From 16e4a92e0de44af134e76ffbd80029eed201f2a7 Mon Sep 17 00:00:00 2001 From: Charles Duffy Date: Fri, 3 Mar 2023 11:14:43 -0600 Subject: [PATCH 001/227] pcsc-safenet: 10.0.37 -> 10.8.28 Update pcsc-safenet to a version with better hardware support, clearer licensing, less-unofficial download location - Version 10.8 explicitly supports the 5110+ CC line of SafeNet tokens. - Version 10.8 release notes explicitly document that "from SAC 10.8 release onwards, no license is required for SAC on Linux". It's not clear to me whether this is sufficient to allow clearing the nonfree flag, but it's certainly an improvement. Also, we're now getting our downloads from a company that distributes SafeNet hardware rather than a website under the control of an Arch contributor, and thus have a clearer chain-of-custody for these security-critical binaries. --- pkgs/tools/security/pcsc-safenet/default.nix | 78 +++++++++++--------- 1 file changed, 43 insertions(+), 35 deletions(-) diff --git a/pkgs/tools/security/pcsc-safenet/default.nix b/pkgs/tools/security/pcsc-safenet/default.nix index 68006a40da8d..be86f9cd643d 100644 --- a/pkgs/tools/security/pcsc-safenet/default.nix +++ b/pkgs/tools/security/pcsc-safenet/default.nix @@ -1,22 +1,31 @@ { stdenv , lib +, runCommand , fetchurl , autoPatchelfHook , dpkg -, gtk2 -, openssl +, gtk3 +, openssl_1_1 , pcsclite +, unzip }: stdenv.mkDerivation rec { pname = "pcsc-safenet"; - version = "10.0.37-0"; + version = "10.8.28"; - # https://aur.archlinux.org/packages/sac-core/ - src = fetchurl { - url = "https://storage.spidlas.cz/public/soft/safenet/SafenetAuthenticationClient-core-${version}_amd64.deb"; - sha256 = "1r9739bhal7ramj1rpawaqvik45xbs1c756l1da96din638gzy5l"; - }; + # extract debian package from larger zip file + src = runCommand "sac.deb" { + zipSrc = let + versionWithUnderscores = builtins.replaceStrings ["."] ["_"] version; + in fetchurl { + url = "https://www.digicert.com/StaticFiles/SAC_${versionWithUnderscores}_GA_Build.zip"; + hash = "sha256-bh+TB7ZGDMh9G4lcPtv7mc0XeGhmCfMMqrlqtyGIIaA="; + }; + debName = "SAC ${version} GA Build/Installation/Standard/Ubuntu-2004/safenetauthenticationclient_${version}_amd64.deb"; + } '' + ${unzip}/bin/unzip -p "$zipSrc" "$debName" >"$out" + ''; dontBuild = true; dontConfigure = true; @@ -26,13 +35,13 @@ stdenv.mkDerivation rec { ''; buildInputs = [ - gtk2 - openssl + gtk3 + openssl_1_1 pcsclite ]; runtimeDependencies = [ - openssl + openssl_1_1 ]; nativeBuildInputs = [ @@ -41,35 +50,34 @@ stdenv.mkDerivation rec { ]; installPhase = '' - # Set up for pcsc drivers + mv usr/* . + mkdir -p pcsc/drivers - mv usr/share/eToken/drivers/* pcsc/drivers/ - rm -r usr/share/eToken/drivers + mv -- lib/pkcs11/* pcsc/drivers/ + rmdir lib/pkcs11 - # Move binaries out - mv usr/bin bin + mkdir "$out" + cp -r ./* "$out/" - # Move UI to bin - mv usr/share/SAC/SACUIProcess bin/ - rm -r usr/share/SAC + ( + cd "$out/lib/" || exit + for f in *.so.*.*.*; do + ln -sf "$f" "''${f%.*}" || exit + ln -sf "$f" "''${f%.*.*}" || exit + ln -sf "$f" "''${f%.*.*.*}" || exit + done + ) || exit - mkdir $out - cp -r {bin,etc,lib,pcsc,usr,var} $out/ + ( + cd "$out/pcsc/drivers" || exit + for f in *; do + if [[ ! -e $f && -e ../../lib/$f ]]; then + ln -sf ../../lib/"$f" "$f" || exit + fi + done + ) || exit - cd "$out/lib/" - ln -sf libeToken.so.10.0.37 libeTPkcs11.so - ln -sf libeToken.so.10.0.37 libeToken.so.10.0 - ln -sf libeToken.so.10.0.37 libeToken.so.10 - ln -sf libeToken.so.10.0.37 libeToken.so - ln -sf libcardosTokenEngine.so.10.0.37 libcardosTokenEngine.so.10.0 - ln -sf libcardosTokenEngine.so.10.0.37 libcardosTokenEngine.so.10 - ln -sf libcardosTokenEngine.so.10.0.37 libcardosTokenEngine.so - - cd $out/pcsc/drivers/aks-ifdh.bundle/Contents/Linux/ - ln -sf libAksIfdh.so.10.0 libAksIfdh.so - ln -sf libAksIfdh.so.10.0 libAksIfdh.so.10 - - ln -sf ${lib.getLib openssl}/lib/libcrypto.so $out/lib/libcrypto.so.1.0.0 + ln -sf ${lib.getLib openssl_1_1}/lib/libcrypto.so $out/lib/libcrypto.so.1.1.0 ''; dontAutoPatchelf = true; From 1b0cd6bcdaa4d591b9ccf0de620eafe04544bd83 Mon Sep 17 00:00:00 2001 From: Samuel Dionne-Riel Date: Tue, 7 Mar 2023 00:11:41 -0500 Subject: [PATCH 002/227] grub2: Pull upstream patches for flicker-free boot --- pkgs/tools/misc/grub/2.0x.nix | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/pkgs/tools/misc/grub/2.0x.nix b/pkgs/tools/misc/grub/2.0x.nix index b6125b9faf76..f44b3c7a1bcf 100644 --- a/pkgs/tools/misc/grub/2.0x.nix +++ b/pkgs/tools/misc/grub/2.0x.nix @@ -81,6 +81,30 @@ stdenv.mkDerivation rec { url = "https://git.savannah.gnu.org/cgit/grub.git/patch/?id=000b5cd04fd228f9741f5dca0491636bc0b89eb8"; sha256 = "sha256-Mex3qQ0lW7ZCv7ZI7MSSqbylJXZ5RTbR4Pv1+CJ0ciM="; }) + + # Upstreamed patches for flicker-free boot + # Remove these patches once a new release is cut + (fetchpatch { + # term/efi/console: Do not set colorstate until the first text output + url = "https://git.savannah.gnu.org/cgit/grub.git/patch/?id=9381dbe045b39bd9395c9ab4276d95b4041ec9fb"; + sha256 = "sha256-ZFq/PdCYo6aRySZRAfZARO8BmXwGgqeXz+9uNgNJEO8="; + }) + (fetchpatch { + # term/efi/console: Do not set cursor until the first text output + url = "https://git.savannah.gnu.org/cgit/grub.git/patch/?id=7c316e18301e101e4dcd8abe88c0bed0b1b78857"; + sha256 = "sha256-WJiK7MqmdStzq77vIDsO60Fu7i9LE/jDYzF4E9FXb7c="; + }) + (fetchpatch { + # normal/menu: Don't show "Booting `%s'" msg when auto-booting with TIMEOUT_STYLE_HIDDEN + url = "https://git.savannah.gnu.org/cgit/grub.git/patch/?id=5bb4f2b7d665c84bde402d1a528b652a61753380"; + sha256 = "sha256-lwJPPyq6yj7X1C2RuHfxnwKKstFkWGxcMXuSQqd9Z4I="; + }) + (fetchpatch { + # kern/main: Suppress the "Welcome to GRUB!" message in EFI builds + url = "https://git.savannah.gnu.org/cgit/grub.git/patch/?id=3e4cbbeca0ef35097301a1086f85fd0d119e64aa"; + sha256 = "sha256-cQX4x9V5Y7SU9WACn5FzDjukL2/StAUMMoHY/DRHq+g="; + }) + (fetchpatch { name = "CVE-2021-3981.patch"; url = "https://git.savannah.gnu.org/cgit/grub.git/patch/?id=0adec29674561034771c13e446069b41ef41e4d4"; From 1649603f9f7625673a4dbbd298ef8be4f572f2ae Mon Sep 17 00:00:00 2001 From: Alexandre Iooss Date: Fri, 3 Mar 2023 08:37:45 +0100 Subject: [PATCH 003/227] gutenprint: enable strictDeps --- pkgs/misc/drivers/gutenprint/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/misc/drivers/gutenprint/default.nix b/pkgs/misc/drivers/gutenprint/default.nix index f5a104fd08c3..7cdf66377d8f 100644 --- a/pkgs/misc/drivers/gutenprint/default.nix +++ b/pkgs/misc/drivers/gutenprint/default.nix @@ -14,7 +14,9 @@ stdenv.mkDerivation rec { sha256 = "0s0b14hjwvbxksq7af5v8z9g2rfqv9jdmxd9d81m57f5mh6rad0p"; }; - nativeBuildInputs = [ makeWrapper pkg-config ]; + strictDeps = true; + nativeBuildInputs = [ makeWrapper pkg-config ] + ++ lib.optional cupsSupport cups; # for cups-config buildInputs = [ ijs zlib ] ++ lib.optionals gimp2Support [ gimp.gtk gimp ] From 22d7930c643dad6979e1145feeab734cb4a3e9c8 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Fri, 17 Mar 2023 04:20:00 +0000 Subject: [PATCH 004/227] dash: 0.5.11.5 -> 0.5.12 --- pkgs/shells/dash/default.nix | 28 ++++------------------------ 1 file changed, 4 insertions(+), 24 deletions(-) diff --git a/pkgs/shells/dash/default.nix b/pkgs/shells/dash/default.nix index e6113c0d7696..ff4656f6650f 100644 --- a/pkgs/shells/dash/default.nix +++ b/pkgs/shells/dash/default.nix @@ -1,10 +1,8 @@ { lib , stdenv , buildPackages -, autoreconfHook , pkg-config , fetchurl -, fetchpatch , libedit , runCommand , dash @@ -12,34 +10,16 @@ stdenv.mkDerivation rec { pname = "dash"; - version = "0.5.11.5"; + version = "0.5.12"; src = fetchurl { url = "http://gondor.apana.org.au/~herbert/dash/files/${pname}-${version}.tar.gz"; - sha256 = "sha256-23eBEIkfeTeYXym/I0EP4cXWaVAnYPWE5U4OeynhI70="; + sha256 = "sha256-akdKxG6LCzKRbExg32lMggWNMpfYs4W3RQgDDKSo8oo="; }; - hardeningDisable = [ "format" ]; - - patches = [ - (fetchpatch { - # Dash executes code when noexec ("-n") is specified - # https://www.openwall.com/lists/oss-security/2020/11/11/3 - url = "https://git.kernel.org/pub/scm/utils/dash/dash.git/patch/?id=29d6f2148f10213de4e904d515e792d2cf8c968e"; - sha256 = "0aadb7aaaan6jxmi6icv4p5gqx7k510yszaqsa29b5giyxz5l9i1"; - }) - - # aarch64-darwin fix from upstream; remove on next release - (fetchpatch { - url = "https://git.kernel.org/pub/scm/utils/dash/dash.git/patch/?id=6f6d1f2da03468c0e131fdcbdcfa9771ffca2614"; - sha256 = "16iz2ylkyhpxqq411ns8pjk8rizh6afhavvsf052wvzsnmmlvfbw"; - }) - ]; - strictDeps = true; - # configure.ac patched; remove on next release - nativeBuildInputs = [ autoreconfHook ] - ++ lib.optionals stdenv.hostPlatform.isStatic [ pkg-config ]; + + nativeBuildInputs = lib.optionals stdenv.hostPlatform.isStatic [ pkg-config ]; depsBuildBuild = [ buildPackages.stdenv.cc ]; buildInputs = [ libedit ]; From 2ea51885809634912c9c9f5f78e1f1b81964562f Mon Sep 17 00:00:00 2001 From: Mathieu Rene Date: Sat, 18 Mar 2023 18:13:35 -0400 Subject: [PATCH 005/227] chirp: unstable-2022-12-07 -> unstable-2023-03-15 Upgrading fixes a current build problem regarding setuptools 67's enhanced strictness. --- pkgs/applications/radio/chirp/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/radio/chirp/default.nix b/pkgs/applications/radio/chirp/default.nix index e73f438f76b8..52d3c566179d 100644 --- a/pkgs/applications/radio/chirp/default.nix +++ b/pkgs/applications/radio/chirp/default.nix @@ -6,13 +6,13 @@ python3.pkgs.buildPythonApplication rec { pname = "chirp"; - version = "unstable-2022-12-07"; + version = "unstable-2023-03-15"; src = fetchFromGitHub { owner = "kk7ds"; repo = "chirp"; - rev = "dc0c98d22423b496faf0a86296a6ec0bb3b3e11a"; - hash = "sha256-z0xD11CB7Vt8k0dPXE+E5ZD9XAFwWNxjnUs25/Gd7zI="; + rev = "33402b7c545c5a92b7042369867e7eb75ef32a59"; + hash = "sha256-duSEpd2GBBskoKNFos5X9wFtsjRct1918VhZd1T2rvU="; }; propagatedBuildInputs = with python3.pkgs; [ @@ -21,6 +21,7 @@ python3.pkgs.buildPythonApplication rec { requests six wxPython_4_2 + yattag ]; # "running build_ext" fails with no output From c3ab41d59273e5c4283213c745ffdbe09f6f974c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 19 Mar 2023 15:38:56 +0000 Subject: [PATCH 006/227] armadillo: 11.4.3 -> 12.0.1 --- pkgs/development/libraries/armadillo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/armadillo/default.nix b/pkgs/development/libraries/armadillo/default.nix index d3bee03c5e19..bd147fffc99d 100644 --- a/pkgs/development/libraries/armadillo/default.nix +++ b/pkgs/development/libraries/armadillo/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "armadillo"; - version = "11.4.3"; + version = "12.0.1"; src = fetchurl { url = "mirror://sourceforge/arma/armadillo-${version}.tar.xz"; - sha256 = "sha256-h2AyY2ZJiK9B2iyk82IF426kepKB+mz9RjEV83l6HaI="; + sha256 = "sha256-IwpcddqtUtxH4a3Oj1pQ+apOQ1Tg8bsY6oTvoucOIN8="; }; nativeBuildInputs = [ cmake ]; From 6480e5cd8d74725ab8b1af39ed975e118a42f8c9 Mon Sep 17 00:00:00 2001 From: Ivan Mincik Date: Mon, 20 Mar 2023 12:36:46 +0100 Subject: [PATCH 007/227] geos: 3.11.1 -> 3.11.2 This change also removes unused `fetchpatch` function. --- pkgs/development/libraries/geos/default.nix | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/geos/default.nix b/pkgs/development/libraries/geos/default.nix index 670fa30cb0f1..333d8196d57f 100644 --- a/pkgs/development/libraries/geos/default.nix +++ b/pkgs/development/libraries/geos/default.nix @@ -1,18 +1,17 @@ { lib -, stdenv , fetchurl -, fetchpatch -, cmake +, stdenv , testers +, cmake }: stdenv.mkDerivation (finalAttrs: { pname = "geos"; - version = "3.11.1"; + version = "3.11.2"; src = fetchurl { url = "https://download.osgeo.org/geos/${finalAttrs.pname}-${finalAttrs.version}.tar.bz2"; - hash = "sha256-bQ6zz6n5LZR3Mcx18XUDVrO9/AfqAgVT2vavHHaOC+I="; + hash = "sha256-sfB3ZpSBxaPmKv/EnpbrBvKBmHpdNv2rIlIX5bgl5Mw="; }; nativeBuildInputs = [ cmake ]; From 6c96cf3d29f3b169b768a27ed2de14d7b86852c8 Mon Sep 17 00:00:00 2001 From: Christopher Bergqvist Date: Mon, 13 Mar 2023 22:09:27 +0100 Subject: [PATCH 008/227] cogl: Add missing patch decompression It appears that the Bugzilla server started delivering compressed attachments at some point. --- pkgs/development/libraries/cogl/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/libraries/cogl/default.nix b/pkgs/development/libraries/cogl/default.nix index 74f09ce29283..a0c679b4fe01 100644 --- a/pkgs/development/libraries/cogl/default.nix +++ b/pkgs/development/libraries/cogl/default.nix @@ -41,11 +41,13 @@ stdenv.mkDerivation rec { (fetchpatch { url = "https://bug787443.bugzilla-attachments.gnome.org/attachment.cgi?id=359589"; sha256 = "0f0d9iddg8zwy853phh7swikg4yzhxxv71fcag36f8gis0j5p998"; + decode = "xz -d"; }) (fetchpatch { url = "https://bug787443.bugzilla-attachments.gnome.org/attachment.cgi?id=361056"; sha256 = "09fyrdci4727fg6qm5aaapsbv71sf4wgfaqz8jqlyy61dibgg490"; + decode = "xz -d"; }) ]; From fc9d82a33533b2851da368cc4da735ab49bfa9fa Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 21 Mar 2023 09:37:00 +0000 Subject: [PATCH 009/227] zola: 0.17.1 -> 0.17.2 --- pkgs/applications/misc/zola/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/zola/default.nix b/pkgs/applications/misc/zola/default.nix index 298d218560ec..ca5a4684a48c 100644 --- a/pkgs/applications/misc/zola/default.nix +++ b/pkgs/applications/misc/zola/default.nix @@ -15,16 +15,16 @@ rustPlatform.buildRustPackage rec { pname = "zola"; - version = "0.17.1"; + version = "0.17.2"; src = fetchFromGitHub { owner = "getzola"; repo = "zola"; rev = "v${version}"; - hash = "sha256-+q6arKZjHVstnbPQhmuxdj/kCPTFf9L0jZYlPS+lksk="; + hash = "sha256-br7VpxkVMZ/TgwMaFbnVMOw9RemNjur/UYnloMoDzHs="; }; - cargoHash = "sha256-mS+yQD7ggQJ/6TYgL54+lLsUbKQaZX9oxT2/GaFoWyI="; + cargoHash = "sha256-AAub8UwAvX3zNX+SM/T9biyNxFTgfqUQG/MUGfwWuno="; nativeBuildInputs = [ cmake From 8da60f204ffc26b6ac59b39568071fa4e3276412 Mon Sep 17 00:00:00 2001 From: midchildan Date: Tue, 21 Mar 2023 21:05:38 +0900 Subject: [PATCH 010/227] syncthing: apply autoSignDarwinBinariesHook Somewhere between macOS 13.0.1 and 13.2.1, launchd started rejecting binaries that aren't signed in Launch Agents/Daemons. This is the case even on x86 devices, which has a more lax code signing policy compared to Apple Silicon. This change signs Syncthing binaries so that it can be auto-started at login by launchd. --- .../networking/syncthing/default.nix | 20 ++++++++++++++++++- pkgs/top-level/all-packages.nix | 1 + 2 files changed, 20 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/networking/syncthing/default.nix b/pkgs/applications/networking/syncthing/default.nix index 952851b08dba..0ddf1fc8f9cc 100644 --- a/pkgs/applications/networking/syncthing/default.nix +++ b/pkgs/applications/networking/syncthing/default.nix @@ -1,4 +1,13 @@ -{ pkgsBuildBuild, go, buildGoModule, stdenv, lib, procps, fetchFromGitHub, nixosTests }: +{ pkgsBuildBuild +, go +, buildGoModule +, stdenv +, lib +, procps +, fetchFromGitHub +, nixosTests +, autoSignDarwinBinariesHook +}: let common = { stname, target, postInstall ? "" }: @@ -15,6 +24,15 @@ let vendorHash = "sha256-5NgflkRXkbWiIkASmxIgWliE8sF89HtlMtlIF+5u6Ic="; + nativeBuildInputs = lib.optionals stdenv.isDarwin [ + # Recent versions of macOS seem to require binaries to be signed when + # run from Launch Agents/Daemons, even on x86 devices where it has a + # more lax code signing policy compared to Apple Silicon. So just sign + # the binaries on both architectures to make it possible for launchd to + # auto-start Syncthing at login. + autoSignDarwinBinariesHook + ]; + doCheck = false; BUILD_USER = "nix"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 633b100887ab..e768a67217c5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -33598,6 +33598,7 @@ with pkgs; syncterm = callPackage ../applications/terminal-emulators/syncterm { }; inherit (callPackages ../applications/networking/syncthing { + inherit (darwin) autoSignDarwinBinariesHook; buildGoModule = buildGo119Module; # go 1.20 build failure }) syncthing From dec6a6d91a07e8c16f2c83b7ff7af8d3cf81aaea Mon Sep 17 00:00:00 2001 From: rewine Date: Wed, 22 Mar 2023 00:04:44 +0800 Subject: [PATCH 011/227] deepin.deepin-clone: init at 5.0.11 --- .../deepin/apps/deepin-clone/default.nix | 77 +++++++++++++++++++ pkgs/desktops/deepin/default.nix | 1 + 2 files changed, 78 insertions(+) create mode 100644 pkgs/desktops/deepin/apps/deepin-clone/default.nix diff --git a/pkgs/desktops/deepin/apps/deepin-clone/default.nix b/pkgs/desktops/deepin/apps/deepin-clone/default.nix new file mode 100644 index 000000000000..9252224488ee --- /dev/null +++ b/pkgs/desktops/deepin/apps/deepin-clone/default.nix @@ -0,0 +1,77 @@ +{ stdenv +, lib +, fetchFromGitHub +, cmake +, qttools +, pkg-config +, qtbase +, wrapQtAppsHook +, dtkwidget +, qt5integration +, qt5platform-plugins +, libuuid +, parted +, partclone +}: + +stdenv.mkDerivation rec { + pname = "deepin-clone"; + version = "5.0.11"; + + src = fetchFromGitHub { + owner = "linuxdeepin"; + repo = pname; + rev = version; + sha256 = "sha256-ZOJc8R82R9q87Qpf/J4CXE+xL6nvbsXRIs0boNY+2uk="; + }; + + postPatch = '' + substituteInPlace app/{deepin-clone-ionice,deepin-clone-pkexec,deepin-clone.desktop,com.deepin.pkexec.deepin-clone.policy.tmp} \ + --replace "/usr" "$out" + + substituteInPlace app/src/corelib/ddevicediskinfo.cpp \ + --replace "/sbin/blkid" "${libuuid}/bin/blkid" + + substituteInPlace app/src/corelib/helper.cpp \ + --replace "/bin/lsblk" "${libuuid}/bin/lsblk" \ + --replace "/sbin/sfdisk" "${libuuid}/bin/sfdisk" \ + --replace "/sbin/partprobe" "${parted}/bin/partprobe" \ + --replace "/usr/sbin" "${partclone}/bin" + ''; + + nativeBuildInputs = [ + cmake + qttools + pkg-config + wrapQtAppsHook + ]; + + buildInputs = [ + qtbase + dtkwidget + qt5platform-plugins + libuuid + parted + partclone + ]; + + cmakeFlags = [ + "-DDISABLE_DFM_PLUGIN=YES" + ]; + + strictDeps = true; + + # qt5integration must be placed before qtsvg in QT_PLUGIN_PATH + qtWrapperArgs = [ + "--prefix QT_PLUGIN_PATH : ${qt5integration}/${qtbase.qtPluginPrefix}" + ]; + + meta = with lib; { + description = "Disk and partition backup/restore tool"; + homepage = "https://github.com/linuxdeepin/deepin-clone"; + license = licenses.gpl3Plus; + platforms = platforms.linux; + maintainers = teams.deepin.members; + }; +} + diff --git a/pkgs/desktops/deepin/default.nix b/pkgs/desktops/deepin/default.nix index 96c3d08b65dc..1c3d8db8a026 100644 --- a/pkgs/desktops/deepin/default.nix +++ b/pkgs/desktops/deepin/default.nix @@ -39,6 +39,7 @@ let deepin-calculator = callPackage ./apps/deepin-calculator { }; deepin-camera = callPackage ./apps/deepin-camera { }; deepin-compressor = callPackage ./apps/deepin-compressor { }; + deepin-clone = callPackage ./apps/deepin-clone { }; deepin-draw = callPackage ./apps/deepin-draw { }; deepin-editor = callPackage ./apps/deepin-editor { }; deepin-image-viewer = callPackage ./apps/deepin-image-viewer { }; From 14a55e86420ee9a5ed75949edc66d063bc6bceec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Tue, 21 Mar 2023 22:46:15 +0100 Subject: [PATCH 012/227] via: 2.1.0 -> 3.0.0 --- pkgs/tools/misc/via/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/via/default.nix b/pkgs/tools/misc/via/default.nix index 4d1783b53acc..5fd808cd1d81 100644 --- a/pkgs/tools/misc/via/default.nix +++ b/pkgs/tools/misc/via/default.nix @@ -2,12 +2,12 @@ let pname = "via"; - version = "2.1.0"; + version = "3.0.0"; name = "${pname}-${version}"; src = fetchurl { url = "https://github.com/the-via/releases/releases/download/v${version}/via-${version}-linux.AppImage"; name = "via-${version}-linux.AppImage"; - sha256 = "sha256-eVmaVD3W+ZEw3HkuZWKsd9XYhASP5+dxzVW64fOhqwk="; + sha256 = "sha256-+uTvmrqHK7L5VA/lUHCZZeRYPUrcVA+vjG7venxuHhs="; }; appimageContents = appimageTools.extractType2 { inherit name src; }; in From c4b7a1439f905090faf0173d7288925e076bbc11 Mon Sep 17 00:00:00 2001 From: Jona Enzinger Date: Fri, 24 Feb 2023 15:48:47 +0100 Subject: [PATCH 013/227] microsoft-edge: 107.0.1418.52 -> 111.0.1661.44 --- .../browsers/microsoft-edge/browser.nix | 7 ------- .../browsers/microsoft-edge/default.nix | 20 +++++++++---------- 2 files changed, 10 insertions(+), 17 deletions(-) diff --git a/pkgs/applications/networking/browsers/microsoft-edge/browser.nix b/pkgs/applications/networking/browsers/microsoft-edge/browser.nix index 685bd7e42ac8..a2eda0dc3c17 100644 --- a/pkgs/applications/networking/browsers/microsoft-edge/browser.nix +++ b/pkgs/applications/networking/browsers/microsoft-edge/browser.nix @@ -94,9 +94,6 @@ stdenv.mkDerivation rec { libGLESv2 = lib.makeLibraryPath [ xorg.libX11 xorg.libXext xorg.libxcb wayland ]; - libsmartscreen = lib.makeLibraryPath [ - libuuid stdenv.cc.cc.lib - ]; libsmartscreenn = lib.makeLibraryPath [ libuuid ]; @@ -131,10 +128,6 @@ stdenv.mkDerivation rec { --set-rpath "${libPath.libGLESv2}" \ opt/microsoft/${shortName}/libGLESv2.so - patchelf \ - --set-rpath "${libPath.libsmartscreen}" \ - opt/microsoft/${shortName}/libsmartscreen.so - patchelf \ --set-rpath "${libPath.libsmartscreenn}" \ opt/microsoft/${shortName}/libsmartscreenn.so diff --git a/pkgs/applications/networking/browsers/microsoft-edge/default.nix b/pkgs/applications/networking/browsers/microsoft-edge/default.nix index 7a9e69421495..c60a867055ca 100644 --- a/pkgs/applications/networking/browsers/microsoft-edge/default.nix +++ b/pkgs/applications/networking/browsers/microsoft-edge/default.nix @@ -1,20 +1,20 @@ { + stable = import ./browser.nix { + channel = "stable"; + version = "111.0.1661.44"; + revision = "1"; + sha256 = "sha256-ePViYQZUteMBkV7AkvsoQwPVxibMB68LDWgg7d82iIE="; + }; beta = import ./browser.nix { channel = "beta"; - version = "108.0.1462.20"; + version = "112.0.1722.15"; revision = "1"; - sha256 = "sha256:0dfmzjfy4y07pqifyzv3rc8dbmxz8rr3v2idanla7jrks0pghcxm"; + sha256 = "sha256-Ba6f5MOBTtY8bUxCcMySQCWqDvOiI1hLnuwcIspReq8="; }; dev = import ./browser.nix { channel = "dev"; - version = "109.0.1495.2"; + version = "113.0.1741.1"; revision = "1"; - sha256 = "sha256:1bk7dx3mf020ahzmvr9cdgcn72rjrn2420j9g362vwcl1khyxciw"; - }; - stable = import ./browser.nix { - channel = "stable"; - version = "107.0.1418.52"; - revision = "1"; - sha256 = "sha256:1k3c5r9lq3vpc190bzs5fn944bi3af6wjxzwcliy4wzzrb5g0day"; + sha256 = "sha256-1d92bQAoiTkqWgiWdUBn3VKBYCRP1KCvPiu7cQTFVio="; }; } From 91c2c00aad7d60baa0de4d20edc203615a539ba5 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 22 Mar 2023 12:07:12 +0000 Subject: [PATCH 014/227] sumo: 1.15.0 -> 1.16.0 --- pkgs/applications/science/networking/sumo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/networking/sumo/default.nix b/pkgs/applications/science/networking/sumo/default.nix index 6fda53161dd3..b48ea98387d8 100644 --- a/pkgs/applications/science/networking/sumo/default.nix +++ b/pkgs/applications/science/networking/sumo/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "sumo"; - version = "1.15.0"; + version = "1.16.0"; src = fetchFromGitHub { owner = "eclipse"; repo = "sumo"; rev = "v${lib.replaceStrings ["."] ["_"] version}"; - sha256 = "sha256-Mm8Kqb5W9h2jYvRGypI6v5IHDm4CnAeT+NcJybdU5K0="; + sha256 = "sha256-0aUm7sgBLTPNSJuH6/xsTDZKUzAI87wPI2G3WSi5SGA="; fetchSubmodules = true; }; From 1d31b69cddb893e18a76908f9e57b39f344113d4 Mon Sep 17 00:00:00 2001 From: Daniel Goertzen Date: Wed, 22 Mar 2023 12:43:07 -0500 Subject: [PATCH 015/227] linux-kernels/linuxConfig: add kernelPatches Kernel patches may contain new Kconfig elements so they should be applied to src before generating a config. --- pkgs/top-level/linux-kernels.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/top-level/linux-kernels.nix b/pkgs/top-level/linux-kernels.nix index fa83d6c925fc..6b8a14f921e2 100644 --- a/pkgs/top-level/linux-kernels.nix +++ b/pkgs/top-level/linux-kernels.nix @@ -630,6 +630,7 @@ in { # Derive one of the default .config files linuxConfig = { src, + kernelPatches ? [], version ? (builtins.parseDrvName src.name).version, makeTarget ? "defconfig", name ? "kernel.config", @@ -637,6 +638,7 @@ in { inherit name src; depsBuildBuild = [ buildPackages.stdenv.cc ] ++ lib.optionals (lib.versionAtLeast version "4.16") [ buildPackages.bison buildPackages.flex ]; + patches = map (p: p.patch) kernelPatches; # Patches may include new configs. postPatch = '' patchShebangs scripts/ ''; From 319f623d417867171b5abe7980c2930218a976c6 Mon Sep 17 00:00:00 2001 From: Raphael Robatsch Date: Wed, 22 Mar 2023 19:53:28 +0100 Subject: [PATCH 016/227] honk: 0.9.8 -> 0.9.91 Changelog: https://humungus.tedunangst.com/r/honk/v/v0.9.91/f/docs/changelog.txt For existing installations the database schema must be manually updated by executing `honk upgrade`. --- pkgs/servers/honk/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/honk/default.nix b/pkgs/servers/honk/default.nix index 913b607ac843..cdcc0ddb63ac 100644 --- a/pkgs/servers/honk/default.nix +++ b/pkgs/servers/honk/default.nix @@ -2,11 +2,11 @@ buildGoModule rec { pname = "honk"; - version = "0.9.8"; + version = "0.9.91"; src = fetchurl { url = "https://humungus.tedunangst.com/r/honk/d/honk-${version}.tgz"; - sha256 = "0vh8y1aj2w0y2zxmybhik4iv7myyldfzkd75nzgmlz3vycr60rh6"; + hash = "sha256-+NFWTTMVdngWsC8/EIN2xJC/5C4naaAekk/YoA17wFk="; }; vendorHash = null; From 3dade082a18fbd36b3ba85b398bab1dcb8cac41b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 23 Mar 2023 05:35:15 +0000 Subject: [PATCH 017/227] exodus: 22.8.12 -> 23.3.13 --- pkgs/applications/blockchains/exodus/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/blockchains/exodus/default.nix b/pkgs/applications/blockchains/exodus/default.nix index 1bc33588c42d..709e20f476b2 100644 --- a/pkgs/applications/blockchains/exodus/default.nix +++ b/pkgs/applications/blockchains/exodus/default.nix @@ -4,11 +4,11 @@ cups, vivaldi-ffmpeg-codecs, libpulseaudio, at-spi2-core, libxkbcommon, mesa }: stdenv.mkDerivation rec { pname = "exodus"; - version = "22.8.12"; + version = "23.3.13"; src = fetchzip { url = "https://downloads.exodus.com/releases/${pname}-linux-x64-${version}.zip"; - sha256 = "sha256-jNzHh4zYhFzpFZAC9rHmwjTdFkbpROSEN3qpL7geiOU="; + sha256 = "sha256-/xCDtR3V++LaZZWTaNpeD3YuP5ZM5BChB1CUBH/xNcU="; }; installPhase = '' From ba783d488784ae1ad28a821aedf33015931874c0 Mon Sep 17 00:00:00 2001 From: Arthur Outhenin-Chalandre Date: Wed, 15 Mar 2023 11:33:36 +0100 Subject: [PATCH 018/227] protonmail-bridge: 3.0.18 -> 3.0.21 Signed-off-by: Arthur Outhenin-Chalandre --- pkgs/applications/networking/protonmail-bridge/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/protonmail-bridge/default.nix b/pkgs/applications/networking/protonmail-bridge/default.nix index 5dc7779e12e9..d02bf7ec1fe2 100644 --- a/pkgs/applications/networking/protonmail-bridge/default.nix +++ b/pkgs/applications/networking/protonmail-bridge/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "protonmail-bridge"; - version = "3.0.18"; + version = "3.0.21"; src = fetchFromGitHub { owner = "ProtonMail"; repo = "proton-bridge"; rev = "v${version}"; - hash = "sha256-0gQnMhjwW2NEJwafqndStQ33dIu82lW6ntXFRCpbmm4="; + hash = "sha256-aRzVXmAWRifIGCAPWYciBhK9XMvsmtHc67XRoI19VYU="; }; - vendorHash = "sha256-lHMcVcaoBwjE2ikEZPeZexC5XvhkAtvHnDci7UAa4vg="; + vendorHash = "sha256-zCE4LO6m4uyOvSzhUbzH2F9EgDs0UZH4eCl6lfRjIRQ="; nativeBuildInputs = [ pkg-config ]; From 46344c77b3d313d9c5e1a7a7053836de9935ee7f Mon Sep 17 00:00:00 2001 From: Chuang Zhu Date: Fri, 24 Mar 2023 02:55:11 +0800 Subject: [PATCH 019/227] nixos/proxychains: add package option --- nixos/modules/programs/proxychains.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/nixos/modules/programs/proxychains.nix b/nixos/modules/programs/proxychains.nix index a52783aa6698..9bdd5d405668 100644 --- a/nixos/modules/programs/proxychains.nix +++ b/nixos/modules/programs/proxychains.nix @@ -51,6 +51,10 @@ in { enable = mkEnableOption (lib.mdDoc "installing proxychains configuration"); + package = mkPackageOptionMD pkgs "proxychains" { + example = "pkgs.proxychains-ng"; + }; + chain = { type = mkOption { type = types.enum [ "dynamic" "strict" "random" ]; @@ -159,7 +163,7 @@ in { }; environment.etc."proxychains.conf".text = configFile; - environment.systemPackages = [ pkgs.proxychains ]; + environment.systemPackages = [ cfg.package ]; }; } From 91f99f14ff83b3c2ca0c90c29ada3b030127152d Mon Sep 17 00:00:00 2001 From: Kiskae Date: Fri, 24 Mar 2023 11:35:55 +0100 Subject: [PATCH 020/227] linuxPackages.nvidia_x11: add support for zstd compression --- pkgs/os-specific/linux/nvidia-x11/builder.sh | 2 +- pkgs/os-specific/linux/nvidia-x11/generic.nix | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/os-specific/linux/nvidia-x11/builder.sh b/pkgs/os-specific/linux/nvidia-x11/builder.sh index 1cf1400f996b..2ca74fb5f058 100755 --- a/pkgs/os-specific/linux/nvidia-x11/builder.sh +++ b/pkgs/os-specific/linux/nvidia-x11/builder.sh @@ -3,7 +3,7 @@ source $stdenv/setup unpackManually() { skip=$(sed 's/^skip=//; t; d' $src) - tail -n +$skip $src | xz -d | tar xvf - + tail -n +$skip $src | bsdtar xvf - sourceRoot=. } diff --git a/pkgs/os-specific/linux/nvidia-x11/generic.nix b/pkgs/os-specific/linux/nvidia-x11/generic.nix index e56318deca96..b76e64232b74 100644 --- a/pkgs/os-specific/linux/nvidia-x11/generic.nix +++ b/pkgs/os-specific/linux/nvidia-x11/generic.nix @@ -20,7 +20,7 @@ }@args: { lib, stdenv, callPackage, pkgs, pkgsi686Linux, fetchurl -, kernel ? null, perl, nukeReferences, which +, kernel ? null, perl, nukeReferences, which, libarchive , # Whether to build the libraries only (i.e. not the kernel module or # nvidia-settings). Used to support 32-bit binaries on 64-bit # Linux. @@ -98,8 +98,7 @@ let libPath = libPathFor pkgs; libPath32 = optionalString i686bundled (libPathFor pkgsi686Linux); - buildInputs = [ which ]; - nativeBuildInputs = [ perl nukeReferences ] + nativeBuildInputs = [ perl nukeReferences which libarchive ] ++ optionals (!libsOnly) kernel.moduleBuildDependencies; disallowedReferences = optionals (!libsOnly) [ kernel.dev ]; From c3ce711249cb09e3558468e3d0e33d5870affe65 Mon Sep 17 00:00:00 2001 From: Kiskae Date: Fri, 24 Mar 2023 11:37:35 +0100 Subject: [PATCH 021/227] nixos/nvidia: re-enable IBT for newer drivers --- nixos/modules/hardware/video/nvidia.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/nixos/modules/hardware/video/nvidia.nix b/nixos/modules/hardware/video/nvidia.nix index 434931ccae5a..79a3ab6baaab 100644 --- a/nixos/modules/hardware/video/nvidia.nix +++ b/nixos/modules/hardware/video/nvidia.nix @@ -462,8 +462,7 @@ in boot.kernelParams = optional (offloadCfg.enable || cfg.modesetting.enable) "nvidia-drm.modeset=1" ++ optional cfg.powerManagement.enable "nvidia.NVreg_PreserveVideoMemoryAllocations=1" ++ optional cfg.open "nvidia.NVreg_OpenRmEnableUnsupportedGpus=1" - # proprietary driver is not compiled with support for X86_KERNEL_IBT - ++ optional (!cfg.open && config.boot.kernelPackages.kernel.kernelAtLeast "6.2") "ibt=off"; + ++ optional (!cfg.open && config.boot.kernelPackages.kernel.kernelAtLeast "6.2" && lib.versionOlder nvidia_x11.version "530") "ibt=off"; services.udev.extraRules = '' From 070c3a155fb4a6f0f2c7c7f72d2ae5d534b6271f Mon Sep 17 00:00:00 2001 From: Kiskae Date: Fri, 24 Mar 2023 11:37:59 +0100 Subject: [PATCH 022/227] linuxPackages.nvidia_x11_beta: 525.89.02 -> 530.30.02 --- pkgs/os-specific/linux/nvidia-x11/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/os-specific/linux/nvidia-x11/default.nix b/pkgs/os-specific/linux/nvidia-x11/default.nix index 156bb150c5f7..17bd36f4a05e 100644 --- a/pkgs/os-specific/linux/nvidia-x11/default.nix +++ b/pkgs/os-specific/linux/nvidia-x11/default.nix @@ -41,11 +41,11 @@ rec { }); beta = selectHighestVersion latest (generic { - version = "525.53"; - sha256_64bit = "sha256-dLsJcfBPHd3TxGQciRcG+5bo3lLiL2B55Q3nbTpRaH8="; - openSha256 = "sha256-XA5RY+dQZv+dTHF7rm/bXnPZLj1G75PJKSTfREpuKag="; - settingsSha256 = "sha256-N3+EOm2D2NSmD/cai+Pm2z5WHmV+GEJVr9KTQv/7j88="; - persistencedSha256 = "sha256-AhB6zetbejQzajg76+hqpbfv3OzftueXGpviepH/xss="; + version = "530.30.02"; + sha256_64bit = "sha256-R/3bvXoiumYZI9vObn9R7sVN9oBQxAbMBJDDv77eeWM="; + openSha256 = "sha256-LCtTyuJ8s8isTBt9HetItLqSjL1GOn0tPUarjuxHpMk="; + settingsSha256 = "sha256-6mynLNSaWeiB52HdwZ0EQNyPg+tuat0oEqpZGSb2yQo="; + persistencedSha256 = "sha256-h6iq0iD9F41a7s6jWKPTI+oVzgDRIr1Kk97LNH9rg7E="; }); # Vulkan developer beta driver From 90c44c959814b11009fe3abb33344fa6f5e6d290 Mon Sep 17 00:00:00 2001 From: Kiskae Date: Thu, 23 Mar 2023 17:36:43 +0100 Subject: [PATCH 023/227] linuxPackages.nvidia_x11: 525.89.02 -> 530.41.03 --- pkgs/os-specific/linux/nvidia-x11/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/os-specific/linux/nvidia-x11/default.nix b/pkgs/os-specific/linux/nvidia-x11/default.nix index 17bd36f4a05e..ab497c145164 100644 --- a/pkgs/os-specific/linux/nvidia-x11/default.nix +++ b/pkgs/os-specific/linux/nvidia-x11/default.nix @@ -33,11 +33,11 @@ rec { }; latest = selectHighestVersion production (generic { - version = "520.56.06"; - sha256_64bit = "sha256-UWdLAL7Wdm7EPUHKhNGNaTkGI0+FUZBptqNB92wRPEY="; - openSha256 = "sha256-miIxF/0fA7v8fU+oh/mx0DRqJdPBzmz14IqgPWJQeKU="; - settingsSha256 = "sha256-NeT3tb7NGicKHnNkuOwbte6BJsP1bUzPSE+TXnevCAM="; - persistencedSha256 = "sha256-3nWtnwpLaal3ty8GNMFa4zeonT8nKpYs6DIgsAq9+84="; + version = "530.41.03"; + sha256_64bit = "sha256-riehapaMhVA/XRYd2jQ8FgJhKwJfSu4V+S4uoKy3hLE="; + openSha256 = "sha256-etbtw6LMRUcFoZC9EDDRrTDekV8JFRYmkp3idLaMk5g="; + settingsSha256 = "sha256-8KB6T9f+gWl8Ni+uOyrJKiiH5mNx9eyfCcW/RjPTQQA="; + persistencedSha256 = "sha256-zrstlt/0YVGnsPGUuBbR9ULutywi2wNDVxh7OhJM7tM="; }); beta = selectHighestVersion latest (generic { From 5073b8c39ce15e1ff381d4352f44a5cd1317d916 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 24 Mar 2023 17:15:12 +0000 Subject: [PATCH 024/227] firefox-devedition-bin-unwrapped: 112.0b5 -> 112.0b6 --- .../firefox-bin/devedition_sources.nix | 802 +++++++++--------- 1 file changed, 401 insertions(+), 401 deletions(-) diff --git a/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix index d995760924c9..6eabadafbdf6 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix @@ -1,1005 +1,1005 @@ { - version = "112.0b5"; + version = "112.0b6"; sources = [ - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-x86_64/ach/firefox-112.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b6/linux-x86_64/ach/firefox-112.0b6.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; - sha256 = "05859db46d62c1c66035a21012f384d7392a42a443f21fae27b1c22519e1a787"; + sha256 = "3c07e964f23adfb557c30aabd83afda74cd1431e6f56c636a27a31d5732f2895"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-x86_64/af/firefox-112.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b6/linux-x86_64/af/firefox-112.0b6.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha256 = "49f9073e4426000dcdc008a8f9f52edbdcd7f89d0f6af4463e06ad3c70d493af"; + sha256 = "2c944716a6c695f6a7e02b2592f63b879f1d9ecc1d98148920941e03cc24d3d8"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-x86_64/an/firefox-112.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b6/linux-x86_64/an/firefox-112.0b6.tar.bz2"; locale = "an"; arch = "linux-x86_64"; - sha256 = "6b07b832993b5142dbd619d8d2e39d7394346be6f1b5580dc6f62fd50226cfd2"; + sha256 = "ce14c24ee1477912b5671364472ab07016e14277258487bfe7766d50bd757f8f"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-x86_64/ar/firefox-112.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b6/linux-x86_64/ar/firefox-112.0b6.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha256 = "a248911af735ce319b559dd97f87734b54377ad70b22aa51f989433ee809f3df"; + sha256 = "dd265c505f5263a2cc9a7fcab83d29587ba986d1d0e9e17b1b3d25c617af8e61"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-x86_64/ast/firefox-112.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b6/linux-x86_64/ast/firefox-112.0b6.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha256 = "835f1935904afdd4081d82d6c73ebfe6159fa94acd10dda826ccf0b14b86b54c"; + sha256 = "9128fc4c7b505c30b23a953cfab428fec361b7bca94b13718ec806b802bfaef0"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-x86_64/az/firefox-112.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b6/linux-x86_64/az/firefox-112.0b6.tar.bz2"; locale = "az"; arch = "linux-x86_64"; - sha256 = "63f778e01748faa999374a82f72b58342e72fcc159f0b385ad393d96a9bf1001"; + sha256 = "6ad10ede0403064a94d98c802e8082a1988b2914565473034f068874588b0c7a"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-x86_64/be/firefox-112.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b6/linux-x86_64/be/firefox-112.0b6.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha256 = "e1a9652fcd7b34ddddf80d2c4d1f7d13a44e382af722bf5a2d2f3a1a6d328fdb"; + sha256 = "b2b03e037a5d68c0f8e6bca169b513fd25167c710c84011d0162e435ca3dbcf1"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-x86_64/bg/firefox-112.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b6/linux-x86_64/bg/firefox-112.0b6.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha256 = "e90ff246ea24f285a51d10b31957301b6cc9f104d3cbb8913521ed9413449092"; + sha256 = "b3d8c55193980e6b705bfb728eeb0da53a9df676288433df312002e2feff60cd"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-x86_64/bn/firefox-112.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b6/linux-x86_64/bn/firefox-112.0b6.tar.bz2"; locale = "bn"; arch = "linux-x86_64"; - sha256 = "ee9f1665f8c76806fb8ead80b492ab39756d010ab70703b9a806bd511f5b2e5e"; + sha256 = "513bbf8cb0fc17ceae546dccf6c8f5cd43d78d2fccf212fb5762a210cdd2bd3d"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-x86_64/br/firefox-112.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b6/linux-x86_64/br/firefox-112.0b6.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha256 = "4fc531ffe5ee4970e51723f741df9b1a0d32e0e67497c7296302e2aabdb66c3c"; + sha256 = "4ee6a09aa510535dd483a5cc570a202ac7ba5d9699070969740f38f98f143e7e"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-x86_64/bs/firefox-112.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b6/linux-x86_64/bs/firefox-112.0b6.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; - sha256 = "374fac7c2633e37e148d75ba8ad919e6f9101d155835f624c3bd3f72a5564c52"; + sha256 = "144558775c3e28b27cebaa136aec69d38abc29bd51af2cd625bcd15b1d5291c9"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-x86_64/ca-valencia/firefox-112.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b6/linux-x86_64/ca-valencia/firefox-112.0b6.tar.bz2"; locale = "ca-valencia"; arch = "linux-x86_64"; - sha256 = "9a3467b62347a6c022721100f694212b06cdb30d056741bfa393759068352331"; + sha256 = "7c6654dda1029eb23f41e73104187ea157298994127976e24ec0c82326de35bd"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-x86_64/ca/firefox-112.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b6/linux-x86_64/ca/firefox-112.0b6.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha256 = "cfd738a5fcdd6b0fc9f07b8a4c6f85e9f38740af7c797a488aa249d86ce49114"; + sha256 = "389b901dd0a4069ef9860379e71a12239dd4a33d4df05dfd7d16d35ec50d7748"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-x86_64/cak/firefox-112.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b6/linux-x86_64/cak/firefox-112.0b6.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha256 = "0508c53ff3ae20712559c429f676b2dcfc5488f15746a5e802b759ae4b9af92e"; + sha256 = "e91ea1785dd87c2bb92f0f2126f82d4f6127301250886de313751118d4d86d02"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-x86_64/cs/firefox-112.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b6/linux-x86_64/cs/firefox-112.0b6.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha256 = "4f2dac86bc0d29fb86667a93f172a1077e6e18dadc8c9b1c80917cc48d186a5b"; + sha256 = "6ffd6aae1b31bf22095c1acff6d6fe53c747a875ef3868d0624873267a6ca7c2"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-x86_64/cy/firefox-112.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b6/linux-x86_64/cy/firefox-112.0b6.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha256 = "947a766e64dc318162ce24c02a4e53498a8b261807a2e2f02df348aabe6fd203"; + sha256 = "ae0cfbbe890991bd30762f181a4ae7bde2701d5e0f924f6142b71e1cf9474f86"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-x86_64/da/firefox-112.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b6/linux-x86_64/da/firefox-112.0b6.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha256 = "557d3e24d92af23c2d7847aa156fb961ea6d00b677935eb37573e5d10a431e70"; + sha256 = "b7a6aecd661653c93e2237a27fed8ac169bfc4f2dcd2b377b820b685cffe7d1a"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-x86_64/de/firefox-112.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b6/linux-x86_64/de/firefox-112.0b6.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha256 = "b0ace6526a07016e2b8a7413ee27ba282458854eeca0a563977b6a7dc79df517"; + sha256 = "936d530879ba9715446ac97b8a433987d25bd8d41e01b70c10e99994b56433a9"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-x86_64/dsb/firefox-112.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b6/linux-x86_64/dsb/firefox-112.0b6.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha256 = "a7d34883dee70a0a1a354b19302af4e0a7dd605294489c3e732322fd9b27d471"; + sha256 = "96566692bd75645538f336b2322ad6821889bc1de73b63646b880d6b1263c90a"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-x86_64/el/firefox-112.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b6/linux-x86_64/el/firefox-112.0b6.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha256 = "1dd23fcfa7d21fa0abd534b7fafcde2ebb68cc5d1082849b65ca853e8c97542e"; + sha256 = "d52d4040df2b1398eedea68f8253ed58b897c6da68ee11b13c81b5768c1d221f"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-x86_64/en-CA/firefox-112.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b6/linux-x86_64/en-CA/firefox-112.0b6.tar.bz2"; locale = "en-CA"; arch = "linux-x86_64"; - sha256 = "bb07562373692afbb647ff83293e2c73be125ef3d5865e042f6f068e459df240"; + sha256 = "ac8763f0b3dadce233ac88e93f24695b9acb5299e1884feac7bfbd0a04cff0f1"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-x86_64/en-GB/firefox-112.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b6/linux-x86_64/en-GB/firefox-112.0b6.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha256 = "b0bd2e1e75672b70e66ddef4d69a30cee469178fea807a76fbd3f4a3b54f8377"; + sha256 = "6e5567e859557151c093727f7c7bab1961de6d1c8b8b8e11717d1f55c93f628b"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-x86_64/en-US/firefox-112.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b6/linux-x86_64/en-US/firefox-112.0b6.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha256 = "d367fac2132309c669bb0e4419d27756ad1c500e8f3753d4ea6020eb7f7ad53c"; + sha256 = "235972a20d398a3641ffe7e427375f01744b0cf0487b450e23bf2d217f7390d2"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-x86_64/eo/firefox-112.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b6/linux-x86_64/eo/firefox-112.0b6.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; - sha256 = "6fbf9f27f70308525b487d2ae308eeb3c704725113f1c23e03c166c1632452c3"; + sha256 = "3a4eda3ada0681c3033adde3b5de46cda7901de136cb18e64221e47e97f7bba5"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-x86_64/es-AR/firefox-112.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b6/linux-x86_64/es-AR/firefox-112.0b6.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha256 = "ff5859cd53d94135463d638ca0ea0cfad310f261dece75342d4860baf9e07832"; + sha256 = "70448e290002f4dd8ed8a3ae48f53eeaa568f68302bb36e0175c7b417ad8d3a5"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-x86_64/es-CL/firefox-112.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b6/linux-x86_64/es-CL/firefox-112.0b6.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; - sha256 = "22853be89138a70b5a45f1b983bf3d27f872d2ecea8127512848eca9335bc67c"; + sha256 = "13e5eddfa538961a0cd587c7d498a88daae23d578750e23ae48dd6f2398a3216"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-x86_64/es-ES/firefox-112.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b6/linux-x86_64/es-ES/firefox-112.0b6.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha256 = "495c74d78b711eee03f2d376675547aa1bbcacc93817f1141a1cacb9d7a7b359"; + sha256 = "0429f562d61626e701c23292eb13f6787b29f8b8cb2aaa33adf35ba791e9166c"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-x86_64/es-MX/firefox-112.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b6/linux-x86_64/es-MX/firefox-112.0b6.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha256 = "cec7c4d65ffd6ce0608f0063c9634f2a9624e0bace5cbe159f9171ae2a0747ec"; + sha256 = "df33f30d6f1852b4ae2f5fc2be567009d62c76d519c8741d83645bfbe5847701"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-x86_64/et/firefox-112.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b6/linux-x86_64/et/firefox-112.0b6.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha256 = "99f6dbfce8f79360d5fe9360b5d2f7e8b721ac9de7ddd958e24c8a8c1608a563"; + sha256 = "d89fafb4fdfa59e61478ee0668b1a51723bf7d974c8acfa568d73004ee022237"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-x86_64/eu/firefox-112.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b6/linux-x86_64/eu/firefox-112.0b6.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha256 = "1198890563e45116380b57ee3ec576458b58935a584ecd561bc05b8750808c1e"; + sha256 = "0d46ea00d2babd59fd78a754ea6e6a872912e5e9a956366a3b0bd402e3f31a0c"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-x86_64/fa/firefox-112.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b6/linux-x86_64/fa/firefox-112.0b6.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha256 = "cc0bfefb8df93dbf384dd65b23da2ebbc1cc7d3a7c068f72a3ceea58a24e7fd1"; + sha256 = "c829052709ed804781b2f3f04eccc2fc5d6ef88f4cd049a0ab0ac98189fc8578"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-x86_64/ff/firefox-112.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b6/linux-x86_64/ff/firefox-112.0b6.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; - sha256 = "ad9d500e301fb94c09d3ea334c9590462eacb7732ab3c43ff9184f09d05e3e94"; + sha256 = "bf7c2c400dea1fa5df076d7478cce9de30af37ddc192c889b4738a166d9cfa5b"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-x86_64/fi/firefox-112.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b6/linux-x86_64/fi/firefox-112.0b6.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha256 = "216540e1c2fc59f946ebb0c3968045f928784fc38873bc96d9f5317bfae56df6"; + sha256 = "5edfebdfebe51909c1ec7177e497bd4d0728dcbfbb3e81aafa3878b7a6406418"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-x86_64/fr/firefox-112.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b6/linux-x86_64/fr/firefox-112.0b6.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha256 = "84897d974fcc365287bab6d9e941c03c6aa464fba22b5968e3f5a41d21f8ac7f"; + sha256 = "2958284604ce96177fe3973460b2eb96e12902c363e40517cdfa0e90bb3c0858"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-x86_64/fur/firefox-112.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b6/linux-x86_64/fur/firefox-112.0b6.tar.bz2"; locale = "fur"; arch = "linux-x86_64"; - sha256 = "e03d8761e955becb1f6f542e697d7d64aaf90d1abac9ff0dfe0ae698aab91830"; + sha256 = "e82ee24e0bf4fffe3c185bec25563016906b7d0c093b4dcd1e67f72432c74399"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-x86_64/fy-NL/firefox-112.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b6/linux-x86_64/fy-NL/firefox-112.0b6.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha256 = "e0cb84ee39ed5d8b7cd21bd8283e233a0547a98ff703d15ec001bf30049748ed"; + sha256 = "90c3862b789a5507026696c4794964cfc9d1f0c1ec3e41be2c7d6c008b56e1f8"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-x86_64/ga-IE/firefox-112.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b6/linux-x86_64/ga-IE/firefox-112.0b6.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha256 = "ce2e7c971f787470f38e3b7a96d9670892de6480bb4fe8ac45bcdb0049033265"; + sha256 = "8dc83431305b71d33c85533304c054c9975ed835e610af800dcbc7e3b83eba5f"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-x86_64/gd/firefox-112.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b6/linux-x86_64/gd/firefox-112.0b6.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha256 = "461f3d05b8d1b587111c952be55138d54b6747d9340278e0650f4f963cdb378a"; + sha256 = "3f656718bf9dabe3cf4fc3b8b089aec67acc4c8c61f4c3d2eb1a49cb13f7ceaf"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-x86_64/gl/firefox-112.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b6/linux-x86_64/gl/firefox-112.0b6.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha256 = "25664e36f13283c637337b94cc7d90c296a854bb21de1f139b6682a2b39503aa"; + sha256 = "6d7db43edcaf6c797bcd2a6fa8684c3e56ae8fdcb344b7a8f2c86fab0e03c1fc"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-x86_64/gn/firefox-112.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b6/linux-x86_64/gn/firefox-112.0b6.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; - sha256 = "360fbd631fdbeb8ebc876920c8346a4f0f4d903ff931014db197b0ed0170512c"; + sha256 = "812518dab7d7d964ba8babca078df50cc38453b103ca803e09eb2e48173f1c1f"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-x86_64/gu-IN/firefox-112.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b6/linux-x86_64/gu-IN/firefox-112.0b6.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; - sha256 = "42229ebfea176d3c0bf174115025fe9bd9d0303821618a2843a48364980c87e5"; + sha256 = "ccc8b86769c127c3f041c89ebe48fb88ff50df0ff95021f944801ab530f9c304"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-x86_64/he/firefox-112.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b6/linux-x86_64/he/firefox-112.0b6.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha256 = "eef8c9609920d4ab26030e697465c38783f6f8c9688d2f2ead3d6d572d57a8f6"; + sha256 = "b275c9ef40ce81cb6a85e210d7e3b547913af7ca3715dd54074e5024b428ba1b"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-x86_64/hi-IN/firefox-112.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b6/linux-x86_64/hi-IN/firefox-112.0b6.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; - sha256 = "cdf20283ad2698a16c1977c75d1ff424f75008d2166585d41ef92b1293729ed0"; + sha256 = "4f3b3743ca324935aa3fec117a6d6cc1ee8321fd64e281529a8ed070ae2a013b"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-x86_64/hr/firefox-112.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b6/linux-x86_64/hr/firefox-112.0b6.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha256 = "9441a3683dd0a51360ab84d8c0adcf9bad148e37025e6484995bcdc141acdb67"; + sha256 = "059ff55d680a0d8f1bdfebe5deca396de923f6f4fecfca82b123061f5c47d3a8"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-x86_64/hsb/firefox-112.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b6/linux-x86_64/hsb/firefox-112.0b6.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha256 = "6a30c59deb36336392794867d12b4c6fbeaf4c8c2f4e98c843bc96799a877a2e"; + sha256 = "f62efb1274177339936547265b10de4e507e5ee71220aac10c9f00091f67abe5"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-x86_64/hu/firefox-112.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b6/linux-x86_64/hu/firefox-112.0b6.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha256 = "4ba34af1efa0f1b52858c200035d696e60417f36ff4884c88fee01e2589eddcd"; + sha256 = "4e66d7fed06b0b247e5b253b27a7bd647db142f1deda1edb4c0f3498843ae439"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-x86_64/hy-AM/firefox-112.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b6/linux-x86_64/hy-AM/firefox-112.0b6.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha256 = "c20eac2ee61c73b0d5065b7842a4f5daecd3b29d5d508e6aac8512301da428cf"; + sha256 = "ef9dd23be04d7ee7b06ca830ad516765e95172dbbaae14b8a33e77c38edf7c84"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-x86_64/ia/firefox-112.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b6/linux-x86_64/ia/firefox-112.0b6.tar.bz2"; locale = "ia"; arch = "linux-x86_64"; - sha256 = "9c5aa72cb38a505f289df411bf458ec0aadca322b19819b6098ff08d74bf9fe3"; + sha256 = "163f9577825303ad0705df664d2359190d4555893d4deb60d8999b5f98f4578a"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-x86_64/id/firefox-112.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b6/linux-x86_64/id/firefox-112.0b6.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha256 = "46146a6c4fcd09e091202a20b4a352bbc9dacb84d7459a40079f7b95681d6ad2"; + sha256 = "558c1d87e938084462a118e1991d1d7e1e21cc4f046a9ff41a87bf1d5f883bd1"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-x86_64/is/firefox-112.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b6/linux-x86_64/is/firefox-112.0b6.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha256 = "ff47754b70642cc10c151015f67465b4e334945a9d1861f194da6a0ffbd3a549"; + sha256 = "0cfa8d0c8f797266c6fcc8bf31d559d1c107c0e9a9c2e255ad41169496f25f44"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-x86_64/it/firefox-112.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b6/linux-x86_64/it/firefox-112.0b6.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha256 = "e67c8c532ddd34cb1dd1195e116e87af8cabae73e4c734614cc8605cf0c2670b"; + sha256 = "8e9b0088965dc9a12aa7147ce057b1ad5950d4e935764edf8075e7a954870c86"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-x86_64/ja/firefox-112.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b6/linux-x86_64/ja/firefox-112.0b6.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha256 = "022aee39de289422088628f9b71de28a3d9b994ad87f489c0f4491e7279106bb"; + sha256 = "37055a2e0dbcb2ae5daf068b1665a18a69623e0f16e3ae3e92bc1cbd763c4eac"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-x86_64/ka/firefox-112.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b6/linux-x86_64/ka/firefox-112.0b6.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha256 = "05ee2bf3ee4c90f879b4410ada592c9feb53df9129df23f711896a5fd9e1d349"; + sha256 = "32ce3679cfd4496c2b15726e526589f88cf32be1c67015d2e7b64cf25d482c90"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-x86_64/kab/firefox-112.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b6/linux-x86_64/kab/firefox-112.0b6.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha256 = "c50c4992077a7cec127be1c648d431a69bca9f135b247e8d17339716c35c6301"; + sha256 = "3c2f0bc4289872cc4af3fedec73f378f5bed1494725b5166ff0241ea7a1cfacc"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-x86_64/kk/firefox-112.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b6/linux-x86_64/kk/firefox-112.0b6.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha256 = "86bb3a893d3a93b54fb7c9de260fce58f33b7157d9ac67f8cf2e1206153d22b5"; + sha256 = "81b32893eac3bf5da780136b68f5bd8b7ff07d228f0745b2183275bd1d4c4cc8"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-x86_64/km/firefox-112.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b6/linux-x86_64/km/firefox-112.0b6.tar.bz2"; locale = "km"; arch = "linux-x86_64"; - sha256 = "a0b3a731be915fb4a60bd2fc665733bda240596f1a0560139fa2315343b61ece"; + sha256 = "d14299677c06c038c5065d2beb492ddc7589817e8da5f4ec18060ea2badcdf01"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-x86_64/kn/firefox-112.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b6/linux-x86_64/kn/firefox-112.0b6.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; - sha256 = "72a4374de710898854a360c8582c1395bf2956084c0cbaba550c1c0e3f9d6cf7"; + sha256 = "50ae16bbb02bd429052822d86a1a380782f4662ae3e422e609ab9dd0c49c7fd9"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-x86_64/ko/firefox-112.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b6/linux-x86_64/ko/firefox-112.0b6.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha256 = "dccf0da734efcd432d6b3a0f2355e076389abab2195124f47fd718484dc40bdf"; + sha256 = "6eece940c50c4140480c81ef8f0ce5c69e58056b522c6a0e6afbe365a670ac52"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-x86_64/lij/firefox-112.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b6/linux-x86_64/lij/firefox-112.0b6.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; - sha256 = "5f6be135e9246d5a866c89afab8cd0e97f57153073cb91d9171fc4710a08175e"; + sha256 = "b530e6c0ba7c339d2c9acdd09093d91c446078fcf3e206067d0ed3307d58e730"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-x86_64/lt/firefox-112.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b6/linux-x86_64/lt/firefox-112.0b6.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha256 = "cbe6953543c0d4ed357e963a4fa224bc93a4a6d7b5df3df6519c10427ea0e296"; + sha256 = "4c80c748503e6dd3610a16a1c5aa659ccd7c87e36995dc4dc8d6866f94bb0c63"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-x86_64/lv/firefox-112.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b6/linux-x86_64/lv/firefox-112.0b6.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha256 = "7aa9b425e18a65ea87a1ea8f9c53fdbd6c0cea6c1f8e1de969084a30d4fd3ae9"; + sha256 = "f6c9a2c64dcb1fbf5ed1926ec97c2f2d027f2293373570b144b8e848315b9932"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-x86_64/mk/firefox-112.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b6/linux-x86_64/mk/firefox-112.0b6.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; - sha256 = "149e4d575764ad523b63983b36eac28a0966a7c33b0e54e7e525e75f6cad8511"; + sha256 = "27e1ea632973fe0f033a867af5f640c9062c4a094374f06f7ed24920bbd90dac"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-x86_64/mr/firefox-112.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b6/linux-x86_64/mr/firefox-112.0b6.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; - sha256 = "7b89022dfa8ec90607844004a82f6c064b768f0ff26bf4bab96c0f46d0c45321"; + sha256 = "b800670eb9767d3fdc7c1f4eee3dcb114a643aeac04a7c46c6dcd1fd26d767b5"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-x86_64/ms/firefox-112.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b6/linux-x86_64/ms/firefox-112.0b6.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha256 = "efd9c123189f5cba21a1177f245403bd0b40acfef72a8bf696be3221c87c06c2"; + sha256 = "bf48affb46b6f6b1ef28eda29b4ba4050c4d0386c07261181c5f1e46fa3ec682"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-x86_64/my/firefox-112.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b6/linux-x86_64/my/firefox-112.0b6.tar.bz2"; locale = "my"; arch = "linux-x86_64"; - sha256 = "7d644179700df173a9111c41f3de5863f5d7d72d0552d2fcd99bbfd129b9a3b1"; + sha256 = "eba976f190093299f0eda2b486a690400a52e81be037e8cd12afce94f8df97cb"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-x86_64/nb-NO/firefox-112.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b6/linux-x86_64/nb-NO/firefox-112.0b6.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha256 = "233080da37207e934405f033e397d32dee4897b10a96372eafaad1c7c7202b6c"; + sha256 = "28a5a231ef583e9e2a9a1275c386491f5a32de673d7d6f91ddc6f47dc183ce16"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-x86_64/ne-NP/firefox-112.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b6/linux-x86_64/ne-NP/firefox-112.0b6.tar.bz2"; locale = "ne-NP"; arch = "linux-x86_64"; - sha256 = "df8970e2b5cc7f96f3cbc22ea55d88919737478e1984ff651dc691577bbf27e9"; + sha256 = "7b504900c0b68be9b63bc08d8a148fb237eb65900b152a687639ccd32fe43c2d"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-x86_64/nl/firefox-112.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b6/linux-x86_64/nl/firefox-112.0b6.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha256 = "4c36621ccfe5532781bccf8c4b75889db028b4926f955f2f6f69ecea586c0f74"; + sha256 = "30ecc6272f59d3db4018b131efbcb98ac9724c4c8f6d48309c488113d658b206"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-x86_64/nn-NO/firefox-112.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b6/linux-x86_64/nn-NO/firefox-112.0b6.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha256 = "fb08d40b78af79860daa81c061405375ea119a382abf428c62da5a2688de38aa"; + sha256 = "e483a0f44f631a4f01c62ec4e31fcbf10e9b5de86aad0470ed46792c263078d5"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-x86_64/oc/firefox-112.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b6/linux-x86_64/oc/firefox-112.0b6.tar.bz2"; locale = "oc"; arch = "linux-x86_64"; - sha256 = "28c50833f976fcd589e842a85e1befdc9272703491bb224048d7ff7ff9c6a83f"; + sha256 = "6df8c4f8cd34074e2e86de468a785ac00bc2d8fceb2bc9d62ff1b083ceee04f6"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-x86_64/pa-IN/firefox-112.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b6/linux-x86_64/pa-IN/firefox-112.0b6.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha256 = "e494e1b1e3c2a7847bd45305f98afe3427ba33145f85890ba01664cd383e4590"; + sha256 = "6fc85246861bc852f413d1c4ee42784f7969df13504ce54a3c570c47e1741844"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-x86_64/pl/firefox-112.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b6/linux-x86_64/pl/firefox-112.0b6.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha256 = "46aa243e6466aad2cf4c9caee954cd420dd5ad095581574d7692f92b7feee57b"; + sha256 = "814a0bfef6e077f86c8d142b0fef2e1017836dbba4bd9247cd13325a6f88ca89"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-x86_64/pt-BR/firefox-112.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b6/linux-x86_64/pt-BR/firefox-112.0b6.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha256 = "e30ce279396acf88a40ae40ac6831ca3a85d6a1051bc3554b51e8a3285d350ad"; + sha256 = "02442f1b2de00105fc6dcaa46a040b48446b671e5b8129f51ee600ee0f122e76"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-x86_64/pt-PT/firefox-112.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b6/linux-x86_64/pt-PT/firefox-112.0b6.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha256 = "1dbd434d60463d59779a4aea948b7fd694f9c0eeb13d62531c3259b45190018f"; + sha256 = "f48a79caa82e3b307e3a3de7bb4a883a662db6f2ac9f44172e0d9e3ad4d71ba4"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-x86_64/rm/firefox-112.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b6/linux-x86_64/rm/firefox-112.0b6.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha256 = "5740e389e978ee285273fb24d12f5fb23b40741c429eecfe44b91f82d27ae414"; + sha256 = "99fc942cd487d122433ffa64645d9187fbf42c10f4415fa8c0616d52f6d065f2"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-x86_64/ro/firefox-112.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b6/linux-x86_64/ro/firefox-112.0b6.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha256 = "6c77aed73265b6c74cfc2f8126277c806b2d4f9629cbebcab15ddeae697c5477"; + sha256 = "5168fc51d066e5a576c1ad3392259b45ab4f8eb14c66461dc2a9e7721ce1f000"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-x86_64/ru/firefox-112.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b6/linux-x86_64/ru/firefox-112.0b6.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha256 = "0b8b9125a9dd6cbbf76e8f1b060ccbbfbae123b537d427a8ec608fef87effa98"; + sha256 = "2de9e8d22b3e60c5cc700c481fc7228097680076eb636a188c507086c81b236f"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-x86_64/sc/firefox-112.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b6/linux-x86_64/sc/firefox-112.0b6.tar.bz2"; locale = "sc"; arch = "linux-x86_64"; - sha256 = "08780b4d08bfcfbcb260019e55ceffdce03819e3c50b26f8b0260a854a3f178e"; + sha256 = "563ebfaea00c3e25b753e77e10fb3ba1132396996a2ec5744093b72398973722"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-x86_64/sco/firefox-112.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b6/linux-x86_64/sco/firefox-112.0b6.tar.bz2"; locale = "sco"; arch = "linux-x86_64"; - sha256 = "f76f8d4975a5803ae59ed8d7429914d0a67782f3c6ebe8de74c21c9b3dc422f7"; + sha256 = "c643b62d62ed158a41e6aeacb533795e1c3774d207afbe8a95488bca91742eb5"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-x86_64/si/firefox-112.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b6/linux-x86_64/si/firefox-112.0b6.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha256 = "3ddec5b1eda9ff9dadfa28274b237db1e070bba7602445d0659e56b4d83f5c32"; + sha256 = "6a82759501c7a6da27df5dd3e998e514a459d35139cb17648249599f3c521722"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-x86_64/sk/firefox-112.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b6/linux-x86_64/sk/firefox-112.0b6.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha256 = "7ba092acc5e90f2f0978e3d462946e647e1cfb20fa076f071668ad7e9a575dfe"; + sha256 = "2dd5c7c2743dd8018f46594c4ab7ade8b76e94b88f13ada5874722a88c48f72a"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-x86_64/sl/firefox-112.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b6/linux-x86_64/sl/firefox-112.0b6.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha256 = "dbeea39152cfd7515830d7e4a543d6c7bf91768ae39035cf817b2e919c1cc9be"; + sha256 = "7f5ea08a2978b7fdb148c515c213183217deb9f23c2bcd9fcff07ef0d58c5228"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-x86_64/son/firefox-112.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b6/linux-x86_64/son/firefox-112.0b6.tar.bz2"; locale = "son"; arch = "linux-x86_64"; - sha256 = "c3b4392bdd6eaf3f7cb4abd769a2389ffd9605b80b52a99a6084973a9c9eed16"; + sha256 = "ce987ec89797e07c51d0b96346243826d08a52365511e8671b3a2d1f8b0a57e1"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-x86_64/sq/firefox-112.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b6/linux-x86_64/sq/firefox-112.0b6.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha256 = "372d6f5232a746679a3773ba3ee74762427f9b529f9bb681c8359dd0d5adb6c1"; + sha256 = "c5062fc67d51dd29df304b5ee381ddaad4fa62fa92a7b1ae5278671e95c2314a"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-x86_64/sr/firefox-112.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b6/linux-x86_64/sr/firefox-112.0b6.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha256 = "edf3164ba81dae459415f8c41f0fac09372080d3fe413eb282789d3026db8f83"; + sha256 = "6fc309a7a2412e7822d7017ba2fee5f1cc5dec9d8021f0ae4cf9101a2c4dadd9"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-x86_64/sv-SE/firefox-112.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b6/linux-x86_64/sv-SE/firefox-112.0b6.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha256 = "6a5da09f8f5dff0cd147af8b45c341f301b1716b9eebb0cc7bc348124c5fb242"; + sha256 = "c0794112545d72c57a98398d984ec88ce465559e7648cd835fb8df2944eec376"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-x86_64/szl/firefox-112.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b6/linux-x86_64/szl/firefox-112.0b6.tar.bz2"; locale = "szl"; arch = "linux-x86_64"; - sha256 = "df07280e6be3573342c5421de2e7137e63fbe691590ab9cc442e63827803dcd8"; + sha256 = "e1e134dd0e9bfbdf06b2348bab4020e904fc50c3792738cee479562ed1093fc6"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-x86_64/ta/firefox-112.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b6/linux-x86_64/ta/firefox-112.0b6.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; - sha256 = "44d8ad4cd0dfccef357ef7b2d212a913cafc0433f2aa9a3672fd1df1e2a72c98"; + sha256 = "2cb9caa865ed321016cefb2d69c304b57a5346bc19f491163e6f7750719f3788"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-x86_64/te/firefox-112.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b6/linux-x86_64/te/firefox-112.0b6.tar.bz2"; locale = "te"; arch = "linux-x86_64"; - sha256 = "70488686b28265481ddb882ea66ae03309828353a04123d46e33e19edb0f4c60"; + sha256 = "8bd811c257f9dea90ecb67a681ebe38c8e822c99a3a131008009570db5812b81"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-x86_64/th/firefox-112.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b6/linux-x86_64/th/firefox-112.0b6.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha256 = "70d3bf27c80954553b88fbdb486b310c19726e5953e91edd159e61fda76de6fc"; + sha256 = "968c068773476365ef0649b39354f46b4391d5adcc75ec7dedcdaf24bc9c3fac"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-x86_64/tl/firefox-112.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b6/linux-x86_64/tl/firefox-112.0b6.tar.bz2"; locale = "tl"; arch = "linux-x86_64"; - sha256 = "3126646299c67c74a59801c694e48e5f5402b14a636b4917253259967edbfce3"; + sha256 = "f62b4e88589a4bd66a29881e0f296bda9458616c922c9f727e37486703ee4103"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-x86_64/tr/firefox-112.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b6/linux-x86_64/tr/firefox-112.0b6.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha256 = "2ea8edfff3d4fc495e37d108cd5c8f7d003b929f82d065936a80e6daf4fc7d99"; + sha256 = "bbc7c06f87d6c7a2de53182f8584ccf74298af1ad64013e6c6915df90e26cb47"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-x86_64/trs/firefox-112.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b6/linux-x86_64/trs/firefox-112.0b6.tar.bz2"; locale = "trs"; arch = "linux-x86_64"; - sha256 = "fb29e43f65dbf2a550c5d25a170be28a05e96a1f4e3e735835be8db111220b06"; + sha256 = "18370b2ffb2b584c664c687ef716af4a0eeddb6851790ad2fb67dff393c85f88"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-x86_64/uk/firefox-112.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b6/linux-x86_64/uk/firefox-112.0b6.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha256 = "7a3111f74b3bc9333ebd2ce2db0c1d34c55196710bfe628be37924636feccf3e"; + sha256 = "196fc861eea70145835f93e7111e4453a42d16b1f243bb4ffcf1234f305d0c8c"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-x86_64/ur/firefox-112.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b6/linux-x86_64/ur/firefox-112.0b6.tar.bz2"; locale = "ur"; arch = "linux-x86_64"; - sha256 = "dcd147e968ce2a97d36a3c2cc8b6c8c224e1f548623c30febf301d1870924315"; + sha256 = "0725751ea0f6f7fbe0f4e104ae7a9ad5957b9185c29d3955a9d0d30f3c09e06a"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-x86_64/uz/firefox-112.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b6/linux-x86_64/uz/firefox-112.0b6.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha256 = "9421f0b5848d2f15954539d59ae5ec92c4206abb48e608ed26dc5a5c55346b61"; + sha256 = "c9a139b876bbd13eef0e51316c07264aa7b2e1405b7e9b2bc5992cb954cd5975"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-x86_64/vi/firefox-112.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b6/linux-x86_64/vi/firefox-112.0b6.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha256 = "f3b4f54631e37488ed3444058eed40d060c82eeb67f423ba8a3d500dbfa4ad8f"; + sha256 = "73d827171ce290803434b0763efb9d93ce44089823f6dead23cd11cfb48b7dda"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-x86_64/xh/firefox-112.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b6/linux-x86_64/xh/firefox-112.0b6.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; - sha256 = "ec40e4e8f37f561f8a49a014ef538e7e8d3b78dfa526657cc64f8784ee1f945a"; + sha256 = "3ff3c8f0f0d2cb18da7b8f110499491a8d5d285eb2cf52d38898706a03104dad"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-x86_64/zh-CN/firefox-112.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b6/linux-x86_64/zh-CN/firefox-112.0b6.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha256 = "c4f780ebe92916044c71c48cb58e7dc10c08ff0ad7446d01a3ec5fdbf6c04e70"; + sha256 = "74c30b59b36560a275f89ae666c9f4d8ab41fb6dfe9c3176a993b85f6eb03f2a"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-x86_64/zh-TW/firefox-112.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b6/linux-x86_64/zh-TW/firefox-112.0b6.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha256 = "7556349dda4963f88d79a58de2fd2d557411997485bb16dacd90be297c58769d"; + sha256 = "97d25ac61d9a85a00c2cd8ed4d5d47f2e3f4c5c1a46ca036cc79a0cd2eb955da"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-i686/ach/firefox-112.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b6/linux-i686/ach/firefox-112.0b6.tar.bz2"; locale = "ach"; arch = "linux-i686"; - sha256 = "8c8d1a43cbb010798570dca68fea1502a8d9ec0711bf3c69c2ddd173a3538317"; + sha256 = "19776a30548215f780e8013709cddbf77a92810e66847ef38a8e29e81221e50f"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-i686/af/firefox-112.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b6/linux-i686/af/firefox-112.0b6.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha256 = "7c89e0f7270caf1ef3a69c5514da97cce715f4e3a52ee545ef5aa78cf03dd55c"; + sha256 = "2a575a6f8348e0e0084373f80197cbf78fddba5716b51926e9d2b707a7c64149"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-i686/an/firefox-112.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b6/linux-i686/an/firefox-112.0b6.tar.bz2"; locale = "an"; arch = "linux-i686"; - sha256 = "355596b7006d114efc0a1c75cde51d01cfda3dfa06bd59fc0dd9ce036a54b77b"; + sha256 = "580a30e4e45bcacada0c42e7f4461df118bedcb3bef3dc32d78030025b4a1e6f"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-i686/ar/firefox-112.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b6/linux-i686/ar/firefox-112.0b6.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha256 = "c43c434a8f090343dd718d3549860ca6056ea75cd0a805eb74ac44a7475717ce"; + sha256 = "705dff2e9135a5db4260f16f1d4b94a01d2aba642049d5dc38c0b60c4bff0fc4"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-i686/ast/firefox-112.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b6/linux-i686/ast/firefox-112.0b6.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha256 = "c64aca4b338c1633fb0e64f1c5992121dc29908c34d776aa569ebf58fed065fb"; + sha256 = "30ef9890c33ec4f4c4b5a8c41ebcca3db93a20f24a61523b8446d4d89746a507"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-i686/az/firefox-112.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b6/linux-i686/az/firefox-112.0b6.tar.bz2"; locale = "az"; arch = "linux-i686"; - sha256 = "0370b48bd8b3c7f27fa6cc715acfdb0f8d065aaaac00c15250a47bdf7d481faa"; + sha256 = "7f679b6e47afeec3e5bf85ae2c3235e4962e36b751cf1a6fd67c0c822e20065b"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-i686/be/firefox-112.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b6/linux-i686/be/firefox-112.0b6.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha256 = "c12a416339347b843990068f016d1fe199efecffeb57c4555f2fbbe71d6e37d0"; + sha256 = "ee9f99eee4460cb0862f6dc647cc494ffe28f11ed2999f005097510487eb165c"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-i686/bg/firefox-112.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b6/linux-i686/bg/firefox-112.0b6.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha256 = "d0587424301145187f35ce7474485517e9440f3e4c5e92eb3565a97c39c42d1a"; + sha256 = "f73d2142887d3a4ebc1c98b8482901039f5073bb6f07ee190753b7b892adf47d"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-i686/bn/firefox-112.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b6/linux-i686/bn/firefox-112.0b6.tar.bz2"; locale = "bn"; arch = "linux-i686"; - sha256 = "68cd8fb4716dcb2a10b5c332c10d1f8c47ec79b0fc344275b3ac23086cb0b89a"; + sha256 = "e6a255f95e9bed6295c03383eb5b32930a7600529abd885c912638fc2c33ea33"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-i686/br/firefox-112.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b6/linux-i686/br/firefox-112.0b6.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha256 = "7386b53e5c4eabc0f1ac191b6a93acca5b3fb38ce0f5006a0e94f3050d790281"; + sha256 = "a14a44af3576aae7ada0fe14856219803d7d2a025702430418e9ed46e62acd85"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-i686/bs/firefox-112.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b6/linux-i686/bs/firefox-112.0b6.tar.bz2"; locale = "bs"; arch = "linux-i686"; - sha256 = "40686fd813e59c155ca4b08c9bf138be20ec655efdeeea9201f78f7b11615422"; + sha256 = "62a797df2f195d1fc3a402a55acef10c0e3aaeaa7c8dabdecf6ca41d3094a442"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-i686/ca-valencia/firefox-112.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b6/linux-i686/ca-valencia/firefox-112.0b6.tar.bz2"; locale = "ca-valencia"; arch = "linux-i686"; - sha256 = "b16cd0d27edd8a3477bea72326e9104734c276602b94299b58acdeba10ed1620"; + sha256 = "91d512c997715a15d4b02f59668587e8fce15dac958719c556abd452d82a3327"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-i686/ca/firefox-112.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b6/linux-i686/ca/firefox-112.0b6.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha256 = "f0e81d340f00c1ded4df4d0967c1183d4ef18c8f3864fdb520ffa32cec2fabfe"; + sha256 = "f302ccd5ad1ef1f4611fe4a8fcd9f9af14e5cb803c515419c464dbe41fe61b7c"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-i686/cak/firefox-112.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b6/linux-i686/cak/firefox-112.0b6.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha256 = "d6c1545923f780491c3b4d6789b55303c107c533375ffb04401781be56e7315f"; + sha256 = "05ea38ce95db95c44cb29cc72865f578d71353756a344d7e168bbed0796253f4"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-i686/cs/firefox-112.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b6/linux-i686/cs/firefox-112.0b6.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha256 = "5af2de24992583982afbb684c9c6e58a4d98eb35ee89d6cad6e9bd18bbecb470"; + sha256 = "dd74c98db61d4adaaa89262438430841501815adcf285fddb8b86456ead1284f"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-i686/cy/firefox-112.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b6/linux-i686/cy/firefox-112.0b6.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha256 = "3aa0dfa96a072c9a2a333666e419e000ab36861058b1cbce6abc11d935fa03be"; + sha256 = "56337dacca8929d3c65b188c56c333d0cf874cba2df89cf7b530853ffa6f1e19"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-i686/da/firefox-112.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b6/linux-i686/da/firefox-112.0b6.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha256 = "6998603e2c5524c38b7b89bec452fc658956b55561c94fc4b0fe08691ec978e3"; + sha256 = "c7a86a7c2bd94cbced67eb151a102c9e59b86c623a5df86a6ea8e936ceca4074"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-i686/de/firefox-112.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b6/linux-i686/de/firefox-112.0b6.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha256 = "d5b59dc00dc63ad988c9db7f770e31f9e5ea68fb15db894dd3fe90d78797932a"; + sha256 = "2a9417463238e4cade10ba64dc8677410dcb8ac1d0917e715f059060e52d6fb3"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-i686/dsb/firefox-112.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b6/linux-i686/dsb/firefox-112.0b6.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha256 = "526ac2c06239a7176422bf37757be3117a3b349e3f2c97c379ed797596047b54"; + sha256 = "70b660be2e0bed4a05cc0ee8adc2becd6583b835a9486228febd8905cca63ff9"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-i686/el/firefox-112.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b6/linux-i686/el/firefox-112.0b6.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha256 = "9af390e46e28c9a5e3ab3646a04363ae618303d11bdb1661c0d1e5413e5c5b87"; + sha256 = "604183c159eab56032cd1a9ed45f9f63e9054eb860429e4d5e49159d8b422e18"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-i686/en-CA/firefox-112.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b6/linux-i686/en-CA/firefox-112.0b6.tar.bz2"; locale = "en-CA"; arch = "linux-i686"; - sha256 = "bb012f07f4e13d95d1ab24bebc9c655dabcf5a3d03e2cce578402cbf9274eb2a"; + sha256 = "979e3e37d25202601c2123f2175bf65c96111154e338c59780b8ba3afb018390"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-i686/en-GB/firefox-112.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b6/linux-i686/en-GB/firefox-112.0b6.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha256 = "943f1fe86afa3c0f7ae8d348fc7c80e08a57d5117d1eb4c848b7ca3b75214e1d"; + sha256 = "5b3a8d845970563c991053327e4951f0b44d4e0ac2e96ef060dca757ba7dadf6"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-i686/en-US/firefox-112.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b6/linux-i686/en-US/firefox-112.0b6.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha256 = "ef7b243ce04c41fd438b20522f7f90f47b903c513812606945cf9326ed183cb1"; + sha256 = "9349b8674173490d9886e2c3c31a72041da819021d1bd3f7eb85cd62f66468c9"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-i686/eo/firefox-112.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b6/linux-i686/eo/firefox-112.0b6.tar.bz2"; locale = "eo"; arch = "linux-i686"; - sha256 = "3e058915748fa0f50b1b439d5d933ef79f98cc6ff6112fe9a3ea0f9ff34f868f"; + sha256 = "5a7d10519cb3744f558605a4090fb2b3994cd5694f3210f5b0fcb1c82ba206b8"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-i686/es-AR/firefox-112.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b6/linux-i686/es-AR/firefox-112.0b6.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha256 = "e90bfaaa61c2569ecd6090f151cdbf9c2765ef6fe79ec301f23609ee0006f91c"; + sha256 = "e4bf9dc36cc77e6581c2eeded1915138e944cf113f7b733bf3f3323c6d954d50"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-i686/es-CL/firefox-112.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b6/linux-i686/es-CL/firefox-112.0b6.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; - sha256 = "9c0a842c4ad9915e2ae03358277dd60e7935c736b1dd04c66795fa99c90a3dfc"; + sha256 = "93b4d67bfc8d8d6fbaa49b2973f4ab3f46d7f7dcecf4b4f4e44265c528145e76"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-i686/es-ES/firefox-112.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b6/linux-i686/es-ES/firefox-112.0b6.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha256 = "8f37a758563eddf6f397785c79bd9233f4dd19a9830562ea821e64123c31cb64"; + sha256 = "3ee2c2475362ec2a4da4e5870676bece65a43f3b55a0d61dddb3c9875ab6ee31"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-i686/es-MX/firefox-112.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b6/linux-i686/es-MX/firefox-112.0b6.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha256 = "547f4f9ffce5a7ea5ceabc4ba402eb42ec0ce539e5bd4e51374f2dae17ca7949"; + sha256 = "62e6ae0e8636ae43d0151fa549cf62c87cbc472ed9cd6f5783b8d4b76fb76996"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-i686/et/firefox-112.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b6/linux-i686/et/firefox-112.0b6.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha256 = "eff697113a52e31069e4961354eaafe78972dff7a68737fb6153a42780265c43"; + sha256 = "0a9bd46034f708195466c4002efec47e0a6316f31c3131a50f1cb6a31727b061"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-i686/eu/firefox-112.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b6/linux-i686/eu/firefox-112.0b6.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha256 = "b9f9aa5538b44f8365276f54f75bcee5725f915f1d57c2816b09254b8fd1d07e"; + sha256 = "334dc2222832a40d8bdfb831544300662be6c8ad650782a417e40d211bb7156c"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-i686/fa/firefox-112.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b6/linux-i686/fa/firefox-112.0b6.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha256 = "a48b03b41e7fe9f75b8b596ced9fa45c1f6fd709d67413691b93c53193156e75"; + sha256 = "a1cb40d0e0cc30e6430a2b24c33fa8721a82a0724d52098048d659d8f4b4aa27"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-i686/ff/firefox-112.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b6/linux-i686/ff/firefox-112.0b6.tar.bz2"; locale = "ff"; arch = "linux-i686"; - sha256 = "03b86fe75130b180be97340616f9a5995bcb5e81d9900912fa9a324e0d409182"; + sha256 = "a687a279ae9b75d48b030458cf6ee82601f5da63fa3f1a856dfd03c9c185a371"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-i686/fi/firefox-112.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b6/linux-i686/fi/firefox-112.0b6.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha256 = "e9c3a886e6491d23631f724058d9d435cc9c0e60de3cb5b33ea3acfa8babb0ce"; + sha256 = "26c51b6966c6a1042baaeed143e242f47692bab7caab22037240d6f52d3e48a5"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-i686/fr/firefox-112.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b6/linux-i686/fr/firefox-112.0b6.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha256 = "dcb7513622428d5c91f32667a055e61072fe0d5039545bc683194b36d6bb49a3"; + sha256 = "6d75a816c793be15a3747cc550317abf443f9a348ca049769ca84ce9e09e46d9"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-i686/fur/firefox-112.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b6/linux-i686/fur/firefox-112.0b6.tar.bz2"; locale = "fur"; arch = "linux-i686"; - sha256 = "33fdd12569cf1b8eec60ded795559286e7cfa41b2db58bfd9c7f4887000a6b82"; + sha256 = "1b6093306c6d8b5c4158c9b93fa95eeba5bc5a683ca25a126c95bde31ca97e16"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-i686/fy-NL/firefox-112.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b6/linux-i686/fy-NL/firefox-112.0b6.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha256 = "d95f0bc82184d007d55de86caaf84ac442ba56c840b6798dcfd5b8cc2854c4e6"; + sha256 = "e5edfba6e09a677a8ac5d7e482a26210c9c34c35ddf18d558aa26428b6a1f29f"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-i686/ga-IE/firefox-112.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b6/linux-i686/ga-IE/firefox-112.0b6.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha256 = "48d23034a37bdd46385b9974eaa4569c080b4a873e00e33be0abcc8e945e1f42"; + sha256 = "4e8e0584ed9246be2d41eda90852a202f259ee041a239f6005f37eb2127e0d6e"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-i686/gd/firefox-112.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b6/linux-i686/gd/firefox-112.0b6.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha256 = "b1facf79a7b6fc22d75307954dbb189a72644ee665a2d8dba1706b5421c6e96b"; + sha256 = "9dca713182c1a40859a648da50ab2b9d69fb3c213b34e7ef7ce328c0f2b04556"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-i686/gl/firefox-112.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b6/linux-i686/gl/firefox-112.0b6.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha256 = "769315eb7186ef37227a43a96ee2a67634d9020f47fef673de9dafa66a2d7436"; + sha256 = "4a551695702b3cdff799390e783b0924432af243e5a546e183772de555874e47"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-i686/gn/firefox-112.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b6/linux-i686/gn/firefox-112.0b6.tar.bz2"; locale = "gn"; arch = "linux-i686"; - sha256 = "fb48fe024c20a025084fbe6f261f756b2b609b72ffc59e9645b0bb88ccc00746"; + sha256 = "9e0130b8d9b093afb1896c3a70ee26d94bb8f486b449edb4774cdfaba0783201"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-i686/gu-IN/firefox-112.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b6/linux-i686/gu-IN/firefox-112.0b6.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; - sha256 = "f5854e070c36bd433025d60c28ddcfd3ae73dd7f4787198dafb6b1e917cb3975"; + sha256 = "dab88118d1ab466c7726a1789381614fa21dc829aa6ce65ab57f8caf8079c065"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-i686/he/firefox-112.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b6/linux-i686/he/firefox-112.0b6.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha256 = "b71d3776631872e549ac310638b51828c8b1b7a600943c73d65b5e9121e10b9e"; + sha256 = "4b7debe735b5b8aef668cf586be61a39e964d7990047deece2ba90f058917746"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-i686/hi-IN/firefox-112.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b6/linux-i686/hi-IN/firefox-112.0b6.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; - sha256 = "61cb5d112085b4185ba21ce1277aebb43701970404a632cd255d2b010a8ca5dd"; + sha256 = "2e166358b50df0ebbf3c37a4fcfdb12c11d37c6ccdf215a1fa75b6abf6022a92"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-i686/hr/firefox-112.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b6/linux-i686/hr/firefox-112.0b6.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha256 = "0b3151de29c64199f4be91dd499f4e5b142dc5832fce7465b5ac709b103d2c06"; + sha256 = "550c33b0c45f69b8bcc90ab2f79b40ed63e65e9c93a16c6457838c3a1437c852"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-i686/hsb/firefox-112.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b6/linux-i686/hsb/firefox-112.0b6.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha256 = "7935f0cddb2f8d79fb3295b286a5ac8a62f5dfe54b72aafa7ed4d90cd09e7e81"; + sha256 = "cbf4ab6aa4789bcd2e2eefb49285ef557148af04b9b80a7e705f8477c475b1c1"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-i686/hu/firefox-112.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b6/linux-i686/hu/firefox-112.0b6.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha256 = "ef39a9bd38c4e697b2acfc385e4f4b6bf64ee5196530a1f96d922a80f5e96811"; + sha256 = "b62c4ad1bb3e4ced77ee7f37685206974302598d9bd3e4fe5bb8d6631404896c"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-i686/hy-AM/firefox-112.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b6/linux-i686/hy-AM/firefox-112.0b6.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha256 = "e4a35e4eb59270c98784fd5956d7576703b8d6f374e63ff99f859b4618a0e957"; + sha256 = "3348e171f9457adc872272f420e3c657532220a8b562f4baf55731944a36e9db"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-i686/ia/firefox-112.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b6/linux-i686/ia/firefox-112.0b6.tar.bz2"; locale = "ia"; arch = "linux-i686"; - sha256 = "f9f6c8df9633b5b04212ca108115b32b7b7d670e105e5eabf971ab6c87ade854"; + sha256 = "6ce221f1bdf3d0af0d149ff6ad630ae79e165a3e56d1157d12bd0530a669a635"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-i686/id/firefox-112.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b6/linux-i686/id/firefox-112.0b6.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha256 = "fea802d675e2ccd2b389e81d3ef2766fa3083ece7a68450f33914421fe8081b5"; + sha256 = "f35d99e6410bc31c9bcb87f96aceb0c303223b57f5640e2bd950ae2dacc8432d"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-i686/is/firefox-112.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b6/linux-i686/is/firefox-112.0b6.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha256 = "e2a5ea9a8cfe0d769c9b61f5a452e144973017c2e65d6ad03e190413c04a2430"; + sha256 = "456cde1dccb24c86e9ea049f1fd0d2b939307aa519f70761b90f9edb3cc3c103"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-i686/it/firefox-112.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b6/linux-i686/it/firefox-112.0b6.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha256 = "211864798e0ff9fb06f10fe9e0c36ab5617ef5447cf24d03b5127f3a456a6249"; + sha256 = "0cb75b4dfcd9d75673eeffe0d779cc4ea8762d97e9feea2e49d3908f63726b60"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-i686/ja/firefox-112.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b6/linux-i686/ja/firefox-112.0b6.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha256 = "ad7dba75cc991240315eabd9c99a3d643c8cc9d403f679162961be5c7f9da198"; + sha256 = "278dd545a883088cad75b13225ecf639c6799ab198c0c3791e8bca5c92d2d177"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-i686/ka/firefox-112.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b6/linux-i686/ka/firefox-112.0b6.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha256 = "9a27a1b23da7c17881466ee52f0fd55de6069fbac45721e74c575a65d39924c5"; + sha256 = "ac969431f2807db57035faa6722cd124838a128e3f21011e98e95f6dcb57ad22"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-i686/kab/firefox-112.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b6/linux-i686/kab/firefox-112.0b6.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha256 = "f9b89268fb6cea643117779d845ca607de48b680c8331123ff9a2213a49c6aab"; + sha256 = "ff59f7d076f1410274bb627778b3ea672c47c576585f24aaf259eaf9329dea92"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-i686/kk/firefox-112.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b6/linux-i686/kk/firefox-112.0b6.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha256 = "b3995abef49360a373e73d612683a9de37df9da3172f754855977b2a350f02c2"; + sha256 = "3a4b1a95db17b68cd39da5c1cff17c4af616b45f754403a8ca7e26745cca447f"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-i686/km/firefox-112.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b6/linux-i686/km/firefox-112.0b6.tar.bz2"; locale = "km"; arch = "linux-i686"; - sha256 = "b113f611be572fad8d707ef089d1113a840f47341960b0180ce8c8d958c0fac1"; + sha256 = "5626087484f861a701387858f77852e7c89e86d65fb0826f256f59a94f45d791"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-i686/kn/firefox-112.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b6/linux-i686/kn/firefox-112.0b6.tar.bz2"; locale = "kn"; arch = "linux-i686"; - sha256 = "43376fca7535feb95e083abf2cd695d452cb7c3d9e5136d617340f37bfd695e1"; + sha256 = "56d4e7875ad5a4aa3b4eaf48aa6dd9df6311b78fdc5c7d3bd6cd3a425c203974"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-i686/ko/firefox-112.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b6/linux-i686/ko/firefox-112.0b6.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha256 = "cab18f93e0ca6b56d5bbd269e33fc80e16e8048a359d81d6e272582c6c6e9a76"; + sha256 = "f9c93dcf09240788b0ca138c77ea3aa1f6c0aec58920be3fd4040e127e69ddaf"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-i686/lij/firefox-112.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b6/linux-i686/lij/firefox-112.0b6.tar.bz2"; locale = "lij"; arch = "linux-i686"; - sha256 = "69c0416f559a64bb806ae7e3eca236ec13621cb8ab634e1aea901fdcb80180d6"; + sha256 = "e038a14c85ea3937ec770364449cc595257264f05f1cc6b8cdb143f66a891aee"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-i686/lt/firefox-112.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b6/linux-i686/lt/firefox-112.0b6.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha256 = "ab662f5812d14e544255c1e708b9c1961ad6d9d37de25986aa4069beb568d9a2"; + sha256 = "5a47ee907197e21f2a7c8e13c22e6e01aa336c1adb608ba99a85e10f83058b94"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-i686/lv/firefox-112.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b6/linux-i686/lv/firefox-112.0b6.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha256 = "39ba8132bb0178ebf707115a2a3c6a6eb2bcda82a3132a21ca8f8fc77f861312"; + sha256 = "dd97002a88bdeb2de908dace8f67b9240589e22f29d8a39ba3062aa07c925980"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-i686/mk/firefox-112.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b6/linux-i686/mk/firefox-112.0b6.tar.bz2"; locale = "mk"; arch = "linux-i686"; - sha256 = "124b53c31c874fb32f7f006dd48332d44bb9a139947e52952eeb484d17247ddb"; + sha256 = "685647a2951a1684c71fe9179f49442cf8e14b26a137d8cce4eea7beec7e3839"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-i686/mr/firefox-112.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b6/linux-i686/mr/firefox-112.0b6.tar.bz2"; locale = "mr"; arch = "linux-i686"; - sha256 = "58e7e6b526f00187cad5e032323c39d4efd58a9fd8e2e0a6ca46eca4f45e1c6f"; + sha256 = "1033c1f9dbd85640256c130331706867ed9f8bdffa5545212040712fac5e8d62"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-i686/ms/firefox-112.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b6/linux-i686/ms/firefox-112.0b6.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha256 = "fe19152b27b2ad3ba6bcaa127713a0a9191f7c81529ade02e48817f5f6cc12c4"; + sha256 = "d71844cbe97105e5bdf7c7a0b01c33dceb190c331526113f0efe114a163a2af9"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-i686/my/firefox-112.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b6/linux-i686/my/firefox-112.0b6.tar.bz2"; locale = "my"; arch = "linux-i686"; - sha256 = "6c39c38301d6e5d845c4a4ad34685d8017cb874665aba823e62cce651b388f56"; + sha256 = "4767bce810321d63d14a4b74a1e5387bca6f2181967fd2f06b03e0da849ef20c"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-i686/nb-NO/firefox-112.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b6/linux-i686/nb-NO/firefox-112.0b6.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha256 = "e297b652111781206672b3c6191897080c3d6dff63e74f7f62c6a0f4292a3389"; + sha256 = "45048e94308db389ac5c42745024320d6dfe054e11b7ddbcb826382883b040c2"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-i686/ne-NP/firefox-112.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b6/linux-i686/ne-NP/firefox-112.0b6.tar.bz2"; locale = "ne-NP"; arch = "linux-i686"; - sha256 = "9d25913a2e07c874ede15a3849b396586a32b614ef29087774f244c40a33225e"; + sha256 = "5dd376e2a9c23088cc729c1c729830f9d1c2cda3ae9ea79e13c0ff722638d070"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-i686/nl/firefox-112.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b6/linux-i686/nl/firefox-112.0b6.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha256 = "ed3398198b475c4c369a340dbdddb687bdd8b5e0c397e981b3f2489d6e575447"; + sha256 = "9a6dd57d5ab5ca98d229d7d4a851fe6f8fcd2a996914b8a23dafae8b8fc8fc17"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-i686/nn-NO/firefox-112.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b6/linux-i686/nn-NO/firefox-112.0b6.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha256 = "91376b1de28595e2050fc0c56024cc89ec4143b590c51612218c2a822860834d"; + sha256 = "f991770a8a2685acf994d3dd12ae82f3eec687bfc90e2708cb53ca73b392cecf"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-i686/oc/firefox-112.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b6/linux-i686/oc/firefox-112.0b6.tar.bz2"; locale = "oc"; arch = "linux-i686"; - sha256 = "4ef41fadb4b297b781c8a24fd64302e6e348b455101c5450d9b3011e3bf1d638"; + sha256 = "48981d0797793095954146806120e894472dcfd98396f8bba4328036ca43ea7f"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-i686/pa-IN/firefox-112.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b6/linux-i686/pa-IN/firefox-112.0b6.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha256 = "ca8122bcee87fc1384ea0ebebcf501e659987c58bd8a6a2a54f78681ca6df264"; + sha256 = "21b3fab3b57b512ce4699c18dbc3abcec7dc0b4cdba30ebcea0ec7c662ed2159"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-i686/pl/firefox-112.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b6/linux-i686/pl/firefox-112.0b6.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha256 = "6e9835f4ccf62810d4e9500f05bfe7b9be205b8103be642ded328bc85aa84c21"; + sha256 = "730232af1251d6b41b82b35fb21465a9d6af22d97654df0092a5070dd23d2f37"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-i686/pt-BR/firefox-112.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b6/linux-i686/pt-BR/firefox-112.0b6.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha256 = "e9dd785fd994226e747586ab38a2bc503760938180c0aec1e3966ac35776cf85"; + sha256 = "ad03de89aa51b401845a663887dc707880ad2abb63ff763103f6d17b4e8eeefa"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-i686/pt-PT/firefox-112.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b6/linux-i686/pt-PT/firefox-112.0b6.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha256 = "9f37f69dbdf6748da01c3fa9c581e44184091ac0ad85101da7d58f7115a3cdc4"; + sha256 = "b12b8c60458e366c975f88dfa3749ea43c2bd68486883b2bfe922541e4982f20"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-i686/rm/firefox-112.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b6/linux-i686/rm/firefox-112.0b6.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha256 = "752b66437a1684c36847ed36f65005e9ca4156b05c93dcadcb842370792ab252"; + sha256 = "899de725c2b8fa7652c79f1b4e816acb93a2f32602c6530988f83f06bac7d975"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-i686/ro/firefox-112.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b6/linux-i686/ro/firefox-112.0b6.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha256 = "3c5e8aed8dddf11964e3070d539377a82e63827ef1517553ae784565a0c241fc"; + sha256 = "025a050940b6388d791b9c3a08f6c5840615417ced4481cd11d7ef5c7e64f8ec"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-i686/ru/firefox-112.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b6/linux-i686/ru/firefox-112.0b6.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha256 = "b626cfce29b6bce883513057dc4571a489f5e0c392c7222e9853cac419923165"; + sha256 = "a35164120fa259bcc2c325aace7bee3b9a7d12c27ea7efd357c5ca35b3be1248"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-i686/sc/firefox-112.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b6/linux-i686/sc/firefox-112.0b6.tar.bz2"; locale = "sc"; arch = "linux-i686"; - sha256 = "d96abbf55494f33262ba3edf2552b96ba71defb0318a36118a8cbd26dd3ec4a0"; + sha256 = "383638b4d42846f7560f7ec9c7ad922048bd4a26d9c3ad970135f6c3c974cbbf"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-i686/sco/firefox-112.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b6/linux-i686/sco/firefox-112.0b6.tar.bz2"; locale = "sco"; arch = "linux-i686"; - sha256 = "b352cf61ef75da6f2ec0c8fd6a16e90aa72961a82ceb7a014dfcb0a9ba35277b"; + sha256 = "e8db341fad63d07e25a6df1833e7cec51be6dba50df1d9b56ca7723f275228f9"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-i686/si/firefox-112.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b6/linux-i686/si/firefox-112.0b6.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha256 = "a4ebfa843e140b8b7015fc6945dcc166211882662f00a6c4eb27d2334cb2fc97"; + sha256 = "5bbdcb123d8d7679838589353cccda6472cc656af103ca3fdcaad73b9e13d5a7"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-i686/sk/firefox-112.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b6/linux-i686/sk/firefox-112.0b6.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha256 = "83d58804619b82afc9431d048c16cd3738dfa75bf9d6e069b1f020a2b628df1a"; + sha256 = "f2eea2a25a651232fd2a6f7292ff4aecf198260e354b6835827f7c917fac740c"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-i686/sl/firefox-112.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b6/linux-i686/sl/firefox-112.0b6.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha256 = "1c36099781dc219b1cca5d9796f3df67f0a10412c7dc494f2a8cfb53e4668ee8"; + sha256 = "07fa7dbdfe3aec9222d77ed0bf5622262970c899559514ac1a802fdda5aeeb96"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-i686/son/firefox-112.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b6/linux-i686/son/firefox-112.0b6.tar.bz2"; locale = "son"; arch = "linux-i686"; - sha256 = "4f27373905fed3827c1b74ce3de095d435e4dcc9a163d40690e072cbe42141c5"; + sha256 = "a1b8ea0657a86a5bf6177b7367604f3090799c75a81e126ded4b172c2141f522"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-i686/sq/firefox-112.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b6/linux-i686/sq/firefox-112.0b6.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha256 = "5080273f3461bf27473fbd4d435d5efc50f6e15ed7cb382f000db313a4df49d7"; + sha256 = "e06ae973fd38b96bac35ab0bc9cf4b126309f91accc74d7a516212dfae9a60cc"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-i686/sr/firefox-112.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b6/linux-i686/sr/firefox-112.0b6.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha256 = "d8589c74b96f1a162d1d37c9e280216af7769cb7f08c151a530fa1d44bf6311b"; + sha256 = "7dd65f794705aa6a397327b9468b349bb91773022124b1aff0d3077bc1aa7855"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-i686/sv-SE/firefox-112.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b6/linux-i686/sv-SE/firefox-112.0b6.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha256 = "4026373c960ffc40beda3f9dd04b13d274d751247abe23631efe517b57ea23d8"; + sha256 = "0a21d28820d5412136805f036aa36264852b1633f950d7292f10231335545d0a"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-i686/szl/firefox-112.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b6/linux-i686/szl/firefox-112.0b6.tar.bz2"; locale = "szl"; arch = "linux-i686"; - sha256 = "697404cbd67c589db561ebc2261fe15af6f272609d17cc5ecd6c434d95cb55e1"; + sha256 = "4865191a0fed0a435ce6970e5a61683ce0482737cbf0619b58faae263f3b84b6"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-i686/ta/firefox-112.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b6/linux-i686/ta/firefox-112.0b6.tar.bz2"; locale = "ta"; arch = "linux-i686"; - sha256 = "187b26a699a3b7f4182433ba6a458420434137ae44fa662eb88e35d592de1dbf"; + sha256 = "6f77a1fe557eb3c31b588ad3da1656fb887f644a2732df958d04c7be072ec630"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-i686/te/firefox-112.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b6/linux-i686/te/firefox-112.0b6.tar.bz2"; locale = "te"; arch = "linux-i686"; - sha256 = "c21f404ae4626101fa63c7c5fb06a515ad76f5113196f8d5490adb1556808d80"; + sha256 = "5c00deefee9ba062189416083cf1c69d16df8afdce5d3bf24c164977c60018b5"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-i686/th/firefox-112.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b6/linux-i686/th/firefox-112.0b6.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha256 = "8623f5d172c3148faeb0e67ee22aed2586dba858b3c8283ad8f5a05ab32d493a"; + sha256 = "b07e63db0a6c4c93da04304305bc2ea5d98c1802102e644de11d9fa59210545c"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-i686/tl/firefox-112.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b6/linux-i686/tl/firefox-112.0b6.tar.bz2"; locale = "tl"; arch = "linux-i686"; - sha256 = "b5609b75505ca2a27839ec7519eb4f21f2d84f8eda89b6b76b958b73c7b5e5cd"; + sha256 = "8a251397d02cf17bc4fa32c8c7c271a69de9ee896d60195c8dbf37171d42774a"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-i686/tr/firefox-112.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b6/linux-i686/tr/firefox-112.0b6.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha256 = "8239a21e49341ea63dec6e000d7854925b8885550148f1bdeed190fdacd54627"; + sha256 = "e5462ff92013f55e0e62e482c1ab75bde96ba227cc997fe6b7368e52c700fde2"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-i686/trs/firefox-112.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b6/linux-i686/trs/firefox-112.0b6.tar.bz2"; locale = "trs"; arch = "linux-i686"; - sha256 = "e7ecd2309bb66c2b635430e6f001c742d4e67eccc7d3278d64ff0086481ce037"; + sha256 = "97d33e734780c3c8f47f87b2db8c04e709c64ba6080e86352df9cdf0f74d8eb6"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-i686/uk/firefox-112.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b6/linux-i686/uk/firefox-112.0b6.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha256 = "15eac212a24278055f27bbf9bb7d2bce298ad40d8474a09a64a8d6a82253a730"; + sha256 = "1d48cf9b0da2b9131e80fbca068c69a6e93d5fad1c0e6501ca9952f88bc5c3ce"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-i686/ur/firefox-112.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b6/linux-i686/ur/firefox-112.0b6.tar.bz2"; locale = "ur"; arch = "linux-i686"; - sha256 = "5d59b25da307aef5d9baacb68059d04e5125e9f8c9ad72d229b6f59aed2cc856"; + sha256 = "3524739074f3355682aae83165b0617f27f967ff52f736e91f4a2502c9a0475d"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-i686/uz/firefox-112.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b6/linux-i686/uz/firefox-112.0b6.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha256 = "b66c8cc522829e6415bf452542d792946c62d6911ecdd8977dc36854a96bb59a"; + sha256 = "a5a8709a01c2c80371e2e996d15b987f637f80f450fec83d30b3912fb9780e5d"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-i686/vi/firefox-112.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b6/linux-i686/vi/firefox-112.0b6.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha256 = "b24e0038f2f8147c9dfa79acfd195e5ce8cfe27f5d7ace9a591a21dcda8889a5"; + sha256 = "a70fe7c7724459eef0af6aa473b39f1e67b1e97df0d5d668f605c3462929d3a9"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-i686/xh/firefox-112.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b6/linux-i686/xh/firefox-112.0b6.tar.bz2"; locale = "xh"; arch = "linux-i686"; - sha256 = "ba5d40a5cd4653e3f3381b25dee1c7a579986fa187e6a1c9fd6d81bd29c0a73e"; + sha256 = "96345654ac1c667f7d44a12c83a59492ccc9ba86e02be6ef25479a60a7196743"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-i686/zh-CN/firefox-112.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b6/linux-i686/zh-CN/firefox-112.0b6.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha256 = "5b978f0f36e894eda54f0f690edc7e1fa156b898d550e747a8c5b712bbe2846b"; + sha256 = "4d1ba4d9703ceb99680d4e64f508eb727547593d153cc0639b372c4e09a7b6bb"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-i686/zh-TW/firefox-112.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b6/linux-i686/zh-TW/firefox-112.0b6.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha256 = "7d4b52012de5cd28dd21b89c04f2ed1f392fa8637c07747e34619812daf40146"; + sha256 = "ec18e28bc82af7610f78e6c396bef2071300e692080de794acc42e6303a44ad2"; } ]; } From f31c0d7f9e03b911d225eec1021b9b1573882c6f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 24 Mar 2023 20:54:35 +0000 Subject: [PATCH 025/227] python310Packages.trimesh: 3.20.2 -> 3.21.0 --- pkgs/development/python-modules/trimesh/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/trimesh/default.nix b/pkgs/development/python-modules/trimesh/default.nix index a8614aa5bba9..6b0c047df8b5 100644 --- a/pkgs/development/python-modules/trimesh/default.nix +++ b/pkgs/development/python-modules/trimesh/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "trimesh"; - version = "3.20.2"; + version = "3.21.0"; src = fetchPypi { inherit pname version; - hash = "sha256-6tSrWovgVTEccDelUFrw8E1ghyiPmUsEASW8kGPUBhM="; + hash = "sha256-KqjDEpAOJKdId0Sn6dR+eUvW55rWKaqkjN4NN+5joJQ="; }; propagatedBuildInputs = [ numpy ]; From f50a1657dede88134b9289651d81d4c54b9c1d25 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 24 Mar 2023 21:23:07 +0000 Subject: [PATCH 026/227] vips: 8.14.1 -> 8.14.2 --- pkgs/tools/graphics/vips/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/graphics/vips/default.nix b/pkgs/tools/graphics/vips/default.nix index db44108112f3..9c4099783e0c 100644 --- a/pkgs/tools/graphics/vips/default.nix +++ b/pkgs/tools/graphics/vips/default.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { pname = "vips"; - version = "8.14.1"; + version = "8.14.2"; outputs = [ "bin" "out" "man" "dev" ] ++ lib.optionals (!stdenv.isDarwin) [ "devdoc" ]; @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { owner = "libvips"; repo = "libvips"; rev = "v${version}"; - hash = "sha256-ajGVSVjnv78S/Xd3Aqn0N87I7m39DWKZHAQjwbog+5U="; + hash = "sha256-QUWZ11t2JEJBdpNuIY2uRiSL/hffRbV0SV5HowxWaME="; # Remove unicode file names which leads to different checksums on HFS+ # vs. other filesystems because of unicode normalisation. postFetch = '' From 2a3b9026be919c50fe4bb201f6c45595b7790baa Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 24 Mar 2023 21:45:46 +0000 Subject: [PATCH 027/227] unison: 2.53.0 -> 2.53.2 --- pkgs/applications/networking/sync/unison/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/sync/unison/default.nix b/pkgs/applications/networking/sync/unison/default.nix index 7c0b8dc0747e..ec920bf37d8e 100644 --- a/pkgs/applications/networking/sync/unison/default.nix +++ b/pkgs/applications/networking/sync/unison/default.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation rec { pname = "unison"; - version = "2.53.0"; + version = "2.53.2"; src = fetchFromGitHub { owner = "bcpierce00"; repo = "unison"; rev = "v${version}"; - sha256 = "sha256-4Lyn1UecpVIhoEXIFu35XK4aoAfYGPCZ9L4ZY7224yo="; + sha256 = "sha256-H+70NZZP0cUsxetFcsjWEx2kENsgMdo/41wBwwaX6zg="; }; strictDeps = true; From d7282c901d68286717db16d64f5605725a4bf491 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 24 Mar 2023 22:27:55 +0000 Subject: [PATCH 028/227] snappymail: 2.26.4 -> 2.27.2 --- pkgs/servers/snappymail/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/snappymail/default.nix b/pkgs/servers/snappymail/default.nix index bdc94c57bc89..8685a9281884 100644 --- a/pkgs/servers/snappymail/default.nix +++ b/pkgs/servers/snappymail/default.nix @@ -7,11 +7,11 @@ stdenv.mkDerivation rec { pname = "snappymail"; - version = "2.26.4"; + version = "2.27.2"; src = fetchurl { url = "https://github.com/the-djmaze/snappymail/releases/download/v${version}/snappymail-${version}.tar.gz"; - sha256 = "sha256-BWjkdzAm9/bvPTjsdg+Vr+gr0fqzEvARmaySth95fsI="; + sha256 = "sha256-Br28cDw9XxXR0UA57oOQ+KwptAcPndH+XK2gFhuVOB4="; }; sourceRoot = "snappymail"; From df59c8988be65b8621cc0a79e1452a173d4fd1a4 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 25 Mar 2023 01:38:12 +0000 Subject: [PATCH 029/227] hubstaff: 1.6.12-da9418f3 -> 1.6.13-269829b4 --- pkgs/applications/misc/hubstaff/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/hubstaff/default.nix b/pkgs/applications/misc/hubstaff/default.nix index 4f3859e2e22b..e6b384904b70 100644 --- a/pkgs/applications/misc/hubstaff/default.nix +++ b/pkgs/applications/misc/hubstaff/default.nix @@ -4,9 +4,9 @@ , curl, writeShellScript, common-updater-scripts }: let - url = "https://hubstaff-production.s3.amazonaws.com/downloads/HubstaffClient/Builds/Release/1.6.12-da9418f3/Hubstaff-1.6.12-da9418f3.sh"; - version = "1.6.12-da9418f3"; - sha256 = "1iz81g0r20215z65mj6bfls7h0dp1k5kk8q10fjbdfj82rpwbfws"; + url = "https://hubstaff-production.s3.amazonaws.com/downloads/HubstaffClient/Builds/Release/1.6.13-269829b4/Hubstaff-1.6.13-269829b4.sh"; + version = "1.6.13-269829b4"; + sha256 = "0i05d8kivm09hqsc1z6vn7w0bbc3l9dawssqpqsm7kqdyaq0l304"; rpath = lib.makeLibraryPath [ libX11 zlib libSM libICE libXext freetype libXrender fontconfig libXft From a47f412366cc6a8966185c8ff61e6b1fe43cef05 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 25 Mar 2023 01:51:37 +0000 Subject: [PATCH 030/227] python310Packages.dyn: 1.8.1 -> 1.8.6 --- pkgs/development/python-modules/dyn/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/dyn/default.nix b/pkgs/development/python-modules/dyn/default.nix index e8859128b5f8..39e6ff6ed760 100644 --- a/pkgs/development/python-modules/dyn/default.nix +++ b/pkgs/development/python-modules/dyn/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "dyn"; - version = "1.8.1"; + version = "1.8.6"; src = fetchPypi { inherit pname version; - sha256 = "e112149d48b4500c18b3cfb6e0e6e780bb5aa0e56ff87cac412280200b9ec8bf"; + sha256 = "sha256-933etYrKRgSqJfOMIuIDL4Uv4/RdSEFMNWFtW5qiPpA="; }; buildInputs = [ glibcLocales ]; From 8c061165c32433732bc6c43b6e3a821ccada7a99 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 25 Mar 2023 02:32:54 +0000 Subject: [PATCH 031/227] python310Packages.plaid-python: 11.6.0 -> 12.0.0 --- pkgs/development/python-modules/plaid-python/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/plaid-python/default.nix b/pkgs/development/python-modules/plaid-python/default.nix index 58bd99ae1f25..b94cec292402 100644 --- a/pkgs/development/python-modules/plaid-python/default.nix +++ b/pkgs/development/python-modules/plaid-python/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "plaid-python"; - version = "11.6.0"; + version = "12.0.0"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-du6UqzZthjzkRkkqXzl/019bNMQH/K3tqmFOtA/hm6M="; + hash = "sha256-m/U7O859pWOB+qF4PVcXg3pI7M2Zpl2uWPjaubeV2dE="; }; propagatedBuildInputs = [ From 237510b1128015636e2c57b9a21af6da6df09721 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 25 Mar 2023 04:05:33 +0000 Subject: [PATCH 032/227] jbang: 0.104.0 -> 0.105.1 --- pkgs/development/tools/jbang/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/jbang/default.nix b/pkgs/development/tools/jbang/default.nix index f76c120b87f3..eab14d4541c9 100644 --- a/pkgs/development/tools/jbang/default.nix +++ b/pkgs/development/tools/jbang/default.nix @@ -1,12 +1,12 @@ { stdenv, lib, fetchzip, jdk, makeWrapper, coreutils, curl }: stdenv.mkDerivation rec { - version = "0.104.0"; + version = "0.105.1"; pname = "jbang"; src = fetchzip { url = "https://github.com/jbangdev/jbang/releases/download/v${version}/${pname}-${version}.tar"; - sha256 = "sha256-rqsmhCeVhlm/qnz3lDKCUenfkvnkI/Gsysh2hF02cIQ="; + sha256 = "sha256-bkjXvubZVwmZgaTAa+ieJCAUplL7UTj11hJIMaQf8TA="; }; nativeBuildInputs = [ makeWrapper ]; From 69cc4d0ce8c5b6fc8d2401557aa436363cab5b5b Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sat, 25 Mar 2023 04:20:00 +0000 Subject: [PATCH 033/227] python310Packages.trimesh: 3.21.0 -> 3.21.2 --- pkgs/development/python-modules/trimesh/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/trimesh/default.nix b/pkgs/development/python-modules/trimesh/default.nix index 6b0c047df8b5..8dbae7d45e73 100644 --- a/pkgs/development/python-modules/trimesh/default.nix +++ b/pkgs/development/python-modules/trimesh/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "trimesh"; - version = "3.21.0"; + version = "3.21.2"; src = fetchPypi { inherit pname version; - hash = "sha256-KqjDEpAOJKdId0Sn6dR+eUvW55rWKaqkjN4NN+5joJQ="; + hash = "sha256-VRPE+1QLKGy5W99ia5BuPNtmH/eoXulApS8n8SdQSaQ="; }; propagatedBuildInputs = [ numpy ]; From a99a07b1a611b863c03b8db99a5d292f1fd100a7 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sat, 25 Mar 2023 04:20:00 +0000 Subject: [PATCH 034/227] python310Packages.trimesh: set format to "pyproject" --- pkgs/development/python-modules/trimesh/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/python-modules/trimesh/default.nix b/pkgs/development/python-modules/trimesh/default.nix index 8dbae7d45e73..bc14617c0082 100644 --- a/pkgs/development/python-modules/trimesh/default.nix +++ b/pkgs/development/python-modules/trimesh/default.nix @@ -1,18 +1,22 @@ { lib , buildPythonPackage , fetchPypi +, setuptools , numpy }: buildPythonPackage rec { pname = "trimesh"; version = "3.21.2"; + format = "pyproject"; src = fetchPypi { inherit pname version; hash = "sha256-VRPE+1QLKGy5W99ia5BuPNtmH/eoXulApS8n8SdQSaQ="; }; + nativeBuildInputs = [ setuptools ]; + propagatedBuildInputs = [ numpy ]; # tests are not included in pypi distributions and would require lots of From 96200c5e43b108748568e87e2e844066229b083e Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sat, 25 Mar 2023 04:20:00 +0000 Subject: [PATCH 035/227] python310Packages.trimesh: execute minimal test --- pkgs/development/python-modules/trimesh/default.nix | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/trimesh/default.nix b/pkgs/development/python-modules/trimesh/default.nix index bc14617c0082..185a8a4fdf67 100644 --- a/pkgs/development/python-modules/trimesh/default.nix +++ b/pkgs/development/python-modules/trimesh/default.nix @@ -3,6 +3,7 @@ , fetchPypi , setuptools , numpy +, lxml }: buildPythonPackage rec { @@ -19,9 +20,13 @@ buildPythonPackage rec { propagatedBuildInputs = [ numpy ]; - # tests are not included in pypi distributions and would require lots of - # optional dependencies - doCheck = false; + nativeCheckInputs = [ lxml ]; + + checkPhase = '' + # Disable test_load because requires loading models which aren't part of the tarball + substituteInPlace tests/test_minimal.py --replace "test_load" "disable_test_load" + python tests/test_minimal.py + ''; pythonImportsCheck = [ "trimesh" ]; From 6afaad64ebe209afd541fb225e8700fdbb20ba71 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 25 Mar 2023 04:27:10 +0000 Subject: [PATCH 036/227] git-stack: 0.10.12 -> 0.10.14 --- pkgs/applications/version-management/git-stack/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/version-management/git-stack/default.nix b/pkgs/applications/version-management/git-stack/default.nix index 4189822d268a..69b1f299f5e7 100644 --- a/pkgs/applications/version-management/git-stack/default.nix +++ b/pkgs/applications/version-management/git-stack/default.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage rec { pname = "git-stack"; - version = "0.10.12"; + version = "0.10.14"; src = fetchFromGitHub { owner = "gitext-rs"; repo = "git-stack"; rev = "v${version}"; - hash = "sha256-ghH3wmXLPzJZ4lNXFwEGKD89r7xaRMXUe9kGHm7MC4s="; + hash = "sha256-DAvvVI3npHM7ln/EAr0RjtUCqCoKx9QHsCw69F8C8p4="; }; - cargoHash = "sha256-5FXcReXgq5LFysPGBuYawFdkYAgRHsW+p2Ytin4+ZxI="; + cargoHash = "sha256-KDVHSCQx7qIS/Gwx/wlpdIMgirPSfG535dvu33gjF7c="; buildInputs = lib.optionals stdenv.isDarwin [ Security From fdf38b8a0301806498c1a80c171c66b9d1050408 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 25 Mar 2023 06:51:12 +0000 Subject: [PATCH 037/227] cyberchef: 9.55.0 -> 10.2.0 --- pkgs/tools/misc/cyberchef/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/cyberchef/default.nix b/pkgs/tools/misc/cyberchef/default.nix index c229667db474..7146ad692843 100644 --- a/pkgs/tools/misc/cyberchef/default.nix +++ b/pkgs/tools/misc/cyberchef/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "cyberchef"; - version = "9.55.0"; + version = "10.2.0"; src = fetchzip { url = "https://github.com/gchq/CyberChef/releases/download/v${version}/CyberChef_v${version}.zip"; - sha256 = "sha256-nJes11d/KqQH6pCGIEwlEeP0BjsUr9bo5rBoEoB0IZk="; + sha256 = "sha256-Qom8NRy46EoZtXcdA716yO48GVemloEBlXxEFMB3g10="; stripRoot = false; }; From 50e860b91ebcdbc71b94f3ceeb7542e28ae12d29 Mon Sep 17 00:00:00 2001 From: Lijun Chen Date: Sat, 25 Mar 2023 10:28:01 +0100 Subject: [PATCH 038/227] xdg-desktop-portal-kde: fix missing runtime dependency `plasma-workspace` is required when `xdg-desktop-portal-kde` needs to open an application picker to let the user pick the application to use to open a certain file (when no existing default is available). If `plasma-workspace` is not available the `xdg-desktop-portal-kde` service logs an error and nothing else happens (the application picker is not opened). See https://github.com/NixOS/nixpkgs/issues/160923#issuecomment-1474989176 --- pkgs/desktops/plasma-5/xdg-desktop-portal-kde.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/desktops/plasma-5/xdg-desktop-portal-kde.nix b/pkgs/desktops/plasma-5/xdg-desktop-portal-kde.nix index dc5728791b60..5fa1a17c4240 100644 --- a/pkgs/desktops/plasma-5/xdg-desktop-portal-kde.nix +++ b/pkgs/desktops/plasma-5/xdg-desktop-portal-kde.nix @@ -19,6 +19,7 @@ , kdeclarative , plasma-framework , plasma-wayland-protocols +, plasma-workspace , kio , qtbase }: @@ -45,5 +46,6 @@ mkDerivation { kdeclarative plasma-framework plasma-wayland-protocols + plasma-workspace ]; } From 19b435931aa311acd115fe7f104685070f408c10 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Sat, 25 Mar 2023 11:18:11 +0100 Subject: [PATCH 039/227] ocamlPackages.mirage-block-ramdisk: use Dune 3 --- pkgs/development/ocaml-modules/mirage-block-ramdisk/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/ocaml-modules/mirage-block-ramdisk/default.nix b/pkgs/development/ocaml-modules/mirage-block-ramdisk/default.nix index 78f3e48c5bd4..a6978d3d5811 100644 --- a/pkgs/development/ocaml-modules/mirage-block-ramdisk/default.nix +++ b/pkgs/development/ocaml-modules/mirage-block-ramdisk/default.nix @@ -16,6 +16,7 @@ buildDunePackage rec { ''; minimalOCamlVersion = "4.06"; + duneVersion = "3"; propagatedBuildInputs = [ io-page mirage-block ]; From bec9dd54c60c4d36caaed0d7ff84e68d38783c05 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Sat, 25 Mar 2023 11:20:03 +0100 Subject: [PATCH 040/227] ocamlPackages.mirage-block-unix: use Dune 3 --- pkgs/development/ocaml-modules/mirage-block-unix/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/ocaml-modules/mirage-block-unix/default.nix b/pkgs/development/ocaml-modules/mirage-block-unix/default.nix index 0d0851536b38..e32523c85eb6 100644 --- a/pkgs/development/ocaml-modules/mirage-block-unix/default.nix +++ b/pkgs/development/ocaml-modules/mirage-block-unix/default.nix @@ -13,6 +13,7 @@ buildDunePackage rec { }; minimalOCamlVersion = "4.08"; + duneVersion = "3"; propagatedBuildInputs = [ cstruct-lwt logs mirage-block rresult uri ]; From 01f457d3280a1cd94fd18ce186eb41ba1b2bfbc1 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Sat, 25 Mar 2023 11:20:35 +0100 Subject: [PATCH 041/227] =?UTF-8?q?ocamlPackages.mirage-block:=203.0.0=20?= =?UTF-8?q?=E2=86=92=203.0.2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ocaml-modules/mirage-block/combinators.nix | 6 ++++-- pkgs/development/ocaml-modules/mirage-block/default.nix | 8 +++++--- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/pkgs/development/ocaml-modules/mirage-block/combinators.nix b/pkgs/development/ocaml-modules/mirage-block/combinators.nix index 7dee169afd5b..fc50002da1e6 100644 --- a/pkgs/development/ocaml-modules/mirage-block/combinators.nix +++ b/pkgs/development/ocaml-modules/mirage-block/combinators.nix @@ -1,10 +1,12 @@ -{ buildDunePackage, mirage-block, io-page, logs }: +{ buildDunePackage, mirage-block, logs }: buildDunePackage rec { pname = "mirage-block-combinators"; inherit (mirage-block) version src; - propagatedBuildInputs = [ mirage-block io-page logs ]; + duneVersion = "3"; + + propagatedBuildInputs = [ mirage-block logs ]; meta = mirage-block.meta // { description = "Block signatures and implementations for MirageOS using Lwt"; diff --git a/pkgs/development/ocaml-modules/mirage-block/default.nix b/pkgs/development/ocaml-modules/mirage-block/default.nix index 161fd4a66ead..0cd1f1717ea6 100644 --- a/pkgs/development/ocaml-modules/mirage-block/default.nix +++ b/pkgs/development/ocaml-modules/mirage-block/default.nix @@ -4,11 +4,13 @@ buildDunePackage rec { pname = "mirage-block"; - version = "3.0.0"; + version = "3.0.2"; + + duneVersion = "3"; src = fetchurl { - url = "https://github.com/mirage/mirage-block/releases/download/v${version}/mirage-block-v${version}.tbz"; - sha256 = "sha256-NB5nJpppMtdi0HDjKcCAqRjO4vIbAMfnP934P+SnzmU="; + url = "https://github.com/mirage/mirage-block/releases/download/v${version}/mirage-block-${version}.tbz"; + hash = "sha256-UALUfeL0G1mfSsLgAb/HpQ6OV12YtY+GUOYG6yhUwAI="; }; propagatedBuildInputs = [ cstruct lwt fmt ]; From 5475dfc18d95153fdfda20ac6dc005bade7ce718 Mon Sep 17 00:00:00 2001 From: Thomas Gerbet Date: Sat, 25 Mar 2023 11:55:59 +0100 Subject: [PATCH 042/227] apacheHttpd: 2.4.55 -> 2.4.56 Fixes CVE-2023-27522 and CVE-2023-25690. https://downloads.apache.org/httpd/CHANGES_2.4.56 --- pkgs/servers/http/apache-httpd/2.4.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/http/apache-httpd/2.4.nix b/pkgs/servers/http/apache-httpd/2.4.nix index fa20e4605540..11d97faaaf46 100644 --- a/pkgs/servers/http/apache-httpd/2.4.nix +++ b/pkgs/servers/http/apache-httpd/2.4.nix @@ -11,11 +11,11 @@ stdenv.mkDerivation rec { pname = "apache-httpd"; - version = "2.4.55"; + version = "2.4.56"; src = fetchurl { url = "mirror://apache/httpd/httpd-${version}.tar.bz2"; - sha256 = "sha256-Eda6GeNsC5PKYuR+b/wtLyiElCaUvODyPznHG9xfaaw="; + sha256 = "sha256-2NRfE5i6hO3QW7M8p1k6wpibF8ucegyv5UQtQa/bLXw="; }; # FIXME: -dev depends on -doc From d2593b5650e39252c040da732d3424d871234145 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 25 Mar 2023 13:17:42 +0000 Subject: [PATCH 043/227] alfaview: 8.58.2 -> 8.65.0 --- .../networking/instant-messengers/alfaview/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/alfaview/default.nix b/pkgs/applications/networking/instant-messengers/alfaview/default.nix index c9b2c4a21280..9a8062521fbe 100644 --- a/pkgs/applications/networking/instant-messengers/alfaview/default.nix +++ b/pkgs/applications/networking/instant-messengers/alfaview/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "alfaview"; - version = "8.58.2"; + version = "8.65.0"; src = fetchurl { url = "https://production-alfaview-assets.alfaview.com/stable/linux/${pname}_${version}.deb"; - sha256 = "sha256-z6GjIR9K4OWFuQTGBbP05aYFNa2sD1UW4e/GW01xj78="; + sha256 = "sha256-/1qYC2JCbgiR8fGL9R0mnRm8fY1DbAKhkjkDwEENWsA="; }; nativeBuildInputs = [ From 60ecb0a52e1918d45678af973adf9bdfddcc934e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9-Patrick=20Bubel?= Date: Sat, 25 Mar 2023 14:44:43 +0100 Subject: [PATCH 044/227] prusa-slicer: 2.5.0 -> 2.5.1 --- pkgs/applications/misc/prusa-slicer/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/prusa-slicer/default.nix b/pkgs/applications/misc/prusa-slicer/default.nix index 702a7769200d..246e579975bb 100644 --- a/pkgs/applications/misc/prusa-slicer/default.nix +++ b/pkgs/applications/misc/prusa-slicer/default.nix @@ -47,7 +47,7 @@ let in stdenv.mkDerivation rec { pname = "prusa-slicer"; - version = "2.5.0"; + version = "2.5.1"; nativeBuildInputs = [ cmake @@ -150,7 +150,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "prusa3d"; repo = "PrusaSlicer"; - sha256 = "sha256-wLe+5TFdkgQ1mlGYgp8HBzugeONSne17dsBbwblILJ4="; + sha256 = "sha256-ZeCofpBtsIBPRcjeJSEjOj+yNOOmYQA91/NLZwB2GUs="; rev = "version_${version}"; }; From 2cb2ee963019b3cfd381683343a81ec21077384a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 25 Mar 2023 14:10:42 +0000 Subject: [PATCH 045/227] ginac: 1.8.5 -> 1.8.6 --- pkgs/applications/science/math/ginac/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/math/ginac/default.nix b/pkgs/applications/science/math/ginac/default.nix index 1b5a0622f4e2..057b242e609b 100644 --- a/pkgs/applications/science/math/ginac/default.nix +++ b/pkgs/applications/science/math/ginac/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "ginac"; - version = "1.8.5"; + version = "1.8.6"; src = fetchurl { url = "https://www.ginac.de/ginac-${version}.tar.bz2"; - sha256 = "sha256-wks3oecJ9mDQl4eH6GszSAPNKOwXaJzzbd/zgAc+omE="; + sha256 = "sha256-ALMgsRFsrlt7QzZNv/t5EkcdFx9ITYJ2RgXXFYWNl1s="; }; propagatedBuildInputs = [ cln ]; From d0be03cc91995aa1a99a5d07d49e7de1061355fc Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 25 Mar 2023 14:22:03 +0000 Subject: [PATCH 046/227] arkade: 0.9.4 -> 0.9.5 --- pkgs/applications/networking/cluster/arkade/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/arkade/default.nix b/pkgs/applications/networking/cluster/arkade/default.nix index 020277a33e7a..0b36e75d9b00 100644 --- a/pkgs/applications/networking/cluster/arkade/default.nix +++ b/pkgs/applications/networking/cluster/arkade/default.nix @@ -7,20 +7,20 @@ buildGoModule rec { pname = "arkade"; - version = "0.9.4"; + version = "0.9.5"; src = fetchFromGitHub { owner = "alexellis"; repo = "arkade"; rev = version; - sha256 = "sha256-r3cSHiNlWrP7JCqYOy86mn6ssfDEbm6DYerVCoARz7M="; + sha256 = "sha256-gC7HdOrmOIYTaksx/CxXMt4wIly3RBL1SsQRbwQWLi8="; }; CGO_ENABLED = 0; nativeBuildInputs = [ installShellFiles ]; - vendorHash = "sha256-9QQuFrICfYLkoObNFsIn3H6brcv3qXL3FIguQMZ02HY="; + vendorHash = "sha256-BGUaU8p0C6kN8l3b27WQjfWP1e2LWD1KLWNsJdyEuRc="; # Exclude pkg/get: tests downloading of binaries which fail when sandbox=true subPackages = [ From 6aab31bf5027043e2a3c7b676cec7ee46033bc50 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 25 Mar 2023 14:59:03 +0000 Subject: [PATCH 047/227] booster: 0.9 -> 0.10 --- pkgs/applications/system/booster/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/system/booster/default.nix b/pkgs/applications/system/booster/default.nix index dda41f24531b..f1e55644fa5e 100644 --- a/pkgs/applications/system/booster/default.nix +++ b/pkgs/applications/system/booster/default.nix @@ -16,16 +16,16 @@ buildGoModule rec { pname = "booster"; - version = "0.9"; + version = "0.10"; src = fetchFromGitHub { owner = "anatol"; repo = pname; rev = version; - hash = "sha256-kalVFVBb+ngoUpm+iiIHGS6vBVLEvTVyKuSMSMbp7Qc="; + hash = "sha256-mUmh2oAD3G9cpv7yiKcFaXJkEdo18oMD/sttnYnAQL8="; }; - vendorHash = "sha256-GD+nsT4/Y2mTF+ztOC3N560BY5+QSfsPrXZ+dJYtzAw="; + vendorHash = "sha256-czzNAUO4eRYTwfnidNLqyvIsR0nyzR9cb+G9/5JRvKs="; postPatch = '' substituteInPlace init/main.go --replace "/usr/bin/fsck" "${unixtools.fsck}/bin/fsck" From 322dda5148212661366ce3657be56138996e3b87 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 25 Mar 2023 15:09:59 +0000 Subject: [PATCH 048/227] weather: 2.4.2 -> 2.4.4 --- pkgs/applications/misc/weather/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/weather/default.nix b/pkgs/applications/misc/weather/default.nix index 6149c52e7753..290de03f39ff 100644 --- a/pkgs/applications/misc/weather/default.nix +++ b/pkgs/applications/misc/weather/default.nix @@ -1,12 +1,12 @@ { lib, stdenv, fetchurl, python3, installShellFiles }: stdenv.mkDerivation rec { - version = "2.4.2"; + version = "2.4.4"; pname = "weather"; src = fetchurl { url = "http://fungi.yuggoth.org/weather/src/${pname}-${version}.tar.xz"; - sha256 = "sha256-qJl5rFDk31Fm+tmR6+Iiihcx6qyd9alHz2L672pNJsc="; + sha256 = "sha256-uBwcntmLmIAztbIOHEDx0Y0/kcoJqAHqBOM2yBiRHrU="; }; nativeBuildInputs = [ From 7cbb2be5082c3fc696ae0e2f1aff2e52f55682d4 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 25 Mar 2023 15:37:44 +0000 Subject: [PATCH 049/227] datovka: 4.21.1 -> 4.22.0 --- pkgs/applications/networking/datovka/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/datovka/default.nix b/pkgs/applications/networking/datovka/default.nix index a45fc62cf1f2..9aaf19d75e93 100644 --- a/pkgs/applications/networking/datovka/default.nix +++ b/pkgs/applications/networking/datovka/default.nix @@ -12,11 +12,11 @@ mkDerivation rec { pname = "datovka"; - version = "4.21.1"; + version = "4.22.0"; src = fetchurl { url = "https://gitlab.nic.cz/datovka/datovka/-/archive/v${version}/datovka-v${version}.tar.gz"; - sha256 = "sha256-mzCtZE4mira/ZeyfujBh+cONq1YbCyLIypiIX0kTVJg="; + sha256 = "sha256-MM2fTONdgvCOrVlMlBgpaoaZLbuSMVG/ENOx2egug98="; }; buildInputs = [ libdatovka qmake qtbase qtsvg libxml2 qtwebsockets ]; From 7de0aeade4db1c46cb2767bc64418eff51f44f6c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 25 Mar 2023 15:49:28 +0000 Subject: [PATCH 050/227] ckbcomp: 1.217 -> 1.218 --- pkgs/tools/X11/ckbcomp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/X11/ckbcomp/default.nix b/pkgs/tools/X11/ckbcomp/default.nix index e9bd772a94d1..08028053bec6 100644 --- a/pkgs/tools/X11/ckbcomp/default.nix +++ b/pkgs/tools/X11/ckbcomp/default.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec { pname = "ckbcomp"; - version = "1.217"; + version = "1.218"; src = fetchFromGitLab { domain = "salsa.debian.org"; owner = "installer-team"; repo = "console-setup"; rev = version; - sha256 = "sha256-oiHY0ZylhPKrC3dZS760J6LSjzP6y7UiXGAmUp9idMI="; + sha256 = "sha256-8FCQEQiy+xDOUmdABPrr0J87RLj0kqdJDxv4JvyzZM0="; }; buildInputs = [ perl ]; From e05175a7c9578559305fd5471aa5e749ee72b6d9 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 25 Mar 2023 16:32:49 +0000 Subject: [PATCH 051/227] ostree: 2023.1 -> 2023.2 --- pkgs/tools/misc/ostree/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/ostree/default.nix b/pkgs/tools/misc/ostree/default.nix index 0a41ef0f8bec..ea1b04de25cc 100644 --- a/pkgs/tools/misc/ostree/default.nix +++ b/pkgs/tools/misc/ostree/default.nix @@ -43,13 +43,13 @@ let ])); in stdenv.mkDerivation rec { pname = "ostree"; - version = "2023.1"; + version = "2023.2"; outputs = [ "out" "dev" "man" "installedTests" ]; src = fetchurl { url = "https://github.com/ostreedev/ostree/releases/download/v${version}/libostree-${version}.tar.xz"; - sha256 = "sha256-3XkrFnaToZccn24xaAE9kGrANRAP9scZo7Mi60S5b1U="; + sha256 = "sha256-zrB4h1Wgv/VzjURUNVL7+IPPcd9IG6o8pyiNp6QCu4U="; }; patches = [ From 8b7f79be5c17603ad59d99064e4cdfe989fd4ffd Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 25 Mar 2023 18:08:03 +0000 Subject: [PATCH 052/227] setbfree: 0.8.11 -> 0.8.12 --- pkgs/applications/audio/setbfree/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/setbfree/default.nix b/pkgs/applications/audio/setbfree/default.nix index 7cad39b63ea7..ce2b17caf86d 100644 --- a/pkgs/applications/audio/setbfree/default.nix +++ b/pkgs/applications/audio/setbfree/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "setbfree"; - version = "0.8.11"; + version = "0.8.12"; src = fetchFromGitHub { owner = "pantherb"; repo = "setBfree"; rev = "v${version}"; - sha256 = "sha256-OYrsq3zVaotmS1KUgDIQbVQgxpfweMKiB17/PC1iXDA="; + sha256 = "sha256-e/cvD/CtT8dY1lYcsZ21DC8pNqKXqKfC/eRXX8k01eI="; }; postPatch = '' From d0b5d7f95cb68f941be6e86a0bdc9647b6f2f4b3 Mon Sep 17 00:00:00 2001 From: Izorkin Date: Sat, 25 Mar 2023 22:32:36 +0300 Subject: [PATCH 053/227] mydumper: 0.13.1-1 -> 0.14.1-1 --- pkgs/tools/backup/mydumper/default.nix | 42 +++++++++++--------------- 1 file changed, 17 insertions(+), 25 deletions(-) diff --git a/pkgs/tools/backup/mydumper/default.nix b/pkgs/tools/backup/mydumper/default.nix index eee9c70fccc4..451ed58d8185 100644 --- a/pkgs/tools/backup/mydumper/default.nix +++ b/pkgs/tools/backup/mydumper/default.nix @@ -1,43 +1,35 @@ -{ lib -, stdenv -, fetchFromGitHub -, cmake -, pkg-config -, glib -, zlib -, pcre -, libmysqlclient -, libressl +{ lib, stdenv, fetchFromGitHub +, cmake, pkg-config, sphinx +, glib , pcre +, libmysqlclient, libressl +, zlib, zstd }: -let inherit (lib) getDev; in - stdenv.mkDerivation rec { pname = "mydumper"; - version = "0.13.1-1"; + version = "0.14.1-1"; src = fetchFromGitHub { - owner = "maxbube"; + owner = "mydumper"; repo = "mydumper"; rev = "refs/tags/v${version}"; - hash = "sha256-Oknivkyr3wOfjnDccEeFVt7D2l1CkeWgXahsQCtAc0I="; + hash = "sha256-I8COArsIO8+09SNa3DrgoGpvhLj08I8UvT2H9k9mJNQ="; }; - nativeBuildInputs = [ - cmake - pkg-config - ]; + outputs = [ "out" "doc" "man" ]; + + nativeBuildInputs = [ cmake pkg-config sphinx ]; buildInputs = [ - glib - zlib - pcre - libmysqlclient - libressl + glib pcre + libmysqlclient libressl + zlib zstd ]; cmakeFlags = [ - "-DMYSQL_INCLUDE_DIR=${getDev libmysqlclient}/include/mysql" + "-DCMAKE_SKIP_BUILD_RPATH=ON" + "-DMYSQL_INCLUDE_DIR=${lib.getDev libmysqlclient}/include/mysql" + "-DWITH_ZSTD=ON" ]; meta = with lib; { From afeb7db834b3e32e397296a77ee71695f7173118 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 25 Mar 2023 20:14:00 +0000 Subject: [PATCH 054/227] python310Packages.zeroc-ice: 3.7.8.2 -> 3.7.9 --- pkgs/development/python-modules/zeroc-ice/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/zeroc-ice/default.nix b/pkgs/development/python-modules/zeroc-ice/default.nix index 0852ce740ede..59e8d5ca3a9a 100644 --- a/pkgs/development/python-modules/zeroc-ice/default.nix +++ b/pkgs/development/python-modules/zeroc-ice/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "zeroc-ice"; - version = "3.7.8.2"; + version = "3.7.9"; src = fetchPypi { inherit version pname; - hash = "sha256-ZDiiyNT871XMDHNPOhKHm4NzgXHcJ0fN/iO4sEz8pRE="; + hash = "sha256-q994axJexRU1SUlg9P71NvaZRpR9dj46GX85cbvMEy8="; }; buildInputs = [ openssl bzip2 ]; From f463bda48dd02e7f5401bc9a5de84a53d0df1e50 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 25 Mar 2023 22:09:18 +0000 Subject: [PATCH 055/227] protoc-gen-validate: 0.9.1 -> 0.10.1 --- pkgs/development/tools/protoc-gen-validate/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/protoc-gen-validate/default.nix b/pkgs/development/tools/protoc-gen-validate/default.nix index 13b61e1d694d..0102a3499462 100644 --- a/pkgs/development/tools/protoc-gen-validate/default.nix +++ b/pkgs/development/tools/protoc-gen-validate/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "protoc-gen-validate"; - version = "0.9.1"; + version = "0.10.1"; src = fetchFromGitHub { owner = "bufbuild"; repo = "protoc-gen-validate"; rev = "v${version}"; - sha256 = "sha256-5Vr7qE6AFesvBkOpgStxI26m8rbQ8pXOXvNxbcX/ilc="; + sha256 = "sha256-yo0/RhUs9KUdY0l0qqRs3eGWr4y183ZNSCsWihFK++4="; }; - vendorSha256 = "sha256-D8ITrzEwas/UElfsXBG2BfHGFcFsxzWFar2ehgLwy5U="; + vendorHash = "sha256-yGQO5vTdkAr6bKnpaQz//n7r07NGyQg+vQ2BqPGe8Nk="; excludedPackages = [ "tests" ]; From b5e8c47696600a719a14a83f870e906d5458c193 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 26 Mar 2023 03:06:24 +0000 Subject: [PATCH 056/227] python310Packages.pydy: 0.6.0 -> 0.7.1 --- pkgs/development/python-modules/pydy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pydy/default.nix b/pkgs/development/python-modules/pydy/default.nix index 69314340cd1d..caa013f22688 100644 --- a/pkgs/development/python-modules/pydy/default.nix +++ b/pkgs/development/python-modules/pydy/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "pydy"; - version = "0.6.0"; + version = "0.7.1"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-e/Ssfd5llioA7ccLULlRdHR113IbR4AJ4/HmzQuU7vI="; + hash = "sha256-aaRinJMGR8v/OVkeSp1hA4+QLOrmDWq50wvA6b/suvk="; }; propagatedBuildInputs = [ From eb7fd31ca062c57e20564380eac5167c3da9ad1b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 26 Mar 2023 03:37:31 +0000 Subject: [PATCH 057/227] altair: 5.0.17 -> 5.0.19 --- pkgs/development/tools/altair-graphql-client/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/altair-graphql-client/default.nix b/pkgs/development/tools/altair-graphql-client/default.nix index 0ff47dae38f0..be67115333c1 100644 --- a/pkgs/development/tools/altair-graphql-client/default.nix +++ b/pkgs/development/tools/altair-graphql-client/default.nix @@ -2,11 +2,11 @@ let pname = "altair"; - version = "5.0.17"; + version = "5.0.19"; src = fetchurl { url = "https://github.com/imolorhe/altair/releases/download/v${version}/altair_${version}_x86_64_linux.AppImage"; - sha256 = "sha256-UX7WqQt5inVldrXG3bIVmR8ucCvbHdyVLgQ/srhpCak="; + sha256 = "sha256-ziJz9bJm4TxKzpGOBv1JwTnjgmloGBa9SCAUbg0WoLU="; }; appimageContents = appimageTools.extract { inherit pname version src; }; From 619fbfc06972b4ba1a2b8174e1cdcaf9b6b16e5c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 26 Mar 2023 03:39:15 +0000 Subject: [PATCH 058/227] pscale: 0.130.0 -> 0.133.0 --- pkgs/development/tools/pscale/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/pscale/default.nix b/pkgs/development/tools/pscale/default.nix index e6798260f94b..b16f04cef265 100644 --- a/pkgs/development/tools/pscale/default.nix +++ b/pkgs/development/tools/pscale/default.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "pscale"; - version = "0.130.0"; + version = "0.133.0"; src = fetchFromGitHub { owner = "planetscale"; repo = "cli"; rev = "v${version}"; - sha256 = "sha256-rrrjIyIMoCshq348bUBGzMcwYhEZMt1OA/pOoE4PEY8="; + sha256 = "sha256-2yCtpxrw05Vh098wBH5FwdbvRtMmyyihzQUzQgH0vyo="; }; - vendorHash = "sha256-shs05gXqLjp+L3t5f7oh0BV8YRPtcoCzrTlmx1tOvP0="; + vendorHash = "sha256-JJwMucS03LdGCnlHqPych73KVcSZ3S9Y1nNr4V6CB+o="; ldflags = [ "-s" "-w" From aa9f2afec4f0e383a5fe3d250112e72162da38c9 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 26 Mar 2023 03:46:43 +0000 Subject: [PATCH 059/227] phrase-cli: 2.7.0 -> 2.8.0 --- pkgs/tools/misc/phrase-cli/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/phrase-cli/default.nix b/pkgs/tools/misc/phrase-cli/default.nix index d4bdeffc4fb2..2a85535b29aa 100644 --- a/pkgs/tools/misc/phrase-cli/default.nix +++ b/pkgs/tools/misc/phrase-cli/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "phrase-cli"; - version = "2.7.0"; + version = "2.8.0"; src = fetchFromGitHub { owner = "phrase"; repo = "phrase-cli"; rev = version; - sha256 = "sha256-1ocLvpesL0Cu6f1PYaOBzKj5set1Sqm/n5MPgawOOfk="; + sha256 = "sha256-Gima27E77iJEgOVY49Y2s9kQkd+rnzS359ru5NAyGik="; }; - vendorHash = "sha256-CMJjeVTydxyLNW/937sojrjbENR00/HMEbY/gOYMNFs="; + vendorHash = "sha256-a0QA/1vUryAnO0Nr+m8frxtpnSHBOSOP1pq+BORTIJw="; ldflags = [ "-X=github.com/phrase/phrase-cli/cmd.PHRASE_CLIENT_VERSION=${version}" ]; From f4b0e86c9386a90a8099b34464bae17f248af1c8 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 26 Mar 2023 03:53:32 +0000 Subject: [PATCH 060/227] svlint: 0.6.1 -> 0.7.1 --- pkgs/development/tools/analysis/svlint/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/analysis/svlint/default.nix b/pkgs/development/tools/analysis/svlint/default.nix index 390b25b642c2..158e73ccd9d9 100644 --- a/pkgs/development/tools/analysis/svlint/default.nix +++ b/pkgs/development/tools/analysis/svlint/default.nix @@ -5,14 +5,14 @@ rustPlatform.buildRustPackage rec { pname = "svlint"; - version = "0.6.1"; + version = "0.7.1"; src = fetchCrate { inherit pname version; - sha256 = "sha256-rPgURBjhfCRO7XFtr24Y7Dvcm/VEv7frq8p6wvtgjdY="; + sha256 = "sha256-FLyD6fbcBi15gSh4dB9titqrJS3COfJYhxA3uroD24k="; }; - cargoSha256 = "sha256-IFoK52Qmw34oghAwlGtGFLl9MWXtJkMcx86jIqiwjuQ="; + cargoHash = "sha256-yD7oQyT7QimUOtaqaUURPP8hV0z6QKBhItk5C+rJjwo="; cargoBuildFlags = [ "--bin" "svlint" ]; From 0fa75a6ff5dc38ca22978433974c1d45e4876358 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 26 Mar 2023 04:16:34 +0000 Subject: [PATCH 061/227] cf-terraforming: 0.10.0 -> 0.11.0 --- pkgs/tools/misc/cf-terraforming/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/cf-terraforming/default.nix b/pkgs/tools/misc/cf-terraforming/default.nix index d57475fb5938..cc28ddb12a6e 100644 --- a/pkgs/tools/misc/cf-terraforming/default.nix +++ b/pkgs/tools/misc/cf-terraforming/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "cf-terraforming"; - version = "0.10.0"; + version = "0.11.0"; src = fetchFromGitHub { owner = "cloudflare"; repo = "cf-terraforming"; rev = "v${version}"; - sha256 = "sha256-2YL+ncT1UcanslFnMIMonvGugD7HxO6taYZtKK6kmEc="; + sha256 = "sha256-kdY/3D/GiAlOfj3pT9DECOsD9wqb7GZN7yzZrhec8hI="; }; - vendorHash = "sha256-eAWgLR3wqcTmlA3hG9IGgTm/Q+EKcypXYXRdtRAb94o="; + vendorHash = "sha256-HLKk64PcJUjKfY4pIwI2OXnjqFF1EkYlWOi0aWOVSbk="; ldflags = [ "-X github.com/cloudflare/cf-terraforming/internal/app/cf-terraforming/cmd.versionString=${version}" ]; # The test suite insists on downloading a binary release of Terraform from From a715e773cceaf2cdf28e9aaa4c9298a8821feaf4 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 26 Mar 2023 05:31:07 +0000 Subject: [PATCH 062/227] xmrig-mo: 6.19.0-mo1 -> 6.19.1-mo1 --- pkgs/applications/misc/xmrig/moneroocean.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/xmrig/moneroocean.nix b/pkgs/applications/misc/xmrig/moneroocean.nix index 0a513fc70581..56eca7606522 100644 --- a/pkgs/applications/misc/xmrig/moneroocean.nix +++ b/pkgs/applications/misc/xmrig/moneroocean.nix @@ -2,13 +2,13 @@ xmrig.overrideAttrs (oldAttrs: rec { pname = "xmrig-mo"; - version = "6.19.0-mo1"; + version = "6.19.1-mo1"; src = fetchFromGitHub { owner = "MoneroOcean"; repo = "xmrig"; rev = "v${version}"; - sha256 = "sha256-+J6gl/R9Yi8V2nYNuIH/oyplWi8vzfdamELHjp6iS7c="; + sha256 = "sha256-wrjn1QhHI/OeSpPkwuwqQAsTOW8O/lNqIgKjkjxSbbA="; }; meta = with lib; { From 5265db5915c146d8d78184519688dbc8034ef339 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 26 Mar 2023 05:40:34 +0000 Subject: [PATCH 063/227] argocd-vault-plugin: 1.13.1 -> 1.14.0 --- pkgs/tools/security/argocd-vault-plugin/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/argocd-vault-plugin/default.nix b/pkgs/tools/security/argocd-vault-plugin/default.nix index 785caa8f536d..0f0901f372fc 100644 --- a/pkgs/tools/security/argocd-vault-plugin/default.nix +++ b/pkgs/tools/security/argocd-vault-plugin/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "argocd-vault-plugin"; - version = "1.13.1"; + version = "1.14.0"; src = fetchFromGitHub { owner = "argoproj-labs"; repo = pname; rev = "v${version}"; - hash = "sha256-BuPNmGWKvjWkMCyyAFZeSCcnBUeaoduw7fZe07WD3Jo="; + hash = "sha256-TIZpeCYj8i/RbWqYn6js70QtQsnAF0itHCs+2mjwuGg="; }; - vendorHash = "sha256-jxuYT63FxylQinJ9paPk/Ut0aFX5gdLOS4ugzrtRIF0="; + vendorHash = "sha256-awa3hbM9/9YR7amx/VVOEWgzK/l8OjOemDFpYojfOwg="; # integration tests require filesystem and network access for credentials doCheck = false; From 460dec94b1592e8ea2d21f268de247b5de5228f3 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Sun, 26 Mar 2023 07:45:54 +0200 Subject: [PATCH 064/227] =?UTF-8?q?ocamlPackages.tsdl-ttf:=200.3.2=20?= =?UTF-8?q?=E2=86=92=200.5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/ocaml-modules/tsdl-ttf/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/ocaml-modules/tsdl-ttf/default.nix b/pkgs/development/ocaml-modules/tsdl-ttf/default.nix index 0ff1963fcaf0..93bee8f10156 100644 --- a/pkgs/development/ocaml-modules/tsdl-ttf/default.nix +++ b/pkgs/development/ocaml-modules/tsdl-ttf/default.nix @@ -9,13 +9,15 @@ buildDunePackage rec { pname = "tsdl-ttf"; - version = "0.3.2"; + version = "0.5"; + + duneVersion = "3"; src = fetchFromGitHub { owner = "sanette"; repo = pname; rev = version; - sha256 = "sha256-COBLF9K8thRROJJGeg4wxqrjB3aBa4CGYkf8HdAQ2o0"; + hash = "sha256-ai9ChsA3HZzTxT9AuHsY1UIA2Q3U3CcOA7jRSG4MDsQ="; }; buildInputs = [ From 4d5d4665ca028aca6919bdebc05947ebb6dd9c63 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Sun, 26 Mar 2023 07:45:59 +0200 Subject: [PATCH 065/227] =?UTF-8?q?ocamlPackages.tsdl-mixer:=200.3.2=20?= =?UTF-8?q?=E2=86=92=200.5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/ocaml-modules/tsdl-mixer/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/ocaml-modules/tsdl-mixer/default.nix b/pkgs/development/ocaml-modules/tsdl-mixer/default.nix index 24043ef4391e..d2721c5398e2 100644 --- a/pkgs/development/ocaml-modules/tsdl-mixer/default.nix +++ b/pkgs/development/ocaml-modules/tsdl-mixer/default.nix @@ -9,13 +9,15 @@ buildDunePackage rec { pname = "tsdl-mixer"; - version = "0.3.2"; + version = "0.5"; + + duneVersion = "3"; src = fetchFromGitHub { owner = "sanette"; repo = pname; rev = version; - sha256 = "sha256-UDRhwnanrn87/PYVnacur1z/LsKuUu2G+0QQXjTw/IE="; + hash = "sha256-HGtO5iO3lxuVa707MDIhw0pgDZLHt9qY+Rd24sFkags="; }; buildInputs = [ From 1c30d5e3146b51b8bd08f9335b57a4ba02ec5bd5 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Sun, 26 Mar 2023 07:46:03 +0200 Subject: [PATCH 066/227] =?UTF-8?q?ocamlPackages.tsdl-image:=200.3.2=20?= =?UTF-8?q?=E2=86=92=200.5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/ocaml-modules/tsdl-image/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/ocaml-modules/tsdl-image/default.nix b/pkgs/development/ocaml-modules/tsdl-image/default.nix index d4eaaae65caa..3b0895b7b2f6 100644 --- a/pkgs/development/ocaml-modules/tsdl-image/default.nix +++ b/pkgs/development/ocaml-modules/tsdl-image/default.nix @@ -9,13 +9,15 @@ buildDunePackage rec { pname = "tsdl-image"; - version = "0.3.2"; + version = "0.5"; + + duneVersion = "3"; src = fetchFromGitHub { owner = "sanette"; repo = pname; rev = version; - sha256 = "sha256-u6VYAwq+2oLn2Kw1+KQRVPswAqeKDSAaPfGLPrzn30s="; + hash = "sha256-khLhVJuiLNNWw76gTeg4W32v5XbkwAg11bIOWl67u2k="; }; buildInputs = [ From a49c9701e83bd96ca6ea2e04dcbb718b6d650c30 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Sun, 26 Mar 2023 07:46:08 +0200 Subject: [PATCH 067/227] =?UTF-8?q?ocamlPackages.tsdl:=200.9.9=20=E2=86=92?= =?UTF-8?q?=201.0.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/ocaml-modules/tsdl/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/development/ocaml-modules/tsdl/default.nix b/pkgs/development/ocaml-modules/tsdl/default.nix index 354a8ca2098a..14c29f3daee0 100644 --- a/pkgs/development/ocaml-modules/tsdl/default.nix +++ b/pkgs/development/ocaml-modules/tsdl/default.nix @@ -7,16 +7,17 @@ else let pname = "tsdl"; - version = "0.9.9"; + version = "1.0.0"; webpage = "https://erratique.ch/software/${pname}"; in stdenv.mkDerivation { - name = "ocaml${ocaml.version}-${pname}-${version}"; + pname = "ocaml${ocaml.version}-${pname}"; + inherit version; src = fetchurl { url = "${webpage}/releases/${pname}-${version}.tbz"; - sha256 = "sha256-GqFz+bYG2ESkAEJyP8DKud4JFfU5MGLulzJa5Z4sptQ="; + hash = "sha256-XdgzCj9Uqplt/8Jk8rSFaQf8zu+9SZa8b9ZIlW/gjyE="; }; strictDeps = true; From d2e946e21ad876c4a4808473386fd2845f51e554 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 26 Mar 2023 05:54:53 +0000 Subject: [PATCH 068/227] sqlcmd: 0.15.3 -> 0.15.4 --- pkgs/development/tools/database/sqlcmd/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/database/sqlcmd/default.nix b/pkgs/development/tools/database/sqlcmd/default.nix index 36055cc2b882..ed46312a580f 100644 --- a/pkgs/development/tools/database/sqlcmd/default.nix +++ b/pkgs/development/tools/database/sqlcmd/default.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "sqlcmd"; - version = "0.15.3"; + version = "0.15.4"; src = fetchFromGitHub { repo = "go-sqlcmd"; owner = "microsoft"; rev = "v${version}"; - sha256 = "sha256-1CdZVh7pbupCNOE1ydgYEqX4rYo2LRddlNRNf0QjlN0="; + sha256 = "sha256-6ofLXGrwkPBXQC+wb3sNqeMsVin5kBD8GyM7Ywu7xDs="; }; - vendorSha256 = "sha256-6JfxKzYAjSQ9JFuFGDUZ0ALS1D7f2LK3bP0Fbl2ivo0="; + vendorHash = "sha256-6JfxKzYAjSQ9JFuFGDUZ0ALS1D7f2LK3bP0Fbl2ivo0="; proxyVendor = true; ldflags = [ "-s" "-w" "-X main.version=${version}" ]; From 51a1a188719c9f5910681e4cd39601ad31edde96 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 26 Mar 2023 07:32:18 +0000 Subject: [PATCH 069/227] tmux-mem-cpu-load: 3.6.1 -> 3.6.2 --- pkgs/tools/misc/tmux-mem-cpu-load/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/tmux-mem-cpu-load/default.nix b/pkgs/tools/misc/tmux-mem-cpu-load/default.nix index 23477e46c117..2fcb42f9ab0c 100644 --- a/pkgs/tools/misc/tmux-mem-cpu-load/default.nix +++ b/pkgs/tools/misc/tmux-mem-cpu-load/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "tmux-mem-cpu-load"; - version = "3.6.1"; + version = "3.6.2"; src = fetchFromGitHub { owner = "thewtex"; repo = "tmux-mem-cpu-load"; rev = "v${version}"; - sha256 = "sha256-DqUfThAdfwXaZ/2KCw5+68l0vxRd4Ie3lwgz/A/6l5U="; + sha256 = "sha256-PQFR0mkt6OhtFlIrJXriNv+aoI9d7Y6y2tBEZrKkRU8="; }; nativeBuildInputs = [ cmake ]; From 647ac3f5a46fc8e8c3853edbf003543ef929884e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 26 Mar 2023 07:42:49 +0000 Subject: [PATCH 070/227] osinfo-db: 20221130 -> 20230308 --- pkgs/data/misc/osinfo-db/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/misc/osinfo-db/default.nix b/pkgs/data/misc/osinfo-db/default.nix index 67c3dc7a3c12..e563c2133187 100644 --- a/pkgs/data/misc/osinfo-db/default.nix +++ b/pkgs/data/misc/osinfo-db/default.nix @@ -8,11 +8,11 @@ stdenv.mkDerivation rec { pname = "osinfo-db"; - version = "20221130"; + version = "20230308"; src = fetchurl { url = "https://releases.pagure.org/libosinfo/${pname}-${version}.tar.xz"; - sha256 = "sha256-opVMrXob7yZ5lJmHxjiI8eCBsJ4R+3JQVDcvA37HcX8="; + sha256 = "sha256-VGugTsxekzui1/PztDM6KYDUrk38UoSYm5xUdY8rkIg="; }; nativeBuildInputs = [ From 56376c515a7bb0d1b7f42ff69ab006f87458de8b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 26 Mar 2023 08:52:24 +0000 Subject: [PATCH 071/227] redpanda: 23.1.1 -> 23.1.3 --- pkgs/servers/redpanda/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/redpanda/default.nix b/pkgs/servers/redpanda/default.nix index fde3454dd310..ef8335c56ccc 100644 --- a/pkgs/servers/redpanda/default.nix +++ b/pkgs/servers/redpanda/default.nix @@ -7,12 +7,12 @@ , stdenv }: let - version = "23.1.1"; + version = "23.1.3"; src = fetchFromGitHub { owner = "redpanda-data"; repo = "redpanda"; rev = "v${version}"; - sha256 = "sha256-3IRhr+XQLZXCeKhUHOlE8REwUkxLw1jcHYIataG3BaM="; + sha256 = "sha256-tqQl7Elslcdw0hNjayYShj19KYmVskJG0qtaijGTzm0="; }; server = callPackage ./server.nix { inherit src version; }; in From 4d0c66529b67219fadd720778a921ab3f68efc94 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 26 Mar 2023 09:35:36 +0000 Subject: [PATCH 072/227] src: 1.29 -> 1.31 --- pkgs/applications/version-management/src/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/src/default.nix b/pkgs/applications/version-management/src/default.nix index a39a1fd79d84..8532231ac8e9 100644 --- a/pkgs/applications/version-management/src/default.nix +++ b/pkgs/applications/version-management/src/default.nix @@ -9,11 +9,11 @@ stdenv.mkDerivation rec { pname = "src"; - version = "1.29"; + version = "1.31"; src = fetchurl { url = "http://www.catb.org/~esr/src/${pname}-${version}.tar.gz"; - sha256 = "sha256-Tc+qBhLtC9u23BrqVniAprAV8YhXELvbMn+XxN5BQkE="; + sha256 = "sha256-m00CG96w5olzxitxzTE2RLAQniUm1hhHpFmSaVgvDt0="; }; nativeBuildInputs = [ From 7f6bfd8f3879f070ec6b77209efe73c54e210264 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 26 Mar 2023 11:03:09 +0000 Subject: [PATCH 073/227] argocd: 2.6.5 -> 2.6.7 --- pkgs/applications/networking/cluster/argocd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/argocd/default.nix b/pkgs/applications/networking/cluster/argocd/default.nix index b955f2ebdf63..f14201eab038 100644 --- a/pkgs/applications/networking/cluster/argocd/default.nix +++ b/pkgs/applications/networking/cluster/argocd/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "argocd"; - version = "2.6.5"; + version = "2.6.7"; src = fetchFromGitHub { owner = "argoproj"; repo = "argo-cd"; rev = "v${version}"; - sha256 = "sha256-+3d20bD2sxck8fCrMv6Z9O70g7iWdHA5FdFVoLDtY2k="; + sha256 = "sha256-KvnKz+NxCiCqX/lDsm4YdrUmtK028D9KM9Ke9mxiZQw="; }; proxyVendor = true; # darwin/linux hash mismatch From 3257a92f244ed8811f9fd64412583477d1325737 Mon Sep 17 00:00:00 2001 From: Matthias Beyer Date: Sun, 26 Mar 2023 15:27:15 +0200 Subject: [PATCH 074/227] mutt: 2.2.9 -> 2.2.10 Signed-off-by: Matthias Beyer --- pkgs/applications/networking/mailreaders/mutt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/mailreaders/mutt/default.nix b/pkgs/applications/networking/mailreaders/mutt/default.nix index 91a424d9eb12..d449ae7db817 100644 --- a/pkgs/applications/networking/mailreaders/mutt/default.nix +++ b/pkgs/applications/networking/mailreaders/mutt/default.nix @@ -23,12 +23,12 @@ assert gpgmeSupport -> sslSupport; stdenv.mkDerivation rec { pname = "mutt"; - version = "2.2.9"; + version = "2.2.10"; outputs = [ "out" "doc" "info" ]; src = fetchurl { url = "http://ftp.mutt.org/pub/mutt/${pname}-${version}.tar.gz"; - sha256 = "+lMbIx1Y/h8wztoO1iZoPqnr37ds5H74uyfC93Qiz/s="; + sha256 = "sha256-TXc/IkIveQlve5S1e+5FZUrZolFl27NkY8WClbTNPYg="; }; patches = lib.optional smimeSupport (fetchpatch { From 0da407258286793d3c1189b2b0ef496063acac4d Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Tue, 28 Feb 2023 15:28:42 +0000 Subject: [PATCH 075/227] llvmPackages_git.llvm: run the tests on macOS Port of c7231c0b6d8 ("llvmPackages_15.llvm: run the tests on macOS"). The sysctl native check input was taken from 6d0c87602fe ("llvmPackages_15.llvm: add in a missing check dep"), because it looks like it was supposed to be part of c7231c0b6d8 instead. --- .../compilers/llvm/git/llvm/default.nix | 69 ++++++++++++---- ...-script-runner-set-dyld-library-path.patch | 26 ++++++ .../llvm-lit-cfg-add-libs-to-dylib-path.patch | 79 +++++++++++++++++++ ...polly-lit-cfg-add-libs-to-dylib-path.patch | 24 ++++++ 4 files changed, 181 insertions(+), 17 deletions(-) create mode 100644 pkgs/development/compilers/llvm/git/llvm/lit-shell-script-runner-set-dyld-library-path.patch create mode 100644 pkgs/development/compilers/llvm/git/llvm/llvm-lit-cfg-add-libs-to-dylib-path.patch create mode 100644 pkgs/development/compilers/llvm/git/llvm/polly-lit-cfg-add-libs-to-dylib-path.patch diff --git a/pkgs/development/compilers/llvm/git/llvm/default.nix b/pkgs/development/compilers/llvm/git/llvm/default.nix index 1daeb745e588..d944ee949fd9 100644 --- a/pkgs/development/compilers/llvm/git/llvm/default.nix +++ b/pkgs/development/compilers/llvm/git/llvm/default.nix @@ -16,9 +16,10 @@ , release_version , zlib , which +, sysctl , buildLlvmTools , debugVersion ? false -, doCheck ? stdenv.isLinux && (!stdenv.isx86_32) && (!stdenv.hostPlatform.isMusl) +, doCheck ? (!stdenv.isx86_32 /* TODO: why */) && (!stdenv.hostPlatform.isMusl) && (stdenv.hostPlatform == stdenv.buildPlatform) , enableManpages ? false , enableSharedLibraries ? !stdenv.hostPlatform.isStatic @@ -85,11 +86,59 @@ in stdenv.mkDerivation (rec { propagatedBuildInputs = [ ncurses zlib ]; - nativeCheckInputs = [ which ]; + nativeCheckInputs = [ + which + ] ++ lib.optional stdenv.isDarwin sysctl; patches = [ ./gnu-install-dirs.patch - ] ++ lib.optional enablePolly ./gnu-install-dirs-polly.patch; + + # Running the tests involves invoking binaries (like `opt`) that depend on + # the LLVM dylibs and reference them by absolute install path (i.e. their + # nix store path). + # + # Because we have not yet run the install phase (we're running these tests + # as part of `checkPhase` instead of `installCheckPhase`) these absolute + # paths do not exist yet; to work around this we point the loader (`ld` on + # unix, `dyld` on macOS) at the `lib` directory which will later become this + # package's `lib` output. + # + # Previously we would just set `LD_LIBRARY_PATH` to include the build `lib` + # dir but: + # - this doesn't generalize well to other platforms; `lit` doesn't forward + # `DYLD_LIBRARY_PATH` (macOS): + # + https://github.com/llvm/llvm-project/blob/0d89963df354ee309c15f67dc47c8ab3cb5d0fb2/llvm/utils/lit/lit/TestingConfig.py#L26 + # - even if `lit` forwarded this env var, we actually cannot set + # `DYLD_LIBRARY_PATH` in the child processes `lit` launches because + # `DYLD_LIBRARY_PATH` (and `DYLD_FALLBACK_LIBRARY_PATH`) is cleared for + # "protected processes" (i.e. the python interpreter that runs `lit`): + # https://stackoverflow.com/a/35570229 + # - other LLVM subprojects deal with this issue by having their `lit` + # configuration set these env vars for us; it makes sense to do the same + # for LLVM: + # + https://github.com/llvm/llvm-project/blob/4c106cfdf7cf7eec861ad3983a3dd9a9e8f3a8ae/clang-tools-extra/test/Unit/lit.cfg.py#L22-L31 + # + # !!! TODO: look into upstreaming this patch + ./llvm-lit-cfg-add-libs-to-dylib-path.patch + + # `lit` has a mode where it executes run lines as a shell script which is + # constructs; this is problematic for macOS because it means that there's + # another process in between `lit` and the binaries being tested. As noted + # above, this means that `DYLD_LIBRARY_PATH` is cleared which means that our + # tests fail with dyld errors. + # + # To get around this we patch `lit` to reintroduce `DYLD_LIBRARY_PATH`, when + # present in the test configuration. + # + # It's not clear to me why this isn't an issue for LLVM developers running + # on macOS (nothing about this _seems_ nix specific).. + ./lit-shell-script-runner-set-dyld-library-path.patch + ] ++ lib.optionals enablePolly [ + ./gnu-install-dirs-polly.patch + + # Just like the `llvm-lit-cfg` patch, but for `polly`. + ./polly-lit-cfg-add-libs-to-dylib-path.patch + ]; postPatch = optionalString stdenv.isDarwin '' substituteInPlace cmake/modules/AddLLVM.cmake \ @@ -134,12 +183,6 @@ in stdenv.mkDerivation (rec { ) ''; - # hacky fix: created binaries need to be run before installation - preBuild = '' - mkdir -p $out/ - ln -sv $PWD/lib $out - ''; - # E.g. mesa.drivers use the build-id as a cache key (see #93946): LDFLAGS = optionalString (enableSharedLibraries && !stdenv.isDarwin) "-Wl,--build-id=sha1"; @@ -216,14 +259,6 @@ in stdenv.mkDerivation (rec { ) ]; - postBuild = '' - rm -fR $out - ''; - - preCheck = '' - export LD_LIBRARY_PATH=$LD_LIBRARY_PATH''${LD_LIBRARY_PATH:+:}$PWD/lib - ''; - postInstall = '' mkdir -p $python/share mv $out/share/opt-viewer $python/share/opt-viewer diff --git a/pkgs/development/compilers/llvm/git/llvm/lit-shell-script-runner-set-dyld-library-path.patch b/pkgs/development/compilers/llvm/git/llvm/lit-shell-script-runner-set-dyld-library-path.patch new file mode 100644 index 000000000000..32f1d13a9dc2 --- /dev/null +++ b/pkgs/development/compilers/llvm/git/llvm/lit-shell-script-runner-set-dyld-library-path.patch @@ -0,0 +1,26 @@ +diff --git a/utils/lit/lit/TestRunner.py b/utils/lit/lit/TestRunner.py +index 0242e0b75af3..d732011306f7 100644 +--- a/utils/lit/lit/TestRunner.py ++++ b/utils/lit/lit/TestRunner.py +@@ -1029,6 +1029,12 @@ def executeScript(test, litConfig, tmpBase, commands, cwd): + f.write('@echo off\n') + f.write('\n@if %ERRORLEVEL% NEQ 0 EXIT\n'.join(commands)) + else: ++ # This env var is *purged* when invoking subprocesses so we have to ++ # manually set it from within the bash script in order for the commands ++ # in run lines to see this var: ++ if "DYLD_LIBRARY_PATH" in test.config.environment: ++ f.write(f'export DYLD_LIBRARY_PATH="{test.config.environment["DYLD_LIBRARY_PATH"]}"\n') ++ + for i, ln in enumerate(commands): + match = re.match(kPdbgRegex, ln) + if match: +@@ -1363,7 +1369,7 @@ def applySubstitutions(script, substitutions, conditions={}, + return processed + + process = processLine if recursion_limit is None else processLineToFixedPoint +- ++ + return [unescapePercents(process(ln)) for ln in script] + + diff --git a/pkgs/development/compilers/llvm/git/llvm/llvm-lit-cfg-add-libs-to-dylib-path.patch b/pkgs/development/compilers/llvm/git/llvm/llvm-lit-cfg-add-libs-to-dylib-path.patch new file mode 100644 index 000000000000..d824516c0a16 --- /dev/null +++ b/pkgs/development/compilers/llvm/git/llvm/llvm-lit-cfg-add-libs-to-dylib-path.patch @@ -0,0 +1,79 @@ +diff --git a/test/Unit/lit.cfg.py b/test/Unit/lit.cfg.py +index 81e8dc04acea..479ff95681e2 100644 +--- a/test/Unit/lit.cfg.py ++++ b/test/Unit/lit.cfg.py +@@ -3,6 +3,7 @@ + # Configuration file for the 'lit' test runner. + + import os ++import platform + import subprocess + + import lit.formats +@@ -55,3 +56,26 @@ if sys.platform in ['win32', 'cygwin'] and os.path.isdir(config.shlibdir): + # Win32 may use %SYSTEMDRIVE% during file system shell operations, so propogate. + if sys.platform == 'win32' and 'SYSTEMDRIVE' in os.environ: + config.environment['SYSTEMDRIVE'] = os.environ['SYSTEMDRIVE'] ++ ++# Add the LLVM dynamic libs to the platform-specific loader search path env var: ++# ++# TODO: this is copied from `clang`'s `lit.cfg.py`; should unify.. ++def find_shlibpath_var(): ++ if platform.system() in ['Linux', 'FreeBSD', 'NetBSD', 'OpenBSD', 'SunOS']: ++ yield 'LD_LIBRARY_PATH' ++ elif platform.system() == 'Darwin': ++ yield 'DYLD_LIBRARY_PATH' ++ elif platform.system() == 'Windows': ++ yield 'PATH' ++ elif platform.system() == 'AIX': ++ yield 'LIBPATH' ++ ++for shlibpath_var in find_shlibpath_var(): ++ shlibpath = os.path.pathsep.join( ++ (config.shlibdir, ++ config.environment.get(shlibpath_var, ''))) ++ config.environment[shlibpath_var] = shlibpath ++ break ++else: ++ lit_config.warning("unable to inject shared library path on '{}'" ++ .format(platform.system())) +diff --git a/test/lit.cfg.py b/test/lit.cfg.py +index 75a38b4c5dad..856fc75c9d74 100644 +--- a/test/lit.cfg.py ++++ b/test/lit.cfg.py +@@ -42,6 +42,26 @@ llvm_config.with_environment('PATH', config.llvm_tools_dir, append_path=True) + llvm_config.with_system_environment( + ['HOME', 'INCLUDE', 'LIB', 'TMP', 'TEMP']) + ++# Add the LLVM dynamic libs to the platform-specific loader search path env var: ++# ++# TODO: this is copied from `clang`'s `lit.cfg.py`; should unify.. ++def find_shlibpath_var(): ++ if platform.system() in ['Linux', 'FreeBSD', 'NetBSD', 'OpenBSD', 'SunOS']: ++ yield 'LD_LIBRARY_PATH' ++ elif platform.system() == 'Darwin': ++ yield 'DYLD_LIBRARY_PATH' ++ elif platform.system() == 'Windows': ++ yield 'PATH' ++ elif platform.system() == 'AIX': ++ yield 'LIBPATH' ++ ++for shlibpath_var in find_shlibpath_var(): ++ shlibpath = config.llvm_shlib_dir ++ llvm_config.with_environment(shlibpath_var, shlibpath, append_path = True) ++ break ++else: ++ lit_config.warning("unable to inject shared library path on '{}'" ++ .format(platform.system())) + + # Set up OCAMLPATH to include newly built OCaml libraries. + top_ocaml_lib = os.path.join(config.llvm_lib_dir, 'ocaml') +@@ -318,7 +338,7 @@ def have_cxx_shared_library(): + + try: + readobj_cmd = subprocess.Popen( +- [readobj_exe, '--needed-libs', readobj_exe], stdout=subprocess.PIPE) ++ [readobj_exe, '--needed-libs', readobj_exe], stdout=subprocess.PIPE, env=config.environment) + except OSError: + print('could not exec llvm-readobj') + return False diff --git a/pkgs/development/compilers/llvm/git/llvm/polly-lit-cfg-add-libs-to-dylib-path.patch b/pkgs/development/compilers/llvm/git/llvm/polly-lit-cfg-add-libs-to-dylib-path.patch new file mode 100644 index 000000000000..1354ad267314 --- /dev/null +++ b/pkgs/development/compilers/llvm/git/llvm/polly-lit-cfg-add-libs-to-dylib-path.patch @@ -0,0 +1,24 @@ +diff --git a/tools/polly/test/lit.cfg b/tools/polly/test/lit.cfg +index 41e3a589c61e..09f3b17498b0 100644 +--- a/tools/polly/test/lit.cfg ++++ b/tools/polly/test/lit.cfg +@@ -36,9 +36,17 @@ base_paths = [config.llvm_tools_dir, config.environment['PATH']] + path = os.path.pathsep.join(base_paths + config.extra_paths) + config.environment['PATH'] = path + ++# (Copied from polly/test/Unit/lit.cfg) ++if platform.system() == 'Darwin': ++ shlibpath_var = 'DYLD_LIBRARY_PATH' ++elif platform.system() == 'Windows': ++ shlibpath_var = 'PATH' ++else: ++ shlibpath_var = 'LD_LIBRARY_PATH' ++ + path = os.path.pathsep.join((config.llvm_libs_dir, +- config.environment.get('LD_LIBRARY_PATH',''))) +-config.environment['LD_LIBRARY_PATH'] = path ++ config.environment.get(shlibpath_var,''))) ++config.environment[shlibpath_var] = path + + llvm_config.use_default_substitutions() + From 5d315417f20eb31842cf524bc480f3429adb9d3f Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 26 Mar 2023 16:55:33 +0200 Subject: [PATCH 076/227] cyberchef: add changelog to meta --- pkgs/tools/misc/cyberchef/default.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/misc/cyberchef/default.nix b/pkgs/tools/misc/cyberchef/default.nix index 7146ad692843..c34bc26b0e7a 100644 --- a/pkgs/tools/misc/cyberchef/default.nix +++ b/pkgs/tools/misc/cyberchef/default.nix @@ -1,4 +1,7 @@ -{ lib, fetchzip, stdenv }: +{ lib +, fetchzip +, stdenv +}: stdenv.mkDerivation rec { pname = "cyberchef"; @@ -19,6 +22,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "The Cyber Swiss Army Knife for encryption, encoding, compression and data analysis."; homepage = "https://gchq.github.io/CyberChef"; + changelog = "https://github.com/gchq/CyberChef/blob/v${version}/CHANGELOG.md"; maintainers = with maintainers; [ sebastianblunt ]; license = licenses.asl20; platforms = platforms.all; From 422b0ff93b3d72b366f7473766dbbbd0fa665e47 Mon Sep 17 00:00:00 2001 From: Atemu Date: Sun, 29 Jan 2023 14:42:38 +0100 Subject: [PATCH 077/227] steam: use writeShellScript --- pkgs/games/steam/fhsenv.nix | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/pkgs/games/steam/fhsenv.nix b/pkgs/games/steam/fhsenv.nix index c50176dce790..246f59cb24b5 100644 --- a/pkgs/games/steam/fhsenv.nix +++ b/pkgs/games/steam/fhsenv.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, writeScript, buildFHSUserEnv, steam, glxinfo-i686, runtimeShell +{ lib, stdenv, writeShellScript, buildFHSUserEnv, steam, glxinfo-i686 , steam-runtime-wrapped, steam-runtime-wrapped-i686 ? null , extraPkgs ? pkgs: [ ] # extra packages to add to targetPkgs , extraLibraries ? pkgs: [ ] # extra packages to add to multiPkgs @@ -228,8 +228,7 @@ in buildFHSUserEnv rec { export SDL_JOYSTICK_DISABLE_UDEV=1 '' + extraProfile; - runScript = writeScript "steam-wrapper.sh" '' - #!${runtimeShell} + runScript = writeShellScript "steam-wrapper.sh" '' if [ -f /host/etc/NIXOS ]; then # Check only useful on NixOS ${glxinfo-i686}/bin/glxinfo >/dev/null 2>&1 # If there was an error running glxinfo, we know something is wrong with the configuration @@ -272,8 +271,7 @@ in buildFHSUserEnv rec { inherit multiPkgs profile extraInstallCommands; inherit unshareIpc unsharePid; - runScript = writeScript "steam-run" '' - #!${runtimeShell} + runScript = writeShellScript "steam-run" '' run="$1" if [ "$run" = "" ]; then echo "Usage: steam-run command-to-run args..." >&2 From 192c3ecd4bcc317c3d8868d3c944a75de0dee32e Mon Sep 17 00:00:00 2001 From: Atemu Date: Tue, 7 Mar 2023 20:35:30 +0100 Subject: [PATCH 078/227] buildFHSEnvBubblewrap: allow deeper introspection via passthru --- .../{env.nix => buildFHSEnv.nix} | 6 +++++- .../build-fhs-userenv-bubblewrap/default.nix | 11 ++++++----- 2 files changed, 11 insertions(+), 6 deletions(-) rename pkgs/build-support/build-fhs-userenv-bubblewrap/{env.nix => buildFHSEnv.nix} (98%) diff --git a/pkgs/build-support/build-fhs-userenv-bubblewrap/env.nix b/pkgs/build-support/build-fhs-userenv-bubblewrap/buildFHSEnv.nix similarity index 98% rename from pkgs/build-support/build-fhs-userenv-bubblewrap/env.nix rename to pkgs/build-support/build-fhs-userenv-bubblewrap/buildFHSEnv.nix index c4d967a11c69..0d98c0a2bc64 100644 --- a/pkgs/build-support/build-fhs-userenv-bubblewrap/env.nix +++ b/pkgs/build-support/build-fhs-userenv-bubblewrap/buildFHSEnv.nix @@ -1,6 +1,6 @@ { stdenv, lib, buildEnv, writeText, writeShellScriptBin, pkgs, pkgsi686Linux }: -{ name, profile ? "" +args@{ name, profile ? "" , targetPkgs ? pkgs: [], multiPkgs ? pkgs: [] , extraBuildCommands ? "", extraBuildCommandsMulti ? "" , extraOutputsToInstall ? [] @@ -216,4 +216,8 @@ in stdenv.mkDerivation { ''; preferLocalBuild = true; allowSubstitutes = false; + + passthru = { + inherit args multiPaths targetPaths; + }; } diff --git a/pkgs/build-support/build-fhs-userenv-bubblewrap/default.nix b/pkgs/build-support/build-fhs-userenv-bubblewrap/default.nix index 76e68573faa8..290ad35c0640 100644 --- a/pkgs/build-support/build-fhs-userenv-bubblewrap/default.nix +++ b/pkgs/build-support/build-fhs-userenv-bubblewrap/default.nix @@ -19,9 +19,9 @@ args @ { with builtins; let - buildFHSEnv = callPackage ./env.nix { }; + buildFHSEnv = callPackage ./buildFHSEnv.nix { }; - env = buildFHSEnv (removeAttrs args [ + fhsenv = buildFHSEnv (removeAttrs args [ "runScript" "extraInstallCommands" "meta" "passthru" "extraBwrapArgs" "dieWithParent" "unshareUser" "unshareCgroup" "unshareUts" "unshareNet" "unsharePid" "unshareIpc" ]); @@ -102,7 +102,7 @@ let ro_mounts=() symlinks=() etc_ignored=() - for i in ${env}/*; do + for i in ${fhsenv}/*; do path="/''${i##*/}" if [[ $path == '/etc' ]]; then : @@ -115,8 +115,8 @@ let fi done - if [[ -d ${env}/etc ]]; then - for i in ${env}/etc/*; do + if [[ -d ${fhsenv}/etc ]]; then + for i in ${fhsenv}/etc/*; do path="/''${i##*/}" # NOTE: we're binding /etc/fonts and /etc/ssl/certs from the host so we # don't want to override it with a path from the FHS environment. @@ -215,6 +215,7 @@ in runCommandLocal name { echo >&2 "" exit 1 ''; + inherit args fhsenv; }; } '' mkdir -p $out/bin From 473159871236e584af08386ed408aef30102395c Mon Sep 17 00:00:00 2001 From: Atemu Date: Tue, 7 Mar 2023 20:24:28 +0100 Subject: [PATCH 079/227] nixos/steam: always apply extraLibraries and make them additive Before, setting {option}`programs.steam.package` would result in a steam without the {option}`hardware.opengl.package`, {option}`hardware.opengl.extraPackages` etc. You had to manually add them yourself. Additionally, overlaying `steam = prev.steam.override { extraLibraries = [ ... ]; }` resulted in those extra libraries not actually being put into the fhsenv because they'd be fully overridden by the option's default. Now, the user can supply a custom steam to {option}`programs.steam.package` with its own list of extraLibraries which will not be overridden and overlays work as expected too. --- nixos/modules/programs/steam.nix | 34 ++++++++++++++++++++------------ 1 file changed, 21 insertions(+), 13 deletions(-) diff --git a/nixos/modules/programs/steam.nix b/nixos/modules/programs/steam.nix index 98269f6250db..6935ac93bf74 100644 --- a/nixos/modules/programs/steam.nix +++ b/nixos/modules/programs/steam.nix @@ -9,23 +9,31 @@ in { enable = mkEnableOption (lib.mdDoc "steam"); package = mkOption { - type = types.package; - default = pkgs.steam.override { - extraLibraries = pkgs: with config.hardware.opengl; - if pkgs.stdenv.hostPlatform.is64bit - then [ package ] ++ extraPackages - else [ package32 ] ++ extraPackages32; - }; - defaultText = literalExpression '' - pkgs.steam.override { - extraLibraries = pkgs: with config.hardware.opengl; + type = types.package; + default = pkgs.steam; + defaultText = literalExpression "pkgs.steam"; + example = literalExpression '' + pkgs.steam-small.override { + extraLibraries = with pkgs; [ + atk + ]; + } + ''; + apply = steam: steam.override (prev: { + extraLibraries = pkgs: let + prevLibs = if prev ? extraLibraries then prev.extraLibraries pkgs else [ ]; + additionalLibs = with config.hardware.opengl; if pkgs.stdenv.hostPlatform.is64bit then [ package ] ++ extraPackages else [ package32 ] ++ extraPackages32; - } - ''; + in prevLibs ++ additionalLibs; + }); description = lib.mdDoc '' - steam package to use. + The Steam package to use. Additional libraries are added from the system + configuration to ensure graphics work properly. + + Use this option to customise the Steam package rather than adding your + custom Steam to {option}`environment.systemPackages` yourself. ''; }; From 1f27e0b77a63fd243ab40dfce22edf106424faea Mon Sep 17 00:00:00 2001 From: Atemu Date: Sun, 29 Jan 2023 14:56:57 +0100 Subject: [PATCH 080/227] steam: add extraEnv option --- nixos/modules/programs/steam.nix | 7 ++++++- pkgs/games/steam/fhsenv.nix | 9 +++++++++ 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/nixos/modules/programs/steam.nix b/nixos/modules/programs/steam.nix index 6935ac93bf74..fc63f0f187e8 100644 --- a/nixos/modules/programs/steam.nix +++ b/nixos/modules/programs/steam.nix @@ -14,7 +14,12 @@ in { defaultText = literalExpression "pkgs.steam"; example = literalExpression '' pkgs.steam-small.override { - extraLibraries = with pkgs; [ + extraEnv = { + MANGOHUD = true; + OBS_VKCAPTURE = true; + RADV_TEX_ANISO = 16; + }; + extraLibraries = p: with p; [ atk ]; } diff --git a/pkgs/games/steam/fhsenv.nix b/pkgs/games/steam/fhsenv.nix index 246f59cb24b5..8d461104eaac 100644 --- a/pkgs/games/steam/fhsenv.nix +++ b/pkgs/games/steam/fhsenv.nix @@ -4,6 +4,7 @@ , extraLibraries ? pkgs: [ ] # extra packages to add to multiPkgs , extraProfile ? "" # string to append to profile , extraArgs ? "" # arguments to always pass to steam +, extraEnv ? { } # Environment variables to pass to Steam , withGameSpecificLibraries ? true # exclude game specific libraries }: @@ -52,6 +53,8 @@ let fi ''; + envScript = lib.toShellVars extraEnv; + in buildFHSUserEnv rec { name = "steam"; @@ -248,6 +251,9 @@ in buildFHSUserEnv rec { ${exportLDPath} ${fixBootstrap} + + set -o allexport # Export the following env vars + ${envScript} exec steam ${extraArgs} "$@" ''; @@ -281,6 +287,9 @@ in buildFHSUserEnv rec { ${exportLDPath} ${fixBootstrap} + + set -o allexport # Export the following env vars + ${envScript} exec -- "$run" "$@" ''; From 3f9a9ad9f27bb6c82485cee964da4b05def00f78 Mon Sep 17 00:00:00 2001 From: Rahul Butani Date: Sun, 8 Jan 2023 04:31:14 -0800 Subject: [PATCH 081/227] llvmPackages_git.llvm: adjust a path, skip an xfail test on darwin Port of 0ee52512f0fd4f5b675ba9f742a300b50adf27d3 ("llvmPackages_15.llvm: adjust a path, skip an xfail test on darwin") --- pkgs/development/compilers/llvm/git/llvm/default.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkgs/development/compilers/llvm/git/llvm/default.nix b/pkgs/development/compilers/llvm/git/llvm/default.nix index d944ee949fd9..4f0e68dc7b5f 100644 --- a/pkgs/development/compilers/llvm/git/llvm/default.nix +++ b/pkgs/development/compilers/llvm/git/llvm/default.nix @@ -4,6 +4,7 @@ , runCommand , fetchpatch , cmake +, darwin , ninja , python3 , libffi @@ -144,6 +145,14 @@ in stdenv.mkDerivation (rec { substituteInPlace cmake/modules/AddLLVM.cmake \ --replace 'set(_install_name_dir INSTALL_NAME_DIR "@rpath")' "set(_install_name_dir)" \ --replace 'set(_install_rpath "@loader_path/../''${CMAKE_INSTALL_LIBDIR}''${LLVM_LIBDIR_SUFFIX}" ''${extra_libdir})' "" + # As of LLVM 15, marked as XFAIL on arm64 macOS but lit doesn't seem to pick + # this up: https://github.com/llvm/llvm-project/blob/c344d97a125b18f8fed0a64aace73c49a870e079/llvm/test/MC/ELF/cfi-version.ll#L7 + rm test/MC/ELF/cfi-version.ll + + # This test tries to call `sw_vers` by absolute path (`/usr/bin/sw_vers`) + # thus fails under the sandbox: + substituteInPlace unittests/Support/Host.cpp \ + --replace '/usr/bin/sw_vers' "${(builtins.toString darwin.DarwinTools) + "/bin/sw_vers" }" '' + '' # FileSystem permissions tests fail with various special bits substituteInPlace unittests/Support/CMakeLists.txt \ From ff75d77c5d6803123568981d0413606f58252a53 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Sun, 26 Mar 2023 23:58:05 +0200 Subject: [PATCH 082/227] golangci-lint: 1.52.1 -> 1.52.2 Diff: https://github.com/golangci/golangci-lint/compare/v1.52.1...v1.52.2 --- pkgs/development/tools/golangci-lint/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/golangci-lint/default.nix b/pkgs/development/tools/golangci-lint/default.nix index 0f0c486ee617..30529f03ffdb 100644 --- a/pkgs/development/tools/golangci-lint/default.nix +++ b/pkgs/development/tools/golangci-lint/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "golangci-lint"; - version = "1.52.1"; + version = "1.52.2"; src = fetchFromGitHub { owner = "golangci"; repo = "golangci-lint"; rev = "v${version}"; - hash = "sha256-Du0u31P2Ay4MVLmgrQmbAstmczuIy+ONIUAUEbbK+j4="; + hash = "sha256-FmNXjOMDDdGxMQvy5f1NoaqrKFpmlPWclXooMxXP8zg="; }; - vendorHash = "sha256-N20AJaREqmvCey5P0YuUd3l/5xRzrIG+mPOiVHOUFWc="; + vendorHash = "sha256-BhD3a0LNc3hpiH4QC8FpmNn3swx3to8+6gfcgZT8TLg="; subPackages = [ "cmd/golangci-lint" ]; From d7887373fe0731719365831cd254c1e5948307d3 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Thu, 23 Mar 2023 16:33:39 +0100 Subject: [PATCH 083/227] keyleds: init at 2022-07-03 --- pkgs/applications/misc/keyleds/default.nix | 66 ++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 68 insertions(+) create mode 100644 pkgs/applications/misc/keyleds/default.nix diff --git a/pkgs/applications/misc/keyleds/default.nix b/pkgs/applications/misc/keyleds/default.nix new file mode 100644 index 000000000000..c48b30b34dc9 --- /dev/null +++ b/pkgs/applications/misc/keyleds/default.nix @@ -0,0 +1,66 @@ +{ lib +, stdenv +, fetchFromGitHub +, fetchpatch +, cmake +, pkg-config +, libuv +, libX11 +, libXi +, libyaml +, luajit +, udev +}: + +stdenv.mkDerivation rec { + pname = "keyleds"; + version = "unstable-2021-04-08"; + + src = fetchFromGitHub { + owner = "keyleds"; + repo = pname; + rev = "171361654a64b570d747c2d196acb2da4b8dc293"; + sha256 = "sha256-mojgHMT0gni0Po0hiZqQ8eMzqfwUipXue1uqpionihw="; + }; + + # This commit corresponds to the following open PR: + # https://github.com/keyleds/keyleds/pull/74 + # According to the author of the PR, the maintainer of keyleds is unreachable. + # This patch fixes the build process which is broken on the current master branch of keyleds. + patches = [ + (fetchpatch { + url = "https://github.com/keyleds/keyleds/commit/bffed5eb181127df915002b6ed830f85f15feafd.patch"; + sha256 = "sha256-i2N3D/K++34JVqJloNK2UcN473NarIjdjAz6PUhXcNY="; + }) + ]; + + strictDeps = true; + + nativeBuildInputs = [ + cmake + pkg-config + ]; + + buildInputs = [ + libuv + libX11 + libXi + libyaml + luajit + udev + ]; + + enableParallelBuilding = true; + + cmakeFlags = [ + "-DCMAKE_BUILD_TYPE=MinSizeRel" + ]; + + meta = { + homepage = "https://github.com/keyleds/keyleds"; + description = "Advanced RGB animation service for Logitech keyboards"; + license = lib.licenses.gpl3; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ GaetanLepage ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 489e3d50e00c..407747c4ea22 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -30618,6 +30618,8 @@ with pkgs; jay = callPackage ../applications/window-managers/jay { }; + keyleds = callPackage ../applications/misc/keyleds { }; + keylight-controller-mschneider82 = callPackage ../applications/misc/keylight-controller-mschneider82 { }; leftwm = callPackage ../applications/window-managers/leftwm { }; From d5929d7a82d4836baf2377b4f3d3481a98dbe06a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 26 Mar 2023 23:08:48 +0000 Subject: [PATCH 084/227] btrbk: 0.32.5 -> 0.32.6 --- pkgs/tools/backup/btrbk/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/backup/btrbk/default.nix b/pkgs/tools/backup/btrbk/default.nix index 34bd7c56178d..36bd2065de7e 100644 --- a/pkgs/tools/backup/btrbk/default.nix +++ b/pkgs/tools/backup/btrbk/default.nix @@ -18,11 +18,11 @@ stdenv.mkDerivation rec { pname = "btrbk"; - version = "0.32.5"; + version = "0.32.6"; src = fetchurl { url = "https://digint.ch/download/btrbk/releases/${pname}-${version}.tar.xz"; - sha256 = "8f5AkWgCFteMeQPYKn+P+V6Ypb6x0f/bK6UpOovDn7Q="; + sha256 = "AuKsZHyRhGMgLL5ge7lVV6T3/SNwaRJDM8VNpbK7t2s="; }; nativeBuildInputs = [ asciidoctor makeWrapper ]; From 596b7126582e6592c447536d65abaac8b4c2c3aa Mon Sep 17 00:00:00 2001 From: Zenithal Date: Mon, 27 Mar 2023 11:51:20 +0800 Subject: [PATCH 085/227] mill: 0.10.11 -> 0.10.12 --- pkgs/development/tools/build-managers/mill/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/build-managers/mill/default.nix b/pkgs/development/tools/build-managers/mill/default.nix index 6ede440cc611..30f9097be31d 100644 --- a/pkgs/development/tools/build-managers/mill/default.nix +++ b/pkgs/development/tools/build-managers/mill/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "mill"; - version = "0.10.11"; + version = "0.10.12"; src = fetchurl { url = "https://github.com/com-lihaoyi/mill/releases/download/${version}/${version}-assembly"; - hash = "sha256-B47C7sqOqiHa/2kC5lk/J1pXK61l1M5umVKaCfVO7cc="; + hash = "sha256-MlPnJMuz35Zd+VQwvsadRRPULebR7GWN1vGV+cJ7s4c="; }; nativeBuildInputs = [ makeWrapper ]; From 88076399f496666119828d1fa7d8cd82cd0a3d18 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 27 Mar 2023 04:31:27 +0000 Subject: [PATCH 086/227] gtk-server: 2.4.5 -> 2.4.6 --- pkgs/development/interpreters/gtk-server/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/gtk-server/default.nix b/pkgs/development/interpreters/gtk-server/default.nix index b3a66f12dc43..e6d32f40c40e 100644 --- a/pkgs/development/interpreters/gtk-server/default.nix +++ b/pkgs/development/interpreters/gtk-server/default.nix @@ -10,11 +10,11 @@ stdenv.mkDerivation rec { pname = "gtk-server"; - version = "2.4.5"; + version = "2.4.6"; src = fetchurl { url = "https://www.gtk-server.org/stable/gtk-server-${version}.tar.gz"; - sha256 = "0vlx5ibvc7hyc8yipjgvrx1azvmh42i9fv1khg3dvn09nrdkrc7f"; + sha256 = "sha256-sFL3y068oXDKgkEUcNnGVsNSPBdI1NzpsqdYJfmOQoA="; }; preConfigure = '' From e541cff5de9f58923f2c41ba2116bc5445e8f0d0 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 27 Mar 2023 04:49:59 +0000 Subject: [PATCH 087/227] eksctl: 0.134.0 -> 0.135.0 --- pkgs/tools/admin/eksctl/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/admin/eksctl/default.nix b/pkgs/tools/admin/eksctl/default.nix index 668110650f3b..f4c6955d2876 100644 --- a/pkgs/tools/admin/eksctl/default.nix +++ b/pkgs/tools/admin/eksctl/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "eksctl"; - version = "0.134.0"; + version = "0.135.0"; src = fetchFromGitHub { owner = "weaveworks"; repo = pname; rev = version; - sha256 = "sha256-J179fhhcUUcSIVQvNUwgAiERPNQbMdFQBlKbvSb2/ss="; + sha256 = "sha256-wpy9DWE3HqpYK85JymQFScYYq+re7Xk2cF6pbSOvi2w="; }; - vendorHash = "sha256-/LcqW9D1FeyCMUM81d9JIa9vjTow9IG9CZPeixbDsXE="; + vendorHash = "sha256-ke1Tl2TFHAzBAQjMYsdYKiXVpgwYzZndTb8eTwUYDcY="; doCheck = false; From 0bd1408dfe17712e9896dedec45e57548f347339 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Mon, 27 Mar 2023 06:42:35 +0200 Subject: [PATCH 088/227] ocamlPackages: fix eval Evaluation for OCaml < 4.08 has been broken by d9f767600fb2f5f0b7e7159cd8638c0701ad6bfc --- pkgs/development/ocaml-modules/bistro/default.nix | 2 +- pkgs/development/ocaml-modules/bls12-381/default.nix | 5 ++++- pkgs/development/ocaml-modules/cohttp/async.nix | 2 +- pkgs/development/ocaml-modules/data-encoding/default.nix | 2 +- pkgs/development/ocaml-modules/faraday/async.nix | 2 +- pkgs/development/ocaml-modules/hack_parallel/default.nix | 2 +- pkgs/development/ocaml-modules/integers_stubs_js/default.nix | 2 +- pkgs/development/ocaml-modules/magic-trace/default.nix | 4 ++-- pkgs/development/ocaml-modules/mldoc/default.nix | 2 +- 9 files changed, 13 insertions(+), 10 deletions(-) diff --git a/pkgs/development/ocaml-modules/bistro/default.nix b/pkgs/development/ocaml-modules/bistro/default.nix index 192bb470a66d..8f84a973bf0f 100644 --- a/pkgs/development/ocaml-modules/bistro/default.nix +++ b/pkgs/development/ocaml-modules/bistro/default.nix @@ -7,7 +7,7 @@ , bos , core , core_kernel -, core_unix +, core_unix ? null , lwt_react , ocamlgraph , ppx_sexp_conv diff --git a/pkgs/development/ocaml-modules/bls12-381/default.nix b/pkgs/development/ocaml-modules/bls12-381/default.nix index 8330ce3e2bc3..20b2cd66a758 100644 --- a/pkgs/development/ocaml-modules/bls12-381/default.nix +++ b/pkgs/development/ocaml-modules/bls12-381/default.nix @@ -1,5 +1,8 @@ { lib, buildDunePackage, fetchFromGitLab -, ff-sig, zarith, zarith_stubs_js, integers_stubs_js, integers, hex +, ff-sig, zarith +, zarith_stubs_js ? null +, integers_stubs_js +, integers, hex , alcotest, ff-pbt }: diff --git a/pkgs/development/ocaml-modules/cohttp/async.nix b/pkgs/development/ocaml-modules/cohttp/async.nix index 3e6ac4ae2d96..3236d4775070 100644 --- a/pkgs/development/ocaml-modules/cohttp/async.nix +++ b/pkgs/development/ocaml-modules/cohttp/async.nix @@ -7,7 +7,7 @@ , async_unix , cohttp , conduit-async -, core_unix +, core_unix ? null , uri , uri-sexp , logs diff --git a/pkgs/development/ocaml-modules/data-encoding/default.nix b/pkgs/development/ocaml-modules/data-encoding/default.nix index 5a17abdcc532..2b4013eb46a0 100644 --- a/pkgs/development/ocaml-modules/data-encoding/default.nix +++ b/pkgs/development/ocaml-modules/data-encoding/default.nix @@ -5,7 +5,7 @@ , either , ezjsonm , zarith -, zarith_stubs_js +, zarith_stubs_js ? null , hex , json-data-encoding , json-data-encoding-bson diff --git a/pkgs/development/ocaml-modules/faraday/async.nix b/pkgs/development/ocaml-modules/faraday/async.nix index 90f56c159632..f24866a815c1 100644 --- a/pkgs/development/ocaml-modules/faraday/async.nix +++ b/pkgs/development/ocaml-modules/faraday/async.nix @@ -1,4 +1,4 @@ -{ buildDunePackage, lib, faraday, core_unix, async }: +{ buildDunePackage, lib, faraday, core_unix ? null, async }: buildDunePackage rec { pname = "faraday-async"; diff --git a/pkgs/development/ocaml-modules/hack_parallel/default.nix b/pkgs/development/ocaml-modules/hack_parallel/default.nix index 8d1414731f13..afd49b871656 100644 --- a/pkgs/development/ocaml-modules/hack_parallel/default.nix +++ b/pkgs/development/ocaml-modules/hack_parallel/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchFromGitHub, buildDunePackage, core, core_unix, pkg-config +{ lib, fetchFromGitHub, buildDunePackage, core, core_unix ? null, pkg-config , sqlite }: buildDunePackage rec { pname = "hack_parallel"; diff --git a/pkgs/development/ocaml-modules/integers_stubs_js/default.nix b/pkgs/development/ocaml-modules/integers_stubs_js/default.nix index fc06efae7e04..59d47d2daf5f 100644 --- a/pkgs/development/ocaml-modules/integers_stubs_js/default.nix +++ b/pkgs/development/ocaml-modules/integers_stubs_js/default.nix @@ -1,6 +1,6 @@ { lib, fetchFromGitHub, buildDunePackage -, zarith_stubs_js +, zarith_stubs_js ? null }: buildDunePackage rec { diff --git a/pkgs/development/ocaml-modules/magic-trace/default.nix b/pkgs/development/ocaml-modules/magic-trace/default.nix index 1f1417f67275..39bdca1119a4 100644 --- a/pkgs/development/ocaml-modules/magic-trace/default.nix +++ b/pkgs/development/ocaml-modules/magic-trace/default.nix @@ -1,5 +1,5 @@ -{ lib, fetchFromGitHub, buildDunePackage, async, cohttp_static_handler -, core_unix, owee, ppx_jane, shell }: +{ lib, fetchFromGitHub, buildDunePackage, async, cohttp_static_handler ? null +, core_unix ? null, owee, ppx_jane, shell ? null }: buildDunePackage rec { pname = "magic-trace"; diff --git a/pkgs/development/ocaml-modules/mldoc/default.nix b/pkgs/development/ocaml-modules/mldoc/default.nix index 058261a78d3d..7960042ff9cc 100644 --- a/pkgs/development/ocaml-modules/mldoc/default.nix +++ b/pkgs/development/ocaml-modules/mldoc/default.nix @@ -6,7 +6,7 @@ , cmdliner , core , core_bench -, core_unix +, core_unix ? null , js_of_ocaml , js_of_ocaml-ppx , ppx_deriving_yojson From 158d603401ad885c2f8275861133cc3999a7f0e8 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 27 Mar 2023 05:23:55 +0000 Subject: [PATCH 089/227] steampipe: 0.19.2 -> 0.19.3 --- pkgs/tools/misc/steampipe/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/steampipe/default.nix b/pkgs/tools/misc/steampipe/default.nix index 3c72233743f4..6968fff13e7d 100644 --- a/pkgs/tools/misc/steampipe/default.nix +++ b/pkgs/tools/misc/steampipe/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "steampipe"; - version = "0.19.2"; + version = "0.19.3"; src = fetchFromGitHub { owner = "turbot"; repo = "steampipe"; rev = "v${version}"; - sha256 = "sha256-CWZ+zsWaI5JULmcJRZggewqArfYpB1G7jyjRPD4WNug="; + sha256 = "sha256-RbtIDgTVS/vtYQpbTQ7Yl7oBtC8c6D9Pns9SdEjUsmI="; }; vendorHash = "sha256-XrEdaNLG46BwMEF/vhAk9+A6vH4mpbtH7vWXd01Y7ME="; From dec9899d8ec039633d75b14ac3c925120557e931 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 27 Mar 2023 06:53:01 +0000 Subject: [PATCH 090/227] python310Packages.dvc-objects: 0.20.0 -> 0.21.1 --- pkgs/development/python-modules/dvc-objects/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/dvc-objects/default.nix b/pkgs/development/python-modules/dvc-objects/default.nix index 343e5705f401..652ac0e1c1ed 100644 --- a/pkgs/development/python-modules/dvc-objects/default.nix +++ b/pkgs/development/python-modules/dvc-objects/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "dvc-objects"; - version = "0.20.0"; + version = "0.21.1"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "iterative"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-T7vcnxxN0YUHoDVc98f0QwiMqT88lx8NejTsDfBY5SY="; + hash = "sha256-JUpK4sAn5ZivjlpHO3XSBXZVDSWkjch/HRqHNrdC7b4="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; From 98615cb6dc585f3e1b4363dc6fcfe653c8aea016 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 27 Mar 2023 09:38:01 +0200 Subject: [PATCH 091/227] python310Packages.types-urllib3: 1.26.25.8 -> 1.26.25.9 --- pkgs/development/python-modules/types-urllib3/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/types-urllib3/default.nix b/pkgs/development/python-modules/types-urllib3/default.nix index 409d6584d7f7..34306f386f6f 100644 --- a/pkgs/development/python-modules/types-urllib3/default.nix +++ b/pkgs/development/python-modules/types-urllib3/default.nix @@ -5,12 +5,12 @@ buildPythonPackage rec { pname = "types-urllib3"; - version = "1.26.25.8"; + version = "1.26.25.9"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-7PQ8QtjuQ51zKhEQtJAekBenmjjayibwjkLIRgBpOSw="; + hash = "sha256-Fgcnh5vb5S8R9f7soJKkc/ONaO076Iq7RhtZzaQPubw="; }; # Module doesn't have tests From 31c05a5230806ee99f4946ca794be36a3bcc6b5b Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 27 Mar 2023 09:40:01 +0200 Subject: [PATCH 092/227] python310Packages.aioesphomeapi: 13.5.1 -> 13.6.0 Diff: https://github.com/esphome/aioesphomeapi/compare/refs/tags/v13.5.1...v13.6.0 Changelog: https://github.com/esphome/aioesphomeapi/releases/tag/v13.6.0 --- pkgs/development/python-modules/aioesphomeapi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aioesphomeapi/default.nix b/pkgs/development/python-modules/aioesphomeapi/default.nix index dfb88f77aae3..470a600810bb 100644 --- a/pkgs/development/python-modules/aioesphomeapi/default.nix +++ b/pkgs/development/python-modules/aioesphomeapi/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "aioesphomeapi"; - version = "13.5.1"; + version = "13.6.0"; format = "setuptools"; disabled = pythonOlder "3.9"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "esphome"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-ifk1psowUGVG7XafipLq5T2+5K5+psDDsX/u/GYDXdU="; + hash = "sha256-M/KgQFt603V9wzd3SGexjDU7YWwStzVPZOoMBwp52/I="; }; propagatedBuildInputs = [ From 45003ac138216f681f3a6d23e790c8c3c3a6e847 Mon Sep 17 00:00:00 2001 From: Francesco Gazzetta Date: Mon, 27 Mar 2023 10:02:51 +0200 Subject: [PATCH 093/227] yewtube: 2.10.1 -> 2.10.2 --- pkgs/applications/misc/yewtube/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/yewtube/default.nix b/pkgs/applications/misc/yewtube/default.nix index 13dabe296b3d..6f56dd8ff4e0 100644 --- a/pkgs/applications/misc/yewtube/default.nix +++ b/pkgs/applications/misc/yewtube/default.nix @@ -2,13 +2,13 @@ python3Packages.buildPythonApplication rec { pname = "yewtube"; - version = "2.10.1"; + version = "2.10.2"; src = fetchFromGitHub { owner = "mps-youtube"; repo = "yewtube"; rev = "refs/tags/v${version}"; - hash = "sha256-1qYHgMp9OZQuKDycvVwp0ADvF8xNY668JvRMVIE/dko="; + hash = "sha256-yqztce6t7VTtrumxbhbikYY54FiyUaegBPYSnF4wTkU="; }; postPatch = '' From 399396ec833c96ede55a0bd91c4826bce1752897 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 27 Mar 2023 08:18:32 +0000 Subject: [PATCH 094/227] python310Packages.scikit-hep-testdata: 0.4.28 -> 0.4.30 --- .../python-modules/scikit-hep-testdata/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/scikit-hep-testdata/default.nix b/pkgs/development/python-modules/scikit-hep-testdata/default.nix index 0e82762339ca..66836286794d 100644 --- a/pkgs/development/python-modules/scikit-hep-testdata/default.nix +++ b/pkgs/development/python-modules/scikit-hep-testdata/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "scikit-hep-testdata"; - version = "0.4.28"; + version = "0.4.30"; format = "pyproject"; disabled = pythonOlder "3.6"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "scikit-hep"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-RpjjN26zxX1VSm3G/4GMOSUbnDk3mhOSIcpzexGPuUs="; + hash = "sha256-8nmzU+aCBlGZs0O3/7gcP9zDM9LyCb6hVqW4cNKxrU4="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; From 76694fdeb3fc6e4f975cbf621df6b332b61ae35e Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Mon, 27 Mar 2023 13:47:01 +0300 Subject: [PATCH 095/227] prl-tools: refactor --- pkgs/os-specific/linux/prl-tools/default.nix | 227 ++++++++++--------- 1 file changed, 123 insertions(+), 104 deletions(-) diff --git a/pkgs/os-specific/linux/prl-tools/default.nix b/pkgs/os-specific/linux/prl-tools/default.nix index b0769f70ca48..b800e2ee98de 100644 --- a/pkgs/os-specific/linux/prl-tools/default.nix +++ b/pkgs/os-specific/linux/prl-tools/default.nix @@ -1,28 +1,39 @@ -{ stdenv -, lib +{ lib +, stdenv +, fetchurl +, autoPatchelfHook +, bbe , makeWrapper , p7zip -, gawk -, util-linux -, xorg -, glib -, dbus-glib -, zlib -, bbe -, bash -, timetrap -, netcat -, cups -, kernel ? null -, libsOnly ? false -, fetchurl -, undmg , perl -, autoPatchelfHook +, undmg +, dbus-glib +, glib +, xorg +, zlib +, kernel +, bash +, cups +, gawk +, netcat +, timetrap +, util-linux }: -assert (!libsOnly) -> kernel != null; +let + kernelVersion = kernel.modDirVersion; + kernelDir = "${kernel.dev}/lib/modules/${kernelVersion}"; + libPath = lib.concatStringsSep ":" [ "${glib.out}/lib" "${xorg.libXrandr}/lib" ]; + scriptPath = lib.concatStringsSep ":" [ + "${bash}/bin" + "${cups}/sbin" + "${gawk}/bin" + "${netcat}/bin" + "${timetrap}/bin" + "${util-linux}/bin" + ]; +in stdenv.mkDerivation rec { version = "18.2.0-53488"; pname = "prl-tools"; @@ -36,124 +47,132 @@ stdenv.mkDerivation rec { hardeningDisable = [ "pic" "format" ]; - nativeBuildInputs = [ p7zip undmg perl bbe autoPatchelfHook ] - ++ lib.optionals (!libsOnly) [ makeWrapper ] ++ kernel.moduleBuildDependencies; + nativeBuildInputs = [ + autoPatchelfHook + bbe + makeWrapper + p7zip + perl + undmg + ] ++ kernel.moduleBuildDependencies; - buildInputs = with xorg; [ libXrandr libXext libX11 libXcomposite libXinerama ] - ++ lib.optionals (!libsOnly) [ libXi glib dbus-glib zlib ]; + buildInputs = [ + dbus-glib + glib + xorg.libX11 + xorg.libXcomposite + xorg.libXext + xorg.libXrandr + xorg.libXi + xorg.libXinerama + zlib + ]; - runtimeDependencies = [ glib xorg.libXrandr ]; - - inherit libsOnly; + runtimeDependencies = [ + glib + xorg.libXrandr + ]; unpackPhase = '' + runHook preUnpack + undmg $src export sourceRoot=prl-tools-build 7z x "Parallels Desktop.app/Contents/Resources/Tools/prl-tools-lin${lib.optionalString stdenv.isAarch64 "-arm"}.iso" -o$sourceRoot - if test -z "$libsOnly"; then - ( cd $sourceRoot/kmods; tar -xaf prl_mod.tar.gz ) - fi + ( cd $sourceRoot/kmods; tar -xaf prl_mod.tar.gz ) + + runHook postUnpack ''; - kernelVersion = lib.optionalString (!libsOnly) kernel.modDirVersion; - kernelDir = lib.optionalString (!libsOnly) "${kernel.dev}/lib/modules/${kernelVersion}"; - - libPath = lib.concatStringsSep ":" [ "${glib.out}/lib" "${xorg.libXrandr}/lib" ]; - - scriptPath = lib.concatStringsSep ":" (lib.optionals (!libsOnly) [ - "${util-linux}/bin" - "${gawk}/bin" - "${bash}/bin" - "${timetrap}/bin" - "${netcat}/bin" - "${cups}/sbin" - ]); + env.NIX_CFLAGS_COMPILE = lib.optionalString (lib.versionAtLeast kernelVersion "6.3") "-Wno-incompatible-pointer-types"; buildPhase = '' - if test -z "$libsOnly"; then - ( # kernel modules - cd kmods - make -f Makefile.kmods \ - KSRC=$kernelDir/source \ - HEADERS_CHECK_DIR=$kernelDir/source \ - KERNEL_DIR=$kernelDir/build \ - SRC=$kernelDir/build \ - KVER=$kernelVersion - ) - fi + runHook preBuild + + ( # kernel modules + cd kmods + make -f Makefile.kmods \ + KSRC=${kernelDir}/source \ + HEADERS_CHECK_DIR=${kernelDir}/source \ + KERNEL_DIR=${kernelDir}/build \ + SRC=${kernelDir}/build \ + KVER=${kernelVersion} + ) + + runHook postBuild ''; installPhase = '' - if test -z "$libsOnly"; then - ( # kernel modules - cd kmods - mkdir -p $out/lib/modules/${kernelVersion}/extra - cp prl_fs/SharedFolders/Guest/Linux/prl_fs/prl_fs.ko $out/lib/modules/${kernelVersion}/extra - cp prl_fs_freeze/Snapshot/Guest/Linux/prl_freeze/prl_fs_freeze.ko $out/lib/modules/${kernelVersion}/extra - cp prl_tg/Toolgate/Guest/Linux/prl_tg/prl_tg.ko $out/lib/modules/${kernelVersion}/extra - ${lib.optionalString stdenv.isAarch64 - "cp prl_notifier/Installation/lnx/prl_notifier/prl_notifier.ko $out/lib/modules/${kernelVersion}/extra"} - ) - fi + runHook preInstall + + ( # kernel modules + cd kmods + mkdir -p $out/lib/modules/${kernelVersion}/extra + cp prl_fs/SharedFolders/Guest/Linux/prl_fs/prl_fs.ko $out/lib/modules/${kernelVersion}/extra + cp prl_fs_freeze/Snapshot/Guest/Linux/prl_freeze/prl_fs_freeze.ko $out/lib/modules/${kernelVersion}/extra + cp prl_tg/Toolgate/Guest/Linux/prl_tg/prl_tg.ko $out/lib/modules/${kernelVersion}/extra + ${lib.optionalString stdenv.isAarch64 + "cp prl_notifier/Installation/lnx/prl_notifier/prl_notifier.ko $out/lib/modules/${kernelVersion}/extra"} + ) ( # tools cd tools/tools${if stdenv.isAarch64 then "-arm64" else if stdenv.isx86_64 then "64" else "32"} mkdir -p $out/lib - if test -z "$libsOnly"; then - # prltoolsd contains hardcoded /bin/bash path - # we're lucky because it uses only -c command - # => replace to /bin/sh - bbe -e "s:/bin/bash:/bin/sh\x00\x00:" -o bin/prltoolsd.tmp bin/prltoolsd - rm -f bin/prltoolsd - mv bin/prltoolsd.tmp bin/prltoolsd + # prltoolsd contains hardcoded /bin/bash path + # we're lucky because it uses only -c command + # => replace to /bin/sh + bbe -e "s:/bin/bash:/bin/sh\x00\x00:" -o bin/prltoolsd.tmp bin/prltoolsd + rm -f bin/prltoolsd + mv bin/prltoolsd.tmp bin/prltoolsd - # install binaries - for i in bin/* sbin/prl_nettool sbin/prl_snapshot; do - # also patch binaries to replace /usr/bin/XXX to XXX - # here a two possible cases: - # 1. it is uses as null terminated string and should be truncated by null; - # 2. it is uses inside shell script and should be truncated by space. - for p in bin/* sbin/prl_nettool sbin/prl_snapshot sbin/prlfsmountd; do - p=$(basename $p) - bbe -e "s:/usr/bin/$p\x00:./$p\x00\x00\x00\x00\x00\x00\x00\x00:" -o $i.tmp $i - bbe -e "s:/usr/sbin/$p\x00:./$p\x00\x00\x00\x00\x00\x00\x00\x00 :" -o $i $i.tmp - bbe -e "s:/usr/bin/$p:$p :" -o $i.tmp $i - bbe -e "s:/usr/sbin/$p:$p :" -o $i $i.tmp - done - - install -Dm755 $i $out/$i + # install binaries + for i in bin/* sbin/prl_nettool sbin/prl_snapshot; do + # also patch binaries to replace /usr/bin/XXX to XXX + # here a two possible cases: + # 1. it is uses as null terminated string and should be truncated by null; + # 2. it is uses inside shell script and should be truncated by space. + for p in bin/* sbin/prl_nettool sbin/prl_snapshot sbin/prlfsmountd; do + p=$(basename $p) + bbe -e "s:/usr/bin/$p\x00:./$p\x00\x00\x00\x00\x00\x00\x00\x00:" -o $i.tmp $i + bbe -e "s:/usr/sbin/$p\x00:./$p\x00\x00\x00\x00\x00\x00\x00\x00 :" -o $i $i.tmp + bbe -e "s:/usr/bin/$p:$p :" -o $i.tmp $i + bbe -e "s:/usr/sbin/$p:$p :" -o $i $i.tmp done - install -Dm755 ../../tools/prlfsmountd.sh $out/sbin/prlfsmountd - for f in $out/bin/* $out/sbin/*; do - wrapProgram $f \ - --prefix LD_LIBRARY_PATH ':' "$libPath" \ - --prefix PATH ':' "$scriptPath" - done + install -Dm755 $i $out/$i + done - for i in lib/libPrl*.0.0; do - cp $i $out/lib - ln -s $out/$i $out/''${i%.0.0} - done + install -Dm755 ../../tools/prlfsmountd.sh $out/sbin/prlfsmountd + for f in $out/bin/* $out/sbin/*; do + wrapProgram $f \ + --prefix LD_LIBRARY_PATH ':' "${libPath}" \ + --prefix PATH ':' "${scriptPath}" + done - mkdir -p $out/share/man/man8 - install -Dm644 ../mount.prl_fs.8 $out/share/man/man8 + for i in lib/libPrl*.0.0; do + cp $i $out/lib + ln -s $out/$i $out/''${i%.0.0} + done - substituteInPlace ../99prltoolsd-hibernate \ - --replace "/bin/bash" "${bash}/bin/bash" + mkdir -p $out/share/man/man8 + install -Dm644 ../mount.prl_fs.8 $out/share/man/man8 - mkdir -p $out/etc/pm/sleep.d - install -Dm644 ../99prltoolsd-hibernate $out/etc/pm/sleep.d - fi + substituteInPlace ../99prltoolsd-hibernate \ + --replace "/bin/bash" "${bash}/bin/bash" + + mkdir -p $out/etc/pm/sleep.d + install -Dm644 ../99prltoolsd-hibernate $out/etc/pm/sleep.d ) + + runHook postInstall ''; meta = with lib; { description = "Parallels Tools for Linux guests"; homepage = "https://parallels.com"; - platforms = platforms.linux; license = licenses.unfree; maintainers = with maintainers; [ catap wegank ]; + platforms = platforms.linux; }; } From 830b112ebb5cdd5bb4c6e39f2af955a3f8f01762 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 27 Mar 2023 11:03:05 +0000 Subject: [PATCH 096/227] librewolf-unwrapped: 111.0-3 -> 111.0.1-1 --- .../networking/browsers/librewolf/src.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/networking/browsers/librewolf/src.json b/pkgs/applications/networking/browsers/librewolf/src.json index 63cf728a0cbf..8b0599282836 100644 --- a/pkgs/applications/networking/browsers/librewolf/src.json +++ b/pkgs/applications/networking/browsers/librewolf/src.json @@ -1,11 +1,11 @@ { - "packageVersion": "111.0-3", + "packageVersion": "111.0.1-1", "source": { - "rev": "111.0-3", - "sha256": "09vb9vi9rrm5y8ym21g52lrbbp6w4k6qpk9q13k0vxzf26wmwk5n" + "rev": "111.0.1-1", + "sha256": "045nisl000ll0pzir9zhrkbbkl87bsd38mygx7gz9kv6p0pppl7i" }, "firefox": { - "version": "111.0", - "sha512": "cdb300fdbb2b60068b0fc10a18df587b417e484901d36f52dd174d320d3440a42b02ea000f325c5781fd8853a5171b1a5184562fb535ece90619e4c64d46bb82" + "version": "111.0.1", + "sha512": "b16c9399a19cb1de2d865a023d54fbe71c23a363ea4d36cd58f41f64f7ad04bc1b9d8a8448943417516e17337e0ee2afd370c29a72b51b0947161f4ffab6935f" } } From 855b6e2ad0e08fa92956f3f9f7de0a5fc5c794ee Mon Sep 17 00:00:00 2001 From: toonn Date: Mon, 27 Mar 2023 13:28:46 +0200 Subject: [PATCH 097/227] nim-unwrapped: Add missing Security framework buildInput --- pkgs/development/compilers/nim/default.nix | 5 +++-- pkgs/top-level/all-packages.nix | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/development/compilers/nim/default.nix b/pkgs/development/compilers/nim/default.nix index 318a7ac34052..5518eb64bbd8 100644 --- a/pkgs/development/compilers/nim/default.nix +++ b/pkgs/development/compilers/nim/default.nix @@ -3,7 +3,7 @@ { lib, callPackage, buildPackages, stdenv, fetchurl, fetchgit, fetchFromGitHub , makeWrapper, openssl, pcre, readline, boehmgc, sqlite, nim-unwrapped -, nimble-unwrapped }: +, nimble-unwrapped, Security }: let parseCpu = platform: @@ -94,7 +94,8 @@ in { hash = "sha256-rO8LCrdzYE1Nc5S2hRntt0+zD0aRIpSyi8J+DHtLTcI="; }; - buildInputs = [ boehmgc openssl pcre readline sqlite ]; + buildInputs = [ boehmgc openssl pcre readline sqlite ] + ++ lib.optional stdenv.isDarwin Security; patches = [ ./NIM_CONFIG_DIR.patch diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 489e3d50e00c..ca79d2ad2505 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15579,8 +15579,9 @@ with pkgs; muonlang = callPackage ../development/compilers/muonlang { }; - inherit (callPackages ../development/compilers/nim { }) - nim-unwrapped nimble-unwrapped nim; + inherit (callPackages ../development/compilers/nim + { inherit (darwin) Security; } + ) nim-unwrapped nimble-unwrapped nim; nimPackages = recurseIntoAttrs nim.pkgs; nrpl = callPackage ../development/tools/nrpl { }; From 20659b83308a02fcf043982f6274bddec69c853c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 27 Mar 2023 13:19:14 +0000 Subject: [PATCH 098/227] python310Packages.google-cloud-spanner: 3.28.0 -> 3.29.0 --- .../python-modules/google-cloud-spanner/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-spanner/default.nix b/pkgs/development/python-modules/google-cloud-spanner/default.nix index ce2a5366ac60..922f8163e171 100644 --- a/pkgs/development/python-modules/google-cloud-spanner/default.nix +++ b/pkgs/development/python-modules/google-cloud-spanner/default.nix @@ -17,14 +17,14 @@ buildPythonPackage rec { pname = "google-cloud-spanner"; - version = "3.28.0"; + version = "3.29.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-3WA2SUC9frxafOXiGquDinwyffNrubQ4QEnfMxxC2KE="; + hash = "sha256-Dk13N2SeCGBjjwXCffLGVM0iOL6fGptRcmNidbxnzQc="; }; propagatedBuildInputs = [ From 5f29c19fab334e8ac2c0cae8c245207ff60bf397 Mon Sep 17 00:00:00 2001 From: Sebastian Neubauer Date: Mon, 27 Mar 2023 15:27:27 +0200 Subject: [PATCH 099/227] vulkan-cts: 1.3.5.0 -> 1.3.5.1 --- pkgs/tools/graphics/vulkan-cts/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/graphics/vulkan-cts/default.nix b/pkgs/tools/graphics/vulkan-cts/default.nix index 003a3c18bfbf..d0586abdcead 100644 --- a/pkgs/tools/graphics/vulkan-cts/default.nix +++ b/pkgs/tools/graphics/vulkan-cts/default.nix @@ -76,13 +76,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "vulkan-cts"; - version = "1.3.5.0"; + version = "1.3.5.1"; src = fetchFromGitHub { owner = "KhronosGroup"; repo = "VK-GL-CTS"; rev = "${finalAttrs.pname}-${finalAttrs.version}"; - hash = "sha256-RPuhcLJ5Ad41SFPjJBdghcNBPIGzZBeVWTjySWOp0KA="; + hash = "sha256-QxRtslteGb45xlLclyg5i5+w2+QGTgieAJeqjjCvaIA="; }; outputs = [ "out" "lib" ]; From 098589a3cc76a976cb8e7a3d395d0823784389ea Mon Sep 17 00:00:00 2001 From: Ilya Fedin Date: Mon, 27 Mar 2023 18:14:35 +0400 Subject: [PATCH 100/227] vokoscreen-ng: enable pipewire screen record --- pkgs/applications/video/vokoscreen-ng/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/applications/video/vokoscreen-ng/default.nix b/pkgs/applications/video/vokoscreen-ng/default.nix index 82a09bbaca7c..b20d73d7c09b 100644 --- a/pkgs/applications/video/vokoscreen-ng/default.nix +++ b/pkgs/applications/video/vokoscreen-ng/default.nix @@ -16,6 +16,7 @@ , gst-plugins-bad , gst-plugins-ugly , wayland +, pipewire , wrapQtAppsHook }: @@ -41,6 +42,7 @@ mkDerivation rec { qtmultimedia qtx11extras wayland + pipewire gst-plugins-base gst-plugins-good gst-plugins-bad From decad3f23c29fa7046da80fa3de5ec2af69dd639 Mon Sep 17 00:00:00 2001 From: Joscha Date: Mon, 27 Mar 2023 19:32:12 +0200 Subject: [PATCH 101/227] vscode-extensions.github: split up for consistency --- .../editors/vscode/extensions/default.nix | 90 +++++++++---------- 1 file changed, 44 insertions(+), 46 deletions(-) diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index bf975ce68eba..3e3831ca59d4 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -1257,59 +1257,57 @@ let }; }; - github = { - codespaces = buildVscodeMarketplaceExtension { - mktplcRef = { - publisher = "github"; - name = "codespaces"; - version = "1.14.1"; - sha256 = "sha256-oiAn/tW4jfccsY8zH6L7UzldeM7sV9tllSvgZD8c9aY="; - }; - meta = { license = lib.licenses.unfree; }; + github.codespaces = buildVscodeMarketplaceExtension { + mktplcRef = { + publisher = "github"; + name = "codespaces"; + version = "1.14.1"; + sha256 = "sha256-oiAn/tW4jfccsY8zH6L7UzldeM7sV9tllSvgZD8c9aY="; }; + meta = { license = lib.licenses.unfree; }; + }; - copilot = buildVscodeMarketplaceExtension { - mktplcRef = { - publisher = "github"; - name = "copilot"; - version = "1.78.9758"; - sha256 = "sha256-qIaaM72SenMv+vtkTMBodD2JsroZLpw8qEttr5aIDQk="; - }; - meta = { - description = "GitHub Copilot uses OpenAI Codex to suggest code and entire functions in real-time right from your editor."; - downloadPage = "https://marketplace.visualstudio.com/items?itemName=GitHub.copilot"; - homepage = "https://github.com/features/copilot"; - license = lib.licenses.unfree; - maintainers = [ lib.maintainers.Zimmi48 ]; - }; + github.copilot = buildVscodeMarketplaceExtension { + mktplcRef = { + publisher = "github"; + name = "copilot"; + version = "1.78.9758"; + sha256 = "sha256-qIaaM72SenMv+vtkTMBodD2JsroZLpw8qEttr5aIDQk="; }; + meta = { + description = "GitHub Copilot uses OpenAI Codex to suggest code and entire functions in real-time right from your editor."; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=GitHub.copilot"; + homepage = "https://github.com/features/copilot"; + license = lib.licenses.unfree; + maintainers = [ lib.maintainers.Zimmi48 ]; + }; + }; - github-vscode-theme = buildVscodeMarketplaceExtension { - mktplcRef = { - name = "github-vscode-theme"; - publisher = "github"; - version = "6.3.3"; - sha256 = "sha256-fN9ljeZlbbSNW9qggLEz5HOLZlPhHmTHNi1VsZo7Uxk="; - }; - meta = { - description = "GitHub theme for VS Code"; - downloadPage = - "https://marketplace.visualstudio.com/items?itemName=GitHub.github-vscode-theme"; - homepage = "https://github.com/primer/github-vscode-theme"; - license = lib.licenses.mit; - maintainers = [ lib.maintainers.hugolgst ]; - }; + github.github-vscode-theme = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "github-vscode-theme"; + publisher = "github"; + version = "6.3.3"; + sha256 = "sha256-fN9ljeZlbbSNW9qggLEz5HOLZlPhHmTHNi1VsZo7Uxk="; }; + meta = { + description = "GitHub theme for VS Code"; + downloadPage = + "https://marketplace.visualstudio.com/items?itemName=GitHub.github-vscode-theme"; + homepage = "https://github.com/primer/github-vscode-theme"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.hugolgst ]; + }; + }; - vscode-pull-request-github = buildVscodeMarketplaceExtension { - mktplcRef = { - name = "vscode-pull-request-github"; - publisher = "github"; - version = "0.61.2023032418"; - sha256 = "sha256-pCFq0lAMH3fno4/BtHJHhS4hX1KqxsPf4wEmAm66Y8E="; - }; - meta = { license = lib.licenses.mit; }; + github.vscode-pull-request-github = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "vscode-pull-request-github"; + publisher = "github"; + version = "0.61.2023032418"; + sha256 = "sha256-pCFq0lAMH3fno4/BtHJHhS4hX1KqxsPf4wEmAm66Y8E="; }; + meta = { license = lib.licenses.mit; }; }; gitlab.gitlab-workflow = buildVscodeMarketplaceExtension { From 09adaec7c13bfe06e22c0d151c2a72901585d13e Mon Sep 17 00:00:00 2001 From: Joscha Date: Mon, 27 Mar 2023 19:35:05 +0200 Subject: [PATCH 102/227] vscode-extensions.coenraads.bracket-pair-colorizer: remove The extension no longer exists on the marketplace. --- .../editors/vscode/extensions/default.nix | 17 ----------------- 1 file changed, 17 deletions(-) diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index 3e3831ca59d4..4c56d43c653b 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -634,23 +634,6 @@ let }; }; - coenraads.bracket-pair-colorizer = buildVscodeMarketplaceExtension { - meta = { - changelog = "https://marketplace.visualstudio.com/items/CoenraadS.bracket-pair-colorizer/changelog"; - description = "A customizable extension for colorizing matching brackets"; - downloadPage = "https://marketplace.visualstudio.com/items?itemName=CoenraadS.bracket-pair-colorizer"; - homepage = "https://github.com/CoenraadS/BracketPair"; - license = lib.licenses.mit; - maintainers = [ ]; - }; - mktplcRef = { - name = "bracket-pair-colorizer"; - publisher = "CoenraadS"; - version = "1.0.61"; - sha256 = "0r3bfp8kvhf9zpbiil7acx7zain26grk133f0r0syxqgml12i652"; - }; - }; - coenraads.bracket-pair-colorizer-2 = buildVscodeMarketplaceExtension { mktplcRef = { name = "bracket-pair-colorizer-2"; From 9c73895c06e460c4beaa9578e3a9136f737abfd8 Mon Sep 17 00:00:00 2001 From: Joscha Date: Mon, 27 Mar 2023 19:35:46 +0200 Subject: [PATCH 103/227] vscode-extensions.coenraads.bracket-pair-colorizer-2: remove The extension is deprecated as its functionality is now a native feature of VSCode. See also: https://marketplace.visualstudio.com/items?itemName=CoenraadS.bracket-pair-colorizer-2 --- .../editors/vscode/extensions/default.nix | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index 4c56d43c653b..1471c0a616e6 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -634,18 +634,6 @@ let }; }; - coenraads.bracket-pair-colorizer-2 = buildVscodeMarketplaceExtension { - mktplcRef = { - name = "bracket-pair-colorizer-2"; - publisher = "CoenraadS"; - version = "0.2.2"; - sha256 = "0zcbs7h801agfs2cggk1cz8m8j0i2ypmgznkgw17lcx3zisll9ad"; - }; - meta = { - license = lib.licenses.mit; - }; - }; - colejcummins.llvm-syntax-highlighting = buildVscodeMarketplaceExtension { mktplcRef = { name = "llvm-syntax-highlighting"; From 359124ad033209aca919cc0fa51693cf42ea207f Mon Sep 17 00:00:00 2001 From: Joscha Date: Mon, 27 Mar 2023 19:38:54 +0200 Subject: [PATCH 104/227] vscode-extensions.faustinoaq.lex-flex-yacc-bison: remove The extension no longer exists on the marketplace. --- .../editors/vscode/extensions/default.nix | 17 ----------------- 1 file changed, 17 deletions(-) diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index 1471c0a616e6..555faf7ec9a7 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -1051,23 +1051,6 @@ let }; }; - faustinoaq.lex-flex-yacc-bison = buildVscodeMarketplaceExtension { - mktplcRef = { - name = "lex-flex-yacc-bison"; - publisher = "faustinoaq"; - version = "0.0.3"; - sha256 = "6254f52157dc796eae7bf135ac88c1c9cc19d884625331a1e634f9768722cc3d"; - }; - meta = { - changelog = "https://marketplace.visualstudio.com/items/faustinoaq.lex-flex-yacc-bison/changelog"; - description = "Language support for Lex, Flex, Yacc and Bison."; - downloadPage = "https://marketplace.visualstudio.com/items?itemName=faustinoaq.lex-flex-yacc-bison"; - homepage = "https://github.com/faustinoaq/vscode-lex-flex-yacc-bison"; - license = lib.licenses.mit; - maintainers = [ lib.maintainers.emilytrau ]; - }; - }; - file-icons.file-icons = buildVscodeMarketplaceExtension { meta = { changelog = "https://marketplace.visualstudio.com/items/file-icons.file-icons/changelog"; From e8888cfda14e16c649cd6ab27d50df21c2c7f25a Mon Sep 17 00:00:00 2001 From: Joscha Date: Mon, 27 Mar 2023 19:40:09 +0200 Subject: [PATCH 105/227] vscode-extensions.msjsdiag.debugger-for-chrome: remove The extension is deprecated as VSCode now has its own debugger that covers the same functionality. See also: https://marketplace.visualstudio.com/items?itemName=msjsdiag.debugger-for-chrome --- .../editors/vscode/extensions/default.nix | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index 555faf7ec9a7..ece4db7e9b12 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -2076,18 +2076,6 @@ let ms-vsliveshare.vsliveshare = callPackage ./ms-vsliveshare.vsliveshare { }; - msjsdiag.debugger-for-chrome = buildVscodeMarketplaceExtension { - mktplcRef = { - name = "debugger-for-chrome"; - publisher = "msjsdiag"; - version = "4.12.11"; - sha256 = "sha256-9i3TgCFThnFF5ccwzS4ATj5c2Xoe/4tDFGv75jJxeQ4="; - }; - meta = { - license = lib.licenses.mit; - }; - }; - mskelton.one-dark-theme = buildVscodeMarketplaceExtension { mktplcRef = { name = "one-dark-theme"; From 4dcef4d9c91bd14990b154a4d52faf6fbfa66709 Mon Sep 17 00:00:00 2001 From: Joscha Date: Mon, 27 Mar 2023 19:42:23 +0200 Subject: [PATCH 106/227] vscode-extensions.silvenon.mdx: remove The extension is deprecated in favor of the official MDX extension at https://marketplace.visualstudio.com/items?itemName=unifiedjs.vscode-mdx See also: https://marketplace.visualstudio.com/items?itemName=silvenon.mdx --- .../editors/vscode/extensions/default.nix | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index ece4db7e9b12..dd5fe68da373 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -2486,18 +2486,6 @@ let }; }; - silvenon.mdx = buildVscodeMarketplaceExtension { - mktplcRef = { - name = "mdx"; - publisher = "silvenon"; - version = "0.1.0"; - sha256 = "1mzsqgv0zdlj886kh1yx1zr966yc8hqwmiqrb1532xbmgyy6adz3"; - }; - meta = { - license = lib.licenses.mit; - }; - }; - skellock.just = buildVscodeMarketplaceExtension { mktplcRef = { name = "just"; From aed907112c7108a25ff9a7bb9a29e9205217ae64 Mon Sep 17 00:00:00 2001 From: Charles Duffy Date: Mon, 27 Mar 2023 12:55:52 -0500 Subject: [PATCH 107/227] pcsc-safenet: switch from fetchurl to fetchzip --- pkgs/tools/security/pcsc-safenet/default.nix | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/pkgs/tools/security/pcsc-safenet/default.nix b/pkgs/tools/security/pcsc-safenet/default.nix index be86f9cd643d..c424dfb32667 100644 --- a/pkgs/tools/security/pcsc-safenet/default.nix +++ b/pkgs/tools/security/pcsc-safenet/default.nix @@ -1,7 +1,7 @@ { stdenv , lib , runCommand -, fetchurl +, fetchzip , autoPatchelfHook , dpkg , gtk3 @@ -14,24 +14,22 @@ stdenv.mkDerivation rec { pname = "pcsc-safenet"; version = "10.8.28"; + debName = "Installation/Standard/Ubuntu-2004/safenetauthenticationclient_${version}_amd64.deb"; + # extract debian package from larger zip file - src = runCommand "sac.deb" { - zipSrc = let + src = + let versionWithUnderscores = builtins.replaceStrings ["."] ["_"] version; - in fetchurl { + in fetchzip { url = "https://www.digicert.com/StaticFiles/SAC_${versionWithUnderscores}_GA_Build.zip"; - hash = "sha256-bh+TB7ZGDMh9G4lcPtv7mc0XeGhmCfMMqrlqtyGIIaA="; + hash = "sha256-7XWj3T9/KnmgQ05urOJV6dqgkAS/A2G7efnqjQO2ing="; }; - debName = "SAC ${version} GA Build/Installation/Standard/Ubuntu-2004/safenetauthenticationclient_${version}_amd64.deb"; - } '' - ${unzip}/bin/unzip -p "$zipSrc" "$debName" >"$out" - ''; dontBuild = true; dontConfigure = true; unpackPhase = '' - dpkg-deb -x $src . + dpkg-deb -x "$src/$debName" . ''; buildInputs = [ From 8b5a5c29f7ed0ab739b8581518ba9aabd2b74ffd Mon Sep 17 00:00:00 2001 From: Charles Duffy Date: Mon, 27 Mar 2023 12:56:51 -0500 Subject: [PATCH 108/227] pcsc-safenet: add comments documenting library symlink munging --- pkgs/tools/security/pcsc-safenet/default.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/security/pcsc-safenet/default.nix b/pkgs/tools/security/pcsc-safenet/default.nix index c424dfb32667..2fcbd302e8cc 100644 --- a/pkgs/tools/security/pcsc-safenet/default.nix +++ b/pkgs/tools/security/pcsc-safenet/default.nix @@ -57,15 +57,17 @@ stdenv.mkDerivation rec { mkdir "$out" cp -r ./* "$out/" + # for each library like libfoo.so.1.2.3, create symlinks to it from libfoo.so, libfoo.so.1, libfoo.so.1.2 ( cd "$out/lib/" || exit - for f in *.so.*.*.*; do - ln -sf "$f" "''${f%.*}" || exit - ln -sf "$f" "''${f%.*.*}" || exit - ln -sf "$f" "''${f%.*.*.*}" || exit + for f in *.so.*.*.*; do # find library names with three-layer suffixes + ln -sf "$f" "''${f%.*}" || exit # strip only one suffix layer + ln -sf "$f" "''${f%.*.*}" || exit # strip two suffix layers + ln -sf "$f" "''${f%.*.*.*}" || exit # strip all three suffix layers done ) || exit + # when library links are missing in pcsc/drivers, create them ( cd "$out/pcsc/drivers" || exit for f in *; do From a761d073ca9caaf226125cab1cdad34c716c6e3d Mon Sep 17 00:00:00 2001 From: Joscha Date: Mon, 27 Mar 2023 19:58:36 +0200 Subject: [PATCH 109/227] vscode-extensions.jpoinssonnier.vscode-styled-components: move to styled-components.vscode-styled-components, 1.4.1 -> 1.7.6 According to the readme, the old location will no longer receive updates: https://github.com/styled-components/vscode-styled-components --- .../editors/vscode/extensions/default.nix | 29 +++++++++++-------- 1 file changed, 17 insertions(+), 12 deletions(-) diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index dd5fe68da373..2a33974d6106 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -1550,18 +1550,6 @@ let }; }; - jpoissonnier.vscode-styled-components = buildVscodeMarketplaceExtension { - mktplcRef = { - name = "vscode-styled-components"; - publisher = "jpoissonnier"; - version = "1.4.1"; - sha256 = "sha256-ojbeuYBCS+DjF5R0aLuBImzoSOb8mXw1s0Uh0CzggzE="; - }; - meta = { - license = lib.licenses.mit; - }; - }; - justusadam.language-haskell = buildVscodeMarketplaceExtension { mktplcRef = { name = "language-haskell"; @@ -2616,6 +2604,22 @@ let }; }; + styled-components.vscode-styled-components = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "vscode-styled-components"; + publisher = "styled-components"; + version = "1.7.6"; + sha256 = "sha256-ZXXXFUriu//2Wmj1N+plj7xzJauGBfj+79SyrkUZAO4="; + }; + meta = { + changelog = "https://marketplace.visualstudio.com/items/styled-components.vscode-styled-components/changelog"; + description = "Syntax highlighting and IntelliSense for styled-components"; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=styled-components.vscode-styled-components"; + homepage = "https://github.com/styled-components/vscode-styled-components"; + license = lib.licenses.mit; + }; + }; + sumneko.lua = callPackage ./sumneko.lua { }; svelte.svelte-vscode = buildVscodeMarketplaceExtension { @@ -3161,6 +3165,7 @@ let aliases = self: super: { # aliases jakebecker.elixir-ls = super.elixir-lsp.vscode-elixir-ls; + jpoissonnier.vscode-styled-components = super.styled-components.vscode-styled-components; ms-vscode = lib.recursiveUpdate super.ms-vscode { inherit (super.golang) go; }; _1Password = throw ''_1Password has been replaced with "1Password"''; _2gua = throw ''_2gua has been replaced with "2gua"''; From 32a11f9cf16c37f2b6d030447df253cafe5af7f5 Mon Sep 17 00:00:00 2001 From: Joscha Date: Mon, 27 Mar 2023 20:01:20 +0200 Subject: [PATCH 110/227] vscode-extensions.matklad.rust-analyzer: move to alias section --- pkgs/applications/editors/vscode/extensions/default.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index 2a33974d6106..2c25798d9622 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -1749,8 +1749,6 @@ let meta.license = lib.licenses.mit; }; - matklad.rust-analyzer = self.rust-lang.rust-analyzer; # Previous publisher - matthewpi.caddyfile-support = buildVscodeMarketplaceExtension { mktplcRef = { name = "caddyfile-support"; @@ -3166,6 +3164,7 @@ let # aliases jakebecker.elixir-ls = super.elixir-lsp.vscode-elixir-ls; jpoissonnier.vscode-styled-components = super.styled-components.vscode-styled-components; + matklad.rust-analyzer = super.rust-lang.rust-analyzer; # Previous publisher ms-vscode = lib.recursiveUpdate super.ms-vscode { inherit (super.golang) go; }; _1Password = throw ''_1Password has been replaced with "1Password"''; _2gua = throw ''_2gua has been replaced with "2gua"''; From 5cfaf84ab6266931c7a43c32c4ce7fda2ce53cfe Mon Sep 17 00:00:00 2001 From: Joscha Date: Mon, 27 Mar 2023 20:28:53 +0200 Subject: [PATCH 111/227] vscode-extensions: restore alphabetical order --- .../editors/vscode/extensions/default.nix | 228 +++++++++--------- 1 file changed, 114 insertions(+), 114 deletions(-) diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index 2c25798d9622..814ec75fb785 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -451,18 +451,6 @@ let }; }; - bodil.file-browser = buildVscodeMarketplaceExtension { - mktplcRef = { - name = "file-browser"; - publisher = "bodil"; - version = "0.2.11"; - sha256 = "sha256-yPVhhsAUZxnlhj58fXkk+yhxop2q7YJ6X4W9dXGKJfo="; - }; - meta = { - license = lib.licenses.mit; - }; - }; - bierner.emojisense = buildVscodeMarketplaceExtension { mktplcRef = { name = "emojisense"; @@ -536,6 +524,18 @@ let }; }; + bodil.file-browser = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "file-browser"; + publisher = "bodil"; + version = "0.2.11"; + sha256 = "sha256-yPVhhsAUZxnlhj58fXkk+yhxop2q7YJ6X4W9dXGKJfo="; + }; + meta = { + license = lib.licenses.mit; + }; + }; + bradlc.vscode-tailwindcss = buildVscodeMarketplaceExtension { mktplcRef = { name = "vscode-tailwindcss"; @@ -594,6 +594,23 @@ let chenglou92.rescript-vscode = callPackage ./chenglou92.rescript-vscode { }; + chris-hayes.chatgpt-reborn = buildVscodeMarketplaceExtension { + meta = { + changelog = "https://marketplace.visualstudio.com/items/chris-hayes.chatgpt-reborn/changelog"; + description = "A Visual Studio Code extension to support ChatGPT, GPT-3 and Codex conversations"; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=chris-hayes.chatgpt-reborn"; + homepage = "https://github.com/christopher-hayes/vscode-chatgpt-reborn"; + license = lib.licenses.isc; + maintainers = [ lib.maintainers.drupol ]; + }; + mktplcRef = { + name = "chatgpt-reborn"; + publisher = "chris-hayes"; + version = "3.11.2"; + sha256 = "sha256-YidcekYTgPYlzfmDHHAxywF+bJE8Da3pg/TCumK4Epo="; + }; + }; + christian-kohler.path-intellisense = buildVscodeMarketplaceExtension { mktplcRef = { name = "path-intellisense"; @@ -663,23 +680,6 @@ let }; }; - chris-hayes.chatgpt-reborn = buildVscodeMarketplaceExtension { - meta = { - changelog = "https://marketplace.visualstudio.com/items/chris-hayes.chatgpt-reborn/changelog"; - description = "A Visual Studio Code extension to support ChatGPT, GPT-3 and Codex conversations"; - downloadPage = "https://marketplace.visualstudio.com/items?itemName=chris-hayes.chatgpt-reborn"; - homepage = "https://github.com/christopher-hayes/vscode-chatgpt-reborn"; - license = lib.licenses.isc; - maintainers = [ lib.maintainers.drupol ]; - }; - mktplcRef = { - name = "chatgpt-reborn"; - publisher = "chris-hayes"; - version = "3.11.2"; - sha256 = "sha256-YidcekYTgPYlzfmDHHAxywF+bJE8Da3pg/TCumK4Epo="; - }; - }; - cweijan.vscode-database-client2 = buildVscodeMarketplaceExtension { mktplcRef = { name = "vscode-database-client2"; @@ -1928,6 +1928,56 @@ let }; }; + ms-toolsai.jupyter = callPackage ./ms-toolsai.jupyter { }; + + ms-toolsai.jupyter-keymap = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "jupyter-keymap"; + publisher = "ms-toolsai"; + version = "1.1.0"; + sha256 = "sha256-krDtR+ZJiJf1Kxcu5mdXOaSAiJb2bXC1H0XWWviWeMQ="; + }; + meta = { + license = lib.licenses.mit; + }; + }; + + ms-toolsai.jupyter-renderers = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "jupyter-renderers"; + publisher = "ms-toolsai"; + version = "1.0.15"; + sha256 = "sha256-JR6PunvRRTsSqjSGGAn/1t1B+Ia6X0MgqahehcuSNYA="; + }; + meta = { + license = lib.licenses.mit; + }; + }; + + ms-toolsai.vscode-jupyter-cell-tags = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "vscode-jupyter-cell-tags"; + publisher = "ms-toolsai"; + version = "0.1.8"; + sha256 = "sha256-0oPyptnUWL1h/H13SdR+FdgGzVwEpTaK9SCE7BvI/5M="; + }; + meta = { + license = lib.licenses.mit; + }; + }; + + ms-toolsai.vscode-jupyter-slideshow = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "vscode-jupyter-slideshow"; + publisher = "ms-toolsai"; + version = "0.1.5"; + sha256 = "1p6r5vkzvwvxif3wxqi9599vplabzig27fzzz0bx9z0awfglzyi7"; + }; + meta = { + license = lib.licenses.mit; + }; + }; + ms-vscode.anycode = buildVscodeMarketplaceExtension { mktplcRef = { name = "anycode"; @@ -1992,8 +2042,6 @@ let }; }; - ms-vscode-remote.remote-ssh = callPackage ./ms-vscode-remote.remote-ssh { }; - ms-vscode.theme-tomorrowkit = buildVscodeMarketplaceExtension { mktplcRef = { name = "Theme-TomorrowKit"; @@ -2010,55 +2058,7 @@ let }; }; - ms-toolsai.jupyter = callPackage ./ms-toolsai.jupyter { }; - - ms-toolsai.jupyter-keymap = buildVscodeMarketplaceExtension { - mktplcRef = { - name = "jupyter-keymap"; - publisher = "ms-toolsai"; - version = "1.1.0"; - sha256 = "sha256-krDtR+ZJiJf1Kxcu5mdXOaSAiJb2bXC1H0XWWviWeMQ="; - }; - meta = { - license = lib.licenses.mit; - }; - }; - - ms-toolsai.jupyter-renderers = buildVscodeMarketplaceExtension { - mktplcRef = { - name = "jupyter-renderers"; - publisher = "ms-toolsai"; - version = "1.0.15"; - sha256 = "sha256-JR6PunvRRTsSqjSGGAn/1t1B+Ia6X0MgqahehcuSNYA="; - }; - meta = { - license = lib.licenses.mit; - }; - }; - - ms-toolsai.vscode-jupyter-cell-tags = buildVscodeMarketplaceExtension { - mktplcRef = { - name = "vscode-jupyter-cell-tags"; - publisher = "ms-toolsai"; - version = "0.1.8"; - sha256 = "sha256-0oPyptnUWL1h/H13SdR+FdgGzVwEpTaK9SCE7BvI/5M="; - }; - meta = { - license = lib.licenses.mit; - }; - }; - - ms-toolsai.vscode-jupyter-slideshow = buildVscodeMarketplaceExtension { - mktplcRef = { - name = "vscode-jupyter-slideshow"; - publisher = "ms-toolsai"; - version = "0.1.5"; - sha256 = "1p6r5vkzvwvxif3wxqi9599vplabzig27fzzz0bx9z0awfglzyi7"; - }; - meta = { - license = lib.licenses.mit; - }; - }; + ms-vscode-remote.remote-ssh = callPackage ./ms-vscode-remote.remote-ssh { }; ms-vsliveshare.vsliveshare = callPackage ./ms-vsliveshare.vsliveshare { }; @@ -2137,6 +2137,18 @@ let }; }; + octref.vetur = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "vetur"; + publisher = "octref"; + version = "0.37.3"; + sha256 = "sha256-3hi1LOZto5AYaomB9ihkAt4j/mhkCDJ8Jqa16piwHIQ="; + }; + meta = { + license = lib.licenses.mit; + }; + }; + oderwat.indent-rainbow = buildVscodeMarketplaceExtension { mktplcRef = { name = "indent-rainbow"; @@ -2153,18 +2165,6 @@ let }; }; - octref.vetur = buildVscodeMarketplaceExtension { - mktplcRef = { - name = "vetur"; - publisher = "octref"; - version = "0.37.3"; - sha256 = "sha256-3hi1LOZto5AYaomB9ihkAt4j/mhkCDJ8Jqa16piwHIQ="; - }; - meta = { - license = lib.licenses.mit; - }; - }; - phoenixframework.phoenix = buildVscodeMarketplaceExtension { mktplcRef = { name = "phoenix"; @@ -2263,6 +2263,16 @@ let }; }; + redhat.vscode-xml = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "vscode-xml"; + publisher = "redhat"; + version = "0.25.2023032304"; + sha256 = "sha256-3hU/MZU9dP91p2PVycFL6yg/nf4/x8tt76vmlkiHnE8="; + }; + meta.license = lib.licenses.epl20; + }; + redhat.vscode-yaml = buildVscodeMarketplaceExtension { mktplcRef = { name = "vscode-yaml"; @@ -2275,16 +2285,6 @@ let }; }; - redhat.vscode-xml = buildVscodeMarketplaceExtension { - mktplcRef = { - name = "vscode-xml"; - publisher = "redhat"; - version = "0.25.2023032304"; - sha256 = "sha256-3hU/MZU9dP91p2PVycFL6yg/nf4/x8tt76vmlkiHnE8="; - }; - meta.license = lib.licenses.epl20; - }; - richie5um2.snake-trail = buildVscodeMarketplaceExtension { mktplcRef = { name = "snake-trail"; @@ -2333,18 +2333,6 @@ let }; }; - rubymaniac.vscode-paste-and-indent = buildVscodeMarketplaceExtension { - mktplcRef = { - name = "vscode-paste-and-indent"; - publisher = "Rubymaniac"; - version = "0.0.8"; - sha256 = "0fqwcvwq37ndms6vky8jjv0zliy6fpfkh8d9raq8hkinfxq6klgl"; - }; - meta = { - license = lib.licenses.mit; - }; - }; - rubbersheep.gi = buildVscodeMarketplaceExtension { mktplcRef = { name = "gi"; @@ -2357,6 +2345,18 @@ let }; }; + rubymaniac.vscode-paste-and-indent = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "vscode-paste-and-indent"; + publisher = "Rubymaniac"; + version = "0.0.8"; + sha256 = "0fqwcvwq37ndms6vky8jjv0zliy6fpfkh8d9raq8hkinfxq6klgl"; + }; + meta = { + license = lib.licenses.mit; + }; + }; + rust-lang.rust-analyzer = callPackage ./rust-lang.rust-analyzer { }; ryu1kn.partial-diff = buildVscodeMarketplaceExtension { From bfee95c1a12b46ec247b53b18a94d6404708155e Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 27 Mar 2023 20:38:56 +0200 Subject: [PATCH 112/227] python310Packages.reolink-aio: 0.5.6 -> 0.5.7 Changelog: https://github.com/starkillerOG/reolink_aio/releases/tag/0.5.7 --- pkgs/development/python-modules/reolink-aio/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/reolink-aio/default.nix b/pkgs/development/python-modules/reolink-aio/default.nix index ce0492180414..10a336905baa 100644 --- a/pkgs/development/python-modules/reolink-aio/default.nix +++ b/pkgs/development/python-modules/reolink-aio/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "reolink-aio"; - version = "0.5.6"; + version = "0.5.7"; format = "setuptools"; disabled = pythonOlder "3.9"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "starkillerOG"; repo = "reolink_aio"; rev = "refs/tags/${version}"; - hash = "sha256-tkmaWD+OfJfI3QjvdQivmqi8kv5Yuk2UxLlYw8hVocY="; + hash = "sha256-orNKPm51rOOM49+RUUjI7+gTo3GoQv5h7b/gPFFZBTE="; }; postPatch = '' From 6e8f5201e547bd7bba53a3c5650096ccf2671b7a Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 27 Mar 2023 20:40:50 +0200 Subject: [PATCH 113/227] python310Packages.yalexs-ble: 2.1.10 -> 2.1.12 Changelog: https://github.com/bdraco/yalexs-ble/blob/v2.1.12/CHANGELOG.md --- pkgs/development/python-modules/yalexs-ble/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/yalexs-ble/default.nix b/pkgs/development/python-modules/yalexs-ble/default.nix index b9bd837c169b..fd36854ebb6e 100644 --- a/pkgs/development/python-modules/yalexs-ble/default.nix +++ b/pkgs/development/python-modules/yalexs-ble/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "yalexs-ble"; - version = "2.1.10"; + version = "2.1.12"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "bdraco"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-B1ncj/5Z+V+mXTW+bY7BXsKjwaH8SgZI6nDZn6Qc754="; + hash = "sha256-+Kae+mqx4ySXX8FlpVPdbXOJ3IsYfgdm7mM5V8f9JOI="; }; nativeBuildInputs = [ From fc69cf51a5b028acb426d372de3f1be9377e2bba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Mon, 27 Mar 2023 21:22:02 +0200 Subject: [PATCH 114/227] libowfat: 0.32 -> 0.33 --- pkgs/development/libraries/libowfat/default.nix | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/pkgs/development/libraries/libowfat/default.nix b/pkgs/development/libraries/libowfat/default.nix index 3dfb910f1cd6..a04050458edf 100644 --- a/pkgs/development/libraries/libowfat/default.nix +++ b/pkgs/development/libraries/libowfat/default.nix @@ -2,21 +2,13 @@ stdenv.mkDerivation rec { pname = "libowfat"; - version = "0.32"; + version = "0.33"; src = fetchurl { url = "https://www.fefe.de/libowfat/${pname}-${version}.tar.xz"; - sha256 = "1hcqg7pvy093bxx8wk7i4gvbmgnxz2grxpyy7b4mphidjbcv7fgl"; + sha256 = "sha256-MR7Is/S3K7RC4yP7ATqY+Vb6dFVH8ryUVih7INAnzX0="; }; - patches = [ - (fetchurl { - name = "first_deferred.patch"; - url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/dev-libs/libowfat/files/libowfat-0.32-gcc10.patch?id=129f4ab9f8571c651937c46ba7bd4c82d6d052a2"; - sha256 = "zxWb9qq5dkDucOsiPfGG1Gb4BZ6HmhBjgSe3tBnydP4="; - }) - ]; - # Fix for glibc 2.34 from Gentoo # https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=914a4aa87415dabfe77181a2365766417a5919a4 postPatch = '' @@ -26,6 +18,9 @@ stdenv.mkDerivation rec { # remove unneeded definition of __deprecated__ sed '/^#define __deprecated__$/d' -i scan/scan_iso8601.c scan/scan_httpdate.c || die ''; + preBuild = '' + make headers + ''; makeFlags = [ "prefix=$(out)" ]; enableParallelBuilding = true; From 816a6f60d409a979afff51eb77be4bad6dc650ce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Mon, 27 Mar 2023 21:25:34 +0200 Subject: [PATCH 115/227] opentracker: 2018-05-26 -> 2021-08-23 --- pkgs/applications/networking/p2p/opentracker/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/p2p/opentracker/default.nix b/pkgs/applications/networking/p2p/opentracker/default.nix index ac0aeba97215..ebc105147d3d 100644 --- a/pkgs/applications/networking/p2p/opentracker/default.nix +++ b/pkgs/applications/networking/p2p/opentracker/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation { pname = "opentracker"; - version = "unstable-2018-05-26"; + version = "unstable-2021-08-23"; src = fetchgit { url = "https://erdgeist.org/gitweb/opentracker"; - rev = "6411f1567f64248b0d145493c2e61004d2822623"; - sha256 = "110nfb6n4clykwdzpk54iccsfjawq0krjfqhg114i1z0ri5dyl8j"; + rev = "110868ec4ebe60521d5a4ced63feca6a1cf0aa2a"; + sha256 = "sha256-SuElfmk7zONolTiyg0pyvbfvyJRn3r9OrXwpTzLw8LI="; }; buildInputs = [ libowfat zlib ]; From c7f5ccaef9fb0bcb992797a88b9811d090aff14f Mon Sep 17 00:00:00 2001 From: Joscha Date: Mon, 27 Mar 2023 22:18:21 +0200 Subject: [PATCH 116/227] vscode-extensions: lowercase remaining extension names In practice, the vast majority of extensions with uppercase characters in their extension identifiers was already using lowercased versions of the identifiers as names. This commit documents this practice and converts the four remaining extensions. --- .../editors/vscode/extensions/default.nix | 31 ++++++++++++------- 1 file changed, 20 insertions(+), 11 deletions(-) diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index 814ec75fb785..282b2800ec75 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -25,11 +25,13 @@ let inherit (vscode-utils) buildVscodeMarketplaceExtension; # - # Unless there is a good reason not to, we attempt to use the same name as the - # extension's unique identifier (the name the extension gets when installed - # from vscode under `~/.vscode`) and found on the marketplace extension page. - # So an extension's attribute name should be of the form: - # "${mktplcRef.publisher}.${mktplcRef.name}". + # Unless there is a good reason not to, we attempt to use the lowercase + # version of the extension's unique identifier. The unique identifier can be + # found on the marketplace extension page, and is the name under which the + # extension is installed by VSCode under `~/.vscode`. + # + # This means an extension should be located at + # ${lib.strings.toLower mktplcRef.publisher}.${lib.string.toLower mktplcRef.name} # baseExtensions = self: lib.mapAttrs (_n: lib.recurseIntoAttrs) { @@ -253,7 +255,7 @@ let }; }; - Arjun.swagger-viewer = buildVscodeMarketplaceExtension { + arjun.swagger-viewer = buildVscodeMarketplaceExtension { mktplcRef = { publisher = "Arjun"; name = "swagger-viewer"; @@ -2026,7 +2028,7 @@ let }; }; - ms-vscode.PowerShell = buildVscodeMarketplaceExtension { + ms-vscode.powershell = buildVscodeMarketplaceExtension { mktplcRef = { name = "PowerShell"; publisher = "ms-vscode"; @@ -2297,7 +2299,7 @@ let }; }; - rioj7.commandOnAllFiles = buildVscodeMarketplaceExtension { + rioj7.commandonallfiles = buildVscodeMarketplaceExtension { mktplcRef = { name = "commandOnAllFiles"; publisher = "rioj7"; @@ -3028,7 +3030,7 @@ let }; }; - WakaTime.vscode-wakatime = callPackage ./WakaTime.vscode-wakatime { }; + wakatime.vscode-wakatime = callPackage ./WakaTime.vscode-wakatime { }; wholroyd.jinja = buildVscodeMarketplaceExtension { mktplcRef = { @@ -3161,11 +3163,18 @@ let }; aliases = self: super: { - # aliases + Arjun.swagger-viewer = super.arjun.swagger-viewer; jakebecker.elixir-ls = super.elixir-lsp.vscode-elixir-ls; jpoissonnier.vscode-styled-components = super.styled-components.vscode-styled-components; matklad.rust-analyzer = super.rust-lang.rust-analyzer; # Previous publisher - ms-vscode = lib.recursiveUpdate super.ms-vscode { inherit (super.golang) go; }; + ms-vscode = lib.recursiveUpdate super.ms-vscode { + go = super.golang.go; + PowerShell = super.ms-vscode.powershell; + }; + rioj7 = lib.recursiveUpdate super.rioj7 { + commandOnAllFiles = super.rioj7.commandonallfiles; + }; + WakaTime.vscode-wakatime = super.wakatime.vscode-wakatime; _1Password = throw ''_1Password has been replaced with "1Password"''; _2gua = throw ''_2gua has been replaced with "2gua"''; _4ops = throw ''_4ops has been replaced with "4ops"''; From 052bb41410760535a5360cbb591cb54d538c2bcd Mon Sep 17 00:00:00 2001 From: pennae Date: Mon, 27 Mar 2023 22:39:11 +0200 Subject: [PATCH 117/227] doc: assign ids to many headings without stable ids on headings we cannot generate stable links to these headings. nrd complains about this, but the current docbook workflow does not. a few generated ids remain, mostly in examples and footnotes. most of the examples are generated by nixdoc (which has since gained MD export functions, and the MD export does generate IDs). --- doc/builders/fetchers.chapter.md | 2 +- doc/builders/images/binarycache.section.md | 2 +- doc/builders/images/dockertools.section.md | 4 ++-- doc/builders/images/makediskimage.section.md | 10 +++++----- doc/builders/special/makesetuphook.section.md | 4 ++-- doc/builders/special/mkshell.section.md | 4 ++-- doc/builders/testers.chapter.md | 4 ++-- .../submitting-changes.chapter.md | 2 +- doc/languages-frameworks/agda.section.md | 2 +- doc/languages-frameworks/beam.section.md | 4 ++-- doc/languages-frameworks/chicken.section.md | 6 +++--- doc/languages-frameworks/cuelang.section.md | 4 ++-- doc/languages-frameworks/haskell.section.md | 20 +++++++++---------- .../javascript.section.md | 12 +++++------ .../pkg-config.section.md | 8 ++++---- doc/languages-frameworks/python.section.md | 8 ++++---- doc/languages-frameworks/ruby.section.md | 2 +- doc/languages-frameworks/vim.section.md | 6 +++--- doc/manual.xml | 11 +++++----- doc/stdenv/meta.chapter.md | 4 ++-- doc/stdenv/stdenv.chapter.md | 14 ++++++------- 21 files changed, 67 insertions(+), 66 deletions(-) diff --git a/doc/builders/fetchers.chapter.md b/doc/builders/fetchers.chapter.md index ecff01894840..b86fffa46042 100644 --- a/doc/builders/fetchers.chapter.md +++ b/doc/builders/fetchers.chapter.md @@ -3,7 +3,7 @@ Building software with Nix often requires downloading source code and other files from the internet. `nixpkgs` provides *fetchers* for different protocols and services. Fetchers are functions that simplify downloading files. -## Caveats +## Caveats {#chap-pkgs-fetchers-caveats} Fetchers create [fixed output derivations](https://nixos.org/manual/nix/stable/#fixed-output-drvs) from downloaded files. Nix can reuse the downloaded files via the hash of the resulting derivation. diff --git a/doc/builders/images/binarycache.section.md b/doc/builders/images/binarycache.section.md index fe2772f33b4b..62e47dad7c66 100644 --- a/doc/builders/images/binarycache.section.md +++ b/doc/builders/images/binarycache.section.md @@ -6,7 +6,7 @@ Nix packages are most commonly shared between machines using [HTTP, SSH, or S3]( Note that this function is meant for advanced use-cases. The more idiomatic way to work with flat-file binary caches is via the [nix-copy-closure](https://nixos.org/manual/nix/stable/command-ref/nix-copy-closure.html) command. You may also want to consider [dockerTools](#sec-pkgs-dockerTools) for your containerization needs. -## Example +## Example {#sec-pkgs-binary-cache-example} The following derivation will construct a flat-file binary cache containing the closure of `hello`. diff --git a/doc/builders/images/dockertools.section.md b/doc/builders/images/dockertools.section.md index 2467739a1a5e..3ac4f224b5de 100644 --- a/doc/builders/images/dockertools.section.md +++ b/doc/builders/images/dockertools.section.md @@ -410,7 +410,7 @@ If the derivation is fully buildable (i.e. `nix-build` can be used on it), runni The behavior doesn't match `nix-shell` or `nix-build` exactly and this function is known not to work correctly for e.g. fixed-output derivations, content-addressed derivations, impure derivations and other special types of derivations. ::: -### Arguments +### Arguments {#ssec-pkgs-dockerTools-buildNixShellImage-arguments} `drv` @@ -473,7 +473,7 @@ The behavior doesn't match `nix-shell` or `nix-build` exactly and this function *Default:* (none) -### Example +### Example {#ssec-pkgs-dockerTools-buildNixShellImage-example} The following shows how to build the `pkgs.hello` package inside a Docker container built with `buildNixShellImage`. diff --git a/doc/builders/images/makediskimage.section.md b/doc/builders/images/makediskimage.section.md index c4566e753108..e50479c4e83e 100644 --- a/doc/builders/images/makediskimage.section.md +++ b/doc/builders/images/makediskimage.section.md @@ -12,12 +12,12 @@ Whereas for many web servers, applications, it is possible to work with a Nix st NixOS tests also use this function when preparing the VM. The `cptofs` method is used when `virtualisation.useBootLoader` is false (the default). Otherwise the second method is used. -## Features +## Features {#sec-make-disk-image-features} For reference, read the function signature source code for documentation on arguments: . Features are separated in various sections depending on if you opt for a Nix-store only image or a full NixOS image. -### Common +### Common {#sec-make-disk-image-features-common} - arbitrary NixOS configuration - automatic or bound disk size: `diskSize` parameter, `additionalSpace` can be set when `diskSize` is `auto` to add a constant of disk space @@ -29,7 +29,7 @@ Features are separated in various sections depending on if you opt for a Nix-sto - the current nixpkgs can be realized as a channel in the disk image, which will change the hash of the image when the sources are updated - additional store paths can be provided through `additionalPaths` -### Full NixOS image +### Full NixOS image {#sec-make-disk-image-features-full-image} - arbitrary contents with permissions can be placed in the target filesystem using `contents` - a `/etc/nixpkgs/nixos/configuration.nix` can be provided through `configFile` @@ -37,7 +37,7 @@ Features are separated in various sections depending on if you opt for a Nix-sto - EFI variables can be mutated during image production and the result is exposed in `$out` - boot partition size when partition table is `efi` or `hybrid` -### On bit-to-bit reproducibility +### On bit-to-bit reproducibility {#sec-make-disk-image-features-reproducibility} Images are **NOT** deterministic, please do not hesitate to try to fix this, source of determinisms are (not exhaustive) : @@ -47,7 +47,7 @@ Images are **NOT** deterministic, please do not hesitate to try to fix this, sou A `deterministic` flag is available for best efforts determinism. -## Usage +## Usage {#sec-make-disk-image-usage} To produce a Nix-store only image: ```nix diff --git a/doc/builders/special/makesetuphook.section.md b/doc/builders/special/makesetuphook.section.md index 90d75c5491cf..fee508dc29c2 100644 --- a/doc/builders/special/makesetuphook.section.md +++ b/doc/builders/special/makesetuphook.section.md @@ -12,7 +12,7 @@ pkgs.makeSetupHook { } ./script.sh ``` -#### setup hook that depends on the hello package and runs hello and @shell@ is substituted with path to bash +#### setup hook that depends on the hello package and runs hello and @shell@ is substituted with path to bash {#sec-pkgs.makeSetupHook-usage-example} ```nix pkgs.makeSetupHook { @@ -27,7 +27,7 @@ pkgs.makeSetupHook { '') ``` -## Attributes +## Attributes {#sec-pkgs.makeSetupHook-attributes} * `name` Set the name of the hook. * `propagatedBuildInputs` Runtime dependencies (such as binaries) of the hook. diff --git a/doc/builders/special/mkshell.section.md b/doc/builders/special/mkshell.section.md index 73cc57f485bd..96d43535955f 100644 --- a/doc/builders/special/mkshell.section.md +++ b/doc/builders/special/mkshell.section.md @@ -20,7 +20,7 @@ pkgs.mkShell { } ``` -## Attributes +## Attributes {#sec-pkgs-mkShell-attributes} * `name` (default: `nix-shell`). Set the name of the derivation. * `packages` (default: `[]`). Add executable packages to the `nix-shell` environment. @@ -29,7 +29,7 @@ pkgs.mkShell { ... all the attributes of `stdenv.mkDerivation`. -## Building the shell +## Building the shell {#sec-pkgs-mkShell-building} This derivation output will contain a text file that contains a reference to all the build inputs. This is useful in CI where we want to make sure that diff --git a/doc/builders/testers.chapter.md b/doc/builders/testers.chapter.md index a0f0f97f9d53..a644262fd9c9 100644 --- a/doc/builders/testers.chapter.md +++ b/doc/builders/testers.chapter.md @@ -178,7 +178,7 @@ letting NixOS invoke Nixpkgs anew. If a test machine needs to set NixOS options under `nixpkgs`, it must set only the `nixpkgs.pkgs` option. -### Parameter +### Parameter {#tester-nixosTest-parameter} A [NixOS VM test network](https://nixos.org/nixos/manual/index.html#sec-nixos-tests), or path to it. Example: @@ -200,7 +200,7 @@ A [NixOS VM test network](https://nixos.org/nixos/manual/index.html#sec-nixos-te } ``` -### Result +### Result {#tester-nixosTest-result} A derivation that runs the VM test. diff --git a/doc/contributing/submitting-changes.chapter.md b/doc/contributing/submitting-changes.chapter.md index 96e2ecf970cb..30fe4fa47d0d 100644 --- a/doc/contributing/submitting-changes.chapter.md +++ b/doc/contributing/submitting-changes.chapter.md @@ -290,7 +290,7 @@ Other examples of reasons are: - The previous download links were all broken - Crash when starting on some X11 systems -#### Acceptable backport criteria +#### Acceptable backport criteria {#acceptable-backport-criteria} The stable branch does have some changes which cannot be backported. Most notable are breaking changes. The desire is to have stable users be uninterrupted when updating packages. diff --git a/doc/languages-frameworks/agda.section.md b/doc/languages-frameworks/agda.section.md index d9ed56fb83fc..ff3d70ef0c62 100644 --- a/doc/languages-frameworks/agda.section.md +++ b/doc/languages-frameworks/agda.section.md @@ -216,7 +216,7 @@ you can test whether it builds correctly by writing in a comment: @ofborg build agdaPackages.iowa-stdlib ``` -### Maintaining Agda packages +### Maintaining Agda packages {#agda-maintaining-packages} As mentioned before, the aim is to have a compatible, and up-to-date package set. These two conditions sometimes exclude each other: diff --git a/doc/languages-frameworks/beam.section.md b/doc/languages-frameworks/beam.section.md index 0ef0c830ef8c..4c1650781f05 100644 --- a/doc/languages-frameworks/beam.section.md +++ b/doc/languages-frameworks/beam.section.md @@ -281,11 +281,11 @@ mkShell { } ``` -### Using an overlay +### Using an overlay {#beam-using-overlays} If you need to use an overlay to change some attributes of a derivation, e.g. if you need a bugfix from a version that is not yet available in nixpkgs, you can override attributes such as `version` (and the corresponding `hash`) and then use this overlay in your development environment: -#### `shell.nix` +#### `shell.nix` {#beam-using-overlays-shell.nix} ```nix let diff --git a/doc/languages-frameworks/chicken.section.md b/doc/languages-frameworks/chicken.section.md index d8c35bd20c50..d329943dc3c2 100644 --- a/doc/languages-frameworks/chicken.section.md +++ b/doc/languages-frameworks/chicken.section.md @@ -4,7 +4,7 @@ [R⁵RS](https://schemers.org/Documents/Standards/R5RS/HTML/)-compliant Scheme compiler. It includes an interactive mode and a custom package format, "eggs". -## Using Eggs +## Using Eggs {#sec-chicken-using} Eggs described in nixpkgs are available inside the `chickenPackages.chickenEggs` attrset. Including an egg as a build input is @@ -22,7 +22,7 @@ might write: Both `chicken` and its eggs have a setup hook which configures the environment variables `CHICKEN_INCLUDE_PATH` and `CHICKEN_REPOSITORY_PATH`. -## Updating Eggs +## Updating Eggs {#sec-chicken-updating-eggs} nixpkgs only knows about a subset of all published eggs. It uses [egg2nix](https://github.com/the-kenny/egg2nix) to generate a @@ -36,7 +36,7 @@ $ cd pkgs/development/compilers/chicken/5/ $ egg2nix eggs.scm > eggs.nix ``` -## Adding Eggs +## Adding Eggs {#sec-chicken-adding-eggs} When we run `egg2nix`, we obtain one collection of eggs with mutually-compatible versions. This means that when we add new eggs, we may diff --git a/doc/languages-frameworks/cuelang.section.md b/doc/languages-frameworks/cuelang.section.md index ef408c7bb19b..86304208aa20 100644 --- a/doc/languages-frameworks/cuelang.section.md +++ b/doc/languages-frameworks/cuelang.section.md @@ -7,7 +7,7 @@ - do configuration akin to [Dhall Lang](https://dhall-lang.org/) - perform data validation -## Cuelang schema quick start +## Cuelang schema quick start {#cuelang-quickstart} Cuelang schemas are similar to JSON, here is a quick cheatsheet: @@ -21,7 +21,7 @@ Cuelang schemas are similar to JSON, here is a quick cheatsheet: - Read to learn more about the semantics. - Read to learn about the language specification. -## `writeCueValidator` +## `writeCueValidator` {#cuelang-writeCueValidator} Nixpkgs provides a `pkgs.writeCueValidator` helper, which will write a validation script based on the provided Cuelang schema. diff --git a/doc/languages-frameworks/haskell.section.md b/doc/languages-frameworks/haskell.section.md index ec123e7c7bac..4b4f52312940 100644 --- a/doc/languages-frameworks/haskell.section.md +++ b/doc/languages-frameworks/haskell.section.md @@ -160,7 +160,7 @@ All `haskell.packages.*` package sets use the same package descriptions and the of versions by default. There are however GHC version specific override `.nix` files to loosen this a bit. -### Dependency resolution +### Dependency resolution {#haskell-dependency-resolution} Normally when you build Haskell packages with `cabal-install`, `cabal-install` does dependency resolution. It will look at all Haskell package versions known @@ -230,7 +230,7 @@ specification, test suites, benchmarks etc. by compiling and invoking the package's `Setup.hs`. It does *not* use or invoke the `cabal-install` binary, but uses the underlying `Cabal` library instead. -### General arguments +### General arguments {#haskell-derivation-args} `pname` : Package name, assumed to be the same as on Hackage (if applicable) @@ -479,7 +479,7 @@ are especially useful when writing [overrides](#haskell-overriding-haskell-packa when you want to make sure that they are definitely included. However, it is recommended to use the more accurate ones listed above when possible. -### Meta attributes +### Meta attributes {#haskell-derivation-meta} `haskellPackages.mkDerivation` accepts the following attributes as direct arguments which are transparently set in `meta` of the resulting derivation. See @@ -714,7 +714,7 @@ editor plugin to achieve this. ## Overriding Haskell packages {#haskell-overriding-haskell-packages} -### Overriding a single package +### Overriding a single package {#haskell-overriding-a-single-package} @@ -803,7 +803,7 @@ lib.pipe my-haskell-package [ ] ``` -#### `haskell.lib.compose` +#### `haskell.lib.compose` {#haskell-haskell.lib.compose} The base interface for all overriding is the following function: @@ -826,7 +826,7 @@ following overview. Refer to the [documentation of `haskellPackages.mkDerivation`](#haskell-mkderivation) for a more detailed description of the effects of the respective arguments. -##### Packaging Helpers +##### Packaging Helpers {#haskell-packaging-helpers} `overrideSrc { src, version } drv` : Replace the source used for building `drv` with the path or derivation given @@ -875,7 +875,7 @@ sometimes necessary when working with versioned packages in altogether. Useful if it fails to evaluate cleanly and is causing noise in the evaluation errors tab on Hydra. -##### Development Helpers +##### Development Helpers {#haskell-development-helpers} `sdistTarball drv` : Create a source distribution tarball like those found on Hackage @@ -913,7 +913,7 @@ for debugging with e.g. `gdb`. -##### Trivial Helpers +##### Trivial Helpers {#haskell-trivial-helpers} `doJailbreak drv` : Sets the `jailbreak` argument to `true` for `drv`. @@ -998,7 +998,7 @@ benchmark component. `dontCoverage drv` : Sets the `doCoverage` argument to `false` for `drv`. -#### Library functions in the Haskell package sets +#### Library functions in the Haskell package sets {#haskell-package-set-lib-functions} Some library functions depend on packages from the Haskell package sets. Thus they are exposed from those instead of from `haskell.lib.compose` which can only access what is @@ -1062,7 +1062,7 @@ it does for the unstable branches. ## F.A.Q. {#haskell-faq} -### Why is topic X not covered in this section? Why is section Y missing? +### Why is topic X not covered in this section? Why is section Y missing? {#haskell-why-not-covered} We have been working on [moving the nixpkgs Haskell documentation back into the nixpkgs manual](https://github.com/NixOS/nixpkgs/issues/121403). Since this diff --git a/doc/languages-frameworks/javascript.section.md b/doc/languages-frameworks/javascript.section.md index 76cf6e03c257..6d5e465ec337 100644 --- a/doc/languages-frameworks/javascript.section.md +++ b/doc/languages-frameworks/javascript.section.md @@ -6,16 +6,16 @@ This contains instructions on how to package javascript applications. The various tools available will be listed in the [tools-overview](#javascript-tools-overview). Some general principles for packaging will follow. Finally some tool specific instructions will be given. -## Getting unstuck / finding code examples +## Getting unstuck / finding code examples {#javascript-finding-examples} If you find you are lacking inspiration for packing javascript applications, the links below might prove useful. Searching online for prior art can be helpful if you are running into solved problems. -### Github +### Github {#javascript-finding-examples-github} - Searching Nix files for `mkYarnPackage`: - Searching just `flake.nix` files for `mkYarnPackage`: -### Gitlab +### Gitlab {#javascript-finding-examples-gitlab} - Searching Nix files for `mkYarnPackage`: - Searching just `flake.nix` files for `mkYarnPackage`: @@ -105,7 +105,7 @@ After you have identified the correct system, you need to override your package }); ``` -### Adding and Updating Javascript packages in nixpkgs +### Adding and Updating Javascript packages in nixpkgs {#javascript-adding-or-updating-packages} To add a package from NPM to nixpkgs: @@ -140,7 +140,7 @@ To update NPM packages in nixpkgs, run the same `generate.sh` script: ./pkgs/development/node-packages/generate.sh ``` -#### Git protocol error +#### Git protocol error {#javascript-git-error} Some packages may have Git dependencies from GitHub specified with `git://`. GitHub has [disabled unecrypted Git connections](https://github.blog/2021-09-01-improving-git-protocol-security-github/#no-more-unauthenticated-git), so you may see the following error when running the generate script: @@ -288,7 +288,7 @@ configurePhase = '' This will generate a derivation including the `node_modules` directory. If you have to build a derivation for an integrated web framework (rails, phoenix..), this is probably the easiest way. -#### Overriding dependency behavior +#### Overriding dependency behavior {#javascript-mkYarnPackage-overriding-dependencies} In the `mkYarnPackage` record the property `pkgConfig` can be used to override packages when you encounter problems building. diff --git a/doc/languages-frameworks/pkg-config.section.md b/doc/languages-frameworks/pkg-config.section.md index fb6fee997d6f..75cbdaeb6fe8 100644 --- a/doc/languages-frameworks/pkg-config.section.md +++ b/doc/languages-frameworks/pkg-config.section.md @@ -4,7 +4,7 @@ Nixpkgs provides a couple of facilities for working with this tool. -## Writing packages providing pkg-config modules +## Writing packages providing pkg-config modules {#pkg-config-writing-packages} Packages should set `meta.pkgConfigModules` with the list of package config modules they provide. They should also use `testers.testMetaPkgConfig` to check that the final built package matches that list. @@ -29,9 +29,9 @@ stdenv.mkDerivation (finalAttrs: { }) ``` -## Accessing packages via pkg-config module name +## Accessing packages via pkg-config module name {#sec-pkg-config-usage} -### Within Nixpkgs +### Within Nixpkgs {#sec-pkg-config-usage-internal} A [setup hook](#setup-hook-pkg-config) is bundled in the `pkg-config` package to bring a derivation's declared build inputs into the environment. This will populate environment variables like `PKG_CONFIG_PATH`, `PKG_CONFIG_PATH_FOR_BUILD`, and `PKG_CONFIG_PATH_HOST` based on: @@ -44,7 +44,7 @@ For more details see the section on [specifying dependencies in general](#ssec-s Normal pkg-config commands to look up dependencies by name will then work with those environment variables defined by the hook. -### Externally +### Externally {#sec-pkg-config-usage-external} The `defaultPkgConfigPackages` package set is a set of aliases, named after the modules they provide. This is meant to be used by language-to-nix integrations. diff --git a/doc/languages-frameworks/python.section.md b/doc/languages-frameworks/python.section.md index a65cea533bc0..88d57618d05d 100644 --- a/doc/languages-frameworks/python.section.md +++ b/doc/languages-frameworks/python.section.md @@ -1117,7 +1117,7 @@ with import {}; in python.withPackages(ps: [ps.blaze])).env ``` -#### Optional extra dependencies +#### Optional extra dependencies {#python-optional-dependencies} Some packages define optional dependencies for additional features. With `setuptools` this is called `extras_require` and `flit` calls it @@ -1801,14 +1801,14 @@ The following rules are desired to be respected: * Attribute names in `python-packages.nix` should be sorted alphanumerically to avoid merge conflicts and ease locating attributes. -## Package set maintenance +## Package set maintenance {#python-package-set-maintenance} The whole Python package set has a lot of packages that do not see regular updates, because they either are a very fragile component in the Python ecosystem, like for example the `hypothesis` package, or packages that have no maintainer, so maintenance falls back to the package set maintainers. -### Updating packages in bulk +### Updating packages in bulk {#python-package-bulk-updates} There is a tool to update alot of python libraries in bulk, it exists at `maintainers/scripts/update-python-libraries` with this repository. @@ -1836,7 +1836,7 @@ would be: $ maintainers/scripts/update-python-libraries --target minor --commit --use-pkgs-prefix pkgs/development/python-modules/**/default.nix ``` -## CPython Update Schedule +## CPython Update Schedule {#python-cpython-update-schedule} With [PEP 602](https://www.python.org/dev/peps/pep-0602/), CPython now follows a yearly release cadence. In nixpkgs, all supported interpreters diff --git a/doc/languages-frameworks/ruby.section.md b/doc/languages-frameworks/ruby.section.md index d1265097d206..f1953500fa32 100644 --- a/doc/languages-frameworks/ruby.section.md +++ b/doc/languages-frameworks/ruby.section.md @@ -201,7 +201,7 @@ $ nix-shell --run 'ruby -rpg -e "puts PG.library_version"' Of course for this use-case one could also use overlays since the configuration for `pg` depends on the `postgresql` alias, but for demonstration purposes this has to suffice. -### Platform-specific gems +### Platform-specific gems {#ruby-platform-specif-gems} Right now, bundix has some issues with pre-built, platform-specific gems: [bundix PR #68](https://github.com/nix-community/bundix/pull/68). Until this is solved, you can tell bundler to not use platform-specific gems and instead build them from source each time: diff --git a/doc/languages-frameworks/vim.section.md b/doc/languages-frameworks/vim.section.md index 3490b2576121..39e38c6a123d 100644 --- a/doc/languages-frameworks/vim.section.md +++ b/doc/languages-frameworks/vim.section.md @@ -166,8 +166,8 @@ in If your package requires building specific parts, use instead `pkgs.vimUtils.buildVimPlugin`. -### Specificities for some plugins -#### Treesitter +### Specificities for some plugins {#vim-plugin-specificities} +#### Treesitter {#vim-plugin-treesitter} By default `nvim-treesitter` encourages you to download, compile and install the required Treesitter grammars at run time with `:TSInstall`. This works @@ -244,7 +244,7 @@ Alternatively, set the number of processes to a lower count to avoid rate-limiti ./pkgs/applications/editors/vim/plugins/update.py --proc 1 ``` -## How to maintain an out-of-tree overlay of vim plugins ? +## How to maintain an out-of-tree overlay of vim plugins ? {#vim-out-of-tree-overlays} You can use the updater script to generate basic packages out of a custom vim plugin list: diff --git a/doc/manual.xml b/doc/manual.xml index ccbaf40586d1..8aca36017684 100644 --- a/doc/manual.xml +++ b/doc/manual.xml @@ -1,19 +1,20 @@ + xmlns:xi="http://www.w3.org/2001/XInclude" + xml:id="nixpkgs-manual"> Nixpkgs Manual Version - + Using Nixpkgs - + Standard environment @@ -21,7 +22,7 @@ - + Builders @@ -32,7 +33,7 @@ - + Contributing to Nixpkgs diff --git a/doc/stdenv/meta.chapter.md b/doc/stdenv/meta.chapter.md index 1fca829aa597..0b4777efdb8c 100644 --- a/doc/stdenv/meta.chapter.md +++ b/doc/stdenv/meta.chapter.md @@ -101,7 +101,7 @@ $ cd path/to/nixpkgs $ nix-build -A your-package.tests ``` -#### Package tests +#### Package tests {#var-meta-tests-packages} Tests that are part of the source package are often executed in the `installCheckPhase`. @@ -113,7 +113,7 @@ Prefer `passthru.tests` for tests that are introduced in nixpkgs because: For more on how to write and run package tests, see . -#### NixOS tests +#### NixOS tests {#var-meta-tests-nixos} The NixOS tests are available as `nixosTests` in parameters of derivations. For instance, the OpenSMTPD derivation includes lines similar to: diff --git a/doc/stdenv/stdenv.chapter.md b/doc/stdenv/stdenv.chapter.md index 6f3f2b446042..081d1e778fe8 100644 --- a/doc/stdenv/stdenv.chapter.md +++ b/doc/stdenv/stdenv.chapter.md @@ -703,7 +703,7 @@ The prefix under which the package must be installed, passed via the `--prefix` The key to use when specifying the prefix. By default, this is set to `--prefix=` as that is used by the majority of packages. -##### `dontAddStaticConfigureFlags` +##### `dontAddStaticConfigureFlags` {#var-stdenv-dontAddStaticConfigureFlags} By default, when building statically, stdenv will try to add build system appropriate configure flags to try to enable static builds. @@ -1095,15 +1095,15 @@ postInstall = '' Performs string substitution on the contents of \, writing the result to \. The substitutions in \ are of the following form: -#### `--replace` \ \ +#### `--replace` \ \ {#fun-substitute-replace} Replace every occurrence of the string \ by \. -#### `--subst-var` \ +#### `--subst-var` \ {#fun-substitute-subst-var} Replace every occurrence of `@varName@` by the contents of the environment variable \. This is useful for generating files from templates, using `@...@` in the template as placeholders. -#### `--subst-var-by` \ \ +#### `--subst-var-by` \ \ {#fun-substitute-subst-var-by} Replace every occurrence of `@varName@` by the string \. @@ -1244,7 +1244,7 @@ Multiple paths can be specified. patchShebangs [--build | --host] PATH... ``` -##### Flags +##### Flags {#patch-shebangs.sh-invocation-flags} `--build` : Look up commands available at build time @@ -1252,7 +1252,7 @@ patchShebangs [--build | --host] PATH... `--host` : Look up commands available at run time -##### Examples +##### Examples {#patch-shebangs.sh-invocation-examples} ```sh patchShebangs --host /nix/store/-hello-1.0/bin @@ -1339,7 +1339,7 @@ Similarly, the CC Wrapper follows the Bintools Wrapper in defining standard envi Here are some more packages that provide a setup hook. Since the list of hooks is extensible, this is not an exhaustive list. The mechanism is only to be used as a last resort, so it might cover most uses. -### Other hooks +### Other hooks {#stdenv-other-hooks} Many other packages provide hooks, that are not part of `stdenv`. You can find these in the [Hooks Reference](#chap-hooks). From 11df65743da95d6153c6c048dbc9596e47871fa6 Mon Sep 17 00:00:00 2001 From: Joscha Date: Mon, 27 Mar 2023 22:36:23 +0200 Subject: [PATCH 118/227] vscode-extensions: simplify how aliases are specified --- .../editors/vscode/extensions/default.nix | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index 282b2800ec75..40ff07c7d4fc 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -3162,18 +3162,14 @@ let }; }; - aliases = self: super: { + aliases = super: { Arjun.swagger-viewer = super.arjun.swagger-viewer; jakebecker.elixir-ls = super.elixir-lsp.vscode-elixir-ls; jpoissonnier.vscode-styled-components = super.styled-components.vscode-styled-components; matklad.rust-analyzer = super.rust-lang.rust-analyzer; # Previous publisher - ms-vscode = lib.recursiveUpdate super.ms-vscode { - go = super.golang.go; - PowerShell = super.ms-vscode.powershell; - }; - rioj7 = lib.recursiveUpdate super.rioj7 { - commandOnAllFiles = super.rioj7.commandonallfiles; - }; + ms-vscode.go = super.golang.go; + ms-vscode.PowerShell = super.ms-vscode.powershell; + rioj7.commandOnAllFiles = super.rioj7.commandonallfiles; WakaTime.vscode-wakatime = super.wakatime.vscode-wakatime; _1Password = throw ''_1Password has been replaced with "1Password"''; _2gua = throw ''_2gua has been replaced with "2gua"''; @@ -3184,7 +3180,9 @@ let # then apply extension specific modifcations to packages. # overlays will be applied left to right, overrides should come after aliases. - overlays = lib.optionals config.allowAliases [ aliases ]; + overlays = lib.optionals config.allowAliases [ + (self: super: lib.recursiveUpdate super (aliases super)) + ]; toFix = lib.foldl' (lib.flip lib.extends) baseExtensions overlays; in From 733e7c52c2f9ef8e083b7442a85e4e7711b37b89 Mon Sep 17 00:00:00 2001 From: kilianar Date: Tue, 28 Mar 2023 00:03:32 +0200 Subject: [PATCH 119/227] calcmysky: 0.2.1 -> unstable-203-02-11 --- pkgs/applications/science/astronomy/calcmysky/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/science/astronomy/calcmysky/default.nix b/pkgs/applications/science/astronomy/calcmysky/default.nix index 3b66284e8b0c..bcbc90fa3717 100644 --- a/pkgs/applications/science/astronomy/calcmysky/default.nix +++ b/pkgs/applications/science/astronomy/calcmysky/default.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "calcmysky"; - version = "0.2.1"; + version = "unstable-2023-02-11"; src = fetchFromGitHub { owner = "10110111"; repo = "CalcMySky"; - rev = "v${version}"; - hash = "sha256-7Yj6OlZ7weenekXYGhK5EWcME20oCHiLPOxz5KEuKy4="; + rev = "c5f281452816d8de775b13a70fb90e79427c93c4"; + hash = "sha256-mzxtu6YTaZpR17m2WGiSDo/bAPXGJdQskyz7aqtxGoQ="; }; nativeBuildInputs = [ cmake wrapQtAppsHook ]; From d19f5dedec60d27391fcadfeb61c4bcae07bf5b0 Mon Sep 17 00:00:00 2001 From: kilianar Date: Tue, 28 Mar 2023 00:13:23 +0200 Subject: [PATCH 120/227] stellarium: 1.2 -> 23.1 https://github.com/Stellarium/stellarium/releases/tag/v23.1 Mitigates https://github.com/advisories/GHSA-7vmm-m8vp-g5h3 --- pkgs/applications/science/astronomy/stellarium/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/astronomy/stellarium/default.nix b/pkgs/applications/science/astronomy/stellarium/default.nix index 89ba8bf0e9d9..c3880b0b1d2b 100644 --- a/pkgs/applications/science/astronomy/stellarium/default.nix +++ b/pkgs/applications/science/astronomy/stellarium/default.nix @@ -21,13 +21,13 @@ stdenv.mkDerivation rec { pname = "stellarium"; - version = "1.2"; + version = "23.1"; src = fetchFromGitHub { owner = "Stellarium"; repo = "stellarium"; rev = "v${version}"; - sha256 = "sha256-0/ZSe6QfM2zVsqcbyqefl9hiuex72KPxJvVMRNCnpZg="; + hash = "sha256-7jzS3pRklPsCTgCr3nrywfHCNlBDHuyuGGvrVoI9+A0="; }; nativeBuildInputs = [ From e946e982a776d6b41dee28becd1ea106596989dd Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 28 Mar 2023 00:11:19 +0000 Subject: [PATCH 121/227] awscli2: 2.11.4 -> 2.11.6 --- pkgs/tools/admin/awscli2/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/admin/awscli2/default.nix b/pkgs/tools/admin/awscli2/default.nix index 65b6eb0301e1..d0a7bce8bc02 100644 --- a/pkgs/tools/admin/awscli2/default.nix +++ b/pkgs/tools/admin/awscli2/default.nix @@ -37,14 +37,14 @@ let in with py.pkgs; buildPythonApplication rec { pname = "awscli2"; - version = "2.11.4"; # N.B: if you change this, check if overrides are still up-to-date + version = "2.11.6"; # N.B: if you change this, check if overrides are still up-to-date format = "pyproject"; src = fetchFromGitHub { owner = "aws"; repo = "aws-cli"; rev = version; - hash = "sha256-vue0daG+s7DdIWXZIRS7pjbQKlnxT3xZxGLTmwWWNpQ="; + hash = "sha256-6VEDGakOx2LJcDbBKicxxfOt0t2tf2iaRXkx1Em0Ieg="; }; postPatch = '' From dba111b7c88c55751c8694146972131d12abd453 Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Sat, 25 Mar 2023 20:18:00 +0100 Subject: [PATCH 122/227] palemoon: 32.0.1 -> 32.1.0 --- pkgs/applications/networking/browsers/palemoon/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/browsers/palemoon/default.nix b/pkgs/applications/networking/browsers/palemoon/default.nix index 231a858ef4fc..c361fbd07e99 100644 --- a/pkgs/applications/networking/browsers/palemoon/default.nix +++ b/pkgs/applications/networking/browsers/palemoon/default.nix @@ -45,7 +45,7 @@ assert with lib.strings; ( stdenv.mkDerivation rec { pname = "palemoon"; - version = "32.0.1"; + version = "32.1.0"; src = fetchFromGitea { domain = "repo.palemoon.org"; @@ -53,7 +53,7 @@ stdenv.mkDerivation rec { repo = "Pale-Moon"; rev = "${version}_Release"; fetchSubmodules = true; - sha256 = "sha256-lz9Ok8i95pVfl4UHy2zWFe9vwJocUvDbueiWdZuz4Bo="; + sha256 = "sha256-yfXcHoPdTknryYFV8mBWHvzs68oELqsJjTC/nT4SMB8="; }; nativeBuildInputs = [ From b81f7d15f1b9bc6074e36e111505a1cc5fd3a2ff Mon Sep 17 00:00:00 2001 From: Bill Ewanick Date: Wed, 22 Mar 2023 19:37:05 -0400 Subject: [PATCH 123/227] lemmy: 0.17.1 -> 0.17.2 --- pkgs/servers/web-apps/lemmy/package.json | 54 ++++++++++++------------ pkgs/servers/web-apps/lemmy/pin.json | 10 ++--- pkgs/servers/web-apps/lemmy/update.sh | 2 +- 3 files changed, 33 insertions(+), 33 deletions(-) diff --git a/pkgs/servers/web-apps/lemmy/package.json b/pkgs/servers/web-apps/lemmy/package.json index 7f7abbdb4afc..5ba480ea5cf5 100644 --- a/pkgs/servers/web-apps/lemmy/package.json +++ b/pkgs/servers/web-apps/lemmy/package.json @@ -1,7 +1,7 @@ { "name": "lemmy-ui", "description": "An isomorphic UI for lemmy", - "version": "0.17.1", + "version": "0.17.2", "author": "Dessalines ", "license": "AGPL-3.0", "scripts": { @@ -17,13 +17,13 @@ }, "repository": "https://github.com/LemmyNet/lemmy-ui", "dependencies": { - "@babel/plugin-proposal-decorators": "^7.20.13", - "@babel/plugin-transform-runtime": "^7.19.6", - "@babel/plugin-transform-typescript": "^7.20.13", + "@babel/plugin-proposal-decorators": "^7.21.0", + "@babel/plugin-transform-runtime": "^7.21.0", + "@babel/plugin-transform-typescript": "^7.21.0", "@babel/preset-env": "7.20.2", - "@babel/preset-typescript": "^7.18.6", - "@babel/runtime": "^7.20.13", - "autosize": "^5.0.2", + "@babel/preset-typescript": "^7.21.0", + "@babel/runtime": "^7.21.0", + "autosize": "^6.0.1", "babel-loader": "^9.1.2", "babel-plugin-inferno": "^6.6.0", "check-password-strength": "^2.0.7", @@ -34,18 +34,18 @@ "css-loader": "^6.7.3", "emoji-short-name": "^2.0.0", "express": "~4.18.2", - "html-to-text": "^9.0.3", - "i18next": "^22.4.9", - "inferno": "^8.0.5", - "inferno-create-element": "^8.0.5", + "html-to-text": "^9.0.4", + "i18next": "^22.4.10", + "inferno": "^8.0.6", + "inferno-create-element": "^8.0.6", "inferno-helmet": "^5.2.1", - "inferno-hydrate": "^8.0.5", + "inferno-hydrate": "^8.0.6", "inferno-i18next-dess": "0.0.2", - "inferno-router": "^8.0.5", - "inferno-server": "^8.0.5", + "inferno-router": "^8.0.6", + "inferno-server": "^8.0.6", "isomorphic-cookie": "^1.2.4", "jwt-decode": "^3.1.2", - "lemmy-js-client": "0.17.0-rc.62", + "lemmy-js-client": "0.17.2-rc.1", "markdown-it": "^13.0.1", "markdown-it-container": "^3.0.0", "markdown-it-footnote": "^3.0.3", @@ -58,8 +58,8 @@ "register-service-worker": "^1.7.2", "run-node-webpack-plugin": "^1.3.0", "rxjs": "^7.8.0", - "sanitize-html": "^2.8.1", - "sass": "^1.57.1", + "sanitize-html": "^2.10.0", + "sass": "^1.58.3", "sass-loader": "^13.2.0", "serialize-javascript": "^6.0.1", "tippy.js": "^6.3.7", @@ -71,35 +71,35 @@ "websocket-ts": "^1.1.1" }, "devDependencies": { - "@babel/core": "^7.20.12", + "@babel/core": "^7.21.0", "@types/autosize": "^4.0.0", - "@types/express": "^4.17.16", + "@types/express": "^4.17.17", "@types/html-to-text": "^9.0.0", "@types/markdown-it": "^12.2.3", "@types/markdown-it-container": "^2.0.5", - "@types/node": "^18.11.18", + "@types/node": "^18.14.0", "@types/node-fetch": "^2.6.2", "@types/sanitize-html": "^2.8.0", "@types/serialize-javascript": "^5.0.1", "@types/toastify-js": "^1.11.1", - "@typescript-eslint/eslint-plugin": "^5.49.0", - "@typescript-eslint/parser": "^5.49.0", + "@typescript-eslint/eslint-plugin": "^5.53.0", + "@typescript-eslint/parser": "^5.53.0", "bootstrap": "^5.2.3", "bootswatch": "^5.2.3", - "eslint": "^8.33.0", + "eslint": "^8.34.0", "eslint-plugin-inferno": "^7.32.1", "eslint-plugin-prettier": "^4.2.1", "husky": "^8.0.3", "import-sort-style-module": "^6.0.0", - "lint-staged": "^13.1.0", - "prettier": "^2.8.3", + "lint-staged": "^13.1.2", + "prettier": "^2.8.4", "prettier-plugin-import-sort": "^0.0.7", "prettier-plugin-organize-imports": "^3.2.2", - "prettier-plugin-packagejson": "^2.4.2", + "prettier-plugin-packagejson": "^2.4.3", "rimraf": "^4.1.2", "sortpack": "^2.3.3", "style-loader": "^3.3.1", - "terser": "^5.16.2", + "terser": "^5.16.4", "typescript": "^4.9.5", "webpack-dev-server": "4.11.1" }, diff --git a/pkgs/servers/web-apps/lemmy/pin.json b/pkgs/servers/web-apps/lemmy/pin.json index 05960e62965d..b2a1f1923ce6 100644 --- a/pkgs/servers/web-apps/lemmy/pin.json +++ b/pkgs/servers/web-apps/lemmy/pin.json @@ -1,7 +1,7 @@ { - "version": "0.17.1", - "serverSha256": "sha256-2pSa3IvmEoZbDS3U0yvZfocpgmoHJKm6n2ggPCCXtxY=", - "serverCargoSha256": "sha256-uVqRuOSr5Smjpe/HUhIebrBaxJNdMOzHrtQkzTKsLC8=", - "uiSha256": "sha256-JehU0Bk0S1qjYRlQSQzQOYSLUScDAAbKp8O9zH40XRc=", - "uiYarnDepsSha256": "sha256-AeY6k1qkubTefUofq9ISzXq3huNWHoSpQFFRgCMdFhQ=" + "version": "0.17.2", + "serverSha256": "sha256-fkpMVm52XLyrk9RfzJpthT8fctIilawAIgfK+4TXHvU=", + "serverCargoSha256": "sha256-AC6EP612uaeGfqHbrHrz89h0tsNlMceEg6GxEsm1QMA=", + "uiSha256": "sha256-0Zhm6Jgc6rlN4c7ryRnR45+fZEdzQhuOXSwU8Wz0D5g=", + "uiYarnDepsSha256": "sha256-aZAclSaFZJvuK+FpCBWboGaVEOEJTxq2jnWk0A6iAFw=" } diff --git a/pkgs/servers/web-apps/lemmy/update.sh b/pkgs/servers/web-apps/lemmy/update.sh index 2df3f9e88d06..a2657025a0e2 100755 --- a/pkgs/servers/web-apps/lemmy/update.sh +++ b/pkgs/servers/web-apps/lemmy/update.sh @@ -14,7 +14,7 @@ const latest_rev = $(curl -q https://api.github.com/repos/${owner}/${server_repo jq -r '.tag_name') const latest_version = $(echo $latest_rev) const current_version = $(jq -r '.version' $directory/pin.json) -if ($latest_version === $current_version) { +if (latest_version === $current_version) { echo "lemmy is already up-to-date" return 0 } else { From 3965ba97fc6389ecdd1eff81190f3119275a83e9 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 28 Mar 2023 01:12:01 +0000 Subject: [PATCH 124/227] python310Packages.packageurl-python: 0.10.4 -> 0.11.1 --- pkgs/development/python-modules/packageurl-python/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/packageurl-python/default.nix b/pkgs/development/python-modules/packageurl-python/default.nix index a1764765ef3d..95eb962bf6b4 100644 --- a/pkgs/development/python-modules/packageurl-python/default.nix +++ b/pkgs/development/python-modules/packageurl-python/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "packageurl-python"; - version = "0.10.4"; + version = "0.11.1"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-XJEzT5Qs1V1F6wxn3TOaU175DiXwW57AFq0YjtDvkEg="; + hash = "sha256-u8xT0stZIMgVwWJsdZkvMZv8RQtziT+nvYqsWGmqSf4="; }; nativeCheckInputs = [ From 5cd8f3499c45912a534fa2903f29b9d1873f43ac Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 28 Mar 2023 01:13:04 +0000 Subject: [PATCH 125/227] python310Packages.zope-cachedescriptors: 4.4 -> 5.0 --- .../python-modules/zope-cachedescriptors/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/zope-cachedescriptors/default.nix b/pkgs/development/python-modules/zope-cachedescriptors/default.nix index 2c73f5800558..e6aa92cd357b 100644 --- a/pkgs/development/python-modules/zope-cachedescriptors/default.nix +++ b/pkgs/development/python-modules/zope-cachedescriptors/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "zope-cachedescriptors"; - version = "4.4"; + version = "5.0"; format = "setuptools"; src = fetchPypi { pname = "zope.cachedescriptors"; inherit version; - hash = "sha256-1FxIdIb334HymS8aAJEmJL93JZ2DxdmKp2tnhxbj0Ro="; + hash = "sha256-MVe+hm/Jck0Heotb9sP8IcOKQUerZk5yRiLf5fr/BIo="; }; propagatedBuildInputs = [ From 9c463813caa836df96bc7e99195c411ba1cd6afa Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 28 Mar 2023 01:23:03 +0000 Subject: [PATCH 126/227] python310Packages.google-cloud-tasks: 2.13.0 -> 2.13.1 --- .../development/python-modules/google-cloud-tasks/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-tasks/default.nix b/pkgs/development/python-modules/google-cloud-tasks/default.nix index 3ab5abb61d90..f69cb6709fda 100644 --- a/pkgs/development/python-modules/google-cloud-tasks/default.nix +++ b/pkgs/development/python-modules/google-cloud-tasks/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "google-cloud-tasks"; - version = "2.13.0"; + version = "2.13.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-7V57grRH2ysU765TDmqq7DOna9o8Nu9v4HjDAIf/ETA="; + hash = "sha256-mbhFBVx6Gye3M0lCny1vag659Am0ze7InfmeFr0ZeDM="; }; propagatedBuildInputs = [ From 45615f788d42bb238fcd3ff2befc60bed292f6ca Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 28 Mar 2023 01:45:45 +0000 Subject: [PATCH 127/227] python310Packages.pytaglib: 1.5.0-1 -> 2.0.0 --- pkgs/development/python-modules/pytaglib/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/pytaglib/default.nix b/pkgs/development/python-modules/pytaglib/default.nix index 909dad99fb8f..b8810a874bae 100644 --- a/pkgs/development/python-modules/pytaglib/default.nix +++ b/pkgs/development/python-modules/pytaglib/default.nix @@ -8,13 +8,13 @@ buildPythonPackage rec { pname = "pytaglib"; - version = "1.5.0-1"; + version = "2.0.0"; src = fetchFromGitHub { owner = "supermihi"; repo = pname; - rev = "v${version}"; - sha256 = "1nssiqzlzvzdd3pc5xd1qwgwgkyazynmq8qiljz0dhy0c8j6mkfp"; + rev = "refs/tags/v${version}"; + sha256 = "sha256-CEpyRxC9d7EuxupMQaX7WUCZ7lhyE6LhQY7Koe0NJ1A="; }; buildInputs = [ From c4f42f7964c7d4bffac07b64a5caf3c1603b1e36 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 28 Mar 2023 02:30:19 +0000 Subject: [PATCH 128/227] python310Packages.json-stream: 2.2.0 -> 2.2.1 --- pkgs/development/python-modules/json-stream/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/json-stream/default.nix b/pkgs/development/python-modules/json-stream/default.nix index 010edcd27a1e..6f22a64317d6 100644 --- a/pkgs/development/python-modules/json-stream/default.nix +++ b/pkgs/development/python-modules/json-stream/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "json-stream"; - version = "2.2.0"; + version = "2.2.1"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-Vg6zF4iR4YqVAsx93Gy5mO2JNldm2f7BhNBtjzVY82w="; + hash = "sha256-7SZw7hRN+VtvHHXG+O/eIrc02vc1nPnn2oJGIg7CtFM="; }; nativeBuildInputs = [ From 25e44caf2f54c1b73e4f22592820e002cd5ca975 Mon Sep 17 00:00:00 2001 From: "P. R. d. O" Date: Mon, 27 Mar 2023 20:50:49 -0600 Subject: [PATCH 129/227] vmware-workstation: add libxcrypt-legacy --- pkgs/applications/virtualization/vmware-workstation/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/applications/virtualization/vmware-workstation/default.nix b/pkgs/applications/virtualization/vmware-workstation/default.nix index 6bcd15dc52ff..035fc9ceb2d0 100755 --- a/pkgs/applications/virtualization/vmware-workstation/default.nix +++ b/pkgs/applications/virtualization/vmware-workstation/default.nix @@ -16,6 +16,7 @@ , vulkan-loader , alsa-lib , libpulseaudio +, libxcrypt-legacy , libGL , numactl , libX11 @@ -86,6 +87,7 @@ stdenv.mkDerivation rec { vulkan-loader alsa-lib libpulseaudio + libxcrypt-legacy libGL numactl libX11 From 49ca24350c28656ba87344e8e771a24b067d813e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 28 Mar 2023 03:00:07 +0000 Subject: [PATCH 130/227] python310Packages.tern: 2.11.0 -> 2.12.0 --- pkgs/development/python-modules/tern/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/tern/default.nix b/pkgs/development/python-modules/tern/default.nix index 3b2701960f87..592c5d72da7d 100644 --- a/pkgs/development/python-modules/tern/default.nix +++ b/pkgs/development/python-modules/tern/default.nix @@ -19,14 +19,14 @@ buildPythonPackage rec { pname = "tern"; - version = "2.11.0"; + version = "2.12.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-MELPpz7UeOKSAW7hC2xDIog/bdLUflU00vvIbAePNBA="; + hash = "sha256-XvhKe7mf09Nr3sbpMOKOO63HQ+9thgluU02iEIdWSpg="; }; preBuild = '' From 19746a83aa3b3936fbb2e55fd53c7408bfec1da9 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 28 Mar 2023 03:06:36 +0000 Subject: [PATCH 131/227] discord-ptb: 0.0.39 -> 0.0.41 --- .../networking/instant-messengers/discord/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/discord/default.nix b/pkgs/applications/networking/instant-messengers/discord/default.nix index 804deb10eb8c..b7becb715bc8 100644 --- a/pkgs/applications/networking/instant-messengers/discord/default.nix +++ b/pkgs/applications/networking/instant-messengers/discord/default.nix @@ -2,7 +2,7 @@ let versions = if stdenv.isLinux then { stable = "0.0.25"; - ptb = "0.0.39"; + ptb = "0.0.41"; canary = "0.0.150"; } else { stable = "0.0.273"; @@ -18,7 +18,7 @@ let }; ptb = fetchurl { url = "https://dl-ptb.discordapp.net/apps/linux/${version}/discord-ptb-${version}.tar.gz"; - sha256 = "LoDg3iwK18rDszU/dQEK0/J8DIxrqydsfflZo8IARks="; + sha256 = "AhiZXgkXG/lroG7XAgcvJ7r5PSvzMFhamsxB1cXJOak="; }; canary = fetchurl { url = "https://dl-canary.discordapp.net/apps/linux/${version}/discord-canary-${version}.tar.gz"; From a7cf2875838aec3963ada43436039b776ce108b2 Mon Sep 17 00:00:00 2001 From: figsoda Date: Mon, 27 Mar 2023 23:33:53 -0400 Subject: [PATCH 132/227] comrak: 0.16.0 -> 0.17.1 Diff: https://github.com/kivikakk/comrak/compare/0.16.0...0.17.1 Changelog: https://github.com/kivikakk/comrak/blob/0.17.1/changelog.txt --- pkgs/tools/text/comrak/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/text/comrak/default.nix b/pkgs/tools/text/comrak/default.nix index 3f751dc4d7e6..098f4c5e201a 100644 --- a/pkgs/tools/text/comrak/default.nix +++ b/pkgs/tools/text/comrak/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "comrak"; - version = "0.16.0"; + version = "0.17.1"; src = fetchFromGitHub { owner = "kivikakk"; repo = pname; rev = version; - sha256 = "sha256-ZKIqjeRsNTQYaa5itBSnqQ1w54Yq/iY2EQfDN713KGM="; + sha256 = "sha256-VnCR09yu2b3zDWpSYQvJ18XNKuZaVtQ6JFnE7kNVips="; }; - cargoSha256 = "sha256-Xafdt4AGympN6CLctOWfbCNfhwp4XN6XmSYESgjhRPk="; + cargoSha256 = "sha256-HHy8dm0aiREfqcKK51aW/j1AoJVq+4zOpQe2rvT1YNc="; meta = with lib; { description = "A CommonMark-compatible GitHub Flavored Markdown parser and formatter"; From 4cd7d8634dfbfe237d2ede2ae0da882ab2829efe Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 28 Mar 2023 03:34:54 +0000 Subject: [PATCH 133/227] nixpacks: 1.5.1 -> 1.6.0 --- pkgs/applications/virtualization/nixpacks/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/virtualization/nixpacks/default.nix b/pkgs/applications/virtualization/nixpacks/default.nix index 2de8989830c3..4143c21218da 100644 --- a/pkgs/applications/virtualization/nixpacks/default.nix +++ b/pkgs/applications/virtualization/nixpacks/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "nixpacks"; - version = "1.5.1"; + version = "1.6.0"; src = fetchFromGitHub { owner = "railwayapp"; repo = pname; rev = "v${version}"; - sha256 = "sha256-eAniM4o7TshGhO5jGrCZz+Rs5n5Q24tvIWMWebKAWAs="; + sha256 = "sha256-q+NMV0GagcGeUb+WD8BoFjAKJWgzBSq/POqwPUADAUI="; }; - cargoHash = "sha256-0Y4hHuWB7NY7rRJImNIrxlEffrT9055ThQGqJlMeDMM="; + cargoHash = "sha256-m9CvMorM7uX6OOfVCtM2pZPgRcKm7fVoTk/SCt8FXyU="; # skip test due FHS dependency doCheck = false; From b0a7c437a215afe12b1ea9760f0af958c59028cf Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 28 Mar 2023 03:45:05 +0000 Subject: [PATCH 134/227] holochain-launcher: 0.9.2 -> 0.9.3 --- pkgs/applications/misc/holochain-launcher/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/holochain-launcher/default.nix b/pkgs/applications/misc/holochain-launcher/default.nix index 2173c12461c3..f4989b2c3f03 100644 --- a/pkgs/applications/misc/holochain-launcher/default.nix +++ b/pkgs/applications/misc/holochain-launcher/default.nix @@ -12,11 +12,11 @@ stdenv.mkDerivation rec { name = "holochain-launcher"; - version = "0.9.2"; + version = "0.9.3"; src = fetchurl { url = "https://github.com/holochain/launcher/releases/download/v${version}/holochain-launcher_${version}_amd64.deb"; - sha256 = "sha256-ipcv1rP4DDjBEybmntsfw2ubjCgm1cGDlYM7sN0jeVo="; + sha256 = "sha256-hvnOB6cTL+VffwtBulrEzujxVZEQMSDoJx2HjivJ9z8="; }; nativeBuildInputs = [ From 8932f6b0b4879181ee9006b198170bdb645a4fd2 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 28 Mar 2023 03:59:24 +0000 Subject: [PATCH 135/227] svls: 0.2.7 -> 0.2.8 --- pkgs/development/tools/language-servers/svls/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/language-servers/svls/default.nix b/pkgs/development/tools/language-servers/svls/default.nix index fef2306b1cd7..e568568ccdeb 100644 --- a/pkgs/development/tools/language-servers/svls/default.nix +++ b/pkgs/development/tools/language-servers/svls/default.nix @@ -5,16 +5,16 @@ rustPlatform.buildRustPackage rec { pname = "svls"; - version = "0.2.7"; + version = "0.2.8"; src = fetchFromGitHub { owner = "dalance"; repo = "svls"; rev = "v${version}"; - sha256 = "sha256-+auy6LfvT7OCCSM/WNjnzFsBTAHS+kcghOaMpG3f9dA="; + sha256 = "sha256-vUvDdeowbrmDQvUCUYRjOGQQrlyGGKrnXsYFsMWMfFw="; }; - cargoHash = "sha256-ZNYYb0Ji4AmiXfhKMPK/4MPfFYSmnUeeeTmiq6rpBvg="; + cargoHash = "sha256-zb1F3bv1MrXkoBzTaVXbHcKFlg5R9Ulq6eN8mh8WKSg="; meta = with lib; { description = "SystemVerilog language server"; From 14ddd89f4c3078b6bef983a0e3f25d8a3d73de46 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 28 Mar 2023 04:02:38 +0000 Subject: [PATCH 136/227] datree: 1.8.45 -> 1.8.46 --- pkgs/development/tools/datree/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/datree/default.nix b/pkgs/development/tools/datree/default.nix index 3f969acf89ae..09d4aaa074c3 100644 --- a/pkgs/development/tools/datree/default.nix +++ b/pkgs/development/tools/datree/default.nix @@ -8,13 +8,13 @@ buildGoModule rec { pname = "datree"; - version = "1.8.45"; + version = "1.8.46"; src = fetchFromGitHub { owner = "datreeio"; repo = "datree"; rev = "refs/tags/${version}"; - hash = "sha256-11bwb8Nnr5RmRes/qUAoxMJ9vpwkIyB1113X3HDjYKA="; + hash = "sha256-sSMJxR8ZizQtWjiDbuc8pH5GltZ7YVzZrwOuz7Ih9iw="; }; vendorHash = "sha256-MrVIpr2iwddW3yUeBuDfeg+Xo9Iarr/fp4Rc4WGYGeU="; From f2deff906250349120f228dc678b051734cc8e39 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 28 Mar 2023 03:07:06 +0000 Subject: [PATCH 137/227] =?UTF-8?q?terraform-providers.buildkite:=200.11.1?= =?UTF-8?q?=20=E2=86=92=200.12.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../networking/cluster/terraform-providers/providers.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index adafa76ddb6d..238fd454c715 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -182,12 +182,12 @@ "vendorHash": "sha256-dm+2SseBeS49/QoepRwJ1VFwPCtU+6VymvyEH/sLkvI=" }, "buildkite": { - "hash": "sha256-H9kVHGnIzOHViTAuJnLJqcxDjSRXVqyKBAFfOd8fkHo=", + "hash": "sha256-CRxGzg0wQZOJ2gWKjRjCOsVjYF3ls35EMHO8DrfPNFk=", "homepage": "https://registry.terraform.io/providers/buildkite/buildkite", "owner": "buildkite", "proxyVendor": true, "repo": "terraform-provider-buildkite", - "rev": "v0.11.1", + "rev": "v0.12.1", "spdx": "MIT", "vendorHash": "sha256-C7bm9wDNEO7fJuqssUxQ4t9poVkPkKd8MU7S9MJTOW4=" }, From 668e6b8183de6acb6972ffda458ba3ebcf497c0a Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 28 Mar 2023 03:09:28 +0000 Subject: [PATCH 138/227] =?UTF-8?q?terraform-providers.argocd:=205.0.0=20?= =?UTF-8?q?=E2=86=92=205.0.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../networking/cluster/terraform-providers/providers.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 238fd454c715..ccd206b191a5 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -73,13 +73,13 @@ "vendorHash": "sha256-DqAHkNxfI1txtW9PadHzgWuRCiuV/CVqq/qba+e0O7M=" }, "argocd": { - "hash": "sha256-nxNZ0W8tcnnUhqf2S8tM6CvupYS4ALamYg3zYZQScA8=", + "hash": "sha256-fmIbmjXOwIvtNMNQHtg3ucKzwXdh0do8DW5c6iYlil0=", "homepage": "https://registry.terraform.io/providers/oboukili/argocd", "owner": "oboukili", "repo": "terraform-provider-argocd", - "rev": "v5.0.0", + "rev": "v5.0.1", "spdx": "MPL-2.0", - "vendorHash": "sha256-KgEX0h+WgcVjMMgNb5QJJNQjqAxQ8ATolVXZBro+adQ=" + "vendorHash": "sha256-mKefDPwWPlUleoAkJpTvJwQeOb7pA80cZQ7fpwir6kk=" }, "auth0": { "hash": "sha256-y2pjk+rSLAM7H4XjwvwZSNFW4+9EhN3fb01cml6RTb0=", From 0bfce55798f268c614aafc129fcb1a94241b33e4 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 28 Mar 2023 03:09:45 +0000 Subject: [PATCH 139/227] =?UTF-8?q?terraform-providers.fastly:=204.1.0=20?= =?UTF-8?q?=E2=86=92=204.1.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../networking/cluster/terraform-providers/providers.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index ccd206b191a5..b92a0d3dcdea 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -382,11 +382,11 @@ "vendorHash": "sha256-E1gzdES/YVxQq2J47E2zosvud2C/ViBeQ8+RfNHMBAg=" }, "fastly": { - "hash": "sha256-60WydEYr/U1oDVq2YI5W86ivbLw/MRztOOQbTqbDQSg=", + "hash": "sha256-FO6SXpFk/DxOvDszwYiftB65JVNoN90JG6JFc8zid50=", "homepage": "https://registry.terraform.io/providers/fastly/fastly", "owner": "fastly", "repo": "terraform-provider-fastly", - "rev": "v4.1.0", + "rev": "v4.1.1", "spdx": "MPL-2.0", "vendorHash": null }, From e935eb83651547f193d9f789a5aae3c92766ebf4 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 28 Mar 2023 04:25:03 +0000 Subject: [PATCH 140/227] brook: 20230401 -> 20230404 --- pkgs/tools/networking/brook/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/brook/default.nix b/pkgs/tools/networking/brook/default.nix index e3ca1df48023..84ad4e56755e 100644 --- a/pkgs/tools/networking/brook/default.nix +++ b/pkgs/tools/networking/brook/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "brook"; - version = "20230401"; + version = "20230404"; src = fetchFromGitHub { owner = "txthinking"; repo = pname; rev = "v${version}"; - sha256 = "sha256-PVkdK1wcY3PaeixEG4StV1AmYPit6pQNErcALmV2LXc="; + sha256 = "sha256-nh59sfOWLk4evuIxa35bWu0J6xSUIzrPv4oQHWSZInA="; }; - vendorHash = "sha256-7h+rMfFFpcsfZa6tw/o0uRIDw4g3g+dwd9y2Ysg2NJc="; + vendorHash = "sha256-PYdR0vfgOgRheHDvoIC9jCFmfzCSOhxqcPFm+MqirsQ="; meta = with lib; { homepage = "https://github.com/txthinking/brook"; From 3b3cc657012f64c336f23a4ae5010a4246667485 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 28 Mar 2023 04:37:03 +0000 Subject: [PATCH 141/227] primecount: 7.6 -> 7.7 --- pkgs/applications/science/math/primecount/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/math/primecount/default.nix b/pkgs/applications/science/math/primecount/default.nix index 8fd2644ba110..ee6b781d7d3f 100644 --- a/pkgs/applications/science/math/primecount/default.nix +++ b/pkgs/applications/science/math/primecount/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "primecount"; - version = "7.6"; + version = "7.7"; src = fetchFromGitHub { owner = "kimwalisch"; repo = "primecount"; rev = "v${version}"; - hash = "sha256-x9sXLuHd3nfVM6sL/5yAzIoTVkf1LIUnbhx2WlD/OS8="; + hash = "sha256-6Q9DPnlGKb31QYEGpm78ISfbj90MeLD0/2k2fDZm7cM="; }; nativeBuildInputs = [ From a01d310e2ca8a802e4052135d28b44b8d1fcc0ca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Mon, 27 Mar 2023 21:38:28 -0700 Subject: [PATCH 142/227] python310Packages.nextcloudmonitor: 1.3.0 -> 1.4.0 Diff: https://github.com/meichthys/nextcloud_monitor/compare/v1.3.0...v1.4.0 Changelog: https://github.com/meichthys/nextcloud_monitor/blob/v1.4.0/README.md#change-log --- pkgs/development/python-modules/nextcloudmonitor/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/nextcloudmonitor/default.nix b/pkgs/development/python-modules/nextcloudmonitor/default.nix index 35ac2a4b6ce7..521295f53620 100644 --- a/pkgs/development/python-modules/nextcloudmonitor/default.nix +++ b/pkgs/development/python-modules/nextcloudmonitor/default.nix @@ -6,7 +6,7 @@ buildPythonPackage rec { pname = "nextcloudmonitor"; - version = "1.3.0"; + version = "1.4.0"; format = "setuptools"; @@ -14,7 +14,7 @@ buildPythonPackage rec { owner = "meichthys"; repo = "nextcloud_monitor"; rev = "v${version}"; - hash = "sha256-Ivo5dqKcvE1e+1crZNzKHydprtMXkZdzDl4MsZviLQQ="; + hash = "sha256-jyC8oOFr5yVtIJNxVCLNTyFpJTdjHu8t6Xs4il45ysI="; }; propagatedBuildInputs = [ @@ -27,6 +27,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "nextcloudmonitor" ]; meta = with lib; { + changelog = "https://github.com/meichthys/nextcloud_monitor/blob/${src.rev}/README.md#change-log"; description = "Python wrapper around nextcloud monitor api"; homepage = "https://github.com/meichthys/nextcloud_monitor"; license = licenses.mit; From ebeb85bf32c7bc6577bf2fb393a918ab7968ae3d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 28 Mar 2023 05:34:18 +0000 Subject: [PATCH 143/227] symfony-cli: 5.5.1 -> 5.5.2 --- pkgs/development/tools/symfony-cli/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/symfony-cli/default.nix b/pkgs/development/tools/symfony-cli/default.nix index 812a02b2edda..c4e81d4eca7e 100644 --- a/pkgs/development/tools/symfony-cli/default.nix +++ b/pkgs/development/tools/symfony-cli/default.nix @@ -2,14 +2,14 @@ buildGoModule rec { pname = "symfony-cli"; - version = "5.5.1"; - vendorHash = "sha256-OMQaYvNt4VeLoNVL/syQlIlGsP4F0C2A679OLbXIXng="; + version = "5.5.2"; + vendorHash = "sha256-hDr/ByBCjKE+B698IXzDFq1ovS6Nfs4O32aF7HKmrcY="; src = fetchFromGitHub { owner = "symfony-cli"; repo = "symfony-cli"; rev = "v${version}"; - sha256 = "sha256-sTgnDe3cjisdmJPtqNkjPF5XncC25Leud4ASai9peJE="; + sha256 = "sha256-Bo9oT6POywVYfZwXFfSGMZTf4XhSm0hgG2cQg6W1A2U="; }; ldflags = [ From b5173ecce0b4dd08bf8fb38ce232e0361aaa74a9 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 28 Mar 2023 06:00:45 +0000 Subject: [PATCH 144/227] fbthrift: 2023.02.20.00 -> 2023.03.20.00 --- pkgs/development/libraries/fbthrift/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/fbthrift/default.nix b/pkgs/development/libraries/fbthrift/default.nix index 15eedbdfc485..6b660a491f23 100644 --- a/pkgs/development/libraries/fbthrift/default.nix +++ b/pkgs/development/libraries/fbthrift/default.nix @@ -22,13 +22,13 @@ stdenv.mkDerivation rec { pname = "fbthrift"; - version = "2023.02.20.00"; + version = "2023.03.20.00"; src = fetchFromGitHub { owner = "facebook"; repo = "fbthrift"; rev = "v${version}"; - sha256 = "sha256-MnF2JS+5kvcA6nymFWW7DTM5yWsnQR0U69lirG/CLDg="; + sha256 = "sha256-jCgdo7jE5QlRK5f2S6XEVM4+TPWI//4DKG/fDMFzgzg="; }; nativeBuildInputs = [ From 49e3f4fe0c927b128d1471bbbc8035657dde17c3 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 28 Mar 2023 06:11:04 +0000 Subject: [PATCH 145/227] memcached: 1.6.18 -> 1.6.19 --- pkgs/servers/memcached/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/memcached/default.nix b/pkgs/servers/memcached/default.nix index aa7e4136017f..037f5f81f523 100644 --- a/pkgs/servers/memcached/default.nix +++ b/pkgs/servers/memcached/default.nix @@ -1,12 +1,12 @@ {lib, stdenv, fetchurl, cyrus_sasl, libevent, nixosTests }: stdenv.mkDerivation rec { - version = "1.6.18"; + version = "1.6.19"; pname = "memcached"; src = fetchurl { url = "https://memcached.org/files/${pname}-${version}.tar.gz"; - sha256 = "sha256-y91quIEGSaxdkvzQ/LDKkx2Knb0K2MxXW0ciLu3WQVg="; + sha256 = "sha256-L9SLBHFGOYsHOliOl5F9m8kIzlGXhYDY4L7aoSO0xw0="; }; configureFlags = [ From 8fe1ea496b24338f61032e4caa7f981626d24d4b Mon Sep 17 00:00:00 2001 From: Ali Caglayan Date: Mon, 27 Mar 2023 08:54:48 +0200 Subject: [PATCH 146/227] coq: 8.16.1 -> 8.17.0 Signed-off-by: Ali Caglayan --- pkgs/applications/science/logic/coq/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/science/logic/coq/default.nix b/pkgs/applications/science/logic/coq/default.nix index 3740d4e39268..81fab07ecbf8 100644 --- a/pkgs/applications/science/logic/coq/default.nix +++ b/pkgs/applications/science/logic/coq/default.nix @@ -53,7 +53,7 @@ let "8.15.2".sha256 = "sha256:0qibbvzrhsvs6w3zpkhyclndp29jnr6bs9i5skjlpp431jdjjfqd"; "8.16.0".sha256 = "sha256-3V6kL9j2rn5FHBxq1mtmWWTZS9X5cAyvtUsS6DaM+is="; "8.16.1".sha256 = "sha256-n7830+zfZeyYHEOGdUo57bH6bb2/SZs8zv8xJhV+iAc="; - "8.17+rc1".sha256 = "sha256-BsVgYa2fAYqRmQNSaY/YSiZhqkmwM+xbE5T4FHOEqkc="; + "8.17.0".sha256 = "sha256-TGwm7S6+vkeZ8cidvp8pkiAd9tk008jvvPvYgfEOXhM="; }; releaseRev = v: "V${v}"; fetched = import ../../../../build-support/coq/meta-fetch/default.nix From a5bfcaf6f1dc5151e0b887ac1bd650400c4f2f33 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 28 Mar 2023 06:24:47 +0000 Subject: [PATCH 147/227] avfs: 1.1.4 -> 1.1.5 --- pkgs/tools/filesystems/avfs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/filesystems/avfs/default.nix b/pkgs/tools/filesystems/avfs/default.nix index eea423b897a6..a59c2695c20a 100644 --- a/pkgs/tools/filesystems/avfs/default.nix +++ b/pkgs/tools/filesystems/avfs/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { pname = "avfs"; - version = "1.1.4"; + version = "1.1.5"; src = fetchurl { url = "mirror://sourceforge/avf/${version}/${pname}-${version}.tar.bz2"; - sha256 = "0ax1zbw4pmggx1b784bfabdqyn39k7109cnl22p69y2phnpq2y9s"; + sha256 = "sha256-rZ87ZBBNYAmgWMcPZwiPeZMJv4UZsUsVSvrSJqRScs8="; }; nativeBuildInputs = [ pkg-config ]; From c26e9c8ee2e8fcc98a6f8cfaadc0831d40698a05 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 28 Mar 2023 08:37:32 +0200 Subject: [PATCH 148/227] python310Packages.pytaglib: add changelog to meta --- pkgs/development/python-modules/pytaglib/default.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pytaglib/default.nix b/pkgs/development/python-modules/pytaglib/default.nix index b8810a874bae..6540171acd32 100644 --- a/pkgs/development/python-modules/pytaglib/default.nix +++ b/pkgs/development/python-modules/pytaglib/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { owner = "supermihi"; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "sha256-CEpyRxC9d7EuxupMQaX7WUCZ7lhyE6LhQY7Koe0NJ1A="; + hash = "sha256-CEpyRxC9d7EuxupMQaX7WUCZ7lhyE6LhQY7Koe0NJ1A="; }; buildInputs = [ @@ -26,11 +26,14 @@ buildPythonPackage rec { pytestCheckHook ]; - pythonImportsCheck = [ "taglib" ]; + pythonImportsCheck = [ + "taglib" + ]; meta = with lib; { description = "Python bindings for the Taglib audio metadata library"; homepage = "https://github.com/supermihi/pytaglib"; + changelog = "https://github.com/supermihi/pytaglib/blob/v${version}/CHANGELOG.md"; license = licenses.gpl3Plus; maintainers = with maintainers; [ mrkkrp ]; }; From 8066817ecc0d44859733883c52d82fa5175137bb Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 28 Mar 2023 08:38:49 +0200 Subject: [PATCH 149/227] python310Packages.pytaglib: disable on unsupported Python releases - add format --- pkgs/development/python-modules/pytaglib/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/python-modules/pytaglib/default.nix b/pkgs/development/python-modules/pytaglib/default.nix index 6540171acd32..0b57dce5ec1a 100644 --- a/pkgs/development/python-modules/pytaglib/default.nix +++ b/pkgs/development/python-modules/pytaglib/default.nix @@ -4,11 +4,15 @@ , taglib , cython , pytestCheckHook +, pythonOlder }: buildPythonPackage rec { pname = "pytaglib"; version = "2.0.0"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "supermihi"; From 50a63ac98d1063e57dff5f7d743ce546777431d9 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 28 Mar 2023 08:41:10 +0200 Subject: [PATCH 150/227] python310Packages.packageurl-python: add changelog to meta --- pkgs/development/python-modules/packageurl-python/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/python-modules/packageurl-python/default.nix b/pkgs/development/python-modules/packageurl-python/default.nix index 95eb962bf6b4..6e0935e6413d 100644 --- a/pkgs/development/python-modules/packageurl-python/default.nix +++ b/pkgs/development/python-modules/packageurl-python/default.nix @@ -28,6 +28,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python parser and builder for package URLs"; homepage = "https://github.com/package-url/packageurl-python"; + changelog = "https://github.com/package-url/packageurl-python/blob/v${version}/CHANGELOG.rst"; license = licenses.mit; maintainers = with maintainers; [ armijnhemel ]; }; From cfc14296519ec87ad68f122de1a04ce6f7ce0f49 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 28 Mar 2023 08:41:28 +0200 Subject: [PATCH 151/227] python310Packages.packageurl-python: update disabled --- pkgs/development/python-modules/packageurl-python/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/packageurl-python/default.nix b/pkgs/development/python-modules/packageurl-python/default.nix index 6e0935e6413d..1b7f7957382c 100644 --- a/pkgs/development/python-modules/packageurl-python/default.nix +++ b/pkgs/development/python-modules/packageurl-python/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { version = "0.11.1"; format = "setuptools"; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; From 1767ac74ea4ddbc144524d934df06430dd9d0ba6 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 28 Mar 2023 08:43:51 +0200 Subject: [PATCH 152/227] python310Packages.plugwise: 0.27.7 -> 0.27.9 Diff: https://github.com/plugwise/python-plugwise/compare/refs/tags/v0.27.7...v0.27.9 Changelog: https://github.com/plugwise/python-plugwise/releases/tag/v0.27.9 --- pkgs/development/python-modules/plugwise/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/plugwise/default.nix b/pkgs/development/python-modules/plugwise/default.nix index 89ced453a9d3..81a81f221e26 100644 --- a/pkgs/development/python-modules/plugwise/default.nix +++ b/pkgs/development/python-modules/plugwise/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { pname = "plugwise"; - version = "0.27.7"; + version = "0.27.9"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -30,7 +30,7 @@ buildPythonPackage rec { owner = pname; repo = "python-plugwise"; rev = "refs/tags/v${version}"; - hash = "sha256-MT6P1st3NbHPdulL23zckgliFRTgCn8h9CK3QumXVtQ="; + hash = "sha256-ZxVlMiSMJOr4XxCuSRvTBdcd1295m+d7yqOnNxzRiuI="; }; propagatedBuildInputs = [ From fb57c89c92c3e6c7a8741301947ad53b99bbf7f3 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 28 Mar 2023 08:44:35 +0200 Subject: [PATCH 153/227] python310Packages.pydeps: 1.11.1 -> 1.11.2 Diff: https://github.com/thebjorn/pydeps/compare/refs/tags/v1.11.1...v1.11.2 Changelog: https://github.com/thebjorn/pydeps/releases/tag/v1.11.2 --- pkgs/development/python-modules/pydeps/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pydeps/default.nix b/pkgs/development/python-modules/pydeps/default.nix index aefb4cc43f54..2449ecafb915 100644 --- a/pkgs/development/python-modules/pydeps/default.nix +++ b/pkgs/development/python-modules/pydeps/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "pydeps"; - version = "1.11.1"; + version = "1.11.2"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "thebjorn"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-nFdt68QhpX1URLEQtdikR11KFK9E9Y+cTvJQn4/YZlI="; + hash = "sha256-6eiSzuxspWutEKL1pKBeZ0/ZQjS07BpTwgd8dyrePcM="; }; buildInputs = [ From c4138344572780d01bd040cccf32d6afeb2bb505 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 28 Mar 2023 08:45:10 +0200 Subject: [PATCH 154/227] python310Packages.python-bsblan: 0.5.9 -> 0.5.10 Diff: https://github.com/liudger/python-bsblan/compare/refs/tags/v0.5.9...v0.5.10 Changelog: https://github.com/liudger/python-bsblan/releases/tag/v0.5.10 --- pkgs/development/python-modules/python-bsblan/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/python-bsblan/default.nix b/pkgs/development/python-modules/python-bsblan/default.nix index 11d3bdc3adfc..dcfed60a8c1e 100644 --- a/pkgs/development/python-modules/python-bsblan/default.nix +++ b/pkgs/development/python-modules/python-bsblan/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "python-bsblan"; - version = "0.5.9"; + version = "0.5.10"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "liudger"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-9WXj/zFFzPr3YabdEYN+Xn/IwKplPFdHAFDB2S2JUEI="; + hash = "sha256-VOi3v5SPHHx+qgqQmbIcC+APAks9CPklFAlCmHRM1iQ="; }; nativeBuildInputs = [ From bd2a2628c584982d4be45c32757e7b98fb603a45 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 28 Mar 2023 08:45:47 +0200 Subject: [PATCH 155/227] python310Packages.types-colorama: 0.4.15.8 -> 0.4.15.9 --- pkgs/development/python-modules/types-colorama/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/types-colorama/default.nix b/pkgs/development/python-modules/types-colorama/default.nix index 19190404a6b6..7710cdc152c0 100644 --- a/pkgs/development/python-modules/types-colorama/default.nix +++ b/pkgs/development/python-modules/types-colorama/default.nix @@ -5,12 +5,12 @@ buildPythonPackage rec { pname = "types-colorama"; - version = "0.4.15.8"; + version = "0.4.15.9"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-xrskWqhox914w7Fr1ISEzTZhJ9YeTvoVZ26sI6zYK3Y="; + hash = "sha256-+25tIa07AbGHj8an0/Jm0fhFiwE9cUWTO9kI6x5mj7I="; }; # Module has no tests From 42d79d1cb86f472633682d53bf8d2fc2e1799213 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 28 Mar 2023 08:49:08 +0200 Subject: [PATCH 156/227] python310Packages.aiodiscover: 1.4.14 -> 1.4.15 Diff: https://github.com/bdraco/aiodiscover/compare/refs/tags/v1.4.14...v1.4.15 Changelog: https://github.com/bdraco/aiodiscover/releases/tag/v1.4.15 --- pkgs/development/python-modules/aiodiscover/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aiodiscover/default.nix b/pkgs/development/python-modules/aiodiscover/default.nix index 044bbf7be6e1..aa0414fe7985 100644 --- a/pkgs/development/python-modules/aiodiscover/default.nix +++ b/pkgs/development/python-modules/aiodiscover/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "aiodiscover"; - version = "1.4.14"; + version = "1.4.15"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "bdraco"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-AZ6AqobhgMRCrCqtTuCfJjmKZjFlyIIxPqMtHHH9aBA="; + hash = "sha256-Ee6lo1910dR02fAQEkuS+xCzM93UMKkrgbKPd/Id0Uc="; }; propagatedBuildInputs = [ From 4d862ad620ebf1b5d00d7b70dc158e82fed300f5 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 28 Mar 2023 08:50:22 +0200 Subject: [PATCH 157/227] exploitdb: 2023-03-26 -> 2023-03-28 Diff: https://gitlab.com/exploit-database/exploitdb/-/compare/refs/tags/2023-03-26...2023-03-28 --- pkgs/tools/security/exploitdb/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/exploitdb/default.nix b/pkgs/tools/security/exploitdb/default.nix index 42bb124c4961..55b85b95437c 100644 --- a/pkgs/tools/security/exploitdb/default.nix +++ b/pkgs/tools/security/exploitdb/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "exploitdb"; - version = "2023-03-26"; + version = "2023-03-28"; src = fetchFromGitLab { owner = "exploit-database"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-oUoQNjg14rAs8BAxTOLtYHw9iTwEAsLymObog+GrQw8="; + hash = "sha256-aduDgEj07Gy+P6xDa8DUT31ZHEWXHlzspi7ZY2wCl9A="; }; nativeBuildInputs = [ From 6d0c84a94e777f216823af82b1112c7c30352279 Mon Sep 17 00:00:00 2001 From: Aaron Jheng Date: Tue, 28 Mar 2023 14:54:56 +0800 Subject: [PATCH 158/227] wakatime: 1.68.3 -> 1.70.0 --- pkgs/tools/misc/wakatime/default.nix | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/wakatime/default.nix b/pkgs/tools/misc/wakatime/default.nix index 45d7e95103b4..eda5790c7c41 100644 --- a/pkgs/tools/misc/wakatime/default.nix +++ b/pkgs/tools/misc/wakatime/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "wakatime"; - version = "1.68.3"; + version = "1.70.0"; src = fetchFromGitHub { owner = "wakatime"; repo = "wakatime-cli"; rev = "v${version}"; - hash = "sha256-LifMxov7j2yRDtwh74RjjwfcHfFc/zWrzX96vb2hI9o="; + hash = "sha256-JURz3xPZIqrPreh+kT+o62cOhw55anUH4kqaT3t0tM0="; }; vendorHash = "sha256-SlYYrlRDBvhNm2BxemK9HzzsqM/RGH/sDQXpoGEY8rw="; @@ -22,15 +22,19 @@ buildGoModule rec { preCheck = let skippedTests = [ + # Tests requiring network "TestFileExperts" "TestSendHeartbeats" "TestSendHeartbeats_ExtraHeartbeats" "TestSendHeartbeats_IsUnsavedEntity" "TestSendHeartbeats_NonExistingExtraHeartbeatsEntity" + + # Flaky tests + "TestLoadParams_ApiKey_FromVault_Err_Darwin" ]; in '' - # Disable tests requiring network + # Disable tests buildFlagsArray+=("-run" "[^(${builtins.concatStringsSep "|" skippedTests})]") ''; From 37d68dd8e76fa0d1d6e075697c0104882b23983b Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Mon, 27 Mar 2023 06:54:04 +0200 Subject: [PATCH 159/227] =?UTF-8?q?ocamlPackages.pcap-format:=200.5.2=20?= =?UTF-8?q?=E2=86=92=200.6.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ocaml-modules/pcap-format/default.nix | 20 ++++++++----------- 1 file changed, 8 insertions(+), 12 deletions(-) diff --git a/pkgs/development/ocaml-modules/pcap-format/default.nix b/pkgs/development/ocaml-modules/pcap-format/default.nix index ffd183787793..e73492830893 100644 --- a/pkgs/development/ocaml-modules/pcap-format/default.nix +++ b/pkgs/development/ocaml-modules/pcap-format/default.nix @@ -1,36 +1,32 @@ { lib, buildDunePackage, fetchurl -, ppx_cstruct, ppx_tools -, cstruct, ounit, mmap, stdlib-shims +, ppx_cstruct +, cstruct +, ounit }: buildDunePackage rec { pname = "pcap-format"; - version = "0.5.2"; + version = "0.6.0"; - minimumOCamlVersion = "4.03"; - - # due to cstruct - useDune2 = true; + minimalOCamlVersion = "4.08"; + duneVersion = "3"; src = fetchurl { - url = "https://github.com/mirage/ocaml-pcap/releases/download/${version}/${pname}-${version}.tbz"; - sha256 = "14c5rpgglyz41jic0fg0xa22d2w1syb86kva22y9fi7aqj9vm31f"; + url = "https://github.com/mirage/ocaml-pcap/releases/download/v${version}/${pname}-${version}.tbz"; + hash = "sha256-LUjy8Xm6VsnMq1FHKzmJg7uorkTv7cOTsoLwmtNHkaY="; }; buildInputs = [ - ppx_tools ppx_cstruct ]; propagatedBuildInputs = [ cstruct - stdlib-shims ]; doCheck = true; checkInputs = [ ounit - mmap ]; meta = with lib; { From 6b9fe979f4122972403278be0b661e54954572ad Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 28 Mar 2023 08:56:13 +0200 Subject: [PATCH 160/227] trufflehog: 3.29.1 -> 3.30.0 Changelog: https://github.com/trufflesecurity/trufflehog/releases/tag/v3.30.0 --- pkgs/tools/security/trufflehog/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/trufflehog/default.nix b/pkgs/tools/security/trufflehog/default.nix index 7bfa0e0a19ad..f4be423a269f 100644 --- a/pkgs/tools/security/trufflehog/default.nix +++ b/pkgs/tools/security/trufflehog/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "trufflehog"; - version = "3.29.1"; + version = "3.30.0"; src = fetchFromGitHub { owner = "trufflesecurity"; repo = "trufflehog"; rev = "refs/tags/v${version}"; - hash = "sha256-ZCHrqvqIlANqkZ/zVYbwOsRimWVUAZ8zvBnfTaBE8qk="; + hash = "sha256-4h9obnh4+QNda0SoMPMFEyG0KnW4753RpXTPWi6yB34="; }; - vendorHash = "sha256-Z1QJM2feKFQ8MEVwzYt+MkpDZHiaVWlzq2lbResWQWk="; + vendorHash = "sha256-VBWzqfqte7aZ03HFW2L6wsEU84NBMTVrzKvdRUFGOro="; # Test cases run git clone and require network access doCheck = false; From 4e6d3feb566667b6d8df6ab5bfbf7ca91da19dbb Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 28 Mar 2023 09:19:11 +0200 Subject: [PATCH 161/227] python310Packages.asyncua: add changelog to meta --- pkgs/development/python-modules/asyncua/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/asyncua/default.nix b/pkgs/development/python-modules/asyncua/default.nix index 8faa98cfda06..028b60e7adb3 100644 --- a/pkgs/development/python-modules/asyncua/default.nix +++ b/pkgs/development/python-modules/asyncua/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "FreeOpcUa"; repo = "opcua-asyncio"; - rev = "v${version}"; + rev = "refs/tags/v${version}"; hash = "sha256-6A4z+tiQ2oUlB9t44wlW64j5sjWFMAgqT3Xt0FdJCBs="; }; @@ -60,6 +60,7 @@ buildPythonPackage rec { meta = with lib; { description = "OPC UA / IEC 62541 Client and Server for Python"; homepage = "https://github.com/FreeOpcUa/opcua-asyncio"; + changelog = "https://github.com/FreeOpcUa/opcua-asyncio/releases/tag/v${version}"; license = licenses.lgpl3Plus; maintainers = with maintainers; [ harvidsen ]; }; From 03d50d87c785b658ef0427bbaab43db02556e78b Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Tue, 28 Mar 2023 11:22:07 +1000 Subject: [PATCH 162/227] podman: 4.4.3 -> 4.4.4 Diff: https://github.com/containers/podman/compare/v4.4.3...v4.4.4 Changelog: https://github.com/containers/podman/blob/v4.4.4/RELEASE_NOTES.md --- pkgs/applications/virtualization/podman/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/virtualization/podman/default.nix b/pkgs/applications/virtualization/podman/default.nix index 8298469e1d98..52a20bb57f20 100644 --- a/pkgs/applications/virtualization/podman/default.nix +++ b/pkgs/applications/virtualization/podman/default.nix @@ -61,13 +61,13 @@ let in buildGoModule rec { pname = "podman"; - version = "4.4.3"; + version = "4.4.4"; src = fetchFromGitHub { owner = "containers"; repo = "podman"; rev = "v${version}"; - hash = "sha256-s0aGZN4rnyyNLoO3nnAO7KbeD7MYxE9VMOHrQsKGNBk="; + hash = "sha256-rLXq+sveSxeoD3gyXSnfgGFx6alOBKSRCdDHGwwvPm4="; }; patches = [ From 025027cb010bdeeb0ca070d222857a5a8abc3d82 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 28 Mar 2023 09:31:32 +0200 Subject: [PATCH 163/227] python310Packages.asyncua: remove asynctest --- .../python-modules/asyncua/default.nix | 40 ++++++++++--------- 1 file changed, 21 insertions(+), 19 deletions(-) diff --git a/pkgs/development/python-modules/asyncua/default.nix b/pkgs/development/python-modules/asyncua/default.nix index 028b60e7adb3..90c4a2bfc9af 100644 --- a/pkgs/development/python-modules/asyncua/default.nix +++ b/pkgs/development/python-modules/asyncua/default.nix @@ -1,19 +1,17 @@ { lib -, buildPythonPackage -, fetchFromGitHub -, aiosqlite , aiofiles -, pytz -, python-dateutil -, sortedcontainers +, aiosqlite +, buildPythonPackage , cryptography -, typing-extensions -, importlib-metadata -, pytestCheckHook +, fetchFromGitHub , pytest-asyncio , pytest-mock -, asynctest +, pytestCheckHook +, python-dateutil , pythonOlder +, pytz +, sortedcontainers +, typing-extensions }: buildPythonPackage rec { @@ -21,7 +19,7 @@ buildPythonPackage rec { version = "1.0.1"; format = "setuptools"; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "FreeOpcUa"; @@ -30,6 +28,12 @@ buildPythonPackage rec { hash = "sha256-6A4z+tiQ2oUlB9t44wlW64j5sjWFMAgqT3Xt0FdJCBs="; }; + postPatch = '' + # https://github.com/FreeOpcUa/opcua-asyncio/issues/1263 + substituteInPlace setup.py \ + --replace ", 'asynctest'" "" + ''; + propagatedBuildInputs = [ aiosqlite aiofiles @@ -38,23 +42,21 @@ buildPythonPackage rec { sortedcontainers cryptography typing-extensions - ] ++ lib.optionals (pythonOlder "3.8") [ - importlib-metadata - ]; - - pythonImportsCheck = [ - "asyncua" ]; nativeCheckInputs = [ pytestCheckHook pytest-asyncio pytest-mock - asynctest + ]; + + pythonImportsCheck = [ + "asyncua" ]; disabledTests = [ - "test_cli_tools_which_require_sigint" # Hard coded path only works from root of src + # Hard coded path only works from root of src + "test_cli_tools_which_require_sigint" ]; meta = with lib; { From bc6f8b1a2e0ba3d9e3e5d147164a84321f770620 Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Tue, 28 Mar 2023 09:46:48 +0200 Subject: [PATCH 164/227] firefox-beta-unwrapped: 112.0b6 -> 112.0b7 --- pkgs/applications/networking/browsers/firefox/packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/browsers/firefox/packages.nix b/pkgs/applications/networking/browsers/firefox/packages.nix index d3231f98ceab..813d28b45185 100644 --- a/pkgs/applications/networking/browsers/firefox/packages.nix +++ b/pkgs/applications/networking/browsers/firefox/packages.nix @@ -29,11 +29,11 @@ rec { firefox-beta = buildMozillaMach rec { pname = "firefox-beta"; - version = "112.0b6"; + version = "112.0b7"; applicationName = "Mozilla Firefox Beta"; src = fetchurl { url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz"; - sha512 = "sha512-3Ae3IilmvG7twTaFnKs0TJpiuzLERdrjToTmE644VFeK2GpRgaXgFRfsSB32cyAE+zXPYN/fub8sUoPAHLMbvg=="; + sha512 = "sha512-81g/K0tLZ6lDnMnomMlX1++WMfK45PLBw7AzppuJGNhl9cnryc4BXilSMF9ibIuyTuSMpLHoCggFtH0k7IRyAA=="; }; meta = { From fb4c70366b3c429b7b00eb9d1ab306574dbd74dc Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Tue, 28 Mar 2023 09:47:24 +0200 Subject: [PATCH 165/227] firefox-devedition-unwrapped: 112.0b6 -> 112.0b7 --- pkgs/applications/networking/browsers/firefox/packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/browsers/firefox/packages.nix b/pkgs/applications/networking/browsers/firefox/packages.nix index 813d28b45185..d14876c99fb5 100644 --- a/pkgs/applications/networking/browsers/firefox/packages.nix +++ b/pkgs/applications/networking/browsers/firefox/packages.nix @@ -56,12 +56,12 @@ rec { firefox-devedition = buildMozillaMach rec { pname = "firefox-devedition"; - version = "112.0b6"; + version = "112.0b7"; applicationName = "Mozilla Firefox Developer Edition"; branding = "browser/branding/aurora"; src = fetchurl { url = "mirror://mozilla/devedition/releases/${version}/source/firefox-${version}.source.tar.xz"; - sha512 = "sha512-UJjZ4HFaO6XUpFt+d61KXdliN3FW0BDHFpwt4f6/pv6Rv10mxeRUnGKZDomoLwv+yCgN3EKDZ+iPA9FzkLxZCQ=="; + sha512 = "sha512-2g+2/0s2lp36P+W2Z+9zd8AaMKvDFXjV+JgRoqtFr57HPIC+HwW1f9Swg4dFUVN7oz1CQ7cZiPBuH+FmMT7Q6Q=="; }; meta = { From 4212b26928112c4d669f3fbb2a6ed87927a552dc Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 28 Mar 2023 08:40:53 +0000 Subject: [PATCH 166/227] python310Packages.azure-mgmt-containerservice: 21.2.0 -> 22.0.0 --- .../python-modules/azure-mgmt-containerservice/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/azure-mgmt-containerservice/default.nix b/pkgs/development/python-modules/azure-mgmt-containerservice/default.nix index 89cf42a6a247..f1c8f0bb54d0 100644 --- a/pkgs/development/python-modules/azure-mgmt-containerservice/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-containerservice/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "azure-mgmt-containerservice"; - version = "21.2.0"; + version = "22.0.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; extension = "zip"; - hash = "sha256-pJLnSuSbXbarOiXwfnjSDNmyU7ZOl2IUUVaEA8mQriQ="; + hash = "sha256-/nHR81KW3VaeP2yOSWnCDvZGyxrzK8fAn9S/RRgBhyk="; }; propagatedBuildInputs = [ From 0d401abaef820943cd76f64b4f0e329b944a8b6c Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 28 Mar 2023 10:49:03 +0200 Subject: [PATCH 167/227] python310Packages.garminconnect: 0.1.54 -> 0.1.55 Diff: https://github.com/cyberjunky/python-garminconnect/compare/refs/tags/0.1.54...0.1.55 Changelog: https://github.com/cyberjunky/python-garminconnect/releases/tag/0.1.55 --- pkgs/development/python-modules/garminconnect/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/garminconnect/default.nix b/pkgs/development/python-modules/garminconnect/default.nix index 1d5cd945881d..815b695ce1c2 100644 --- a/pkgs/development/python-modules/garminconnect/default.nix +++ b/pkgs/development/python-modules/garminconnect/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "garminconnect"; - version = "0.1.54"; + version = "0.1.55"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "cyberjunky"; repo = "python-garminconnect"; rev = "refs/tags/${version}"; - hash = "sha256-lxifhL70Yn3BIjeRPnWqOs97Oy65RD0Rrgw4bJno2kI="; + hash = "sha256-YPLlrlV8UyoaNtE+LgX7jpZkR7jbSe/2WRR0v0cfACY="; }; propagatedBuildInputs = [ From 92fc688db9a56c0c04d42ff8c76441bd10e06d15 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 28 Mar 2023 10:52:25 +0200 Subject: [PATCH 168/227] python310Packages.goodwe: 0.2.28 -> 0.2.29 Changelog: https://github.com/marcelblijleven/goodwe/releases/tag/v0.2.29 --- pkgs/development/python-modules/goodwe/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/goodwe/default.nix b/pkgs/development/python-modules/goodwe/default.nix index 77698e3ace2e..a2ed64150f73 100644 --- a/pkgs/development/python-modules/goodwe/default.nix +++ b/pkgs/development/python-modules/goodwe/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "goodwe"; - version = "0.2.28"; + version = "0.2.29"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "marcelblijleven"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-HkOlvZaCQOt+jbmzal17W5eU7SEq+kzTgbFd3fiTY/A="; + hash = "sha256-ukKMWdyaOALA3e68cYilS8TT6aHV3n8qQXobgDTeT2o="; }; postPatch = '' From 097c19b9b01f3258609f77f3951089385ea3cefa Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 28 Mar 2023 10:58:12 +0200 Subject: [PATCH 169/227] python310packages.bellows: remove asnyctest --- pkgs/development/python-modules/bellows/default.nix | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/bellows/default.nix b/pkgs/development/python-modules/bellows/default.nix index e82df588323b..621f8ef5b2cc 100644 --- a/pkgs/development/python-modules/bellows/default.nix +++ b/pkgs/development/python-modules/bellows/default.nix @@ -1,5 +1,4 @@ { lib -, asynctest , buildPythonPackage , click , click-log @@ -19,7 +18,7 @@ buildPythonPackage rec { version = "0.34.10"; format = "setuptools"; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "zigpy"; @@ -41,8 +40,6 @@ buildPythonPackage rec { pytestCheckHook pytest-asyncio pytest-timeout - ] ++ lib.optionals (pythonOlder "3.8") [ - asynctest ]; pythonImportsCheck = [ From 982ea4295b10fc40bc3df5c2d003e9fb94f97081 Mon Sep 17 00:00:00 2001 From: r-vdp Date: Tue, 28 Mar 2023 10:50:02 +0200 Subject: [PATCH 170/227] NixOS/opengl: Use the default Mesa package by default. Fixes #223458 Fixes #223331 --- nixos/modules/hardware/opengl.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/nixos/modules/hardware/opengl.nix b/nixos/modules/hardware/opengl.nix index c4b93db22bef..7b5e669d47f4 100644 --- a/nixos/modules/hardware/opengl.nix +++ b/nixos/modules/hardware/opengl.nix @@ -90,8 +90,8 @@ in mesaPackage = mkOption { type = types.package; - default = pkgs.mesa_23; - defaultText = literalExpression "pkgs.mesa_23"; + default = pkgs.mesa; + defaultText = literalExpression "pkgs.mesa"; example = literalExpression "pkgs.mesa_22"; description = lib.mdDoc '' The Mesa driver package used for rendering support on the system. @@ -103,8 +103,8 @@ in }; mesaPackage32 = mkOption { type = types.package; - default = pkgs.pkgsi686Linux.mesa_23; - defaultText = literalExpression "pkgs.pkgsi686Linux.mesa_23"; + default = pkgs.pkgsi686Linux.mesa; + defaultText = literalExpression "pkgs.pkgsi686Linux.mesa"; example = literalExpression "pkgs.pkgsi686Linux.mesa_22"; description = lib.mdDoc '' Same as {option}`mesaPackage` but for the 32-bit Mesa on 64-bit From 81566fa8cd4f982989ee2a373d83004400e5e748 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 28 Mar 2023 11:08:38 +0200 Subject: [PATCH 171/227] python310Packages.zigpy: remove asynctest --- pkgs/development/python-modules/zigpy/default.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/zigpy/default.nix b/pkgs/development/python-modules/zigpy/default.nix index 4b55e598e2c0..f487cc71b435 100644 --- a/pkgs/development/python-modules/zigpy/default.nix +++ b/pkgs/development/python-modules/zigpy/default.nix @@ -1,7 +1,6 @@ { lib , aiohttp , aiosqlite -, asynctest , buildPythonPackage , crccheck , cryptography @@ -21,7 +20,7 @@ buildPythonPackage rec { version = "0.53.2"; format = "setuptools"; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "zigpy"; @@ -41,7 +40,6 @@ buildPythonPackage rec { ]; nativeCheckInputs = [ - asynctest freezegun pytest-asyncio pytest-timeout From 5a775d7cb520ebb0e1baeb35d5228e532b8db481 Mon Sep 17 00:00:00 2001 From: Ulrik Strid Date: Tue, 28 Mar 2023 11:22:31 +0200 Subject: [PATCH 172/227] ocamlPackages.git: 3.12.0 -> 3.13.0 (#223522) * ocamlPackages.awa: 0.1.2 -> 0.2.0 * ocamlPackages.git: 3.12.0 -> 3.13.0 --- pkgs/development/ocaml-modules/awa/default.nix | 4 ++-- pkgs/development/ocaml-modules/git/default.nix | 4 ++-- pkgs/development/ocaml-modules/git/unix.nix | 7 ------- 3 files changed, 4 insertions(+), 11 deletions(-) diff --git a/pkgs/development/ocaml-modules/awa/default.nix b/pkgs/development/ocaml-modules/awa/default.nix index e8ff5df1a9e5..6b52ddf01f1a 100644 --- a/pkgs/development/ocaml-modules/awa/default.nix +++ b/pkgs/development/ocaml-modules/awa/default.nix @@ -8,14 +8,14 @@ buildDunePackage rec { pname = "awa"; - version = "0.1.2"; + version = "0.2.0"; minimalOCamlVersion = "4.08"; duneVersion = "3"; src = fetchurl { url = "https://github.com/mirage/awa-ssh/releases/download/v${version}/awa-${version}.tbz"; - hash = "sha256-HfIqvmvmdizPSfSHthj2syszVZXVhju7tI8yNEetc38="; + hash = "sha256-hsmTuoubBdsEyGe8zmfG7JihY0LFM4lErpPKUVobIX8="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/ocaml-modules/git/default.nix b/pkgs/development/ocaml-modules/git/default.nix index 1ffc95d3c225..5e1a0461abb1 100644 --- a/pkgs/development/ocaml-modules/git/default.nix +++ b/pkgs/development/ocaml-modules/git/default.nix @@ -8,14 +8,14 @@ buildDunePackage rec { pname = "git"; - version = "3.12.0"; + version = "3.13.0"; minimalOCamlVersion = "4.08"; duneVersion = "3"; src = fetchurl { url = "https://github.com/mirage/ocaml-git/releases/download/${version}/git-${version}.tbz"; - hash = "sha256-qgd5fny23J6pcOdgwB3Yt1UxJii2XE25OjcSVFdLMKA="; + hash = "sha256-98w2Amze/B+YN/ENfSb0V8I2yyFUf8rSEOcUg1YbVdM="; }; # remove changelog for the carton package diff --git a/pkgs/development/ocaml-modules/git/unix.nix b/pkgs/development/ocaml-modules/git/unix.nix index 680c77dfa39e..1079f554731d 100644 --- a/pkgs/development/ocaml-modules/git/unix.nix +++ b/pkgs/development/ocaml-modules/git/unix.nix @@ -14,13 +14,6 @@ buildDunePackage { pname = "git-unix"; inherit (git) version src; - patches = [ - (fetchpatch { - url = "https://github.com/mirage/ocaml-git/commit/b708db8319cc456a5640618210d740a1e00468e9.patch"; - hash = "sha256-Fe+eDhU/beZT/8br8XmOhHYJowaVEha16eGqyuu2Zr4="; - }) - ]; - minimalOCamlVersion = "4.08"; duneVersion = "3"; From b3b75dc9805de6238b204171bc8549068e00a165 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Tue, 28 Mar 2023 08:57:17 +0200 Subject: [PATCH 173/227] ocamlPackages.mirage-random-test: use Dune 3 --- .../development/ocaml-modules/mirage-random-test/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/development/ocaml-modules/mirage-random-test/default.nix b/pkgs/development/ocaml-modules/mirage-random-test/default.nix index 81d75db77251..24339b49568c 100644 --- a/pkgs/development/ocaml-modules/mirage-random-test/default.nix +++ b/pkgs/development/ocaml-modules/mirage-random-test/default.nix @@ -6,10 +6,9 @@ buildDunePackage rec { pname = "mirage-random-test"; version = "0.1.0"; - minimumOCamlVersion = "4.06"; + minimalOCamlVersion = "4.06"; - # due to cstruct - useDune2 = true; + duneVersion = "3"; src = fetchurl { url = "https://github.com/mirage/${pname}/releases/download/v${version}/${pname}-v${version}.tbz"; From b28fd0e903f05211f76df8ce69011b951f2e18de Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Tue, 28 Mar 2023 08:57:22 +0200 Subject: [PATCH 174/227] ocamlPackages.mirage-random: use Dune 3 --- pkgs/development/ocaml-modules/mirage-random/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/ocaml-modules/mirage-random/default.nix b/pkgs/development/ocaml-modules/mirage-random/default.nix index a119395764e5..ba70665c6ede 100644 --- a/pkgs/development/ocaml-modules/mirage-random/default.nix +++ b/pkgs/development/ocaml-modules/mirage-random/default.nix @@ -4,6 +4,8 @@ buildDunePackage rec { pname = "mirage-random"; version = "3.0.0"; + duneVersion = "3"; + src = fetchurl { url = "https://github.com/mirage/mirage-random/releases/download/v${version}/mirage-random-v${version}.tbz"; sha256 = "sha256-Sf4/KB1kMMwXI+yr5H/JuOmynYPNXwlk9dAA+gFAZs8="; From 5accdae43a011d68bf33d02c821f4d02e6d0ab8a Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Tue, 28 Mar 2023 08:57:26 +0200 Subject: [PATCH 175/227] ocamlPackages.mirage-channel: use Dune 3 --- pkgs/development/ocaml-modules/mirage-channel/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/ocaml-modules/mirage-channel/default.nix b/pkgs/development/ocaml-modules/mirage-channel/default.nix index bdafeb430549..74ff38f9a70a 100644 --- a/pkgs/development/ocaml-modules/mirage-channel/default.nix +++ b/pkgs/development/ocaml-modules/mirage-channel/default.nix @@ -8,10 +8,11 @@ buildDunePackage rec { version = "4.1.0"; minimalOCamlVersion = "4.07"; + duneVersion = "3"; src = fetchurl { url = "https://github.com/mirage/mirage-channel/releases/download/v${version}/mirage-channel-${version}.tbz"; - sha256 = "sha256-sBdoUdTd9ZeNcHK0IBGBeOYDDqULM7EYX+Pz2f2nIQA="; + hash = "sha256-sBdoUdTd9ZeNcHK0IBGBeOYDDqULM7EYX+Pz2f2nIQA="; }; propagatedBuildInputs = [ cstruct logs lwt mirage-flow ]; From ad6bb1a8169b30c31eeac884b4904c8e66935460 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Tue, 28 Mar 2023 08:57:29 +0200 Subject: [PATCH 176/227] ocamlPackages.callipyge: use Dune 3 --- pkgs/development/ocaml-modules/callipyge/default.nix | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/pkgs/development/ocaml-modules/callipyge/default.nix b/pkgs/development/ocaml-modules/callipyge/default.nix index 2004f8868caf..68ba880a7987 100644 --- a/pkgs/development/ocaml-modules/callipyge/default.nix +++ b/pkgs/development/ocaml-modules/callipyge/default.nix @@ -1,8 +1,6 @@ { lib , buildDunePackage , fetchurl -, ocaml - , alcotest , eqaf , fmt @@ -14,17 +12,16 @@ buildDunePackage rec { src = fetchurl { url = "https://github.com/oklm-wsh/Callipyge/releases/download/v${version}/${pname}-${version}.tbz"; - sha256 = "sha256-T/94a88xvK51TggjXecdKc9kyTE9aIyueIt5T24sZB0="; + hash = "sha256-T/94a88xvK51TggjXecdKc9kyTE9aIyueIt5T24sZB0="; }; - useDune2 = true; + duneVersion = "3"; - minimumOCamlVersion = "4.03"; + minimalOCamlVersion = "4.08"; propagatedBuildInputs = [ fmt eqaf ]; - # alcotest isn't available for OCaml < 4.08 due to fmt - doCheck = lib.versionAtLeast ocaml.version "4.08"; + doCheck = true; checkInputs = [ alcotest ]; meta = { From 7da5c6a3038aa0e2134cfcd9e1a8490115b81201 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Tue, 28 Mar 2023 08:57:32 +0200 Subject: [PATCH 177/227] ocamlPackages.eqaf: use Dune 3 --- pkgs/development/ocaml-modules/eqaf/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/ocaml-modules/eqaf/default.nix b/pkgs/development/ocaml-modules/eqaf/default.nix index d3e29be3c688..d777755253c2 100644 --- a/pkgs/development/ocaml-modules/eqaf/default.nix +++ b/pkgs/development/ocaml-modules/eqaf/default.nix @@ -2,12 +2,13 @@ buildDunePackage rec { minimalOCamlVersion = "4.07"; + duneVersion = "3"; pname = "eqaf"; version = "0.9"; src = fetchurl { url = "https://github.com/mirage/eqaf/releases/download/v${version}/eqaf-${version}.tbz"; - sha256 = "sha256-7A4oqUasaBf5XVhU8FqZYa46hAi7YQ55z60BubJV3+A="; + hash = "sha256-7A4oqUasaBf5XVhU8FqZYa46hAi7YQ55z60BubJV3+A="; }; propagatedBuildInputs = [ cstruct ]; From 8fdf8ee81c9948cf591a16bf1572cfcd21ec9049 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Tue, 28 Mar 2023 08:57:35 +0200 Subject: [PATCH 178/227] ocamlPackages.mirage-console: use Dune 3 --- pkgs/development/ocaml-modules/mirage-console/default.nix | 3 ++- pkgs/development/ocaml-modules/mirage-console/unix.nix | 2 ++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/development/ocaml-modules/mirage-console/default.nix b/pkgs/development/ocaml-modules/mirage-console/default.nix index 2fcd58973bcd..b0746c54162a 100644 --- a/pkgs/development/ocaml-modules/mirage-console/default.nix +++ b/pkgs/development/ocaml-modules/mirage-console/default.nix @@ -7,10 +7,11 @@ buildDunePackage rec { version = "5.1.0"; minimalOCamlVersion = "4.08"; + duneVersion = "3"; src = fetchurl { url = "https://github.com/mirage/mirage-console/releases/download/v${version}/mirage-console-${version}.tbz"; - sha256 = "sha256-mjYRisbNOJbYoSuWaGoPueXakmqAwmWh0ATvLLsvpNM="; + hash = "sha256-mjYRisbNOJbYoSuWaGoPueXakmqAwmWh0ATvLLsvpNM="; }; propagatedBuildInputs = [ lwt mirage-flow ]; diff --git a/pkgs/development/ocaml-modules/mirage-console/unix.nix b/pkgs/development/ocaml-modules/mirage-console/unix.nix index 634bcc353ad3..ca8c2aeac5e3 100644 --- a/pkgs/development/ocaml-modules/mirage-console/unix.nix +++ b/pkgs/development/ocaml-modules/mirage-console/unix.nix @@ -5,6 +5,8 @@ buildDunePackage { inherit (mirage-console) version src; + duneVersion = "3"; + propagatedBuildInputs = [ mirage-console cstruct From 33eff1646629b977e373ef4d486c6862974080a6 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Tue, 28 Mar 2023 08:57:38 +0200 Subject: [PATCH 179/227] ocamlPackages.vchan: use Dune 3 --- pkgs/development/ocaml-modules/vchan/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/ocaml-modules/vchan/default.nix b/pkgs/development/ocaml-modules/vchan/default.nix index 872d11606ff6..e727c8667669 100644 --- a/pkgs/development/ocaml-modules/vchan/default.nix +++ b/pkgs/development/ocaml-modules/vchan/default.nix @@ -9,10 +9,11 @@ buildDunePackage rec { version = "6.0.1"; minimalOCamlVersion = "4.08"; + duneVersion = "3"; src = fetchurl { url = "https://github.com/mirage/ocaml-vchan/releases/download/v${version}/vchan-${version}.tbz"; - sha256 = "sha256-5E7dITMVirYoxUkp8ZamRAolyhA6avXGJNAioxeBuV0="; + hash = "sha256-5E7dITMVirYoxUkp8ZamRAolyhA6avXGJNAioxeBuV0="; }; propagatedBuildInputs = [ From aeb9262087a4312b9cfea0c3cbaaddb4f333b62a Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Tue, 28 Mar 2023 08:57:41 +0200 Subject: [PATCH 180/227] ocamlPackages.xenstore: use Dune 3 --- pkgs/development/ocaml-modules/xenstore-tool/default.nix | 2 ++ pkgs/development/ocaml-modules/xenstore/default.nix | 1 + pkgs/development/ocaml-modules/xenstore_transport/default.nix | 1 + 3 files changed, 4 insertions(+) diff --git a/pkgs/development/ocaml-modules/xenstore-tool/default.nix b/pkgs/development/ocaml-modules/xenstore-tool/default.nix index 4b6c0d89a82a..b3c8c241ae41 100644 --- a/pkgs/development/ocaml-modules/xenstore-tool/default.nix +++ b/pkgs/development/ocaml-modules/xenstore-tool/default.nix @@ -5,6 +5,8 @@ buildDunePackage { inherit (xenstore_transport) src version; + duneVersion = "3"; + buildInputs = [ xenstore_transport xenstore lwt ]; meta = xenstore_transport.meta // { diff --git a/pkgs/development/ocaml-modules/xenstore/default.nix b/pkgs/development/ocaml-modules/xenstore/default.nix index a3f4e0abcdef..093ca1ffe902 100644 --- a/pkgs/development/ocaml-modules/xenstore/default.nix +++ b/pkgs/development/ocaml-modules/xenstore/default.nix @@ -7,6 +7,7 @@ buildDunePackage rec { version = "2.2.0"; minimalOCamlVersion = "4.08"; + duneVersion = "3"; src = fetchurl { url = "https://github.com/mirage/ocaml-xenstore/releases/download/v${version}/xenstore-${version}.tbz"; diff --git a/pkgs/development/ocaml-modules/xenstore_transport/default.nix b/pkgs/development/ocaml-modules/xenstore_transport/default.nix index a7fb853f3bec..f0867b4ec314 100644 --- a/pkgs/development/ocaml-modules/xenstore_transport/default.nix +++ b/pkgs/development/ocaml-modules/xenstore_transport/default.nix @@ -5,6 +5,7 @@ buildDunePackage rec { version = "1.3.0"; minimalOCamlVersion = "4.08"; + duneVersion = "3"; src = fetchFromGitHub { owner = "xapi-project"; From 1bf4036f3c25ba8f8e0112d4944dad8dc7820204 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Tue, 28 Mar 2023 08:57:44 +0200 Subject: [PATCH 181/227] ocamlPackages.io-page: use Dune 3 --- pkgs/development/ocaml-modules/io-page/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/ocaml-modules/io-page/default.nix b/pkgs/development/ocaml-modules/io-page/default.nix index b57628222405..79142f0e8d4d 100644 --- a/pkgs/development/ocaml-modules/io-page/default.nix +++ b/pkgs/development/ocaml-modules/io-page/default.nix @@ -5,10 +5,11 @@ buildDunePackage rec { version = "3.0.0"; minimalOCamlVersion = "4.08"; + duneVersion = "3"; src = fetchurl { url = "https://github.com/mirage/${pname}/releases/download/v${version}/${pname}-${version}.tbz"; - sha256 = "sha256-DjbKdNkFa6YQgJDLmLsuvyrweb4/TNvqAiggcj/3hu4="; + hash = "sha256-DjbKdNkFa6YQgJDLmLsuvyrweb4/TNvqAiggcj/3hu4="; }; nativeBuildInputs = [ pkg-config ]; From 4f2c5e880d4f76cdbbf3f55cca952a4220d62e06 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Tue, 28 Mar 2023 08:57:46 +0200 Subject: [PATCH 182/227] ocamlPackages.mirage-flow: use Dune 3 --- .../ocaml-modules/mirage-flow/combinators.nix | 8 +++++--- pkgs/development/ocaml-modules/mirage-flow/default.nix | 10 +++++----- pkgs/development/ocaml-modules/mirage-flow/unix.nix | 4 +++- 3 files changed, 13 insertions(+), 9 deletions(-) diff --git a/pkgs/development/ocaml-modules/mirage-flow/combinators.nix b/pkgs/development/ocaml-modules/mirage-flow/combinators.nix index d4904e77430a..5500d0551253 100644 --- a/pkgs/development/ocaml-modules/mirage-flow/combinators.nix +++ b/pkgs/development/ocaml-modules/mirage-flow/combinators.nix @@ -1,11 +1,13 @@ -{ buildDunePackage, mirage-flow, fmt, ocaml_lwt, logs, cstruct, mirage-clock }: +{ buildDunePackage, mirage-flow, fmt, lwt, logs, cstruct, mirage-clock }: buildDunePackage { pname = "mirage-flow-combinators"; - inherit (mirage-flow) version useDune2 src; + inherit (mirage-flow) version src; - propagatedBuildInputs = [ ocaml_lwt logs cstruct mirage-clock mirage-flow ]; + duneVersion = "3"; + + propagatedBuildInputs = [ lwt logs cstruct mirage-clock mirage-flow ]; meta = mirage-flow.meta // { description = "Flow implementations and combinators for MirageOS specialized to lwt"; diff --git a/pkgs/development/ocaml-modules/mirage-flow/default.nix b/pkgs/development/ocaml-modules/mirage-flow/default.nix index bc987eff9884..6b454512915b 100644 --- a/pkgs/development/ocaml-modules/mirage-flow/default.nix +++ b/pkgs/development/ocaml-modules/mirage-flow/default.nix @@ -1,18 +1,18 @@ -{ lib, buildDunePackage, fetchurl, cstruct, fmt, ocaml_lwt }: +{ lib, buildDunePackage, fetchurl, cstruct, fmt, lwt }: buildDunePackage rec { pname = "mirage-flow"; version = "3.0.0"; - useDune2 = true; - minimumOCamlVersion = "4.05"; + duneVersion = "3"; + minimalOCamlVersion = "4.05"; src = fetchurl { url = "https://github.com/mirage/mirage-flow/releases/download/v${version}/mirage-flow-v${version}.tbz"; - sha256 = "sha256-1wvabIXsJ0e+2IvE2V8mnSgQUDuSkT8IB75SkWlhOPw="; + hash = "sha256-1wvabIXsJ0e+2IvE2V8mnSgQUDuSkT8IB75SkWlhOPw="; }; - propagatedBuildInputs = [ cstruct fmt ocaml_lwt ]; + propagatedBuildInputs = [ cstruct fmt lwt ]; meta = { description = "Flow implementations and combinators for MirageOS"; diff --git a/pkgs/development/ocaml-modules/mirage-flow/unix.nix b/pkgs/development/ocaml-modules/mirage-flow/unix.nix index 023896447db1..12681911a3de 100644 --- a/pkgs/development/ocaml-modules/mirage-flow/unix.nix +++ b/pkgs/development/ocaml-modules/mirage-flow/unix.nix @@ -5,7 +5,9 @@ buildDunePackage { pname = "mirage-flow-unix"; - inherit (mirage-flow) version useDune2 src; + inherit (mirage-flow) version src; + + duneVersion = "3"; # Make tests compatible with alcotest 1.4.0 postPatch = '' From 78be8391f7db1778e7d2c18070a878e7a78a2f60 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Tue, 28 Mar 2023 08:57:49 +0200 Subject: [PATCH 183/227] ocamlPackages.asn1-combinators: use Dune 3 --- pkgs/development/ocaml-modules/asn1-combinators/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/ocaml-modules/asn1-combinators/default.nix b/pkgs/development/ocaml-modules/asn1-combinators/default.nix index 8447c25cd707..a8e8a9cc847f 100644 --- a/pkgs/development/ocaml-modules/asn1-combinators/default.nix +++ b/pkgs/development/ocaml-modules/asn1-combinators/default.nix @@ -4,6 +4,7 @@ buildDunePackage rec { minimalOCamlVersion = "4.08"; + duneVersion = "3"; pname = "asn1-combinators"; version = "0.2.6"; From 23e5b45f189af8cd47b143612d0b90d1eea8ba84 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Tue, 28 Mar 2023 08:57:52 +0200 Subject: [PATCH 184/227] ocamlPackages.randomconv: use Dune 3 --- pkgs/development/ocaml-modules/randomconv/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/ocaml-modules/randomconv/default.nix b/pkgs/development/ocaml-modules/randomconv/default.nix index 078d50da895b..45f52ba5bded 100644 --- a/pkgs/development/ocaml-modules/randomconv/default.nix +++ b/pkgs/development/ocaml-modules/randomconv/default.nix @@ -4,7 +4,7 @@ buildDunePackage rec { pname = "randomconv"; version = "0.1.3"; - useDune2 = true; + duneVersion = "3"; src = fetchurl { url = "https://github.com/hannesm/randomconv/releases/download/v${version}/randomconv-v${version}.tbz"; From 0e0155ed964cef8aa20cd9f797fa1981c94c0f81 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Tue, 28 Mar 2023 08:57:55 +0200 Subject: [PATCH 185/227] ocamlPackages.dbf: use Dune 3 --- pkgs/development/ocaml-modules/dbf/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/ocaml-modules/dbf/default.nix b/pkgs/development/ocaml-modules/dbf/default.nix index d2dad611bf46..664cb5dead17 100644 --- a/pkgs/development/ocaml-modules/dbf/default.nix +++ b/pkgs/development/ocaml-modules/dbf/default.nix @@ -7,13 +7,13 @@ buildDunePackage rec { minimalOCamlVersion = "4.08"; - useDune2 = true; + duneVersion = "3"; src = fetchFromGitHub { owner = "pveber"; repo = "dbf"; - rev = "${version}"; - sha256 = "sha256-h1K5YDLbXGEJi/quKXvSR0gZ+WkBzut7AsVFv+Bm8/g="; + rev = version; + hash = "sha256-h1K5YDLbXGEJi/quKXvSR0gZ+WkBzut7AsVFv+Bm8/g="; }; buildInputs = [ ppx_cstruct ]; From 6134a755daac37db021eed103db693e3fe3b701c Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Tue, 28 Mar 2023 08:57:59 +0200 Subject: [PATCH 186/227] ocamlPackages.wayland: use Dune 3 --- pkgs/development/ocaml-modules/wayland/default.nix | 1 + pkgs/tools/wayland/wayland-proxy-virtwl/default.nix | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/ocaml-modules/wayland/default.nix b/pkgs/development/ocaml-modules/wayland/default.nix index f7ade2ec8070..9dea4a64a508 100644 --- a/pkgs/development/ocaml-modules/wayland/default.nix +++ b/pkgs/development/ocaml-modules/wayland/default.nix @@ -15,6 +15,7 @@ buildDunePackage rec { version = "1.1"; minimalOCamlVersion = "4.08"; + duneVersion = "3"; src = fetchurl { url = "https://github.com/talex5/ocaml-wayland/releases/download/v${version}/wayland-${version}.tbz"; diff --git a/pkgs/tools/wayland/wayland-proxy-virtwl/default.nix b/pkgs/tools/wayland/wayland-proxy-virtwl/default.nix index 47b59353af86..164605b3d8a2 100644 --- a/pkgs/tools/wayland/wayland-proxy-virtwl/default.nix +++ b/pkgs/tools/wayland/wayland-proxy-virtwl/default.nix @@ -22,8 +22,8 @@ ocamlPackages.buildDunePackage rec { ''; minimalOCamlVersion = "4.12"; + duneVersion = "3"; - strictDeps = true; nativeBuildInputs = [ pkg-config ]; From cb68c76b8e2843d357ee336569d1f178312a2255 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Tue, 28 Mar 2023 08:58:02 +0200 Subject: [PATCH 187/227] =?UTF-8?q?ocamlPackages.cstruct:=206.1.1=20?= =?UTF-8?q?=E2=86=92=206.2.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/ocaml-modules/cstruct/async.nix | 2 ++ pkgs/development/ocaml-modules/cstruct/default.nix | 5 +++-- pkgs/development/ocaml-modules/cstruct/lwt.nix | 1 + pkgs/development/ocaml-modules/cstruct/ppx.nix | 1 + pkgs/development/ocaml-modules/cstruct/sexp.nix | 1 + pkgs/development/ocaml-modules/cstruct/unix.nix | 1 + 6 files changed, 9 insertions(+), 2 deletions(-) diff --git a/pkgs/development/ocaml-modules/cstruct/async.nix b/pkgs/development/ocaml-modules/cstruct/async.nix index 57647c97c416..1fe020f6490b 100644 --- a/pkgs/development/ocaml-modules/cstruct/async.nix +++ b/pkgs/development/ocaml-modules/cstruct/async.nix @@ -4,6 +4,8 @@ buildDunePackage rec { pname = "cstruct-async"; inherit (cstruct) src version meta; + duneVersion = "3"; + propagatedBuildInputs = [ async_unix async diff --git a/pkgs/development/ocaml-modules/cstruct/default.nix b/pkgs/development/ocaml-modules/cstruct/default.nix index 9efe75af70c9..9877adbcf81a 100644 --- a/pkgs/development/ocaml-modules/cstruct/default.nix +++ b/pkgs/development/ocaml-modules/cstruct/default.nix @@ -2,13 +2,14 @@ buildDunePackage rec { pname = "cstruct"; - version = "6.1.1"; + version = "6.2.0"; minimalOCamlVersion = "4.08"; + duneVersion = "3"; src = fetchurl { url = "https://github.com/mirage/ocaml-cstruct/releases/download/v${version}/cstruct-${version}.tbz"; - sha256 = "sha256-G3T5hw9qfuYAiSRZBxbdUzpyijyhC7GNqf6ovkZ/UY0="; + hash = "sha256-mngHM5JYDoNJFI+jq0sbLpidydMNB0AbBMlrfGDwPmI="; }; buildInputs = [ fmt ]; diff --git a/pkgs/development/ocaml-modules/cstruct/lwt.nix b/pkgs/development/ocaml-modules/cstruct/lwt.nix index 7226193565b1..3aa70e5c9986 100644 --- a/pkgs/development/ocaml-modules/cstruct/lwt.nix +++ b/pkgs/development/ocaml-modules/cstruct/lwt.nix @@ -9,6 +9,7 @@ else inherit (cstruct) version src meta; minimalOCamlVersion = "4.08"; + duneVersion = "3"; propagatedBuildInputs = [ cstruct lwt ]; } diff --git a/pkgs/development/ocaml-modules/cstruct/ppx.nix b/pkgs/development/ocaml-modules/cstruct/ppx.nix index b640c9745f3b..f2b19355b099 100644 --- a/pkgs/development/ocaml-modules/cstruct/ppx.nix +++ b/pkgs/development/ocaml-modules/cstruct/ppx.nix @@ -11,6 +11,7 @@ else inherit (cstruct) version src meta; minimalOCamlVersion = "4.08"; + duneVersion = "3"; propagatedBuildInputs = [ cstruct ppxlib sexplib stdlib-shims ]; diff --git a/pkgs/development/ocaml-modules/cstruct/sexp.nix b/pkgs/development/ocaml-modules/cstruct/sexp.nix index a20911cbb299..3b28cda15afc 100644 --- a/pkgs/development/ocaml-modules/cstruct/sexp.nix +++ b/pkgs/development/ocaml-modules/cstruct/sexp.nix @@ -9,6 +9,7 @@ buildDunePackage rec { inherit (cstruct) version src meta; minimalOCamlVersion = "4.08"; + duneVersion = "3"; doCheck = true; checkInputs = [ alcotest ]; diff --git a/pkgs/development/ocaml-modules/cstruct/unix.nix b/pkgs/development/ocaml-modules/cstruct/unix.nix index 064bdadb3285..40467a77a57f 100644 --- a/pkgs/development/ocaml-modules/cstruct/unix.nix +++ b/pkgs/development/ocaml-modules/cstruct/unix.nix @@ -9,6 +9,7 @@ else inherit (cstruct) version src meta; minimalOCamlVersion = "4.08"; + duneVersion = "3"; propagatedBuildInputs = [ cstruct ]; } From f0a09cc1658c000790f9becf3dc7fd7c55e18948 Mon Sep 17 00:00:00 2001 From: Ruixi-rebirth Date: Tue, 28 Mar 2023 13:59:43 +0800 Subject: [PATCH 188/227] chatgpt-cli: init at 0.6.0-beta chatgpt-cli: init at 0.6.0-beta chatgpt-cli: init at 0.6.0-beta chatgpt-cli: init at 0.6.0-beta chatgpt-cli: init at 0.6.0-beta chatgpt-cli: init at 0.6.0-beta --- pkgs/tools/misc/chatgpt-cli/default.nix | 28 +++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 30 insertions(+) create mode 100644 pkgs/tools/misc/chatgpt-cli/default.nix diff --git a/pkgs/tools/misc/chatgpt-cli/default.nix b/pkgs/tools/misc/chatgpt-cli/default.nix new file mode 100644 index 000000000000..0818e860b5ce --- /dev/null +++ b/pkgs/tools/misc/chatgpt-cli/default.nix @@ -0,0 +1,28 @@ +{ lib +, fetchFromGitHub +, buildGoModule +, +}: +buildGoModule rec { + pname = "chatgpt"; + version = "0.6.0-beta"; + + src = fetchFromGitHub { + owner = "j178"; + repo = pname; + rev = "v${version}"; + hash = "sha256-qIa0eU3aFyDC5cm/J/BmZfcJe1DARqAtmpUMqlaqsF4="; + }; + + vendorHash = "sha256-JlBAPHtMm5mq91aOtsNMDu48net9i3W/AxCiKalYkm4="; + + subPackages = [ "." ]; + + meta = with lib; { + description = "Interactive CLI for ChatGPT"; + homepage = "https://github.com/j178/chatgpt"; + license = licenses.mit; + mainProgram = "chatgpt"; + maintainers = with maintainers; [ Ruixi-rebirth ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 452fb8108891..fd86d9ec1de0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -402,6 +402,8 @@ with pkgs; cewl = callPackage ../tools/security/cewl { }; + chatgpt-cli = callPackage ../tools/misc/chatgpt-cli { }; + checkov = callPackage ../development/tools/analysis/checkov { python3 = python311; }; From 1139cea54204b0d9ec29a2805628ba3bceb2b67b Mon Sep 17 00:00:00 2001 From: Gabriel Arazas Date: Tue, 28 Mar 2023 17:39:17 +0800 Subject: [PATCH 189/227] gum: 0.8.0 -> 0.10.0 --- pkgs/applications/misc/gum/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/gum/default.nix b/pkgs/applications/misc/gum/default.nix index d4bd7c63a722..753ff769a647 100644 --- a/pkgs/applications/misc/gum/default.nix +++ b/pkgs/applications/misc/gum/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "gum"; - version = "0.8.0"; + version = "0.10.0"; src = fetchFromGitHub { owner = "charmbracelet"; repo = pname; rev = "v${version}"; - sha256 = "sha256-6x1t/PLs1dqlY5XQ1F0PDqZ/TofZ0h1hTc0C1sjn3fA="; + sha256 = "sha256-SP8n9PGfn4Oe+3+i7gT4i2WKgO35igPu+86SGp65R7g="; }; - vendorSha256 = "sha256-rOBwhPXo4sTSI3j3rn3c5qWGnGFgkpeFUKgtzKBltbg="; + vendorSha256 = "sha256-gA545IqG3us0mmWxbw3fu3mFLqJzluH/T6d3ilfnLyM="; nativeBuildInputs = [ installShellFiles From ded33fd591a466a8b1829b00e69ab7ad99e70a02 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 28 Mar 2023 10:13:28 +0000 Subject: [PATCH 190/227] jackett: 0.20.3670 -> 0.20.3689 --- pkgs/servers/jackett/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/jackett/default.nix b/pkgs/servers/jackett/default.nix index 004aa72c7cba..440c9c67519f 100644 --- a/pkgs/servers/jackett/default.nix +++ b/pkgs/servers/jackett/default.nix @@ -9,13 +9,13 @@ buildDotnetModule rec { pname = "jackett"; - version = "0.20.3670"; + version = "0.20.3689"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - hash = "sha512-n+dZ5YsluZK45QCHcc2leFwfBEUXHvlAC9LBni5L+lDmNVNkH4Qz+nbJHOiK/WNeTn6aAUADhGk6vUJoaFUqEQ=="; + hash = "sha512-nsbzTR748vyojwju8ydXTNqgXaMPC2jLCLWPh0kVxzi2M0mG5hk6z1GSWIkfUPk6CogAWlfyFmyY/iMONgXQdw=="; }; projectFile = "src/Jackett.Server/Jackett.Server.csproj"; From 97e9bfa750192d65140ccf48b4d1db48800c5760 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 26 Mar 2023 12:20:24 +0000 Subject: [PATCH 191/227] octave: 7.3.0 -> 8.1.0 https://octave.org/NEWS-8.html --- pkgs/development/interpreters/octave/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/interpreters/octave/default.nix b/pkgs/development/interpreters/octave/default.nix index e221956cf225..45d35d027b88 100644 --- a/pkgs/development/interpreters/octave/default.nix +++ b/pkgs/development/interpreters/octave/default.nix @@ -15,7 +15,7 @@ , portaudio , libX11 , graphicsmagick -, pcre +, pcre2 , pkg-config , libGL , libGLU @@ -112,12 +112,12 @@ let }; self = mkDerivation rec { - version = "7.3.0"; + version = "8.1.0"; pname = "octave"; src = fetchurl { url = "mirror://gnu/octave/${pname}-${version}.tar.gz"; - sha256 = "sha256-bhSkZJ1wr0WrZg+Mu/ZFqvHsM/JfiL/aRpfLF+RAxPU="; + sha256 = "sha256-gFIHTRew72Q9A33oqziWcsdSuyAe6c6k36aYWPtqIT8="; }; buildInputs = [ @@ -127,7 +127,7 @@ let flex qhull graphicsmagick - pcre + pcre2 fltk zlib curl From 5af358e19362b7cf98182a49cc2d3197f13be701 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 28 Mar 2023 10:40:13 +0000 Subject: [PATCH 192/227] checkstyle: 10.9.2 -> 10.9.3 --- pkgs/development/tools/analysis/checkstyle/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/analysis/checkstyle/default.nix b/pkgs/development/tools/analysis/checkstyle/default.nix index 93f26dc7d598..fcb849d4369c 100644 --- a/pkgs/development/tools/analysis/checkstyle/default.nix +++ b/pkgs/development/tools/analysis/checkstyle/default.nix @@ -1,12 +1,12 @@ { lib, stdenv, fetchurl, makeWrapper, jre }: stdenv.mkDerivation rec { - version = "10.9.2"; + version = "10.9.3"; pname = "checkstyle"; src = fetchurl { url = "https://github.com/checkstyle/checkstyle/releases/download/checkstyle-${version}/checkstyle-${version}-all.jar"; - sha256 = "sha256-XsWzSg/bwP+O454oQSVDrvmjWKVZpLyfGB47olqRSUY="; + sha256 = "sha256-728SBtKcYTRA8ogNMX6XD3aFbz14GjyNvBVkjdiASPE="; }; nativeBuildInputs = [ makeWrapper ]; From 46293d2b9a208349ec3d7f282142873dff1e2e7e Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Tue, 28 Mar 2023 13:40:44 +0300 Subject: [PATCH 193/227] octave.pkgs: Update all with script --- pkgs/development/octave-modules/control/default.nix | 4 ++-- pkgs/development/octave-modules/doctest/default.nix | 4 ++-- pkgs/development/octave-modules/ltfat/default.nix | 4 ++-- pkgs/development/octave-modules/ocl/default.nix | 4 ++-- pkgs/development/octave-modules/stk/default.nix | 4 ++-- pkgs/development/octave-modules/symbolic/default.nix | 6 +++--- 6 files changed, 13 insertions(+), 13 deletions(-) diff --git a/pkgs/development/octave-modules/control/default.nix b/pkgs/development/octave-modules/control/default.nix index c265fe71d492..95ccaf3d0551 100644 --- a/pkgs/development/octave-modules/control/default.nix +++ b/pkgs/development/octave-modules/control/default.nix @@ -7,11 +7,11 @@ buildOctavePackage rec { pname = "control"; - version = "3.4.0"; + version = "3.5.1"; src = fetchurl { url = "mirror://sourceforge/octave/${pname}-${version}.tar.gz"; - sha256 = "sha256-bsagbhOtKIr62GMcxB9yR+RwlvoejQQkDU7QHvvkp3o="; + sha256 = "sha256-U/o0RQoHdDhPP3xuiR9gCFb60CKrA30bpc/dH/ozDpg="; }; nativeBuildInputs = [ diff --git a/pkgs/development/octave-modules/doctest/default.nix b/pkgs/development/octave-modules/doctest/default.nix index 3c02a20cdad1..456b9810df90 100644 --- a/pkgs/development/octave-modules/doctest/default.nix +++ b/pkgs/development/octave-modules/doctest/default.nix @@ -5,11 +5,11 @@ buildOctavePackage rec { pname = "doctest"; - version = "0.7.0"; + version = "0.8.0"; src = fetchurl { url = "mirror://sourceforge/octave/${pname}-${version}.tar.gz"; - sha256 = "0hh9izj9ds69bmrvmmj16fd1c4z7733h50c7isl8f714srw26kf4"; + sha256 = "sha256-/oXJ7NnbbdsVfhNOYU/tkkYwKhYs5zKMEjybmbf0Cok="; }; meta = with lib; { diff --git a/pkgs/development/octave-modules/ltfat/default.nix b/pkgs/development/octave-modules/ltfat/default.nix index 505670f6298b..829f6eb9287e 100644 --- a/pkgs/development/octave-modules/ltfat/default.nix +++ b/pkgs/development/octave-modules/ltfat/default.nix @@ -13,11 +13,11 @@ buildOctavePackage rec { pname = "ltfat"; - version = "2.3.1"; + version = "2.5.0"; src = fetchurl { url = "mirror://sourceforge/octave/${pname}-${version}.tar.gz"; - sha256 = "0gghh5a4w649ff776wvidfvqas87m0n7rqs960pid1d11bnyqqrh"; + sha256 = "sha256-CFLqlHrTwQzCvpPAtQigCVL3Fs8V05Tmh6nkEsnaV2I="; }; patches = [ diff --git a/pkgs/development/octave-modules/ocl/default.nix b/pkgs/development/octave-modules/ocl/default.nix index 21ba508500e9..6c6d306abd1d 100644 --- a/pkgs/development/octave-modules/ocl/default.nix +++ b/pkgs/development/octave-modules/ocl/default.nix @@ -6,11 +6,11 @@ buildOctavePackage rec { pname = "ocl"; - version = "1.2.0"; + version = "1.2.1"; src = fetchurl { url = "mirror://sourceforge/octave/${pname}-${version}.tar.gz"; - sha256 = "sha256-jQdwZwQNU3PZZFa3lp0hIr0GDt/XFHLJoq4waLI4gS8="; + sha256 = "sha256-NVUefSGv5/l1B7sES7NG1gU8Ms2gfmb8OGxQrhzWlus="; }; meta = with lib; { diff --git a/pkgs/development/octave-modules/stk/default.nix b/pkgs/development/octave-modules/stk/default.nix index fa67936d2bcd..0b161c261c40 100644 --- a/pkgs/development/octave-modules/stk/default.nix +++ b/pkgs/development/octave-modules/stk/default.nix @@ -5,11 +5,11 @@ buildOctavePackage rec { pname = "stk"; - version = "2.7.0"; + version = "2.8.0"; src = fetchurl { url = "mirror://sourceforge/octave/${pname}-${version}.tar.gz"; - sha256 = "sha256-vIf+XDLvLNOMwptFCgiqfl+o3PIQ+KLpsJhOArd7gMM="; + sha256 = "sha256-dgxpw2L7e9o/zimsLPoqW7dEihrrNsks62XtuXt4zTI="; }; meta = with lib; { diff --git a/pkgs/development/octave-modules/symbolic/default.nix b/pkgs/development/octave-modules/symbolic/default.nix index 1d3715b3d73b..2ca59a972cb6 100644 --- a/pkgs/development/octave-modules/symbolic/default.nix +++ b/pkgs/development/octave-modules/symbolic/default.nix @@ -14,13 +14,13 @@ let in buildOctavePackage rec { pname = "symbolic"; - version = "3.0.1"; + version = "3.1.1"; src = fetchFromGitHub { owner = "cbm755"; repo = "octsympy"; - rev = "v${version}"; - hash = "sha256-FJb5uazqEiyNI6TL9WVewMoQnC3CutcHENl+umNZeto="; + rev = "refs/tags/v${version}"; + hash = "sha256-6LmLzTwcBhvMDBE7u/lIkSUP97qFMPRHkxfbAyvas6M="; }; propagatedBuildInputs = [ pythonEnv ]; From a0849883432b75507153db90ce999ebb41308f5d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 28 Mar 2023 10:44:47 +0000 Subject: [PATCH 194/227] dagger: 0.4.1 -> 0.4.2 --- .../tools/continuous-integration/dagger/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/continuous-integration/dagger/default.nix b/pkgs/development/tools/continuous-integration/dagger/default.nix index 05b303878779..334c52cd47f8 100644 --- a/pkgs/development/tools/continuous-integration/dagger/default.nix +++ b/pkgs/development/tools/continuous-integration/dagger/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "dagger"; - version = "0.4.1"; + version = "0.4.2"; src = fetchFromGitHub { owner = "dagger"; repo = "dagger"; rev = "v${version}"; - hash = "sha256-d7Yz5MgV5l54uGbQPmGUVZuz4xdGO+gSiI9/6Axqsb0="; + hash = "sha256-R9O+ilOz5AZmsSR0uoOhXLNMTUEej9sV4ONaIF6ZnVc="; }; - vendorHash = "sha256-fRHs2B/pea9FIqPpOaR6z3do+tpnaGlKTbwfF/smC4w="; + vendorHash = "sha256-/ZwIuzUvs7GvpoR6CfxdCivyOS8kDOukM92NuWFXJCY="; proxyVendor = true; subPackages = [ From a3afe1883609dc0e5c8a3659999c09476f79a70b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 28 Mar 2023 10:52:38 +0000 Subject: [PATCH 195/227] coreth: 0.11.8 -> 0.11.9 --- pkgs/applications/networking/coreth/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/coreth/default.nix b/pkgs/applications/networking/coreth/default.nix index 5f857caee92c..1366bfa7fdf5 100644 --- a/pkgs/applications/networking/coreth/default.nix +++ b/pkgs/applications/networking/coreth/default.nix @@ -6,19 +6,19 @@ buildGoModule rec { pname = "coreth"; - version = "0.11.8"; + version = "0.11.9"; src = fetchFromGitHub { owner = "ava-labs"; repo = pname; rev = "v${version}"; - hash = "sha256-O6dTbhnZPWd7BKMwaPfUOPwcvwzQoHUKR9Zj7uKqtGM="; + hash = "sha256-i0mLyTeosGlnTpKvAUS3wDvBRFpgmnfmKXAtCnAGqE0="; }; # go mod vendor has a bug, see: golang/go#57529 proxyVendor = true; - vendorHash = "sha256-nJA83SfMv+5xKKyJTtaSRsro1XR+3sNiszBeXRRY5NA="; + vendorHash = "sha256-zX1rQ9RDBkzZIbqCDlFEgseYyKYUHYyGFApZqhOrkGU="; ldflags = [ "-s" From 124736ba6cc017a75a51e7d37625f7f91f893e98 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 28 Mar 2023 10:58:06 +0000 Subject: [PATCH 196/227] docker-credential-gcr: 2.1.6 -> 2.1.7 --- pkgs/tools/admin/docker-credential-gcr/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/admin/docker-credential-gcr/default.nix b/pkgs/tools/admin/docker-credential-gcr/default.nix index 65c850fdca91..3ea03db31adf 100644 --- a/pkgs/tools/admin/docker-credential-gcr/default.nix +++ b/pkgs/tools/admin/docker-credential-gcr/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "docker-credential-gcr"; - version = "2.1.6"; + version = "2.1.7"; src = fetchFromGitHub { owner = "GoogleCloudPlatform"; repo = "docker-credential-gcr"; rev = "v${version}"; - sha256 = "sha256-SdVAq/i5J21EoCHVrYL0y6zJxlElZRsGoKGJupZN94w="; + sha256 = "sha256-/+c0bvPdw1FKXw0pfp7v5ArA/PrHU2b7wrt80vAXfCo="; }; patches = [ @@ -23,7 +23,7 @@ buildGoModule rec { rm -rf ./test ''; - vendorSha256 = "sha256-e7XNTizZYp/tS7KRvB9KxY3Yurphnm6Ehz4dHZNReK8="; + vendorHash = "sha256-e7XNTizZYp/tS7KRvB9KxY3Yurphnm6Ehz4dHZNReK8="; CGO_ENABLED = 0; From 06f72bd18a0f666faec4bb7b75ae8d28aa9a8e4f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 28 Mar 2023 11:05:10 +0000 Subject: [PATCH 197/227] quarto: 1.2.335 -> 1.2.475 --- pkgs/development/libraries/quarto/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/quarto/default.nix b/pkgs/development/libraries/quarto/default.nix index 4221d24679c3..058abe3990b3 100644 --- a/pkgs/development/libraries/quarto/default.nix +++ b/pkgs/development/libraries/quarto/default.nix @@ -13,10 +13,10 @@ stdenv.mkDerivation rec { pname = "quarto"; - version = "1.2.335"; + version = "1.2.475"; src = fetchurl { url = "https://github.com/quarto-dev/quarto-cli/releases/download/v${version}/quarto-${version}-linux-amd64.tar.gz"; - sha256 = "sha256-f9b6vDiE/CDsPE8/AseWVTXPZH14wOQtUskMv42Xhcg="; + sha256 = "sha256-oyKjDlTKt2fIzirOqgNRrpuM7buNCG5mmgIztPa28rY="; }; nativeBuildInputs = [ From 5a4cfac5ecdd2e56efe3596dfbb35caee9fe46b2 Mon Sep 17 00:00:00 2001 From: Rahul Butani Date: Fri, 27 Jan 2023 11:26:14 -0800 Subject: [PATCH 198/227] llvmPackages_git.llvm: fix the tests on `x86_64-darwin` Port of eafb8fbd3215f0fe6b1d4a0360a9c4f761677179 ("llvmPackages_15.llvm: fix the tests on `x86_64-darwin`") --- .../compilers/llvm/git/llvm/default.nix | 53 ++++++++++++++++++- 1 file changed, 51 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/llvm/git/llvm/default.nix b/pkgs/development/compilers/llvm/git/llvm/default.nix index 4f0e68dc7b5f..ef7ff66e7464 100644 --- a/pkgs/development/compilers/llvm/git/llvm/default.nix +++ b/pkgs/development/compilers/llvm/git/llvm/default.nix @@ -150,10 +150,59 @@ in stdenv.mkDerivation (rec { rm test/MC/ELF/cfi-version.ll # This test tries to call `sw_vers` by absolute path (`/usr/bin/sw_vers`) - # thus fails under the sandbox: + # and thus fails under the sandbox: substituteInPlace unittests/Support/Host.cpp \ --replace '/usr/bin/sw_vers' "${(builtins.toString darwin.DarwinTools) + "/bin/sw_vers" }" - '' + '' + '' + optionalString (stdenv.isDarwin && stdenv.hostPlatform.isx86) '' + # This test tries to call the intrinsics `@llvm.roundeven.f32` and + # `@llvm.roundeven.f64` which seem to (incorrectly?) lower to `roundevenf` + # and `roundeven` on x86_64 macOS. + # + # However these functions are glibc specific so the test fails: + # - https://www.gnu.org/software/gnulib/manual/html_node/roundevenf.html + # - https://www.gnu.org/software/gnulib/manual/html_node/roundeven.html + # + # TODO(@rrbutani): this seems to run fine on `aarch64-darwin`, why does it + # pass there? + substituteInPlace test/ExecutionEngine/Interpreter/intrinsics.ll \ + --replace "%roundeven32 = call float @llvm.roundeven.f32(float 0.000000e+00)" "" \ + --replace "%roundeven64 = call double @llvm.roundeven.f64(double 0.000000e+00)" "" + + # This test fails on darwin x86_64 because `sw_vers` reports a different + # macOS version than what LLVM finds by reading + # `/System/Library/CoreServices/SystemVersion.plist` (which is passed into + # the sandbox on macOS). + # + # The `sw_vers` provided by nixpkgs reports the macOS version associated + # with the `CoreFoundation` framework with which it was built. Because + # nixpkgs pins the SDK for `aarch64-darwin` and `x86_64-darwin` what + # `sw_vers` reports is not guaranteed to match the macOS version of the host + # that's building this derivation. + # + # Astute readers will note that we only _patch_ this test on aarch64-darwin + # (to use the nixpkgs provided `sw_vers`) instead of disabling it outright. + # So why does this test pass on aarch64? + # + # Well, it seems that `sw_vers` on aarch64 actually links against the _host_ + # CoreFoundation framework instead of the nixpkgs provided one. + # + # Not entirely sure what the right fix is here. I'm assuming aarch64 + # `sw_vers` doesn't intentionally link against the host `CoreFoundation` + # (still digging into how this ends up happening, will follow up) but that + # aside I think the more pertinent question is: should we be patching LLVM's + # macOS version detection logic to use `sw_vers` instead of reading host + # paths? This *is* a way in which details about builder machines can creep + # into the artifacts that are produced, affecting reproducibility, but it's + # not clear to me when/where/for what this even gets used in LLVM. + # + # TODO(@rrbutani): fix/follow-up + substituteInPlace unittests/Support/Host.cpp \ + --replace "getMacOSHostVersion" "DISABLED_getMacOSHostVersion" + + # This test fails with a `dysmutil` crash; have not yet dug into what's + # going on here (TODO(@rrbutani)). + rm test/tools/dsymutil/ARM/obfuscated.test + '' + '' # FileSystem permissions tests fail with various special bits substituteInPlace unittests/Support/CMakeLists.txt \ --replace "Path.cpp" "" From c492acd865a2b5347de5257273bb5961b3daa11e Mon Sep 17 00:00:00 2001 From: Arthur Outhenin-Chalandre Date: Wed, 15 Mar 2023 11:33:52 +0100 Subject: [PATCH 199/227] protonmail-bridge: rename back the binary to protonmail-bridge `bridge` is used by iproute2, so using this name for protonmail-bridge made it very likely to produce a name "conflict". Also `bridge` is used in the Makefile by upstream project Makefile but it apparently is renamed later on when packaged in rpm/deb so even for coherence purposes it does make sense to revert it back to the name `protonmail-bridge` that were previously being used. Signed-off-by: Arthur Outhenin-Chalandre --- nixos/doc/manual/release-notes/rl-2305.section.md | 4 +--- pkgs/applications/networking/protonmail-bridge/default.nix | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/nixos/doc/manual/release-notes/rl-2305.section.md b/nixos/doc/manual/release-notes/rl-2305.section.md index b5e157cdb76e..2cdc70a7fd67 100644 --- a/nixos/doc/manual/release-notes/rl-2305.section.md +++ b/nixos/doc/manual/release-notes/rl-2305.section.md @@ -134,7 +134,7 @@ In addition to numerous new and upgraded packages, this release has the followin - The [services.wordpress.sites.<name>.plugins](#opt-services.wordpress.sites._name_.plugins) and [services.wordpress.sites.<name>.themes](#opt-services.wordpress.sites._name_.themes) options have been converted from sets to attribute sets to allow for consumers to specify explicit install paths via attribute name. -- `protonmail-bridge` package has been updated to v3.0 and the CLI executable is now named bridge instead of protonmail-bridge to be more in line with upstream. +- `protonmail-bridge` package has been updated to major version 3. - Nebula now runs as a system user and group created for each nebula network, using the `CAP_NET_ADMIN` ambient capability on launch rather than starting as root. Ensure that any files each Nebula instance needs to access are owned by the correct user and group, by default `nebula-${networkName}`. @@ -286,8 +286,6 @@ In addition to numerous new and upgraded packages, this release has the followin - The `unifi-poller` package and corresponding NixOS module have been renamed to `unpoller` to match upstream. -- `protonmail-bridge` package has been updated to v3.0 and the CLI executable is now named bridge instead of protonmail-bridge to be more in line with upstream. - - The new option `services.tailscale.useRoutingFeatures` controls various settings for using Tailscale features like exit nodes and subnet routers. If you wish to use your machine as an exit node, you can set this setting to `server`, otherwise if you wish to use an exit node you can set this setting to `client`. The strict RPF warning has been removed as the RPF will be loosened automatically based on the value of this setting. - `openjdk` from version 11 and above is not build with `openjfx` (i.e.: JavaFX) support by default anymore. You can re-enable it by overriding, e.g.: `openjdk11.override { enableJavaFX = true; };`. diff --git a/pkgs/applications/networking/protonmail-bridge/default.nix b/pkgs/applications/networking/protonmail-bridge/default.nix index d02bf7ec1fe2..3cac4a2dcdd6 100644 --- a/pkgs/applications/networking/protonmail-bridge/default.nix +++ b/pkgs/applications/networking/protonmail-bridge/default.nix @@ -38,7 +38,7 @@ buildGoModule rec { ]; postInstall = '' - mv $out/bin/Desktop-Bridge $out/bin/bridge # The cli is named like that in the upstream repo + mv $out/bin/Desktop-Bridge $out/bin/protonmail-bridge # The cli is named like that in other distro packages ''; meta = with lib; { From 236410c7a63fd2d521c72094ceff39523900aaa2 Mon Sep 17 00:00:00 2001 From: Jack Cummings Date: Thu, 23 Mar 2023 15:41:23 -0700 Subject: [PATCH 200/227] bluespec: 2022.1 -> 2023.1 --- pkgs/development/compilers/bluespec/default.nix | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/pkgs/development/compilers/bluespec/default.nix b/pkgs/development/compilers/bluespec/default.nix index 4970d02e32c1..6637b769dd65 100644 --- a/pkgs/development/compilers/bluespec/default.nix +++ b/pkgs/development/compilers/bluespec/default.nix @@ -28,18 +28,18 @@ let in stdenv.mkDerivation rec { pname = "bluespec"; - version = "2022.01"; + version = "2023.01"; src = fetchFromGitHub { owner = "B-Lang-org"; repo = "bsc"; rev = version; - sha256 = "sha256-ivTua3MLa8akma3MGkhsqwSdwswYX916kywKdlj7TqY="; + sha256 = "sha256-kFHQtRaQmZiHo+IQ+mwbW23i3kbdAh/XH0OE7P/ibd0="; }; yices-src = fetchurl { url = "https://github.com/B-Lang-org/bsc/releases/download/${version}/yices-src-for-bsc-${version}.tar.gz"; - sha256 = "sha256-ey5yIIVFZyG4EnYGqbIJqmxK1rZ70FWM0Jz+2hIoGXE="; + sha256 = "sha256-pyEdCJvmgwOYPMZEtw7aro76tSn/Y/2GcKTyARmIh4E="; }; enableParallelBuilding = true; @@ -50,8 +50,7 @@ in stdenv.mkDerivation rec { patches = [ ./libstp_stub_makefile.patch ]; postUnpack = '' - mkdir -p $sourceRoot/src/vendor/yices/v2.6/yices2 - tar -C $sourceRoot/src/vendor/yices/v2.6/yices2 -xf ${yices-src} + tar -C $sourceRoot/ -xf ${yices-src} chmod -R +rwX $sourceRoot/src/vendor/yices/v2.6/yices2 ''; @@ -94,7 +93,7 @@ in stdenv.mkDerivation rec { makeFlags = [ "release" - "NO_DEPS_CHECKS=1" # skip the subrepo check (this deriviation uses yices.src instead of the subrepo) + "NO_DEPS_CHECKS=1" # skip the subrepo check (this deriviation uses yices-src instead of the subrepo) "NOGIT=1" # https://github.com/B-Lang-org/bsc/issues/12 "LDCONFIG=ldconfig" # https://github.com/B-Lang-org/bsc/pull/43 "STP_STUB=1" From 73b6b55ab2f6183e1e80adec4da7ee5e9949f299 Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Tue, 28 Mar 2023 13:55:00 +0300 Subject: [PATCH 201/227] octave.pkgs.database: Fix c_verror issue --- .../octave-modules/database/c_verror.patch | 11 +++++++++++ pkgs/development/octave-modules/database/default.nix | 4 ++++ 2 files changed, 15 insertions(+) create mode 100644 pkgs/development/octave-modules/database/c_verror.patch diff --git a/pkgs/development/octave-modules/database/c_verror.patch b/pkgs/development/octave-modules/database/c_verror.patch new file mode 100644 index 000000000000..9726a29512eb --- /dev/null +++ b/pkgs/development/octave-modules/database/c_verror.patch @@ -0,0 +1,11 @@ +--- a/src/error-helpers.h ++++ b/src/error-helpers.h +@@ -64,7 +64,7 @@ + } \ + catch (OCTAVE__EXECUTION_EXCEPTION& e) \ + { \ +- verror (e, __VA_ARGS__); \ ++ c_verror (e, __VA_ARGS__); \ + } + #endif + diff --git a/pkgs/development/octave-modules/database/default.nix b/pkgs/development/octave-modules/database/default.nix index 3e1fe863276c..811278af5027 100644 --- a/pkgs/development/octave-modules/database/default.nix +++ b/pkgs/development/octave-modules/database/default.nix @@ -13,6 +13,10 @@ buildOctavePackage rec { url = "mirror://sourceforge/octave/${pname}-${version}.tar.gz"; sha256 = "1c0n76adi0jw6bx62s04vjyda6kb6ca8lzz2vam43vdy10prcq9p"; }; + patches = [ + # Fix for octave 8.x + ./c_verror.patch + ]; propagatedBuildInputs = [ postgresql From a991a71d04cb18241ee9cc4c7b613fe78cb86ce1 Mon Sep 17 00:00:00 2001 From: Sumner Evans Date: Tue, 28 Mar 2023 13:55:24 +0200 Subject: [PATCH 202/227] matrix-synapse: 1.79.0 -> 1.80.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 3e9fadea76fa..0061fa71e6b8 100644 --- a/pkgs/servers/matrix-synapse/default.nix +++ b/pkgs/servers/matrix-synapse/default.nix @@ -12,20 +12,20 @@ in with python3.pkgs; buildPythonApplication rec { pname = "matrix-synapse"; - version = "1.79.0"; + version = "1.80.0"; format = "pyproject"; src = fetchFromGitHub { owner = "matrix-org"; repo = "synapse"; rev = "v${version}"; - hash = "sha256-2MHP4Gu+C5yyXObbd7NLYWCy1E0L7fUwpzYsoD7ULDo="; + hash = "sha256-Lw6gmuI+ntOW54HQbmDoY9QYNDTu5vgtrJz6HMWWmMM="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - hash = "sha256-yDKs6KRStjJMC/48dZcyQ4OmBXY1TombjH/ZDfBJbSc="; + hash = "sha256-KqPpaIJ8VuVV6f6n14/7wbA+Vtk7NvWm09bUBWuAAlY="; }; postPatch = '' From ef507bb93938fdd723ec691bd0884944996349e4 Mon Sep 17 00:00:00 2001 From: Damien Cassou Date: Tue, 28 Mar 2023 14:24:48 +0200 Subject: [PATCH 203/227] woob: remove unused dependencies --- .../python-modules/woob/default.nix | 19 ------------------- 1 file changed, 19 deletions(-) diff --git a/pkgs/development/python-modules/woob/default.nix b/pkgs/development/python-modules/woob/default.nix index 4d90e4e17e42..fb9f9f930d19 100644 --- a/pkgs/development/python-modules/woob/default.nix +++ b/pkgs/development/python-modules/woob/default.nix @@ -1,30 +1,21 @@ { lib , babel , buildPythonPackage -, colorama -, cssselect -, feedparser , fetchFromGitLab , fetchpatch -, gdata , gnupg -, google-api-python-client , html2text , libyaml , lxml -, mechanize , nose , packaging -, pdfminer-six , pdm-pep517 , pillow , prettytable -, pyqt5 , python-dateutil , pythonOlder , pyyaml , requests -, simplejson , termcolor , testers , unidecode @@ -47,31 +38,21 @@ buildPythonPackage rec { nativeBuildInputs = [ packaging - pyqt5 pdm-pep517 ]; propagatedBuildInputs = [ babel - colorama - cssselect python-dateutil - feedparser - gdata gnupg - google-api-python-client html2text libyaml lxml - mechanize packaging - pdfminer-six pillow prettytable - pyqt5 pyyaml requests - simplejson termcolor unidecode ]; From c09ecd65bf98a764f6e4008d4f21c21e688cea21 Mon Sep 17 00:00:00 2001 From: IndeedNotJames Date: Tue, 28 Mar 2023 14:29:39 +0200 Subject: [PATCH 204/227] rustic-rs: 0.4.4 -> 0.5.0 Temporarily removed zsh shell completions, as they don't generate due to a bug. https://github.com/rustic-rs/rustic/blob/v0.5.0/changelog/0.5.0.txt https://github.com/rustic-rs/rustic/releases/tag/v0.5.0 diff: https://github.com/rustic-rs/rustic/compare/v0.4.4...v0.5.0 --- pkgs/tools/backup/rustic-rs/default.nix | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/backup/rustic-rs/default.nix b/pkgs/tools/backup/rustic-rs/default.nix index 559fcf2a0ff9..5487a2641750 100644 --- a/pkgs/tools/backup/rustic-rs/default.nix +++ b/pkgs/tools/backup/rustic-rs/default.nix @@ -2,27 +2,30 @@ rustPlatform.buildRustPackage rec { pname = "rustic-rs"; - version = "0.4.4"; + version = "0.5.0"; src = fetchFromGitHub { owner = "rustic-rs"; repo = "rustic"; rev = "v${version}"; - hash = "sha256-irN5enJ0nyyzrLvnLXm7YhyEJ3nz9PQukzAfUrKmOzY="; + hash = "sha256-r4hOjX/LKv2wX720FMEztUo9rf2hDBLfcHtENSZNA3U="; }; - cargoHash = "sha256-wJuWeoS45ikP12S2o6aB2Iogw5HomXzCIjkFbp3rSR4="; + cargoHash = "sha256-sNxD8rDkfUw5aVhRYpYftpPMiWhiTYDdShlVZvx2BHk="; nativeBuildInputs = [ installShellFiles ]; buildInputs = lib.optionals stdenv.isDarwin [ Security ]; + ## v0.5.0 panics when trying to generate zsh completions due to a bug. + ## See https://github.com/rustic-rs/rustic/issues/533 + ## and https://github.com/rustic-rs/rustic/pull/536 postInstall = '' - for shell in {ba,fi,z}sh; do + for shell in {ba,fi}sh; do $out/bin/rustic completions $shell > rustic.$shell done - installShellCompletion rustic.{ba,fi,z}sh + installShellCompletion rustic.{ba,fi}sh ''; meta = { From c9e77048fbeb2d1e0bd792020e7ce22c4a77ed63 Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Tue, 28 Mar 2023 11:30:05 +0200 Subject: [PATCH 205/227] typst: 23-03-21-2 -> 23-03-28 --- pkgs/tools/typesetting/typst/Cargo.lock | 26 +++++++++++++++--------- pkgs/tools/typesetting/typst/default.nix | 22 +++++--------------- 2 files changed, 21 insertions(+), 27 deletions(-) diff --git a/pkgs/tools/typesetting/typst/Cargo.lock b/pkgs/tools/typesetting/typst/Cargo.lock index fe52185931f8..c595674ad62c 100644 --- a/pkgs/tools/typesetting/typst/Cargo.lock +++ b/pkgs/tools/typesetting/typst/Cargo.lock @@ -58,8 +58,9 @@ checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" [[package]] name = "biblatex" -version = "0.6.3" -source = "git+https://github.com/typst/biblatex#932ad283dd45dd88d4fa14dc5b9bda7a270ba027" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1bc17a7f4d461f93f5dbbae4c961746cb4aafb5c6c1a61089a86836614932a3c" dependencies = [ "chrono", "numerals", @@ -159,8 +160,9 @@ checksum = "3d7b894f5411737b7867f4827955924d7c254fc9f4d91a6aad6b097804b1018b" [[package]] name = "comemo" -version = "0.1.0" -source = "git+https://github.com/typst/comemo#9b520e8f5284d1c39d0bb13eb426f923972775f8" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "22bf2c21093020535dd771993fedae8dd55393a4258cca501a9b55a962d350a5" dependencies = [ "comemo-macros", "siphasher", @@ -168,8 +170,9 @@ dependencies = [ [[package]] name = "comemo-macros" -version = "0.1.0" -source = "git+https://github.com/typst/comemo#9b520e8f5284d1c39d0bb13eb426f923972775f8" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9faa23f4534253fa656b176ff524d5cd7306a6fed3048929f9cc01ab38ab5a5a" dependencies = [ "proc-macro2", "quote", @@ -430,8 +433,9 @@ checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" [[package]] name = "hayagriva" -version = "0.1.1" -source = "git+https://github.com/typst/hayagriva#754efb7e1034bcd4d4f1366e432197edbbfb9ed5" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "33f939b9606af811242f770582c89a2f8bb5de4e531c0a1df9d2d4906bcbc32a" dependencies = [ "biblatex", "chrono", @@ -844,7 +848,8 @@ checksum = "db8bcd96cb740d03149cbad5518db9fd87126a10ab519c011893b1754134c468" [[package]] name = "pixglyph" version = "0.1.0" -source = "git+https://github.com/typst/pixglyph#e3ff0272d6723cdada91a00b0c99cda0e5adb56d" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9eefadd393715fe315c8cdcd587f893b818a6dfe4f6f9faeb44b764c7c38fd8b" dependencies = [ "ttf-parser 0.18.1", ] @@ -1500,7 +1505,8 @@ checksum = "e5464a87b239f13a63a501f2701565754bae92d243d4bb7eb12f6d57d2269bf4" [[package]] name = "unicode-math-class" version = "0.1.0" -source = "git+https://github.com/typst/unicode-math-class#a7ac7dd75cd79ab2e0bdb629036cb913371608d2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7d246cf599d5fae3c8d56e04b20eb519adb89a8af8d0b0fbcded369aa3647d65" [[package]] name = "unicode-normalization" diff --git a/pkgs/tools/typesetting/typst/default.nix b/pkgs/tools/typesetting/typst/default.nix index 0e4cdfcb9a30..ed5473892e4c 100644 --- a/pkgs/tools/typesetting/typst/default.nix +++ b/pkgs/tools/typesetting/typst/default.nix @@ -7,25 +7,20 @@ rustPlatform.buildRustPackage rec { pname = "typst"; - version = "23-03-21-2"; + version = "23-03-28"; src = fetchFromGitHub { owner = "typst"; repo = "typst"; rev = "v${version}"; - hash = "sha256-bJPGs/Bd9nKYDrCCaFT+20+1wTN4YdkV8bGrtOCR4tM="; + hash = "sha256-0fTGbXdpzPadABWqdReQNZf2N7OMZ8cs9U5fmhfN6m4="; }; cargoLock = { lockFile = ./Cargo.lock; outputHashes = { - "biblatex-0.6.3" = "sha256-TfH2tk7B61HHqpdGY48TdPKelp4+78x+8LRFobAg8QA="; - "comemo-0.1.0" = "sha256-zg056kUc8sVLQ8vvT4uOuRJnyrCORsGYUvsjBJEkFPg="; - "hayagriva-0.1.1" = "sha256-HGQ+jNAnejxUBQNaqXPw57zfAC3qNXSWUVzDALZTXg0="; "iai-0.1.1" = "sha256-EdNzCPht5chg7uF9O8CtPWR/bzSYyfYIXNdLltqdlR0="; "lipsum-0.8.2" = "sha256-deIbpn4YM7/NeuJ5Co48ivJmxwrcsbLl6c3cP3JZxAQ="; - "pixglyph-0.1.0" = "sha256-8veNF3rzV21ayzk9gh2x0mQA8nHGM662ohvh084a0vk="; - "unicode-math-class-0.1.0" = "sha256-NkwDzj1SfUe570UcfotmVP6bIEYwiegZd0j8TPEWoOk="; }; }; @@ -36,20 +31,13 @@ rustPlatform.buildRustPackage rec { cargoBuildFlags = [ "-p" "typst-cli" ]; cargoTestFlags = [ "-p" "typst-cli" ]; - # the build script tries to get the revision using git - # which overwrites the environment variable set below - postPatch = '' - rm cli/build.rs - ''; - - # git revision used for `--version` - # https://github.com/typst/typst/blob/b934a2fd83d63fc115c01f959e888c7bc1aa87e4/cli/build.rs#L7 - TYPST_HASH = "b934a2fd"; + # https://github.com/typst/typst/blob/056d15a/cli/src/main.rs#L164 + TYPST_VERSION = version; meta = with lib; { description = "A new markup-based typesetting system that is powerful and easy to learn"; homepage = "https://typst.app"; license = licenses.asl20; - maintainers = with maintainers; [ figsoda kanashimia ]; + maintainers = with maintainers; [ drupol figsoda kanashimia ]; }; } From ad103077d9ed9959cecea32a5e89ca79a17e4667 Mon Sep 17 00:00:00 2001 From: Carlos Alexandro Becker Date: Tue, 28 Mar 2023 10:30:02 -0300 Subject: [PATCH 206/227] svu: init at 1.10.2 (#223393) --- pkgs/tools/misc/svu/default.nix | 31 +++++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 33 insertions(+) create mode 100644 pkgs/tools/misc/svu/default.nix diff --git a/pkgs/tools/misc/svu/default.nix b/pkgs/tools/misc/svu/default.nix new file mode 100644 index 000000000000..62568696c42d --- /dev/null +++ b/pkgs/tools/misc/svu/default.nix @@ -0,0 +1,31 @@ +{ lib, buildGoModule, fetchFromGitHub, testers, svu }: + +buildGoModule rec { + pname = "svu"; + version = "1.10.2"; + + src = fetchFromGitHub { + owner = "caarlos0"; + repo = pname; + rev = "v${version}"; + sha256 = "37AT+ygN7u3KfFqr26M9c7aTt15z8m4PBrSd+G5mJcE="; + }; + + vendorHash = "sha256-+e1oL08KvBSNaRepGR2SBBrEDJaGxl5V9rOBysGEfQs="; + + ldflags = [ "-s" "-w" "-X=main.version=${version}" "-X=main.builtBy=nixpkgs" ]; + + # test assumes source directory to be a git repository + postPatch = '' + rm internal/git/git_test.go + ''; + + passthru.tests.version = testers.testVersion { package = svu; }; + + meta = with lib; { + description = "Semantic Version Util"; + homepage = "https://github.com/caarlos0/svu"; + maintainers = with maintainers; [ caarlos0 ]; + license = licenses.mit; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 50a72b68608b..bf9e382dd6d4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12426,6 +12426,8 @@ with pkgs; svgcleaner = callPackage ../tools/graphics/svgcleaner { }; + svu = callPackage ../tools/misc/svu { }; + ssb = callPackage ../tools/security/ssb { }; ssb-patchwork = callPackage ../applications/networking/ssb-patchwork { }; From 4766c30e4df6a3a32cc79145c9f7ed497cc7ba12 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Tue, 28 Mar 2023 16:44:47 +0300 Subject: [PATCH 207/227] audacity: fix build on x86_64-darwin (#223386) --- pkgs/applications/audio/audacity/default.nix | 6 +++--- pkgs/top-level/all-packages.nix | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/audio/audacity/default.nix b/pkgs/applications/audio/audacity/default.nix index 6d8f279dadbd..24d610f62d02 100644 --- a/pkgs/applications/audio/audacity/default.nix +++ b/pkgs/applications/audio/audacity/default.nix @@ -75,6 +75,8 @@ stdenv.mkDerivation rec { '' + lib.optionalString stdenv.isLinux '' substituteInPlace libraries/lib-files/FileNames.cpp \ --replace /usr/include/linux/magic.h ${linuxHeaders}/include/linux/magic.h + '' + lib.optionalString (stdenv.isDarwin && lib.versionOlder stdenv.targetPlatform.darwinMinVersion "11.0") '' + sed -z -i "s/NSAppearanceName.*systemAppearance//" src/AudacityApp.mm ''; nativeBuildInputs = [ @@ -93,9 +95,6 @@ stdenv.mkDerivation rec { ffmpeg_4 file flac - ] ++ lib.optionals stdenv.isDarwin [ - AppKit - ] ++ [ gtk3 lame libid3tag @@ -135,6 +134,7 @@ stdenv.mkDerivation rec { libuuid util-linux ] ++ lib.optionals stdenv.isDarwin [ + AppKit CoreAudioKit # for portaudio libpng libjpeg diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index bf9e382dd6d4..2040db59dfae 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -28705,8 +28705,8 @@ with pkgs; }; audaciousQt5 = audacious; - audacity = darwin.apple_sdk_11_0.callPackage ../applications/audio/audacity { - inherit (darwin.apple_sdk_11_0.frameworks) AppKit CoreAudioKit; + audacity = callPackage ../applications/audio/audacity { + inherit (darwin.apple_sdk.frameworks) AppKit CoreAudioKit; }; audio-recorder = callPackage ../applications/audio/audio-recorder { }; From 5a8991c6b34fc62793f3996cb4614595d5d13a6c Mon Sep 17 00:00:00 2001 From: Ulrik Strid Date: Tue, 28 Mar 2023 16:17:52 +0200 Subject: [PATCH 208/227] Fix dune-configurator --- .../ocaml-modules/dune-configurator/default.nix | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/pkgs/development/ocaml-modules/dune-configurator/default.nix b/pkgs/development/ocaml-modules/dune-configurator/default.nix index f5303db9a3b5..862e0d01d598 100644 --- a/pkgs/development/ocaml-modules/dune-configurator/default.nix +++ b/pkgs/development/ocaml-modules/dune-configurator/default.nix @@ -1,17 +1,21 @@ -{ lib, buildDunePackage, dune_2, csexp, result }: +{ lib, buildDunePackage, dune_3, csexp }: buildDunePackage rec { pname = "dune-configurator"; - useDune2 = true; + inherit (dune_3) src version; - inherit (dune_2) src version patches; + # This fixes finding csexp + postPatch = '' + rm -rf ./vendor + ''; - minimumOCamlVersion = "4.03"; + minimumOCamlVersion = "4.04"; + duneVersion = "3"; dontAddPrefix = true; - propagatedBuildInputs = [ csexp result ]; + propagatedBuildInputs = [ csexp ]; meta = with lib; { description = "Helper library for gathering system configuration"; From f79bec0b3a3f3d56fe7ad39b280da7a0ac7a9477 Mon Sep 17 00:00:00 2001 From: "Ricardo M. Correia" Date: Tue, 28 Mar 2023 14:13:11 +0000 Subject: [PATCH 209/227] zfs: remove myself from maintainers --- pkgs/os-specific/linux/zfs/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/zfs/default.nix b/pkgs/os-specific/linux/zfs/default.nix index 750586ff1b1d..8655bd2ed323 100644 --- a/pkgs/os-specific/linux/zfs/default.nix +++ b/pkgs/os-specific/linux/zfs/default.nix @@ -210,7 +210,7 @@ let changelog = "https://github.com/openzfs/zfs/releases/tag/zfs-${version}"; license = lib.licenses.cddl; platforms = lib.platforms.linux; - maintainers = with lib.maintainers; [ jcumming jonringer wizeman globin raitobezarius ]; + maintainers = with lib.maintainers; [ jcumming jonringer globin raitobezarius ]; mainProgram = "zfs"; # If your Linux kernel version is not yet supported by zfs, try zfsUnstable. # On NixOS set the option boot.zfs.enableUnstable. From ce251cd8a948e3d82047b4a3d3825c680af63bd7 Mon Sep 17 00:00:00 2001 From: "Ricardo M. Correia" Date: Tue, 28 Mar 2023 14:13:33 +0000 Subject: [PATCH 210/227] transmission: remove myself from maintainers --- pkgs/applications/networking/p2p/transmission/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/networking/p2p/transmission/default.nix b/pkgs/applications/networking/p2p/transmission/default.nix index 8f44d79f817d..403b0bc9e87c 100644 --- a/pkgs/applications/networking/p2p/transmission/default.nix +++ b/pkgs/applications/networking/p2p/transmission/default.nix @@ -142,7 +142,7 @@ in stdenv.mkDerivation { ''; homepage = "http://www.transmissionbt.com/"; license = lib.licenses.gpl2Plus; # parts are under MIT - maintainers = with lib.maintainers; [ astsmtl vcunat wizeman ]; + maintainers = with lib.maintainers; [ astsmtl vcunat ]; platforms = lib.platforms.unix; }; From 81487980879ff04d1f94a65a06831a42dc75a1db Mon Sep 17 00:00:00 2001 From: Ruixi-rebirth Date: Tue, 28 Mar 2023 22:06:43 +0800 Subject: [PATCH 211/227] go-musicfox: 3.7.5 -> 3.7.7 --- pkgs/applications/audio/go-musicfox/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/go-musicfox/default.nix b/pkgs/applications/audio/go-musicfox/default.nix index da54f07dfb00..40ecd0dd21a6 100644 --- a/pkgs/applications/audio/go-musicfox/default.nix +++ b/pkgs/applications/audio/go-musicfox/default.nix @@ -10,13 +10,13 @@ # gcc only supports objc on darwin buildGoModule.override { stdenv = clangStdenv; } rec { pname = "go-musicfox"; - version = "3.7.5"; + version = "3.7.7"; src = fetchFromGitHub { owner = "anhoder"; repo = pname; rev = "v${version}"; - hash = "sha256-+0s+MCFLw527gFj7pfiYGfKYihthFjRLPeto2SbALw0="; + hash = "sha256-gQPr+mCZ7tnASs/ibow1b0Qj3ppZhdgP4U1Vxo+FfE4="; }; deleteVendor = true; From bca930867614ab4edcb9164a0ca6dce7fc6d4b17 Mon Sep 17 00:00:00 2001 From: MGlolenstine Date: Mon, 20 Mar 2023 19:53:59 +0100 Subject: [PATCH 212/227] shell_gpt: init at 0.7.3 --- pkgs/tools/misc/shell_gpt/default.nix | 40 +++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 42 insertions(+) create mode 100644 pkgs/tools/misc/shell_gpt/default.nix diff --git a/pkgs/tools/misc/shell_gpt/default.nix b/pkgs/tools/misc/shell_gpt/default.nix new file mode 100644 index 000000000000..695ceb15fe04 --- /dev/null +++ b/pkgs/tools/misc/shell_gpt/default.nix @@ -0,0 +1,40 @@ +{ lib +, python3 +}: + +python3.pkgs.buildPythonApplication rec { + pname = "shell_gpt"; + version = "0.7.3"; + + src = python3.pkgs.fetchPypi { + inherit pname version; + sha256 = "sha256-lS8zLtsh8Uz782KJwHqifEQnWQswbCXRVIfXWAmWtvI="; + }; + + nativeBuildInputs = with python3.pkgs; [ + python3.pkgs.pythonRelaxDepsHook + python3 + pip + ]; + + propagatedBuildInputs = with python3.pkgs; [ + markdown-it-py + rich + distro + typer + requests + ]; + + pythonRelaxDeps = [ "requests" "rich" "distro" "typer" ]; + + doCheck = false; + + meta = with lib; { + mainProgram = "sgpt"; + homepage = "https://github.com/TheR1D/shell_gpt"; + description = "Access ChatGPT from your terminal"; + platforms = platforms.linux; + license = licenses.mit; + maintainers = with maintainers; [ mglolenstine ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2040db59dfae..00fd1bb285e3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -33275,6 +33275,8 @@ with pkgs; shadowfox = callPackage ../tools/networking/shadowfox { }; + shell_gpt = callPackage ../tools/misc/shell_gpt { }; + shfmt = callPackage ../tools/text/shfmt { }; shipments = callPackage ../applications/misc/shipments { }; From 445760731092ffa38d03eb9668b17251cf2b7b22 Mon Sep 17 00:00:00 2001 From: superherointj <5861043+superherointj@users.noreply.github.com> Date: Tue, 28 Mar 2023 12:37:16 -0300 Subject: [PATCH 213/227] ocamlPackages.dune-configurator: revert last commit --- .../ocaml-modules/dune-configurator/default.nix | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/pkgs/development/ocaml-modules/dune-configurator/default.nix b/pkgs/development/ocaml-modules/dune-configurator/default.nix index 862e0d01d598..cdb1e3fc2005 100644 --- a/pkgs/development/ocaml-modules/dune-configurator/default.nix +++ b/pkgs/development/ocaml-modules/dune-configurator/default.nix @@ -1,21 +1,17 @@ -{ lib, buildDunePackage, dune_3, csexp }: +{ lib, buildDunePackage, dune_2, csexp, result }: buildDunePackage rec { pname = "dune-configurator"; - inherit (dune_3) src version; + inherit (dune_2) src version patches; - # This fixes finding csexp - postPatch = '' - rm -rf ./vendor - ''; + duneVersion = "2"; - minimumOCamlVersion = "4.04"; + minimalOCamlVersion = "4.03"; - duneVersion = "3"; dontAddPrefix = true; - propagatedBuildInputs = [ csexp ]; + propagatedBuildInputs = [ csexp result ]; meta = with lib; { description = "Helper library for gathering system configuration"; From b89c975ca4a577b045ac4a11af85166e406a4932 Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Tue, 28 Mar 2023 19:09:22 +0300 Subject: [PATCH 214/227] octave.pkgs.image-aquisition: mark as broken --- pkgs/development/octave-modules/image-acquisition/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/octave-modules/image-acquisition/default.nix b/pkgs/development/octave-modules/image-acquisition/default.nix index 08c4305999b3..e1410fd8368f 100644 --- a/pkgs/development/octave-modules/image-acquisition/default.nix +++ b/pkgs/development/octave-modules/image-acquisition/default.nix @@ -28,5 +28,7 @@ buildOctavePackage rec { The Octave-forge Image Aquisition package provides functions to capture images from connected devices. Currently only v4l2 is supported. ''; + # Got broke with octave 8.x update, and wasn't updated since 2015 + broken = true; }; } From 5390b407569e9dc697acf7597bd97143a0e96a56 Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Tue, 28 Mar 2023 19:09:43 +0300 Subject: [PATCH 215/227] octave.pkgs.level-set: mark as broken --- pkgs/development/octave-modules/level-set/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/octave-modules/level-set/default.nix b/pkgs/development/octave-modules/level-set/default.nix index 3cce6f2cad55..3cc0873e3813 100644 --- a/pkgs/development/octave-modules/level-set/default.nix +++ b/pkgs/development/octave-modules/level-set/default.nix @@ -23,7 +23,7 @@ buildOctavePackage rec { # corrected to have a %s format specifier. However, logic_error() also # exists, (a simple regex also matches that), but logic_error() doesn't # require a format specifier. So, this regex was born to handle that... - patchPhase = '' + postPatch = '' substituteInPlace build.sh --replace "level-set-0.3.1" "${pname}-${version}" \ --replace "\`pwd\`" '/build' sed -i -E 's#[^[:graph:]]error \(# error \(\"%s\", #g' src/*.cpp @@ -51,7 +51,7 @@ buildOctavePackage rec { license = licenses.gpl3Plus; maintainers = with maintainers; [ KarlJoad ]; description = "Routines for calculating the time-evolution of the level-set equation and extracting geometric information from the level-set function"; - # /build/level-set-2019-04-13.tar.gz: Cannot open: No such file or directory - broken = stdenv.isDarwin; + # Got broke with octave 8.x update, and wasn't updated since 2019 + broken = true; }; } From ffbdb8b3d9e7ddbefc957b4d916cb416a6ffd567 Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Tue, 28 Mar 2023 19:33:05 +0300 Subject: [PATCH 216/227] octave.pkgs.parallel: mark as broken --- pkgs/development/octave-modules/parallel/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/development/octave-modules/parallel/default.nix b/pkgs/development/octave-modules/parallel/default.nix index 11fba7d36300..45c57d72f20f 100644 --- a/pkgs/development/octave-modules/parallel/default.nix +++ b/pkgs/development/octave-modules/parallel/default.nix @@ -14,6 +14,9 @@ buildOctavePackage rec { url = "mirror://sourceforge/octave/${pname}-${version}.tar.gz"; sha256 = "1h8vw2r42393px6dk10y3lhpxl168r9d197f9whz6lbk2rg571pa"; }; + patches = [ + ../database/c_verror.patch + ]; nativeBuildInputs = [ pkg-config @@ -32,5 +35,8 @@ buildOctavePackage rec { license = licenses.gpl3Plus; maintainers = with maintainers; [ KarlJoad ]; description = "Parallel execution package"; + # Although upstream has added an identical patch to that of ../database, it + # still won't build with octave>8.1 + broken = true; }; } From 1403166764b729eb46a2ea2b501218b887d6e5df Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Tue, 28 Mar 2023 19:37:07 +0300 Subject: [PATCH 217/227] octave.pkgs.tisean: mark as broken --- pkgs/development/octave-modules/sparsersb/default.nix | 2 ++ pkgs/development/octave-modules/tisean/default.nix | 5 ++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/development/octave-modules/sparsersb/default.nix b/pkgs/development/octave-modules/sparsersb/default.nix index 507ed1100a42..41ee75cb1a80 100644 --- a/pkgs/development/octave-modules/sparsersb/default.nix +++ b/pkgs/development/octave-modules/sparsersb/default.nix @@ -22,5 +22,7 @@ buildOctavePackage rec { license = licenses.gpl3Plus; maintainers = with maintainers; [ KarlJoad ]; description = "Interface to the librsb package implementing the RSB sparse matrix format for fast shared-memory sparse matrix computations"; + # Broken since octave>8.x + broken = true; }; } diff --git a/pkgs/development/octave-modules/tisean/default.nix b/pkgs/development/octave-modules/tisean/default.nix index bfe01f10f2ff..71d05dc7a1f0 100644 --- a/pkgs/development/octave-modules/tisean/default.nix +++ b/pkgs/development/octave-modules/tisean/default.nix @@ -1,5 +1,4 @@ { buildOctavePackage -, stdenv , lib , fetchurl # Octave dependencies @@ -30,7 +29,7 @@ buildOctavePackage rec { license = licenses.gpl3Plus; maintainers = with maintainers; [ KarlJoad ]; description = "Port of TISEAN 3.0.1"; - # Some gfortran symbols claimed to be missing - broken = stdenv.isDarwin; + # Broken since octave 8.x update, and wasn't updated since 2021 + broken = true; }; } From f672b32b2eeb2db0a0742884593d7f63ad75e9d1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Mon, 27 Mar 2023 19:44:49 -0700 Subject: [PATCH 218/227] vaultwarden: 1.27.0 -> 1.28.0 Diff: https://github.com/dani-garcia/vaultwarden/compare/1.27.0..1.28.0 Changelog: https://github.com/dani-garcia/vaultwarden/releases/tag/1.28.0 --- nixos/tests/vaultwarden.nix | 6 +- pkgs/tools/security/vaultwarden/Cargo.lock | 1462 ++++++++++-------- pkgs/tools/security/vaultwarden/default.nix | 9 +- pkgs/tools/security/vaultwarden/update.nix | 8 +- pkgs/tools/security/vaultwarden/webvault.nix | 14 +- 5 files changed, 870 insertions(+), 629 deletions(-) diff --git a/nixos/tests/vaultwarden.nix b/nixos/tests/vaultwarden.nix index d0b11e00538f..95d00c1d8ec1 100644 --- a/nixos/tests/vaultwarden.nix +++ b/nixos/tests/vaultwarden.nix @@ -121,6 +121,8 @@ let driver.find_element(By.CSS_SELECTOR, 'input#register-form_input_confirm-master-password').send_keys( '${userPassword}' ) + if driver.find_element(By.CSS_SELECTOR, 'input#checkForBreaches').is_selected(): + driver.find_element(By.CSS_SELECTOR, 'input#checkForBreaches').click() driver.find_element(By.XPATH, "//button[contains(., 'Create account')]").click() @@ -133,9 +135,9 @@ let ) driver.find_element(By.XPATH, "//button[contains(., 'Log in')]").click() - wait.until(EC.title_contains("Vaultwarden Web Vault")) + wait.until(EC.title_contains("Vaults")) - driver.find_element(By.XPATH, "//button[contains(., 'Add item')]").click() + driver.find_element(By.XPATH, "//button[contains(., 'New item')]").click() driver.find_element(By.CSS_SELECTOR, 'input#name').send_keys( 'secrets' diff --git a/pkgs/tools/security/vaultwarden/Cargo.lock b/pkgs/tools/security/vaultwarden/Cargo.lock index 8bf1ee42722f..6c893cad2c6b 100644 --- a/pkgs/tools/security/vaultwarden/Cargo.lock +++ b/pkgs/tools/security/vaultwarden/Cargo.lock @@ -2,56 +2,12 @@ # It is not intended for manual editing. version = 3 -[[package]] -name = "addr2line" -version = "0.19.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a76fd60b23679b7d19bd066031410fb7e458ccc5e958eb5c325888ce4baedc97" -dependencies = [ - "gimli", -] - [[package]] name = "adler" version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" -[[package]] -name = "aead" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c192eb8f11fc081b0fe4259ba5af04217d4e0faddd02417310a927911abd7c8" -dependencies = [ - "crypto-common", - "generic-array", -] - -[[package]] -name = "aes" -version = "0.8.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "433cfd6710c9986c576a25ca913c39d66a6474107b406f34f91d4a8923395241" -dependencies = [ - "cfg-if", - "cipher", - "cpufeatures", -] - -[[package]] -name = "aes-gcm" -version = "0.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "82e1366e0c69c9f927b1fa5ce2c7bf9eafc8f9268c0b9800729e8b267612447c" -dependencies = [ - "aead", - "aes", - "cipher", - "ctr", - "ghash", - "subtle", -] - [[package]] name = "aho-corasick" version = "0.7.20" @@ -85,6 +41,28 @@ dependencies = [ "libc", ] +[[package]] +name = "argon2" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "95c2fcf79ad1932ac6269a738109997a83c227c09b75842ae564dc8ede6a861c" +dependencies = [ + "base64ct", + "blake2", + "password-hash", +] + +[[package]] +name = "async-channel" +version = "1.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cf46fee83e5ccffc220104713af3292ff9bc7c64c7de289f66dae8e38d826833" +dependencies = [ + "concurrent-queue", + "event-listener", + "futures-core", +] + [[package]] name = "async-compression" version = "0.3.15" @@ -100,35 +78,145 @@ dependencies = [ ] [[package]] -name = "async-stream" -version = "0.3.3" +name = "async-executor" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dad5c83079eae9969be7fadefe640a1c566901f05ff91ab221de4b6f68d9507e" +checksum = "17adb73da160dfb475c183343c8cccd80721ea5a605d3eb57125f0a7b7a92d0b" +dependencies = [ + "async-lock", + "async-task", + "concurrent-queue", + "fastrand", + "futures-lite", + "slab", +] + +[[package]] +name = "async-global-executor" +version = "2.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f1b6f5d7df27bd294849f8eec66ecfc63d11814df7a4f5d74168a2394467b776" +dependencies = [ + "async-channel", + "async-executor", + "async-io", + "async-lock", + "blocking", + "futures-lite", + "once_cell", +] + +[[package]] +name = "async-io" +version = "1.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0fc5b45d93ef0529756f812ca52e44c221b35341892d3dcc34132ac02f3dd2af" +dependencies = [ + "async-lock", + "autocfg", + "cfg-if", + "concurrent-queue", + "futures-lite", + "log", + "parking", + "polling", + "rustix 0.37.3", + "slab", + "socket2", + "waker-fn", +] + +[[package]] +name = "async-lock" +version = "2.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fa24f727524730b077666307f2734b4a1a1c57acb79193127dcc8914d5242dd7" +dependencies = [ + "event-listener", +] + +[[package]] +name = "async-process" +version = "1.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6381ead98388605d0d9ff86371043b5aa922a3905824244de40dc263a14fcba4" +dependencies = [ + "async-io", + "async-lock", + "autocfg", + "blocking", + "cfg-if", + "event-listener", + "futures-lite", + "libc", + "signal-hook", + "windows-sys 0.42.0", +] + +[[package]] +name = "async-std" +version = "1.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "62565bb4402e926b29953c785397c6dc0391b7b446e45008b0049eb43cec6f5d" +dependencies = [ + "async-channel", + "async-global-executor", + "async-io", + "async-lock", + "async-process", + "crossbeam-utils", + "futures-channel", + "futures-core", + "futures-io", + "futures-lite", + "gloo-timers", + "kv-log-macro", + "log", + "memchr", + "once_cell", + "pin-project-lite", + "pin-utils", + "slab", + "wasm-bindgen-futures", +] + +[[package]] +name = "async-stream" +version = "0.3.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ad445822218ce64be7a341abfb0b1ea43b5c23aa83902542a4542e78309d8e5e" dependencies = [ "async-stream-impl", "futures-core", + "pin-project-lite", ] [[package]] name = "async-stream-impl" -version = "0.3.3" +version = "0.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "10f203db73a71dfa2fb6dd22763990fa26f3d2625a6da2da900d23b87d26be27" +checksum = "e4655ae1a7b0cdf149156f780c5bf3f1352bc53cbd9e0a361a7ef7b22947e965" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.109", ] [[package]] -name = "async-trait" -version = "0.1.59" +name = "async-task" +version = "4.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31e6e93155431f3931513b243d371981bb2770112b370c82745a1d19d2f99364" +checksum = "ecc7ab41815b3c653ccd2978ec3255c81349336702dfdf62ee6f7069b12a3aae" + +[[package]] +name = "async-trait" +version = "0.1.68" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b9ccdd8f2a161be9bd5c023df56f1b2a0bd1d83872ae53b71a84a12c9bf6e842" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.10", ] [[package]] @@ -147,15 +235,10 @@ dependencies = [ ] [[package]] -name = "atty" -version = "0.2.14" +name = "atomic-waker" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8" -dependencies = [ - "hermit-abi", - "libc", - "winapi", -] +checksum = "debc29dde2e69f9e47506b525f639ed42300fc014a3e007832592448fa8e4599" [[package]] name = "autocfg" @@ -163,27 +246,24 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" -[[package]] -name = "backtrace" -version = "0.3.67" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "233d376d6d185f2a3093e58f283f60f880315b6c60075b01f36b3b85154564ca" -dependencies = [ - "addr2line", - "cc", - "cfg-if", - "libc", - "miniz_oxide", - "object", - "rustc-demangle", -] - [[package]] name = "base64" version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" +[[package]] +name = "base64" +version = "0.21.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a4a4ddaa51a5bc52a6948f74c06d20aaaddb71924eab79b8c97a8c556e942d6a" + +[[package]] +name = "base64ct" +version = "1.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8c3c1a368f70d6cf7302d78f8f7093da241fb8e8807c05cc9e51a125895a6d5b" + [[package]] name = "binascii" version = "0.1.4" @@ -197,14 +277,43 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] -name = "block-buffer" -version = "0.10.3" +name = "bitflags" +version = "2.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "69cce20737498f97b993470a6e536b8523f0af7892a4f928cceb1ac5e52ebe7e" +checksum = "487f1e0fcbe47deb8b0574e646def1c903389d95241dd1bbcc6ce4a715dfc0c1" + +[[package]] +name = "blake2" +version = "0.10.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "46502ad458c9a52b69d4d4d32775c788b7a1b85e8bc9d482d92250fc0e3f8efe" +dependencies = [ + "digest", +] + +[[package]] +name = "block-buffer" +version = "0.10.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71" dependencies = [ "generic-array", ] +[[package]] +name = "blocking" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3c67b173a56acffd6d2326fb7ab938ba0b00a71480e14902b2591c87bc5741e8" +dependencies = [ + "async-channel", + "async-lock", + "async-task", + "atomic-waker", + "fastrand", + "futures-lite", +] + [[package]] name = "brotli" version = "3.3.4" @@ -218,9 +327,9 @@ dependencies = [ [[package]] name = "brotli-decompressor" -version = "2.3.2" +version = "2.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59ad2d4653bf5ca36ae797b1f4bb4dbddb60ce49ca4aed8a2ce4829f60425b80" +checksum = "4b6561fd3f895a11e8f72af2cb7d22e08366bebc2b6b57f7744c4bda27034744" dependencies = [ "alloc-no-stdlib", "alloc-stdlib", @@ -228,9 +337,9 @@ dependencies = [ [[package]] name = "bumpalo" -version = "3.11.1" +version = "3.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "572f695136211188308f16ad2ca5c851a712c464060ae6974944458eb83880ba" +checksum = "0d261e256854913907f67ed06efbc3338dfe6179796deefc1ff763fc1aee5535" [[package]] name = "byteorder" @@ -240,22 +349,22 @@ checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610" [[package]] name = "bytes" -version = "1.3.0" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dfb24e866b15a1af2a1b663f10c6b6b8f397a84aadb828f12e5b289ec23a3a3c" +checksum = "89b2fd2a0dcf38d7971e2194b6b6eebab45ae01067456a7fd93d5547a61b70be" [[package]] name = "cached" -version = "0.40.0" +version = "0.42.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72b4147cd94d5fbdc2ab71b11d50a2f45493625576b3bb70257f59eedea69f3d" +checksum = "5e5877db5d1af7fae60d06b5db9430b68056a69b3582a0be8e3691e87654aeb6" dependencies = [ "async-trait", "async_once", "cached_proc_macro", "cached_proc_macro_types", "futures", - "hashbrown", + "hashbrown 0.13.2", "instant", "lazy_static", "once_cell", @@ -265,14 +374,15 @@ dependencies = [ [[package]] name = "cached_proc_macro" -version = "0.15.0" +version = "0.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "751f7f4e7a091545e7f6c65bacc404eaee7e87bfb1f9ece234a1caa173dc16f2" +checksum = "e10ca87c81aaa3a949dbbe2b5e6c2c45dbc94ba4897e45ea31ff9ec5087be3dc" dependencies = [ "cached_proc_macro_types", "darling", + "proc-macro2", "quote", - "syn", + "syn 1.0.109", ] [[package]] @@ -283,9 +393,9 @@ checksum = "3a4f925191b4367301851c6d99b09890311d74b0d43f274c0b34c86d308a3663" [[package]] name = "cc" -version = "1.0.78" +version = "1.0.79" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a20104e2335ce8a659d6dd92a51a767a0c062599c73b343fd152cb401e828c3d" +checksum = "50d30906286121d95be3d479533b458f87493b30a4b5f79a607db8f5d11aa91f" [[package]] name = "cfg-if" @@ -295,9 +405,9 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "chrono" -version = "0.4.23" +version = "0.4.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "16b0a3d9ed01224b22057780a37bb8c5dbfe1be8ba48678e7bf57ec4b385411f" +checksum = "4e3c5919066adf22df73762e50cffcde3a758f2a848b113b586d1f86728b673b" dependencies = [ "iana-time-zone", "num-integer", @@ -328,16 +438,6 @@ dependencies = [ "phf_codegen", ] -[[package]] -name = "cipher" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d1873270f8f7942c191139cb8a40fd228da6c3fd2fc376d7e92d47aa14aeb59e" -dependencies = [ - "crypto-common", - "inout", -] - [[package]] name = "codespan-reporting" version = "0.11.1" @@ -349,19 +449,32 @@ dependencies = [ ] [[package]] -name = "cookie" -version = "0.16.1" +name = "concurrent-queue" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "344adc371239ef32293cb1c4fe519592fcf21206c79c02854320afcdf3ab4917" +checksum = "c278839b831783b70278b14df4d45e1beb1aad306c07bb796637de9a0e323e8e" +dependencies = [ + "crossbeam-utils", +] + +[[package]] +name = "cookie" +version = "0.16.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e859cd57d0710d9e06c381b550c06e76992472a8c6d527aecd2fc673dcc231fb" +dependencies = [ + "percent-encoding", + "time", + "version_check", +] + +[[package]] +name = "cookie" +version = "0.17.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7efb37c3e1ccb1ff97164ad95ac1606e8ccd35b3fa0a7d99a304c7f4a428cc24" dependencies = [ - "aes-gcm", - "base64", - "hkdf", - "hmac", "percent-encoding", - "rand", - "sha2", - "subtle", "time", "version_check", ] @@ -372,7 +485,7 @@ version = "0.16.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2e4b6aa369f41f5faa04bb80c9b1f4216ea81646ed6124d76ba5c49a7aafd9cd" dependencies = [ - "cookie", + "cookie 0.16.2", "idna 0.2.3", "log", "publicsuffix", @@ -388,7 +501,7 @@ version = "0.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bca9b3c618262fc0c85ecbc814c144e04be9c6eec08b315e7cd1cfbe0bb6ca84" dependencies = [ - "cookie", + "cookie 0.16.2", "idna 0.3.0", "log", "publicsuffix", @@ -416,9 +529,9 @@ checksum = "5827cebf4670468b8772dd191856768aedcb1b0278a04f989f7766351917b9dc" [[package]] name = "cpufeatures" -version = "0.2.5" +version = "0.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28d997bd5e24a5928dd43e46dc529867e207907fe0b239c3477d924f7f2ca320" +checksum = "280a9f2d8b3a38871a3c8a46fb80db65e5e5ed97da80c4d08bf27fb63e35e181" dependencies = [ "libc", ] @@ -445,9 +558,9 @@ dependencies = [ [[package]] name = "crossbeam-utils" -version = "0.8.14" +version = "0.8.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fb766fa798726286dbbb842f174001dab8abc7b627a1dd86e0b7222a95d929f" +checksum = "3c063cd8cc95f5c377ed0d4b49a4b21f632396ff690e8470c29b3359b346984b" dependencies = [ "cfg-if", ] @@ -459,24 +572,24 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3" dependencies = [ "generic-array", - "rand_core", "typenum", ] [[package]] -name = "ctr" -version = "0.9.2" +name = "ctor" +version = "0.1.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0369ee1ad671834580515889b80f2ea915f23b8be8d0daa4bbaf2ac5c7590835" +checksum = "6d2301688392eb071b0bf1a37be05c469d3cc4dbbd95df672fe28ab021e6a096" dependencies = [ - "cipher", + "quote", + "syn 1.0.109", ] [[package]] name = "cxx" -version = "1.0.83" +version = "1.0.93" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bdf07d07d6531bfcdbe9b8b739b104610c6508dcc4d63b410585faf338241daf" +checksum = "a9c00419335c41018365ddf7e4d5f1c12ee3659ddcf3e01974650ba1de73d038" dependencies = [ "cc", "cxxbridge-flags", @@ -486,9 +599,9 @@ dependencies = [ [[package]] name = "cxx-build" -version = "1.0.83" +version = "1.0.93" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2eb5b96ecdc99f72657332953d4d9c50135af1bac34277801cc3937906ebd39" +checksum = "fb8307ad413a98fff033c8545ecf133e3257747b3bae935e7602aab8aa92d4ca" dependencies = [ "cc", "codespan-reporting", @@ -496,31 +609,31 @@ dependencies = [ "proc-macro2", "quote", "scratch", - "syn", + "syn 2.0.10", ] [[package]] name = "cxxbridge-flags" -version = "1.0.83" +version = "1.0.93" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac040a39517fd1674e0f32177648334b0f4074625b5588a64519804ba0553b12" +checksum = "edc52e2eb08915cb12596d29d55f0b5384f00d697a646dbd269b6ecb0fbd9d31" [[package]] name = "cxxbridge-macro" -version = "1.0.83" +version = "1.0.93" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1362b0ddcfc4eb0a1f57b68bd77dd99f0e826958a96abd0ae9bd092e114ffed6" +checksum = "631569015d0d8d54e6c241733f944042623ab6df7bc3be7466874b05fcdb1c5f" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.10", ] [[package]] name = "darling" -version = "0.13.4" +version = "0.14.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a01d95850c592940db9b8194bc39f4bc0e89dee5c4265e4b1807c34a9aba453c" +checksum = "7b750cb3417fd1b327431a470f388520309479ab0bf5e323505daf0290cd3850" dependencies = [ "darling_core", "darling_macro", @@ -528,27 +641,27 @@ dependencies = [ [[package]] name = "darling_core" -version = "0.13.4" +version = "0.14.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "859d65a907b6852c9361e3185c862aae7fafd2887876799fa55f5f99dc40d610" +checksum = "109c1ca6e6b7f82cc233a97004ea8ed7ca123a9af07a8230878fcfda9b158bf0" dependencies = [ "fnv", "ident_case", "proc-macro2", "quote", "strsim", - "syn", + "syn 1.0.109", ] [[package]] name = "darling_macro" -version = "0.13.4" +version = "0.14.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c972679f83bdf9c42bd905396b6c3588a843a17f0f16dfcfa3e2c5d57441835" +checksum = "a4aab4dbc9f7611d8b55048a3a16d2d010c2c8334e46304b40ac1cc14bf3b48e" dependencies = [ "darling_core", "quote", - "syn", + "syn 1.0.109", ] [[package]] @@ -558,7 +671,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "907076dfda823b0b36d2a1bb5f90c96660a5bbcd7729e10727f07858f22c4edc" dependencies = [ "cfg-if", - "hashbrown", + "hashbrown 0.12.3", "lock_api", "once_cell", "parking_lot_core", @@ -578,9 +691,9 @@ checksum = "8d7439c3735f405729d52c3fbbe4de140eaf938a1fe47d227c27f8254d4302a5" [[package]] name = "devise" -version = "0.3.1" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50c7580b072f1c8476148f16e0a0d5dedddab787da98d86c5082c5e9ed8ab595" +checksum = "d6eacefd3f541c66fc61433d65e54e0e46e0a029a819a7dbbc7a7b489e8a85f8" dependencies = [ "devise_codegen", "devise_core", @@ -588,9 +701,9 @@ dependencies = [ [[package]] name = "devise_codegen" -version = "0.3.1" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "123c73e7a6e51b05c75fe1a1b2f4e241399ea5740ed810b0e3e6cacd9db5e7b2" +checksum = "9c8cf4b8dd484ede80fd5c547592c46c3745a617c8af278e2b72bea86b2dfed6" dependencies = [ "devise_core", "quote", @@ -598,24 +711,24 @@ dependencies = [ [[package]] name = "devise_core" -version = "0.3.1" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "841ef46f4787d9097405cac4e70fb8644fc037b526e8c14054247c0263c400d0" +checksum = "35b50dba0afdca80b187392b24f2499a88c336d5a8493e4b4ccfb608708be56a" dependencies = [ - "bitflags", + "bitflags 2.0.2", "proc-macro2", "proc-macro2-diagnostics", "quote", - "syn", + "syn 2.0.10", ] [[package]] name = "diesel" -version = "2.0.2" +version = "2.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68c186a7418a2aac330bb76cde82f16c36b03a66fb91db32d20214311f9f6545" +checksum = "4391a22b19c916e50bec4d6140f29bdda3e3bb187223fe6e3ea0b6e4d1021c04" dependencies = [ - "bitflags", + "bitflags 1.3.2", "byteorder", "chrono", "diesel_derives", @@ -630,14 +743,14 @@ dependencies = [ [[package]] name = "diesel_derives" -version = "2.0.1" +version = "2.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "143b758c91dbc3fe1fdcb0dba5bd13276c6a66422f2ef5795b58488248a310aa" +checksum = "0ad74fdcf086be3d4fdd142f67937678fe60ed431c3b2f08599e7687269410c4" dependencies = [ "proc-macro-error", "proc-macro2", "quote", - "syn", + "syn 1.0.109", ] [[package]] @@ -674,23 +787,23 @@ dependencies = [ [[package]] name = "dotenvy" -version = "0.15.6" +version = "0.15.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03d8c417d7a8cb362e0c37e5d815f5eb7c37f79ff93707329d5a194e42e54ca0" +checksum = "1aaf95b3e5c8f23aa320147307562d361db0ae0d51242340f558153b4eb2439b" [[package]] name = "either" -version = "1.8.0" +version = "1.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90e5c1c8368803113bf0c9584fc495a58b86dc8a29edbf8fe877d21d9507e797" +checksum = "7fcaabb2fef8c910e7f4c7ce9f67a1283a1715879a7c230ca9d6d1ae31f16d91" [[package]] name = "email-encoding" -version = "0.1.3" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34dd14c63662e0206599796cd5e1ad0268ab2b9d19b868d6050d688eba2bbf98" +checksum = "dbfb21b9878cf7a348dcb8559109aabc0ec40d69924bd706fa5149846c4fef75" dependencies = [ - "base64", + "base64 0.21.0", "memchr", ] @@ -705,9 +818,9 @@ dependencies = [ [[package]] name = "encoding_rs" -version = "0.8.31" +version = "0.8.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9852635589dc9f9ea1b6fe9f05b50ef208c85c834a562f0c6abb1c475736ec2b" +checksum = "071a31f4ee85403370b58aca746f01041ede6f0da2730960ad001edc2b71b394" dependencies = [ "cfg-if", ] @@ -721,7 +834,39 @@ dependencies = [ "heck", "proc-macro2", "quote", - "syn", + "syn 1.0.109", +] + +[[package]] +name = "errno" +version = "0.2.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f639046355ee4f37944e44f60642c6f3a7efa3cf6b78c78a0d989a8ce6c396a1" +dependencies = [ + "errno-dragonfly", + "libc", + "winapi", +] + +[[package]] +name = "errno" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "50d6a0976c999d473fe89ad888d5a284e55366d9dc9038b1ba2aa15128c4afa0" +dependencies = [ + "errno-dragonfly", + "libc", + "windows-sys 0.45.0", +] + +[[package]] +name = "errno-dragonfly" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aa68f1b12764fab894d2755d2518754e71b4fd80ecfb822714a1206c2aab39bf" +dependencies = [ + "cc", + "libc", ] [[package]] @@ -734,19 +879,25 @@ dependencies = [ ] [[package]] -name = "fastrand" -version = "1.8.0" +name = "event-listener" +version = "2.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7a407cfaa3385c4ae6b23e84623d48c2798d06e3e6a1878f7f59f17b3f86499" +checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0" + +[[package]] +name = "fastrand" +version = "1.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e51093e27b0797c359783294ca4f0a911c270184cb10f85783b118614a1501be" dependencies = [ "instant", ] [[package]] name = "fern" -version = "0.6.1" +version = "0.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3bdd7b0849075e79ee9a1836df22c717d1eba30451796fdc631b04565dd11e2a" +checksum = "d9f0c14694cbd524c8720dd69b0e3179344f04ebb5f90f2e4a440c6ea3b2f1ee" dependencies = [ "log", "syslog", @@ -808,9 +959,9 @@ dependencies = [ [[package]] name = "futures" -version = "0.3.25" +version = "0.3.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38390104763dc37a5145a53c29c63c1290b5d316d6086ec32c293f6736051bb0" +checksum = "531ac96c6ff5fd7c62263c5e3c67a603af4fcaee2e1a0ae5565ba3a11e69e549" dependencies = [ "futures-channel", "futures-core", @@ -823,9 +974,9 @@ dependencies = [ [[package]] name = "futures-channel" -version = "0.3.25" +version = "0.3.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "52ba265a92256105f45b719605a571ffe2d1f0fea3807304b522c1d778f79eed" +checksum = "164713a5a0dcc3e7b4b1ed7d3b433cabc18025386f9339346e8daf15963cf7ac" dependencies = [ "futures-core", "futures-sink", @@ -833,15 +984,15 @@ dependencies = [ [[package]] name = "futures-core" -version = "0.3.25" +version = "0.3.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04909a7a7e4633ae6c4a9ab280aeb86da1236243a77b694a49eacd659a4bd3ac" +checksum = "86d7a0c1aa76363dac491de0ee99faf6941128376f1cf96f07db7603b7de69dd" [[package]] name = "futures-executor" -version = "0.3.25" +version = "0.3.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7acc85df6714c176ab5edf386123fafe217be88c0840ec11f199441134a074e2" +checksum = "1997dd9df74cdac935c76252744c1ed5794fac083242ea4fe77ef3ed60ba0f83" dependencies = [ "futures-core", "futures-task", @@ -850,32 +1001,47 @@ dependencies = [ [[package]] name = "futures-io" -version = "0.3.25" +version = "0.3.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "00f5fb52a06bdcadeb54e8d3671f8888a39697dcb0b81b23b55174030427f4eb" +checksum = "89d422fa3cbe3b40dca574ab087abb5bc98258ea57eea3fd6f1fa7162c778b91" + +[[package]] +name = "futures-lite" +version = "1.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7694489acd39452c77daa48516b894c153f192c3578d5a839b62c58099fcbf48" +dependencies = [ + "fastrand", + "futures-core", + "futures-io", + "memchr", + "parking", + "pin-project-lite", + "waker-fn", +] [[package]] name = "futures-macro" -version = "0.3.25" +version = "0.3.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bdfb8ce053d86b91919aad980c220b1fb8401a9394410e1c289ed7e66b61835d" +checksum = "3eb14ed937631bd8b8b8977f2c198443447a8355b6e3ca599f38c975e5a963b6" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.109", ] [[package]] name = "futures-sink" -version = "0.3.25" +version = "0.3.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39c15cf1a4aa79df40f1bb462fb39676d0ad9e366c2a33b590d7c66f4f81fcf9" +checksum = "ec93083a4aecafb2a80a885c9de1f0ccae9dbd32c2bb54b0c3a65690e0b8d2f2" [[package]] name = "futures-task" -version = "0.3.25" +version = "0.3.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2ffb393ac5d9a6eaa9d3fdf37ae2776656b706e200c8e16b1bdb227f5198e6ea" +checksum = "fd65540d33b37b16542a0438c12e6aeead10d4ac5d05bd3f805b8f35ab592879" [[package]] name = "futures-timer" @@ -885,9 +1051,9 @@ checksum = "e64b03909df88034c26dc1547e8970b91f98bdb65165d6a4e9110d94263dbb2c" [[package]] name = "futures-util" -version = "0.3.25" +version = "0.3.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "197676987abd2f9cadff84926f410af1c183608d36641465df73ae8211dc65d6" +checksum = "3ef6b17e481503ec85211fed8f39d1970f128935ca1f814cd32ac4a6842e84ab" dependencies = [ "futures-channel", "futures-core", @@ -903,15 +1069,15 @@ dependencies = [ [[package]] name = "generator" -version = "0.7.2" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d266041a359dfa931b370ef684cceb84b166beb14f7f0421f4a6a3d0c446d12e" +checksum = "33a20a288a94683f5f4da0adecdbe095c94a77c295e514cc6484e9394dd8376e" dependencies = [ "cc", "libc", "log", "rustversion", - "windows", + "windows 0.44.0", ] [[package]] @@ -935,27 +1101,23 @@ dependencies = [ "wasi 0.11.0+wasi-snapshot-preview1", ] -[[package]] -name = "ghash" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d930750de5717d2dd0b8c0d42c076c0e884c81a73e6cab859bbd2339c71e3e40" -dependencies = [ - "opaque-debug", - "polyval", -] - -[[package]] -name = "gimli" -version = "0.27.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dec7af912d60cdbd3677c1af9352ebae6fb8394d165568a2234df0fa00f87793" - [[package]] name = "glob" -version = "0.3.0" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b919933a397b79c37e33b77bb2aa3dc8eb6e165ad809e58ff75bc7db2e34574" +checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" + +[[package]] +name = "gloo-timers" +version = "0.2.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9b995a66bb87bebce9a0f4a95aed01daca4872c050bfcb21653361c03bc35e5c" +dependencies = [ + "futures-channel", + "futures-core", + "js-sys", + "wasm-bindgen", +] [[package]] name = "governor" @@ -977,9 +1139,9 @@ dependencies = [ [[package]] name = "h2" -version = "0.3.15" +version = "0.3.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f9f29bc9dda355256b2916cf526ab02ce0aeaaaf2bad60d65ef3f12f11dd0f4" +checksum = "5be7b54589b581f624f566bf5d8eb2bab1db736c51528720b6bd36b96b55924d" dependencies = [ "bytes", "fnv", @@ -1002,9 +1164,9 @@ checksum = "eabb4a44450da02c90444cf74558da904edde8fb4e9035a9a6a4e15445af0bd7" [[package]] name = "handlebars" -version = "4.3.5" +version = "4.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "433e4ab33f1213cdc25b5fa45c76881240cfe79284cf2b395e8b9e312a30a2fd" +checksum = "035ef95d03713f2c347a72547b7cd38cbc9af7cd51e6099fb62d586d4a6dee3a" dependencies = [ "log", "pest", @@ -1022,28 +1184,31 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" [[package]] -name = "heck" -version = "0.4.0" +name = "hashbrown" +version = "0.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2540771e65fc8cb83cd6e8a237f70c319bd5c29f78ed1084ba5d50eeac86f7f9" +checksum = "43a3c133739dddd0d2990f9a4bdf8eb4b21ef50e4851ca85ab661199821d510e" + +[[package]] +name = "heck" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" [[package]] name = "hermit-abi" -version = "0.1.19" +version = "0.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33" +checksum = "ee512640fe35acbfb4bb779db6f0d80704c2cacfa2e39b601ef3e3f47d1ae4c7" dependencies = [ "libc", ] [[package]] -name = "hkdf" -version = "0.12.3" +name = "hermit-abi" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "791a029f6b9fc27657f6f188ec6e5e43f6911f6f878e0dc5501396e09809d437" -dependencies = [ - "hmac", -] +checksum = "fed44880c466736ef9a5c5b5facefb5ed0785676d0c02d612db14e54f0d84286" [[package]] name = "hmac" @@ -1076,9 +1241,9 @@ dependencies = [ [[package]] name = "http" -version = "0.2.8" +version = "0.2.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75f43d41e26995c17e71ee126451dd3941010b0514a81a9d11f3b341debc2399" +checksum = "bd6effc99afb63425aff9b05836f029929e345a6148a14b7ecd5ab67af944482" dependencies = [ "bytes", "fnv", @@ -1110,9 +1275,9 @@ checksum = "c4a1e36c821dbe04574f602848a19f742f4fb3c98d40449f11bcad18d6b17421" [[package]] name = "hyper" -version = "0.14.23" +version = "0.14.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "034711faac9d2166cb1baf1a2fb0b60b1f277f8492fd72176c17f3515e1abd3c" +checksum = "cc5e554ff619822309ffd57d8734d77cd5ce6238bc956f037ea06c58238c9899" dependencies = [ "bytes", "futures-channel", @@ -1147,16 +1312,16 @@ dependencies = [ [[package]] name = "iana-time-zone" -version = "0.1.53" +version = "0.1.54" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64c122667b287044802d6ce17ee2ddf13207ed924c712de9a66a5814d5b64765" +checksum = "0c17cc76786e99f8d2f055c11159e7f0091c42474dcc3189fbab96072e873e6d" dependencies = [ "android_system_properties", "core-foundation-sys", "iana-time-zone-haiku", "js-sys", "wasm-bindgen", - "winapi", + "windows 0.46.0", ] [[package]] @@ -1198,12 +1363,12 @@ dependencies = [ [[package]] name = "indexmap" -version = "1.9.2" +version = "1.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1885e79c1fc4b10f0e172c475f458b7f7b93061064d98c3293e98c5ba0c8b399" +checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99" dependencies = [ "autocfg", - "hashbrown", + "hashbrown 0.12.3", "serde", ] @@ -1213,15 +1378,6 @@ version = "0.1.15" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c8fae54786f62fb2918dcfae3d568594e50eb9b5c25bf04371af6fe7516452fb" -[[package]] -name = "inout" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a0c10553d664a4d0bcff9f4215d0aac67a639cc68ef660840afe309b807bc9f5" -dependencies = [ - "generic-array", -] - [[package]] name = "instant" version = "0.1.12" @@ -1231,6 +1387,17 @@ dependencies = [ "cfg-if", ] +[[package]] +name = "io-lifetimes" +version = "1.0.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "09270fd4fa1111bc614ed2246c7ef56239a3063d5be0d1ec3b589c505d400aeb" +dependencies = [ + "hermit-abi 0.3.1", + "libc", + "windows-sys 0.45.0", +] + [[package]] name = "ipconfig" version = "0.3.1" @@ -1245,15 +1412,27 @@ dependencies = [ [[package]] name = "ipnet" -version = "2.7.0" +version = "2.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "11b0d96e660696543b251e58030cf9787df56da39dab19ad60eae7353040917e" +checksum = "30e22bd8629359895450b59ea7a776c850561b96a3b1d31321c1949d9e6c9146" + +[[package]] +name = "is-terminal" +version = "0.4.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8687c819457e979cc940d09cb16e42a1bf70aa6b60a549de6d3a62a0ee90c69e" +dependencies = [ + "hermit-abi 0.3.1", + "io-lifetimes", + "rustix 0.36.11", + "windows-sys 0.45.0", +] [[package]] name = "itoa" -version = "1.0.4" +version = "1.0.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4217ad341ebadf8d8e724e264f13e593e0648f5b3e94b3896a5df283be015ecc" +checksum = "453ad9f582a441959e5f0d088b02ce04cfe8d51a8eaf077f12ac6d3e94164ca6" [[package]] name = "jetscii" @@ -1263,9 +1442,9 @@ checksum = "47f142fe24a9c9944451e8349de0a56af5f3e7226dc46f3ed4d4ecc0b85af75e" [[package]] name = "job_scheduler_ng" -version = "2.0.3" +version = "2.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "830ebb8320dcba49a2d081c36677d500bbbf9ab7e0500ddddadf88252bca3891" +checksum = "10bbdf445513bbe53f4666218b7057d265c76fa0b30475e121a6bf05dbaacaae" dependencies = [ "chrono", "cron", @@ -1274,20 +1453,20 @@ dependencies = [ [[package]] name = "js-sys" -version = "0.3.60" +version = "0.3.61" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49409df3e3bf0856b916e2ceaca09ee28e6871cf7d9ce97a692cacfdb2a25a47" +checksum = "445dde2150c55e483f3d8416706b97ec8e8237c307e5b7b4b8dd15e6af2a0730" dependencies = [ "wasm-bindgen", ] [[package]] name = "jsonwebtoken" -version = "8.2.0" +version = "8.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09f4f04699947111ec1733e71778d763555737579e44b85844cae8e1940a1828" +checksum = "6971da4d9c3aa03c3d8f3ff0f4155b534aad021292003895a469716b2a230378" dependencies = [ - "base64", + "base64 0.21.0", "pem", "ring", "serde", @@ -1295,6 +1474,15 @@ dependencies = [ "simple_asn1", ] +[[package]] +name = "kv-log-macro" +version = "1.0.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0de8b303297635ad57c9f5059fd9cee7a47f8e8daa09df0fcd07dd39fb22977f" +dependencies = [ + "log", +] + [[package]] name = "lazy_static" version = "1.4.0" @@ -1303,12 +1491,13 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" [[package]] name = "lettre" -version = "0.10.1" +version = "0.10.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2eabca5e0b4d0e98e7f2243fb5b7520b6af2b65d8f87bcc86f2c75185a6ff243" +checksum = "d8033576bf9f051fce6cb92b6264114b4340896c352a9ff38b67bd4cde924635" dependencies = [ + "async-std", "async-trait", - "base64", + "base64 0.21.0", "email-encoding", "email_address", "fastrand", @@ -1316,7 +1505,7 @@ dependencies = [ "futures-util", "hostname", "httpdate", - "idna 0.2.3", + "idna 0.3.0", "mime", "native-tls", "nom", @@ -1331,15 +1520,15 @@ dependencies = [ [[package]] name = "libc" -version = "0.2.138" +version = "0.2.140" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db6d7e329c562c5dfab7a46a2afabc8b987ab9a4834c9d1ca04dc54c1546cef8" +checksum = "99227334921fae1a979cf0bfdfcc6b3e5ce376ef57e16fb6fb3ea2ed6095f80c" [[package]] name = "libmimalloc-sys" -version = "0.1.28" +version = "0.1.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04d1c67deb83e6b75fa4fe3309e09cfeade12e7721d95322af500d3814ea60c9" +checksum = "dd8c7cbf8b89019683667e347572e6d55a7df7ea36b0c4ce69961b0cde67b174" dependencies = [ "cc", "libc", @@ -1358,9 +1547,9 @@ dependencies = [ [[package]] name = "link-cplusplus" -version = "1.0.7" +version = "1.0.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9272ab7b96c9046fbc5bc56c06c117cb639fe2d509df0c421cad82d2915cf369" +checksum = "ecd207c9c713c34f95a097a5b029ac2ce6010530c7b49d7fea24d977dede04f5" dependencies = [ "cc", ] @@ -1371,6 +1560,18 @@ version = "0.5.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f" +[[package]] +name = "linux-raw-sys" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f051f77a7c8e6957c0696eac88f26b0117e54f52d3fc682ab19397a8812846a4" + +[[package]] +name = "linux-raw-sys" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cd550e73688e6d578f0ac2119e32b797a327631a42f9433e59d02e139c8df60d" + [[package]] name = "lock_api" version = "0.4.9" @@ -1388,6 +1589,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "abb12e687cfb44aa40f41fc3978ef76448f9b6038cad6aef4259d3c095a2382e" dependencies = [ "cfg-if", + "value-bag", ] [[package]] @@ -1440,9 +1642,9 @@ dependencies = [ [[package]] name = "matches" -version = "0.1.9" +version = "0.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3e378b66a060d48947b590737b30a1be76706c8dd7b8ba0f2fe3989c68a853f" +checksum = "2532096657941c2fea9c289d370a250971c689d4f143798ff67113ec042024a5" [[package]] name = "memchr" @@ -1473,18 +1675,18 @@ dependencies = [ [[package]] name = "mimalloc" -version = "0.1.32" +version = "0.1.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b2374e2999959a7b583e1811a1ddbf1d3a4b9496eceb9746f1192a59d871eca" +checksum = "9dcb174b18635f7561a0c6c9fc2ce57218ac7523cf72c50af80e2d79ab8f3ba1" dependencies = [ "libmimalloc-sys", ] [[package]] name = "mime" -version = "0.3.16" +version = "0.3.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a60c7ce501c71e03a9c9c0d35b861413ae925bd979cc7a4e30d060069aaac8d" +checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a" [[package]] name = "minimal-lexical" @@ -1503,20 +1705,21 @@ dependencies = [ [[package]] name = "mio" -version = "0.8.5" +version = "0.8.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5d732bc30207a6423068df043e3d02e0735b155ad7ce1a6f76fe2baa5b158de" +checksum = "5b9d9a46eff5b4ff64b45a9e316a6d1e0bc719ef429cbec4dc630684212bfdf9" dependencies = [ "libc", "log", "wasi 0.11.0+wasi-snapshot-preview1", - "windows-sys 0.42.0", + "windows-sys 0.45.0", ] [[package]] name = "multer" version = "2.0.4" -source = "git+https://github.com/BlackDex/multer-rs?rev=477d16b7fa0f361b5c2a5ba18a5b28bec6d26a8a#477d16b7fa0f361b5c2a5ba18a5b28bec6d26a8a" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6ed4198ce7a4cbd2a57af78d28c6fbb57d81ac5f1d6ad79ac6c5587419cbdf22" dependencies = [ "bytes", "encoding_rs", @@ -1526,7 +1729,7 @@ dependencies = [ "log", "memchr", "mime", - "spin 0.9.4", + "spin 0.9.6", "tokio", "tokio-util", "version_check", @@ -1568,9 +1771,9 @@ checksum = "b93853da6d84c2e3c7d730d6473e8817692dd89be387eb01b94d7f108ecb5b8c" [[package]] name = "nom" -version = "7.1.1" +version = "7.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8903e5a29a317527874d0402f867152a3d21c908bb0b933e416c65e301d4c36" +checksum = "d273983c5a657a70a3e8f2a01329822f3b8c8172b73826411a55751e404a0a4a" dependencies = [ "memchr", "minimal-lexical", @@ -1611,7 +1814,7 @@ checksum = "876a53fff98e03a936a674b29568b0e605f06b29372c2489ff4de23f1949743d" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.109", ] [[package]] @@ -1635,11 +1838,11 @@ dependencies = [ [[package]] name = "num_cpus" -version = "1.14.0" +version = "1.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6058e64324c71e02bc2b150e4f3bc8286db6c83092132ffa3f6b1eab0f9def5" +checksum = "0fac9e2da13b5eb447a6ce3d392f23a29d8694bff781bf03a16cd9ac8697593b" dependencies = [ - "hermit-abi", + "hermit-abi 0.2.6", "libc", ] @@ -1652,34 +1855,19 @@ dependencies = [ "libc", ] -[[package]] -name = "object" -version = "0.30.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "239da7f290cfa979f43f85a8efeee9a8a76d0827c356d37f9d3d7254d6b537fb" -dependencies = [ - "memchr", -] - [[package]] name = "once_cell" -version = "1.16.0" +version = "1.17.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86f0b0d4bf799edbc74508c1e8bf170ff5f41238e5f8225603ca7caaae2b7860" - -[[package]] -name = "opaque-debug" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5" +checksum = "b7e5500299e16ebb147ae15a00a942af264cf3688f47923b8fc2cd5858f23ad3" [[package]] name = "openssl" -version = "0.10.44" +version = "0.10.48" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "29d971fd5722fec23977260f6e81aa67d2f22cadbdc2aa049f1022d9a3be1566" +checksum = "518915b97df115dd36109bfa429a48b8f737bd05508cf9588977b599648926d2" dependencies = [ - "bitflags", + "bitflags 1.3.2", "cfg-if", "foreign-types", "libc", @@ -1696,7 +1884,7 @@ checksum = "b501e44f11665960c7e7fcf062c7d96a14ade4aa98116c004b2e37b5be7d736c" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.109", ] [[package]] @@ -1707,18 +1895,18 @@ checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" [[package]] name = "openssl-src" -version = "111.24.0+1.1.1s" +version = "111.25.2+1.1.1t" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3498f259dab01178c6228c6b00dcef0ed2a2d5e20d648c017861227773ea4abd" +checksum = "320708a054ad9b3bf314688b5db87cf4d6683d64cfc835e2337924ae62bf4431" dependencies = [ "cc", ] [[package]] name = "openssl-sys" -version = "0.9.79" +version = "0.9.83" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5454462c0eced1e97f2ec09036abc8da362e66802f66fd20f86854d9d8cbcbc4" +checksum = "666416d899cf077260dac8698d60a60b435a46d57e82acb1be3d0dad87284e5b" dependencies = [ "autocfg", "cc", @@ -1734,6 +1922,12 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39" +[[package]] +name = "parking" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "427c3892f9e783d91cc128285287e70a59e206ca452770ece88a76f7a3eddd72" + [[package]] name = "parking_lot" version = "0.12.1" @@ -1746,15 +1940,15 @@ dependencies = [ [[package]] name = "parking_lot_core" -version = "0.9.5" +version = "0.9.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ff9f3fef3968a3ec5945535ed654cb38ff72d7495a25619e2247fb15a2ed9ba" +checksum = "9069cbb9f99e3a5083476ccb29ceb1de18b9118cafa53e90c9551235de2b9521" dependencies = [ "cfg-if", "libc", "redox_syscall", "smallvec", - "windows-sys 0.42.0", + "windows-sys 0.45.0", ] [[package]] @@ -1767,16 +1961,27 @@ dependencies = [ ] [[package]] -name = "paste" -version = "1.0.10" +name = "password-hash" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf1c2c742266c2f1041c914ba65355a83ae8747b05f208319784083583494b4b" +checksum = "346f04948ba92c43e8469c1ee6736c7563d71012b17d40745260fe106aac2166" +dependencies = [ + "base64ct", + "rand_core", + "subtle", +] + +[[package]] +name = "paste" +version = "1.0.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9f746c4065a8fa3fe23974dd82f15431cc8d40779821001404d10d2e79ca7d79" [[package]] name = "pear" -version = "0.2.3" +version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "15e44241c5e4c868e3eaa78b7c1848cadd6344ed4f54d029832d32b415a58702" +checksum = "0ec95680a7087503575284e5063e14b694b7a9c0b065e5dceec661e0497127e8" dependencies = [ "inlinable_string", "pear_codegen", @@ -1785,23 +1990,23 @@ dependencies = [ [[package]] name = "pear_codegen" -version = "0.2.3" +version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "82a5ca643c2303ecb740d506539deba189e16f2754040a42901cd8105d0282d0" +checksum = "9661a3a53f93f09f2ea882018e4d7c88f6ff2956d809a276060476fd8c879d3c" dependencies = [ "proc-macro2", "proc-macro2-diagnostics", "quote", - "syn", + "syn 2.0.10", ] [[package]] name = "pem" -version = "1.1.0" +version = "1.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03c64931a1a212348ec4f3b4362585eca7159d0d09cbdf4a7f74f02173596fd4" +checksum = "a8835c273a76a90455d7344889b0964598e3316e2a79ede8e36f16bdcf2228b8" dependencies = [ - "base64", + "base64 0.13.1", ] [[package]] @@ -1812,9 +2017,9 @@ checksum = "478c572c3d73181ff3c2539045f6eb99e5491218eae919370993b890cdbdd98e" [[package]] name = "pest" -version = "2.5.1" +version = "2.5.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc8bed3549e0f9b0a2a78bf7c0018237a2cdf085eecbbc048e52612438e4e9d0" +checksum = "8cbd939b234e95d72bc393d51788aec68aeeb5d51e748ca08ff3aad58cb722f7" dependencies = [ "thiserror", "ucd-trie", @@ -1822,9 +2027,9 @@ dependencies = [ [[package]] name = "pest_derive" -version = "2.5.1" +version = "2.5.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cdc078600d06ff90d4ed238f0119d84ab5d43dbaad278b0e33a8820293b32344" +checksum = "a81186863f3d0a27340815be8f2078dd8050b14cd71913db9fbda795e5f707d7" dependencies = [ "pest", "pest_generator", @@ -1832,26 +2037,26 @@ dependencies = [ [[package]] name = "pest_generator" -version = "2.5.1" +version = "2.5.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28a1af60b1c4148bb269006a750cff8e2ea36aff34d2d96cf7be0b14d1bed23c" +checksum = "75a1ef20bf3193c15ac345acb32e26b3dc3223aff4d77ae4fc5359567683796b" dependencies = [ "pest", "pest_meta", "proc-macro2", "quote", - "syn", + "syn 1.0.109", ] [[package]] name = "pest_meta" -version = "2.5.1" +version = "2.5.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fec8605d59fc2ae0c6c1aefc0c7c7a9769732017c0ce07f7a9cfffa7b4404f20" +checksum = "5e3b284b1f13a20dc5ebc90aff59a51b8d7137c221131b52a7260c08cbc1cc80" dependencies = [ "once_cell", "pest", - "sha1", + "sha2", ] [[package]] @@ -1917,15 +2122,19 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6ac9a59f73473f1b8d852421e59e64809f025994837ef743615c6d0c5b305160" [[package]] -name = "polyval" -version = "0.6.0" +name = "polling" +version = "2.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ef234e08c11dfcb2e56f79fd70f6f2eb7f025c0ce2333e82f4f0518ecad30c6" +checksum = "7e1f879b2998099c2d69ab9605d145d5b661195627eccc680002c4918a7fb6fa" dependencies = [ + "autocfg", + "bitflags 1.3.2", "cfg-if", - "cpufeatures", - "opaque-debug", - "universal-hash", + "concurrent-queue", + "libc", + "log", + "pin-project-lite", + "windows-sys 0.45.0", ] [[package]] @@ -1952,7 +2161,7 @@ dependencies = [ "proc-macro-error-attr", "proc-macro2", "quote", - "syn", + "syn 1.0.109", "version_check", ] @@ -1967,30 +2176,24 @@ dependencies = [ "version_check", ] -[[package]] -name = "proc-macro-hack" -version = "0.5.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dbf0c48bc1d91375ae5c3cd81e3722dff1abcf81a30960240640d223f59fe0e5" - [[package]] name = "proc-macro2" -version = "1.0.47" +version = "1.0.53" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ea3d908b0e36316caf9e9e2c4625cdde190a7e6f440d794667ed17a1855e725" +checksum = "ba466839c78239c09faf015484e5cc04860f88242cff4d03eb038f04b4699b73" dependencies = [ "unicode-ident", ] [[package]] name = "proc-macro2-diagnostics" -version = "0.9.1" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4bf29726d67464d49fa6224a1d07936a8c08bb3fba727c7493f6cf1616fdaada" +checksum = "606c4ba35817e2922a308af55ad51bab3645b59eae5c570d4a6cf07e36bd493b" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.10", "version_check", "yansi", ] @@ -2035,18 +2238,18 @@ checksum = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0" [[package]] name = "quote" -version = "1.0.21" +version = "1.0.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbe448f377a7d6961e30f5955f9b8d106c3f5e449d493ee1b125c1d43c2b5179" +checksum = "4424af4bf778aae2051a77b60283332f386554255d722233d09fbfc7e30da2fc" dependencies = [ "proc-macro2", ] [[package]] name = "quoted_printable" -version = "0.4.6" +version = "0.4.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "20f14e071918cbeefc5edc986a7aa92c425dae244e003a35e1cdddb5ca39b5cb" +checksum = "a24039f627d8285853cc90dcddf8c1ebfaa91f834566948872b225b9a28ed1b6" [[package]] name = "r2d2" @@ -2091,11 +2294,11 @@ dependencies = [ [[package]] name = "raw-cpuid" -version = "10.6.0" +version = "10.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a6823ea29436221176fe662da99998ad3b4db2c7f31e7b6f5fe43adccd6320bb" +checksum = "6c297679cb867470fa8c9f67dbba74a78d78e3e98d7cf2b08d6d71540f797332" dependencies = [ - "bitflags", + "bitflags 1.3.2", ] [[package]] @@ -2104,34 +2307,34 @@ version = "0.2.16" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a" dependencies = [ - "bitflags", + "bitflags 1.3.2", ] [[package]] name = "ref-cast" -version = "1.0.13" +version = "1.0.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53b15debb4f9d60d767cd8ca9ef7abb2452922f3214671ff052defc7f3502c44" +checksum = "f43faa91b1c8b36841ee70e97188a869d37ae21759da6846d4be66de5bf7b12c" dependencies = [ "ref-cast-impl", ] [[package]] name = "ref-cast-impl" -version = "1.0.13" +version = "1.0.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "abfa8511e9e94fd3de6585a3d3cd00e01ed556dc9814829280af0e8dc72a8f36" +checksum = "8d2275aab483050ab2a7364c1a46604865ee7d6906684e08db0f090acf74f9e7" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.10", ] [[package]] name = "regex" -version = "1.7.0" +version = "1.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e076559ef8e241f2ae3479e36f97bd5741c0330689e217ad51ce2c76808b868a" +checksum = "8b1f693b24f6ac912f4893ef08244d70b6067480d2f1a46e950c9691e6749d1d" dependencies = [ "aho-corasick", "memchr", @@ -2149,29 +2352,20 @@ dependencies = [ [[package]] name = "regex-syntax" -version = "0.6.28" +version = "0.6.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "456c603be3e8d448b072f410900c09faf164fbce2d480456f50eea6e25f9c848" - -[[package]] -name = "remove_dir_all" -version = "0.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3acd125665422973a33ac9d3dd2df85edad0f4ae9b00dafb1a05e43a9f5ef8e7" -dependencies = [ - "winapi", -] +checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1" [[package]] name = "reqwest" -version = "0.11.13" +version = "0.11.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68cc60575865c7831548863cc02356512e3f1dc2f3f82cb837d7fc4cc8f3c97c" +checksum = "0ba30cc2c0cd02af1222ed216ba659cdb2f879dfe3181852fe7c50b1d0005949" dependencies = [ "async-compression", - "base64", + "base64 0.21.0", "bytes", - "cookie", + "cookie 0.16.2", "cookie_store 0.16.1", "encoding_rs", "futures-core", @@ -2189,7 +2383,6 @@ dependencies = [ "once_cell", "percent-encoding", "pin-project-lite", - "proc-macro-hack", "serde", "serde_json", "serde_urlencoded", @@ -2202,6 +2395,7 @@ dependencies = [ "url", "wasm-bindgen", "wasm-bindgen-futures", + "wasm-streams", "web-sys", "winreg", ] @@ -2254,20 +2448,20 @@ dependencies = [ [[package]] name = "rocket" -version = "0.5.0-rc.2" +version = "0.5.0-rc.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "98ead083fce4a405feb349cf09abdf64471c6077f14e0ce59364aa90d4b99317" +checksum = "58734f7401ae5cfd129685b48f61182331745b357b96f2367f01aebaf1cc9cc9" dependencies = [ "async-stream", "async-trait", "atomic", - "atty", "binascii", "bytes", "either", "figment", "futures", "indexmap", + "is-terminal", "log", "memchr", "multer", @@ -2293,9 +2487,9 @@ dependencies = [ [[package]] name = "rocket_codegen" -version = "0.5.0-rc.2" +version = "0.5.0-rc.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d6aeb6bb9c61e9cd2c00d70ea267bf36f76a4cc615e5908b349c2f9d93999b47" +checksum = "7093353f14228c744982e409259fb54878ba9563d08214f2d880d59ff2fc508b" dependencies = [ "devise", "glob", @@ -2303,17 +2497,17 @@ dependencies = [ "proc-macro2", "quote", "rocket_http", - "syn", + "syn 2.0.10", "unicode-xid", ] [[package]] name = "rocket_http" -version = "0.5.0-rc.2" +version = "0.5.0-rc.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2ded65d127954de3c12471630bf4b81a2792f065984461e65b91d0fdaafc17a2" +checksum = "936012c99162a03a67f37f9836d5f938f662e26f2717809761a9ac46432090f4" dependencies = [ - "cookie", + "cookie 0.17.0", "either", "futures", "http", @@ -2338,16 +2532,59 @@ dependencies = [ ] [[package]] -name = "rustc-demangle" -version = "0.1.21" +name = "rpassword" +version = "7.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ef03e0a2b150c7a90d01faf6254c9c48a41e95fb2a8c2ac1c6f0d2b9aefc342" +checksum = "6678cf63ab3491898c0d021b493c94c9b221d91295294a2a5746eacbe5928322" +dependencies = [ + "libc", + "rtoolbox", + "winapi", +] + +[[package]] +name = "rtoolbox" +version = "0.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "034e22c514f5c0cb8a10ff341b9b048b5ceb21591f31c8f44c43b960f9b3524a" +dependencies = [ + "libc", + "winapi", +] + +[[package]] +name = "rustix" +version = "0.36.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "db4165c9963ab29e422d6c26fbc1d37f15bace6b2810221f9d925023480fcf0e" +dependencies = [ + "bitflags 1.3.2", + "errno 0.2.8", + "io-lifetimes", + "libc", + "linux-raw-sys 0.1.4", + "windows-sys 0.45.0", +] + +[[package]] +name = "rustix" +version = "0.37.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "62b24138615de35e32031d041a09032ef3487a616d901ca4db224e7d557efae2" +dependencies = [ + "bitflags 1.3.2", + "errno 0.3.0", + "io-lifetimes", + "libc", + "linux-raw-sys 0.3.0", + "windows-sys 0.45.0", +] [[package]] name = "rustls" -version = "0.20.7" +version = "0.20.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "539a2bfe908f471bfa933876bd1eb6a19cf2176d375f82ef7f99530a40e48c2c" +checksum = "fff78fc74d175294f4e83b28343315ffcfb114b156f0185e9741cb5570f50e2f" dependencies = [ "log", "ring", @@ -2357,24 +2594,24 @@ dependencies = [ [[package]] name = "rustls-pemfile" -version = "1.0.1" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0864aeff53f8c05aa08d86e5ef839d3dfcf07aeba2db32f12db0ef716e87bd55" +checksum = "d194b56d58803a43635bdc398cd17e383d6f71f9182b9a192c127ca42494a59b" dependencies = [ - "base64", + "base64 0.21.0", ] [[package]] name = "rustversion" -version = "1.0.9" +version = "1.0.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97477e48b4cf8603ad5f7aaf897467cf42ab4218a38ef76fb14c2d6773a6d6a8" +checksum = "4f3208ce4d8448b3f3e7d168a73f5e0c43a61e32930de3bceeccedb388b6bf06" [[package]] name = "ryu" -version = "1.0.11" +version = "1.0.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4501abdff3ae82a1c1b477a17252eb69cee9e66eb915c1abaa4f44d873df9f09" +checksum = "f91339c0467de62360649f8d3e185ca8de4224ff281f66000de5eb2a77a79041" [[package]] name = "same-file" @@ -2387,19 +2624,18 @@ dependencies = [ [[package]] name = "schannel" -version = "0.1.20" +version = "0.1.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "88d6731146462ea25d9244b2ed5fd1d716d25c52e4d54aa4fb0f3c4e9854dbe2" +checksum = "713cfb06c7059f3588fb8044c0fad1d09e3c01d225e25b9220dbfdcf16dbb1b3" dependencies = [ - "lazy_static", - "windows-sys 0.36.1", + "windows-sys 0.42.0", ] [[package]] name = "scheduled-thread-pool" -version = "0.2.6" +version = "0.2.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "977a7519bff143a44f842fd07e80ad1329295bd71686457f18e496736f4bf9bf" +checksum = "3cbc66816425a074528352f5789333ecff06ca41b36b0b0efdfbb29edc391a19" dependencies = [ "parking_lot", ] @@ -2418,9 +2654,9 @@ checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" [[package]] name = "scratch" -version = "1.0.2" +version = "1.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c8132065adcfd6e02db789d9285a0deb2f3fcb04002865ab67d5fb103533898" +checksum = "1792db035ce95be60c3f8853017b3999209281c24e2ba5bc8e59bf97a0c590c1" [[package]] name = "sct" @@ -2434,11 +2670,11 @@ dependencies = [ [[package]] name = "security-framework" -version = "2.7.0" +version = "2.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2bc1bb97804af6631813c55739f771071e0f2ed33ee20b68c86ec505d906356c" +checksum = "a332be01508d814fed64bf28f798a146d73792121129962fdf335bb3c49a4254" dependencies = [ - "bitflags", + "bitflags 1.3.2", "core-foundation", "core-foundation-sys", "libc", @@ -2447,9 +2683,9 @@ dependencies = [ [[package]] name = "security-framework-sys" -version = "2.6.1" +version = "2.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0160a13a177a45bfb43ce71c01580998474f556ad854dcbca936dd2841a5c556" +checksum = "31c9bb296072e961fcbd8853511dd39c2d8be2deb1e17c6860b1d30732b323b4" dependencies = [ "core-foundation-sys", "libc", @@ -2457,15 +2693,15 @@ dependencies = [ [[package]] name = "semver" -version = "1.0.14" +version = "1.0.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e25dfac463d778e353db5be2449d1cce89bd6fd23c9f1ea21310ce6e5a1b29c4" +checksum = "bebd363326d05ec3e2f532ab7660680f3b02130d780c299bca73469d521bc0ed" [[package]] name = "serde" -version = "1.0.150" +version = "1.0.158" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e326c9ec8042f1b5da33252c8a37e9ffbd2c9bef0155215b6e6c80c790e05f91" +checksum = "771d4d9c4163ee138805e12c710dd365e4f44be8be0503cb1bb9eb989425d9c9" dependencies = [ "serde_derive", ] @@ -2482,20 +2718,20 @@ dependencies = [ [[package]] name = "serde_derive" -version = "1.0.150" +version = "1.0.158" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "42a3df25b0713732468deadad63ab9da1f1fd75a48a15024b50363f128db627e" +checksum = "e801c1712f48475582b7696ac71e0ca34ebb30e09338425384269d9717c62cad" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.10", ] [[package]] name = "serde_json" -version = "1.0.89" +version = "1.0.94" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "020ff22c755c2ed3f8cf162dbb41a7268d934702f3ed3631656ea597e08fc3db" +checksum = "1c533a59c9d8a93a09c6ab31f0fd5e5f4dd1b8fc9434804029839884765d04ea" dependencies = [ "itoa", "ryu", @@ -2557,10 +2793,20 @@ dependencies = [ ] [[package]] -name = "signal-hook-registry" -version = "1.4.0" +name = "signal-hook" +version = "0.3.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e51e73328dc4ac0c7ccbda3a494dfa03df1de2f46018127f60c693f2648455b0" +checksum = "732768f1176d21d09e076c23a93123d40bba92d50c4058da34d45c8de8e682b9" +dependencies = [ + "libc", + "signal-hook-registry", +] + +[[package]] +name = "signal-hook-registry" +version = "1.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d8229b473baa5980ac72ef434c4415e70c4b5e71b423043adb4ba059f89c99a1" dependencies = [ "libc", ] @@ -2585,9 +2831,9 @@ checksum = "7bd3e3206899af3f8b12af284fafc038cc1dc2b41d1b89dd17297221c5d225de" [[package]] name = "slab" -version = "0.4.7" +version = "0.4.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4614a76b2a8be0058caa9dbbaf66d988527d86d003c11a94fbd335d7661edcef" +checksum = "6528351c9bc8ab22353f9d776db39a20288e8d6c37ef8cfe3317cf875eecfc2d" dependencies = [ "autocfg", ] @@ -2600,9 +2846,9 @@ checksum = "a507befe795404456341dfab10cef66ead4c041f62b8b11bbb92bffe5d0953e0" [[package]] name = "socket2" -version = "0.4.7" +version = "0.4.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "02e2d2db9033d13a1567121ddd7a095ee144db4e1ca1b1bda3419bc0da294ebd" +checksum = "64a4a911eed85daf18834cfaa86a79b7d266ff93ff5ba14005426219480ed662" dependencies = [ "libc", "winapi", @@ -2616,9 +2862,9 @@ checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d" [[package]] name = "spin" -version = "0.9.4" +version = "0.9.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f6002a767bff9e83f8eeecf883ecb8011875a21ae8da43bffb817a57e78cc09" +checksum = "b5d6e0250b93c8427a177b849d144a96d5acc57006149479403d7861ab721e34" [[package]] name = "stable-pattern" @@ -2652,9 +2898,20 @@ checksum = "6bdef32e8150c2a081110b42772ffe7d7c9032b606bc226c8260fd97e0976601" [[package]] name = "syn" -version = "1.0.105" +version = "1.0.109" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "60b9b43d45702de4c839cb9b51d9f529c5dd26a4aff255b42b1ebc03e88ee908" +checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + +[[package]] +name = "syn" +version = "2.0.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5aad1363ed6d37b84299588d62d3a7d95b5a5c2d9aad5c85609fda12afaa1f40" dependencies = [ "proc-macro2", "quote", @@ -2676,53 +2933,53 @@ dependencies = [ [[package]] name = "tempfile" -version = "3.3.0" +version = "3.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5cdb1ef4eaeeaddc8fbd371e5017057064af0911902ef36b39801f67cc6d79e4" +checksum = "af18f7ae1acd354b992402e9ec5864359d693cd8a79dcbef59f76891701c1e95" dependencies = [ "cfg-if", "fastrand", - "libc", "redox_syscall", - "remove_dir_all", - "winapi", + "rustix 0.36.11", + "windows-sys 0.42.0", ] [[package]] name = "termcolor" -version = "1.1.3" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bab24d30b911b2376f3a13cc2cd443142f0c81dda04c118693e35b3835757755" +checksum = "be55cf8942feac5c765c2c993422806843c9a9a45d4d5c407ad6dd2ea95eb9b6" dependencies = [ "winapi-util", ] [[package]] name = "thiserror" -version = "1.0.37" +version = "1.0.40" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "10deb33631e3c9018b9baf9dcbbc4f737320d2b576bac10f6aefa048fa407e3e" +checksum = "978c9a314bd8dc99be594bc3c175faaa9794be04a5a5e153caba6915336cebac" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.37" +version = "1.0.40" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "982d17546b47146b28f7c22e3d08465f6b8903d0ea13c1660d9d84a6e7adcdbb" +checksum = "f9456a42c5b0d803c8cd86e73dd7cc9edd429499f37a3550d286d5e86720569f" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.10", ] [[package]] name = "thread_local" -version = "1.1.4" +version = "1.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5516c27b78311c50bf42c071425c560ac799b11c30b31f87e3081965fe5e0180" +checksum = "3fdd6f064ccff2d6567adcb3873ca630700f00b5ad3f060c25b5dcfd9a4ce152" dependencies = [ + "cfg-if", "once_cell", ] @@ -2737,9 +2994,9 @@ dependencies = [ [[package]] name = "time" -version = "0.3.17" +version = "0.3.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a561bf4617eebd33bca6434b988f39ed798e527f51a1e797d0ee4f61c0a38376" +checksum = "cd0cbfecb4d19b5ea75bb31ad904eb5b9fa13f21079c3b92017ebdf4999a5890" dependencies = [ "itoa", "libc", @@ -2757,9 +3014,9 @@ checksum = "2e153e1f1acaef8acc537e68b44906d2db6436e2b35ac2c6b42640fff91f00fd" [[package]] name = "time-macros" -version = "0.2.6" +version = "0.2.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d967f99f534ca7e495c575c62638eebc2898a8c84c119b89e250477bc4ba16b2" +checksum = "fd80a657e71da814b8e5d60d3374fc6d35045062245d80224748ae522dd76f36" dependencies = [ "time-core", ] @@ -2775,15 +3032,15 @@ dependencies = [ [[package]] name = "tinyvec_macros" -version = "0.1.0" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c" +checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.23.0" +version = "1.26.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eab6d665857cc6ca78d6e80303a02cea7a7851e85dfbd77cbdc09bd129f1ef46" +checksum = "03201d01c3c27a29c8a5cee5b55a93ddae1ccf6f08f65365c2c918f8c1b76f64" dependencies = [ "autocfg", "bytes", @@ -2796,7 +3053,7 @@ dependencies = [ "signal-hook-registry", "socket2", "tokio-macros", - "windows-sys 0.42.0", + "windows-sys 0.45.0", ] [[package]] @@ -2807,14 +3064,14 @@ checksum = "d266c00fde287f55d3f1c3e96c500c362a2b8c695076ec180f27918820bc6df8" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.109", ] [[package]] name = "tokio-native-tls" -version = "0.3.0" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7d995660bd2b7f8c1568414c1126076c13fbb725c40112dc0120b78eb9b717b" +checksum = "bbae76ab933c85776efabc971569dd6119c580d8f5d448769dec1764bf796ef2" dependencies = [ "native-tls", "tokio", @@ -2845,9 +3102,9 @@ dependencies = [ [[package]] name = "tokio-stream" -version = "0.1.11" +version = "0.1.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d660770404473ccd7bc9f8b28494a811bc18542b915c0855c51e8f419d5223ce" +checksum = "8fb52b74f05dbf495a8fba459fdc331812b96aa086d9eb78101fa0d4569c3313" dependencies = [ "futures-core", "pin-project-lite", @@ -2868,9 +3125,9 @@ dependencies = [ [[package]] name = "tokio-util" -version = "0.7.4" +version = "0.7.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0bb2e075f03b3d66d8d8785356224ba688d2906a371015e225beeb65ca92c740" +checksum = "5427d89453009325de0d8f342c9490009f76e999cb7672d77e46267448f7e6b2" dependencies = [ "bytes", "futures-core", @@ -2882,9 +3139,9 @@ dependencies = [ [[package]] name = "toml" -version = "0.5.10" +version = "0.5.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1333c76748e868a4d9d1017b5ab53171dfd095f70c712fdb4653a406547f598f" +checksum = "f4f7f0dd8d50a853a531c426359045b1998f04219d88799810762cd4ad314234" dependencies = [ "serde", ] @@ -2928,7 +3185,7 @@ checksum = "4017f8f45139870ca7e672686113917c71c7a6e02d4924eda67186083c03081a" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.109", ] [[package]] @@ -3017,9 +3274,9 @@ dependencies = [ [[package]] name = "try-lock" -version = "0.2.3" +version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59547bce71d9c38b83d9c0e92b6066c4253371f15005def0c30d9657f50c7642" +checksum = "3528ecfd12c466c6f163363caf2d02a71161dd5e1cc6ae7b34207ea2d42d81ed" [[package]] name = "tungstenite" @@ -3027,7 +3284,7 @@ version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "30ee6ab729cd4cf0fd55218530c4522ed30b7b6081752839b68fcec8d0960788" dependencies = [ - "base64", + "base64 0.13.1", "byteorder", "bytes", "http", @@ -3073,15 +3330,15 @@ dependencies = [ [[package]] name = "unicode-bidi" -version = "0.3.8" +version = "0.3.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "099b7128301d285f79ddd55b9a83d5e6b9e97c92e0ea0daebee7263e932de992" +checksum = "92888ba5573ff080736b3648696b70cafad7d250551175acbaa4e0385b3e1460" [[package]] name = "unicode-ident" -version = "1.0.5" +version = "1.0.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ceab39d59e4c9499d4e5a8ee0e2735b891bb7308ac83dfb4e80cad195c9f6f3" +checksum = "e5464a87b239f13a63a501f2701565754bae92d243d4bb7eb12f6d57d2269bf4" [[package]] name = "unicode-normalization" @@ -3104,16 +3361,6 @@ version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f962df74c8c05a667b5ee8bcf162993134c104e96440b663c8daa176dc772d8c" -[[package]] -name = "universal-hash" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d3160b73c9a19f7e2939a2fdad446c57c1bbbbf4d919d3213ff1267a580d8b5" -dependencies = [ - "crypto-common", - "subtle", -] - [[package]] name = "untrusted" version = "0.7.1" @@ -3140,9 +3387,9 @@ checksum = "09cc8ee72d2a9becf2f2febe0205bbed8fc6615b7cb429ad062dc7b7ddd036a9" [[package]] name = "uuid" -version = "1.2.2" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "422ee0de9031b5b948b97a8fc04e3aa35230001a722ddd27943e0be31564ce4c" +checksum = "1674845326ee10d37ca60470760d4288a6f80f304007d92e5c53bab78c9cfd79" dependencies = [ "getrandom", ] @@ -3153,16 +3400,26 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d" +[[package]] +name = "value-bag" +version = "1.0.0-alpha.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2209b78d1249f7e6f3293657c9779fe31ced465df091bbd433a1cf88e916ec55" +dependencies = [ + "ctor", + "version_check", +] + [[package]] name = "vaultwarden" version = "1.0.0" dependencies = [ - "backtrace", + "argon2", "bytes", "cached", "chrono", "chrono-tz", - "cookie", + "cookie 0.16.2", "cookie_store 0.19.0", "dashmap", "data-encoding", @@ -3196,6 +3453,7 @@ dependencies = [ "ring", "rmpv", "rocket", + "rpassword", "semver", "serde", "serde_json", @@ -3208,6 +3466,7 @@ dependencies = [ "url", "uuid", "webauthn-rs", + "which", "yubico", ] @@ -3224,13 +3483,18 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" [[package]] -name = "walkdir" -version = "2.3.2" +name = "waker-fn" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "808cf2735cd4b6866113f648b791c6adc5714537bc222d9347bb203386ffda56" +checksum = "9d5b2c62b4012a3e1eca5a7e077d13b3bf498c4073e33ccd58626607748ceeca" + +[[package]] +name = "walkdir" +version = "2.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "36df944cda56c7d8d8b7496af378e6b16de9284591917d307c9b4d313c44e698" dependencies = [ "same-file", - "winapi", "winapi-util", ] @@ -3258,9 +3522,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasm-bindgen" -version = "0.2.83" +version = "0.2.84" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eaf9f5aceeec8be17c128b2e93e031fb8a4d469bb9c4ae2d7dc1888b26887268" +checksum = "31f8dcbc21f30d9b8f2ea926ecb58f6b91192c17e9d33594b3df58b2007ca53b" dependencies = [ "cfg-if", "wasm-bindgen-macro", @@ -3268,24 +3532,24 @@ dependencies = [ [[package]] name = "wasm-bindgen-backend" -version = "0.2.83" +version = "0.2.84" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c8ffb332579b0557b52d268b91feab8df3615f265d5270fec2a8c95b17c1142" +checksum = "95ce90fd5bcc06af55a641a86428ee4229e44e07033963a2290a8e241607ccb9" dependencies = [ "bumpalo", "log", "once_cell", "proc-macro2", "quote", - "syn", + "syn 1.0.109", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-futures" -version = "0.4.33" +version = "0.4.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23639446165ca5a5de86ae1d8896b737ae80319560fbaa4c2887b7da6e7ebd7d" +checksum = "f219e0d211ba40266969f6dbdd90636da12f75bee4fc9d6c23d1260dadb51454" dependencies = [ "cfg-if", "js-sys", @@ -3295,9 +3559,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.83" +version = "0.2.84" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "052be0f94026e6cbc75cdefc9bae13fd6052cdcaf532fa6c45e7ae33a1e6c810" +checksum = "4c21f77c0bedc37fd5dc21f897894a5ca01e7bb159884559461862ae90c0b4c5" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -3305,28 +3569,41 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.83" +version = "0.2.84" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07bc0c051dc5f23e307b13285f9d75df86bfdf816c5721e573dec1f9b8aa193c" +checksum = "2aff81306fcac3c7515ad4e177f521b5c9a15f2b08f4e32d823066102f35a5f6" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.109", "wasm-bindgen-backend", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-shared" -version = "0.2.83" +version = "0.2.84" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c38c045535d93ec4f0b4defec448e4291638ee608530863b1e2ba115d4fff7f" +checksum = "0046fef7e28c3804e5e38bfa31ea2a0f73905319b677e57ebe37e49358989b5d" + +[[package]] +name = "wasm-streams" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6bbae3363c08332cadccd13b67db371814cd214c2524020932f0804b8cf7c078" +dependencies = [ + "futures-util", + "js-sys", + "wasm-bindgen", + "wasm-bindgen-futures", + "web-sys", +] [[package]] name = "web-sys" -version = "0.3.60" +version = "0.3.61" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bcda906d8be16e728fd5adc5b729afad4e444e106ab28cd1c7256e54fa61510f" +checksum = "e33b99f4b23ba3eec1a53ac264e35a755f00e966e0065077d6027c0f575b0b97" dependencies = [ "js-sys", "wasm-bindgen", @@ -3338,7 +3615,7 @@ version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "90b266eccb4b32595876f5c73ea443b0516da0b1df72ca07bc08ed9ba7f96ec1" dependencies = [ - "base64", + "base64 0.13.1", "nom", "openssl", "rand", @@ -3361,6 +3638,17 @@ dependencies = [ "untrusted", ] +[[package]] +name = "which" +version = "4.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2441c784c52b289a054b7201fc93253e288f094e2f4be9058343127c4226a269" +dependencies = [ + "either", + "libc", + "once_cell", +] + [[package]] name = "widestring" version = "0.5.1" @@ -3400,28 +3688,20 @@ checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" [[package]] name = "windows" -version = "0.39.0" +version = "0.44.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1c4bd0a50ac6020f65184721f758dba47bb9fbc2133df715ec74a237b26794a" +checksum = "9e745dab35a0c4c77aa3ce42d595e13d2003d6902d6b08c9ef5fc326d08da12b" dependencies = [ - "windows_aarch64_msvc 0.39.0", - "windows_i686_gnu 0.39.0", - "windows_i686_msvc 0.39.0", - "windows_x86_64_gnu 0.39.0", - "windows_x86_64_msvc 0.39.0", + "windows-targets", ] [[package]] -name = "windows-sys" -version = "0.36.1" +name = "windows" +version = "0.46.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea04155a16a59f9eab786fe12a4a450e75cdb175f9e0d80da1e17db09f55b8d2" +checksum = "cdacb41e6a96a052c6cb63a144f24900236121c6f63f4f8219fef5977ecb0c25" dependencies = [ - "windows_aarch64_msvc 0.36.1", - "windows_i686_gnu 0.36.1", - "windows_i686_msvc 0.36.1", - "windows_x86_64_gnu 0.36.1", - "windows_x86_64_msvc 0.36.1", + "windows-targets", ] [[package]] @@ -3431,115 +3711,79 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5a3e1820f08b8513f676f7ab6c1f99ff312fb97b553d30ff4dd86f9f15728aa7" dependencies = [ "windows_aarch64_gnullvm", - "windows_aarch64_msvc 0.42.0", - "windows_i686_gnu 0.42.0", - "windows_i686_msvc 0.42.0", - "windows_x86_64_gnu 0.42.0", + "windows_aarch64_msvc", + "windows_i686_gnu", + "windows_i686_msvc", + "windows_x86_64_gnu", "windows_x86_64_gnullvm", - "windows_x86_64_msvc 0.42.0", + "windows_x86_64_msvc", +] + +[[package]] +name = "windows-sys" +version = "0.45.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0" +dependencies = [ + "windows-targets", +] + +[[package]] +name = "windows-targets" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e5180c00cd44c9b1c88adb3693291f1cd93605ded80c250a75d472756b4d071" +dependencies = [ + "windows_aarch64_gnullvm", + "windows_aarch64_msvc", + "windows_i686_gnu", + "windows_i686_msvc", + "windows_x86_64_gnu", + "windows_x86_64_gnullvm", + "windows_x86_64_msvc", ] [[package]] name = "windows_aarch64_gnullvm" -version = "0.42.0" +version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41d2aa71f6f0cbe00ae5167d90ef3cfe66527d6f613ca78ac8024c3ccab9a19e" +checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8" [[package]] name = "windows_aarch64_msvc" -version = "0.36.1" +version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9bb8c3fd39ade2d67e9874ac4f3db21f0d710bee00fe7cab16949ec184eeaa47" - -[[package]] -name = "windows_aarch64_msvc" -version = "0.39.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec7711666096bd4096ffa835238905bb33fb87267910e154b18b44eaabb340f2" - -[[package]] -name = "windows_aarch64_msvc" -version = "0.42.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd0f252f5a35cac83d6311b2e795981f5ee6e67eb1f9a7f64eb4500fbc4dcdb4" +checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43" [[package]] name = "windows_i686_gnu" -version = "0.36.1" +version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "180e6ccf01daf4c426b846dfc66db1fc518f074baa793aa7d9b9aaeffad6a3b6" - -[[package]] -name = "windows_i686_gnu" -version = "0.39.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "763fc57100a5f7042e3057e7e8d9bdd7860d330070251a73d003563a3bb49e1b" - -[[package]] -name = "windows_i686_gnu" -version = "0.42.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fbeae19f6716841636c28d695375df17562ca208b2b7d0dc47635a50ae6c5de7" +checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f" [[package]] name = "windows_i686_msvc" -version = "0.36.1" +version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2e7917148b2812d1eeafaeb22a97e4813dfa60a3f8f78ebe204bcc88f12f024" - -[[package]] -name = "windows_i686_msvc" -version = "0.39.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7bc7cbfe58828921e10a9f446fcaaf649204dcfe6c1ddd712c5eebae6bda1106" - -[[package]] -name = "windows_i686_msvc" -version = "0.42.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "84c12f65daa39dd2babe6e442988fc329d6243fdce47d7d2d155b8d874862246" +checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060" [[package]] name = "windows_x86_64_gnu" -version = "0.36.1" +version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4dcd171b8776c41b97521e5da127a2d86ad280114807d0b2ab1e462bc764d9e1" - -[[package]] -name = "windows_x86_64_gnu" -version = "0.39.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6868c165637d653ae1e8dc4d82c25d4f97dd6605eaa8d784b5c6e0ab2a252b65" - -[[package]] -name = "windows_x86_64_gnu" -version = "0.42.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf7b1b21b5362cbc318f686150e5bcea75ecedc74dd157d874d754a2ca44b0ed" +checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36" [[package]] name = "windows_x86_64_gnullvm" -version = "0.42.0" +version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09d525d2ba30eeb3297665bd434a54297e4170c7f1a44cad4ef58095b4cd2028" +checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3" [[package]] name = "windows_x86_64_msvc" -version = "0.36.1" +version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c811ca4a8c853ef420abd8592ba53ddbbac90410fab6903b3e79972a631f7680" - -[[package]] -name = "windows_x86_64_msvc" -version = "0.39.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e4d40883ae9cae962787ca76ba76390ffa29214667a111db9e0a1ad8377e809" - -[[package]] -name = "windows_x86_64_msvc" -version = "0.42.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f40009d85759725a34da6d89a94e63d7bdc50a862acf0dbc7c8e488f1edcb6f5" +checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0" [[package]] name = "winreg" @@ -3562,7 +3806,7 @@ version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "173f75d2c4010429a2d74ae3a114a69930c59e2b1a4c97b1c75d259a4960d5fb" dependencies = [ - "base64", + "base64 0.13.1", "form_urlencoded", "futures", "hmac", diff --git a/pkgs/tools/security/vaultwarden/default.nix b/pkgs/tools/security/vaultwarden/default.nix index a98d6beb9a35..a31f5e45c4a8 100644 --- a/pkgs/tools/security/vaultwarden/default.nix +++ b/pkgs/tools/security/vaultwarden/default.nix @@ -9,20 +9,17 @@ in rustPlatform.buildRustPackage rec { pname = "vaultwarden"; - version = "1.27.0"; + version = "1.28.0"; src = fetchFromGitHub { owner = "dani-garcia"; repo = pname; rev = version; - hash = "sha256-QvU1Y3syr6PZbTRebbZF4sEzI4lIj1enJe2F/gGfvQM="; + hash = "sha256-ML5eblQUk4xMYbBeLxk9tNxi7N4ltrCjMG0oM9zL6JI="; }; cargoLock = { lockFile = ./Cargo.lock; - outputHashes = { - "multer-2.0.4" = "sha256-962onbcPUjkoIGSQTnF8m1fkamwThpPj4uBJ8EqbouQ="; - }; }; nativeBuildInputs = [ pkg-config ]; @@ -46,7 +43,7 @@ rustPlatform.buildRustPackage rec { meta = with lib; { description = "Unofficial Bitwarden compatible server written in Rust"; homepage = "https://github.com/dani-garcia/vaultwarden"; - license = licenses.gpl3Only; + license = licenses.agpl3Only; maintainers = with maintainers; [ msteen ivan ]; }; } diff --git a/pkgs/tools/security/vaultwarden/update.nix b/pkgs/tools/security/vaultwarden/update.nix index 44af26ada0d8..c2c03413cc43 100644 --- a/pkgs/tools/security/vaultwarden/update.nix +++ b/pkgs/tools/security/vaultwarden/update.nix @@ -20,10 +20,8 @@ writeShellScript "update-vaultwarden" '' URL="https://raw.githubusercontent.com/dani-garcia/vaultwarden/''${VAULTWARDEN_VERSION}/docker/Dockerfile.j2" WEBVAULT_VERSION=$(curl --silent "$URL" | grep "set vault_version" | sed -E "s/.*\"v([^\"]+)\".*/\\1/") - old_hash_bw=$(nix --extra-experimental-features nix-command eval -f default.nix --raw vaultwarden.webvault.src.outputHash) - old_hash_vw=$(nix --extra-experimental-features nix-command eval -f default.nix --raw vaultwarden.webvault.bw_web_builds.outputHash) - new_hash_bw=$(nix --extra-experimental-features nix-command hash to-sri --type sha256 $(nix-prefetch-git https://github.com/bitwarden/clients.git --rev "web-v$WEBVAULT_VERSION" | jq --raw-output ".sha256")) - new_hash_vw=$(nix --extra-experimental-features nix-command hash to-sri --type sha256 $(nix-prefetch-git https://github.com/dani-garcia/bw_web_builds.git --rev "v$WEBVAULT_VERSION" | jq --raw-output ".sha256")) - sed -e "s#$old_hash_bw#$new_hash_bw#" -e "s#$old_hash_vw#$new_hash_vw#" -i pkgs/tools/security/vaultwarden/webvault.nix + old_hash=$(nix --extra-experimental-features nix-command eval -f default.nix --raw vaultwarden.webvault.bw_web_builds.outputHash) + new_hash=$(nix --extra-experimental-features nix-command hash to-sri --type sha256 $(nix-prefetch-git https://github.com/dani-garcia/bw_web_builds.git --rev "v$WEBVAULT_VERSION" | jq --raw-output ".sha256")) + sed -e "s#$old_hash#$new_hash#" -i pkgs/tools/security/vaultwarden/webvault.nix nix-update "vaultwarden.webvault" --version "$WEBVAULT_VERSION" '' diff --git a/pkgs/tools/security/vaultwarden/webvault.nix b/pkgs/tools/security/vaultwarden/webvault.nix index 28b60517ad65..43de28a914a9 100644 --- a/pkgs/tools/security/vaultwarden/webvault.nix +++ b/pkgs/tools/security/vaultwarden/webvault.nix @@ -10,30 +10,30 @@ let buildNpmPackage' = buildNpmPackage.override { nodejs = nodejs-16_x; }; - version = "2022.12.0"; + version = "2023.3.0b"; bw_web_builds = fetchFromGitHub { owner = "dani-garcia"; repo = "bw_web_builds"; rev = "v${version}"; - hash = "sha256-4yUE0ySUCKmmbca+T8qjqSO0AHZEUAHZ4nheRjpDnZo="; + hash = "sha256-3kCgT+NsYU7sRJvw56vcPXS7j+eHxgek195zZnamjJw="; }; -in buildNpmPackage' { +in buildNpmPackage' rec { pname = "vaultwarden-webvault"; inherit version; src = fetchFromGitHub { owner = "bitwarden"; repo = "clients"; - rev = "web-v${version}"; - hash = "sha256-CsbnnP12P7JuGDOm5Ia73SzET/jCx3qRbz9vdUf7lCA="; + rev = "web-v${lib.removeSuffix "b" version}"; + hash = "sha256-pSaFksfdxVx7vaozR5h+wpPB42qVgs+aXhV7HGFq71E="; }; - npmDepsHash = "sha256-wWOtVGNOzY2s82nfQDuWgA4ukpJxJr8Z7Y+rFPq2QdU="; + npmDepsHash = "sha256-ZHbKq7EseYNTWjKi+W66WinmReZbpn3kJB3g0N2z4ww="; postPatch = '' ln -s ${bw_web_builds}/{patches,resources} .. - PATH="${git}/bin:$PATH" VAULT_VERSION=${bw_web_builds.rev} \ + PATH="${git}/bin:$PATH" VAULT_VERSION="${lib.removePrefix "web-" src.rev}" \ bash ${bw_web_builds}/scripts/apply_patches.sh ''; From 9adb30050dfd9fb50b377223884a8901a1d7f495 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 28 Mar 2023 17:16:28 +0000 Subject: [PATCH 219/227] python310Packages.google-cloud-os-config: 1.15.0 -> 1.15.1 --- .../python-modules/google-cloud-os-config/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-os-config/default.nix b/pkgs/development/python-modules/google-cloud-os-config/default.nix index 021d9533b445..6333f2f72df0 100644 --- a/pkgs/development/python-modules/google-cloud-os-config/default.nix +++ b/pkgs/development/python-modules/google-cloud-os-config/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "google-cloud-os-config"; - version = "1.15.0"; + version = "1.15.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-78o/MQFUREOW21BsSezK1QqciPVAEwOd15TRfAhxTWo="; + hash = "sha256-OaF1pzRY5k5SvXNCxTviP/2lhC7Up+oXaQB14f2tGj8="; }; propagatedBuildInputs = [ From 49079a134fd3d3ac25d5ae1f5516f37770f19138 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 28 Mar 2023 05:52:38 +0000 Subject: [PATCH 220/227] tkrzw: 1.0.26 -> 1.0.27 --- pkgs/development/libraries/tkrzw/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/tkrzw/default.nix b/pkgs/development/libraries/tkrzw/default.nix index 843eb2f5b103..b3e8c8fbae28 100644 --- a/pkgs/development/libraries/tkrzw/default.nix +++ b/pkgs/development/libraries/tkrzw/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { pname = "tkrzw"; - version = "1.0.26"; + version = "1.0.27"; # TODO: defeat multi-output reference cycles src = fetchurl { url = "https://dbmx.net/tkrzw/pkg/tkrzw-${version}.tar.gz"; - hash = "sha256-vbuzV4ZZnb0Vl+U9B8BorDD7mHQ7ILwkR35GaFs+aTI="; + hash = "sha256-DxLtDtscTPR1yzeOENyQPylKo+VxJTswUAE/MieEoXQ="; }; postPatch = '' From e1a383102f9d4e6e9ae334eb68e94b61c4770278 Mon Sep 17 00:00:00 2001 From: Daniel Nagy Date: Tue, 28 Mar 2023 20:00:00 +0200 Subject: [PATCH 221/227] nixos/x11: set XKB_CONFIG_ROOT from config The motivation is to make overriding `services.xserver.xkbDir` easier. --- nixos/modules/services/x11/extra-layouts.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/x11/extra-layouts.nix b/nixos/modules/services/x11/extra-layouts.nix index 9c88d12ca6f2..1f48713a68dd 100644 --- a/nixos/modules/services/x11/extra-layouts.nix +++ b/nixos/modules/services/x11/extra-layouts.nix @@ -121,7 +121,7 @@ in environment.sessionVariables = { # runtime override supported by multiple libraries e. g. libxkbcommon # https://xkbcommon.org/doc/current/group__include-path.html - XKB_CONFIG_ROOT = "${xkb_patched}/etc/X11/xkb"; + XKB_CONFIG_ROOT = config.services.xserver.xkbDir; }; services.xserver = { From 91137380e6d9ac975a521dbd54abaac3cbc25d69 Mon Sep 17 00:00:00 2001 From: Antonio Nuno Monteiro Date: Tue, 28 Mar 2023 11:07:28 -0700 Subject: [PATCH 222/227] buildDunePackage: use `--mandir` instead of `--man` --- pkgs/build-support/ocaml/dune.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/build-support/ocaml/dune.nix b/pkgs/build-support/ocaml/dune.nix index 81f1010e467c..7b602e2507d5 100644 --- a/pkgs/build-support/ocaml/dune.nix +++ b/pkgs/build-support/ocaml/dune.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation ({ runHook preInstall dune install --prefix $out --libdir $OCAMLFIND_DESTDIR ${pname} \ ${if lib.versionAtLeast Dune.version "2.9" - then "--docdir $out/share/doc --man $out/share/man" + then "--docdir $out/share/doc --mandir $out/share/man" else ""} runHook postInstall ''; From 5cc9cef25d20a4d392a3076808763fcbfa9d0bf7 Mon Sep 17 00:00:00 2001 From: Astro Date: Sun, 26 Mar 2023 01:29:36 +0100 Subject: [PATCH 223/227] rust-hypervisor-firmware: init at 0.4.2 --- .../rust-hypervisor-firmware/default.nix | 57 +++++++++++++++++++ .../x86_64-unknown-none.json | 20 +++++++ pkgs/top-level/all-packages.nix | 2 + 3 files changed, 79 insertions(+) create mode 100644 pkgs/applications/virtualization/rust-hypervisor-firmware/default.nix create mode 100644 pkgs/applications/virtualization/rust-hypervisor-firmware/x86_64-unknown-none.json diff --git a/pkgs/applications/virtualization/rust-hypervisor-firmware/default.nix b/pkgs/applications/virtualization/rust-hypervisor-firmware/default.nix new file mode 100644 index 000000000000..a4ab7c0805c8 --- /dev/null +++ b/pkgs/applications/virtualization/rust-hypervisor-firmware/default.nix @@ -0,0 +1,57 @@ +{ lib +, fetchFromGitHub +, makeRustPlatform +, hostPlatform +, targetPlatform +, lld +}: + +let + arch = targetPlatform.qemuArch; + + target = ./. + "/${arch}-unknown-none.json"; + + cross = import ../../../.. { + system = hostPlatform.system; + crossSystem = lib.systems.examples."${arch}-embedded" // { + rustc.config = "${arch}-unknown-none"; + rustc.platform = lib.importJSON target; + }; + }; + + inherit (cross) rustPlatform; + +in + +rustPlatform.buildRustPackage rec { + pname = "rust-hypervisor-firmware"; + version = "0.4.2"; + + src = fetchFromGitHub { + owner = "cloud-hypervisor"; + repo = pname; + rev = version; + sha256 = "sha256-hKk5pcop8rb5Q+IVchcl+XhMc3DCBBPn5P+AkAb9XxI="; + }; + + cargoSha256 = "sha256-edi6/Md6KebKM3wHArZe1htUCg0/BqMVZKA4xEH25GI="; + + RUSTC_BOOTSTRAP = 1; + + nativeBuildInputs = [ + lld + ]; + + RUSTFLAGS = "-C linker=lld -C linker-flavor=ld.lld"; + + # Tests don't work for `no_std`. See https://os.phil-opp.com/testing/ + doCheck = false; + + meta = with lib; { + homepage = "https://github.com/cloud-hypervisor/rust-hypervisor-firmware"; + description = "A simple firmware that is designed to be launched from anything that supports loading ELF binaries and running them with the PVH booting standard"; + license = with licenses; [ asl20 ]; + maintainers = with maintainers; [ astro ]; + platforms = [ "x86_64-none" ]; + }; +} diff --git a/pkgs/applications/virtualization/rust-hypervisor-firmware/x86_64-unknown-none.json b/pkgs/applications/virtualization/rust-hypervisor-firmware/x86_64-unknown-none.json new file mode 100644 index 000000000000..f42155ae32ee --- /dev/null +++ b/pkgs/applications/virtualization/rust-hypervisor-firmware/x86_64-unknown-none.json @@ -0,0 +1,20 @@ +{ + "llvm-target": "x86_64-unknown-none", + "data-layout": "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128", + "arch": "x86_64", + "target-endian": "little", + "target-pointer-width": "64", + "target-c-int-width": "32", + "os": "none", + "executables": true, + "linker": "rust-lld", + "linker-flavor": "ld.lld", + "panic-strategy": "abort", + "disable-redzone": true, + "features": "-mmx,-sse,+soft-float", + "code-model": "small", + "relocation-model": "pic", + "pre-link-args": { + "ld.lld": ["--script=x86_64-unknown-none.ld"] + } +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index cd931ae4aa2f..a64f0e6511c4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -25399,6 +25399,8 @@ with pkgs; qboot = pkgsi686Linux.callPackage ../applications/virtualization/qboot { }; + rust-hypervisor-firmware = callPackage ../applications/virtualization/rust-hypervisor-firmware { }; + OVMF = callPackage ../applications/virtualization/OVMF { }; OVMFFull = callPackage ../applications/virtualization/OVMF { secureBoot = true; From 511d699e4e4a29756cdd481ca92a6e3ae8e4aec2 Mon Sep 17 00:00:00 2001 From: Otto Sabart Date: Tue, 28 Mar 2023 21:00:00 +0200 Subject: [PATCH 224/227] teos: add update script --- .../applications/blockchains/teos/default.nix | 5 +++ pkgs/applications/blockchains/teos/update.sh | 31 +++++++++++++++++++ 2 files changed, 36 insertions(+) create mode 100755 pkgs/applications/blockchains/teos/update.sh diff --git a/pkgs/applications/blockchains/teos/default.nix b/pkgs/applications/blockchains/teos/default.nix index a8ce5ca24207..fbd8c08575d5 100644 --- a/pkgs/applications/blockchains/teos/default.nix +++ b/pkgs/applications/blockchains/teos/default.nix @@ -24,6 +24,7 @@ let license = licenses.mit; maintainers = with maintainers; [ seberm ]; }; + updateScript = ./update.sh; in { teos = rustPlatform.buildRustPackage { @@ -43,6 +44,8 @@ in darwin.apple_sdk.frameworks.Security ]; + passthru.updateScript = updateScript; + __darwinAllowLocalNetworking = true; meta = meta // { @@ -70,6 +73,8 @@ in darwin.apple_sdk.frameworks.SystemConfiguration ]; + passthru.updateScript = updateScript; + __darwinAllowLocalNetworking = true; meta = meta // { diff --git a/pkgs/applications/blockchains/teos/update.sh b/pkgs/applications/blockchains/teos/update.sh new file mode 100755 index 000000000000..b7e344cda844 --- /dev/null +++ b/pkgs/applications/blockchains/teos/update.sh @@ -0,0 +1,31 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i bash -p coreutils curl jq git gnupg common-updater-scripts +set -euo pipefail + +# Fetch latest release, update derivation +scriptDir=$(cd "${BASH_SOURCE[0]%/*}" && pwd) +nixpkgs=$(realpath "$scriptDir"/../../../..) + +oldVersion=$(nix-instantiate --eval -E "(import \"$nixpkgs\" { config = {}; overlays = []; }).teos.version" | tr -d '"') +version=$(curl -s --show-error "https://api.github.com/repos/talaia-labs/rust-teos/releases/latest" | jq -r '.tag_name' | tail -c +2) + +if [[ $version == $oldVersion ]]; then + echo "Already at latest version $version" + exit 0 +fi +echo "New version: $version" + +tmpdir=$(mktemp -d /tmp/teos.XXX) +repo="${tmpdir}/repo" +trap 'rm -rf $tmpdir' EXIT + +git clone --depth 1 --branch "v${version}" -c advice.detachedHead=false 'https://github.com/talaia-labs/rust-teos' "$repo" +git -C "$repo" checkout "tags/v${version}" + +rm -rf "${repo}/.git" +hashcheck=$(nix hash path "$repo") + +(cd "$nixpkgs" && update-source-version teos "$version" "$hashcheck") +sed -i 's|cargoHash = .*|cargoHash = "sha256-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=";|' "${scriptDir}/default.nix" +echo +echo "rust-teos: $oldVersion -> $version" From 6592df62339d853df563b2066364570925fc0487 Mon Sep 17 00:00:00 2001 From: mcnesium Date: Tue, 28 Mar 2023 22:13:50 +0200 Subject: [PATCH 225/227] matrix-commander: 3.5.0 > 6.0.1 (#223371) --- .../instant-messengers/matrix-commander/default.nix | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/matrix-commander/default.nix b/pkgs/applications/networking/instant-messengers/matrix-commander/default.nix index d80d2b2f4df5..a9e27186feb7 100644 --- a/pkgs/applications/networking/instant-messengers/matrix-commander/default.nix +++ b/pkgs/applications/networking/instant-messengers/matrix-commander/default.nix @@ -7,7 +7,6 @@ , python-magic , markdown , pillow -, urllib3 , aiofiles , notify2 , dbus-python @@ -17,13 +16,13 @@ buildPythonApplication rec { pname = "matrix-commander"; - version = "3.5.0"; + version = "6.0.1"; src = fetchFromGitHub { owner = "8go"; repo = "matrix-commander"; rev = "v${version}"; - sha256 = "sha256-/hNTaajZTyeIcGILIXqUVbBvZ8AUNZKBDsZ4Gr5RL2o="; + sha256 = "sha256-NSoMGUQjy4TQXdzZcQfO2rUQDsuSzQnoGDpqFiLQHVQ="; }; format = "pyproject"; @@ -45,7 +44,6 @@ buildPythonApplication rec { python-magic markdown pillow - urllib3 aiofiles notify2 dbus-python From 92f28daedeab851b5538e50e8efc352ba524b0a8 Mon Sep 17 00:00:00 2001 From: Pauan Date: Tue, 28 Mar 2023 23:45:26 +0200 Subject: [PATCH 226/227] blender: 3.3.1 -> 3.4.1 (#223478) --- pkgs/applications/misc/blender/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/blender/default.nix b/pkgs/applications/misc/blender/default.nix index 59fd3f915656..992ae201c81d 100644 --- a/pkgs/applications/misc/blender/default.nix +++ b/pkgs/applications/misc/blender/default.nix @@ -1,5 +1,5 @@ { config, stdenv, lib, fetchurl, fetchzip, boost, cmake, ffmpeg, gettext, glew -, ilmbase, libXi, libX11, libXext, libXrender +, ilmbase, libepoxy, libXi, libX11, libXext, libXrender , libjpeg, libpng, libsamplerate, libsndfile , libtiff, libwebp, libGLU, libGL, openal, opencolorio, openexr, openimagedenoise, openimageio, openjpeg, python310Packages , openvdb, libXxf86vm, tbb, alembic @@ -27,11 +27,11 @@ let in stdenv.mkDerivation rec { pname = "blender"; - version = "3.3.1"; + version = "3.4.1"; src = fetchurl { url = "https://download.blender.org/source/${pname}-${version}.tar.xz"; - hash = "sha256-KtpI8L+KDKgCuYfXV0UgEuH48krPTSNFOwnC1ZURjMo="; + hash = "sha256-JHxMEignDJAQ9HIcmFy1tiirUKvPnyZ4Ywc3FC7rkcM="; }; patches = lib.optional stdenv.isDarwin ./darwin.patch; @@ -50,6 +50,7 @@ stdenv.mkDerivation rec { pugixml potrace libharu + libepoxy ] ++ (if (!stdenv.isDarwin) then [ libXi libX11 libXext libXrender From 70bb55ea8b0a190daf3dc669feeb4541898eeddb Mon Sep 17 00:00:00 2001 From: figsoda Date: Tue, 28 Mar 2023 18:50:23 -0400 Subject: [PATCH 227/227] boxxy: 0.5.1 -> 0.6.0 (#223486) --- pkgs/tools/misc/boxxy/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/boxxy/default.nix b/pkgs/tools/misc/boxxy/default.nix index 2213067f9bc9..29bb0f1f27c3 100644 --- a/pkgs/tools/misc/boxxy/default.nix +++ b/pkgs/tools/misc/boxxy/default.nix @@ -6,16 +6,16 @@ rustPlatform.buildRustPackage rec { pname = "boxxy"; - version = "0.5.1"; + version = "0.6.0"; src = fetchFromGitHub { owner = "queer"; repo = "boxxy"; rev = "v${version}"; - hash = "sha256-e6AkxC3TP2StApPSWaadLz/AFmaKBKCrS5HuocvmfQs="; + hash = "sha256-05bGVtjbyd9e/Ega/Lv1Yy4gVDlJfygxD1g8bu5FuWY="; }; - cargoHash = "sha256-E3IX3JSc8Rq8Qnx6Lk+PQgGfHptidxPaOqejYJgudlw="; + cargoHash = "sha256-uzgMqfQCUzOOYCirLWsH2xm02T0UZXcMKCMmM45AkBg="; meta = with lib; { description = "Puts bad Linux applications in a box with only their files";