From c351a84eec83a57643e490c34cb8cb61e1341f53 Mon Sep 17 00:00:00 2001 From: Luflosi Date: Fri, 24 Mar 2023 19:16:24 +0100 Subject: [PATCH 001/168] nixos/tests/installer: test /boot on ZFS Let's test / on ZFS and /boot on ZFS in separate tests since the GRUB integration for ZFS seems to be not very well maintained. If the test breaks in the future it's easier to figure out that ZFS on /boot is at fault and either fix the issue or disable the test. The new test creates a ZFS pool where all features not compatible with GRUB2 are disabled. The dataset is then mounted on /boot and we check that the installer correctly generates a bootable configuration. Try to use as many ZFS features as possible to verify that GRUB can handle them. --- nixos/release-combined.nix | 1 + nixos/tests/installer-systemd-stage-1.nix | 1 + nixos/tests/installer.nix | 86 ++++++++++++++++++++--- nixos/tests/zfs.nix | 1 + 4 files changed, 78 insertions(+), 11 deletions(-) diff --git a/nixos/release-combined.nix b/nixos/release-combined.nix index 9b4b92be6f3a..47506b964af4 100644 --- a/nixos/release-combined.nix +++ b/nixos/release-combined.nix @@ -90,6 +90,7 @@ in rec { (onSystems ["x86_64-linux"] "nixos.tests.installer.btrfsSubvols") (onSystems ["x86_64-linux"] "nixos.tests.installer.luksroot") (onSystems ["x86_64-linux"] "nixos.tests.installer.lvm") + (onSystems ["x86_64-linux"] "nixos.tests.installer.separateBootZfs") (onSystems ["x86_64-linux"] "nixos.tests.installer.separateBootFat") (onSystems ["x86_64-linux"] "nixos.tests.installer.separateBoot") (onSystems ["x86_64-linux"] "nixos.tests.installer.simpleLabels") diff --git a/nixos/tests/installer-systemd-stage-1.nix b/nixos/tests/installer-systemd-stage-1.nix index d0c01a779ef1..662017935412 100644 --- a/nixos/tests/installer-systemd-stage-1.nix +++ b/nixos/tests/installer-systemd-stage-1.nix @@ -22,6 +22,7 @@ # lvm separateBoot separateBootFat + separateBootZfs simple simpleLabels simpleProvided diff --git a/nixos/tests/installer.nix b/nixos/tests/installer.nix index f7fc168eba8c..d83e49a3e8f7 100644 --- a/nixos/tests/installer.nix +++ b/nixos/tests/installer.nix @@ -878,6 +878,78 @@ in { ''; }; + # Same as the previous, but with ZFS /boot. + separateBootZfs = makeInstallerTest "separateBootZfs" { + extraInstallerConfig = { + boot.supportedFilesystems = [ "zfs" ]; + }; + + extraConfig = '' + # Using by-uuid overrides the default of by-id, and is unique + # to the qemu disks, as they don't produce by-id paths for + # some reason. + boot.zfs.devNodes = "/dev/disk/by-uuid/"; + networking.hostId = "00000000"; + ''; + + createPartitions = '' + machine.succeed( + "flock /dev/vda parted --script /dev/vda -- mklabel msdos" + + " mkpart primary ext2 1M 256MB" # /boot + + " mkpart primary linux-swap 256MB 1280M" + + " mkpart primary ext2 1280M -1s", # / + "udevadm settle", + + "mkswap /dev/vda2 -L swap", + "swapon -L swap", + + "mkfs.ext4 -L nixos /dev/vda3", + "mount LABEL=nixos /mnt", + + # Use as many ZFS features as possible to verify that GRUB can handle them + "zpool create" + " -o compatibility=grub2" + " -O utf8only=on" + " -O normalization=formD" + " -O compression=lz4" # Activate the lz4_compress feature + " -O xattr=sa" + " -O acltype=posixacl" + " bpool /dev/vda1", + "zfs create" + " -o recordsize=1M" # Prepare activating the large_blocks feature + " -o mountpoint=legacy" + " -o relatime=on" + " -o quota=1G" + " -o filesystem_limit=100" # Activate the filesystem_limits features + " bpool/boot", + + # Snapshotting the top-level dataset would trigger a bug in GRUB2: https://github.com/openzfs/zfs/issues/13873 + "zfs snapshot bpool/boot@snap-1", # Prepare activating the livelist and bookmarks features + "zfs clone bpool/boot@snap-1 bpool/test", # Activate the livelist feature + "zfs bookmark bpool/boot@snap-1 bpool/boot#bookmark", # Activate the bookmarks feature + "zpool checkpoint bpool", # Activate the zpool_checkpoint feature + "mkdir -p /mnt/boot", + "mount -t zfs bpool/boot /mnt/boot", + "touch /mnt/boot/empty", # Activate zilsaxattr feature + "dd if=/dev/urandom of=/mnt/boot/test bs=1M count=1", # Activate the large_blocks feature + + # Print out all enabled and active ZFS features (and some other stuff) + "sync /mnt/boot", + "zpool get all bpool >&2", + + # Abort early if GRUB2 doesn't like the disks + "grub-probe --target=device /mnt/boot >&2", + ) + ''; + + # umount & export bpool before shutdown + # this is a fix for "cannot import 'bpool': pool was previously in use from another system." + postInstallCommands = '' + machine.succeed("umount /mnt/boot") + machine.succeed("zpool export bpool") + ''; + }; + # zfs on / with swap zfsroot = makeInstallerTest "zfs-root" { extraInstallerConfig = { @@ -897,7 +969,7 @@ in { createPartitions = '' machine.succeed( "flock /dev/vda parted --script /dev/vda -- mklabel msdos" - + " mkpart primary 1M 100MB" # bpool + + " mkpart primary 1M 100MB" # /boot + " mkpart primary linux-swap 100M 1024M" + " mkpart primary 1024M -1s", # rpool "udevadm settle", @@ -909,20 +981,12 @@ in { "zfs create -o mountpoint=legacy rpool/root/usr", "mkdir /mnt/usr", "mount -t zfs rpool/root/usr /mnt/usr", - "zpool create -o compatibility=grub2 bpool /dev/vda1", - "zfs create -o mountpoint=legacy bpool/boot", + "mkfs.vfat -n BOOT /dev/vda1", "mkdir /mnt/boot", - "mount -t zfs bpool/boot /mnt/boot", + "mount LABEL=BOOT /mnt/boot", "udevadm settle", ) ''; - - # umount & export bpool before shutdown - # this is a fix for "cannot import 'bpool': pool was previously in use from another system." - postInstallCommands = '' - machine.succeed("umount /mnt/boot") - machine.succeed("zpool export bpool") - ''; }; # Create two physical LVM partitions combined into one volume group diff --git a/nixos/tests/zfs.nix b/nixos/tests/zfs.nix index ad4ea254f34d..bf81d66fc877 100644 --- a/nixos/tests/zfs.nix +++ b/nixos/tests/zfs.nix @@ -210,6 +210,7 @@ in { enableSystemdStage1 = true; }; + installerBoot = (import ./installer.nix { }).separateBootZfs; installer = (import ./installer.nix { }).zfsroot; expand-partitions = makeTest { From c4cf8445669782d32fde1e6cd1cd0d51b2f81fb0 Mon Sep 17 00:00:00 2001 From: Luflosi Date: Fri, 8 Dec 2023 18:27:39 +0100 Subject: [PATCH 002/168] nixos/tests/ft2-clone: cleanup - Remove unused `config` argument - Don't enable the xserver again, since the import `./common/x11.nix` already takes care of that - Remove an empty line at the end --- nixos/tests/ft2-clone.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/nixos/tests/ft2-clone.nix b/nixos/tests/ft2-clone.nix index a8395d4ebaa6..5476b38c00bd 100644 --- a/nixos/tests/ft2-clone.nix +++ b/nixos/tests/ft2-clone.nix @@ -4,12 +4,11 @@ import ./make-test-python.nix ({ pkgs, ... }: { maintainers = [ fgaz ]; }; - nodes.machine = { config, pkgs, ... }: { + nodes.machine = { pkgs, ... }: { imports = [ ./common/x11.nix ]; - services.xserver.enable = true; sound.enable = true; environment.systemPackages = [ pkgs.ft2-clone ]; }; @@ -30,4 +29,3 @@ import ./make-test-python.nix ({ pkgs, ... }: { machine.screenshot("screen") ''; }) - From c57a4037f5d2a27de8ef9fde4006df7828a21d90 Mon Sep 17 00:00:00 2001 From: Jonathan Davies Date: Sun, 10 Dec 2023 23:55:15 +0000 Subject: [PATCH 003/168] nixos/thanos: Changed query.replica-labels to a list parameter. Fixes: #273432 --- nixos/modules/services/monitoring/thanos.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/nixos/modules/services/monitoring/thanos.nix b/nixos/modules/services/monitoring/thanos.nix index 5baa0d8446e5..02502816ef5d 100644 --- a/nixos/modules/services/monitoring/thanos.nix +++ b/nixos/modules/services/monitoring/thanos.nix @@ -394,9 +394,8 @@ let Maximum number of queries processed concurrently by query node. ''; - query.replica-labels = mkAttrsParam "query.replica-label" '' + query.replica-labels = mkListParam "query.replica-label" '' Labels to treat as a replica indicator along which data is - deduplicated. Still you will be able to query without deduplication using From 13c8727ad89482fb0d0bf02eb43e00c19dc6aa96 Mon Sep 17 00:00:00 2001 From: Luflosi Date: Tue, 12 Dec 2023 11:54:24 +0100 Subject: [PATCH 004/168] raspberrypi-eeprom: migrate to by-name --- .../default.nix => by-name/ra/raspberrypi-eeprom/package.nix} | 1 + pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 1 insertion(+), 2 deletions(-) rename pkgs/{os-specific/linux/raspberrypi-eeprom/default.nix => by-name/ra/raspberrypi-eeprom/package.nix} (98%) diff --git a/pkgs/os-specific/linux/raspberrypi-eeprom/default.nix b/pkgs/by-name/ra/raspberrypi-eeprom/package.nix similarity index 98% rename from pkgs/os-specific/linux/raspberrypi-eeprom/default.nix rename to pkgs/by-name/ra/raspberrypi-eeprom/package.nix index 6cc93b8dd3c6..1cac9e400627 100644 --- a/pkgs/os-specific/linux/raspberrypi-eeprom/default.nix +++ b/pkgs/by-name/ra/raspberrypi-eeprom/package.nix @@ -58,5 +58,6 @@ stdenvNoCC.mkDerivation rec { homepage = "https://www.raspberrypi.com/documentation/computers/raspberry-pi.html#raspberry-pi-4-boot-eeprom"; license = with licenses; [ bsd3 unfreeRedistributableFirmware ]; maintainers = with maintainers; [ das_j Luflosi ]; + platforms = platforms.linux; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 567e92887a1d..32a49204031f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -28655,8 +28655,6 @@ with pkgs; raspberrypifw = callPackage ../os-specific/linux/firmware/raspberrypi { }; raspberrypiWirelessFirmware = callPackage ../os-specific/linux/firmware/raspberrypi-wireless { }; - raspberrypi-eeprom = callPackage ../os-specific/linux/raspberrypi-eeprom { }; - raspberrypi-armstubs = callPackage ../os-specific/linux/firmware/raspberrypi/armstubs.nix { }; reap = callPackage ../os-specific/linux/reap { }; From 7e8102be932defe23e6fde641bbd93729c667f83 Mon Sep 17 00:00:00 2001 From: Luflosi Date: Tue, 12 Dec 2023 15:46:05 +0100 Subject: [PATCH 005/168] raspberrypi-eeprom: cleanup - Move each function argument into its own line for better git diffs in the future - Use `finalAttrs` instead of `rec` --- .../by-name/ra/raspberrypi-eeprom/package.nix | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/ra/raspberrypi-eeprom/package.nix b/pkgs/by-name/ra/raspberrypi-eeprom/package.nix index 1cac9e400627..b8f14c5f8a6a 100644 --- a/pkgs/by-name/ra/raspberrypi-eeprom/package.nix +++ b/pkgs/by-name/ra/raspberrypi-eeprom/package.nix @@ -1,14 +1,23 @@ -{ stdenvNoCC, lib, fetchFromGitHub, makeWrapper -, python3, binutils-unwrapped, findutils, gawk, kmod, pciutils, libraspberrypi +{ stdenvNoCC +, lib +, fetchFromGitHub +, makeWrapper +, python3 +, binutils-unwrapped +, findutils +, gawk +, kmod +, pciutils +, libraspberrypi }: -stdenvNoCC.mkDerivation rec { +stdenvNoCC.mkDerivation (finalAttrs: { pname = "raspberrypi-eeprom"; version = "2023.10.30-2712"; src = fetchFromGitHub { owner = "raspberrypi"; repo = "rpi-eeprom"; - rev = "refs/tags/v${version}"; + rev = "refs/tags/v${finalAttrs.version}"; hash = "sha256-TKvby0qIXidM5Qk7q+ovLk0DpHsCbdQe7xndrgKrSXk="; }; @@ -60,4 +69,4 @@ stdenvNoCC.mkDerivation rec { maintainers = with maintainers; [ das_j Luflosi ]; platforms = platforms.linux; }; -} +}) From 9845925e52bbace8658f39e5fb692960224b11b7 Mon Sep 17 00:00:00 2001 From: Luflosi Date: Tue, 12 Dec 2023 11:52:32 +0100 Subject: [PATCH 006/168] raspberrypi-eeprom: 2023.10.30-2712 -> 2023.12.06-2712 https://github.com/raspberrypi/rpi-eeprom/releases/tag/v2023.12.06-2712 --- pkgs/by-name/ra/raspberrypi-eeprom/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ra/raspberrypi-eeprom/package.nix b/pkgs/by-name/ra/raspberrypi-eeprom/package.nix index b8f14c5f8a6a..796010d687ce 100644 --- a/pkgs/by-name/ra/raspberrypi-eeprom/package.nix +++ b/pkgs/by-name/ra/raspberrypi-eeprom/package.nix @@ -12,13 +12,13 @@ }: stdenvNoCC.mkDerivation (finalAttrs: { pname = "raspberrypi-eeprom"; - version = "2023.10.30-2712"; + version = "2023.12.06-2712"; src = fetchFromGitHub { owner = "raspberrypi"; repo = "rpi-eeprom"; rev = "refs/tags/v${finalAttrs.version}"; - hash = "sha256-TKvby0qIXidM5Qk7q+ovLk0DpHsCbdQe7xndrgKrSXk="; + hash = "sha256-bX+WSWj8Lk0S9GgauJsqElur+AAp5JB8LMEstB6aRGo="; }; buildInputs = [ python3 ]; From 21c2941cf4704ee94d34db142e9cf21a63ace406 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 17 Dec 2023 00:28:18 +0000 Subject: [PATCH 007/168] mockoon: 5.1.0 -> 6.0.1 --- pkgs/tools/networking/mockoon/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/mockoon/default.nix b/pkgs/tools/networking/mockoon/default.nix index 63e4e3c28030..2fbcffe5b09b 100644 --- a/pkgs/tools/networking/mockoon/default.nix +++ b/pkgs/tools/networking/mockoon/default.nix @@ -5,11 +5,11 @@ let pname = "mockoon"; - version = "5.1.0"; + version = "6.0.1"; src = fetchurl { url = "https://github.com/mockoon/mockoon/releases/download/v${version}/mockoon-${version}.AppImage"; - hash = "sha256-FF2F16ulKerNnwgumaz2Theff7pRN4Up3FooCNW8kbg="; + hash = "sha256-aV+jM/XxXbjkStSZE4x8qtrtYX/yKbye4WjO9PiaNQ4="; }; appimageContents = appimageTools.extractType2 { From d6a94adfc57e15c416846ec6e8367fc2c669c5ee Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 17 Dec 2023 03:05:26 +0000 Subject: [PATCH 008/168] mox: 0.0.7 -> 0.0.8 --- pkgs/servers/mail/mox/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/mail/mox/default.nix b/pkgs/servers/mail/mox/default.nix index 17d34d368f6d..22f95c436375 100644 --- a/pkgs/servers/mail/mox/default.nix +++ b/pkgs/servers/mail/mox/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "mox"; - version = "0.0.7"; + version = "0.0.8"; src = fetchFromGitHub { owner = "mjl-"; repo = "mox"; rev = "v${version}"; - hash = "sha256-zFPgMVQQUnEKIgt35KxcRUxuBNSmTM8ZfAZvP22iKgg="; + hash = "sha256-mr07nn0fy19j/Yv46Rxzt2qlqDHfnSkt3bjQvMQ7zsE="; }; # set the version during buildtime From b1364d161db96a194afa651d0030cf6aae0d9b24 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 17 Dec 2023 13:32:03 +0000 Subject: [PATCH 009/168] package-project-cmake: 1.11.0 -> 1.11.1 --- pkgs/development/tools/package-project-cmake/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/package-project-cmake/default.nix b/pkgs/development/tools/package-project-cmake/default.nix index af22ce40a062..fa40335a1801 100644 --- a/pkgs/development/tools/package-project-cmake/default.nix +++ b/pkgs/development/tools/package-project-cmake/default.nix @@ -5,13 +5,13 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "package-project-cmake"; - version = "1.11.0"; + version = "1.11.1"; src = fetchFromGitHub { owner = "TheLartians"; repo = "PackageProject.cmake"; rev = "v${finalAttrs.version}"; - hash = "sha256-41cJm6eO5Q6xhARJbshi6Tesk/IxEQNsMShmDcjVqzs="; + hash = "sha256-E7WZSYDlss5bidbiWL1uX41Oh6JxBRtfhYsFU19kzIw="; }; dontConfigure = true; From 2148d30045143b245cf1378c13f99f1006982874 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 18 Dec 2023 20:46:45 +0000 Subject: [PATCH 010/168] python310Packages.django-filter: 23.4 -> 23.5 --- pkgs/development/python-modules/django-filter/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/django-filter/default.nix b/pkgs/development/python-modules/django-filter/default.nix index 9cfb6493e577..8f91712ba0b7 100644 --- a/pkgs/development/python-modules/django-filter/default.nix +++ b/pkgs/development/python-modules/django-filter/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "django-filter"; - version = "23.4"; + version = "23.5"; format = "pyproject"; src = fetchPypi { inherit pname version; - hash = "sha256-vtBws4NZ3OfS2+BXsWXVl3MFeYY1bLgJ3tmDs2x3qXY="; + hash = "sha256-Z1g6pDuR/oxJ90qDLZX02EQr5ij9TG1l6fgR9RU6Tlw="; }; nativeBuildInputs = [ flit-core ]; From 29cf4af1d58e2fb38840f60d51b930bea7a82cf6 Mon Sep 17 00:00:00 2001 From: Yifei Sun Date: Sun, 17 Dec 2023 14:02:26 -0500 Subject: [PATCH 011/168] spacedrive: add darwin Co-authored-by: Mikael Fangel <34864484+MikaelFangel@users.noreply.github.com> --- pkgs/by-name/sp/spacedrive/package.nix | 88 ++++++++++++++++++-------- 1 file changed, 63 insertions(+), 25 deletions(-) diff --git a/pkgs/by-name/sp/spacedrive/package.nix b/pkgs/by-name/sp/spacedrive/package.nix index 362b02043af7..bf281e372709 100644 --- a/pkgs/by-name/sp/spacedrive/package.nix +++ b/pkgs/by-name/sp/spacedrive/package.nix @@ -1,39 +1,77 @@ -{ lib, appimageTools, fetchurl, pkgs }: +{ lib +, pkgs +, stdenv +, fetchurl +, appimageTools +, undmg +, nix-update-script +}: let pname = "spacedrive"; version = "0.1.4"; src = fetchurl { - url = "https://github.com/spacedriveapp/spacedrive/releases/download/${version}/Spacedrive-linux-x86_64.AppImage"; - hash = "sha256-iBdW8iPuvztP0L5xLyVs7/K8yFe7kD7QwdTuKJLhB+c="; + aarch64-darwin = { + url = "https://github.com/spacedriveapp/spacedrive/releases/download/${version}/Spacedrive-darwin-aarch64.dmg"; + hash = "sha256-gKboB5W0vW6ssZHRRivqbVPE0d0FCUdiNCsP0rKKtNo="; + }; + x86_64-darwin = { + url = "https://github.com/spacedriveapp/spacedrive/releases/download/${version}/Spacedrive-darwin-x86_64.dmg"; + hash = "sha256-KD1hw6aDyqCsXLYM8WrOTI2AfFx7t++UWV7SaCmtypI="; + }; + x86_64-linux = { + url = "https://github.com/spacedriveapp/spacedrive/releases/download/${version}/Spacedrive-linux-x86_64.AppImage"; + hash = "sha256-iBdW8iPuvztP0L5xLyVs7/K8yFe7kD7QwdTuKJLhB+c="; + }; + }.${stdenv.system} or (throw "${pname}-${version}: ${stdenv.system} is unsupported."); + + meta = { + description = "An open source file manager, powered by a virtual distributed filesystem"; + homepage = "https://www.spacedrive.com"; + changelog = "https://github.com/spacedriveapp/spacedrive/releases/tag/${version}"; + platforms = [ "aarch64-darwin" "x86_64-darwin" "x86_64-linux" ]; + license = lib.licenses.agpl3Plus; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; + maintainers = with lib.maintainers; [ heisfer mikaelfangel stepbrobd ]; + mainProgram = "spacedrive"; }; - appimageContents = appimageTools.extractType2 { inherit pname version src; }; -in appimageTools.wrapType2 { - inherit pname version src; + passthru.updateScript = nix-update-script { }; +in +if stdenv.isDarwin then stdenv.mkDerivation +{ + inherit pname version src meta passthru; + + sourceRoot = "Spacedrive.app"; + + nativeBuildInputs = [ undmg ]; + + installPhase = '' + mkdir -p "$out/Applications/Spacedrive.app" + cp -r . "$out/Applications/Spacedrive.app" + mkdir -p "$out/bin" + ln -s "$out/Applications/Spacedrive.app/Contents/MacOS/Spacedrive" "$out/bin/spacedrive" + ''; +} +else appimageTools.wrapType2 { + inherit pname version src meta passthru; extraPkgs = pkgs: (appimageTools.defaultFhsEnvArgs.multiPkgs pkgs) ++ [ pkgs.libthai ]; - extraInstallCommands = '' - # Remove version from entrypoint - mv $out/bin/spacedrive-"${version}" $out/bin/spacedrive + extraInstallCommands = + let + appimageContents = appimageTools.extractType2 { inherit pname version src; }; + in + '' + # Remove version from entrypoint + mv $out/bin/spacedrive-"${version}" $out/bin/spacedrive - # Install .desktop files - install -Dm444 ${appimageContents}/spacedrive.desktop -t $out/share/applications - install -Dm444 ${appimageContents}/spacedrive.png -t $out/share/pixmaps - substituteInPlace $out/share/applications/spacedrive.desktop \ - --replace 'Exec=AppRun --no-sandbox %U' 'Exec=spacedrive' - ''; - - meta = with lib; { - description = "An open source file manager, powered by a virtual distributed filesystem"; - homepage = "https://www.spacedrive.com/"; - platforms = [ "x86_64-linux" ]; - license = licenses.agpl3Plus; - sourceProvenance = with sourceTypes; [ binaryNativeCode ]; - maintainers = with maintainers; [ mikaelfangel heisfer ]; - mainProgram = "spacedrive"; - }; + # Install .desktop files + install -Dm444 ${appimageContents}/spacedrive.desktop -t $out/share/applications + install -Dm444 ${appimageContents}/spacedrive.png -t $out/share/pixmaps + substituteInPlace $out/share/applications/spacedrive.desktop \ + --replace 'Exec=AppRun --no-sandbox %U' 'Exec=spacedrive' + ''; } From f61302d5e3ff08eee47e595c5996ef61aac7b203 Mon Sep 17 00:00:00 2001 From: noisersup Date: Mon, 18 Dec 2023 23:16:11 +0100 Subject: [PATCH 012/168] ferretdb: 1.16.0 -> 1.17.0 --- pkgs/servers/nosql/ferretdb/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/nosql/ferretdb/default.nix b/pkgs/servers/nosql/ferretdb/default.nix index c241ec987d6d..0f1e84d0c90c 100644 --- a/pkgs/servers/nosql/ferretdb/default.nix +++ b/pkgs/servers/nosql/ferretdb/default.nix @@ -6,13 +6,13 @@ buildGo121Module rec { pname = "ferretdb"; - version = "1.16.0"; + version = "1.17.0"; src = fetchFromGitHub { owner = "FerretDB"; repo = "FerretDB"; rev = "v${version}"; - hash = "sha256-Oh8VHWsV7jD2HgG2IVDV2krTBSCz4dyCENej1m6xnM4="; + hash = "sha256-GHUIr43rcA+H9FLQrrnTKLggyujGE0Is0VisLkL/EQI="; }; postPatch = '' @@ -20,7 +20,7 @@ buildGo121Module rec { echo nixpkgs > build/version/package.txt ''; - vendorHash = "sha256-iDPZ3DG/aWOHz61gVd56KhB7/RvsWOS+gfzk6Rx5c4o="; + vendorHash = "sha256-Mgc+TpK7XnRCT/CLDyW7fIs6jB2LbYlTceiytErIj+U="; CGO_ENABLED = 0; From e8130ad55e361930e1d1d349f4f7db10307a5496 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Tue, 19 Dec 2023 06:26:45 +0100 Subject: [PATCH 013/168] ferretdb: buildGo121Module -> buildGoModule --- pkgs/servers/nosql/ferretdb/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/nosql/ferretdb/default.nix b/pkgs/servers/nosql/ferretdb/default.nix index 0f1e84d0c90c..b1f4584161e7 100644 --- a/pkgs/servers/nosql/ferretdb/default.nix +++ b/pkgs/servers/nosql/ferretdb/default.nix @@ -1,10 +1,10 @@ { lib -, buildGo121Module +, buildGoModule , fetchFromGitHub , nixosTests }: -buildGo121Module rec { +buildGoModule rec { pname = "ferretdb"; version = "1.17.0"; From 1e211406222fb92f1c7ffeee5cd98b03bf8fd660 Mon Sep 17 00:00:00 2001 From: Aaron Jheng Date: Thu, 21 Dec 2023 15:30:16 +0000 Subject: [PATCH 014/168] ssb: remove --- pkgs/tools/security/ssb/default.nix | 26 -------------------------- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 -- 3 files changed, 1 insertion(+), 28 deletions(-) delete mode 100644 pkgs/tools/security/ssb/default.nix diff --git a/pkgs/tools/security/ssb/default.nix b/pkgs/tools/security/ssb/default.nix deleted file mode 100644 index 725f72e6c7cf..000000000000 --- a/pkgs/tools/security/ssb/default.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ lib -, buildGoModule -, fetchFromGitHub -}: - -buildGoModule rec { - pname = "ssb"; - version = "0.1.1"; - - src = fetchFromGitHub { - owner = "kitabisa"; - repo = pname; - rev = "v${version}"; - sha256 = "0dkd02l30461cwn5hsssnjyb9s8ww179wll3l7z5hy1hv3x6h9g1"; - }; - - vendorHash = null; - - meta = with lib; { - description = "Tool to bruteforce SSH server"; - homepage = "https://github.com/kitabisa/ssb"; - license = with licenses; [ asl20 ]; - maintainers = with maintainers; [ fab ]; - broken = true; # vendor isn't reproducible with go > 1.17: nix-build -A $name.goModules --check - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 8fa94e82377a..b8ca173627c1 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -918,6 +918,7 @@ mapAliases ({ spotify-unwrapped = spotify; # added 2022-11-06 spring-boot = spring-boot-cli; # added 2020-04-24 squid4 = throw "'squid4' has been renamed to/replaced by 'squid'"; # Converted to throw 2023-09-10 + ssb = throw "'ssb' has been removed, as it was broken and unmaintained"; # Added 2023-12-21 ssm-agent = amazon-ssm-agent; # Added 2023-10-17 starboard-octant-plugin = throw "starboard-octant-plugin has been dropped due to needing octant which is archived"; # Added 2023-09-29 steam-run-native = steam-run; # added 2022-02-21 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 60b5802a02a5..a46152dce7c6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13590,8 +13590,6 @@ with pkgs; svu = callPackage ../tools/misc/svu { }; - ssb = callPackage ../tools/security/ssb { }; - ssb-patchwork = callPackage ../applications/networking/ssb-patchwork { }; ssdeep = callPackage ../tools/security/ssdeep { }; From 920f39c1c0fe7bf2df63bd8a1477c8d97ed36e84 Mon Sep 17 00:00:00 2001 From: Julius Marozas Date: Fri, 22 Dec 2023 03:50:37 +0100 Subject: [PATCH 015/168] lenovo-legion: fix desktop icons --- pkgs/os-specific/linux/lenovo-legion/app.nix | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/pkgs/os-specific/linux/lenovo-legion/app.nix b/pkgs/os-specific/linux/lenovo-legion/app.nix index a409ad2fbf4d..6d6c604b1c05 100644 --- a/pkgs/os-specific/linux/lenovo-legion/app.nix +++ b/pkgs/os-specific/linux/lenovo-legion/app.nix @@ -7,8 +7,8 @@ python3.pkgs.buildPythonApplication rec { src = fetchFromGitHub { owner = "johnfanv2"; repo = "LenovoLegionLinux"; - rev = "v${version}-prerelese"; - hash = "sha256-P4vqzNX2nF4LnoQDOV8WEiXAICQCyjj9xPpFNvMu93k="; + rev = "v${version}-prerelease"; + hash = "sha256-PQdxfDfW3sn0wWjmsPoAt3HZ43PS3Tyez3/0KEVVZQg="; }; sourceRoot = "${src.name}/python/legion_linux"; @@ -31,10 +31,8 @@ python3.pkgs.buildPythonApplication rec { --replace "FOLDER=/etc/legion_linux/" "FOLDER=$out/share/legion_linux" substituteInPlace ./legion_linux/legion.py \ --replace "/etc/legion_linux" "$out/share/legion_linux" - ''; - - postInstall = '' - cp ./legion_linux/legion_logo.png $out/${python3.sitePackages}/legion_logo.png + substituteInPlace ./legion_linux/legion_gui{,_user}.desktop \ + --replace "Icon=/usr/share/pixmaps/legion_logo.png" "Icon=legion_logo" ''; dontWrapQtApps = true; From 317effb80eace2d0192ca7637dfbda92bef2acb5 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 22 Dec 2023 12:12:56 +0000 Subject: [PATCH 016/168] python310Packages.scmrepo: 1.5.0 -> 2.0.2 --- pkgs/development/python-modules/scmrepo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/scmrepo/default.nix b/pkgs/development/python-modules/scmrepo/default.nix index 36e69d778db8..6e10bb5a1882 100644 --- a/pkgs/development/python-modules/scmrepo/default.nix +++ b/pkgs/development/python-modules/scmrepo/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "scmrepo"; - version = "1.5.0"; + version = "2.0.2"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "iterative"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-eEK2U1gTw3PP7kt2lNjiEs8yZX9Cmty0LIgZqg7FsJc="; + hash = "sha256-qY8puMt6ogMjx2QmAhPjCkimKp4Zfghur//MXRhsfFg="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; From 03de4ec04597fd47ddbb61962359bcef82b452a4 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 22 Dec 2023 16:30:37 +0000 Subject: [PATCH 017/168] python310Packages.sqltrie: 0.9.0 -> 0.11.0 --- pkgs/development/python-modules/sqltrie/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/sqltrie/default.nix b/pkgs/development/python-modules/sqltrie/default.nix index 09eac58bae7c..65470114c14f 100644 --- a/pkgs/development/python-modules/sqltrie/default.nix +++ b/pkgs/development/python-modules/sqltrie/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "sqltrie"; - version = "0.9.0"; + version = "0.11.0"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "iterative"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-4+jj9kRT6AR8u9nIlEkILY+/GQ7EBRd5V2oLeMLSo3o="; + hash = "sha256-QR5IlMHrDNsauKW3VQG0ibMUwetATuwX4fszGPzKuxg="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; From e5f58901b0e058c9f019798486c9f357daedaa3b Mon Sep 17 00:00:00 2001 From: MayNiklas Date: Fri, 22 Dec 2023 21:31:06 +0100 Subject: [PATCH 018/168] github-copilot-intellij-agent: 1.2.18.2908 -> 1.4.5.4049 --- .../tools/github-copilot-intellij-agent/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/github-copilot-intellij-agent/default.nix b/pkgs/development/tools/github-copilot-intellij-agent/default.nix index 128095d671cb..e6cf7744dd38 100644 --- a/pkgs/development/tools/github-copilot-intellij-agent/default.nix +++ b/pkgs/development/tools/github-copilot-intellij-agent/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { pname = "github-copilot-intellij-agent"; - version = "1.2.18.2908"; + version = "1.4.5.4049"; src = fetchurl { name = "${pname}-${version}-plugin.zip"; - url = "https://plugins.jetbrains.com/plugin/download?updateId=373346"; - hash = "sha256-ErSj4ckPSaEkOeGTRS27yFKDlj2iZfoPdjbZleSIL1s="; + url = "https://plugins.jetbrains.com/plugin/download?updateId=454005"; + hash = "sha256-ibu3OcmtyLHuumhJQ6QipsNEIdEhvLUS7sb3xmnaR0U="; }; nativeBuildInputs = [ unzip ]; From 7072750af58e1c6fd94c1466762f7db9a49cf1ed Mon Sep 17 00:00:00 2001 From: Marc Jakobi Date: Tue, 21 Nov 2023 22:19:58 +0100 Subject: [PATCH 019/168] overskride: init at 0.5.6 --- pkgs/by-name/ov/overskride/package.nix | 66 ++++++++++++++++++++++++++ 1 file changed, 66 insertions(+) create mode 100644 pkgs/by-name/ov/overskride/package.nix diff --git a/pkgs/by-name/ov/overskride/package.nix b/pkgs/by-name/ov/overskride/package.nix new file mode 100644 index 000000000000..9ca167dd37ea --- /dev/null +++ b/pkgs/by-name/ov/overskride/package.nix @@ -0,0 +1,66 @@ +{ lib, fetchFromGitHub, rustPlatform, cargo, rustc, meson, ninja +, pkg-config, wrapGAppsHook4, desktop-file-utils, appstream-glib +, blueprint-compiler, dbus, gtk4, libadwaita, bluez, libpulseaudio }: let + +owner = "kaii-lb"; +name = "overskride"; +version = "0.5.6"; + +in rustPlatform.buildRustPackage { + + pname = name; + inherit version; + + src = fetchFromGitHub { + inherit owner; + repo = name; + rev = "v${version}"; + hash = "sha256-syQzHHT0s15oj8Yl2vhgyXlPI8UxOqIXGDqFeUc/dJQ="; + }; + + cargoHash = "sha256-NEsqVfKZqXSLieRO0BvQGdggmXXYO15qVhbfgAFATPc="; + + nativeBuildInputs = [ + pkg-config + wrapGAppsHook4 + desktop-file-utils + appstream-glib + blueprint-compiler + meson + ninja + cargo + rustc + ]; + + buildInputs = [ dbus gtk4 libadwaita bluez libpulseaudio ]; + + buildPhase = '' + runHook preBuild + + meson setup build --prefix $out && cd build + meson compile && meson devenv + + runHook postBuild + ''; + + # The "Validate appstream file" test fails. + # TODO: This appears to have been fixed upstream + # so checks should be enabled with the next version. + doCheck = false; + + preFixup = '' + glib-compile-schemas $out/share/gsettings-schemas/${name}-${version}/glib-2.0/schemas + ''; + + meta = with lib; { + description = + "A Bluetooth and Obex client that is straight to the point, DE/WM agnostic, and beautiful"; + homepage = "https://github.com/${owner}/${name}"; + changelog = "https://github.com/${owner}/${name}/blob/v${version}/CHANGELOG.md"; + license = licenses.gpl3Only; + mainProgram = name; + maintainers = with maintainers; [ mrcjkb ]; + platforms = platforms.linux; + }; + +} From 062e035cc02350b74746fca85d686f828f0d2731 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 23 Dec 2023 05:56:40 +0000 Subject: [PATCH 020/168] rqlite: 7.6.1 -> 8.13.2 --- pkgs/servers/sql/rqlite/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/sql/rqlite/default.nix b/pkgs/servers/sql/rqlite/default.nix index 0eff264210a8..f3d966ed1702 100644 --- a/pkgs/servers/sql/rqlite/default.nix +++ b/pkgs/servers/sql/rqlite/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "rqlite"; - version = "7.6.1"; + version = "8.13.2"; src = fetchFromGitHub { owner = "rqlite"; repo = pname; rev = "v${version}"; - sha256 = "sha256-WvEnMAz3dKG8xMlQzm7E0TmAgvsrRED50bb4Ved1+4U="; + sha256 = "sha256-YwwA9oqMJuHWaJ7zcSLJjbq3urIyUe6aZZS4kEeq7/8="; }; - vendorHash = "sha256-qirt5g7dcjAnceejrBnfhDpA4LSEj7eOuznSlfUBUgo="; + vendorHash = "sha256-qNI3SJdgaBi78Tvsd+RJ52vKZrbUQdEaEG/zTDKX0J4="; subPackages = [ "cmd/rqlite" "cmd/rqlited" "cmd/rqbench" ]; From 6fe2c0c911e9fe2df25a9f58506b6db28ca172bb Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 23 Dec 2023 06:13:10 +0000 Subject: [PATCH 021/168] rtx: 2023.12.18 -> 2023.12.35 --- pkgs/tools/misc/rtx/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/rtx/default.nix b/pkgs/tools/misc/rtx/default.nix index 80469864d361..038c08eabb42 100644 --- a/pkgs/tools/misc/rtx/default.nix +++ b/pkgs/tools/misc/rtx/default.nix @@ -15,16 +15,16 @@ rustPlatform.buildRustPackage rec { pname = "rtx"; - version = "2023.12.18"; + version = "2023.12.35"; src = fetchFromGitHub { owner = "jdx"; repo = "rtx"; rev = "v${version}"; - hash = "sha256-RjILdhH0Gg9VRvyVFukUrreYHnwtC+5MfXT+v4cT7/Y="; + hash = "sha256-vzMjC6qIPhZm80hzYQRpF3j+s85B0nwTcgSGRATQEIg="; }; - cargoHash = "sha256-1/Te4JfPDE0gbMysnQbF2SH/oMq+b3fyVgIHaQx1m5E="; + cargoHash = "sha256-LvW5xGVggzuXlFPhbrc93Dht3S9zaQyx9Nm+Mx/Mjh0="; nativeBuildInputs = [ installShellFiles pkg-config ]; buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ Security SystemConfiguration ]; From aceb671300ddb6dc7f9baf7ab9e4b1dd761a4da6 Mon Sep 17 00:00:00 2001 From: Harsh Shandilya Date: Sat, 23 Dec 2023 12:42:21 +0530 Subject: [PATCH 022/168] glfw: add missing substitutions in wayland-minecraft edition --- .../development/libraries/glfw/3.x-wayland-minecraft.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkgs/development/libraries/glfw/3.x-wayland-minecraft.nix b/pkgs/development/libraries/glfw/3.x-wayland-minecraft.nix index 38821c7d9630..03baa891b3b4 100644 --- a/pkgs/development/libraries/glfw/3.x-wayland-minecraft.nix +++ b/pkgs/development/libraries/glfw/3.x-wayland-minecraft.nix @@ -43,6 +43,15 @@ stdenv.mkDerivation { substituteInPlace src/wl_init.c \ --replace "libdecor-0.so.0" "${lib.getLib libdecor}/lib/libdecor-0.so.0" + + substituteInPlace src/wl_init.c \ + --replace "libwayland-client.so.0" "${lib.getLib wayland}/lib/libwayland-client.so.0" + + substituteInPlace src/wl_init.c \ + --replace "libwayland-cursor.so.0" "${lib.getLib wayland}/lib/libwayland-cursor.so.0" + + substituteInPlace src/wl_init.c \ + --replace "libwayland-egl.so.1" "${lib.getLib wayland}/lib/libwayland-egl.so.1" ''; meta = with lib; { From 9f62a2c0a0a79a896f3ba92581c05eb69418a9e7 Mon Sep 17 00:00:00 2001 From: superherointj <5861043+superherointj@users.noreply.github.com> Date: Sat, 23 Dec 2023 11:12:23 -0300 Subject: [PATCH 023/168] fluxcd: 2.2.1 -> 2.2.2 Release: https://github.com/fluxcd/flux2/releases/tag/v2.2.2 --- pkgs/applications/networking/cluster/fluxcd/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/networking/cluster/fluxcd/default.nix b/pkgs/applications/networking/cluster/fluxcd/default.nix index fbeeb73c7349..707fbbbd6372 100644 --- a/pkgs/applications/networking/cluster/fluxcd/default.nix +++ b/pkgs/applications/networking/cluster/fluxcd/default.nix @@ -7,9 +7,9 @@ }: let - version = "2.2.1"; - sha256 = "12zhg5j77jhn8v0c5mz6232bcx8dqn4dg32x89kqx8znkygd5a42"; - manifestsSha256 = "1hwcy64i6fg0qq0gzsxba6k7hak0ngqgi627680pk1daykfic7wv"; + version = "2.2.2"; + sha256 = "0d4sf1b0dddcarngr4dllhbbyjajpf1byv9cf7nx9040i80vk56p"; + manifestsSha256 = "1ixdzgaw3mrkwbazfbx0vc04z4rsyyyj5dsck15dv5kkvhi304lg"; manifests = fetchzip { url = @@ -29,7 +29,7 @@ in buildGoModule rec { inherit sha256; }; - vendorHash = "sha256-QElnhoWNp17SdRJJFZ+FpLS1NzGjIXaP0dYefzwBNkI="; + vendorHash = "sha256-jbhxSeLjgNmj2wCZao4DkQ57GvpYKlUyy7xdNKN1nWc="; postUnpack = '' cp -r ${manifests} source/cmd/flux/manifests From 2af0ee5b188844367714c4f62f1fef3bfabf06bf Mon Sep 17 00:00:00 2001 From: Bart Brouns Date: Sat, 23 Dec 2023 16:30:56 +0100 Subject: [PATCH 024/168] ardour: 8.1 -> 8.2 --- pkgs/applications/audio/ardour/default.nix | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/audio/ardour/default.nix b/pkgs/applications/audio/ardour/default.nix index 6b001ce85ae6..d6267aff3fef 100644 --- a/pkgs/applications/audio/ardour/default.nix +++ b/pkgs/applications/audio/ardour/default.nix @@ -64,14 +64,14 @@ }: stdenv.mkDerivation rec { pname = "ardour"; - version = "8.1"; + version = "8.2"; # We can't use `fetchFromGitea` here, as attempting to fetch release archives from git.ardour.org # result in an empty archive. See https://tracker.ardour.org/view.php?id=7328 for more info. src = fetchgit { url = "git://git.ardour.org/ardour/ardour.git"; rev = version; - hash = "sha256-T1o1E5+974dNUwEFW/Pw0RzbGifva2FdJPrCusWMk0E="; + hash = "sha256-Ito1gy7k7nzTN7Co/ddXYbAvobiZO0V0J5uymsm756k="; }; bundledContent = fetchzip { @@ -169,7 +169,12 @@ stdenv.mkDerivation rec { "--ptformat" "--run-tests" "--test" - "--use-external-libs" + # since we don't have https://github.com/agfline/LibAAF yet, + # we need to use some of ardours internal libs, see: + # https://discourse.ardour.org/t/ardour-8-2-released/109615/6 + # and + # https://discourse.ardour.org/t/ardour-8-2-released/109615/8 + # "--use-external-libs" ] ++ lib.optional optimize "--optimize"; postInstall = '' From 5037202b688515d76e7d1149983438c4652315de Mon Sep 17 00:00:00 2001 From: Niklas Sombert Date: Sat, 23 Dec 2023 17:00:09 +0100 Subject: [PATCH 025/168] ipxe: Build snp.efi by default --- pkgs/tools/misc/ipxe/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/tools/misc/ipxe/default.nix b/pkgs/tools/misc/ipxe/default.nix index bbb456eaaa8c..e31c6603e429 100644 --- a/pkgs/tools/misc/ipxe/default.nix +++ b/pkgs/tools/misc/ipxe/default.nix @@ -11,6 +11,7 @@ let "bin-x86_64-efi/ipxe.efi" = null; "bin-x86_64-efi/ipxe.efirom" = null; "bin-x86_64-efi/ipxe.usb" = "ipxe-efi.usb"; + "bin-x86_64-efi/snp.efi" = null; } // lib.optionalAttrs stdenv.hostPlatform.isx86 { "bin/ipxe.dsk" = null; "bin/ipxe.usb" = null; @@ -21,10 +22,12 @@ let "bin-arm32-efi/ipxe.efi" = null; "bin-arm32-efi/ipxe.efirom" = null; "bin-arm32-efi/ipxe.usb" = "ipxe-efi.usb"; + "bin-arm32-efi/snp.efi" = null; } // lib.optionalAttrs stdenv.isAarch64 { "bin-arm64-efi/ipxe.efi" = null; "bin-arm64-efi/ipxe.efirom" = null; "bin-arm64-efi/ipxe.usb" = "ipxe-efi.usb"; + "bin-arm64-efi/snp.efi" = null; }; in From b6574f430d022bb0226f88d3e97b0b9ad3734cb9 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 23 Dec 2023 21:21:34 +0100 Subject: [PATCH 026/168] python311Packages.aioskybell: 22.7.0 -> 23.12.0 Diff: https://github.com/tkdrob/aioskybell/compare/refs/tags/22.7.0...23.12.0 --- .../python-modules/aioskybell/default.nix | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/aioskybell/default.nix b/pkgs/development/python-modules/aioskybell/default.nix index 4fd3afe9de2c..2e5527850bf5 100644 --- a/pkgs/development/python-modules/aioskybell/default.nix +++ b/pkgs/development/python-modules/aioskybell/default.nix @@ -3,24 +3,27 @@ , aiohttp , aresponses , buildPythonPackage +, ciso8601 , fetchFromGitHub , pytest-asyncio +, pytest-freezegun , pytestCheckHook , pythonOlder +, setuptools }: buildPythonPackage rec { pname = "aioskybell"; - version = "22.7.0"; - format = "setuptools"; + version = "23.12.0"; + pyproject = true; disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "tkdrob"; - repo = pname; + repo = "aioskybell"; rev = "refs/tags/${version}"; - hash = "sha256-aBT1fDFtq1vasTvCnAXKV2vmZ6LBLZqRCiepv1HDJ+Q="; + hash = "sha256-5F0B5z0pJLKJPzKIowE07vEgmNXnDVEeGFbPGnJ6H9I="; }; postPatch = '' @@ -28,14 +31,20 @@ buildPythonPackage rec { --replace 'version="master",' 'version="${version}",' ''; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ aiohttp aiofiles + ciso8601 ]; nativeCheckInputs = [ aresponses pytest-asyncio + pytest-freezegun pytestCheckHook ]; From ff0f5bfb902c7a75caa159028d884232f428146f Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Sat, 14 Oct 2023 12:32:13 +0200 Subject: [PATCH 027/168] lomiri.history-service: init at 0.4 --- pkgs/desktops/lomiri/default.nix | 1 + ...0001-Drop-deprecated-qt5_use_modules.patch | 247 ++++++++++++++++++ .../services/history-service/default.nix | 180 +++++++++++++ .../history-service/update_schema.sh.in | 34 +++ 4 files changed, 462 insertions(+) create mode 100644 pkgs/desktops/lomiri/services/history-service/0001-Drop-deprecated-qt5_use_modules.patch create mode 100644 pkgs/desktops/lomiri/services/history-service/default.nix create mode 100644 pkgs/desktops/lomiri/services/history-service/update_schema.sh.in diff --git a/pkgs/desktops/lomiri/default.nix b/pkgs/desktops/lomiri/default.nix index a7c560e20579..70caa9d64420 100644 --- a/pkgs/desktops/lomiri/default.nix +++ b/pkgs/desktops/lomiri/default.nix @@ -32,6 +32,7 @@ let #### Services biometryd = callPackage ./services/biometryd { }; hfd-service = callPackage ./services/hfd-service { }; + history-service = callPackage ./services/history-service { }; lomiri-download-manager = callPackage ./services/lomiri-download-manager { }; lomiri-url-dispatcher = callPackage ./services/lomiri-url-dispatcher { }; mediascanner2 = callPackage ./services/mediascanner2 { }; diff --git a/pkgs/desktops/lomiri/services/history-service/0001-Drop-deprecated-qt5_use_modules.patch b/pkgs/desktops/lomiri/services/history-service/0001-Drop-deprecated-qt5_use_modules.patch new file mode 100644 index 000000000000..fee8093619b7 --- /dev/null +++ b/pkgs/desktops/lomiri/services/history-service/0001-Drop-deprecated-qt5_use_modules.patch @@ -0,0 +1,247 @@ +From 007e8cc4118869cab193d049db297bea3ee89269 Mon Sep 17 00:00:00 2001 +From: OPNA2608 +Date: Sun, 19 Feb 2023 22:39:14 +0100 +Subject: [PATCH] Drop deprecated qt5_use_modules + +Also seems broken on Nixpkgs, cannot pick up Qml (from qtdeclarative.dev). +--- + CMakeLists.txt | 1 + + Lomiri/History/CMakeLists.txt | 2 +- + cmake/modules/GenerateTest.cmake | 6 +++--- + daemon/CMakeLists.txt | 2 +- + plugins/sqlite/CMakeLists.txt | 2 +- + plugins/sqlite/schema/CMakeLists.txt | 2 +- + src/CMakeLists.txt | 2 +- + tests/Lomiri.History/CMakeLists.txt | 4 ++-- + tests/common/CMakeLists.txt | 4 ++-- + tests/common/mock/CMakeLists.txt | 2 +- + tests/libhistoryservice/CMakeLists.txt | 2 +- + tests/plugins/sqlite/CMakeLists.txt | 6 +++--- + tools/maketextevents/CMakeLists.txt | 2 +- + tools/makevoiceevents/CMakeLists.txt | 2 +- + tools/reader/CMakeLists.txt | 2 +- + 15 files changed, 21 insertions(+), 20 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index e61fea5..a8e6417 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -18,6 +18,7 @@ find_package(Qt5Qml) + find_package(Qt5Quick) + find_package(Qt5Test) + find_package(Qt5Network) ++find_package(Qt5Sql) + find_package(LibPhoneNumber REQUIRED) + + include(qt5) +diff --git a/Lomiri/History/CMakeLists.txt b/Lomiri/History/CMakeLists.txt +index eb5e18e..cf20761 100644 +--- a/Lomiri/History/CMakeLists.txt ++++ b/Lomiri/History/CMakeLists.txt +@@ -36,7 +36,7 @@ include_directories( + + add_library(history-qml MODULE ${plugin_SRCS} ${plugin_HDRS}) + +-qt5_use_modules(history-qml Contacts Core Qml Quick) ++target_link_libraries(history-qml Qt5::Contacts Qt5::Core Qt5::Qml Qt5::Quick) + + target_link_libraries(history-qml + historyservice +diff --git a/cmake/modules/GenerateTest.cmake b/cmake/modules/GenerateTest.cmake +index 6cec32e..24615d1 100644 +--- a/cmake/modules/GenerateTest.cmake ++++ b/cmake/modules/GenerateTest.cmake +@@ -46,7 +46,7 @@ function(generate_test TESTNAME) + endif () + + if (NOT DEFINED ARG_QT5_MODULES) +- set(ARG_QT5_MODULES Core Test) ++ set(ARG_QT5_MODULES Qt5::Core Qt5::Test) + endif () + + if (${ARG_USE_UI}) +@@ -72,7 +72,7 @@ function(generate_test TESTNAME) + + # No QML test, regular binary compiled test. + add_executable(${TESTNAME} ${ARG_SOURCES}) +- qt5_use_modules(${TESTNAME} ${ARG_QT5_MODULES}) ++ target_link_libraries(${TESTNAME} ${ARG_QT5_MODULES}) + + if (${ARG_USE_DBUS}) + execute_process(COMMAND mktemp -d OUTPUT_VARIABLE TMPDIR) +@@ -136,7 +136,7 @@ function(generate_telepathy_test TESTNAME) + endif(NOT DEFINED ARG_LIBRARIES) + + if (NOT DEFINED ARG_QT5_MODULES) +- set(ARG_QT5_MODULES Core DBus Test Qml) ++ set(ARG_QT5_MODULES Qt5::Core Qt5::DBus Qt5::Test Qt5::Qml) + endif (NOT DEFINED ARG_QT5_MODULES) + generate_test(${TESTNAME} ${ARGN} + TASKS ${TASKS} +diff --git a/daemon/CMakeLists.txt b/daemon/CMakeLists.txt +index d9493a1..791a362 100644 +--- a/daemon/CMakeLists.txt ++++ b/daemon/CMakeLists.txt +@@ -21,7 +21,7 @@ include_directories( + qt5_add_dbus_adaptor(daemon_SRCS HistoryService.xml historyservicedbus.h HistoryServiceDBus) + + add_executable(history-daemon ${daemon_SRCS} ${daemon_HDRS}) +-qt5_use_modules(history-daemon Core DBus) ++target_link_libraries(history-daemon Qt5::Core Qt5::DBus) + + target_link_libraries(history-daemon + ${TP_QT5_LIBRARIES} +diff --git a/plugins/sqlite/CMakeLists.txt b/plugins/sqlite/CMakeLists.txt +index 1a6fdfb..93bbe7a 100644 +--- a/plugins/sqlite/CMakeLists.txt ++++ b/plugins/sqlite/CMakeLists.txt +@@ -22,7 +22,7 @@ include_directories( + qt5_add_resources(plugin_RES sqlitehistoryplugin.qrc) + + add_library(sqlitehistoryplugin SHARED ${plugin_SRCS} ${plugin_HDRS} ${plugin_RES}) +-qt5_use_modules(sqlitehistoryplugin Core DBus Sql) ++target_link_libraries(sqlitehistoryplugin Qt5::Core Qt5::DBus Qt5::Sql) + + # update the .qrc file automatically when there are new schema files + file(GLOB QRC_RESOURCE_FILES ${CMAKE_CURRENT_SOURCE_DIR}/schema/*.sql ${CMAKE_CURRENT_SOURCE_DIR}/schema/*.info) +diff --git a/plugins/sqlite/schema/CMakeLists.txt b/plugins/sqlite/schema/CMakeLists.txt +index fc1530d..c35bfdf 100644 +--- a/plugins/sqlite/schema/CMakeLists.txt ++++ b/plugins/sqlite/schema/CMakeLists.txt +@@ -13,7 +13,7 @@ add_custom_command( + + include_directories(${CMAKE_CURRENT_SOURCE_DIR}/..) + add_executable(generate_schema generate_schema.cpp ${CMAKE_CURRENT_SOURCE_DIR}/../sqlitedatabase.cpp) +-qt5_use_modules(generate_schema Core DBus Sql) ++target_link_libraries(generate_schema Qt5::Core Qt5::DBus Qt5::Sql) + target_link_libraries(generate_schema historyservice ${SQLITE3_LIBRARIES}) + + add_custom_target(schema_update DEPENDS ${SCHEMA_FILE} ${VERSION_FILE}) +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index 7e8dd69..4fca2db 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -101,7 +101,7 @@ set_target_properties(historyservice PROPERTIES + VERSION ${HISTORY_VERSION_MAJOR}.${HISTORY_VERSION_MINOR}.${HISTORY_VERSION_PATCH}) + + target_link_libraries(historyservice ${LibPhoneNumber_LIBRARIES} ${TP_QT5_LIBRARIES}) +-qt5_use_modules(historyservice Contacts Core DBus) ++target_link_libraries(historyservice Qt5::Contacts Qt5::Core Qt5::DBus) + + install(TARGETS historyservice DESTINATION ${CMAKE_INSTALL_LIBDIR}) + +diff --git a/tests/Lomiri.History/CMakeLists.txt b/tests/Lomiri.History/CMakeLists.txt +index 615b772..7d3bd34 100644 +--- a/tests/Lomiri.History/CMakeLists.txt ++++ b/tests/Lomiri.History/CMakeLists.txt +@@ -41,7 +41,7 @@ set(HistoryGroupedThreadsModelTest_SOURCES + generate_test(HistoryGroupedThreadsModelTest + SOURCES ${HistoryGroupedThreadsModelTest_SOURCES} + LIBRARIES historyservice +- QT5_MODULES Core Qml Test ++ QT5_MODULES Qt5::Core Qt5::Qml Qt5::Test + USE_DBUS + USE_XVFB + TASKS --task ${CMAKE_BINARY_DIR}/daemon/history-daemon --ignore-return --task-name history-daemon +@@ -53,7 +53,7 @@ set(HistoryManagerTest_SOURCES + generate_test(HistoryManagerTest + SOURCES ${HistoryManagerTest_SOURCES} + LIBRARIES historyservice +- QT5_MODULES Core Qml Test ++ QT5_MODULES Qt5::Core Qt5::Qml Qt5::Test + USE_DBUS + USE_XVFB + TASKS --task ${CMAKE_BINARY_DIR}/daemon/history-daemon --ignore-return --task-name history-daemon +diff --git a/tests/common/CMakeLists.txt b/tests/common/CMakeLists.txt +index 0cc4bd9..cdf0203 100644 +--- a/tests/common/CMakeLists.txt ++++ b/tests/common/CMakeLists.txt +@@ -4,10 +4,10 @@ include_directories(${TP_QT5_INCLUDE_DIRS} + configure_file(dbus-session.conf.in ${CMAKE_CURRENT_BINARY_DIR}/dbus-session.conf) + + add_library(mockcontroller STATIC mockcontroller.cpp mockcontroller.h) +-qt5_use_modules(mockcontroller Core DBus) ++target_link_libraries(mockcontroller Qt5::Core Qt5::DBus) + + add_library(telepathytest STATIC telepathytest.cpp telepathytest.h) +-qt5_use_modules(telepathytest Core DBus) ++target_link_libraries(telepathytest Qt5::Core Qt5::DBus) + target_link_libraries(telepathytest ${TP_QT5_LIBRARIES}) + + add_subdirectory(mock) +diff --git a/tests/common/mock/CMakeLists.txt b/tests/common/mock/CMakeLists.txt +index acaf621..8e8b1b4 100644 +--- a/tests/common/mock/CMakeLists.txt ++++ b/tests/common/mock/CMakeLists.txt +@@ -15,5 +15,5 @@ set(mock_SRCS main.cpp protocol.cpp connection.cpp textchannel.cpp callchannel.c + qt5_add_dbus_adaptor(mock_SRCS MockConnection.xml mockconnectiondbus.h MockConnectionDBus) + + add_executable(telepathy-mock ${mock_SRCS}) +-qt5_use_modules(telepathy-mock Core DBus) ++target_link_libraries(telepathy-mock Qt5::Core Qt5::DBus) + target_link_libraries(telepathy-mock ${TP_QT5_LIBRARIES} ${TELEPATHY_QT5_SERVICE_LIBRARIES} ${OFONO_QT_LIBRARIES} ${PULSEAUDIO_LIBRARIES} ${Qt5Network_LIBRARIES}) +diff --git a/tests/libhistoryservice/CMakeLists.txt b/tests/libhistoryservice/CMakeLists.txt +index d96daa6..9f9a991 100644 +--- a/tests/libhistoryservice/CMakeLists.txt ++++ b/tests/libhistoryservice/CMakeLists.txt +@@ -40,4 +40,4 @@ generate_test(EventViewTest + # Telepathy-based tests + generate_telepathy_test(ContactMatcherTest + SOURCES ContactMatcherTest.cpp +- QT5_MODULES Core DBus Test Qml Contacts) ++ QT5_MODULES Qt5::Core Qt5::DBus Qt5::Test Qt5::Qml Qt5::Contacts) +diff --git a/tests/plugins/sqlite/CMakeLists.txt b/tests/plugins/sqlite/CMakeLists.txt +index f2bc520..c06f942 100644 +--- a/tests/plugins/sqlite/CMakeLists.txt ++++ b/tests/plugins/sqlite/CMakeLists.txt +@@ -4,6 +4,6 @@ include_directories( + ${CMAKE_CURRENT_BINARY_DIR} + ) + +-generate_test(SqlitePluginTest SOURCES SqlitePluginTest.cpp LIBRARIES historyservice sqlitehistoryplugin QT5_MODULES Core DBus Test Sql) +-generate_test(SqliteThreadViewTest SOURCES SqliteThreadViewTest.cpp LIBRARIES historyservice sqlitehistoryplugin QT5_MODULES Core DBus Test Sql) +-generate_test(SqliteEventViewTest SOURCES SqliteEventViewTest.cpp LIBRARIES historyservice sqlitehistoryplugin QT5_MODULES Core DBus Test Sql) ++generate_test(SqlitePluginTest SOURCES SqlitePluginTest.cpp LIBRARIES historyservice sqlitehistoryplugin QT5_MODULES Qt5::Core Qt5::DBus Qt5::Test Qt5::Sql) ++generate_test(SqliteThreadViewTest SOURCES SqliteThreadViewTest.cpp LIBRARIES historyservice sqlitehistoryplugin QT5_MODULES Qt5::Core Qt5::DBus Qt5::Test Qt5::Sql) ++generate_test(SqliteEventViewTest SOURCES SqliteEventViewTest.cpp LIBRARIES historyservice sqlitehistoryplugin QT5_MODULES Qt5::Core Qt5::DBus Qt5::Test Qt5::Sql) +diff --git a/tools/maketextevents/CMakeLists.txt b/tools/maketextevents/CMakeLists.txt +index e1d4e3e..c539bc5 100644 +--- a/tools/maketextevents/CMakeLists.txt ++++ b/tools/maketextevents/CMakeLists.txt +@@ -5,7 +5,7 @@ include_directories( + ) + + add_executable(history-maketextevents ${maketextevents_SRCS}) +-qt5_use_modules(history-maketextevents Core) ++target_link_libraries(history-maketextevents Qt5::Core) + + target_link_libraries(history-maketextevents historyservice) + install(TARGETS history-maketextevents RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) +diff --git a/tools/makevoiceevents/CMakeLists.txt b/tools/makevoiceevents/CMakeLists.txt +index a8358bd..d5f4c49 100644 +--- a/tools/makevoiceevents/CMakeLists.txt ++++ b/tools/makevoiceevents/CMakeLists.txt +@@ -5,7 +5,7 @@ include_directories( + ) + + add_executable(history-makevoiceevents ${makevoiceevents_SRCS}) +-qt5_use_modules(history-makevoiceevents Core) ++target_link_libraries(history-makevoiceevents Qt5::Core) + + target_link_libraries(history-makevoiceevents historyservice) + install(TARGETS history-makevoiceevents RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) +diff --git a/tools/reader/CMakeLists.txt b/tools/reader/CMakeLists.txt +index 220a7b6..00848bd 100644 +--- a/tools/reader/CMakeLists.txt ++++ b/tools/reader/CMakeLists.txt +@@ -5,6 +5,6 @@ include_directories( + ) + + add_executable(history-reader ${reader_SRCS}) +-qt5_use_modules(history-reader Core) ++target_link_libraries(history-reader Qt5::Core) + + target_link_libraries(history-reader historyservice) +-- +2.38.3 + diff --git a/pkgs/desktops/lomiri/services/history-service/default.nix b/pkgs/desktops/lomiri/services/history-service/default.nix new file mode 100644 index 000000000000..b15bd17058bc --- /dev/null +++ b/pkgs/desktops/lomiri/services/history-service/default.nix @@ -0,0 +1,180 @@ +{ stdenv +, lib +, fetchFromGitLab +, fetchpatch +, gitUpdater +, testers +, cmake +, dbus +, dbus-test-runner +, dconf +, gnome +, libphonenumber +, libqtdbustest +, lomiri-api +, pkg-config +, protobuf +, qtbase +, qtdeclarative +, qtpim +, sqlite +, telepathy +, telepathy-mission-control +, wrapQtAppsHook +, xvfb-run +}: + +let + replaceDbusService = pkg: name: "--replace \"\\\${DBUS_SERVICES_DIR}/${name}\" \"${pkg}/share/dbus-1/services/${name}\""; +in +stdenv.mkDerivation (finalAttrs: { + pname = "history-service"; + version = "0.4"; + + src = fetchFromGitLab { + owner = "ubports"; + repo = "development/core/history-service"; + rev = finalAttrs.version; + hash = "sha256-oCX+moGQewzstbpddEYYp1kQdO2mVXpWJITfvzDzQDI="; + }; + + outputs = [ + "out" + "dev" + ]; + + patches = [ + # Deprecation warnings with Qt5.15, allow disabling -Werror + # Remove when version > 0.4 + (fetchpatch { + url = "https://gitlab.com/ubports/development/core/history-service/-/commit/1370777952c6a2efb85f582ff8ba085c2c0e290a.patch"; + hash = "sha256-Z/dFrFo7WoPZlKto6wNGeWdopsi8iBjmd5ycbqMKgxo="; + }) + ./0001-Drop-deprecated-qt5_use_modules.patch + ]; + + postPatch = '' + # Upstream's way of generating their schema doesn't work for us, don't quite understand why. + # (gdb) bt + # #0 QSQLiteResult::prepare (this=0x4a4650, query=...) at qsql_sqlite.cpp:406 + # #1 0x00007ffff344bcf4 in QSQLiteResult::reset (this=0x4a4650, query=...) at qsql_sqlite.cpp:378 + # #2 0x00007ffff7f95f39 in QSqlQuery::exec (this=this@entry=0x7fffffffaad8, query=...) at kernel/qsqlquery.cpp:406 + # #3 0x00000000004084cb in SQLiteDatabase::dumpSchema (this=) at /build/source/plugins/sqlite/sqlitedatabase.cpp:148 + # #4 0x0000000000406d70 in main (argc=, argv=) + # at /build/source/plugins/sqlite/schema/generate_schema.cpp:56 + # (gdb) p lastError().driverText().toStdString() + # $17 = {_M_dataplus = {> = {> = {}, }, + # _M_p = 0x4880d0 "Unable to execute statement"}, _M_string_length = 27, { + # _M_local_buf = "\033\000\000\000\000\000\000\000+\344\371\367\377\177\000", _M_allocated_capacity = 27}} + # (gdb) p lastError().databaseText().toStdString() + # $18 = {_M_dataplus = {> = {> = {}, }, + # _M_p = 0x48c480 "no such column: rowid"}, _M_string_length = 21, { + # _M_local_buf = "\025\000\000\000\000\000\000\000A\344\371\367\377\177\000", _M_allocated_capacity = 21}} + # + # This makes the tests stall indefinitely and breaks history-service usage. + # This replacement script should hopefully achieve the same / a similar-enough result with just sqlite + cp ${./update_schema.sh.in} plugins/sqlite/schema/update_schema.sh.in + + # libphonenumber -> protobuf -> abseil-cpp demands C++14 + # But uses std::string_view which is C++17? + substituteInPlace CMakeLists.txt \ + --replace '-std=c++11' '-std=c++17' + + # Uses pkg_get_variable, cannot substitute prefix with that + substituteInPlace daemon/CMakeLists.txt \ + --replace 'DESTINATION ''${SYSTEMD_USER_UNIT_DIR}' 'DESTINATION "${placeholder "out"}/lib/systemd/user"' + + # Queries qmake for the QML installation path, which returns a reference to Qt5's build directory + substituteInPlace CMakeLists.txt \ + --replace "\''${QMAKE_EXECUTABLE} -query QT_INSTALL_QML" "echo $out/${qtbase.qtQmlPrefix}" + + # Bad path concatenation + substituteInPlace config.h.in \ + --replace '@CMAKE_INSTALL_PREFIX@/@HISTORY_PLUGIN_PATH@' '@HISTORY_PLUGIN_PATH@' + + '' + (if finalAttrs.doCheck then '' + # Tests launch these DBus services, fix paths related to them + + substituteInPlace tests/common/dbus-services/CMakeLists.txt \ + ${replaceDbusService telepathy-mission-control "org.freedesktop.Telepathy.MissionControl5.service"} \ + ${replaceDbusService telepathy-mission-control "org.freedesktop.Telepathy.AccountManager.service"} \ + ${replaceDbusService dconf "ca.desrt.dconf.service"} + + substituteInPlace cmake/modules/GenerateTest.cmake \ + --replace '/usr/lib/dconf' '${lib.getLib dconf}/libexec' \ + --replace '/usr/lib/telepathy' '${lib.getLib telepathy-mission-control}/libexec' + '' else '' + sed -i CMakeLists.txt -e '/add_subdirectory(tests)/d' + ''); + + strictDeps = true; + + nativeBuildInputs = [ + cmake + pkg-config + sqlite + wrapQtAppsHook + ]; + + buildInputs = [ + libphonenumber + protobuf + qtbase + qtdeclarative + qtpim + telepathy + ]; + + nativeCheckInputs = [ + dbus + dbus-test-runner + dconf + gnome.gnome-keyring + telepathy-mission-control + xvfb-run + ]; + + cmakeFlags = [ + # Many deprecation warnings with Qt 5.15 + "-DENABLE_WERROR=OFF" + ]; + + preBuild = '' + # SQLiteDatabase is used on host to generate SQL schemas + # Tests also need this to use SQLiteDatabase for verifying correct behaviour + export QT_PLUGIN_PATH=${lib.getBin qtbase}/${qtbase.qtPluginPrefix} + ''; + + doCheck = stdenv.buildPlatform.canExecute stdenv.hostPlatform; + + # Starts & talks to D-Bus services, breaks with parallelism + enableParallelChecking = false; + + preCheck = '' + export QT_PLUGIN_PATH=${lib.getBin qtpim}/${qtbase.qtPluginPrefix}:$QT_PLUGIN_PATH + export HOME=$PWD + ''; + + passthru = { + tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + updateScript = gitUpdater { }; + }; + + meta = with lib; { + description = "Service that provides call log and conversation history"; + longDescription = '' + History service provides the database and an API to store/retrieve the call log (used by dialer-app) and the sms/mms history (used by messaging-app). + + See as well telepathy-ofono for incoming message events. + + Database location: ~/.local/share/history-service/history.sqlite + ''; + homepage = "https://gitlab.com/ubports/development/core/history-service"; + license = licenses.gpl3Only; + maintainers = teams.lomiri.members; + platforms = platforms.linux; + pkgConfigModules = [ + "history-service" + ]; + }; +}) diff --git a/pkgs/desktops/lomiri/services/history-service/update_schema.sh.in b/pkgs/desktops/lomiri/services/history-service/update_schema.sh.in new file mode 100644 index 000000000000..3911c59ebe3a --- /dev/null +++ b/pkgs/desktops/lomiri/services/history-service/update_schema.sh.in @@ -0,0 +1,34 @@ +#!/bin/sh + +if [ $# -lt 3 ]; then + echo "Usage: $0 " + exit 1 +fi + +SOURCE_DIR=$1 +TARGET_FILE=$2 +VERSION_FILE=$3 + +VERSION="1" +LATEST_VERSION="1" +MERGED_COMMANDS="merged.sql" + +[ -e $MERGED_COMMANDS ] && rm $MERGED_COMMANDS +SCHEMA_FILE="$SOURCE_DIR/v${VERSION}.sql" +while [ -e $SCHEMA_FILE ]; do + cat $SCHEMA_FILE >> $MERGED_COMMANDS + LATEST_VERSION=$VERSION + VERSION=$(($VERSION+1)) + SCHEMA_FILE="$SOURCE_DIR/v${VERSION}.sql" +done + +# To output the schema +echo ".fullschema" >> $MERGED_COMMANDS + +# The schemas may use functions that history-service defines in C which don't affect the generated schema in a meaningful way. +# sqlite will return an error after processing queries with such function calls, so remove them. +sed -i -e '/normalizeId(/d' $MERGED_COMMANDS + +sqlite3 <$MERGED_COMMANDS >$TARGET_FILE + +echo $LATEST_VERSION > $VERSION_FILE From 0eaae22d8440d03e8c8ab6714de674c94dc17236 Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Mon, 23 Oct 2023 13:16:35 +0200 Subject: [PATCH 028/168] lomiri.history-service: Fix pkg-config --- .../lomiri/services/history-service/default.nix | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/pkgs/desktops/lomiri/services/history-service/default.nix b/pkgs/desktops/lomiri/services/history-service/default.nix index b15bd17058bc..a13927e00885 100644 --- a/pkgs/desktops/lomiri/services/history-service/default.nix +++ b/pkgs/desktops/lomiri/services/history-service/default.nix @@ -11,7 +11,6 @@ , gnome , libphonenumber , libqtdbustest -, lomiri-api , pkg-config , protobuf , qtbase @@ -92,6 +91,15 @@ stdenv.mkDerivation (finalAttrs: { substituteInPlace config.h.in \ --replace '@CMAKE_INSTALL_PREFIX@/@HISTORY_PLUGIN_PATH@' '@HISTORY_PLUGIN_PATH@' + # Honour GNUInstallDirs + substituteInPlace src/CMakeLists.txt \ + --replace 'INCLUDE_INSTALL_DIR include' 'INCLUDE_INSTALL_DIR ''${CMAKE_INSTALL_FULL_INCLUDEDIR}' + + # Fix concatenations & variable references + substituteInPlace src/history-service.pc.in \ + --replace 'LIB_INSTALL_DIR' 'CMAKE_INSTALL_FULL_LIBDIR' \ + --replace "\''${CMAKE_INSTALL_PREFIX}/\''${" "\''${" \ + '' + (if finalAttrs.doCheck then '' # Tests launch these DBus services, fix paths related to them From e8009e368821b08f7357ade698f264e4162b0fcd Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Sun, 17 Dec 2023 21:23:40 +0100 Subject: [PATCH 029/168] lomiri.history-service: Fetch upstream-submitted patch --- ...0001-Drop-deprecated-qt5_use_modules.patch | 247 ------------------ .../services/history-service/default.nix | 10 +- 2 files changed, 8 insertions(+), 249 deletions(-) delete mode 100644 pkgs/desktops/lomiri/services/history-service/0001-Drop-deprecated-qt5_use_modules.patch diff --git a/pkgs/desktops/lomiri/services/history-service/0001-Drop-deprecated-qt5_use_modules.patch b/pkgs/desktops/lomiri/services/history-service/0001-Drop-deprecated-qt5_use_modules.patch deleted file mode 100644 index fee8093619b7..000000000000 --- a/pkgs/desktops/lomiri/services/history-service/0001-Drop-deprecated-qt5_use_modules.patch +++ /dev/null @@ -1,247 +0,0 @@ -From 007e8cc4118869cab193d049db297bea3ee89269 Mon Sep 17 00:00:00 2001 -From: OPNA2608 -Date: Sun, 19 Feb 2023 22:39:14 +0100 -Subject: [PATCH] Drop deprecated qt5_use_modules - -Also seems broken on Nixpkgs, cannot pick up Qml (from qtdeclarative.dev). ---- - CMakeLists.txt | 1 + - Lomiri/History/CMakeLists.txt | 2 +- - cmake/modules/GenerateTest.cmake | 6 +++--- - daemon/CMakeLists.txt | 2 +- - plugins/sqlite/CMakeLists.txt | 2 +- - plugins/sqlite/schema/CMakeLists.txt | 2 +- - src/CMakeLists.txt | 2 +- - tests/Lomiri.History/CMakeLists.txt | 4 ++-- - tests/common/CMakeLists.txt | 4 ++-- - tests/common/mock/CMakeLists.txt | 2 +- - tests/libhistoryservice/CMakeLists.txt | 2 +- - tests/plugins/sqlite/CMakeLists.txt | 6 +++--- - tools/maketextevents/CMakeLists.txt | 2 +- - tools/makevoiceevents/CMakeLists.txt | 2 +- - tools/reader/CMakeLists.txt | 2 +- - 15 files changed, 21 insertions(+), 20 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index e61fea5..a8e6417 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -18,6 +18,7 @@ find_package(Qt5Qml) - find_package(Qt5Quick) - find_package(Qt5Test) - find_package(Qt5Network) -+find_package(Qt5Sql) - find_package(LibPhoneNumber REQUIRED) - - include(qt5) -diff --git a/Lomiri/History/CMakeLists.txt b/Lomiri/History/CMakeLists.txt -index eb5e18e..cf20761 100644 ---- a/Lomiri/History/CMakeLists.txt -+++ b/Lomiri/History/CMakeLists.txt -@@ -36,7 +36,7 @@ include_directories( - - add_library(history-qml MODULE ${plugin_SRCS} ${plugin_HDRS}) - --qt5_use_modules(history-qml Contacts Core Qml Quick) -+target_link_libraries(history-qml Qt5::Contacts Qt5::Core Qt5::Qml Qt5::Quick) - - target_link_libraries(history-qml - historyservice -diff --git a/cmake/modules/GenerateTest.cmake b/cmake/modules/GenerateTest.cmake -index 6cec32e..24615d1 100644 ---- a/cmake/modules/GenerateTest.cmake -+++ b/cmake/modules/GenerateTest.cmake -@@ -46,7 +46,7 @@ function(generate_test TESTNAME) - endif () - - if (NOT DEFINED ARG_QT5_MODULES) -- set(ARG_QT5_MODULES Core Test) -+ set(ARG_QT5_MODULES Qt5::Core Qt5::Test) - endif () - - if (${ARG_USE_UI}) -@@ -72,7 +72,7 @@ function(generate_test TESTNAME) - - # No QML test, regular binary compiled test. - add_executable(${TESTNAME} ${ARG_SOURCES}) -- qt5_use_modules(${TESTNAME} ${ARG_QT5_MODULES}) -+ target_link_libraries(${TESTNAME} ${ARG_QT5_MODULES}) - - if (${ARG_USE_DBUS}) - execute_process(COMMAND mktemp -d OUTPUT_VARIABLE TMPDIR) -@@ -136,7 +136,7 @@ function(generate_telepathy_test TESTNAME) - endif(NOT DEFINED ARG_LIBRARIES) - - if (NOT DEFINED ARG_QT5_MODULES) -- set(ARG_QT5_MODULES Core DBus Test Qml) -+ set(ARG_QT5_MODULES Qt5::Core Qt5::DBus Qt5::Test Qt5::Qml) - endif (NOT DEFINED ARG_QT5_MODULES) - generate_test(${TESTNAME} ${ARGN} - TASKS ${TASKS} -diff --git a/daemon/CMakeLists.txt b/daemon/CMakeLists.txt -index d9493a1..791a362 100644 ---- a/daemon/CMakeLists.txt -+++ b/daemon/CMakeLists.txt -@@ -21,7 +21,7 @@ include_directories( - qt5_add_dbus_adaptor(daemon_SRCS HistoryService.xml historyservicedbus.h HistoryServiceDBus) - - add_executable(history-daemon ${daemon_SRCS} ${daemon_HDRS}) --qt5_use_modules(history-daemon Core DBus) -+target_link_libraries(history-daemon Qt5::Core Qt5::DBus) - - target_link_libraries(history-daemon - ${TP_QT5_LIBRARIES} -diff --git a/plugins/sqlite/CMakeLists.txt b/plugins/sqlite/CMakeLists.txt -index 1a6fdfb..93bbe7a 100644 ---- a/plugins/sqlite/CMakeLists.txt -+++ b/plugins/sqlite/CMakeLists.txt -@@ -22,7 +22,7 @@ include_directories( - qt5_add_resources(plugin_RES sqlitehistoryplugin.qrc) - - add_library(sqlitehistoryplugin SHARED ${plugin_SRCS} ${plugin_HDRS} ${plugin_RES}) --qt5_use_modules(sqlitehistoryplugin Core DBus Sql) -+target_link_libraries(sqlitehistoryplugin Qt5::Core Qt5::DBus Qt5::Sql) - - # update the .qrc file automatically when there are new schema files - file(GLOB QRC_RESOURCE_FILES ${CMAKE_CURRENT_SOURCE_DIR}/schema/*.sql ${CMAKE_CURRENT_SOURCE_DIR}/schema/*.info) -diff --git a/plugins/sqlite/schema/CMakeLists.txt b/plugins/sqlite/schema/CMakeLists.txt -index fc1530d..c35bfdf 100644 ---- a/plugins/sqlite/schema/CMakeLists.txt -+++ b/plugins/sqlite/schema/CMakeLists.txt -@@ -13,7 +13,7 @@ add_custom_command( - - include_directories(${CMAKE_CURRENT_SOURCE_DIR}/..) - add_executable(generate_schema generate_schema.cpp ${CMAKE_CURRENT_SOURCE_DIR}/../sqlitedatabase.cpp) --qt5_use_modules(generate_schema Core DBus Sql) -+target_link_libraries(generate_schema Qt5::Core Qt5::DBus Qt5::Sql) - target_link_libraries(generate_schema historyservice ${SQLITE3_LIBRARIES}) - - add_custom_target(schema_update DEPENDS ${SCHEMA_FILE} ${VERSION_FILE}) -diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index 7e8dd69..4fca2db 100644 ---- a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt -@@ -101,7 +101,7 @@ set_target_properties(historyservice PROPERTIES - VERSION ${HISTORY_VERSION_MAJOR}.${HISTORY_VERSION_MINOR}.${HISTORY_VERSION_PATCH}) - - target_link_libraries(historyservice ${LibPhoneNumber_LIBRARIES} ${TP_QT5_LIBRARIES}) --qt5_use_modules(historyservice Contacts Core DBus) -+target_link_libraries(historyservice Qt5::Contacts Qt5::Core Qt5::DBus) - - install(TARGETS historyservice DESTINATION ${CMAKE_INSTALL_LIBDIR}) - -diff --git a/tests/Lomiri.History/CMakeLists.txt b/tests/Lomiri.History/CMakeLists.txt -index 615b772..7d3bd34 100644 ---- a/tests/Lomiri.History/CMakeLists.txt -+++ b/tests/Lomiri.History/CMakeLists.txt -@@ -41,7 +41,7 @@ set(HistoryGroupedThreadsModelTest_SOURCES - generate_test(HistoryGroupedThreadsModelTest - SOURCES ${HistoryGroupedThreadsModelTest_SOURCES} - LIBRARIES historyservice -- QT5_MODULES Core Qml Test -+ QT5_MODULES Qt5::Core Qt5::Qml Qt5::Test - USE_DBUS - USE_XVFB - TASKS --task ${CMAKE_BINARY_DIR}/daemon/history-daemon --ignore-return --task-name history-daemon -@@ -53,7 +53,7 @@ set(HistoryManagerTest_SOURCES - generate_test(HistoryManagerTest - SOURCES ${HistoryManagerTest_SOURCES} - LIBRARIES historyservice -- QT5_MODULES Core Qml Test -+ QT5_MODULES Qt5::Core Qt5::Qml Qt5::Test - USE_DBUS - USE_XVFB - TASKS --task ${CMAKE_BINARY_DIR}/daemon/history-daemon --ignore-return --task-name history-daemon -diff --git a/tests/common/CMakeLists.txt b/tests/common/CMakeLists.txt -index 0cc4bd9..cdf0203 100644 ---- a/tests/common/CMakeLists.txt -+++ b/tests/common/CMakeLists.txt -@@ -4,10 +4,10 @@ include_directories(${TP_QT5_INCLUDE_DIRS} - configure_file(dbus-session.conf.in ${CMAKE_CURRENT_BINARY_DIR}/dbus-session.conf) - - add_library(mockcontroller STATIC mockcontroller.cpp mockcontroller.h) --qt5_use_modules(mockcontroller Core DBus) -+target_link_libraries(mockcontroller Qt5::Core Qt5::DBus) - - add_library(telepathytest STATIC telepathytest.cpp telepathytest.h) --qt5_use_modules(telepathytest Core DBus) -+target_link_libraries(telepathytest Qt5::Core Qt5::DBus) - target_link_libraries(telepathytest ${TP_QT5_LIBRARIES}) - - add_subdirectory(mock) -diff --git a/tests/common/mock/CMakeLists.txt b/tests/common/mock/CMakeLists.txt -index acaf621..8e8b1b4 100644 ---- a/tests/common/mock/CMakeLists.txt -+++ b/tests/common/mock/CMakeLists.txt -@@ -15,5 +15,5 @@ set(mock_SRCS main.cpp protocol.cpp connection.cpp textchannel.cpp callchannel.c - qt5_add_dbus_adaptor(mock_SRCS MockConnection.xml mockconnectiondbus.h MockConnectionDBus) - - add_executable(telepathy-mock ${mock_SRCS}) --qt5_use_modules(telepathy-mock Core DBus) -+target_link_libraries(telepathy-mock Qt5::Core Qt5::DBus) - target_link_libraries(telepathy-mock ${TP_QT5_LIBRARIES} ${TELEPATHY_QT5_SERVICE_LIBRARIES} ${OFONO_QT_LIBRARIES} ${PULSEAUDIO_LIBRARIES} ${Qt5Network_LIBRARIES}) -diff --git a/tests/libhistoryservice/CMakeLists.txt b/tests/libhistoryservice/CMakeLists.txt -index d96daa6..9f9a991 100644 ---- a/tests/libhistoryservice/CMakeLists.txt -+++ b/tests/libhistoryservice/CMakeLists.txt -@@ -40,4 +40,4 @@ generate_test(EventViewTest - # Telepathy-based tests - generate_telepathy_test(ContactMatcherTest - SOURCES ContactMatcherTest.cpp -- QT5_MODULES Core DBus Test Qml Contacts) -+ QT5_MODULES Qt5::Core Qt5::DBus Qt5::Test Qt5::Qml Qt5::Contacts) -diff --git a/tests/plugins/sqlite/CMakeLists.txt b/tests/plugins/sqlite/CMakeLists.txt -index f2bc520..c06f942 100644 ---- a/tests/plugins/sqlite/CMakeLists.txt -+++ b/tests/plugins/sqlite/CMakeLists.txt -@@ -4,6 +4,6 @@ include_directories( - ${CMAKE_CURRENT_BINARY_DIR} - ) - --generate_test(SqlitePluginTest SOURCES SqlitePluginTest.cpp LIBRARIES historyservice sqlitehistoryplugin QT5_MODULES Core DBus Test Sql) --generate_test(SqliteThreadViewTest SOURCES SqliteThreadViewTest.cpp LIBRARIES historyservice sqlitehistoryplugin QT5_MODULES Core DBus Test Sql) --generate_test(SqliteEventViewTest SOURCES SqliteEventViewTest.cpp LIBRARIES historyservice sqlitehistoryplugin QT5_MODULES Core DBus Test Sql) -+generate_test(SqlitePluginTest SOURCES SqlitePluginTest.cpp LIBRARIES historyservice sqlitehistoryplugin QT5_MODULES Qt5::Core Qt5::DBus Qt5::Test Qt5::Sql) -+generate_test(SqliteThreadViewTest SOURCES SqliteThreadViewTest.cpp LIBRARIES historyservice sqlitehistoryplugin QT5_MODULES Qt5::Core Qt5::DBus Qt5::Test Qt5::Sql) -+generate_test(SqliteEventViewTest SOURCES SqliteEventViewTest.cpp LIBRARIES historyservice sqlitehistoryplugin QT5_MODULES Qt5::Core Qt5::DBus Qt5::Test Qt5::Sql) -diff --git a/tools/maketextevents/CMakeLists.txt b/tools/maketextevents/CMakeLists.txt -index e1d4e3e..c539bc5 100644 ---- a/tools/maketextevents/CMakeLists.txt -+++ b/tools/maketextevents/CMakeLists.txt -@@ -5,7 +5,7 @@ include_directories( - ) - - add_executable(history-maketextevents ${maketextevents_SRCS}) --qt5_use_modules(history-maketextevents Core) -+target_link_libraries(history-maketextevents Qt5::Core) - - target_link_libraries(history-maketextevents historyservice) - install(TARGETS history-maketextevents RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) -diff --git a/tools/makevoiceevents/CMakeLists.txt b/tools/makevoiceevents/CMakeLists.txt -index a8358bd..d5f4c49 100644 ---- a/tools/makevoiceevents/CMakeLists.txt -+++ b/tools/makevoiceevents/CMakeLists.txt -@@ -5,7 +5,7 @@ include_directories( - ) - - add_executable(history-makevoiceevents ${makevoiceevents_SRCS}) --qt5_use_modules(history-makevoiceevents Core) -+target_link_libraries(history-makevoiceevents Qt5::Core) - - target_link_libraries(history-makevoiceevents historyservice) - install(TARGETS history-makevoiceevents RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) -diff --git a/tools/reader/CMakeLists.txt b/tools/reader/CMakeLists.txt -index 220a7b6..00848bd 100644 ---- a/tools/reader/CMakeLists.txt -+++ b/tools/reader/CMakeLists.txt -@@ -5,6 +5,6 @@ include_directories( - ) - - add_executable(history-reader ${reader_SRCS}) --qt5_use_modules(history-reader Core) -+target_link_libraries(history-reader Qt5::Core) - - target_link_libraries(history-reader historyservice) --- -2.38.3 - diff --git a/pkgs/desktops/lomiri/services/history-service/default.nix b/pkgs/desktops/lomiri/services/history-service/default.nix index a13927e00885..ab790d7d7795 100644 --- a/pkgs/desktops/lomiri/services/history-service/default.nix +++ b/pkgs/desktops/lomiri/services/history-service/default.nix @@ -49,7 +49,13 @@ stdenv.mkDerivation (finalAttrs: { url = "https://gitlab.com/ubports/development/core/history-service/-/commit/1370777952c6a2efb85f582ff8ba085c2c0e290a.patch"; hash = "sha256-Z/dFrFo7WoPZlKto6wNGeWdopsi8iBjmd5ycbqMKgxo="; }) - ./0001-Drop-deprecated-qt5_use_modules.patch + + # Drop deprecated qt5_use_modules usage + # Remove when https://gitlab.com/ubports/development/core/history-service/-/merge_requests/36 merged & in release + (fetchpatch { + url = "https://gitlab.com/OPNA2608/history-service/-/commit/b36ab377aca93555b29d1471d6eaa706b5c843ca.patch"; + hash = "sha256-mOpXqqd4JI7lHtcWDm9LGCrtB8ERge04jMpHIagDM2k="; + }) ]; postPatch = '' @@ -100,7 +106,7 @@ stdenv.mkDerivation (finalAttrs: { --replace 'LIB_INSTALL_DIR' 'CMAKE_INSTALL_FULL_LIBDIR' \ --replace "\''${CMAKE_INSTALL_PREFIX}/\''${" "\''${" \ - '' + (if finalAttrs.doCheck then '' + '' + (if finalAttrs.finalPackage.doCheck then '' # Tests launch these DBus services, fix paths related to them substituteInPlace tests/common/dbus-services/CMakeLists.txt \ From 220209b3a9f65517652cc4e218f546be76b52e36 Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Thu, 21 Dec 2023 14:25:13 +0100 Subject: [PATCH 030/168] lomiri.history-service: Disable flaky test --- pkgs/desktops/lomiri/services/history-service/default.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/lomiri/services/history-service/default.nix b/pkgs/desktops/lomiri/services/history-service/default.nix index ab790d7d7795..f86dd5d25883 100644 --- a/pkgs/desktops/lomiri/services/history-service/default.nix +++ b/pkgs/desktops/lomiri/services/history-service/default.nix @@ -104,8 +104,7 @@ stdenv.mkDerivation (finalAttrs: { # Fix concatenations & variable references substituteInPlace src/history-service.pc.in \ --replace 'LIB_INSTALL_DIR' 'CMAKE_INSTALL_FULL_LIBDIR' \ - --replace "\''${CMAKE_INSTALL_PREFIX}/\''${" "\''${" \ - + --replace "\''${CMAKE_INSTALL_PREFIX}/\''${" "\''${" '' + (if finalAttrs.finalPackage.doCheck then '' # Tests launch these DBus services, fix paths related to them @@ -151,6 +150,11 @@ stdenv.mkDerivation (finalAttrs: { cmakeFlags = [ # Many deprecation warnings with Qt 5.15 "-DENABLE_WERROR=OFF" + (lib.cmakeFeature "CMAKE_CTEST_ARGUMENTS" (lib.concatStringsSep ";" [ + # DaemonTest is flaky + # https://gitlab.com/ubports/development/core/history-service/-/issues/13 + "-E" "^DaemonTest" + ])) ]; preBuild = '' From d7193bd0f82ecfa3a98e402d0cd65aa4643d192b Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Thu, 21 Dec 2023 18:40:36 +0100 Subject: [PATCH 031/168] lomiri.history-service: Fetch upstream-submitted patches, small cleanups --- .../services/history-service/default.nix | 45 ++++++++++--------- 1 file changed, 25 insertions(+), 20 deletions(-) diff --git a/pkgs/desktops/lomiri/services/history-service/default.nix b/pkgs/desktops/lomiri/services/history-service/default.nix index f86dd5d25883..de8b614ae3ea 100644 --- a/pkgs/desktops/lomiri/services/history-service/default.nix +++ b/pkgs/desktops/lomiri/services/history-service/default.nix @@ -56,6 +56,27 @@ stdenv.mkDerivation (finalAttrs: { url = "https://gitlab.com/OPNA2608/history-service/-/commit/b36ab377aca93555b29d1471d6eaa706b5c843ca.patch"; hash = "sha256-mOpXqqd4JI7lHtcWDm9LGCrtB8ERge04jMpHIagDM2k="; }) + + # Add more / correct existing GNUInstallDirs usage + # Remove when https://gitlab.com/ubports/development/core/history-service/-/merge_requests/37 merged & in release + (fetchpatch { + url = "https://gitlab.com/OPNA2608/history-service/-/commit/bb4dbdd16e80dcd286d8edfb86b08f0b61bc7fec.patch"; + hash = "sha256-C/XaygI663yaU06klQD9g0NnbqYxHSmzdbrRxcfiJkk="; + }) + + # Correct version information + # Remove when https://gitlab.com/ubports/development/core/history-service/-/merge_requests/38 merged & in release + (fetchpatch { + url = "https://gitlab.com/OPNA2608/history-service/-/commit/30d9fbee203205ec1ea8fd19c9b6eb54c080a9e2.patch"; + hash = "sha256-vSZ1ii5Yhw7pB+Pd1pjWnW7JsQxKnn+LeuBKo6qZjQs="; + }) + + # Make tests optional + # Remove when https://gitlab.com/ubports/development/core/history-service/-/merge_requests/39 merged & in release + (fetchpatch { + url = "https://gitlab.com/OPNA2608/history-service/-/commit/cb5c80cffc35611657244e15a7eb10edcd598ccd.patch"; + hash = "sha256-MFHGu4OMScdThq9htUgFMpezP7Ym6YTIZUHWol20wqw="; + }) ]; postPatch = '' @@ -87,27 +108,13 @@ stdenv.mkDerivation (finalAttrs: { # Uses pkg_get_variable, cannot substitute prefix with that substituteInPlace daemon/CMakeLists.txt \ - --replace 'DESTINATION ''${SYSTEMD_USER_UNIT_DIR}' 'DESTINATION "${placeholder "out"}/lib/systemd/user"' + --replace 'pkg_get_variable(SYSTEMD_USER_UNIT_DIR systemd systemduserunitdir)' 'set(SYSTEMD_USER_UNIT_DIR "''${CMAKE_INSTALL_PREFIX}/lib/systemd/user")' # Queries qmake for the QML installation path, which returns a reference to Qt5's build directory substituteInPlace CMakeLists.txt \ --replace "\''${QMAKE_EXECUTABLE} -query QT_INSTALL_QML" "echo $out/${qtbase.qtQmlPrefix}" - - # Bad path concatenation - substituteInPlace config.h.in \ - --replace '@CMAKE_INSTALL_PREFIX@/@HISTORY_PLUGIN_PATH@' '@HISTORY_PLUGIN_PATH@' - - # Honour GNUInstallDirs - substituteInPlace src/CMakeLists.txt \ - --replace 'INCLUDE_INSTALL_DIR include' 'INCLUDE_INSTALL_DIR ''${CMAKE_INSTALL_FULL_INCLUDEDIR}' - - # Fix concatenations & variable references - substituteInPlace src/history-service.pc.in \ - --replace 'LIB_INSTALL_DIR' 'CMAKE_INSTALL_FULL_LIBDIR' \ - --replace "\''${CMAKE_INSTALL_PREFIX}/\''${" "\''${" - '' + (if finalAttrs.finalPackage.doCheck then '' + '' + lib.optionalString finalAttrs.finalPackage.doCheck '' # Tests launch these DBus services, fix paths related to them - substituteInPlace tests/common/dbus-services/CMakeLists.txt \ ${replaceDbusService telepathy-mission-control "org.freedesktop.Telepathy.MissionControl5.service"} \ ${replaceDbusService telepathy-mission-control "org.freedesktop.Telepathy.AccountManager.service"} \ @@ -116,9 +123,7 @@ stdenv.mkDerivation (finalAttrs: { substituteInPlace cmake/modules/GenerateTest.cmake \ --replace '/usr/lib/dconf' '${lib.getLib dconf}/libexec' \ --replace '/usr/lib/telepathy' '${lib.getLib telepathy-mission-control}/libexec' - '' else '' - sed -i CMakeLists.txt -e '/add_subdirectory(tests)/d' - ''); + ''; strictDeps = true; @@ -149,7 +154,7 @@ stdenv.mkDerivation (finalAttrs: { cmakeFlags = [ # Many deprecation warnings with Qt 5.15 - "-DENABLE_WERROR=OFF" + (lib.cmakeBool "ENABLE_WERROR" false) (lib.cmakeFeature "CMAKE_CTEST_ARGUMENTS" (lib.concatStringsSep ";" [ # DaemonTest is flaky # https://gitlab.com/ubports/development/core/history-service/-/issues/13 From e70ceefa64e5a6d05b6f911039261538d130d0aa Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 23 Dec 2023 23:43:31 +0000 Subject: [PATCH 032/168] python310Packages.pyoutbreaksnearme: 2023.10.0 -> 2023.12.0 --- pkgs/development/python-modules/pyoutbreaksnearme/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyoutbreaksnearme/default.nix b/pkgs/development/python-modules/pyoutbreaksnearme/default.nix index 0c07a12fc1f3..5aa9352f7a4c 100644 --- a/pkgs/development/python-modules/pyoutbreaksnearme/default.nix +++ b/pkgs/development/python-modules/pyoutbreaksnearme/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "pyoutbreaksnearme"; - version = "2023.10.0"; + version = "2023.12.0"; pyproject = true; disabled = pythonOlder "3.10"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "bachya"; repo = "pyoutbreaksnearme"; rev = "refs/tags/${version}"; - hash = "sha256-G+/ooNhiYOaV0kjfr8Z1d31XxRYFArQnt1oIuMQfXdY="; + hash = "sha256-oR/DApOxNSSczrBeH4sytd/vasbD4rA1poW4zNoeAnU="; }; nativeBuildInputs = [ From 9a2b7f1b91a40d212f9e36aa730a59de4f4548a9 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 24 Dec 2023 08:02:58 +0000 Subject: [PATCH 033/168] requestly: 1.5.13 -> 1.5.15 --- pkgs/tools/networking/requestly/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/requestly/default.nix b/pkgs/tools/networking/requestly/default.nix index b23336e6d0e9..e833b0a7e7f1 100644 --- a/pkgs/tools/networking/requestly/default.nix +++ b/pkgs/tools/networking/requestly/default.nix @@ -5,11 +5,11 @@ let pname = "requestly"; - version = "1.5.13"; + version = "1.5.15"; src = fetchurl { url = "https://github.com/requestly/requestly-desktop-app/releases/download/v${version}/Requestly-${version}.AppImage"; - hash = "sha256-DSOZBVBjIYO8BG3o7AUsH7h2KvSPlp9Lj9d3OwvBhfQ="; + hash = "sha256-GTc4VikXsyiEfgN6oY/YQPBqNLia4cFz1aYS65+SboI="; }; appimageContents = appimageTools.extractType2 { inherit pname version src; }; From 5fc84cf30a9f978622aef53528795c9ef2ef42cd Mon Sep 17 00:00:00 2001 From: Paul Meyer <49727155+katexochen@users.noreply.github.com> Date: Sun, 24 Dec 2023 09:17:56 +0100 Subject: [PATCH 034/168] k9s: 0.29.1 -> 0.30.0 --- nixos/doc/manual/release-notes/rl-2405.section.md | 5 ++++- pkgs/applications/networking/cluster/k9s/default.nix | 6 +++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/nixos/doc/manual/release-notes/rl-2405.section.md b/nixos/doc/manual/release-notes/rl-2405.section.md index c2c8f8acab65..259618ef02e4 100644 --- a/nixos/doc/manual/release-notes/rl-2405.section.md +++ b/nixos/doc/manual/release-notes/rl-2405.section.md @@ -39,7 +39,10 @@ The pre-existing [services.ankisyncd](#opt-services.ankisyncd.enable) has been m - The `power.ups` module now generates `upsd.conf`, `upsd.users` and `upsmon.conf` automatically from a set of new configuration options. This breaks compatibility with existing `power.ups` setups where these files were created manually. Back up these files before upgrading NixOS. -- `k9s` was updated to v0.29. There have been breaking changes in the config file format, check out the [changelog](https://github.com/derailed/k9s/releases/tag/v0.29.0) for details. +- `k9s` was updated to v0.30. There have been various breaking changes in the config file format, + check out the changelog of [v0.29](https://github.com/derailed/k9s/releases/tag/v0.29.0) and + [v0.30](https://github.com/derailed/k9s/releases/tag/v0.30.0) for details. It is recommended + to back up your current configuration and let k9s recreate the new base configuration. - `idris2` was updated to v0.7.0. This version introduces breaking changes. Check out the [changelog](https://github.com/idris-lang/Idris2/blob/v0.7.0/CHANGELOG.md#v070) for details. diff --git a/pkgs/applications/networking/cluster/k9s/default.nix b/pkgs/applications/networking/cluster/k9s/default.nix index c53773fc43f6..bdd79ff4c2eb 100644 --- a/pkgs/applications/networking/cluster/k9s/default.nix +++ b/pkgs/applications/networking/cluster/k9s/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "k9s"; - version = "0.29.1"; + version = "0.30.0"; src = fetchFromGitHub { owner = "derailed"; repo = "k9s"; rev = "v${version}"; - sha256 = "sha256-agGayZ20RMAcGOx+owwDbUUDsjF3FZajhwDZ5wtE93k="; + hash = "sha256-ESf1BoQ3DAz0z5J/2PeX3Vq8V3o87sKi7c1250gDGqk="; }; ldflags = [ @@ -23,7 +23,7 @@ buildGoModule rec { proxyVendor = true; - vendorHash = "sha256-9w44gpaB2C/F7hTImjdeabWVgTU5AA/7OSJmAqayrzU="; + vendorHash = "sha256-A8kqMwRMl1Jdonz9Ii79pvwA8RKg8+7XVe1VlPBVhFA="; # TODO investigate why some config tests are failing doCheck = !(stdenv.isDarwin && stdenv.isAarch64); From 27377a0989d14c4a5f4c9bcd9d64fd1523ba66c0 Mon Sep 17 00:00:00 2001 From: Paul Meyer <49727155+katexochen@users.noreply.github.com> Date: Sun, 24 Dec 2023 09:24:39 +0100 Subject: [PATCH 035/168] k9s: add changelog and mainProgram --- pkgs/applications/networking/cluster/k9s/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/applications/networking/cluster/k9s/default.nix b/pkgs/applications/networking/cluster/k9s/default.nix index bdd79ff4c2eb..4c221471d2f3 100644 --- a/pkgs/applications/networking/cluster/k9s/default.nix +++ b/pkgs/applications/networking/cluster/k9s/default.nix @@ -51,7 +51,9 @@ buildGoModule rec { meta = with lib; { description = "Kubernetes CLI To Manage Your Clusters In Style"; homepage = "https://github.com/derailed/k9s"; + changelog = "https://github.com/derailed/k9s/releases/tag/v${version}"; license = licenses.asl20; + mainProgram = "k9s"; maintainers = with maintainers; [ Gonzih markus1189 bryanasdev000 qjoly ]; }; } From c160b6f8621de21aaf88fe93b65acef4f48b64f2 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Sun, 24 Dec 2023 10:39:54 +0000 Subject: [PATCH 036/168] fheroes2: 1.0.10 -> 1.0.11 Changes: https://github.com/ihhub/fheroes2/releases/tag/1.0.11 --- pkgs/games/fheroes2/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/games/fheroes2/default.nix b/pkgs/games/fheroes2/default.nix index 798178e58c16..700dd0f6b315 100644 --- a/pkgs/games/fheroes2/default.nix +++ b/pkgs/games/fheroes2/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "fheroes2"; - version = "1.0.10"; + version = "1.0.11"; src = fetchFromGitHub { owner = "ihhub"; repo = "fheroes2"; rev = version; - hash = "sha256-bh27piX1/HIlbOmTpqQCV7NaHxOMtwMIGrjlXrFvHWE="; + hash = "sha256-R7hl5VzzdRcU9TF6WfiLYgUFpVixuppLobMsan0jKsQ="; }; nativeBuildInputs = [ imagemagick ]; From e5a16fa98b4ae98b8137c92bdcad9b269a95c814 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Sun, 24 Dec 2023 11:48:35 +0000 Subject: [PATCH 037/168] _0verkill: pin to autoconf-2.69 `autoconf-2.72` tweaked `AC_CHECK_LIB` macro a bit and exposed missing quoting in `configure.in` of `0verkill` as: 0verkill-unstable> ./configure: line 4182: syntax error near unexpected token `newline' 0verkill-unstable> ./configure: line 4182: `yes:' `configure.in` requires a bit of patching. Let's pin it to older `2.69` to allow `autoconf` upgrade to 2.72. --- pkgs/games/0verkill/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/games/0verkill/default.nix b/pkgs/games/0verkill/default.nix index 2c09e5c1eb6f..22ef6c6b0cc4 100644 --- a/pkgs/games/0verkill/default.nix +++ b/pkgs/games/0verkill/default.nix @@ -1,7 +1,7 @@ { lib , gccStdenv , fetchFromGitHub -, autoreconfHook +, autoreconfHook269 , xorgproto , libX11 , libXpm @@ -18,7 +18,7 @@ gccStdenv.mkDerivation rec { sha256 = "WO7PN192HhcDl6iHIbVbH7MVMi1Tl2KyQbDa9DWRO6M="; }; - nativeBuildInputs = [ autoreconfHook ]; + nativeBuildInputs = [ autoreconfHook269 ]; buildInputs = [ libX11 xorgproto libXpm ]; configureFlags = [ "--with-x" ]; From f41df75d8a7d4b32e4482bb9bcfd7112f0ae6206 Mon Sep 17 00:00:00 2001 From: Florian Brandes Date: Sun, 24 Dec 2023 15:04:29 +0100 Subject: [PATCH 038/168] sqlite3-to-mysql: 2.1.1 -> 2.1.6 Signed-off-by: Florian Brandes --- pkgs/tools/misc/sqlite3-to-mysql/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/sqlite3-to-mysql/default.nix b/pkgs/tools/misc/sqlite3-to-mysql/default.nix index 68ee19e6c682..08da05b8205b 100644 --- a/pkgs/tools/misc/sqlite3-to-mysql/default.nix +++ b/pkgs/tools/misc/sqlite3-to-mysql/default.nix @@ -4,13 +4,12 @@ , nixosTests , testers , sqlite3-to-mysql -, fetchPypi , mysql80 }: python3Packages.buildPythonApplication rec { pname = "sqlite3-to-mysql"; - version = "2.1.1"; + version = "2.1.6"; format = "pyproject"; disabled = python3Packages.pythonOlder "3.8"; @@ -19,7 +18,7 @@ python3Packages.buildPythonApplication rec { owner = "techouse"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-g3W6ts5Mk//l6E4Yg49rf9dmu+yzgH+mCjz+vPW9ZRQ="; + hash = "sha256-RIe4If7R8snbNN2yIPxAh39EQplVyhMF2c0G06Zipds="; }; nativeBuildInputs = with python3Packages; [ From bb3def8849b2a064da22ac513ee712bd194c442d Mon Sep 17 00:00:00 2001 From: Simon Menke Date: Sun, 24 Dec 2023 18:59:56 +0100 Subject: [PATCH 039/168] frozen: Fix build on case-insensitive file systems --- pkgs/development/libraries/frozen/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/libraries/frozen/default.nix b/pkgs/development/libraries/frozen/default.nix index f6e58991a590..26c47617c1f6 100644 --- a/pkgs/development/libraries/frozen/default.nix +++ b/pkgs/development/libraries/frozen/default.nix @@ -23,7 +23,10 @@ stdenv.mkDerivation rec { # Since it has only two source files, the best course of action to support # cross compilation is to create a small meson.build file. # Relevant upstream issue: https://github.com/cesanta/frozen/pull/71 + # We also remove the GN BUILD file to prevent conflicts on case-insesitive + # file systems. preConfigure = '' + rm BUILD cp ${./meson.build} meson.build ''; From 765c5754a9513300824a0c0591fb0c2b7a22714c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 25 Dec 2023 03:08:58 +0000 Subject: [PATCH 040/168] weaviate: 1.21.7 -> 1.23.0 --- pkgs/servers/search/weaviate/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/search/weaviate/default.nix b/pkgs/servers/search/weaviate/default.nix index f63805cd36e4..307cccf0c211 100644 --- a/pkgs/servers/search/weaviate/default.nix +++ b/pkgs/servers/search/weaviate/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "weaviate"; - version = "1.21.7"; + version = "1.23.0"; src = fetchFromGitHub { owner = "weaviate"; repo = "weaviate"; rev = "v${version}"; - hash = "sha256-fhBjKmWtbivntgBFmxfG4bQNUvCdP5uWtysOvsSqFuw="; + hash = "sha256-gm8PNNRnfnpLR5dS7nFfbvbZSSvTxbC4lUma2HI/+ZM="; }; - vendorHash = "sha256-/ylYXwgJKtkAIvYgSsl8MzBxuxp0Nco3ZR4ZBdmmS+w="; + vendorHash = "sha256-UEdGoXKq7ewNszahgcomjjuO2uzRZpiwkvvnXyFc9Og="; subPackages = [ "cmd/weaviate-server" ]; From 3c40377b98f844a3bfa3a8eab64a33b467067ab5 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 25 Dec 2023 03:20:00 +0000 Subject: [PATCH 041/168] webanalyze: 0.3.9 -> 0.4.1 --- pkgs/tools/security/webanalyze/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/webanalyze/default.nix b/pkgs/tools/security/webanalyze/default.nix index 7c043c0d0a18..427d84c5282d 100644 --- a/pkgs/tools/security/webanalyze/default.nix +++ b/pkgs/tools/security/webanalyze/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "webanalyze"; - version = "0.3.9"; + version = "0.4.1"; src = fetchFromGitHub { owner = "rverton"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-uDf0p4zw23+AVftMmrKfno+FbMZfGC1B5zvutj8qnPg="; + hash = "sha256-rnNbEPlbye0gjUamwq1xjFM/4g0eEHsGOAZWziEqxwM="; }; vendorHash = "sha256-XPOsC+HoLytgv1fhAaO5HYSvuOP6OhjLyOYTfiD64QI="; From a5332c47f4ff2be8c6c839c1f595dfb289ff7fe7 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Mon, 25 Dec 2023 04:20:00 +0000 Subject: [PATCH 042/168] postgresqlPackages.h3-pg: init at 4.1.3 --- pkgs/servers/sql/postgresql/ext/h3-pg.nix | 76 +++++++++++++++++++++++ pkgs/servers/sql/postgresql/packages.nix | 2 + 2 files changed, 78 insertions(+) create mode 100644 pkgs/servers/sql/postgresql/ext/h3-pg.nix diff --git a/pkgs/servers/sql/postgresql/ext/h3-pg.nix b/pkgs/servers/sql/postgresql/ext/h3-pg.nix new file mode 100644 index 000000000000..91437de34585 --- /dev/null +++ b/pkgs/servers/sql/postgresql/ext/h3-pg.nix @@ -0,0 +1,76 @@ +{ lib +, stdenv +, cmake +, fetchFromGitHub +, h3_4 +, postgresql +, postgresqlTestHook +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "h3-pg"; + version = "4.1.3"; + + src = fetchFromGitHub { + owner = "zachasme"; + repo = "h3-pg"; + rev = "v${finalAttrs.version}"; + hash = "sha256-nkaDZ+JuMtsGUJVx70DD2coLrmc/T8/cNov7pfNF1Eg="; + }; + + postPatch = '' + substituteInPlace CMakeLists.txt \ + --replace "add_subdirectory(cmake/h3)" "include_directories(${lib.getDev h3_4}/include/h3)" + '' + lib.optionalString stdenv.isDarwin '' + substituteInPlace cmake/AddPostgreSQLExtension.cmake \ + --replace "INTERPROCEDURAL_OPTIMIZATION TRUE" "" + ''; + + nativeBuildInputs = [ + cmake + ]; + + buildInputs = [ + h3_4 + postgresql + ]; + + installPhase = '' + install -D -t $out/lib h3/h3.so + install -D -t $out/share/postgresql/extension h3/h3-*.sql h3/h3.control + install -D -t $out/lib h3_postgis/h3_postgis.so + install -D -t $out/share/postgresql/extension h3_postgis/h3_postgis-*.sql h3_postgis/h3_postgis.control + ''; + + passthru.tests.extension = stdenv.mkDerivation { + name = "h3-pg-test"; + dontUnpack = true; + doCheck = true; + buildInputs = [ postgresqlTestHook ]; + nativeCheckInputs = [ (postgresql.withPackages (ps: [ ps.h3-pg ps.postgis ])) ]; + postgresqlTestUserOptions = "LOGIN SUPERUSER"; + passAsFile = [ "sql" ]; + sql = '' + CREATE EXTENSION h3; + CREATE EXTENSION h3_postgis CASCADE; + + SELECT h3_lat_lng_to_cell(POINT('37.3615593,-122.0553238'), 5); + SELECT ST_NPoints(h3_cell_to_boundary_geometry('8a63a9a99047fff')); + ''; + failureHook = "postgresqlStop"; + checkPhase = '' + runHook preCheck + psql -a -v ON_ERROR_STOP=1 -f $sqlPath + runHook postCheck + ''; + installPhase = "touch $out"; + }; + + meta = with lib; { + description = "PostgreSQL bindings for H3, a hierarchical hexagonal geospatial indexing system"; + homepage = "https://github.com/zachasme/h3-pg"; + license = licenses.asl20; + maintainers = with maintainers; [ marsam ]; + inherit (postgresql.meta) platforms; + }; +}) diff --git a/pkgs/servers/sql/postgresql/packages.nix b/pkgs/servers/sql/postgresql/packages.nix index 6685602ec3a1..52e4fc700c94 100644 --- a/pkgs/servers/sql/postgresql/packages.nix +++ b/pkgs/servers/sql/postgresql/packages.nix @@ -4,6 +4,8 @@ self: super: { apache_datasketches = super.callPackage ./ext/apache_datasketches.nix { }; + h3-pg = super.callPackage ./ext/h3-pg.nix { }; + hypopg = super.callPackage ./ext/hypopg.nix { }; jsonb_deep_sum = super.callPackage ./ext/jsonb_deep_sum.nix { }; From d5872fa73bac530ac3531523aef55b0cbf0bf58a Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Mon, 25 Dec 2023 04:20:00 +0000 Subject: [PATCH 043/168] python311Packages.borb: init at 2.1.20 --- .../python-modules/borb/default.nix | 50 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 52 insertions(+) create mode 100644 pkgs/development/python-modules/borb/default.nix diff --git a/pkgs/development/python-modules/borb/default.nix b/pkgs/development/python-modules/borb/default.nix new file mode 100644 index 000000000000..2c8c84bbf20c --- /dev/null +++ b/pkgs/development/python-modules/borb/default.nix @@ -0,0 +1,50 @@ +{ lib +, buildPythonPackage +, cryptography +, fetchPypi +, fonttools +, lxml +, pillow +, python-barcode +, pythonOlder +, qrcode +, requests +, setuptools +}: + +buildPythonPackage rec { + pname = "borb"; + version = "2.1.20"; + format = "setuptools"; + + disabled = pythonOlder "3.6"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-HvPwFtqAPtJrG+O+t8OyQmYHVo6DC7StAjSfAxtuFe4="; + }; + + propagatedBuildInputs = [ + cryptography + fonttools + lxml + pillow + python-barcode + qrcode + requests + setuptools + ]; + + pythonImportsCheck = [ + "borb.pdf" + ]; + + doCheck = false; + + meta = with lib; { + description = "Library for reading, creating and manipulating PDF files in Python"; + homepage = "https://borbpdf.com/"; + license = licenses.agpl3Only; + maintainers = with maintainers; [ marsam ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 2ac52212f794..b55484290da3 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1605,6 +1605,8 @@ self: super: with self; { enablePython = true; }); + borb = callPackage ../development/python-modules/borb { }; + bork = callPackage ../development/python-modules/bork { }; boschshcpy = callPackage ../development/python-modules/boschshcpy { }; From 5e727c91bda06e5ba421fa279ae3c687054ddb63 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 25 Dec 2023 04:42:43 +0000 Subject: [PATCH 044/168] xercesc: 3.2.4 -> 3.2.5 --- pkgs/development/libraries/xercesc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/xercesc/default.nix b/pkgs/development/libraries/xercesc/default.nix index 0a254b109583..e386851da02c 100644 --- a/pkgs/development/libraries/xercesc/default.nix +++ b/pkgs/development/libraries/xercesc/default.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation rec { pname = "xerces-c"; - version = "3.2.4"; + version = "3.2.5"; src = fetchurl { url = "mirror://apache/xerces/c/3/sources/${pname}-${version}.tar.gz"; - sha256 = "sha256-PY7Bx/lOOP7g5Mpa0eHZ2yPL86ELumJva0r6Le2v5as="; + sha256 = "sha256-VFz8zmxOdVIHvR8n4xkkHlDjfAwnJQ8RzaEWAY8e8PU="; }; buildInputs = [ From 2dfc0c9c921fff11ef561626b83840d628086a97 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 25 Dec 2023 07:08:52 +0000 Subject: [PATCH 045/168] zfp: 1.0.0 -> 1.0.1 --- pkgs/tools/compression/zfp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/compression/zfp/default.nix b/pkgs/tools/compression/zfp/default.nix index 145f33a1cf8e..8df75d48eb56 100644 --- a/pkgs/tools/compression/zfp/default.nix +++ b/pkgs/tools/compression/zfp/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "zfp"; - version = "1.0.0"; + version = "1.0.1"; src = fetchFromGitHub { owner = "LLNL"; repo = "zfp"; rev = version; - sha256 = "sha256-E2LI1rWo1HO5O/sxPHAmLDs3Z5xouzlgMj11rQFPNYQ="; + sha256 = "sha256-iZxA4lIviZQgaeHj6tEQzEFSKocfgpUyf4WvUykb9qk="; }; nativeBuildInputs = [ cmake ]; From 556aeb33ab284b8eff4d456ba1f3aaaf34306ffc Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 25 Dec 2023 09:04:17 +0100 Subject: [PATCH 046/168] python311Packages.google-generativeai: 0.2.2 -> 0.3.2 Diff: https://github.com/google/generative-ai-python/compare/refs/tags/v0.3.2...v0.3.2 Changelog: https://github.com/google/generative-ai-python/releases/tag/v0.3.2 --- .../python-modules/google-generativeai/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-generativeai/default.nix b/pkgs/development/python-modules/google-generativeai/default.nix index 69c9180ce423..920cd984df33 100644 --- a/pkgs/development/python-modules/google-generativeai/default.nix +++ b/pkgs/development/python-modules/google-generativeai/default.nix @@ -8,11 +8,12 @@ , pythonOlder , pythonRelaxDepsHook , tqdm +, typing-extensions }: buildPythonPackage rec { pname = "google-generativeai"; - version = "0.2.2"; + version = "0.3.2"; format = "setuptools"; disabled = pythonOlder "3.9"; @@ -21,7 +22,7 @@ buildPythonPackage rec { owner = "google"; repo = "generative-ai-python"; rev = "refs/tags/v${version}"; - hash = "sha256-WiDoeScro7TcW5nQBmLpVQriL6IzR9CAVqBj36nqivk="; + hash = "sha256-SL0jnuDHjeiqDq1VvWr4vQPFZ5yyea/OAGArmxztwB4="; }; pythonRelaxDeps = [ @@ -38,6 +39,7 @@ buildPythonPackage rec { google-api-core protobuf tqdm + typing-extensions ]; # Issue with the google.ai module. Check with the next release From c609d66376aac35fe600269b82adfe3f4c19d309 Mon Sep 17 00:00:00 2001 From: Paul Meyer <49727155+katexochen@users.noreply.github.com> Date: Mon, 25 Dec 2023 09:39:44 +0100 Subject: [PATCH 047/168] k9s: 0.30.0 -> 0.30.2 --- pkgs/applications/networking/cluster/k9s/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/k9s/default.nix b/pkgs/applications/networking/cluster/k9s/default.nix index 4c221471d2f3..4246b8189427 100644 --- a/pkgs/applications/networking/cluster/k9s/default.nix +++ b/pkgs/applications/networking/cluster/k9s/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "k9s"; - version = "0.30.0"; + version = "0.30.2"; src = fetchFromGitHub { owner = "derailed"; repo = "k9s"; rev = "v${version}"; - hash = "sha256-ESf1BoQ3DAz0z5J/2PeX3Vq8V3o87sKi7c1250gDGqk="; + hash = "sha256-sAXbiK8jba2SDDlhUWbecOPDMBQXXfPEmnnY5cj3WHs="; }; ldflags = [ From e5d049a3e6622dfb29d8de66f0b5ca7570cd88a0 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Mon, 25 Dec 2023 11:14:49 +0000 Subject: [PATCH 048/168] libsidplayfp: pull fix for `autoconf-2.72` pending upstream inclusion Without the change `libsidplayfp` fails the build on `autoconf-2.72` as: ./configure: line 19606: syntax error near unexpected token `;;' ./configure: line 19606: ` ;;' --- pkgs/development/libraries/libsidplayfp/default.nix | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/pkgs/development/libraries/libsidplayfp/default.nix b/pkgs/development/libraries/libsidplayfp/default.nix index 194da3121615..b8b62781d0a6 100644 --- a/pkgs/development/libraries/libsidplayfp/default.nix +++ b/pkgs/development/libraries/libsidplayfp/default.nix @@ -1,6 +1,7 @@ { stdenv , lib , fetchFromGitHub +, fetchpatch , makeFontsConf , nix-update-script , autoreconfHook @@ -27,6 +28,16 @@ stdenv.mkDerivation rec { sha256 = "sha256-KCp/8UjVl8e3+4s1FD4GvHP7AUAS+eIB7RWhmgm5GIA="; }; + patches = [ + # Pull autoconf-2.72 compatibility fix: + # https://github.com/libsidplayfp/libsidplayfp/pull/103 + (fetchpatch { + name = "autoconf-2.72"; + url = "https://github.com/libsidplayfp/libsidplayfp/commit/b8fff55f6aaa005a3899b59e70cd8730f962641b.patch"; + hash = "sha256-5Hk202IuHUBow7HnnPr2/ieWFjKDuHLQjQ9mJUML9q8="; + }) + ]; + postPatch = '' patchShebangs . ''; From 22a2ee4748f7a3dd32dff76a09668ebadbeef824 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 25 Dec 2023 13:27:25 +0000 Subject: [PATCH 049/168] cdxgen: 6.0.14 -> 9.10.1 --- pkgs/tools/security/cdxgen/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/cdxgen/default.nix b/pkgs/tools/security/cdxgen/default.nix index ffdd977da416..4c4a7292ac56 100644 --- a/pkgs/tools/security/cdxgen/default.nix +++ b/pkgs/tools/security/cdxgen/default.nix @@ -5,16 +5,16 @@ buildNpmPackage rec { pname = "cdxgen"; - version = "6.0.14"; + version = "9.10.1"; src = fetchFromGitHub { owner = "AppThreat"; repo = pname; rev = "v${version}"; - sha256 = "sha256-ddeX2EwA2g6wgfsNxf/5ZVsQOHlINGhxif/y6368wCw="; + sha256 = "sha256-FkOWkjf/TXjmSOMSTHvf/MhRtuIPFwGwMt1IUJdvKM0="; }; - npmDepsHash = "sha256-CJ939wT9dKUzMDH2yHKgT056F2AVBevJlS/NhUBjx0E="; + npmDepsHash = "sha256-2DDLogGXT9G8tKJYxVtS7oa5szlaaQTs1kJcgq9GA7k="; dontNpmBuild = true; From 1b807b609b37371a057646b8bfdd13c17449e2c7 Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Mon, 25 Dec 2023 16:11:38 +0200 Subject: [PATCH 050/168] goverview: install shell completion files --- pkgs/tools/security/goverview/default.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/pkgs/tools/security/goverview/default.nix b/pkgs/tools/security/goverview/default.nix index 77f46526d95d..02038bf27b99 100644 --- a/pkgs/tools/security/goverview/default.nix +++ b/pkgs/tools/security/goverview/default.nix @@ -1,6 +1,7 @@ { lib , buildGoModule , fetchFromGitHub +, installShellFiles }: buildGoModule rec { @@ -20,6 +21,15 @@ buildGoModule rec { "-w" "-s" ]; + nativeBuildInputs = [ + installShellFiles + ]; + postInstall = '' + installShellCompletion --cmd goverview \ + --bash <($out/bin/goverview completion bash) \ + --fish <($out/bin/goverview completion fish) \ + --zsh <($out/bin/goverview completion zsh) + ''; # Tests require network access doCheck = false; From 6b48363b57f10147cc6f044d182ffa5a35754187 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Mon, 25 Dec 2023 18:52:09 +0100 Subject: [PATCH 051/168] ledfx: 2.0.80 -> 2.0.86 --- pkgs/applications/audio/ledfx/default.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/audio/ledfx/default.nix b/pkgs/applications/audio/ledfx/default.nix index 9efc5270fb22..a1a4cf3b33c6 100644 --- a/pkgs/applications/audio/ledfx/default.nix +++ b/pkgs/applications/audio/ledfx/default.nix @@ -5,18 +5,18 @@ python3.pkgs.buildPythonPackage rec { pname = "ledfx"; - version = "2.0.80"; + version = "2.0.86"; pyproject= true; src = fetchPypi { inherit pname version; - hash = "sha256-vwLk3EpXqUSAwzY2oX0ZpXrmH2cT0GdYdL/Mifav6mU="; + hash = "sha256-miOGMsrvK3A3SYnd+i/lqB+9GOHtO4F3RW8NkxDgFqU="; }; postPatch = '' substituteInPlace setup.py \ --replace "'rpi-ws281x>=4.3.0; platform_system == \"Linux\"'," "" \ - --replace "sentry-sdk==1.14.0" "sentry-sdk" \ + --replace "sentry-sdk==1.38.0" "sentry-sdk" \ --replace "~=" ">=" ''; @@ -32,12 +32,14 @@ python3.pkgs.buildPythonPackage rec { cython flux-led icmplib + mss multidict numpy openrgb-python paho-mqtt pillow psutil + pybase64 pyserial pystray python-mbedtls From 793994bac1be3ecc7a54e239cee5a0d3a7fadde1 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Mon, 25 Dec 2023 18:42:41 +0000 Subject: [PATCH 052/168] fwknop: pull fix for `autoconf-2.72` build pending upstream inclusion Without the change the build against `autoconf-2.72` fails as: fwknop> ./configure: line 18863: syntax error near unexpected token `;;' fwknop> ./configure: line 18863: ` ;;' --- pkgs/tools/security/fwknop/default.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/tools/security/fwknop/default.nix b/pkgs/tools/security/fwknop/default.nix index 5625ab47058d..6c4ce6507657 100644 --- a/pkgs/tools/security/fwknop/default.nix +++ b/pkgs/tools/security/fwknop/default.nix @@ -25,6 +25,14 @@ stdenv.mkDerivation rec { url = "https://github.com/mrash/fwknop/commit/a8214fd58bc46d23b64b3a55db023c7f5a5ea6af.patch"; sha256 = "0cp1350q66n455hpd3rdydb9anx66bcirza5gyyyy5232zgg58bi"; }) + + # Pull patch pending upstream inclusion for `autoconf-2.72` support: + # https://github.com/mrash/fwknop/pull/357 + (fetchpatch { + name = "autoconf-2.72.patch"; + url = "https://github.com/mrash/fwknop/commit/bee7958532338499e35c19e75937891c8113f7de.patch"; + hash = "sha256-lrro5dSDR0Zz9aO3bV5vFFADNJjoDR9z6P5lFYWyLW8="; + }) ]; nativeBuildInputs = [ autoreconfHook ]; From dd647021251a01a02e5bfe1af8465eab4f5423fb Mon Sep 17 00:00:00 2001 From: Kirill Radzikhovskyy Date: Tue, 26 Dec 2023 08:03:27 +0900 Subject: [PATCH 053/168] git-hound: 1.4 -> 1.7.2 --- .../version-management/git-hound/default.nix | 20 +++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/version-management/git-hound/default.nix b/pkgs/applications/version-management/git-hound/default.nix index 7a135b69a2e3..86efeef1c444 100644 --- a/pkgs/applications/version-management/git-hound/default.nix +++ b/pkgs/applications/version-management/git-hound/default.nix @@ -1,20 +1,32 @@ { buildGoModule , fetchFromGitHub +, fetchpatch , lib }: buildGoModule rec { pname = "git-hound"; - version = "1.4"; + version = "1.7.2"; src = fetchFromGitHub { owner = "tillson"; repo = pname; rev = "v${version}"; - sha256 = "sha256-HD5OK8HjnLDbyC/TmVI2HfBRIUCyyHTbA3JvKoeXV5E="; + hash = "sha256-W+rYDyRIw4jWWO4UZkUHFq/D/7ZXM+y5vdbclk6S0ro="; }; - vendorHash = null; + patches = [ + # https://github.com/tillson/git-hound/pull/66 + (fetchpatch { + url = "https://github.com/tillson/git-hound/commit/cd8aa19401cfdec9e4d76c1f6eb4d85928ec4b03.patch"; + hash = "sha256-EkdR2KkxxlMLNtKFGpxsQ/msJT5NcMF7irIUcU2WWJY="; + }) + ]; + + # tests fail outside of nix + doCheck = false; + + vendorHash = "sha256-8teIa083oMXm0SjzMP+mGOVAel1Hbsp3TSMhdvqVbQs="; meta = with lib; { description = "Reconnaissance tool for GitHub code search"; @@ -26,6 +38,6 @@ buildGoModule rec { homepage = "https://github.com/tillson/git-hound"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; - broken = true; # vendor isn't reproducible with go > 1.17: nix-build -A $name.goModules --check + mainProgram = "git-hound"; }; } From 3873eb4bcd61d8835d4b9bc264e5ed6ecb8cea39 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Felix=20Schr=C3=B6ter?= Date: Tue, 26 Dec 2023 00:59:21 +0100 Subject: [PATCH 054/168] tor-browser: 13.0.6 -> 13.0.8 https://blog.torproject.org/new-release-tor-browser-1307/ https://blog.torproject.org/new-release-tor-browser-1308/ --- .../networking/browsers/tor-browser/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/browsers/tor-browser/default.nix b/pkgs/applications/networking/browsers/tor-browser/default.nix index cd3711c5e967..9cc75e58d028 100644 --- a/pkgs/applications/networking/browsers/tor-browser/default.nix +++ b/pkgs/applications/networking/browsers/tor-browser/default.nix @@ -101,7 +101,7 @@ lib.warnIf (useHardenedMalloc != null) ++ lib.optionals mediaSupport [ ffmpeg ] ); - version = "13.0.6"; + version = "13.0.8"; sources = { x86_64-linux = fetchurl { @@ -111,7 +111,7 @@ lib.warnIf (useHardenedMalloc != null) "https://tor.eff.org/dist/torbrowser/${version}/tor-browser-linux-x86_64-${version}.tar.xz" "https://tor.calyxinstitute.org/dist/torbrowser/${version}/tor-browser-linux-x86_64-${version}.tar.xz" ]; - hash = "sha256-7T+PJEsGIge+JJOz6GiG8971lnnbQL2jdHfldNmT4jQ="; + hash = "sha256-eD+c4ACgWajmfMiqqk5HC30uJiqfNqvASepVoO7ox2w="; }; i686-linux = fetchurl { @@ -121,7 +121,7 @@ lib.warnIf (useHardenedMalloc != null) "https://tor.eff.org/dist/torbrowser/${version}/tor-browser-linux-i686-${version}.tar.xz" "https://tor.calyxinstitute.org/dist/torbrowser/${version}/tor-browser-linux-i686-${version}.tar.xz" ]; - hash = "sha256-nPhzUu1BYNij3toNRUFFxNVLZ2JnzDBFVlzo4cyskjY="; + hash = "sha256-ZQ0tSPyfzBWy27lX5+zI3Nuqqz5ZUv1T6lzapvYHc7A="; }; }; From 9a4106e62ca33c9f6b5c2906300a683a73da5ce6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Felix=20Schr=C3=B6ter?= Date: Tue, 26 Dec 2023 01:01:32 +0100 Subject: [PATCH 055/168] mullvad-browser: 13.0.6 -> 13.0.7 https://github.com/mullvad/mullvad-browser/releases/tag/13.0.7 --- .../networking/browsers/mullvad-browser/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/browsers/mullvad-browser/default.nix b/pkgs/applications/networking/browsers/mullvad-browser/default.nix index ff26d1534b2e..3ab9e53b209c 100644 --- a/pkgs/applications/networking/browsers/mullvad-browser/default.nix +++ b/pkgs/applications/networking/browsers/mullvad-browser/default.nix @@ -90,7 +90,7 @@ let ++ lib.optionals mediaSupport [ ffmpeg ] ); - version = "13.0.6"; + version = "13.0.7"; sources = { x86_64-linux = fetchurl { @@ -102,7 +102,7 @@ let "https://tor.eff.org/dist/mullvadbrowser/${version}/mullvad-browser-linux-x86_64-${version}.tar.xz" "https://tor.calyxinstitute.org/dist/mullvadbrowser/${version}/mullvad-browser-linux-x86_64-${version}.tar.xz" ]; - hash = "sha256-+CLMAXdyqp0HLe68lzp7p54n2HGZQPwZGckwVxOg4Pw="; + hash = "sha256-8x0Qa+NasMq1JdrVnCWlCyPb+5UpJXK1VLFoY9lx+8Q="; }; }; From 361628d8f983b25faf3d71268dca37c5b5189ee8 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 26 Dec 2023 01:36:28 +0000 Subject: [PATCH 056/168] sbctl: 0.12 -> 0.13 --- pkgs/tools/security/sbctl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/sbctl/default.nix b/pkgs/tools/security/sbctl/default.nix index 0778406b40cb..a5fe6cf6548c 100644 --- a/pkgs/tools/security/sbctl/default.nix +++ b/pkgs/tools/security/sbctl/default.nix @@ -8,13 +8,13 @@ buildGoModule rec { pname = "sbctl"; - version = "0.12"; + version = "0.13"; src = fetchFromGitHub { owner = "Foxboron"; repo = pname; rev = version; - hash = "sha256-1dA+a8GS4teaLmclatJNKt+OjhabLO4j/+p4Q95yG/s="; + hash = "sha256-vxPYWoBU4k2fKWXGaMzIkUdj+EmPWTtCvMwAVmsgKaE="; }; vendorHash = "sha256-kVXzHTONPCE1UeAnUiULjubJeZFD0DAxIk+w8/Dqs6c="; From c010cf1bea6a66556b1df30d5d8c98537ba9a63f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 26 Dec 2023 01:48:25 +0000 Subject: [PATCH 057/168] sptk: 4.1 -> 4.2 --- pkgs/development/libraries/sptk/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/sptk/default.nix b/pkgs/development/libraries/sptk/default.nix index 078d07a62825..3ad693ae5368 100644 --- a/pkgs/development/libraries/sptk/default.nix +++ b/pkgs/development/libraries/sptk/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "sptk"; - version = "4.1"; + version = "4.2"; src = fetchFromGitHub { owner = "sp-nitech"; repo = "SPTK"; rev = "v${version}"; - hash = "sha256-t8XVdKrrewfqefUnEz5xHgRHF0NThNQD1KGPMLOO/o8="; + hash = "sha256-lIyOcN2AR3ilUZ9stpicjbwlredbwgGPwmMICxZEijU="; }; nativeBuildInputs = [ From 05f0788fc4c492ed426238f58a2d247a8d0892f5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stanis=C5=82aw=20Pitucha?= Date: Tue, 26 Dec 2023 22:10:16 +1100 Subject: [PATCH 058/168] archivebox: 0.6.2 -> 0.7.1 --- pkgs/applications/misc/archivebox/default.nix | 30 +++++++++++++------ 1 file changed, 21 insertions(+), 9 deletions(-) diff --git a/pkgs/applications/misc/archivebox/default.nix b/pkgs/applications/misc/archivebox/default.nix index 42f9feb421fe..f2121de3789b 100644 --- a/pkgs/applications/misc/archivebox/default.nix +++ b/pkgs/applications/misc/archivebox/default.nix @@ -2,6 +2,10 @@ , python3 , fetchFromGitHub , fetchPypi +, curl +, wget +, ripgrep +, nodejs }: let @@ -34,6 +38,7 @@ let rev = "e43f383dae3a35237e42f6acfe1207a8e7e7bdf5"; hash = "sha256-NAMa78KhAuoJfp0Cb0Codz84sRfRQ1JhSLNYRI4GBPM="; }; + disabledTests = [ "test_should_highlight_bash_syntax_without_name" ]; }); }; }; @@ -41,26 +46,33 @@ in python.pkgs.buildPythonApplication rec { pname = "archivebox"; - version = "0.6.2"; + version = "0.7.1"; src = fetchPypi { inherit pname version; - sha256 = "sha256-zHty7lTra6yab9d0q3EqsPG3F+lrnZL6PjQAbL1A2NY="; + sha256 = "sha256-IBKYp6AKQTC6LiCS2KLGFy51/U18R+eYhbRdhrq8/pw="; }; propagatedBuildInputs = with python.pkgs; [ - requests - mypy-extensions + croniter + dateparser django django-extensions - dateparser - youtube-dl - python-crontab - croniter - w3lib ipython + mypy-extensions + pdm-backend + python-crontab + requests + w3lib + yt-dlp ]; + makeWrapperArgs = [ + "--prefix PATH : ${lib.makeBinPath [ curl wget ripgrep nodejs ]}" + ]; + + format = "pyproject"; + meta = with lib; { description = "Open source self-hosted web archiving"; homepage = "https://archivebox.io"; From 677196c25931a570d67aac4c6771d079f9111b67 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stanis=C5=82aw=20Pitucha?= Date: Tue, 26 Dec 2023 22:10:48 +1100 Subject: [PATCH 059/168] nodePackages.readability-extractor: init at 0.0.6 --- pkgs/applications/misc/archivebox/default.nix | 3 +- .../node-packages/node-packages.nix | 213 ++++++++++++++++++ pkgs/development/node-packages/overrides.nix | 5 + 3 files changed, 220 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/misc/archivebox/default.nix b/pkgs/applications/misc/archivebox/default.nix index f2121de3789b..dc713c5a1623 100644 --- a/pkgs/applications/misc/archivebox/default.nix +++ b/pkgs/applications/misc/archivebox/default.nix @@ -2,6 +2,7 @@ , python3 , fetchFromGitHub , fetchPypi +, nodePackages , curl , wget , ripgrep @@ -68,7 +69,7 @@ python.pkgs.buildPythonApplication rec { ]; makeWrapperArgs = [ - "--prefix PATH : ${lib.makeBinPath [ curl wget ripgrep nodejs ]}" + "--prefix PATH : ${lib.makeBinPath [ curl wget ripgrep nodejs nodePackages.readability-extractor ]}" ]; format = "pyproject"; diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix index a7e1580f8d58..bbe0fae83f45 100644 --- a/pkgs/development/node-packages/node-packages.nix +++ b/pkgs/development/node-packages/node-packages.nix @@ -7186,6 +7186,15 @@ let sha512 = "iA7+tyVqfrATAIsIRWQG+a7ZLLD0VaOCKV2Wd/v4mqIU3J9c4jx9p7S0nw1XH3gJCKNBOOwACOPYYSUu9pgT+w=="; }; }; + "@mozilla/readability-0.4.4" = { + name = "_at_mozilla_slash_readability"; + packageName = "@mozilla/readability"; + version = "0.4.4"; + src = fetchurl { + url = "https://registry.npmjs.org/@mozilla/readability/-/readability-0.4.4.tgz"; + sha512 = "MCgZyANpJ6msfvVMi6+A0UAsvZj//4OHREYUB9f2087uXHVoU+H+SWhuihvb1beKpM323bReQPRio0WNk2+V6g=="; + }; + }; "@msgpack/msgpack-2.8.0" = { name = "_at_msgpack_slash_msgpack"; packageName = "@msgpack/msgpack"; @@ -13846,6 +13855,15 @@ let sha512 = "ZQl7LOWaF5ePqqcX4hLuv/bLXYQNfNWw2c0/yX/TsPRKamzHcTGQnlCjHT3TsmkOUVEPS3crCxiPfdzE/Trlhg=="; }; }; + "acorn-globals-7.0.1" = { + name = "acorn-globals"; + packageName = "acorn-globals"; + version = "7.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/acorn-globals/-/acorn-globals-7.0.1.tgz"; + sha512 = "umOSDSDrfHbTNPuNpC2NSnnA3LUrqpevPb4T9jRx4MagXNS0rs+gwiTcAvqCRmsD6utzsrzNt+ebm00SNWiC3Q=="; + }; + }; "acorn-import-assertions-1.9.0" = { name = "acorn-import-assertions"; packageName = "acorn-import-assertions"; @@ -13936,6 +13954,15 @@ let sha512 = "FS7hV565M5l1R08MXqo8odwMTB02C2UqzB17RVgu9EyuYFBqJZ3/ZY97sQD5FewVu1UyDFc1yztUDrAwT0EypA=="; }; }; + "acorn-walk-8.3.1" = { + name = "acorn-walk"; + packageName = "acorn-walk"; + version = "8.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/acorn-walk/-/acorn-walk-8.3.1.tgz"; + sha512 = "TgUZgYvqZprrl7YldZNoa9OciCAyZR+Ejm9eXzKCmjsF5IKp/wgQ7Z/ZpjpGTIUPwrHQIcYeI8qDh4PsEwxMbw=="; + }; + }; "add-stream-1.0.0" = { name = "add-stream"; packageName = "add-stream"; @@ -23792,6 +23819,15 @@ let sha512 = "3VdM/SXBZX2omc9JF9nOPCtDaYQ67BGp5CoLpIQlO2KCAPETs8TcDHacF26jXadGbvUteZzRTeos2fhID5+ucQ=="; }; }; + "dompurify-2.4.7" = { + name = "dompurify"; + packageName = "dompurify"; + version = "2.4.7"; + src = fetchurl { + url = "https://registry.npmjs.org/dompurify/-/dompurify-2.4.7.tgz"; + sha512 = "kxxKlPEDa6Nc5WJi+qRgPbOAbgTpSULL+vI3NUXsZMlkJxTqYI9wg5ZTay2sFrdZRWHPWNi+EdAhcJf81WtoMQ=="; + }; + }; "dompurify-3.0.6" = { name = "dompurify"; packageName = "dompurify"; @@ -34288,6 +34324,15 @@ let sha512 = "u9Smc2G1USStM+s/x1ru5Sxrl6mPYCbByG1U/hUmqaVsm4tbNyS7CicOSRyuGQYZhTu0h84qkZZQ/I+dzizSVw=="; }; }; + "jsdom-21.1.2" = { + name = "jsdom"; + packageName = "jsdom"; + version = "21.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/jsdom/-/jsdom-21.1.2.tgz"; + sha512 = "sCpFmK2jv+1sjff4u7fzft+pUh2KSUbUrEHYHyfSIbGTIcmnjyp83qg6qLwdJ/I3LpTXx33ACxeRL7Lsyc6lGQ=="; + }; + }; "jsdom-22.1.0" = { name = "jsdom"; packageName = "jsdom"; @@ -41202,6 +41247,15 @@ let sha512 = "PbZERfeFdrHQOOXiAKOY0VPbykZy90ndPKk0d+CFDegTKmWp1VgOTz2xACVbr1BjCWxrQp68CXtvNsveFhqDJg=="; }; }; + "node-gyp-build-4.7.1" = { + name = "node-gyp-build"; + packageName = "node-gyp-build"; + version = "4.7.1"; + src = fetchurl { + url = "https://registry.npmjs.org/node-gyp-build/-/node-gyp-build-4.7.1.tgz"; + sha512 = "wTSrZ+8lsRRa3I3H8Xr65dLWSgCvY2l4AOnaeKdPA9TB/WYMPaTcrzf3rXvFoVvjKNVnu0CcWSx54qq9GKRUYg=="; + }; + }; "node-gyp-build-optional-packages-5.0.3" = { name = "node-gyp-build-optional-packages"; packageName = "node-gyp-build-optional-packages"; @@ -59662,6 +59716,15 @@ let sha512 = "wEBG1ftX4jcglPxgFCMJmZ2PLtSbJ2Peg6TmpJFTbe9GZYOQCDPdMYu/Tm0/bGZkw8paZnJY45J4K2PZrLYq8g=="; }; }; + "ws-8.15.1" = { + name = "ws"; + packageName = "ws"; + version = "8.15.1"; + src = fetchurl { + url = "https://registry.npmjs.org/ws/-/ws-8.15.1.tgz"; + sha512 = "W5OZiCjXEmk0yZ66ZN82beM5Sz7l7coYxpRkzS+p9PP+ToQry8szKh+61eNktr7EA9DOwvFGhfC605jDHbP6QQ=="; + }; + }; "ws-8.5.0" = { name = "ws"; packageName = "ws"; @@ -91081,6 +91144,156 @@ in bypassCache = true; reconstructLock = true; }; + readability-extractor = nodeEnv.buildNodePackage { + name = "readability-extractor"; + packageName = "readability-extractor"; + version = "0.0.6"; + src = fetchurl { + url = "https://registry.npmjs.org/readability-extractor/-/readability-extractor-0.0.6.tgz"; + sha512 = "JJNUfhxI6OH9ZH8tfHK/hvC8M17S0F6f58yU6904gOJIvAi+287nBA3W/H+6DvhbCw7WJTKKlF2IxMfUKrqh+g=="; + }; + dependencies = [ + sources."@mapbox/node-pre-gyp-1.0.11" + sources."@mozilla/readability-0.4.4" + sources."@tootallnate/once-2.0.0" + sources."abab-2.0.6" + sources."abbrev-1.1.1" + sources."acorn-8.11.2" + sources."acorn-globals-7.0.1" + sources."acorn-walk-8.3.1" + sources."agent-base-6.0.2" + sources."ansi-regex-5.0.1" + sources."aproba-2.0.0" + sources."are-we-there-yet-2.0.0" + sources."asynckit-0.4.0" + sources."balanced-match-1.0.2" + sources."brace-expansion-1.1.11" + sources."bufferutil-4.0.8" + sources."canvas-2.11.2" + sources."chownr-2.0.0" + sources."color-support-1.1.3" + sources."combined-stream-1.0.8" + sources."concat-map-0.0.1" + sources."console-control-strings-1.1.0" + sources."cssstyle-3.0.0" + sources."data-urls-4.0.0" + sources."debug-4.3.4" + sources."decimal.js-10.4.3" + sources."decompress-response-4.2.1" + sources."delayed-stream-1.0.0" + sources."delegates-1.0.0" + sources."detect-libc-2.0.2" + sources."domexception-4.0.0" + sources."dompurify-2.4.7" + sources."emoji-regex-8.0.0" + sources."encoding-0.1.13" + sources."entities-4.5.0" + sources."escodegen-2.1.0" + sources."esprima-4.0.1" + sources."estraverse-5.3.0" + sources."esutils-2.0.3" + sources."form-data-4.0.0" + (sources."fs-minipass-2.1.0" // { + dependencies = [ + sources."minipass-3.3.6" + ]; + }) + sources."fs.realpath-1.0.0" + sources."gauge-3.0.2" + sources."glob-7.2.3" + sources."has-unicode-2.0.1" + sources."html-encoding-sniffer-3.0.0" + sources."http-proxy-agent-5.0.0" + sources."https-proxy-agent-5.0.1" + sources."iconv-lite-0.6.3" + sources."inflight-1.0.6" + sources."inherits-2.0.4" + sources."is-fullwidth-code-point-3.0.0" + sources."is-potential-custom-element-name-1.0.1" + sources."jsdom-21.1.2" + sources."lru-cache-6.0.0" + (sources."make-dir-3.1.0" // { + dependencies = [ + sources."semver-6.3.1" + ]; + }) + sources."mime-db-1.52.0" + sources."mime-types-2.1.35" + sources."mimic-response-2.1.0" + sources."minimatch-3.1.2" + sources."minipass-5.0.0" + (sources."minizlib-2.1.2" // { + dependencies = [ + sources."minipass-3.3.6" + ]; + }) + sources."mkdirp-1.0.4" + sources."ms-2.1.2" + sources."nan-2.18.0" + (sources."node-fetch-2.7.0" // { + dependencies = [ + sources."tr46-0.0.3" + sources."webidl-conversions-3.0.1" + sources."whatwg-url-5.0.0" + ]; + }) + sources."node-gyp-build-4.7.1" + sources."nopt-5.0.0" + sources."npmlog-5.0.1" + sources."nwsapi-2.2.7" + sources."object-assign-4.1.1" + sources."once-1.4.0" + sources."parse5-7.1.2" + sources."path-is-absolute-1.0.1" + sources."psl-1.9.0" + sources."punycode-2.3.1" + sources."querystringify-2.2.0" + sources."readable-stream-3.6.2" + sources."requires-port-1.0.0" + sources."rimraf-3.0.2" + sources."rrweb-cssom-0.6.0" + sources."safe-buffer-5.2.1" + sources."safer-buffer-2.1.2" + sources."saxes-6.0.0" + sources."semver-7.5.4" + sources."set-blocking-2.0.0" + sources."signal-exit-3.0.7" + sources."simple-concat-1.0.1" + sources."simple-get-3.1.1" + sources."source-map-0.6.1" + sources."string-width-4.2.3" + sources."string_decoder-1.3.0" + sources."strip-ansi-6.0.1" + sources."symbol-tree-3.2.4" + sources."tar-6.2.0" + sources."tough-cookie-4.1.3" + sources."tr46-4.1.1" + sources."universalify-0.2.0" + sources."url-parse-1.5.10" + sources."utf-8-validate-6.0.3" + sources."util-deprecate-1.0.2" + sources."w3c-xmlserializer-4.0.0" + sources."webidl-conversions-7.0.0" + sources."whatwg-encoding-2.0.0" + sources."whatwg-mimetype-3.0.0" + sources."whatwg-url-12.0.1" + sources."wide-align-1.1.5" + sources."wrappy-1.0.2" + sources."ws-8.15.1" + sources."xml-name-validator-4.0.0" + sources."xmlchars-2.2.0" + sources."yallist-4.0.0" + ]; + buildInputs = globalBuildInputs; + meta = { + description = "Javascript wrapper around Mozilla Readability for ArchiveBox to call as a oneshot CLI to extract article text"; + homepage = "https://github.com/ArchiveBox/readability-extractor"; + license = "MIT"; + }; + production = true; + bypassCache = true; + reconstructLock = true; + }; remod-cli = nodeEnv.buildNodePackage { name = "remod-cli"; packageName = "remod-cli"; diff --git a/pkgs/development/node-packages/overrides.nix b/pkgs/development/node-packages/overrides.nix index 68f95a2f3b02..764d917d1d59 100644 --- a/pkgs/development/node-packages/overrides.nix +++ b/pkgs/development/node-packages/overrides.nix @@ -289,6 +289,11 @@ final: prev: { ''; }; + readability-extractor = prev.readability-extractor.override { + nativeBuildInputs = [ pkgs.pkg-config ]; + buildInputs = [ pkgs.pango ]; + }; + rush = prev."@microsoft/rush".override { name = "rush"; }; From f4c049b00bc26286269ba03cfcba20ea6fc17d5f Mon Sep 17 00:00:00 2001 From: Stanislaw Pitucha Date: Tue, 26 Dec 2023 04:01:25 +0000 Subject: [PATCH 060/168] nodePackages.postlight-parser: init at 2.2.3 --- pkgs/applications/misc/archivebox/default.nix | 2 +- .../node-packages/node-packages.json | 1 + .../node-packages/node-packages.nix | 253 ++++++++++++++++++ pkgs/development/node-packages/overrides.nix | 4 + 4 files changed, 259 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/misc/archivebox/default.nix b/pkgs/applications/misc/archivebox/default.nix index dc713c5a1623..7b3f1d8e2cae 100644 --- a/pkgs/applications/misc/archivebox/default.nix +++ b/pkgs/applications/misc/archivebox/default.nix @@ -69,7 +69,7 @@ python.pkgs.buildPythonApplication rec { ]; makeWrapperArgs = [ - "--prefix PATH : ${lib.makeBinPath [ curl wget ripgrep nodejs nodePackages.readability-extractor ]}" + "--prefix PATH : ${lib.makeBinPath [ curl wget ripgrep nodejs nodePackages.readability-extractor nodePackages.postlight-parser ]}" ]; format = "pyproject"; diff --git a/pkgs/development/node-packages/node-packages.json b/pkgs/development/node-packages/node-packages.json index df6dc59e3c11..73e72769aec8 100644 --- a/pkgs/development/node-packages/node-packages.json +++ b/pkgs/development/node-packages/node-packages.json @@ -6,6 +6,7 @@ , "@commitlint/cli" , "@commitlint/config-conventional" , "@microsoft/rush" +, "@postlight/parser" , "@shopify/cli" , "@tailwindcss/aspect-ratio" , "@tailwindcss/forms" diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix index bbe0fae83f45..d6b4689b6083 100644 --- a/pkgs/development/node-packages/node-packages.nix +++ b/pkgs/development/node-packages/node-packages.nix @@ -2893,6 +2893,15 @@ let sha512 = "cTIudHnzuWLS56ik4DnRnqqNf8MkdUzV4iFFI1h7Jo9xvrpQROYaAnaSd2mHLQAzzZAPfATynX5ord6YlNYNMA=="; }; }; + "@babel/runtime-corejs2-7.23.6" = { + name = "_at_babel_slash_runtime-corejs2"; + packageName = "@babel/runtime-corejs2"; + version = "7.23.6"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/runtime-corejs2/-/runtime-corejs2-7.23.6.tgz"; + sha512 = "k8QKC2DmBqkwJDOLa4biAZjoCGPQIaAoA1HvHtZ+gR2E9AauudikJOB34h4ETEavN5UG21X0KPdM3IvBRxM0CA=="; + }; + }; "@babel/template-7.22.15" = { name = "_at_babel_slash_template"; packageName = "@babel/template"; @@ -9076,6 +9085,15 @@ let sha512 = "OLkDZSqkA1mkoPNPvLFXyI6fb0enCuFji6Zfditi/CLAo9kmIhQFmEUDu4krSB8i908EljG8YwL5Xjxzm5wsWA=="; }; }; + "@postlight/ci-failed-test-reporter-1.0.26" = { + name = "_at_postlight_slash_ci-failed-test-reporter"; + packageName = "@postlight/ci-failed-test-reporter"; + version = "1.0.26"; + src = fetchurl { + url = "https://registry.npmjs.org/@postlight/ci-failed-test-reporter/-/ci-failed-test-reporter-1.0.26.tgz"; + sha512 = "xfXzxyOiKhco7Gx2OLTe9b66b0dFJw0elg94KGHoQXf5F8JqqFvdo35J8wayGOor64CSMvn+4Bjlu2NKV+yTGA=="; + }; + }; "@prisma/engines-5.6.0" = { name = "_at_prisma_slash_engines"; packageName = "@prisma/engines"; @@ -16708,6 +16726,15 @@ let sha512 = "suhjmLI57Ewpmq00qaygS8UgEq2ly2PCItenIyhMqVjo4t4pGzqMvfgJuX8iWTeSDdfSSqS6j38fL4ToNL7Pfg=="; }; }; + "bluebird-2.11.0" = { + name = "bluebird"; + packageName = "bluebird"; + version = "2.11.0"; + src = fetchurl { + url = "https://registry.npmjs.org/bluebird/-/bluebird-2.11.0.tgz"; + sha512 = "UfFSr22dmHPQqPP9XWHRhq+gWnHCYguQGkXQlbyPtW5qTnhFWA8/iXg765tH0cAjy7l/zPJ1aBTO0g5XgA7kvQ=="; + }; + }; "bluebird-3.4.7" = { name = "bluebird"; packageName = "bluebird"; @@ -23414,6 +23441,16 @@ let sha512 = "D+mk+qE8VC/PAUrlAU34N+VfXev0ghe5ywmpqrawphmVZc1bEfn56uo9qpyGp1p4xpzOHkSW4ztBd6L7Xx4ACw=="; }; }; + "difflib-git+https://github.com/postlight/difflib.js" = { + name = "difflib"; + packageName = "difflib"; + version = "0.2.6"; + src = fetchgit { + url = "https://github.com/postlight/difflib.js"; + rev = "32e8e38c7fcd935241b9baab71bb432fd9b166ed"; + sha256 = "83d7e1db8e541657ce440df7cd0ff7a8df63481fba940ea7f4e2b6d00c7f38f6"; + }; + }; "diff-match-patch-1.0.5" = { name = "diff-match-patch"; packageName = "diff-match-patch"; @@ -23963,6 +24000,15 @@ let sha512 = "IPzF4w4/Rd94bA9imS68tZBaYyBWSCE47V1RGuMrB94iyTOIEwRmVL2x/4An+6mETpLrKJ5hQkB8W4kFAadeIQ=="; }; }; + "dotenv-6.2.0" = { + name = "dotenv"; + packageName = "dotenv"; + version = "6.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/dotenv/-/dotenv-6.2.0.tgz"; + sha512 = "HygQCKUBSFl8wKQZBSemMywRWcEDNidvNbjGVyZu3nbZ8qq9ubiPoGLMdRDpfSrpkkm9BXYFkpKxxFX38o/76w=="; + }; + }; "dotenv-7.0.0" = { name = "dotenv"; packageName = "dotenv"; @@ -24305,6 +24351,15 @@ let sha512 = "L6uRgvZTH+4OF5NE/MBbzQx/WYpru1xCBE9respNj6qznEewGUIfhzmm7horWWxbNO2M0WckQypGctR8lH79xQ=="; }; }; + "ellipsize-0.1.0" = { + name = "ellipsize"; + packageName = "ellipsize"; + version = "0.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/ellipsize/-/ellipsize-0.1.0.tgz"; + sha512 = "5gxbEjcb/Z2n6TTmXZx9wVi3N/DOzE7RXY3Xg9dakDuhX/izwumB9rGjeWUV6dTA0D0+juvo+JonZgNR9sgA5A=="; + }; + }; "elliptic-6.5.4" = { name = "elliptic"; packageName = "elliptic"; @@ -31138,6 +31193,15 @@ let sha512 = "v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA=="; }; }; + "iconv-lite-0.5.0" = { + name = "iconv-lite"; + packageName = "iconv-lite"; + version = "0.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.5.0.tgz"; + sha512 = "NnEhI9hIEKHOzJ4f697DMz9IQEXr/MMJ5w64vN2/4Ai+wRnvV7SBrL0KLoRlwaKVghOc7LQ5YkPLuX146b6Ydw=="; + }; + }; "iconv-lite-0.6.3" = { name = "iconv-lite"; packageName = "iconv-lite"; @@ -40121,6 +40185,15 @@ let sha512 = "zp8slBaeHVn8VOr7aTVzXYYayoVtEF3XI9gmgimyR3PBZsBk4JlXlFgxmcKxRjBZ1voh9ao77u/qwMGSZVZ9+A=="; }; }; + "moment-parseformat-3.0.0" = { + name = "moment-parseformat"; + packageName = "moment-parseformat"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/moment-parseformat/-/moment-parseformat-3.0.0.tgz"; + sha512 = "dVgXe6b6DLnv4CHG7a1zUe5mSXaIZ3c6lSHm/EKeVeQI2/4pwe0VRde8OyoCE1Ro2lKT5P6uT9JElF7KDLV+jw=="; + }; + }; "moment-timezone-0.5.43" = { name = "moment-timezone"; packageName = "moment-timezone"; @@ -45666,6 +45739,24 @@ let sha512 = "z+16RoxK3fUPgwaIgH9NGnK1HKY9XIDpydky5eQGgAFVXTCSezalv9U2jQuNV+Z9qV1fDWNzldcw4eK0SSbqKA=="; }; }; + "postman-request-2.88.1-postman.8-beta.1" = { + name = "postman-request"; + packageName = "postman-request"; + version = "2.88.1-postman.8-beta.1"; + src = fetchurl { + url = "https://registry.npmjs.org/postman-request/-/postman-request-2.88.1-postman.8-beta.1.tgz"; + sha512 = "deC5UZlM1VimFhQdPN1NcbQMvLEtpUCTHZHMXWNv6vyNW7H98O3MJGTlk2xTlzB9BOpU2MCCgXNOPeNP2SU6iA=="; + }; + }; + "postman-url-encoder-1.0.1" = { + name = "postman-url-encoder"; + packageName = "postman-url-encoder"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/postman-url-encoder/-/postman-url-encoder-1.0.1.tgz"; + sha512 = "ned2lpcMpEG+n3ce2LEoGqUJeZsKNRYkViqKfJXe7rUQhLxjrrcp/lQ8TLycvX74lQZm52gkNVVgczmcJBOJ8w=="; + }; + }; "prebuild-install-7.1.1" = { name = "prebuild-install"; packageName = "prebuild-install"; @@ -47889,6 +47980,15 @@ let sha512 = "srw17NI0TUWHuGa5CFGGmhfNIeja30WMBfbslPNhf6JrqQlLN5gcrvig1oqPxiVaXb0oW0XRKtH6Nngs5lKCIA=="; }; }; + "regenerator-runtime-0.14.1" = { + name = "regenerator-runtime"; + packageName = "regenerator-runtime"; + version = "0.14.1"; + src = fetchurl { + url = "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.14.1.tgz"; + sha512 = "dYnhHh0nJoMfnkZs6GmmhFknAGRrLznOu5nc9ML+EJxGvrx6H7teuevqVqCuPcPK//3eDrrjQhehXVx9cnkGdw=="; + }; + }; "regenerator-transform-0.15.2" = { name = "regenerator-transform"; packageName = "regenerator-transform"; @@ -52335,6 +52435,15 @@ let sha512 = "HZfXngYHUAr1exT4fxlbc1IOce1RYxp2ldeaf97LYCOPSoOqY/1Psp7iGvpb+6JIOgkra9zDYnPX01hGAHzEPw=="; }; }; + "stream-length-1.0.2" = { + name = "stream-length"; + packageName = "stream-length"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/stream-length/-/stream-length-1.0.2.tgz"; + sha512 = "aI+qKFiwoDV4rsXiS7WRoCt+v2RX1nUj17+KJC5r2gfh5xoSJIfP6Y3Do/HtvesFcTSWthIuJ3l1cvKQY/+nZg=="; + }; + }; "stream-meter-1.0.4" = { name = "stream-meter"; packageName = "stream-meter"; @@ -52506,6 +52615,15 @@ let sha512 = "aqD2Q0144Z+/RqG52NeHEkZauTAUWJO8c6yTftGJKO3Tja5tUgIfmIl6kExvhtxSDP7fXB6DvzkfMpCd/F3G+Q=="; }; }; + "string-direction-0.1.2" = { + name = "string-direction"; + packageName = "string-direction"; + version = "0.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/string-direction/-/string-direction-0.1.2.tgz"; + sha512 = "NJHQRg6GlOEMLA6jEAlSy21KaXvJDNoAid/v6fBAJbqdvOEIiPpCrIPTHnl4636wUF/IGyktX5A9eddmETb1Cw=="; + }; + }; "string-env-interpolation-1.0.1" = { name = "string-env-interpolation"; packageName = "string-env-interpolation"; @@ -59743,6 +59861,15 @@ let sha512 = "bGy2JzvzkPowEJV++hF07hAD6niYSr0JzBNo/J29WsB57A2r7Wlc1UFcTR9IzrPvuNVO4B8LGqF8qcpsVOhJCA=="; }; }; + "wuzzy-0.1.8" = { + name = "wuzzy"; + packageName = "wuzzy"; + version = "0.1.8"; + src = fetchurl { + url = "https://registry.npmjs.org/wuzzy/-/wuzzy-0.1.8.tgz"; + sha512 = "FUzKQepFSTnANsDYwxpIzGJ/dIJaqxuMre6tzzbvWwFAiUHPsI1nVQVCLK4Xqr67KO7oYAK0kaCcI/+WYj/7JA=="; + }; + }; "xcase-2.0.1" = { name = "xcase"; packageName = "xcase"; @@ -90347,6 +90474,132 @@ in bypassCache = true; reconstructLock = true; }; + "@postlight/parser" = nodeEnv.buildNodePackage { + name = "_at_postlight_slash_parser"; + packageName = "@postlight/parser"; + version = "2.2.3"; + src = fetchurl { + url = "https://registry.npmjs.org/@postlight/parser/-/parser-2.2.3.tgz"; + sha512 = "4/syRvqJARgLN4yH8qtl634WO0+KINjkijU/SmhCJqqh8/aOfv5uQf+SquFpA+JwsAsbGzYQkIxSum29riOreg=="; + }; + dependencies = [ + sources."@babel/runtime-corejs2-7.23.6" + sources."@postlight/ci-failed-test-reporter-1.0.26" + sources."ajv-6.12.6" + sources."asn1-0.2.6" + sources."assert-plus-1.0.0" + sources."asynckit-0.4.0" + sources."aws-sign2-0.7.0" + sources."aws4-1.12.0" + sources."bcrypt-pbkdf-1.0.2" + sources."bluebird-2.11.0" + sources."boolbase-1.0.0" + sources."camelcase-5.3.1" + sources."caseless-0.12.0" + sources."cheerio-0.22.0" + sources."combined-stream-1.0.8" + sources."core-js-2.6.12" + sources."core-util-is-1.0.2" + sources."css-select-1.2.0" + sources."css-what-2.1.3" + sources."dashdash-1.14.1" + sources."decamelize-1.2.0" + sources."delayed-stream-1.0.0" + sources."difflib-git+https://github.com/postlight/difflib.js" + sources."dom-serializer-0.1.1" + sources."domelementtype-1.3.1" + sources."domhandler-2.4.2" + sources."domino-2.1.6" + sources."domutils-1.5.1" + sources."dotenv-6.2.0" + sources."ecc-jsbn-0.1.2" + sources."ellipsize-0.1.0" + (sources."encoding-0.1.13" // { + dependencies = [ + sources."iconv-lite-0.6.3" + ]; + }) + sources."entities-1.1.2" + sources."extend-3.0.2" + sources."extsprintf-1.3.0" + sources."fast-deep-equal-3.1.3" + sources."fast-json-stable-stringify-2.1.0" + sources."forever-agent-0.6.1" + sources."form-data-2.3.3" + sources."getpass-0.1.7" + sources."har-schema-2.0.0" + sources."har-validator-5.1.5" + sources."heap-0.2.7" + sources."htmlparser2-3.10.1" + sources."http-signature-1.2.0" + sources."iconv-lite-0.5.0" + sources."inherits-2.0.4" + sources."is-typedarray-1.0.0" + sources."isstream-0.1.2" + sources."jsbn-0.1.1" + sources."json-schema-0.4.0" + sources."json-schema-traverse-0.4.1" + sources."json-stringify-safe-5.0.1" + sources."jsprim-1.4.2" + sources."lodash-4.17.21" + sources."lodash.assignin-4.2.0" + sources."lodash.bind-4.2.1" + sources."lodash.defaults-4.2.0" + sources."lodash.filter-4.6.0" + sources."lodash.flatten-4.4.0" + sources."lodash.foreach-4.5.0" + sources."lodash.map-4.6.0" + sources."lodash.merge-4.6.2" + sources."lodash.pick-4.4.0" + sources."lodash.reduce-4.6.0" + sources."lodash.reject-4.6.0" + sources."lodash.some-4.6.0" + sources."mime-db-1.52.0" + sources."mime-types-2.1.35" + sources."moment-2.29.4" + sources."moment-parseformat-3.0.0" + sources."node-fetch-2.7.0" + sources."nth-check-1.0.2" + sources."oauth-sign-0.9.0" + sources."performance-now-2.1.0" + sources."postman-request-2.88.1-postman.8-beta.1" + sources."postman-url-encoder-1.0.1" + sources."psl-1.9.0" + sources."punycode-2.3.1" + sources."qs-6.5.3" + sources."readable-stream-3.6.2" + sources."regenerator-runtime-0.14.1" + sources."safe-buffer-5.2.1" + sources."safer-buffer-2.1.2" + sources."sshpk-1.18.0" + sources."stream-length-1.0.2" + sources."string-direction-0.1.2" + sources."string_decoder-1.3.0" + sources."tough-cookie-2.5.0" + sources."tr46-0.0.3" + sources."tunnel-agent-0.6.0" + sources."turndown-7.1.2" + sources."tweetnacl-0.14.5" + sources."uri-js-4.4.1" + sources."util-deprecate-1.0.2" + sources."uuid-3.4.0" + sources."valid-url-1.0.9" + sources."verror-1.10.0" + sources."webidl-conversions-3.0.1" + sources."whatwg-url-5.0.0" + sources."wuzzy-0.1.8" + sources."yargs-parser-15.0.3" + ]; + buildInputs = globalBuildInputs; + meta = { + description = "Postlight Parser transforms web pages into clean text. Publishers and programmers use it to make the web make sense, and readers use it to read any web article comfortably."; + homepage = "https://reader.postlight.com"; + license = "MIT"; + }; + production = true; + bypassCache = true; + reconstructLock = true; + }; prebuild-install = nodeEnv.buildNodePackage { name = "prebuild-install"; packageName = "prebuild-install"; diff --git a/pkgs/development/node-packages/overrides.nix b/pkgs/development/node-packages/overrides.nix index 764d917d1d59..c8b00ed6d6b7 100644 --- a/pkgs/development/node-packages/overrides.nix +++ b/pkgs/development/node-packages/overrides.nix @@ -250,6 +250,10 @@ final: prev: { }; }); + postlight-parser = prev."@postlight/parser".override { + name = "postlight-parser"; + }; + # To update prisma, please first update prisma-engines to the latest # version. Then change the correct hash to this package. The PR should hold # two commits: one for the engines and the other one for the node package. From 7dec18cf66fb198fc996d6da5c788872591ebdd4 Mon Sep 17 00:00:00 2001 From: YMSTNT <21342713+YMSTNT@users.noreply.github.com> Date: Tue, 26 Dec 2023 13:27:48 +0100 Subject: [PATCH 061/168] hifile: 0.9.9.6 -> 0.9.9.7 https://www.hifile.app/changelog --- pkgs/by-name/hi/hifile/package.nix | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/hi/hifile/package.nix b/pkgs/by-name/hi/hifile/package.nix index 8c8f9707a7d3..d4a0c568b4ec 100644 --- a/pkgs/by-name/hi/hifile/package.nix +++ b/pkgs/by-name/hi/hifile/package.nix @@ -1,20 +1,19 @@ { lib, appimageTools, fetchurl }: let - version = "0.9.9.6"; + version = "0.9.9.7"; pname = "hifile"; src = fetchurl { url = "https://www.hifile.app/files/HiFile-${version}.AppImage"; - hash = "sha256-qfBV4w4nChH2wUAHdcUFwVs+3OeqcKqMJ8WUucn31q4="; + hash = "sha256-/vFW+jHmtCEioJt0B5TnNDsaIyFlDuVABnHNccm6iEw="; }; appimageContents = appimageTools.extractType2 { inherit pname version src; }; -in -appimageTools.wrapType2 rec { +in appimageTools.wrapType2 rec { inherit pname version src; extraInstallCommands = '' From 7c694debb47220b0e18b2f78b3d74c6cf83928eb Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 26 Dec 2023 13:37:28 +0000 Subject: [PATCH 062/168] k8sgpt: 0.3.19 -> 0.3.24 --- pkgs/applications/networking/cluster/k8sgpt/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/k8sgpt/default.nix b/pkgs/applications/networking/cluster/k8sgpt/default.nix index 69e8427be027..87afcd7bdf79 100644 --- a/pkgs/applications/networking/cluster/k8sgpt/default.nix +++ b/pkgs/applications/networking/cluster/k8sgpt/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "k8sgpt"; - version = "0.3.19"; + version = "0.3.24"; src = fetchFromGitHub { owner = "k8sgpt-ai"; repo = "k8sgpt"; rev = "v${version}"; - hash = "sha256-yXlcTU0efgjcWy4nlhEIjd9dzErKyAW9gFhacOXv6pA="; + hash = "sha256-GxZDbG2G+TFd2lPpEqP1hIDXFJDOLh4Y7yZsHodok/c="; }; - vendorHash = "sha256-/yibMktAzoUCGED8oJWmNZJxOY0UM0zMl4Qww6olOZY="; + vendorHash = "sha256-N/Qd51EmvTWy48Pj+UywBCRDG+k2zd6NTzGGm4jNyjQ="; CGO_ENABLED = 0; From 791d5780bc1bdc36f677ccd8f96033191716e5b5 Mon Sep 17 00:00:00 2001 From: Paul Meyer <49727155+katexochen@users.noreply.github.com> Date: Tue, 26 Dec 2023 16:07:59 +0100 Subject: [PATCH 063/168] k9s: 0.30.2 -> 0.30.3 --- pkgs/applications/networking/cluster/k9s/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/k9s/default.nix b/pkgs/applications/networking/cluster/k9s/default.nix index 4246b8189427..31d36fbc54e4 100644 --- a/pkgs/applications/networking/cluster/k9s/default.nix +++ b/pkgs/applications/networking/cluster/k9s/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "k9s"; - version = "0.30.2"; + version = "0.30.3"; src = fetchFromGitHub { owner = "derailed"; repo = "k9s"; rev = "v${version}"; - hash = "sha256-sAXbiK8jba2SDDlhUWbecOPDMBQXXfPEmnnY5cj3WHs="; + hash = "sha256-gwVDgHRtn3btbOTuJFcHzkrqU6oBwjYwMI3vbSYevhw="; }; ldflags = [ From 4f12789c352d762dc6f80b13ea28411eaa0b9a60 Mon Sep 17 00:00:00 2001 From: Steve Purcell Date: Tue, 26 Dec 2023 16:45:59 +0000 Subject: [PATCH 064/168] melpa2nix: update to work with Emacs HEAD We now use a newer version of package-build, since previously-necessary functions have been moved/removed from package.el Emacs 30. See https://github.com/melpa/package-build/pull/87 Consequently, some changes are necessary to the corresponding patch and to melpa2nix.el, which this commit also contains. --- pkgs/build-support/emacs/melpa.nix | 4 +- pkgs/build-support/emacs/melpa2nix.el | 26 +++++------ .../emacs/package-build-dont-use-mtime.patch | 43 ++++++------------- 3 files changed, 27 insertions(+), 46 deletions(-) diff --git a/pkgs/build-support/emacs/melpa.nix b/pkgs/build-support/emacs/melpa.nix index 85bc8aa37b3a..83654cf47144 100644 --- a/pkgs/build-support/emacs/melpa.nix +++ b/pkgs/build-support/emacs/melpa.nix @@ -40,8 +40,8 @@ import ./generic.nix { inherit lib stdenv emacs texinfo writeText gcc; } ({ src = fetchFromGitHub { owner = "melpa"; repo = "package-build"; - rev = "c3c535e93d9dc92acd21ebc4b15016b5c3b90e7d"; - sha256 = "17z0wbqdd6fspbj43yq8biff6wfggk74xgnaf1xx6ynsp1i74is5"; + rev = "c48aa078c01b4f07b804270c4583a0a58ffea1c0"; + sha256 = "sha256-MzPj375upIiYXdQR+wWXv3A1zMqbSrZlH0taLuxx/1M="; }; patches = [ ./package-build-dont-use-mtime.patch ]; diff --git a/pkgs/build-support/emacs/melpa2nix.el b/pkgs/build-support/emacs/melpa2nix.el index 72667dea652c..3de77dbf5e5c 100644 --- a/pkgs/build-support/emacs/melpa2nix.el +++ b/pkgs/build-support/emacs/melpa2nix.el @@ -11,22 +11,22 @@ ;; Allow installing package tarfiles larger than 10MB (setq large-file-warning-threshold nil) -(defun melpa2nix-build-package-1 (rcp version commit) - (let ((source-dir (package-recipe--working-tree rcp))) +(defun melpa2nix-build-package-1 (rcp) + (let* ((default-directory (package-recipe--working-tree rcp))) (unwind-protect (let ((files (package-build-expand-files-spec rcp t))) - (cond - ((= (length files) 1) - (package-build--build-single-file-package - rcp version commit files source-dir)) - ((> (length files) 1) - (package-build--build-multi-file-package - rcp version commit files source-dir)) - (t (error "Unable to find files matching recipe patterns"))))))) + (unless files + (error "Unable to find files matching recipe patterns")) + (if (> (length files) 1) + (package-build--build-multi-file-package rcp files) + (package-build--build-single-file-package rcp files)))))) (defun melpa2nix-build-package () - (if (not noninteractive) - (error "`melpa2nix-build-package' is to be used only with -batch")) + (unless noninteractive + (error "`melpa2nix-build-package' is to be used only with -batch")) (pcase command-line-args-left (`(,package ,version ,commit) - (melpa2nix-build-package-1 (package-recipe-lookup package) version commit)))) + (let ((recipe (package-recipe-lookup package))) + (setf (oref recipe commit) commit) + (setf (oref recipe version) version) + (melpa2nix-build-package-1 recipe))))) diff --git a/pkgs/build-support/emacs/package-build-dont-use-mtime.patch b/pkgs/build-support/emacs/package-build-dont-use-mtime.patch index fe94de57a300..1ace7771ea3a 100644 --- a/pkgs/build-support/emacs/package-build-dont-use-mtime.patch +++ b/pkgs/build-support/emacs/package-build-dont-use-mtime.patch @@ -1,40 +1,21 @@ diff --git a/package-build.el b/package-build.el -index e572045..9eb0f82 100644 +index 29cdb61..c19be1b 100644 --- a/package-build.el +++ b/package-build.el -@@ -415,7 +415,7 @@ (defun package-build--write-pkg-file (desc dir) - (princ ";; Local Variables:\n;; no-byte-compile: t\n;; End:\n" - (current-buffer))))) - --(defun package-build--create-tar (name version directory mtime) -+(defun package-build--create-tar (name version directory) - "Create a tar file containing the contents of VERSION of package NAME. - DIRECTORY is a temporary directory that contains the directory - that is put in the tarball. MTIME is used as the modification -@@ -434,7 +434,7 @@ (defun package-build--create-tar (name version directory mtime) - ;; prevent a reproducable tarball as described at +@@ -923,7 +923,6 @@ DIRECTORY is a temporary directory that contains the directory + that is put in the tarball." + (let* ((name (oref rcp name)) + (version (oref rcp version)) +- (time (oref rcp time)) + (tar (expand-file-name (concat name "-" version ".tar") + package-build-archive-dir)) + (dir (concat name "-" version))) +@@ -939,7 +938,7 @@ that is put in the tarball." + ;; prevent a reproducible tarball as described at ;; https://reproducible-builds.org/docs/archives. "--sort=name" -- (format "--mtime=@%d" mtime) +- (format "--mtime=@%d" time) + "--mtime=@0" "--owner=0" "--group=0" "--numeric-owner" "--pax-option=exthdr.name=%d/PaxHeaders/%f,delete=atime,delete=ctime")) (when (and package-build-verbose noninteractive) -@@ -848,12 +848,11 @@ (defun package-build--build-multi-file-package (rcp version commit files source- - (package-build--desc-from-library - name version commit files 'tar) - (error "%s[-pkg].el matching package name is missing" -- name)))) -- (mtime (package-build--get-commit-time rcp commit))) -+ name))))) - (package-build--copy-package-files files source-dir target) - (package-build--write-pkg-file desc target) - (package-build--generate-info-files files source-dir target) -- (package-build--create-tar name version tmp-dir mtime) -+ (package-build--create-tar name version tmp-dir) - (package-build--write-pkg-readme name files source-dir) - (package-build--write-archive-entry desc)) - (delete-directory tmp-dir t nil)))) --- -2.37.2 - From 019072b0e8f34484b98fd227dce1d46d6d1efb01 Mon Sep 17 00:00:00 2001 From: Paul Meyer <49727155+katexochen@users.noreply.github.com> Date: Tue, 26 Dec 2023 20:28:27 +0100 Subject: [PATCH 065/168] k9s: 0.30.3 -> 0.30.4 --- pkgs/applications/networking/cluster/k9s/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/k9s/default.nix b/pkgs/applications/networking/cluster/k9s/default.nix index 31d36fbc54e4..124431b8dfc4 100644 --- a/pkgs/applications/networking/cluster/k9s/default.nix +++ b/pkgs/applications/networking/cluster/k9s/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "k9s"; - version = "0.30.3"; + version = "0.30.4"; src = fetchFromGitHub { owner = "derailed"; repo = "k9s"; rev = "v${version}"; - hash = "sha256-gwVDgHRtn3btbOTuJFcHzkrqU6oBwjYwMI3vbSYevhw="; + hash = "sha256-P06hKqVu/aUttjwdFVCvzC80WWbQn94bXk3LVl/97yw="; }; ldflags = [ @@ -23,7 +23,7 @@ buildGoModule rec { proxyVendor = true; - vendorHash = "sha256-A8kqMwRMl1Jdonz9Ii79pvwA8RKg8+7XVe1VlPBVhFA="; + vendorHash = "sha256-Exn4NYegZWrItBoGVb97GUDRhhfeSJUEdr7xJnxcRMI="; # TODO investigate why some config tests are failing doCheck = !(stdenv.isDarwin && stdenv.isAarch64); From c68f4ec19f529ac204c0a82f242c6cb2e6ef4ec9 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 26 Dec 2023 23:09:22 +0000 Subject: [PATCH 066/168] smplayer: 23.6.0.10170 -> 23.12.0 --- pkgs/applications/video/smplayer/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/video/smplayer/default.nix b/pkgs/applications/video/smplayer/default.nix index 8cd967606041..513468cb16cf 100644 --- a/pkgs/applications/video/smplayer/default.nix +++ b/pkgs/applications/video/smplayer/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "smplayer"; - version = "23.6.0.10170"; + version = "23.12.0"; src = fetchFromGitHub { owner = "smplayer-dev"; repo = "smplayer"; rev = "v${finalAttrs.version}"; - hash = "sha256-ByheWIXvCw9jL3lY63oRzRZhl0jZz4jr+rw5Wi7Mm8w="; + hash = "sha256-ip4y9GF2u1yl1Ts8T9XcFg9wdXVTYXfDrrPuHLz6oSs="; }; nativeBuildInputs = [ From 58f6aba98bf51ad194a4d4c34fdcfcbad3d84272 Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Tue, 26 Dec 2023 19:29:11 -0500 Subject: [PATCH 067/168] wasmer: 4.2.1 -> 4.2.5 Diff: https://github.com/wasmerio/wasmer/compare/refs/tags/v4.2.1...v4.2.5 --- pkgs/development/interpreters/wasmer/default.nix | 8 ++++---- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/interpreters/wasmer/default.nix b/pkgs/development/interpreters/wasmer/default.nix index 22b26c5345f0..af9925369572 100644 --- a/pkgs/development/interpreters/wasmer/default.nix +++ b/pkgs/development/interpreters/wasmer/default.nix @@ -14,16 +14,16 @@ rustPlatform.buildRustPackage rec { pname = "wasmer"; - version = "4.2.1"; + version = "4.2.5"; src = fetchFromGitHub { owner = "wasmerio"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-GROw9TYKC53ECJUeYhCez8f2jImPla/lGgsP91tTGjQ="; + hash = "sha256-zCaN0F6a8qkZkOmHMU0D70KaY4H8pUXElJbyvOCjogc="; }; - cargoHash = "sha256-JE7FDF4MWhqJbL7ZP+yzfV7/Z79x0NuQLYNwWwMjAao="; + cargoHash = "sha256-ugysqLQlnSzm0W4zW6LPSn6KjwpAtJZGEkzk/nWahWg="; nativeBuildInputs = [ rustPlatform.bindgenHook @@ -52,7 +52,7 @@ rustPlatform.buildRustPackage rec { cargoBuildFlags = [ "--manifest-path" "lib/cli/Cargo.toml" "--bin" "wasmer" ]; - env.LLVM_SYS_140_PREFIX = lib.optionalString withLLVM llvmPackages.llvm.dev; + env.LLVM_SYS_150_PREFIX = lib.optionalString withLLVM llvmPackages.llvm.dev; # Tests are failing due to `Cannot allocate memory` and other reasons doCheck = false; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5ba31c6d6db2..119a5e971e0a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -41375,7 +41375,7 @@ with pkgs; wamr = darwin.apple_sdk_11_0.callPackage ../development/interpreters/wamr { }; wasmer = callPackage ../development/interpreters/wasmer { - llvmPackages = llvmPackages_14; + llvmPackages = llvmPackages_15; inherit (darwin.apple_sdk.frameworks) CoreFoundation SystemConfiguration Security; }; From cd791f62321f3df3ad0b93393ea636f5175d96ff Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Tue, 26 Dec 2023 19:43:10 -0500 Subject: [PATCH 068/168] wasmer: add nickcao to maintainers --- pkgs/development/interpreters/wasmer/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/interpreters/wasmer/default.nix b/pkgs/development/interpreters/wasmer/default.nix index af9925369572..f5621cd57d18 100644 --- a/pkgs/development/interpreters/wasmer/default.nix +++ b/pkgs/development/interpreters/wasmer/default.nix @@ -67,6 +67,6 @@ rustPlatform.buildRustPackage rec { ''; homepage = "https://wasmer.io/"; license = licenses.mit; - maintainers = with maintainers; [ Br1ght0ne shamilton ]; + maintainers = with maintainers; [ Br1ght0ne shamilton nickcao ]; }; } From 4d2e0e140d98384ce7fd881179cd6a4ccb4e719b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 27 Dec 2023 03:17:28 +0000 Subject: [PATCH 069/168] magic-vlsi: 8.3.453 -> 8.3.454 --- pkgs/applications/science/electronics/magic-vlsi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/electronics/magic-vlsi/default.nix b/pkgs/applications/science/electronics/magic-vlsi/default.nix index 77ee3d97c9c8..2e4ef8003d15 100644 --- a/pkgs/applications/science/electronics/magic-vlsi/default.nix +++ b/pkgs/applications/science/electronics/magic-vlsi/default.nix @@ -13,11 +13,11 @@ stdenv.mkDerivation rec { pname = "magic-vlsi"; - version = "8.3.453"; + version = "8.3.454"; src = fetchurl { url = "http://opencircuitdesign.com/magic/archive/magic-${version}.tgz"; - sha256 = "sha256-1G8vm9AGboIElufXUIa9ZABaHVjx4UiBNA0ZTYeuVtU="; + sha256 = "sha256-nHZJ2L54J2x+H7S29TeGPInTgjEhRFv3h2ki0ccGYB0="; }; nativeBuildInputs = [ python3 ]; From 18854f9813afb8f55e00ca8022f2f3401f8efd11 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 27 Dec 2023 03:59:18 +0000 Subject: [PATCH 070/168] mediamtx: 1.4.0 -> 1.4.1 --- pkgs/servers/mediamtx/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/mediamtx/default.nix b/pkgs/servers/mediamtx/default.nix index 335cb2510404..b7a7688fef5e 100644 --- a/pkgs/servers/mediamtx/default.nix +++ b/pkgs/servers/mediamtx/default.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "mediamtx"; - version = "1.4.0"; + version = "1.4.1"; src = fetchFromGitHub { owner = "bluenviron"; repo = pname; rev = "v${version}"; - hash = "sha256-o4O0WoLnGFz/cV6GC92yFwdu5dSAE8x906Ln6JfaJdY="; + hash = "sha256-HdFq48+jpkl3UkfTyyrYllK5WM4ij4Qwqmf1bNstLAY="; }; - vendorHash = "sha256-8pFD51uf7CCAI9gart/QkcrBifeiJkyTYu8nIC83j7o="; + vendorHash = "sha256-Z9lm6Gw8q/6kK3AjF1A6zMryUJaKAO9bhXvBoBdlTaM="; # Tests need docker doCheck = false; From 2c22ab16b3e478bfa023cf8012a8d5485c1c8ecb Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Wed, 27 Dec 2023 04:20:00 +0000 Subject: [PATCH 071/168] flexget: 3.10.6 -> 3.11.2 Diff: https://github.com/Flexget/Flexget/compare/refs/tags/v3.10.6...v3.11.2 Changelog: https://github.com/Flexget/Flexget/releases/tag/v3.11.2 --- pkgs/applications/networking/flexget/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/flexget/default.nix b/pkgs/applications/networking/flexget/default.nix index 4d1129e15ba4..8563b71a9faa 100644 --- a/pkgs/applications/networking/flexget/default.nix +++ b/pkgs/applications/networking/flexget/default.nix @@ -24,15 +24,15 @@ let in python.pkgs.buildPythonApplication rec { pname = "flexget"; - version = "3.10.6"; - format = "pyproject"; + version = "3.11.2"; + pyproject = true; # Fetch from GitHub in order to use `requirements.in` src = fetchFromGitHub { owner = "Flexget"; repo = "Flexget"; rev = "refs/tags/v${version}"; - hash = "sha256-cDfeSCG+L8ALCC2CdfKIPzqMrWtwwN6KSvZS5n8rdXQ="; + hash = "sha256-IM3qVn+XAv0EvRYc7ujMU4NPly5IaxF0efHAgI/lyms="; }; postPatch = '' @@ -60,6 +60,7 @@ python.pkgs.buildPythonApplication rec { loguru more-itertools packaging + pendulum psutil pynzb pyrsistent From 5ddf5db9d244c7a455e434c6daa6bb7082bf1652 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Wed, 27 Dec 2023 04:20:00 +0000 Subject: [PATCH 072/168] python311Packages.internetarchive: 3.5.0 -> 3.6.0 Diff: https://github.com/jjjake/internetarchive/compare/v3.5.0...v3.6.0 Changelog: https://github.com/jjjake/internetarchive/raw/v3.6.0/HISTORY.rst --- pkgs/development/python-modules/internetarchive/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/internetarchive/default.nix b/pkgs/development/python-modules/internetarchive/default.nix index a9baf843076c..797f24eee83a 100644 --- a/pkgs/development/python-modules/internetarchive/default.nix +++ b/pkgs/development/python-modules/internetarchive/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "internetarchive"; - version = "3.5.0"; + version = "3.6.0"; format = "pyproject"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "jjjake"; repo = "internetarchive"; rev = "v${version}"; - hash = "sha256-apBzx1qMHEA0wiWh82sS7I+AaiMEoAchhPsrtAgujbQ="; + hash = "sha256-hy5e6DEAwLKn0l2nJD7fyW5r4ZZiH+fuTEDLQen+dNk="; }; propagatedBuildInputs = [ From 02a8ba0e0a55cc40bf1ce0d720fe934111c7eaf0 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Wed, 27 Dec 2023 04:20:00 +0000 Subject: [PATCH 073/168] python311Packages.youtube-transcript-api: 0.6.1 -> 0.6.2 Diff: https://github.com/jdepoix/youtube-transcript-api/compare/refs/tags/v0.6.1...v0.6.2 Changelog: https://github.com/jdepoix/youtube-transcript-api/releases/tag/v0.6.2 --- .../python-modules/youtube-transcript-api/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/youtube-transcript-api/default.nix b/pkgs/development/python-modules/youtube-transcript-api/default.nix index 560810323f2d..79d9c4a174b8 100644 --- a/pkgs/development/python-modules/youtube-transcript-api/default.nix +++ b/pkgs/development/python-modules/youtube-transcript-api/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "youtube-transcript-api"; - version = "0.6.1"; + version = "0.6.2"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "jdepoix"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-7s2qzmfYkaQ7xAi/U+skOEVTAj2gp+2WnODu9k1ojJY="; + hash = "sha256-xCB1XhXRq4jxyfst/n2wXj2k4dERm+/bVUJwP8b70gQ="; }; propagatedBuildInputs = [ From 8436b74ea63db57e46126a96cde16839a0f24111 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 27 Dec 2023 04:33:06 +0000 Subject: [PATCH 074/168] minio: 2023-12-14T18-51-57Z -> 2023-12-23T07-19-11Z --- pkgs/servers/minio/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/minio/default.nix b/pkgs/servers/minio/default.nix index 28436ca33706..53fe4a2fc4c2 100644 --- a/pkgs/servers/minio/default.nix +++ b/pkgs/servers/minio/default.nix @@ -21,16 +21,16 @@ let in buildGoModule rec { pname = "minio"; - version = "2023-12-14T18-51-57Z"; + version = "2023-12-23T07-19-11Z"; src = fetchFromGitHub { owner = "minio"; repo = "minio"; rev = "RELEASE.${version}"; - sha256 = "sha256-UVl6rDm2BlTtmoTcTwCpgm7EdgUVqMi3kPQ/pLVc4kw="; + sha256 = "sha256-1tgJraaF40GSBAnczzf0tdJMH8AXORmhpnEpVxe5yjc="; }; - vendorHash = "sha256-0MLQPqua3FC0524drTnlbiqlkGSIBSm0YiYW871cnmU="; + vendorHash = "sha256-TGdMKzpMRAEE1TpEU6IJKu3A6A1uC2BtifDxCfH9Fd0="; doCheck = false; From 7fc15b617cfc97b76f03fd0687ca1bb11eafbd85 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 27 Dec 2023 07:50:26 +0000 Subject: [PATCH 075/168] npm-check-updates: 16.13.0 -> 16.14.0 --- pkgs/tools/package-management/npm-check-updates/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/package-management/npm-check-updates/default.nix b/pkgs/tools/package-management/npm-check-updates/default.nix index 93585593a494..6e01d4415efc 100644 --- a/pkgs/tools/package-management/npm-check-updates/default.nix +++ b/pkgs/tools/package-management/npm-check-updates/default.nix @@ -5,16 +5,16 @@ buildNpmPackage rec { pname = "npm-check-updates"; - version = "16.13.0"; + version = "16.14.0"; src = fetchFromGitHub { owner = "raineorshine"; repo = "npm-check-updates"; rev = "v${version}"; - hash = "sha256-RrNO1TAPNFB/6JWY8xZjNCZ+FDgM0MCn7vaDXoCSIfI="; + hash = "sha256-X8Mu4Fd650H7eA2nfoefmr4jW974qLBLurmj2H4t7xY="; }; - npmDepsHash = "sha256-aghW4d3/8cJmwpmI5PcHioCnc91Yu4N5EfwuoaB5Xqw="; + npmDepsHash = "sha256-wm7/WlzqfE7DOT0jUTXBivlC9J8dyHa/OVSgi2SdO5w="; meta = { changelog = "https://github.com/raineorshine/npm-check-updates/blob/${src.rev}/CHANGELOG.md"; From 7f719d40910163c867af1a80deb40dee282301b1 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 27 Dec 2023 08:45:59 +0000 Subject: [PATCH 076/168] octavePackages.dicom: 0.5.1 -> 0.6.0 --- pkgs/development/octave-modules/dicom/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/octave-modules/dicom/default.nix b/pkgs/development/octave-modules/dicom/default.nix index e8f02deff546..30d63eebe36d 100644 --- a/pkgs/development/octave-modules/dicom/default.nix +++ b/pkgs/development/octave-modules/dicom/default.nix @@ -7,11 +7,11 @@ buildOctavePackage rec { pname = "dicom"; - version = "0.5.1"; + version = "0.6.0"; src = fetchurl { url = "mirror://sourceforge/octave/${pname}-${version}.tar.gz"; - sha256 = "sha256-0qNqjpJWWBA0N5IgjV0e0SPQlCvbzIwnIgaWo+2wKw0="; + sha256 = "sha256-CFspqPJDSU1Pg+o6dub1/+g+mPDps9sPlus6keDj6h0="; }; nativeBuildInputs = [ From f1142d6be5edd5c9633e0894309eacc48bbfb3b5 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 27 Dec 2023 09:00:51 +0000 Subject: [PATCH 077/168] odin: dev-2023-11 -> dev-2023-12 --- pkgs/development/compilers/odin/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/odin/default.nix b/pkgs/development/compilers/odin/default.nix index 152ee99fcb1c..0197c0888a11 100644 --- a/pkgs/development/compilers/odin/default.nix +++ b/pkgs/development/compilers/odin/default.nix @@ -12,13 +12,13 @@ let inherit (llvmPackages) stdenv; in stdenv.mkDerivation rec { pname = "odin"; - version = "dev-2023-11"; + version = "dev-2023-12"; src = fetchFromGitHub { owner = "odin-lang"; repo = "Odin"; rev = version; - hash = "sha256-5plcr+j9aFSaLfLQXbG4WD1GH6rE7D3uhlUbPaDEYf8="; + hash = "sha256-XFaXs9zNQ/53QprF8pM2pOtiB0nGu8mGbBozNl0EMyA="; }; nativeBuildInputs = [ From 295f52fdee77bfc72e105ab7bc74deec21aff142 Mon Sep 17 00:00:00 2001 From: Harsh Shandilya Date: Wed, 27 Dec 2023 17:16:40 +0530 Subject: [PATCH 078/168] androidStudioPackages.beta: 2023.1.1.25 -> 2023.2.1.19 --- pkgs/applications/editors/android-studio/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/android-studio/default.nix b/pkgs/applications/editors/android-studio/default.nix index ac2a0141f8f4..2a337c0381f7 100644 --- a/pkgs/applications/editors/android-studio/default.nix +++ b/pkgs/applications/editors/android-studio/default.nix @@ -14,8 +14,8 @@ let sha256Hash = "sha256-l36KmFVBT31BFX8L4OEPt0DEK9M392PV2Ws+BZeAZj0="; }; betaVersion = { - version = "2023.1.1.25"; # "Android Studio Hedgehog | 2023.1.1 RC 3" - sha256Hash = "sha256-jOqTAHYAk8j9+Ir01TLBsp20u7/iBKV8T/joZLITDs4="; + version = "2023.2.1.19"; # "Android Studio Iguana | 2023.2.1 Beta 1" + sha256Hash = "sha256-lfJBX7RLIziiuv805+gdt8xfJkFjy0bSh77/bjkNFH4="; }; latestVersion = { version = "2023.2.1.17"; # "Android Studio Iguana | 2023.2.1 Canary 17" From c7d4f48230393a83019dc0c3a2b761ce2eed8afa Mon Sep 17 00:00:00 2001 From: Harsh Shandilya Date: Wed, 27 Dec 2023 17:17:07 +0530 Subject: [PATCH 079/168] androidStudioPackages.canary: 2023.2.1.17 -> 2023.2.1.18 --- pkgs/applications/editors/android-studio/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/android-studio/default.nix b/pkgs/applications/editors/android-studio/default.nix index 2a337c0381f7..82519e494452 100644 --- a/pkgs/applications/editors/android-studio/default.nix +++ b/pkgs/applications/editors/android-studio/default.nix @@ -18,8 +18,8 @@ let sha256Hash = "sha256-lfJBX7RLIziiuv805+gdt8xfJkFjy0bSh77/bjkNFH4="; }; latestVersion = { - version = "2023.2.1.17"; # "Android Studio Iguana | 2023.2.1 Canary 17" - sha256Hash = "sha256-RG1N06psRaRrC/57Trb23K0Iezp2VBViBRqJRHLssMI="; + version = "2023.2.1.18"; # "Android Studio Iguana | 2023.2.1 Canary 18" + sha256Hash = "sha256-QvyA/1IvqIgGkBWryY0Q7LqGA6I1f9Xn8GA1g19jt+w="; }; in { # Attributes are named by their corresponding release channels From 64955da5ee37efd59fd6d759a0994d20e90bb5a8 Mon Sep 17 00:00:00 2001 From: Harsh Shandilya Date: Wed, 27 Dec 2023 17:17:26 +0530 Subject: [PATCH 080/168] androidStudioPackages: add msfjarvis as maintainer --- pkgs/applications/editors/android-studio/common.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/editors/android-studio/common.nix b/pkgs/applications/editors/android-studio/common.nix index 26dded34fefd..2cd1dff33c72 100644 --- a/pkgs/applications/editors/android-studio/common.nix +++ b/pkgs/applications/editors/android-studio/common.nix @@ -222,9 +222,9 @@ in runCommand # source-code itself). platforms = [ "x86_64-linux" ]; maintainers = with maintainers; rec { - stable = [ alapshin ]; - beta = [ alapshin ]; - canary = [ alapshin ]; + stable = [ alapshin msfjarvis ]; + beta = [ alapshin msfjarvis ]; + canary = [ alapshin msfjarvis ]; dev = canary; }."${channel}"; mainProgram = pname; From 6a9b7ca0cff7619f498d9c4e9438fc9fa1e14d2e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 27 Dec 2023 12:38:08 +0000 Subject: [PATCH 081/168] podman: 4.8.1 -> 4.8.2 --- 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 b714db0bd62a..93ef717d5297 100644 --- a/pkgs/applications/virtualization/podman/default.nix +++ b/pkgs/applications/virtualization/podman/default.nix @@ -62,13 +62,13 @@ let in buildGoModule rec { pname = "podman"; - version = "4.8.1"; + version = "4.8.2"; src = fetchFromGitHub { owner = "containers"; repo = "podman"; rev = "v${version}"; - hash = "sha256-EDIgipbv8Z7nVV6VQ5IAmvHvvpLyGEDHMDnwhMUm/BQ="; + hash = "sha256-pRmSaquovfMG3+Aa13W+AW2s7MjK2V/mSje4CQZyURs="; }; patches = [ From 34105536c8737b78e5ee18b8c18fd662d7905efe Mon Sep 17 00:00:00 2001 From: nicoo Date: Tue, 17 Oct 2023 15:20:30 +0000 Subject: [PATCH 082/168] mpvScripts: Refactor drvs for mpv's builtin scripts --- .../video/mpv/scripts/acompressor.nix | 17 ---------- .../video/mpv/scripts/autocrop.nix | 19 ----------- .../video/mpv/scripts/autodeint.nix | 19 ----------- .../video/mpv/scripts/autoload.nix | 20 ------------ .../video/mpv/scripts/default.nix | 5 +-- pkgs/applications/video/mpv/scripts/mpv.nix | 32 +++++++++++++++++++ 6 files changed, 33 insertions(+), 79 deletions(-) delete mode 100644 pkgs/applications/video/mpv/scripts/acompressor.nix delete mode 100644 pkgs/applications/video/mpv/scripts/autocrop.nix delete mode 100644 pkgs/applications/video/mpv/scripts/autodeint.nix delete mode 100644 pkgs/applications/video/mpv/scripts/autoload.nix create mode 100644 pkgs/applications/video/mpv/scripts/mpv.nix diff --git a/pkgs/applications/video/mpv/scripts/acompressor.nix b/pkgs/applications/video/mpv/scripts/acompressor.nix deleted file mode 100644 index d82d12f163e7..000000000000 --- a/pkgs/applications/video/mpv/scripts/acompressor.nix +++ /dev/null @@ -1,17 +0,0 @@ -{ lib -, buildLua -, mpv-unwrapped -}: - -buildLua { - inherit (mpv-unwrapped) src version; - pname = "mpv-acompressor"; - scriptPath = "TOOLS/lua/acompressor.lua"; - - meta = with lib; { - inherit (mpv-unwrapped.meta) license; - description = "Script to toggle and control ffmpeg's dynamic range compression filter."; - homepage = "https://github.com/mpv-player/mpv/blob/master/TOOLS/lua/acompressor.lua"; - maintainers = with maintainers; [ nicoo ]; - }; -} diff --git a/pkgs/applications/video/mpv/scripts/autocrop.nix b/pkgs/applications/video/mpv/scripts/autocrop.nix deleted file mode 100644 index 645a4dd16899..000000000000 --- a/pkgs/applications/video/mpv/scripts/autocrop.nix +++ /dev/null @@ -1,19 +0,0 @@ -{ stdenvNoCC, mpv-unwrapped, lib }: - -stdenvNoCC.mkDerivation rec { - pname = "mpv-autocrop"; - version = mpv-unwrapped.version; - src = "${mpv-unwrapped.src.outPath}/TOOLS/lua/autocrop.lua"; - dontBuild = true; - dontUnpack = true; - installPhase = '' - install -Dm644 ${src} $out/share/mpv/scripts/autocrop.lua - ''; - passthru.scriptName = "autocrop.lua"; - - meta = { - description = "This script uses the lavfi cropdetect filter to automatically insert a crop filter with appropriate parameters for the currently playing video."; - homepage = "https://github.com/mpv-player/mpv/blob/master/TOOLS/lua/autocrop.lua"; - license = lib.licenses.gpl2Plus; - }; -} diff --git a/pkgs/applications/video/mpv/scripts/autodeint.nix b/pkgs/applications/video/mpv/scripts/autodeint.nix deleted file mode 100644 index b5369b748faf..000000000000 --- a/pkgs/applications/video/mpv/scripts/autodeint.nix +++ /dev/null @@ -1,19 +0,0 @@ -{ stdenvNoCC, mpv-unwrapped, lib }: - -stdenvNoCC.mkDerivation rec { - pname = "mpv-autodeint"; - version = mpv-unwrapped.version; - src = "${mpv-unwrapped.src.outPath}/TOOLS/lua/autodeint.lua"; - dontBuild = true; - dontUnpack = true; - installPhase = '' - install -Dm644 ${src} $out/share/mpv/scripts/autodeint.lua - ''; - passthru.scriptName = "autodeint.lua"; - - meta = { - description = "This script uses the lavfi idet filter to automatically insert the appropriate deinterlacing filter based on a short section of the currently playing video."; - homepage = "https://github.com/mpv-player/mpv/blob/master/TOOLS/lua/autodeint.lua"; - license = lib.licenses.gpl2Plus; - }; -} diff --git a/pkgs/applications/video/mpv/scripts/autoload.nix b/pkgs/applications/video/mpv/scripts/autoload.nix deleted file mode 100644 index c4a85c50d938..000000000000 --- a/pkgs/applications/video/mpv/scripts/autoload.nix +++ /dev/null @@ -1,20 +0,0 @@ -{ stdenvNoCC, mpv-unwrapped, lib }: - -stdenvNoCC.mkDerivation rec { - pname = "mpv-autoload"; - version = mpv-unwrapped.version; - src = "${mpv-unwrapped.src.outPath}/TOOLS/lua/autoload.lua"; - dontBuild = true; - dontUnpack = true; - installPhase = '' - install -Dm644 ${src} $out/share/mpv/scripts/autoload.lua - ''; - passthru.scriptName = "autoload.lua"; - - meta = { - description = "This script automatically loads playlist entries before and after the currently played file"; - homepage = "https://github.com/mpv-player/mpv/blob/master/TOOLS/lua/autoload.lua"; - maintainers = [ lib.maintainers.dawidsowa ]; - license = lib.licenses.gpl2Plus; - }; -} diff --git a/pkgs/applications/video/mpv/scripts/default.nix b/pkgs/applications/video/mpv/scripts/default.nix index 9154e3adf490..3520138a7d60 100644 --- a/pkgs/applications/video/mpv/scripts/default.nix +++ b/pkgs/applications/video/mpv/scripts/default.nix @@ -58,10 +58,6 @@ in lib.recurseIntoAttrs (lib.mapAttrs addTests ({ - acompressor = callPackage ./acompressor.nix { inherit buildLua; }; - autocrop = callPackage ./autocrop.nix { }; - autodeint = callPackage ./autodeint.nix { }; - autoload = callPackage ./autoload.nix { }; chapterskip = callPackage ./chapterskip.nix { inherit buildLua; }; convert = callPackage ./convert.nix { inherit buildLua; }; cutter = callPackage ./cutter.nix { inherit buildLua; }; @@ -81,6 +77,7 @@ lib.recurseIntoAttrs vr-reversal = callPackage ./vr-reversal.nix { }; webtorrent-mpv-hook = callPackage ./webtorrent-mpv-hook.nix { }; } + // (callPackage ./mpv.nix { inherit buildLua; }) // (callPackage ./occivink.nix { inherit buildLua; }))) // lib.optionalAttrs config.allowAliases { youtube-quality = throw "'youtube-quality' is no longer maintained, use 'quality-menu' instead"; # added 2023-07-14 diff --git a/pkgs/applications/video/mpv/scripts/mpv.nix b/pkgs/applications/video/mpv/scripts/mpv.nix new file mode 100644 index 000000000000..b2713943981f --- /dev/null +++ b/pkgs/applications/video/mpv/scripts/mpv.nix @@ -0,0 +1,32 @@ +{ lib +, buildLua +, mpv-unwrapped +}: + +let mkBuiltin = name: args: + buildLua (lib.attrsets.recursiveUpdate rec { + inherit (mpv-unwrapped) src version; + pname = "mpv-${name}"; + scriptPath = "TOOLS/lua/${name}.lua"; + + meta = with lib; { + inherit (mpv-unwrapped.meta) license; + homepage = "https://github.com/mpv-player/mpv/blob/master/${scriptPath}"; + }; + } args); + +in lib.mapAttrs (name: lib.makeOverridable (mkBuiltin name)) { + acompressor.meta = { + description = "Script to toggle and control ffmpeg's dynamic range compression filter."; + maintainers = with lib.maintainers; [ nicoo ]; + }; + + autocrop.meta.description = "This script uses the lavfi cropdetect filter to automatically insert a crop filter with appropriate parameters for the currently playing video."; + + autodeint.meta.description = "This script uses the lavfi idet filter to automatically insert the appropriate deinterlacing filter based on a short section of the currently playing video."; + + autoload.meta = { + description = "This script automatically loads playlist entries before and after the currently played file"; + maintainers = [ lib.maintainers.dawidsowa ]; + }; +} From f5db99998c321aecb48167f8fd6060cba58d57d9 Mon Sep 17 00:00:00 2001 From: nicoo Date: Tue, 17 Oct 2023 21:43:23 +0000 Subject: [PATCH 083/168] mpvScripts.{acompressor, auto{crop,deint,load}}: Point homepage to the appropriate version --- pkgs/applications/video/mpv/scripts/mpv.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/video/mpv/scripts/mpv.nix b/pkgs/applications/video/mpv/scripts/mpv.nix index b2713943981f..e8bf87b96564 100644 --- a/pkgs/applications/video/mpv/scripts/mpv.nix +++ b/pkgs/applications/video/mpv/scripts/mpv.nix @@ -11,7 +11,7 @@ let mkBuiltin = name: args: meta = with lib; { inherit (mpv-unwrapped.meta) license; - homepage = "https://github.com/mpv-player/mpv/blob/master/${scriptPath}"; + homepage = "https://github.com/mpv-player/mpv/blob/v${version}/${scriptPath}"; }; } args); From fd1fed39d26a1db7373ff452297db583273ee695 Mon Sep 17 00:00:00 2001 From: nicoo Date: Sat, 9 Dec 2023 15:23:24 +0000 Subject: [PATCH 084/168] mpvScripts.{acompressor, auto{crop,deint,load}}: dontUnpack --- pkgs/applications/video/mpv/scripts/mpv.nix | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/video/mpv/scripts/mpv.nix b/pkgs/applications/video/mpv/scripts/mpv.nix index e8bf87b96564..06e9ccb4d74a 100644 --- a/pkgs/applications/video/mpv/scripts/mpv.nix +++ b/pkgs/applications/video/mpv/scripts/mpv.nix @@ -4,14 +4,17 @@ }: let mkBuiltin = name: args: - buildLua (lib.attrsets.recursiveUpdate rec { + let srcPath = "TOOLS/lua/${name}.lua"; + in buildLua (lib.attrsets.recursiveUpdate rec { inherit (mpv-unwrapped) src version; pname = "mpv-${name}"; - scriptPath = "TOOLS/lua/${name}.lua"; + + dontUnpack = true; + scriptPath = "${src}/${srcPath}"; meta = with lib; { inherit (mpv-unwrapped.meta) license; - homepage = "https://github.com/mpv-player/mpv/blob/v${version}/${scriptPath}"; + homepage = "https://github.com/mpv-player/mpv/blob/v${version}/${srcPath}"; }; } args); From 2bd6c29a2eaddd89e80234e7b4ae2a945a6d6976 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Wed, 27 Dec 2023 15:12:02 +0100 Subject: [PATCH 085/168] flare-signal: 0.10.0 -> 0.11.0 Diff: https://gitlab.com/schmiddi-on-mobile/flare/-/compare/0.10.0...0.11.0 Changelog: https://gitlab.com/schmiddi-on-mobile/flare/-/blob/0.11.0/CHANGELOG.md --- .../flare-signal/Cargo.lock | 1894 +++++++++-------- .../flare-signal/default.nix | 13 +- 2 files changed, 1013 insertions(+), 894 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/flare-signal/Cargo.lock b/pkgs/applications/networking/instant-messengers/flare-signal/Cargo.lock index 085eec078c76..877c80cc6a65 100644 --- a/pkgs/applications/networking/instant-messengers/flare-signal/Cargo.lock +++ b/pkgs/applications/networking/instant-messengers/flare-signal/Cargo.lock @@ -30,7 +30,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0b613b8e1e3cf911a086f53f03bf286f52fd7a7258e4fa606f0ef220d39d8877" dependencies = [ "generic-array", - "rand_core 0.6.4", +] + +[[package]] +name = "aead" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d122413f284cf2d62fb1b7db97e02edb8cda96d769b16e443a4f6195e35662b0" +dependencies = [ + "crypto-common", + "generic-array", ] [[package]] @@ -60,38 +69,38 @@ dependencies = [ [[package]] name = "aes-gcm" -version = "0.9.4" +version = "0.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df5f85a83a7d8b0442b6aa7b504b8212c1733da07b98aae43d4bc21b2cb3cdf6" +checksum = "bc3be92e19a7ef47457b8e6f90707e12b6ac5d20c6f3866584fa3be0787d839f" dependencies = [ - "aead", + "aead 0.4.3", "aes 0.7.5", "cipher 0.3.0", - "ctr 0.8.0", - "ghash", + "ctr 0.7.0", + "ghash 0.4.4", "subtle", ] [[package]] name = "aes-gcm-siv" -version = "0.10.1" +version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cfde8146762f3c5f3c5cd41aa17a71f3188df09d5857192b658510d850e16068" +checksum = "ae0784134ba9375416d469ec31e7c5f9fa94405049cf08c5ce5b4698be673e0d" dependencies = [ - "aead", - "aes 0.7.5", - "cipher 0.3.0", - "ctr 0.7.0", - "polyval", + "aead 0.5.2", + "aes 0.8.3", + "cipher 0.4.4", + "ctr 0.9.2", + "polyval 0.6.1", "subtle", "zeroize", ] [[package]] name = "aho-corasick" -version = "1.0.4" +version = "1.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6748e8def348ed4d14996fa801f4122cd763fff530258cdc03f64b25f89d3a5a" +checksum = "b2969dcb958b36655471fc61f7e416fa76033bdd4bfed0678d8fee1e2d07a1f0" dependencies = [ "memchr", ] @@ -113,9 +122,9 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.75" +version = "1.0.76" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4668cab20f66d8d020e1fbc0ebe47217433c1b6c8f2040faf858554e394ace6" +checksum = "59d2a3357dde987206219e78ecfbbb6e8dad06cbb65292758d3270e6254f7355" [[package]] name = "arrayref" @@ -131,11 +140,10 @@ checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711" [[package]] name = "ashpd" -version = "0.5.0" +version = "0.6.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7370b58af1d7e96df3ca0f454b57e69acf9aa42ed2d7337bd206923bae0d5754" +checksum = "2c018490e423efb6f032ef575f873ea57b61d44bec763cfe027b8e8852a027cf" dependencies = [ - "async-std", "enumflags2", "futures-channel", "futures-util", @@ -143,9 +151,10 @@ dependencies = [ "gdk4-x11", "gtk4", "once_cell", - "rand 0.8.5", + "rand", "serde", "serde_repr", + "tokio", "url", "zbus", ] @@ -156,60 +165,21 @@ version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7c48ccdbf6ca6b121e0f586cbc0e73ae440e56c67c30fa0873b4e110d9c26d2b" dependencies = [ - "event-listener", + "event-listener 2.5.3", "futures-core", ] [[package]] name = "async-channel" -version = "1.9.0" +version = "2.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81953c529336010edd6d8e358f886d9581267795c61b19475b71314bffa46d35" +checksum = "1ca33f4bc4ed1babef42cad36cc1f51fa88be00420404e5b1e80ab1b18f7678c" dependencies = [ "concurrent-queue", - "event-listener", + "event-listener 4.0.1", + "event-listener-strategy", "futures-core", -] - -[[package]] -name = "async-executor" -version = "1.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6fa3dc5f2a8564f07759c008b9109dc0d39de92a88d5588b8a5036d286383afb" -dependencies = [ - "async-lock", - "async-task", - "concurrent-queue", - "fastrand 1.9.0", - "futures-lite", - "slab", -] - -[[package]] -name = "async-fs" -version = "1.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "279cf904654eeebfa37ac9bb1598880884924aab82e290aa65c9e77a0e142e06" -dependencies = [ - "async-lock", - "autocfg", - "blocking", - "futures-lite", -] - -[[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", + "pin-project-lite", ] [[package]] @@ -218,106 +188,127 @@ version = "1.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0fc5b45d93ef0529756f812ca52e44c221b35341892d3dcc34132ac02f3dd2af" dependencies = [ - "async-lock", + "async-lock 2.8.0", "autocfg", "cfg-if", "concurrent-queue", - "futures-lite", + "futures-lite 1.13.0", "log", "parking", - "polling", - "rustix 0.37.23", + "polling 2.8.0", + "rustix 0.37.27", "slab", - "socket2 0.4.9", + "socket2 0.4.10", "waker-fn", ] +[[package]] +name = "async-io" +version = "2.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6afaa937395a620e33dc6a742c593c01aced20aa376ffb0f628121198578ccc7" +dependencies = [ + "async-lock 3.2.0", + "cfg-if", + "concurrent-queue", + "futures-io", + "futures-lite 2.1.0", + "parking", + "polling 3.3.1", + "rustix 0.38.28", + "slab", + "tracing", + "windows-sys 0.52.0", +] + [[package]] name = "async-lock" version = "2.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "287272293e9d8c41773cec55e365490fe034813a2f172f502d6ddcf75b2f582b" dependencies = [ - "event-listener", + "event-listener 2.5.3", +] + +[[package]] +name = "async-lock" +version = "3.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7125e42787d53db9dd54261812ef17e937c95a51e4d291373b670342fa44310c" +dependencies = [ + "event-listener 4.0.1", + "event-listener-strategy", + "pin-project-lite", ] [[package]] name = "async-process" -version = "1.7.0" +version = "1.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a9d28b1d97e08915212e2e45310d47854eafa69600756fc735fb788f75199c9" +checksum = "ea6438ba0a08d81529c69b36700fa2f95837bfe3e776ab39cde9c14d9149da88" dependencies = [ - "async-io", - "async-lock", - "autocfg", + "async-io 1.13.0", + "async-lock 2.8.0", + "async-signal", "blocking", "cfg-if", - "event-listener", - "futures-lite", - "rustix 0.37.23", - "signal-hook", - "windows-sys", + "event-listener 3.1.0", + "futures-lite 1.13.0", + "rustix 0.38.28", + "windows-sys 0.48.0", ] [[package]] name = "async-recursion" -version = "1.0.4" +version = "1.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0e97ce7de6cf12de5d7226c73f5ba9811622f4db3a5b91b55c53e987e5f91cba" +checksum = "5fd55a5ba1179988837d24ab4c7cc8ed6efdeff578ede0416b4225a5fca35bd0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.29", + "syn 2.0.42", ] [[package]] -name = "async-std" -version = "1.12.0" +name = "async-signal" +version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62565bb4402e926b29953c785397c6dc0391b7b446e45008b0049eb43cec6f5d" +checksum = "9e47d90f65a225c4527103a8d747001fc56e375203592b25ad103e1ca13124c5" dependencies = [ - "async-channel", - "async-global-executor", - "async-io", - "async-lock", - "crossbeam-utils", - "futures-channel", + "async-io 2.2.2", + "async-lock 2.8.0", + "atomic-waker", + "cfg-if", "futures-core", "futures-io", - "futures-lite", - "gloo-timers", - "kv-log-macro", - "log", - "memchr", - "once_cell", - "pin-project-lite", - "pin-utils", + "rustix 0.38.28", + "signal-hook-registry", "slab", - "wasm-bindgen-futures", + "windows-sys 0.48.0", ] [[package]] name = "async-task" -version = "4.4.0" +version = "4.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ecc7ab41815b3c653ccd2978ec3255c81349336702dfdf62ee6f7069b12a3aae" +checksum = "e1d90cd0b264dfdd8eb5bad0a2c217c1f88fa96a8573f40e7b12de23fb468f46" [[package]] name = "async-trait" -version = "0.1.73" +version = "0.1.75" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc00ceb34980c03614e35a3a4e218276a0a824e911d07651cd0d858a51e8c0f0" +checksum = "fdf6721fb0140e4f897002dd086c06f6c27775df19cfe1fccb21181a48fd2c98" dependencies = [ "proc-macro2", "quote", - "syn 2.0.29", + "syn 2.0.42", ] [[package]] name = "async-tungstenite" -version = "0.17.2" +version = "0.23.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1b71b31561643aa8e7df3effe284fa83ab1a840e52294c5f4bd7bfd8b2becbb" +checksum = "a1e9efbe14612da0a19fb983059a0b621e9cf6225d7018ecab4f9988215540dc" dependencies = [ "futures-io", "futures-util", @@ -331,9 +322,9 @@ dependencies = [ [[package]] name = "atomic-waker" -version = "1.1.1" +version = "1.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1181e1e0d1fce796a03db1ae795d67167da795f9cf4a39c37589e85ef57f26d3" +checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0" [[package]] name = "autocfg" @@ -370,15 +361,9 @@ checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" [[package]] name = "base64" -version = "0.21.2" +version = "0.21.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "604178f6c5c21f02dc555784810edfb88d34ac2c73b2eae109655649ee73ce3d" - -[[package]] -name = "base64ct" -version = "1.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c3c1a368f70d6cf7302d78f8f7093da241fb8e8807c05cc9e51a125895a6d5b" +checksum = "35636a1494ede3b646cc98f74f8e62c773a38a659ebc777a2cf26b9b74171df9" [[package]] name = "bincode" @@ -389,6 +374,12 @@ dependencies = [ "serde", ] +[[package]] +name = "bit_field" +version = "0.10.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dc827186963e592360843fb5ba4b973e145841266c1357f7180c43526f2e5b61" + [[package]] name = "bitflags" version = "1.3.2" @@ -397,22 +388,21 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "bitflags" -version = "2.4.0" +version = "2.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4682ae6287fcf752ecaabbfcc7b6f9b72aa33933dc23a554d853aea8eea8635" +checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07" [[package]] name = "blake3" -version = "1.4.1" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "199c42ab6972d92c9f8995f086273d25c42fc0f7b2a1fcefba465c1352d25ba5" +checksum = "0231f06152bf547e9c2b5194f247cd97aacf6dcd8b15d8e5ec0663f64580da87" dependencies = [ "arrayref", "arrayvec", "cc", "cfg-if", "constant_time_eq", - "digest 0.10.7", ] [[package]] @@ -421,15 +411,6 @@ version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0d8c1fef690941d3e7788d328517591fecc684c084084702d6ff1641e993699a" -[[package]] -name = "block-buffer" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4152116fd6e9dadb291ae18fc1ec3575ed6d84c29642d97890f4b4a3417297e4" -dependencies = [ - "generic-array", -] - [[package]] name = "block-buffer" version = "0.10.4" @@ -466,23 +447,25 @@ dependencies = [ [[package]] name = "blocking" -version = "1.3.1" +version = "1.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77231a1c8f801696fc0123ec6150ce92cffb8e164a02afb9c8ddee0e9b65ad65" +checksum = "6a37913e8dc4ddcc604f0c6d3bf2887c995153af3611de9e23c352b44c1b9118" dependencies = [ "async-channel", - "async-lock", + "async-lock 3.2.0", "async-task", - "atomic-waker", - "fastrand 1.9.0", - "futures-lite", - "log", + "fastrand 2.0.1", + "futures-io", + "futures-lite 2.1.0", + "piper", + "tracing", ] [[package]] name = "blurhash" -version = "0.1.1" -source = "git+https://github.com/marc0x1/blurhash-rs?branch=pixbuf-patch#c07c0cbcd29b2277e8c1d0f6ae07b2e0fad1ed52" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aa5ddff25bcae3e2ac5a93506cc050c730163fd92d319556861375b225164dde" dependencies = [ "gdk-pixbuf", "image 0.23.14", @@ -490,35 +473,35 @@ dependencies = [ [[package]] name = "bumpalo" -version = "3.13.0" +version = "3.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3e2c3daef883ecc1b5d58c15adae93470a91d425f3532ba1695849656af3fc1" +checksum = "7f30e7476521f6f8af1a1c4c0b8cc94f0bee37d91763d0ca2665f299b6cd8aec" [[package]] name = "bytemuck" -version = "1.13.1" +version = "1.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17febce684fd15d89027105661fec94afb475cb995fbc59d2865198446ba2eea" +checksum = "374d28ec25809ee0e23827c2ab573d729e293f281dfe393500e7ad618baa61c6" [[package]] name = "byteorder" -version = "1.4.3" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610" +checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" [[package]] name = "bytes" -version = "1.4.0" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89b2fd2a0dcf38d7971e2194b6b6eebab45ae01067456a7fd93d5547a61b70be" +checksum = "a2bd12c1caf447e69cd4528f47f94d203fd2582878ecb9e9465484c4148a8223" [[package]] name = "cairo-rs" -version = "0.18.0" +version = "0.18.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d859b656775a6b1dd078d3e5924884e6ea88aa649a7fdde03d5b2ec56ffcc10b" +checksum = "f33613627f0dea6a731b0605101fad59ba4f193a52c96c4687728d822605a8a1" dependencies = [ - "bitflags 2.4.0", + "bitflags 2.4.1", "cairo-sys-rs", "glib", "libc", @@ -528,9 +511,9 @@ dependencies = [ [[package]] name = "cairo-sys-rs" -version = "0.18.0" +version = "0.18.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd4d115132e01c0165e3bf5f56aedee8980b0b96ede4eb000b693c05a8adb8ff" +checksum = "685c9fa8e590b8b3d678873528d83411db17242a73fccaed827770ea0fedda51" dependencies = [ "glib-sys", "libc", @@ -558,9 +541,9 @@ dependencies = [ [[package]] name = "cfg-expr" -version = "0.15.4" +version = "0.15.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b40ccee03b5175c18cde8f37e7d2a33bcef6f8ec8f7cc0d81090d1bb380949c9" +checksum = "03915af431787e6ffdcc74c645077518c6b6e01f80b761e0fbbfa288536311b3" dependencies = [ "smallvec", "target-lexicon", @@ -574,40 +557,39 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "chacha20" -version = "0.8.2" +version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c80e5460aa66fe3b91d40bcbdab953a597b60053e34d684ac6903f863b680a6" +checksum = "c3613f74bd2eac03dad61bd53dbe620703d4371614fe0bc3b9f04dd36fe4e818" dependencies = [ "cfg-if", - "cipher 0.3.0", + "cipher 0.4.4", "cpufeatures", - "zeroize", ] [[package]] name = "chacha20poly1305" -version = "0.9.1" +version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a18446b09be63d457bbec447509e85f662f32952b035ce892290396bc0b0cff5" +checksum = "10cd79432192d1c0f4e1a0fef9527696cc039165d729fb41b3f4f4f354c2dc35" dependencies = [ - "aead", + "aead 0.5.2", "chacha20", - "cipher 0.3.0", + "cipher 0.4.4", "poly1305", "zeroize", ] [[package]] name = "chrono" -version = "0.4.26" +version = "0.4.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec837a71355b28f6556dbd569b37b3f363091c0bd4b2e735674521b4c5fd9bc5" +checksum = "7f2c685bad3eb3d45a01354cedb7d5faa66194d1d58ba6e267a8de788f79db38" dependencies = [ "android-tzdata", "iana-time-zone", "num-traits", "serde", - "winapi", + "windows-targets 0.48.5", ] [[package]] @@ -647,9 +629,9 @@ checksum = "3d7b894f5411737b7867f4827955924d7c254fc9f4d91a6aad6b097804b1018b" [[package]] name = "concurrent-queue" -version = "2.2.0" +version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62ec6771ecfa0762d24683ee5a32ad78487a3d3afdc0fb8cae19d2c5deb50b7c" +checksum = "d16048cd947b08fa32c24458a22f5dc5e835264f689f4f5653210c69fd107363" dependencies = [ "crossbeam-utils", ] @@ -662,9 +644,9 @@ checksum = "f7144d30dcf0fafbce74250a3963025d8d52177934239851c917d29f1df280c2" [[package]] name = "core-foundation" -version = "0.9.3" +version = "0.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "194a7a9e6de53fa55116934067c844d9d749312f75c6f6d0980e8c252f8c2146" +checksum = "91e195e091a93c46f7102ec7818a2aa394e1e1771c3ab4825963fa03e45afb8f" dependencies = [ "core-foundation-sys", "libc", @@ -672,15 +654,15 @@ dependencies = [ [[package]] name = "core-foundation-sys" -version = "0.8.4" +version = "0.8.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e496a50fda8aacccc86d7529e2c1e0892dbd0f898a6b5645b5561b89c3210efa" +checksum = "06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f" [[package]] name = "cpufeatures" -version = "0.2.9" +version = "0.2.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a17b76ff3a4162b0b27f354a0c87015ddad39d35f9c0c36607a3bdd175dde1f1" +checksum = "ce420fe07aecd3e67c5f910618fe65e94158f6dcc0adf44e00d69ce2bdfe0fd0" dependencies = [ "libc", ] @@ -694,21 +676,11 @@ dependencies = [ "cfg-if", ] -[[package]] -name = "crossbeam-channel" -version = "0.5.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a33c2bf77f2df06183c3aa30d1e96c0695a313d4f9c453cc3762a6db39f99200" -dependencies = [ - "cfg-if", - "crossbeam-utils", -] - [[package]] name = "crossbeam-deque" -version = "0.8.3" +version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce6fd6f855243022dcecf8702fef0c297d4338e226845fe067f6341ad9fa0cef" +checksum = "fca89a0e215bab21874660c67903c5f143333cab1da83d041c7ded6053774751" dependencies = [ "cfg-if", "crossbeam-epoch", @@ -717,26 +689,30 @@ dependencies = [ [[package]] name = "crossbeam-epoch" -version = "0.9.15" +version = "0.9.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae211234986c545741a7dc064309f67ee1e5ad243d0e48335adc0484d960bcc7" +checksum = "0e3681d554572a651dda4186cd47240627c3d0114d45a95f6ad27f2f22e7548d" dependencies = [ "autocfg", "cfg-if", "crossbeam-utils", - "memoffset 0.9.0", - "scopeguard", ] [[package]] name = "crossbeam-utils" -version = "0.8.16" +version = "0.8.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a22b2d63d4d1dc0b7f1b6b2747dd0088008a9be28b6ddf0b1e7d335e3037294" +checksum = "c3a430a770ebd84726f584a90ee7f020d28db52c6d02138900f22341f866d39c" dependencies = [ "cfg-if", ] +[[package]] +name = "crunchy" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7" + [[package]] name = "crypto-common" version = "0.1.6" @@ -744,20 +720,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3" dependencies = [ "generic-array", - "rand_core 0.6.4", + "rand_core", "typenum", ] -[[package]] -name = "crypto-mac" -version = "0.11.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1d1a86f49236c215f271d40892d5fc950490551400b02ef360692c29815c714" -dependencies = [ - "generic-array", - "subtle", -] - [[package]] name = "ctr" version = "0.7.0" @@ -777,18 +743,47 @@ dependencies = [ ] [[package]] -name = "curve25519-dalek" -version = "3.2.1" -source = "git+https://github.com/Schmiddiii/curve25519-dalek?rev=1b9f81352bb659999a46af961f069d635ca432d3#1b9f81352bb659999a46af961f069d635ca432d3" +name = "ctr" +version = "0.9.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0369ee1ad671834580515889b80f2ea915f23b8be8d0daa4bbaf2ac5c7590835" dependencies = [ - "byteorder", - "digest 0.9.0", - "rand_core 0.5.1", + "cipher 0.4.4", +] + +[[package]] +name = "curve25519-dalek" +version = "4.0.0" +source = "git+https://github.com/signalapp/curve25519-dalek?tag=signal-curve25519-4.0.0#463e5c7cba32561ffee8a281c4455ff3c25660d4" +dependencies = [ + "cfg-if", + "cpufeatures", + "curve25519-dalek-derive", + "digest", + "fiat-crypto", + "platforms", + "rustc_version", "serde", "subtle", "zeroize", ] +[[package]] +name = "curve25519-dalek-derive" +version = "0.1.0" +source = "git+https://github.com/signalapp/curve25519-dalek?tag=signal-curve25519-4.0.0#463e5c7cba32561ffee8a281c4455ff3c25660d4" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.42", +] + +[[package]] +name = "data-encoding" +version = "2.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7e962a19be5cfc3f3bf6dd8f61eb50107f356ad6270fbb3ed41476571db78be5" + [[package]] name = "deflate" version = "0.8.6" @@ -810,22 +805,13 @@ dependencies = [ "syn 1.0.109", ] -[[package]] -name = "digest" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3dd60d1080a57a05ab032377049e0591415d2b31afd7028356dbf3cc6dcb066" -dependencies = [ - "generic-array", -] - [[package]] name = "digest" version = "0.10.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292" dependencies = [ - "block-buffer 0.10.4", + "block-buffer", "crypto-common", "subtle", ] @@ -838,7 +824,7 @@ checksum = "487585f4d0c6655fe74905e2504d8ad6908e4db67f744eb140876906c2f3175d" dependencies = [ "proc-macro2", "quote", - "syn 2.0.29", + "syn 2.0.42", ] [[package]] @@ -855,9 +841,9 @@ checksum = "a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07" [[package]] name = "enumflags2" -version = "0.7.7" +version = "0.7.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c041f5090df68b32bcd905365fd51769c8b9d553fe87fde0b683534f10c01bd2" +checksum = "5998b4f30320c9d93aed72f63af821bfdac50465b75428fce77b48ec482c3939" dependencies = [ "enumflags2_derive", "serde", @@ -865,20 +851,20 @@ dependencies = [ [[package]] name = "enumflags2_derive" -version = "0.7.7" +version = "0.7.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e9a1f9f7d83e59740248a6e14ecf93929ade55027844dfcea78beafccc15745" +checksum = "f95e2801cd355d4a1a3e3953ce6ee5ae9603a5c833455343a8bfe3f44d418246" dependencies = [ "proc-macro2", "quote", - "syn 2.0.29", + "syn 2.0.42", ] [[package]] name = "env_logger" -version = "0.10.0" +version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85cdab6a89accf66733ad5a1693a4dcced6aeff64602b634530dd73c1f3ee9f0" +checksum = "95b3f3e67048839cb0d0781f445682a35113da7121f7c949db0e2be96a4fbece" dependencies = [ "humantime", "is-terminal", @@ -909,23 +895,12 @@ dependencies = [ [[package]] name = "errno" -version = "0.3.2" +version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b30f669a7961ef1631673d2766cc92f52d64f7ef354d4fe0ddfd30ed52f0f4f" +checksum = "a258e46cdc063eb8519c00b9fc845fc47bcfca4130e2f08e88665ceda8474245" dependencies = [ - "errno-dragonfly", - "libc", - "windows-sys", -] - -[[package]] -name = "errno-dragonfly" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa68f1b12764fab894d2755d2518754e71b4fd80ecfb822714a1206c2aab39bf" -dependencies = [ - "cc", "libc", + "windows-sys 0.52.0", ] [[package]] @@ -934,6 +909,54 @@ version = "2.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0" +[[package]] +name = "event-listener" +version = "3.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d93877bcde0eb80ca09131a08d23f0a5c18a620b01db137dba666d18cd9b30c2" +dependencies = [ + "concurrent-queue", + "parking", + "pin-project-lite", +] + +[[package]] +name = "event-listener" +version = "4.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "84f2cdcf274580f2d63697192d744727b3198894b1bf02923643bf59e2c26712" +dependencies = [ + "concurrent-queue", + "parking", + "pin-project-lite", +] + +[[package]] +name = "event-listener-strategy" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "958e4d70b6d5e81971bebec42271ec641e7ff4e170a6fa605f2b8a8b65cb97d3" +dependencies = [ + "event-listener 4.0.1", + "pin-project-lite", +] + +[[package]] +name = "exr" +version = "1.71.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "832a761f35ab3e6664babfbdc6cef35a4860e816ec3916dcfd0882954e98a8a8" +dependencies = [ + "bit_field", + "flume", + "half", + "lebe", + "miniz_oxide 0.7.1", + "rayon-core", + "smallvec", + "zune-inflate", +] + [[package]] name = "fastrand" version = "1.9.0" @@ -945,19 +968,25 @@ dependencies = [ [[package]] name = "fastrand" -version = "2.0.0" +version = "2.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6999dc1837253364c2ebb0704ba97994bd874e8f195d665c50b7548f6ea92764" +checksum = "25cbce373ec4653f1a01a31e8a5e5ec0c622dc27ff9c4e6606eefef5cbbed4a5" [[package]] name = "fdeflate" -version = "0.3.0" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d329bdeac514ee06249dabc27877490f17f5d371ec693360768b838e19f3ae10" +checksum = "64d6dafc854908ff5da46ff3f8f473c6984119a2876a383a860246dd7841a868" dependencies = [ "simd-adler32", ] +[[package]] +name = "fiat-crypto" +version = "0.1.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e825f6987101665dea6ec934c09ec6d721de7bc1bf92248e1d5810c8cd636b77" + [[package]] name = "field-offset" version = "0.3.6" @@ -976,7 +1005,7 @@ checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80" [[package]] name = "flare" -version = "0.10.0" +version = "0.11.0" dependencies = [ "ashpd", "async-trait", @@ -988,7 +1017,7 @@ dependencies = [ "gettext-rs", "gtk4", "hex", - "image 0.23.14", + "image 0.24.7", "lazy_static", "libadwaita", "libsignal-service", @@ -999,7 +1028,7 @@ dependencies = [ "presage", "presage-store-sled", "qrcode-generator", - "rand 0.8.5", + "rand", "regex", "serde", "serde_json", @@ -1009,19 +1038,27 @@ dependencies = [ "tracing", "url", "zbus", - "zeroize", ] [[package]] name = "flate2" -version = "1.0.27" +version = "1.0.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c6c98ee8095e9d1dcbf2fcc6d95acccb90d1c81db1e44725c6a984b1dbdfb010" +checksum = "46303f565772937ffe1d394a4fac6f411c6013172fadde9dcdb1e147a086940e" dependencies = [ "crc32fast", "miniz_oxide 0.7.1", ] +[[package]] +name = "flume" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "55ac459de2512911e4b674ce33cf20befaba382d05b62b008afc1c8b57cbf181" +dependencies = [ + "spin 0.9.8", +] + [[package]] name = "fnv" version = "1.0.7" @@ -1030,9 +1067,9 @@ checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" [[package]] name = "form_urlencoded" -version = "1.2.0" +version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a62bc1cf6f830c2ec14a513a9fb124d0a213a629668a4186f329db21fe045652" +checksum = "e13624c2627564efccf4934284bdd98cbaa14e79b0b5a141218e507b3a823456" dependencies = [ "percent-encoding", ] @@ -1055,9 +1092,9 @@ checksum = "42703706b716c37f96a77aea830392ad231f44c9e9a67872fa5548707e11b11c" [[package]] name = "futures" -version = "0.3.28" +version = "0.3.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23342abe12aba583913b2e62f22225ff9c950774065e4bfb61a19cd9770fec40" +checksum = "da0290714b38af9b4a7b094b8a37086d1b4e61f2df9122c3cad2577669145335" dependencies = [ "futures-channel", "futures-core", @@ -1070,9 +1107,9 @@ dependencies = [ [[package]] name = "futures-channel" -version = "0.3.28" +version = "0.3.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "955518d47e09b25bbebc7a18df10b81f0c766eaf4c4f1cccef2fca5f2a4fb5f2" +checksum = "ff4dd66668b557604244583e3e1e1eada8c5c2e96a6d0d6653ede395b78bbacb" dependencies = [ "futures-core", "futures-sink", @@ -1080,15 +1117,15 @@ dependencies = [ [[package]] name = "futures-core" -version = "0.3.28" +version = "0.3.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4bca583b7e26f571124fe5b7561d49cb2868d79116cfa0eefce955557c6fee8c" +checksum = "eb1d22c66e66d9d72e1758f0bd7d4fd0bee04cad842ee34587d68c07e45d088c" [[package]] name = "futures-executor" -version = "0.3.28" +version = "0.3.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ccecee823288125bd88b4d7f565c9e58e41858e47ab72e8ea2d64e93624386e0" +checksum = "0f4fb8693db0cf099eadcca0efe2a5a22e4550f98ed16aba6c48700da29597bc" dependencies = [ "futures-core", "futures-task", @@ -1097,9 +1134,9 @@ dependencies = [ [[package]] name = "futures-io" -version = "0.3.28" +version = "0.3.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fff74096e71ed47f8e023204cfd0aa1289cd54ae5430a9523be060cdb849964" +checksum = "8bf34a163b5c4c52d0478a4d757da8fb65cabef42ba90515efee0f6f9fa45aaa" [[package]] name = "futures-lite" @@ -1117,33 +1154,43 @@ dependencies = [ ] [[package]] -name = "futures-macro" -version = "0.3.28" +name = "futures-lite" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72" +checksum = "aeee267a1883f7ebef3700f262d2d54de95dfaf38189015a74fdc4e0c7ad8143" +dependencies = [ + "futures-core", + "pin-project-lite", +] + +[[package]] +name = "futures-macro" +version = "0.3.29" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "53b153fd91e4b0147f4aced87be237c98248656bb01050b96bf3ee89220a8ddb" dependencies = [ "proc-macro2", "quote", - "syn 2.0.29", + "syn 2.0.42", ] [[package]] name = "futures-sink" -version = "0.3.28" +version = "0.3.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f43be4fe21a13b9781a69afa4985b0f6ee0e1afab2c6f454a8cf30e2b2237b6e" +checksum = "e36d3378ee38c2a36ad710c5d30c2911d752cb941c00c72dbabfb786a7970817" [[package]] name = "futures-task" -version = "0.3.28" +version = "0.3.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76d3d132be6c0e6aa1534069c705a74a5997a356c0dc2f86a47765e5617c5b65" +checksum = "efd193069b0ddadc69c46389b740bbccdd97203899b48d09c5f7969591d6bae2" [[package]] name = "futures-util" -version = "0.3.28" +version = "0.3.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26b01e40b772d54cf6c6d721c1d1abd0647a0106a12ecaa1c186273392a69533" +checksum = "a19526d624e703a3179b3d322efec918b6246ea0fa51d41124525f00f1cc8104" dependencies = [ "futures-channel", "futures-core", @@ -1168,9 +1215,9 @@ dependencies = [ [[package]] name = "gdk-pixbuf" -version = "0.18.0" +version = "0.18.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbc9c2ed73a81d556b65d08879ba4ee58808a6b1927ce915262185d6d547c6f3" +checksum = "446f32b74d22c33b7b258d4af4ffde53c2bf96ca2e29abdf1a785fe59bd6c82c" dependencies = [ "gdk-pixbuf-sys", "gio", @@ -1194,9 +1241,9 @@ dependencies = [ [[package]] name = "gdk4" -version = "0.7.2" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6982d9815ed6ac95b0467b189e81f29dea26d08a732926ec113e65744ed3f96c" +checksum = "7edb019ad581f8ecf8ea8e4baa6df7c483a95b5a59be3140be6a9c3b0c632af6" dependencies = [ "cairo-rs", "gdk-pixbuf", @@ -1285,24 +1332,13 @@ dependencies = [ [[package]] name = "getrandom" -version = "0.1.16" +version = "0.2.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8fc3cb4d91f53b50155bdcfd23f6a4c39ae1969c2ae85982b135750cccaf5fce" +checksum = "fe9006bed769170c11f845cf00c7c1e9092aeb3f268e007c3e760ac68008070f" dependencies = [ "cfg-if", "libc", - "wasi 0.9.0+wasi-snapshot-preview1", -] - -[[package]] -name = "getrandom" -version = "0.2.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be4136b2a15dd319360be1c07d9933517ccf0be8f16bf62a3bee4f0d618df427" -dependencies = [ - "cfg-if", - "libc", - "wasi 0.11.0+wasi-snapshot-preview1", + "wasi", ] [[package]] @@ -1332,7 +1368,18 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1583cc1656d7839fd3732b80cf4f38850336cdb9b8ded1cd399ca62958de3c99" dependencies = [ "opaque-debug", - "polyval", + "polyval 0.5.3", +] + +[[package]] +name = "ghash" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d930750de5717d2dd0b8c0d42c076c0e884c81a73e6cab859bbd2339c71e3e40" +dependencies = [ + "opaque-debug", + "polyval 0.6.1", + "zeroize", ] [[package]] @@ -1346,16 +1393,26 @@ dependencies = [ ] [[package]] -name = "gimli" -version = "0.28.0" +name = "gif" +version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6fb8d784f27acf97159b40fc4db5ecd8aa23b9ad5ef69cdd136d3bc80665f0c0" +checksum = "80792593675e051cf94a4b111980da2ba60d4a83e43e0048c5693baab3977045" +dependencies = [ + "color_quant", + "weezl", +] + +[[package]] +name = "gimli" +version = "0.28.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4271d37baee1b8c7e4b708028c57d816cf9d2434acb33a549475f78c181f6253" [[package]] name = "gio" -version = "0.18.1" +version = "0.18.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7884cba6b1c5db1607d970cadf44b14a43913d42bc68766eea6a5e2fe0891524" +checksum = "d4fc8f532f87b79cbc51a79748f16a6828fb784be93145a322fa14d06d354c73" dependencies = [ "futures-channel", "futures-core", @@ -1385,11 +1442,11 @@ dependencies = [ [[package]] name = "glib" -version = "0.18.1" +version = "0.18.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "331156127e8166dd815cf8d2db3a5beb492610c716c03ee6db4f2d07092af0a7" +checksum = "951bbd7fdc5c044ede9f05170f05a3ae9479239c3afdfe2d22d537a3add15c4e" dependencies = [ - "bitflags 2.4.0", + "bitflags 2.4.1", "futures-channel", "futures-core", "futures-executor", @@ -1408,16 +1465,16 @@ dependencies = [ [[package]] name = "glib-macros" -version = "0.18.0" +version = "0.18.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "179643c50bf28d20d2f6eacd2531a88f2f5d9747dd0b86b8af1e8bb5dd0de3c0" +checksum = "72793962ceece3863c2965d7f10c8786323b17c7adea75a515809fa20ab799a5" dependencies = [ "heck 0.4.1", - "proc-macro-crate", + "proc-macro-crate 2.0.1", "proc-macro-error", "proc-macro2", "quote", - "syn 2.0.29", + "syn 2.0.42", ] [[package]] @@ -1436,18 +1493,6 @@ version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" 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 = "gobject-sys" version = "0.18.0" @@ -1484,9 +1529,9 @@ dependencies = [ [[package]] name = "gsk4" -version = "0.7.2" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc25855255120f294d874acd6eaf4fbed7ce1cdc550e2d8415ea57fafbe816d5" +checksum = "0d958e351d2f210309b32d081c832d7de0aca0b077aa10d88336c6379bd01f7e" dependencies = [ "cairo-rs", "gdk4", @@ -1499,9 +1544,9 @@ dependencies = [ [[package]] name = "gsk4-sys" -version = "0.7.2" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1ecf3a63bf1223d68f80f72cc896c4d8c80482fbce1c9a12c66d3de7290ee46" +checksum = "12bd9e3effea989f020e8f1ff3fa3b8c63ba93d43b899c11a118868853a56d55" dependencies = [ "cairo-sys-rs", "gdk4-sys", @@ -1515,9 +1560,9 @@ dependencies = [ [[package]] name = "gtk4" -version = "0.7.2" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3b095b26f2a2df70be1805d3590eeb9d7a05ecb5be9649b82defc72dc56228c" +checksum = "5aeb51aa3e9728575a053e1f43543cd9992ac2477e1b186ad824fd4adfb70842" dependencies = [ "cairo-rs", "field-offset", @@ -1541,7 +1586,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d57ec49cf9b657f69a05bca8027cff0a8dfd0c49e812be026fc7311f2163832f" dependencies = [ "anyhow", - "proc-macro-crate", + "proc-macro-crate 1.3.1", "proc-macro-error", "proc-macro2", "quote", @@ -1550,9 +1595,9 @@ dependencies = [ [[package]] name = "gtk4-sys" -version = "0.7.2" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b0bdde87c50317b4f355bcbb4a9c2c414ece1b7c824fb4ad4ba8f3bdb2c6603" +checksum = "54d8c4aa23638ce9faa2caf7e2a27d4a1295af2155c8e8d28c4d4eeca7a65eb8" dependencies = [ "cairo-sys-rs", "gdk-pixbuf-sys", @@ -1568,19 +1613,27 @@ dependencies = [ ] [[package]] -name = "hashbrown" -version = "0.14.0" +name = "half" +version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c6201b9ff9fd90a5a3bac2e56a830d0caa509576f0e503818ee82c181b3437a" +checksum = "02b4af3693f1b705df946e9fe5631932443781d0aabb423b62fcd4d73f6d2fd0" +dependencies = [ + "crunchy", +] + +[[package]] +name = "hashbrown" +version = "0.14.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604" [[package]] name = "headers" -version = "0.3.8" +version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f3e372db8e5c0d213e0cd0b9be18be2aca3d44cf2fe30a9d46a65581cd454584" +checksum = "06683b93020a07e3dbcf5f8c0f6d40080d725bea7936fc01ad345c01b97dc270" dependencies = [ - "base64 0.13.1", - "bitflags 1.3.2", + "base64 0.21.5", "bytes", "headers-core", "http", @@ -1615,9 +1668,9 @@ checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" [[package]] name = "hermit-abi" -version = "0.3.2" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "443144c8cdadd93ebf52ddb4056d257f5b52c04d3c804e657d19eb73fc33668b" +checksum = "d77f7ec81a6d05a3abb01ab6eb7590f6083d08449fe5a1c8b1e620283546ccb7" [[package]] name = "hex" @@ -1627,31 +1680,11 @@ checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" [[package]] name = "hkdf" -version = "0.11.0" +version = "0.12.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "01706d578d5c281058480e673ae4086a9f4710d8df1ad80a5b03e39ece5f886b" +checksum = "7b5f8eb2ad728638ea2c7d47a21db23b7b58a72ed6a38256b8a1849f15fbbdf7" dependencies = [ - "digest 0.9.0", - "hmac 0.11.0", -] - -[[package]] -name = "hkdf" -version = "0.12.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "791a029f6b9fc27657f6f188ec6e5e43f6911f6f878e0dc5501396e09809d437" -dependencies = [ - "hmac 0.12.1", -] - -[[package]] -name = "hmac" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a2a2320eb7ec0ebe8da8f744d7812d9fc4cb4d09344ac01898dbcb6a20ae69b" -dependencies = [ - "crypto-mac", - "digest 0.9.0", + "hmac", ] [[package]] @@ -1660,7 +1693,16 @@ version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6c49c37c09c17a53d937dfbb742eb3a961d65a994e6bcdcf37e7399d0cc8ab5e" dependencies = [ - "digest 0.10.7", + "digest", +] + +[[package]] +name = "home" +version = "0.5.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e3d1354bf6b7235cb4a0576c2619fd4ed18183f689b12b006a0ee7329eeff9a5" +dependencies = [ + "windows-sys 0.52.0", ] [[package]] @@ -1674,9 +1716,9 @@ dependencies = [ [[package]] name = "http" -version = "0.2.9" +version = "0.2.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd6effc99afb63425aff9b05836f029929e345a6148a14b7ecd5ab67af944482" +checksum = "8947b1a6fad4393052c7ba1f4cd97bed3e953a95c79c92ad9b051a04611d9fbb" dependencies = [ "bytes", "fnv", @@ -1685,9 +1727,9 @@ dependencies = [ [[package]] name = "http-body" -version = "0.4.5" +version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d5f38f16d184e36f2408a55281cd658ecbd3ca05cce6d6510a176eca393e26d1" +checksum = "7ceab25649e9960c0311ea418d17bee82c0dcec1bd053b5f9a66e265a693bed2" dependencies = [ "bytes", "http", @@ -1714,9 +1756,9 @@ checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" [[package]] name = "hyper" -version = "0.14.27" +version = "0.14.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffb1cfd654a8219eaef89881fdb3bb3b1cdc5fa75ded05d6933b2b382e395468" +checksum = "bf96e135eb83a2a8ddf766e426a841d8ddd7449d5f00d34ea02b41d2f19eef80" dependencies = [ "bytes", "futures-channel", @@ -1728,7 +1770,7 @@ dependencies = [ "httpdate", "itoa", "pin-project-lite", - "socket2 0.4.9", + "socket2 0.5.5", "tokio", "tower-service", "tracing", @@ -1737,10 +1779,11 @@ dependencies = [ [[package]] name = "hyper-rustls" -version = "0.23.2" +version = "0.24.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1788965e61b367cd03a62950836d5cd41560c3577d90e40e0819373194d1661c" +checksum = "ec3efd23720e2049821a693cbc7e65ea87c72f1c58ff2f9522ff332b1491e590" dependencies = [ + "futures-util", "http", "hyper", "log", @@ -1764,16 +1807,16 @@ dependencies = [ [[package]] name = "iana-time-zone" -version = "0.1.57" +version = "0.1.58" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2fad5b825842d2b38bd206f3e81d6957625fd7f0a361e345c30e01a0ae2dd613" +checksum = "8326b86b6cff230b97d0d312a6c40a60726df3332e721f72a1b035f451663b20" dependencies = [ "android_system_properties", "core-foundation-sys", "iana-time-zone-haiku", "js-sys", "wasm-bindgen", - "windows", + "windows-core", ] [[package]] @@ -1787,9 +1830,9 @@ dependencies = [ [[package]] name = "idna" -version = "0.4.0" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d20d6b07bfbc108882d88ed8e37d39636dcc260e15e30c45e6ba089610b917c" +checksum = "634d9b1461af396cad843f47fdba5597a4f9e6ddd4bfb6ff5d85028c25cb12f6" dependencies = [ "unicode-bidi", "unicode-normalization", @@ -1804,14 +1847,14 @@ dependencies = [ "bytemuck", "byteorder", "color_quant", - "gif", - "jpeg-decoder", + "gif 0.11.4", + "jpeg-decoder 0.1.22", "num-iter", "num-rational 0.3.2", "num-traits", "png 0.16.8", "scoped_threadpool", - "tiff", + "tiff 0.6.1", ] [[package]] @@ -1823,16 +1866,21 @@ dependencies = [ "bytemuck", "byteorder", "color_quant", + "exr", + "gif 0.12.0", + "jpeg-decoder 0.3.0", "num-rational 0.4.1", "num-traits", "png 0.17.10", + "qoi", + "tiff 0.9.0", ] [[package]] name = "indexmap" -version = "2.0.0" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d5477fe2230a79769d8dc68e0eabf5437907c0457a5614a9e8dddb67f65eb65d" +checksum = "d530e1a18b1cb4c484e6e34556a0d948706958449fca0cab753d649f2bce3d1f" dependencies = [ "equivalent", "hashbrown", @@ -1865,7 +1913,7 @@ checksum = "eae7b9aee968036d54dce06cebaefd919e4472e753296daccd6d344e3e2df0c2" dependencies = [ "hermit-abi", "libc", - "windows-sys", + "windows-sys 0.48.0", ] [[package]] @@ -1875,8 +1923,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cb0889898416213fab133e1d33a0e5858a48177452750691bde3666d0fdbaf8b" dependencies = [ "hermit-abi", - "rustix 0.38.9", - "windows-sys", + "rustix 0.38.28", + "windows-sys 0.48.0", ] [[package]] @@ -1889,16 +1937,25 @@ dependencies = [ ] [[package]] -name = "itoa" -version = "1.0.9" +name = "itertools" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af150ab688ff2122fcef229be89cb50dd66af9e01a4ff320cc137eecc9bacc38" +checksum = "b1c173a5686ce8bfa551b3563d0c2170bf24ca44da99c7ca4bfdab5418c3fe57" +dependencies = [ + "either", +] + +[[package]] +name = "itoa" +version = "1.0.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b1a46d1a171d865aa5f83f92695765caa047a9b4cbae2cbf37dbd613a793fd4c" [[package]] name = "jobserver" -version = "0.1.26" +version = "0.1.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "936cfd212a0155903bcbc060e316fb6cc7cbf2e1907329391ebadc1fe0ce77c2" +checksum = "8c37f63953c4c63420ed5fd3d6d398c719489b9f872b9fa683262f8edd363c7d" dependencies = [ "libc", ] @@ -1913,21 +1970,21 @@ dependencies = [ ] [[package]] -name = "js-sys" -version = "0.3.64" +name = "jpeg-decoder" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c5f195fe497f702db0f318b07fdd68edb16955aed830df8363d837542f8f935a" +checksum = "bc0000e42512c92e31c2252315bda326620a4e034105e900c98ec492fa077b3e" dependencies = [ - "wasm-bindgen", + "rayon", ] [[package]] -name = "kv-log-macro" -version = "1.0.7" +name = "js-sys" +version = "0.3.66" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0de8b303297635ad57c9f5059fd9cee7a47f8e8daa09df0fcd07dd39fb22977f" +checksum = "cee9c64da59eae3b50095c18d3e74f8b73c0b86d2792824ff01bbce68ba229ca" dependencies = [ - "log", + "wasm-bindgen", ] [[package]] @@ -1936,14 +1993,20 @@ version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" dependencies = [ - "spin", + "spin 0.5.2", ] [[package]] -name = "libadwaita" +name = "lebe" version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06444f4ca05a60693da6e9e2b591bd40a298e65a118a8d5e830771718b3e0253" +checksum = "03087c2bad5e1034e8cace5926dec053fb3790248370865f5117a7d0213354c8" + +[[package]] +name = "libadwaita" +version = "0.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2fe7e70c06507ed10a16cda707f358fbe60fe0dc237498f78c686ade92fd979c" dependencies = [ "gdk-pixbuf", "gdk4", @@ -1957,9 +2020,9 @@ dependencies = [ [[package]] name = "libadwaita-sys" -version = "0.5.2" +version = "0.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "021cfe3d1fcfa82411765a791f7e9b32f35dd98ce88d2e3fa10e7320f5cc8ce7" +checksum = "5e10aaa38de1d53374f90deeb4535209adc40cc5dba37f9704724169bceec69a" dependencies = [ "gdk4-sys", "gio-sys", @@ -1973,45 +2036,44 @@ dependencies = [ [[package]] name = "libc" -version = "0.2.147" +version = "0.2.151" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4668fb0ea861c1df094127ac5f1da3409a82116a4ba74fca2e58ef927159bb3" +checksum = "302d7ab3130588088d277783b1e2d2e10c9e9e4a16dd9050e6ec93fb3e7048f4" [[package]] name = "libm" -version = "0.2.7" +version = "0.2.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7012b1bbb0719e1097c47611d3898568c546d597c2e74d66f6087edd5233ff4" +checksum = "4ec2a862134d2a7d32d7983ddcdd1c4923530833c9f2ea1a44fc5fa473989058" [[package]] name = "libsignal-protocol" version = "0.1.0" -source = "git+https://github.com/signalapp/libsignal?tag=v0.28.1#86b2fcc427bf32530866f4e30b18707c1f3682f7" +source = "git+https://github.com/signalapp/libsignal?tag=v0.32.0#72f046fe19a5eac22c7abcf9917956f240759364" dependencies = [ - "aes 0.7.5", + "aes 0.8.3", "aes-gcm-siv", "arrayref", "async-trait", - "block-modes", + "ctr 0.9.2", "curve25519-dalek", "displaydoc", - "generic-array", "hex", - "hkdf 0.11.0", - "hmac 0.11.0", - "itertools", + "hkdf", + "hmac", + "itertools 0.10.5", "log", "num_enum", "pqcrypto-kyber", "pqcrypto-traits", "prost 0.9.0", "prost-build 0.9.0", - "rand 0.7.3", - "sha2 0.9.9", + "rand", + "sha2", "signal-crypto", + "static_assertions", "subtle", "thiserror", - "typenum", "uuid", "x25519-dalek", ] @@ -2019,7 +2081,7 @@ dependencies = [ [[package]] name = "libsignal-service" version = "0.1.0" -source = "git+https://github.com/whisperfish/libsignal-service-rs?rev=8789920#87899201123b8095cd0f30317620a6d5b7fd652b" +source = "git+https://github.com/whisperfish/libsignal-service-rs?rev=0a7987e#0a7987e59bbb9fb110e899ac09e8efb6e28bc46d" dependencies = [ "aes 0.7.5", "aes-gcm", @@ -2032,17 +2094,17 @@ dependencies = [ "derivative", "futures", "hex", - "hkdf 0.12.3", - "hmac 0.12.1", + "hkdf", + "hmac", "libsignal-protocol", "log", "phonenumber", "prost 0.10.4", "prost-build 0.10.4", - "rand 0.7.3", + "rand", "serde", "serde_json", - "sha2 0.10.7", + "sha2", "thiserror", "url", "uuid", @@ -2052,11 +2114,10 @@ dependencies = [ [[package]] name = "libsignal-service-hyper" version = "0.1.0" -source = "git+https://github.com/whisperfish/libsignal-service-rs?rev=8789920#87899201123b8095cd0f30317620a6d5b7fd652b" +source = "git+https://github.com/whisperfish/libsignal-service-rs?rev=0a7987e#0a7987e59bbb9fb110e899ac09e8efb6e28bc46d" dependencies = [ "async-trait", "async-tungstenite", - "base64 0.13.1", "bytes", "futures", "headers", @@ -2118,9 +2179,9 @@ checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519" [[package]] name = "linux-raw-sys" -version = "0.4.5" +version = "0.4.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57bcfdad1b858c2db7c38303a6d2ad4dfaf5eb53dfeb0910128b2c26d6158503" +checksum = "c4cd1a83af159aa67994778be9070f0ae1bd732942279cabb14f86f986a21456" [[package]] name = "locale_config" @@ -2137,9 +2198,9 @@ dependencies = [ [[package]] name = "lock_api" -version = "0.4.10" +version = "0.4.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1cc9717a20b1bb222f333e6a92fd32f7d8a18ddc5a3191a11af45dcbf4dcd16" +checksum = "3c168f8615b12bc01f9c17e2eb0cc07dcae1940121185446edc3744920e8ef45" dependencies = [ "autocfg", "scopeguard", @@ -2150,9 +2211,6 @@ name = "log" version = "0.4.20" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f" -dependencies = [ - "value-bag", -] [[package]] name = "lru-cache" @@ -2172,30 +2230,11 @@ dependencies = [ "libc", ] -[[package]] -name = "matrix-sdk-store-encryption" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ddee75c3cca58f3a323283dc4e849d19d52988903f907ed0fb53dcad5d6fd25" -dependencies = [ - "blake3", - "chacha20poly1305", - "displaydoc", - "hmac 0.12.1", - "pbkdf2 0.11.0", - "rand 0.8.5", - "serde", - "serde_json", - "sha2 0.10.7", - "thiserror", - "zeroize", -] - [[package]] name = "memchr" -version = "2.5.0" +version = "2.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" +checksum = "f665ee40bc4a3c5590afb1e9677db74a508659dfd71e126420da8274909a0167" [[package]] name = "memoffset" @@ -2268,13 +2307,13 @@ dependencies = [ [[package]] name = "mio" -version = "0.8.8" +version = "0.8.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "927a765cd3fc26206e66b296465fa9d3e5ab003e651c1b3c060e7956d96b19d2" +checksum = "8f3d0b296e374a4e6f3c7b0a1f5a51d748a0d34c85e7dc48fc3fa9a87657fe09" dependencies = [ "libc", - "wasi 0.11.0+wasi-snapshot-preview1", - "windows-sys", + "wasi", + "windows-sys 0.48.0", ] [[package]] @@ -2293,7 +2332,7 @@ dependencies = [ "mime_guess", "percent-encoding", "pin-project-lite", - "rand 0.8.5", + "rand", "thiserror", "tokio", "tokio-util", @@ -2307,15 +2346,14 @@ checksum = "e5ce46fe64a9d73be07dcbe690a38ce1b293be448fd8ce1e6c1b8062c9f72c6a" [[package]] name = "nix" -version = "0.26.2" +version = "0.26.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfdda3d196821d6af13126e40375cdf7da646a96114af134d5f417a9a1dc8e1a" +checksum = "598beaf3cc6fdd9a5dfb1630c2800c7acd31df7aaf0f565796fba2b53ca1af1b" dependencies = [ "bitflags 1.3.2", "cfg-if", "libc", "memoffset 0.7.1", - "static_assertions", ] [[package]] @@ -2365,7 +2403,7 @@ dependencies = [ "num-integer", "num-iter", "num-traits", - "rand 0.8.5", + "rand", "serde", "smallvec", "zeroize", @@ -2426,9 +2464,9 @@ dependencies = [ [[package]] name = "num-traits" -version = "0.2.16" +version = "0.2.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f30b0abd723be7e2ffca1272140fac1a2f084c77ec3e123c192b66af1ee9e6c2" +checksum = "39e3200413f237f41ab11ad6d161bc7239c84dcb631773ccd7de3dfe4b5c267c" dependencies = [ "autocfg", ] @@ -2445,23 +2483,23 @@ dependencies = [ [[package]] name = "num_enum" -version = "0.5.11" +version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f646caf906c20226733ed5b1374287eb97e3c2a5c227ce668c1f2ce20ae57c9" +checksum = "7a015b430d3c108a207fd776d2e2196aaf8b1cf8cf93253e3a097ff3085076a1" dependencies = [ "num_enum_derive", ] [[package]] name = "num_enum_derive" -version = "0.5.11" +version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dcbff9bc912032c62bf65ef1d5aea88983b420f4f839db1e9b0c281a25c9c799" +checksum = "96667db765a921f7b295ffee8b60472b686a51d4f21c2ee4ffdb94c7013b65a6" dependencies = [ - "proc-macro-crate", + "proc-macro-crate 1.3.1", "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.42", ] [[package]] @@ -2495,18 +2533,18 @@ dependencies = [ [[package]] name = "object" -version = "0.32.0" +version = "0.32.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77ac5bbd07aea88c60a577a1ce218075ffd59208b2d7ca97adf9bfc5aeb21ebe" +checksum = "a6a622008b6e321afc04970976f62ee297fdbaa6f95318ca343e3eebb9648441" dependencies = [ "memchr", ] [[package]] name = "once_cell" -version = "1.18.0" +version = "1.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d" +checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" [[package]] name = "oncemutex" @@ -2521,22 +2559,21 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "220729ba847d98e1a9902c05e41dae79ce4a0b913dad68bc540dd3120a8c2b6b" dependencies = [ "aes 0.8.3", - "async-global-executor", - "async-std", "byteorder", "cbc", "cipher 0.4.4", - "digest 0.10.7", + "digest", "futures-util", - "hkdf 0.12.3", - "hmac 0.12.1", + "hkdf", + "hmac", "num", "num-bigint-dig", "once_cell", - "pbkdf2 0.12.2", - "rand 0.8.5", + "pbkdf2", + "rand", "serde", - "sha2 0.10.7", + "sha2", + "tokio", "zbus", "zeroize", ] @@ -2565,9 +2602,9 @@ dependencies = [ [[package]] name = "pango" -version = "0.18.0" +version = "0.18.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06a9e54b831d033206160096b825f2070cf5fda7e35167b1c01e9e774f9202d1" +checksum = "7ca27ec1eb0457ab26f3036ea52229edbdb74dee1edd29063f5b9b010e7ebee4" dependencies = [ "gio", "glib", @@ -2590,9 +2627,9 @@ dependencies = [ [[package]] name = "parking" -version = "2.1.0" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14f2252c834a40ed9bb5422029649578e63aa341ac401f74e719dd1afda8394e" +checksum = "bb813b8af86854136c6922af0598d719255ecb2179515e6e7730d468f05c9cae" [[package]] name = "parking_lot" @@ -2619,44 +2656,21 @@ dependencies = [ "winapi", ] -[[package]] -name = "password-hash" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7676374caaee8a325c9e7a2ae557f216c5563a171d6997b0ef8a65af35147700" -dependencies = [ - "base64ct", - "rand_core 0.6.4", - "subtle", -] - -[[package]] -name = "pbkdf2" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "83a0692ec44e4cf1ef28ca317f14f8f07da2d95ec3fa01f86e4467b725e60917" -dependencies = [ - "digest 0.10.7", - "hmac 0.12.1", - "password-hash", - "sha2 0.10.7", -] - [[package]] name = "pbkdf2" version = "0.12.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f8ed6a7761f76e3b9f92dfb0a60a6a6477c61024b775147ff0973a02653abaf2" dependencies = [ - "digest 0.10.7", - "hmac 0.12.1", + "digest", + "hmac", ] [[package]] name = "percent-encoding" -version = "2.3.0" +version = "2.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b2a4787296e9989611394c33f193f676704af1686e70b8f8033ab5ba9a35a94" +checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" [[package]] name = "petgraph" @@ -2670,14 +2684,14 @@ dependencies = [ [[package]] name = "phonenumber" -version = "0.3.2+8.13.9" +version = "0.3.3+8.13.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34749f64ea9d76f10cdc8a859588b57775f59177c7dd91f744d620bd62982d6f" +checksum = "635f3e6288e4f01c049d89332a031bd74f25d64b6fb94703ca966e819488cd06" dependencies = [ "bincode", "either", "fnv", - "itertools", + "itertools 0.11.0", "lazy_static", "nom", "quick-xml", @@ -2685,6 +2699,7 @@ dependencies = [ "regex-cache", "serde", "serde_derive", + "strum", "thiserror", ] @@ -2701,10 +2716,27 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" [[package]] -name = "pkg-config" -version = "0.3.27" +name = "piper" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26072860ba924cbfa98ea39c8c19b4dd6a4a25423dbdf219c1eca91aa0cf6964" +checksum = "668d31b1c4eba19242f2088b2bf3316b82ca31082a8335764db4e083db7485d4" +dependencies = [ + "atomic-waker", + "fastrand 2.0.1", + "futures-io", +] + +[[package]] +name = "pkg-config" +version = "0.3.28" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "69d3587f8a9e599cc7ec2c00e331f71c4e69a5f9a4b8a6efd5b07466b9736f9a" + +[[package]] +name = "platforms" +version = "3.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "14e6ab3f592e6fb464fc9712d8d6e6912de6473954635fd76a589d832cffcbb0" [[package]] name = "png" @@ -2734,11 +2766,12 @@ dependencies = [ [[package]] name = "poksho" version = "0.7.0" -source = "git+https://github.com/signalapp/libsignal?tag=v0.28.1#86b2fcc427bf32530866f4e30b18707c1f3682f7" +source = "git+https://github.com/signalapp/libsignal?tag=v0.32.0#72f046fe19a5eac22c7abcf9917956f240759364" dependencies = [ "curve25519-dalek", - "hmac 0.11.0", - "sha2 0.9.9", + "hmac", + "sha2", + "subtle", ] [[package]] @@ -2754,18 +2787,32 @@ dependencies = [ "libc", "log", "pin-project-lite", - "windows-sys", + "windows-sys 0.48.0", +] + +[[package]] +name = "polling" +version = "3.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cf63fa624ab313c11656b4cda960bfc46c410187ad493c41f6ba2d8c1e991c9e" +dependencies = [ + "cfg-if", + "concurrent-queue", + "pin-project-lite", + "rustix 0.38.28", + "tracing", + "windows-sys 0.52.0", ] [[package]] name = "poly1305" -version = "0.7.2" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "048aeb476be11a4b6ca432ca569e375810de9294ae78f4774e78ea98a9246ede" +checksum = "8159bd90725d2df49889a078b54f4f79e87f1f8a8444194cdca81d38f5393abf" dependencies = [ "cpufeatures", "opaque-debug", - "universal-hash", + "universal-hash 0.5.1", ] [[package]] @@ -2777,7 +2824,19 @@ dependencies = [ "cfg-if", "cpufeatures", "opaque-debug", - "universal-hash", + "universal-hash 0.4.0", +] + +[[package]] +name = "polyval" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d52cff9d1d4dee5fe6d03729099f4a310a41179e0a10dbf542039873f2e826fb" +dependencies = [ + "cfg-if", + "cpufeatures", + "opaque-debug", + "universal-hash 0.5.1", ] [[package]] @@ -2794,15 +2853,15 @@ checksum = "d9d34bec6abe2283e6de7748b68b292d1ffa2203397e3e71380ff8418a49fb46" dependencies = [ "cc", "dunce", - "getrandom 0.2.10", + "getrandom", "libc", ] [[package]] name = "pqcrypto-kyber" -version = "0.7.6" +version = "0.7.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe9d9695c19e525d5366c913562a331fbeef9a2ad801d9a9ded61a0e4c2fe0fb" +checksum = "e205df07793e278e4a77c44db68b7d0e81064984cfcf508f24ae68cde63b6609" dependencies = [ "cc", "glob", @@ -2813,45 +2872,64 @@ dependencies = [ [[package]] name = "pqcrypto-traits" -version = "0.3.4" +version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97e91cb6af081c6daad5fa705f8adb0634c027662052cb3174bdf2957bf07e25" +checksum = "94e851c7654eed9e68d7d27164c454961a616cf8c203d500607ef22c737b51bb" [[package]] name = "presage" version = "0.6.0-dev" -source = "git+https://github.com/MarcusGrass/presage?rev=d6d8fff#d6d8fff5f5e6429e6fe9d3c6d388323d094fdab6" +source = "git+https://github.com/Schmiddiii/presage?rev=1166349dbe47be3b23a2b698ace5b51c760a6e9d#1166349dbe47be3b23a2b698ace5b51c760a6e9d" dependencies = [ - "base64 0.12.3", + "base64 0.21.5", "futures", "libsignal-service", "libsignal-service-hyper", "log", "parking_lot", - "rand 0.7.3", + "rand", "serde", "serde_json", + "sha2", "thiserror", "tokio", "url", ] +[[package]] +name = "presage-store-cipher" +version = "0.1.0" +source = "git+https://github.com/Schmiddiii/presage?rev=1166349dbe47be3b23a2b698ace5b51c760a6e9d#1166349dbe47be3b23a2b698ace5b51c760a6e9d" +dependencies = [ + "blake3", + "chacha20poly1305", + "hmac", + "pbkdf2", + "rand", + "serde", + "serde_json", + "sha2", + "thiserror", + "zeroize", +] + [[package]] name = "presage-store-sled" version = "0.6.0-dev" -source = "git+https://github.com/MarcusGrass/presage?rev=d6d8fff#d6d8fff5f5e6429e6fe9d3c6d388323d094fdab6" +source = "git+https://github.com/Schmiddiii/presage?rev=1166349dbe47be3b23a2b698ace5b51c760a6e9d#1166349dbe47be3b23a2b698ace5b51c760a6e9d" dependencies = [ "async-trait", "base64 0.12.3", "fs_extra", "log", - "matrix-sdk-store-encryption", "presage", + "presage-store-cipher", "prost 0.10.4", "prost-build 0.10.4", + "quickcheck_macros", "serde", "serde_json", - "sha2 0.10.7", + "sha2", "sled", "thiserror", ] @@ -2863,7 +2941,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7f4c021e1093a56626774e81216a4ce732a735e5bad4868a03f3ed65ca0c3919" dependencies = [ "once_cell", - "toml_edit", + "toml_edit 0.19.15", +] + +[[package]] +name = "proc-macro-crate" +version = "2.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "97dc5fea232fc28d2f597b37c4876b348a40e33f3b02cc975c8d006d78d94b1a" +dependencies = [ + "toml_datetime", + "toml_edit 0.20.2", ] [[package]] @@ -2892,9 +2980,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.66" +version = "1.0.71" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "18fb31db3f9bddb2ea821cde30a9f70117e3f119938b5ee630b7403aa6e2ead9" +checksum = "75cb1540fadbd5b8fbccc4dddad2734eba435053f725621c070711a14bb5f4b8" dependencies = [ "unicode-ident", ] @@ -2927,7 +3015,7 @@ checksum = "62941722fb675d463659e49c4f3fe1fe792ff24fe5bbaa9c08cd3b98a1c354f5" dependencies = [ "bytes", "heck 0.3.3", - "itertools", + "itertools 0.10.5", "lazy_static", "log", "multimap", @@ -2949,7 +3037,7 @@ dependencies = [ "cfg-if", "cmake", "heck 0.4.1", - "itertools", + "itertools 0.10.5", "lazy_static", "log", "multimap", @@ -2968,7 +3056,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f9cc1a3263e07e0bf68e96268f37665207b49560d98739662cdfaae215c720fe" dependencies = [ "anyhow", - "itertools", + "itertools 0.10.5", "proc-macro2", "quote", "syn 1.0.109", @@ -2981,7 +3069,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7b670f45da57fb8542ebdbb6105a925fe571b67f9e7ed9f47a06a84e72b4e7cc" dependencies = [ "anyhow", - "itertools", + "itertools 0.10.5", "proc-macro2", "quote", "syn 1.0.109", @@ -3008,10 +3096,19 @@ dependencies = [ ] [[package]] -name = "qrcode-generator" -version = "4.1.8" +name = "qoi" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc713c23eb7e1a5f18b84e72be88b82a617ee25783a524a38f0caa4c986b2d76" +checksum = "7f6d64c71eb498fe9eae14ce4ec935c555749aef511cca85b5568910d6e48001" +dependencies = [ + "bytemuck", +] + +[[package]] +name = "qrcode-generator" +version = "4.1.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1d06cb9646c7a14096231a2474d7f21e5e8c13de090c68d13bde6157cfe7f159" dependencies = [ "html-escape", "image 0.24.7", @@ -3033,6 +3130,17 @@ dependencies = [ "memchr", ] +[[package]] +name = "quickcheck_macros" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b22a693222d716a9587786f37ac3f6b4faedb5b80c23914e7303ff5a1d8016e9" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", +] + [[package]] name = "quote" version = "1.0.33" @@ -3042,19 +3150,6 @@ dependencies = [ "proc-macro2", ] -[[package]] -name = "rand" -version = "0.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a6b1679d49b24bbfe0c803429aa1874472f50d9b363131f0e89fc356b544d03" -dependencies = [ - "getrandom 0.1.16", - "libc", - "rand_chacha 0.2.2", - "rand_core 0.5.1", - "rand_hc", -] - [[package]] name = "rand" version = "0.8.5" @@ -3062,18 +3157,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" dependencies = [ "libc", - "rand_chacha 0.3.1", - "rand_core 0.6.4", -] - -[[package]] -name = "rand_chacha" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4c8ed856279c9737206bf725bf36935d8666ead7aa69b52be55af369d193402" -dependencies = [ - "ppv-lite86", - "rand_core 0.5.1", + "rand_chacha", + "rand_core", ] [[package]] @@ -3083,16 +3168,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88" dependencies = [ "ppv-lite86", - "rand_core 0.6.4", -] - -[[package]] -name = "rand_core" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19" -dependencies = [ - "getrandom 0.1.16", + "rand_core", ] [[package]] @@ -3101,23 +3177,14 @@ version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" dependencies = [ - "getrandom 0.2.10", -] - -[[package]] -name = "rand_hc" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c" -dependencies = [ - "rand_core 0.5.1", + "getrandom", ] [[package]] name = "rayon" -version = "1.7.0" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d2df5196e37bcc87abebc0053e20787d73847bb33134a69841207dd0a47f03b" +checksum = "9c27db03db7734835b3f53954b534c91069375ce6ccaa2e065441e07d9b6cdb1" dependencies = [ "either", "rayon-core", @@ -3125,14 +3192,12 @@ dependencies = [ [[package]] name = "rayon-core" -version = "1.11.0" +version = "1.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b8f95bd6966f5c87776639160a66bd8ab9895d9d4ab01ddba9fc60661aebe8d" +checksum = "5ce3fb6ad83f861aac485e76e1985cd109d9a3713802152be56c3b1f0e0658ed" dependencies = [ - "crossbeam-channel", "crossbeam-deque", "crossbeam-utils", - "num_cpus", ] [[package]] @@ -3146,34 +3211,34 @@ dependencies = [ [[package]] name = "redox_syscall" -version = "0.3.5" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29" +checksum = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa" dependencies = [ "bitflags 1.3.2", ] [[package]] name = "regex" -version = "1.9.3" +version = "1.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81bc1d4caf89fac26a70747fe603c130093b53c773888797a6329091246d651a" +checksum = "380b951a9c5e80ddfd6136919eef32310721aa4aacd4889a8d39124b026ab343" dependencies = [ "aho-corasick", "memchr", "regex-automata", - "regex-syntax 0.7.4", + "regex-syntax 0.8.2", ] [[package]] name = "regex-automata" -version = "0.3.6" +version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fed1ceff11a1dddaee50c9dc8e4938bd106e9d89ae372f192311e7da498e3b69" +checksum = "5f804c7828047e88b2d32e2d7fe5a105da8ee3264f01902f796c8e067dc2483f" dependencies = [ "aho-corasick", "memchr", - "regex-syntax 0.7.4", + "regex-syntax 0.8.2", ] [[package]] @@ -3196,23 +3261,22 @@ checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1" [[package]] name = "regex-syntax" -version = "0.7.4" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5ea92a5b6195c6ef2a0295ea818b312502c6fc94dde986c5553242e18fd4ce2" +checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f" [[package]] name = "ring" -version = "0.16.20" +version = "0.17.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3053cf52e236a3ed746dfc745aa9cacf1b791d846bdaf412f60a8d7d6e17c8fc" +checksum = "688c63d65483050968b2a8937f7995f443e27041a0f7700aa59b0822aedebb74" dependencies = [ "cc", + "getrandom", "libc", - "once_cell", - "spin", + "spin 0.9.8", "untrusted", - "web-sys", - "winapi", + "windows-sys 0.48.0", ] [[package]] @@ -3232,41 +3296,41 @@ dependencies = [ [[package]] name = "rustix" -version = "0.37.23" +version = "0.37.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d69718bf81c6127a49dc64e44a742e8bb9213c0ff8869a22c308f84c1d4ab06" +checksum = "fea8ca367a3a01fe35e6943c400addf443c0f57670e6ec51196f71a4b8762dd2" dependencies = [ "bitflags 1.3.2", "errno", "io-lifetimes", "libc", "linux-raw-sys 0.3.8", - "windows-sys", + "windows-sys 0.48.0", ] [[package]] name = "rustix" -version = "0.38.9" +version = "0.38.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9bfe0f2582b4931a45d1fa608f8a8722e8b3c7ac54dd6d5f3b3212791fedef49" +checksum = "72e572a5e8ca657d7366229cdde4bd14c4eb5499a9573d4d366fe1b599daa316" dependencies = [ - "bitflags 2.4.0", + "bitflags 2.4.1", "errno", "libc", - "linux-raw-sys 0.4.5", - "windows-sys", + "linux-raw-sys 0.4.12", + "windows-sys 0.52.0", ] [[package]] name = "rustls" -version = "0.20.8" +version = "0.21.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fff78fc74d175294f4e83b28343315ffcfb114b156f0185e9741cb5570f50e2f" +checksum = "f9d5a6813c0759e4609cd494e8e725babae6a2ca7b62a5536a13daaec6fcb7ba" dependencies = [ "log", "ring", + "rustls-webpki", "sct", - "webpki", ] [[package]] @@ -3276,7 +3340,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a9aace74cb666635c918e9c12bc0d348266037aa8eb599b5cba565709a8dff00" dependencies = [ "openssl-probe", - "rustls-pemfile 1.0.3", + "rustls-pemfile 1.0.4", "schannel", "security-framework", ] @@ -3292,11 +3356,21 @@ dependencies = [ [[package]] name = "rustls-pemfile" -version = "1.0.3" +version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d3987094b1d07b653b7dfdc3f70ce9a1da9c51ac18c1b06b662e4f9a0e9f4b2" +checksum = "1c74cae0a4cf6ccbbf5f359f08efdf8ee7e1dc532573bf0db71968cb56b1448c" dependencies = [ - "base64 0.21.2", + "base64 0.21.5", +] + +[[package]] +name = "rustls-webpki" +version = "0.101.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b6275d1ee7a1cd780b64aca7726599a1dbc893b1e64144529e55c3c2f745765" +dependencies = [ + "ring", + "untrusted", ] [[package]] @@ -3307,9 +3381,9 @@ checksum = "7ffc183a10b4478d04cbbbfc96d0873219d962dd5accaff2ffbd4ceb7df837f4" [[package]] name = "ryu" -version = "1.0.15" +version = "1.0.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ad4cc8da4ef723ed60bced201181d83791ad433213d8c24efffda1eec85d741" +checksum = "f98d2aa92eebf49b69786be48e4477826b256916e84a57ff2a4f21923b48eb4c" [[package]] name = "schannel" @@ -3317,7 +3391,7 @@ version = "0.1.22" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0c3733bf4cf7ea0880754e19cb5a462007c4a8c1914bff372ccc95b464f1df88" dependencies = [ - "windows-sys", + "windows-sys 0.48.0", ] [[package]] @@ -3334,9 +3408,9 @@ checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" [[package]] name = "sct" -version = "0.7.0" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d53dcdb7c9f8158937a7981b48accfd39a43af418591a5d008c7b22b5e1b7ca4" +checksum = "da046153aa2352493d6cb7da4b6e5c0c057d8a1d0a9aa8560baffdd945acd414" dependencies = [ "ring", "untrusted", @@ -3367,35 +3441,35 @@ dependencies = [ [[package]] name = "semver" -version = "1.0.18" +version = "1.0.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0293b4b29daaf487284529cc2f5675b8e57c61f70167ba415a463651fd6a918" +checksum = "836fa6a3e1e547f9a2c4040802ec865b5d85f4014efe00555d7090a3dcaa1090" [[package]] name = "serde" -version = "1.0.187" +version = "1.0.193" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30a7fe14252655bd1e578af19f5fa00fe02fd0013b100ca6b49fde31c41bae4c" +checksum = "25dd9975e68d0cb5aa1120c288333fc98731bd1dd12f561e468ea4728c042b89" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.187" +version = "1.0.193" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e46b2a6ca578b3f1d4501b12f78ed4692006d79d82a1a7c561c12dbc3d625eb8" +checksum = "43576ca501357b9b071ac53cdc7da8ef0cbd9493d8df094cd821777ea6e894d3" dependencies = [ "proc-macro2", "quote", - "syn 2.0.29", + "syn 2.0.42", ] [[package]] name = "serde_json" -version = "1.0.105" +version = "1.0.108" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "693151e1ac27563d6dbcec9dee9fbd5da8539b20fa14ad3752b2e6d363ace360" +checksum = "3d1c7e3eac408d115102c4c24ad393e0821bb3a5df4d506a80f85f7a742a526b" dependencies = [ "itoa", "ryu", @@ -3404,110 +3478,63 @@ dependencies = [ [[package]] name = "serde_repr" -version = "0.1.16" +version = "0.1.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8725e1dfadb3a50f7e5ce0b1a540466f6ed3fe7a0fca2ac2b8b831d31316bd00" +checksum = "3081f5ffbb02284dda55132aa26daecedd7372a42417bbbab6f14ab7d6bb9145" dependencies = [ "proc-macro2", "quote", - "syn 2.0.29", + "syn 2.0.42", ] [[package]] name = "serde_spanned" -version = "0.6.3" +version = "0.6.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96426c9936fd7a0124915f9185ea1d20aa9445cc9821142f0a73bc9207a2e186" +checksum = "eb3622f419d1296904700073ea6cc23ad690adbd66f13ea683df73298736f0c1" dependencies = [ "serde", ] -[[package]] -name = "sha-1" -version = "0.9.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "99cd6713db3cf16b6c84e06321e049a9b9f699826e16096d23bbcc44d15d51a6" -dependencies = [ - "block-buffer 0.9.0", - "cfg-if", - "cpufeatures", - "digest 0.9.0", - "opaque-debug", -] - -[[package]] -name = "sha-1" -version = "0.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f5058ada175748e33390e40e872bd0fe59a19f265d0158daa551c5a88a76009c" -dependencies = [ - "cfg-if", - "cpufeatures", - "digest 0.10.7", -] - [[package]] name = "sha1" -version = "0.10.5" +version = "0.10.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f04293dc80c3993519f2d7f6f511707ee7094fe0c6d3406feb330cdb3540eba3" +checksum = "e3bf829a2d51ab4a5ddf1352d8470c140cadc8301b2ae1789db023f01cedd6ba" dependencies = [ "cfg-if", "cpufeatures", - "digest 0.10.7", + "digest", ] [[package]] name = "sha2" -version = "0.9.9" +version = "0.10.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d58a1e1bf39749807d89cf2d98ac2dfa0ff1cb3faa38fbb64dd88ac8013d800" -dependencies = [ - "block-buffer 0.9.0", - "cfg-if", - "cpufeatures", - "digest 0.9.0", - "opaque-debug", -] - -[[package]] -name = "sha2" -version = "0.10.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "479fb9d862239e610720565ca91403019f2f00410f1864c5aa7479b950a76ed8" +checksum = "793db75ad2bcafc3ffa7c68b215fee268f537982cd901d132f89c6343f3a3dc8" dependencies = [ "cfg-if", "cpufeatures", - "digest 0.10.7", + "digest", ] [[package]] name = "signal-crypto" version = "0.1.0" -source = "git+https://github.com/signalapp/libsignal?tag=v0.28.1#86b2fcc427bf32530866f4e30b18707c1f3682f7" +source = "git+https://github.com/signalapp/libsignal?tag=v0.32.0#72f046fe19a5eac22c7abcf9917956f240759364" dependencies = [ - "aes 0.7.5", - "block-modes", + "aes 0.8.3", + "cbc", + "ctr 0.9.2", "displaydoc", - "generic-array", - "ghash", - "hmac 0.11.0", - "sha-1 0.9.8", - "sha2 0.9.9", + "ghash 0.5.0", + "hmac", + "sha1", + "sha2", "subtle", "thiserror", ] -[[package]] -name = "signal-hook" -version = "0.3.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8621587d4798caf8eb44879d42e56b9a93ea5dcd315a6487c357130095b62801" -dependencies = [ - "libc", - "signal-hook-registry", -] - [[package]] name = "signal-hook-registry" version = "1.4.1" @@ -3550,15 +3577,15 @@ dependencies = [ [[package]] name = "smallvec" -version = "1.11.0" +version = "1.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62bb4feee49fdd9f707ef802e22365a35de4b7b299de4763d44bfea899442ff9" +checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970" [[package]] name = "socket2" -version = "0.4.9" +version = "0.4.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64a4a911eed85daf18834cfaa86a79b7d266ff93ff5ba14005426219480ed662" +checksum = "9f7916fc008ca5542385b89a3d3ce689953c143e9304a9bf8beec1de48994c0d" dependencies = [ "libc", "winapi", @@ -3566,12 +3593,12 @@ dependencies = [ [[package]] name = "socket2" -version = "0.5.3" +version = "0.5.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2538b18701741680e0322a2302176d3253a35388e2e62f172f64f4f16605f877" +checksum = "7b5fac59a5cb5dd637972e5fca70daf0523c9067fcdc4842f053dae04a18f8e9" dependencies = [ "libc", - "windows-sys", + "windows-sys 0.48.0", ] [[package]] @@ -3615,6 +3642,15 @@ version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d" +[[package]] +name = "spin" +version = "0.9.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67" +dependencies = [ + "lock_api", +] + [[package]] name = "static_assertions" version = "1.1.0" @@ -3622,10 +3658,32 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" [[package]] -name = "subtle" -version = "2.4.1" +name = "strum" +version = "0.24.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6bdef32e8150c2a081110b42772ffe7d7c9032b606bc226c8260fd97e0976601" +checksum = "063e6045c0e62079840579a7e47a355ae92f60eb74daaf156fb1e84ba164e63f" +dependencies = [ + "strum_macros", +] + +[[package]] +name = "strum_macros" +version = "0.24.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e385be0d24f186b4ce2f9982191e7101bb737312ad61c1f2f984f34bcf85d59" +dependencies = [ + "heck 0.4.1", + "proc-macro2", + "quote", + "rustversion", + "syn 1.0.109", +] + +[[package]] +name = "subtle" +version = "2.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "81cdd64d312baedb58e21336b31bc043b77e01cc99033ce76ef539f78e965ebc" [[package]] name = "syn" @@ -3640,9 +3698,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.29" +version = "2.0.42" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c324c494eba9d92503e6f1ef2e6df781e78f6a7705a0202d9801b198807d518a" +checksum = "5b7d0a2c048d661a1a59fcd7355baa232f7ed34e0ee4df2eef3c1c1c0d3852d8" dependencies = [ "proc-macro2", "quote", @@ -3663,9 +3721,9 @@ dependencies = [ [[package]] name = "system-deps" -version = "6.1.1" +version = "6.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30c2de8a4d8f4b823d634affc9cd2a74ec98c53a756f317e529a48046cbf71f3" +checksum = "2a2d580ff6a20c55dfb86be5f9c238f67835d0e81cbdea8bf5680e0897320331" dependencies = [ "cfg-expr", "heck 0.4.1", @@ -3676,56 +3734,56 @@ dependencies = [ [[package]] name = "target-lexicon" -version = "0.12.11" +version = "0.12.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d0e916b1148c8e263850e1ebcbd046f333e0683c724876bb0da63ea4373dc8a" +checksum = "14c39fd04924ca3a864207c66fc2cd7d22d7c016007f9ce846cbb9326331930a" [[package]] name = "temp-dir" -version = "0.1.11" +version = "0.1.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af547b166dd1ea4b472165569fc456cfb6818116f854690b0ff205e636523dab" +checksum = "dd16aa9ffe15fe021c6ee3766772132c6e98dfa395a167e16864f61a9cfb71d6" [[package]] name = "tempfile" -version = "3.8.0" +version = "3.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb94d2f3cc536af71caac6b6fcebf65860b347e7ce0cc9ebe8f70d3e521054ef" +checksum = "7ef1adac450ad7f4b3c28589471ade84f25f731a7a0fe30d71dfa9f60fd808e5" dependencies = [ "cfg-if", - "fastrand 2.0.0", - "redox_syscall 0.3.5", - "rustix 0.38.9", - "windows-sys", + "fastrand 2.0.1", + "redox_syscall 0.4.1", + "rustix 0.38.28", + "windows-sys 0.48.0", ] [[package]] name = "termcolor" -version = "1.2.0" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be55cf8942feac5c765c2c993422806843c9a9a45d4d5c407ad6dd2ea95eb9b6" +checksum = "ff1bc3d3f05aff0403e8ac0d92ced918ec05b666a43f83297ccef5bea8a3d449" dependencies = [ "winapi-util", ] [[package]] name = "thiserror" -version = "1.0.47" +version = "1.0.51" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97a802ec30afc17eee47b2855fc72e0c4cd62be9b4efe6591edde0ec5bd68d8f" +checksum = "f11c217e1416d6f036b870f14e0413d480dbf28edbee1f877abaf0206af43bb7" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.47" +version = "1.0.51" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6bb623b56e39ab7dcd4b1b98bb6c8f8d907ed255b18de254088016b27a8ee19b" +checksum = "01742297787513b79cf8e29d1056ede1313e2420b7b3b15d0a768b4921f549df" dependencies = [ "proc-macro2", "quote", - "syn 2.0.29", + "syn 2.0.42", ] [[package]] @@ -3734,11 +3792,22 @@ version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9a53f4706d65497df0c4349241deddf35f84cee19c87ed86ea8ca590f4464437" dependencies = [ - "jpeg-decoder", + "jpeg-decoder 0.1.22", "miniz_oxide 0.4.4", "weezl", ] +[[package]] +name = "tiff" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d172b0f4d3fba17ba89811858b9d3d97f928aece846475bbda076ca46736211" +dependencies = [ + "flate2", + "jpeg-decoder 0.3.0", + "weezl", +] + [[package]] name = "tinyvec" version = "1.6.0" @@ -3756,18 +3825,21 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.32.0" +version = "1.35.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17ed6077ed6cd6c74735e21f37eb16dc3935f96878b1fe961074089cc80893f9" +checksum = "c89b4efa943be685f629b149f53829423f8f5531ea21249408e8e2f8671ec104" dependencies = [ "backtrace", + "bytes", "libc", "mio", "num_cpus", "pin-project-lite", - "socket2 0.5.3", + "signal-hook-registry", + "socket2 0.5.5", "tokio-macros", - "windows-sys", + "tracing", + "windows-sys 0.48.0", ] [[package]] @@ -3782,24 +3854,23 @@ dependencies = [ [[package]] name = "tokio-macros" -version = "2.1.0" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "630bdcf245f78637c13ec01ffae6187cca34625e8c63150d424b59e55af2675e" +checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.29", + "syn 2.0.42", ] [[package]] name = "tokio-rustls" -version = "0.23.4" +version = "0.24.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c43ee83903113e03984cb9e5cebe6c04a5116269e900e3ddba8f068a62adda59" +checksum = "c28327cf380ac148141087fbfb9de9d7bd4e84ab5d2c28fbc911d753de8a7081" dependencies = [ "rustls", "tokio", - "webpki", ] [[package]] @@ -3818,14 +3889,14 @@ dependencies = [ [[package]] name = "toml" -version = "0.7.6" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c17e963a819c331dcacd7ab957d80bc2b9a9c1e71c804826d2f283dd65306542" +checksum = "185d8ab0dfbb35cf1399a6344d8484209c088f75f8f68230da55d48d95d43e3d" dependencies = [ "serde", "serde_spanned", "toml_datetime", - "toml_edit", + "toml_edit 0.20.2", ] [[package]] @@ -3839,9 +3910,20 @@ dependencies = [ [[package]] name = "toml_edit" -version = "0.19.14" +version = "0.19.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8123f27e969974a3dfba720fdb560be359f57b44302d280ba72e76a74480e8a" +checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421" +dependencies = [ + "indexmap", + "toml_datetime", + "winnow", +] + +[[package]] +name = "toml_edit" +version = "0.20.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "396e4d48bbb2b7554c944bde63101b5ae446cff6ec4a24227428f15eb72ef338" dependencies = [ "indexmap", "serde", @@ -3858,11 +3940,10 @@ checksum = "b6bc1c9ce2b5135ac7f93c72918fc37feb872bdc6a5533a8b85eb4b86bfdae52" [[package]] name = "tracing" -version = "0.1.37" +version = "0.1.40" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ce8c33a8d48bd45d624a6e523445fd21ec13d3653cd51f681abf67418f54eb8" +checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef" dependencies = [ - "cfg-if", "log", "pin-project-lite", "tracing-attributes", @@ -3871,63 +3952,63 @@ dependencies = [ [[package]] name = "tracing-attributes" -version = "0.1.26" +version = "0.1.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f4f31f56159e98206da9efd823404b79b6ef3143b4a7ab76e67b1751b25a4ab" +checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.29", + "syn 2.0.42", ] [[package]] name = "tracing-core" -version = "0.1.31" +version = "0.1.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0955b8137a1df6f1a2e9a37d8a6656291ff0297c1a97c24e0d8425fe2312f79a" +checksum = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54" dependencies = [ "once_cell", ] [[package]] name = "try-lock" -version = "0.2.4" +version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3528ecfd12c466c6f163363caf2d02a71161dd5e1cc6ae7b34207ea2d42d81ed" +checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b" [[package]] name = "tungstenite" -version = "0.17.3" +version = "0.20.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e27992fd6a8c29ee7eef28fc78349aa244134e10ad447ce3b9f0ac0ed0fa4ce0" +checksum = "9e3dac10fd62eaf6617d3a904ae222845979aec67c615d1c842b4002c7666fb9" dependencies = [ - "base64 0.13.1", "byteorder", "bytes", + "data-encoding", "http", "httparse", "log", - "rand 0.8.5", + "rand", "rustls", - "sha-1 0.10.1", + "sha1", "thiserror", "url", "utf-8", - "webpki", ] [[package]] name = "typenum" -version = "1.16.0" +version = "1.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "497961ef93d974e23eb6f433eb5fe1b7930b659f06d12dec6fc44a8f554c0bba" +checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825" [[package]] name = "uds_windows" -version = "1.0.2" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce65604324d3cce9b966701489fbd0cf318cb1f7bd9dd07ac9a4ee6fb791930d" +checksum = "89daebc3e6fd160ac4aa9fc8b3bf71e1f74fbf92367ae71fb83a037e8bf164b9" dependencies = [ + "memoffset 0.9.0", "tempfile", "winapi", ] @@ -3943,15 +4024,15 @@ dependencies = [ [[package]] name = "unicode-bidi" -version = "0.3.13" +version = "0.3.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "92888ba5573ff080736b3648696b70cafad7d250551175acbaa4e0385b3e1460" +checksum = "6f2528f27a9eb2b21e69c95319b30bd0efd85d09c379741b0f78ea1d86be2416" [[package]] name = "unicode-ident" -version = "1.0.11" +version = "1.0.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "301abaae475aa91687eb82514b328ab47a211a533026cb25fc3e519b86adfc3c" +checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" [[package]] name = "unicode-normalization" @@ -3976,25 +4057,35 @@ checksum = "f962df74c8c05a667b5ee8bcf162993134c104e96440b663c8daa176dc772d8c" [[package]] name = "universal-hash" -version = "0.4.1" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f214e8f697e925001e66ec2c6e37a4ef93f0f78c2eed7814394e10c62025b05" +checksum = "8326b2c654932e3e4f9196e69d08fdf7cfd718e1dc6f66b347e6024a0c961402" dependencies = [ "generic-array", "subtle", ] [[package]] -name = "untrusted" -version = "0.7.1" +name = "universal-hash" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a" +checksum = "fc1de2c688dc15305988b563c3854064043356019f97a4b46276fe734c4f07ea" +dependencies = [ + "crypto-common", + "subtle", +] + +[[package]] +name = "untrusted" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1" [[package]] name = "url" -version = "2.4.0" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50bff7831e19200a85b17131d085c25d7811bc4e186efdaf54bbd132994a88cb" +checksum = "31e6302e3bb753d46e83516cae55ae196fc0c309407cf11ab35cc51a4c2a4633" dependencies = [ "form_urlencoded", "idna", @@ -4010,25 +4101,19 @@ checksum = "09cc8ee72d2a9becf2f2febe0205bbed8fc6615b7cb429ad062dc7b7ddd036a9" [[package]] name = "utf8-width" -version = "0.1.6" +version = "0.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5190c9442dcdaf0ddd50f37420417d219ae5261bbf5db120d0f9bab996c9cba1" +checksum = "86bd8d4e895da8537e5315b8254664e6b769c4ff3db18321b297a1e7004392e3" [[package]] name = "uuid" -version = "1.4.1" +version = "1.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "79daa5ed5740825c40b389c5e50312b9c86df53fccd33f281df655642b43869d" +checksum = "5e395fcf16a7a3d8127ec99782007af141946b4795001f876d54fb0d55978560" dependencies = [ "serde", ] -[[package]] -name = "value-bag" -version = "1.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d92ccd67fb88503048c01b59152a04effd0782d035a83a6d256ce6085f08f4a3" - [[package]] name = "version-compare" version = "0.1.1" @@ -4043,9 +4128,9 @@ checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" [[package]] name = "waker-fn" -version = "1.1.0" +version = "1.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d5b2c62b4012a3e1eca5a7e077d13b3bf498c4073e33ccd58626607748ceeca" +checksum = "f3c4517f54858c779bbcbf228f4fca63d121bf85fbecb2dc578cdf4a39395690" [[package]] name = "want" @@ -4056,12 +4141,6 @@ dependencies = [ "try-lock", ] -[[package]] -name = "wasi" -version = "0.9.0+wasi-snapshot-preview1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519" - [[package]] name = "wasi" version = "0.11.0+wasi-snapshot-preview1" @@ -4070,9 +4149,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasm-bindgen" -version = "0.2.87" +version = "0.2.89" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7706a72ab36d8cb1f80ffbf0e071533974a60d0a308d01a5d0375bf60499a342" +checksum = "0ed0d4f68a3015cc185aff4db9506a015f4b96f95303897bfa23f846db54064e" dependencies = [ "cfg-if", "wasm-bindgen-macro", @@ -4080,36 +4159,24 @@ dependencies = [ [[package]] name = "wasm-bindgen-backend" -version = "0.2.87" +version = "0.2.89" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ef2b6d3c510e9625e5fe6f509ab07d66a760f0885d858736483c32ed7809abd" +checksum = "1b56f625e64f3a1084ded111c4d5f477df9f8c92df113852fa5a374dbda78826" dependencies = [ "bumpalo", "log", "once_cell", "proc-macro2", "quote", - "syn 2.0.29", + "syn 2.0.42", "wasm-bindgen-shared", ] -[[package]] -name = "wasm-bindgen-futures" -version = "0.4.37" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c02dbc21516f9f1f04f187958890d7e6026df8d16540b7ad9492bc34a67cea03" -dependencies = [ - "cfg-if", - "js-sys", - "wasm-bindgen", - "web-sys", -] - [[package]] name = "wasm-bindgen-macro" -version = "0.2.87" +version = "0.2.89" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dee495e55982a3bd48105a7b947fd2a9b4a8ae3010041b9e0faab3f9cd028f1d" +checksum = "0162dbf37223cd2afce98f3d0785506dcb8d266223983e4b5b525859e6e182b2" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -4117,42 +4184,22 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.87" +version = "0.2.89" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b" +checksum = "f0eb82fcb7930ae6219a7ecfd55b217f5f0893484b7a13022ebb2b2bf20b5283" dependencies = [ "proc-macro2", "quote", - "syn 2.0.29", + "syn 2.0.42", "wasm-bindgen-backend", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-shared" -version = "0.2.87" +version = "0.2.89" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca6ad05a4870b2bf5fe995117d3728437bd27d7cd5f06f13c17443ef369775a1" - -[[package]] -name = "web-sys" -version = "0.3.64" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b85cbef8c220a6abc02aefd892dfc0fc23afb1c6a426316ec33253a3877249b" -dependencies = [ - "js-sys", - "wasm-bindgen", -] - -[[package]] -name = "webpki" -version = "0.22.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f095d78192e208183081cc07bc5515ef55216397af48b873e5edcd72637fa1bd" -dependencies = [ - "ring", - "untrusted", -] +checksum = "7ab9b36309365056cd639da3134bf87fa8f3d86008abf99e612384a6eecd459f" [[package]] name = "weezl" @@ -4162,13 +4209,14 @@ checksum = "9193164d4de03a926d909d3bc7c30543cecb35400c02114792c2cae20d5e2dbb" [[package]] name = "which" -version = "4.4.0" +version = "4.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2441c784c52b289a054b7201fc93253e288f094e2f4be9058343127c4226a269" +checksum = "87ba24419a2078cd2b0f2ede2691b6c66d8e47836da3b6db8265ebad47afbfc7" dependencies = [ "either", - "libc", + "home", "once_cell", + "rustix 0.38.28", ] [[package]] @@ -4189,9 +4237,9 @@ checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" [[package]] name = "winapi-util" -version = "0.1.5" +version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178" +checksum = "f29e6f9198ba0d26b4c9f07dbe6f9ed633e1f3d5b8b414090084349e46a52596" dependencies = [ "winapi", ] @@ -4203,12 +4251,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" [[package]] -name = "windows" -version = "0.48.0" +name = "windows-core" +version = "0.51.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e686886bc078bc1b0b600cac0147aadb815089b6e4da64016cbd754b6342700f" +checksum = "f1f8cf84f35d2db49a46868f947758c7a1138116f7fac3bc844f43ade1292e64" dependencies = [ - "windows-targets", + "windows-targets 0.48.5", ] [[package]] @@ -4217,7 +4265,16 @@ version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" dependencies = [ - "windows-targets", + "windows-targets 0.48.5", +] + +[[package]] +name = "windows-sys" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" +dependencies = [ + "windows-targets 0.52.0", ] [[package]] @@ -4226,13 +4283,28 @@ version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c" 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", + "windows_aarch64_gnullvm 0.48.5", + "windows_aarch64_msvc 0.48.5", + "windows_i686_gnu 0.48.5", + "windows_i686_msvc 0.48.5", + "windows_x86_64_gnu 0.48.5", + "windows_x86_64_gnullvm 0.48.5", + "windows_x86_64_msvc 0.48.5", +] + +[[package]] +name = "windows-targets" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a18201040b24831fbb9e4eb208f8892e1f50a37feb53cc7ff887feb8f50e7cd" +dependencies = [ + "windows_aarch64_gnullvm 0.52.0", + "windows_aarch64_msvc 0.52.0", + "windows_i686_gnu 0.52.0", + "windows_i686_msvc 0.52.0", + "windows_x86_64_gnu 0.52.0", + "windows_x86_64_gnullvm 0.52.0", + "windows_x86_64_msvc 0.52.0", ] [[package]] @@ -4241,36 +4313,72 @@ version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cb7764e35d4db8a7921e09562a0304bf2f93e0a51bfccee0bd0bb0b666b015ea" + [[package]] name = "windows_aarch64_msvc" version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" +[[package]] +name = "windows_aarch64_msvc" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bbaa0368d4f1d2aaefc55b6fcfee13f41544ddf36801e793edbbfd7d7df075ef" + [[package]] name = "windows_i686_gnu" version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" +[[package]] +name = "windows_i686_gnu" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a28637cb1fa3560a16915793afb20081aba2c92ee8af57b4d5f28e4b3e7df313" + [[package]] name = "windows_i686_msvc" version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" +[[package]] +name = "windows_i686_msvc" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ffe5e8e31046ce6230cc7215707b816e339ff4d4d67c65dffa206fd0f7aa7b9a" + [[package]] name = "windows_x86_64_gnu" version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" +[[package]] +name = "windows_x86_64_gnu" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3d6fa32db2bc4a2f5abeacf2b69f7992cd09dca97498da74a151a3132c26befd" + [[package]] name = "windows_x86_64_gnullvm" version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1a657e1e9d3f514745a572a6846d3c7aa7dbe1658c056ed9c3344c4109a6949e" + [[package]] name = "windows_x86_64_msvc" version = "0.48.5" @@ -4278,22 +4386,29 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" [[package]] -name = "winnow" -version = "0.5.15" +name = "windows_x86_64_msvc" +version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7c2e3184b9c4e92ad5167ca73039d0c42476302ab603e2fec4487511f38ccefc" +checksum = "dff9641d1cd4be8d1a070daf9e3773c5f67e78b4d9d42263020c057706765c04" + +[[package]] +name = "winnow" +version = "0.5.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9b5c3db89721d50d0e2a673f5043fc4722f76dcc352d7b1ab8b8288bed4ed2c5" dependencies = [ "memchr", ] [[package]] name = "x25519-dalek" -version = "1.1.1" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a0c105152107e3b96f6a00a65e86ce82d9b125230e1c4302940eca58ff71f4f" +checksum = "fb66477291e7e8d2b0ff1bcb900bf29489a9692816d79874bea351e7a8b6de96" dependencies = [ "curve25519-dalek", - "rand_core 0.5.1", + "rand_core", + "serde", "zeroize", ] @@ -4314,19 +4429,13 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "31de390a2d872e4cd04edd71b425e29853f786dc99317ed72d73d6fcf5ebb948" dependencies = [ "async-broadcast", - "async-executor", - "async-fs", - "async-io", - "async-lock", "async-process", "async-recursion", - "async-task", "async-trait", - "blocking", "byteorder", "derivative", "enumflags2", - "event-listener", + "event-listener 2.5.3", "futures-core", "futures-sink", "futures-util", @@ -4334,11 +4443,12 @@ dependencies = [ "nix", "once_cell", "ordered-stream", - "rand 0.8.5", + "rand", "serde", "serde_repr", "sha1", "static_assertions", + "tokio", "tracing", "uds_windows", "winapi", @@ -4354,7 +4464,7 @@ version = "3.14.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "41d1794a946878c0e807f55a397187c11fc7a038ba5d868e7db4f3bd7760bc9d" dependencies = [ - "proc-macro-crate", + "proc-macro-crate 1.3.1", "proc-macro2", "quote", "regex", @@ -4375,9 +4485,9 @@ dependencies = [ [[package]] name = "zeroize" -version = "1.6.0" +version = "1.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a0956f1ba7c7909bfb66c2e9e4124ab6f6482560f6628b5aaeba39207c9aad9" +checksum = "525b4ec142c6b68a2d10f01f7bbf6755599ca3f81ea53b8431b7dd348f5fdb2d" dependencies = [ "zeroize_derive", ] @@ -4390,13 +4500,13 @@ checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69" dependencies = [ "proc-macro2", "quote", - "syn 2.0.29", + "syn 2.0.42", ] [[package]] name = "zkcredential" version = "0.1.0" -source = "git+https://github.com/signalapp/libsignal?tag=v0.28.1#86b2fcc427bf32530866f4e30b18707c1f3682f7" +source = "git+https://github.com/signalapp/libsignal?tag=v0.32.0#72f046fe19a5eac22c7abcf9917956f240759364" dependencies = [ "curve25519-dalek", "displaydoc", @@ -4408,23 +4518,33 @@ dependencies = [ [[package]] name = "zkgroup" version = "0.9.0" -source = "git+https://github.com/signalapp/libsignal?tag=v0.28.1#86b2fcc427bf32530866f4e30b18707c1f3682f7" +source = "git+https://github.com/signalapp/libsignal?tag=v0.32.0#72f046fe19a5eac22c7abcf9917956f240759364" dependencies = [ - "aead", "aes-gcm-siv", "bincode", "curve25519-dalek", "displaydoc", "hex", "lazy_static", + "libsignal-protocol", "poksho", "serde", - "sha2 0.9.9", + "sha2", "signal-crypto", "subtle", + "uuid", "zkcredential", ] +[[package]] +name = "zune-inflate" +version = "0.2.54" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "73ab332fe2f6680068f3582b16a24f90ad7096d5d39b974d1c0aff0125116f02" +dependencies = [ + "simd-adler32", +] + [[package]] name = "zvariant" version = "3.15.0" @@ -4446,7 +4566,7 @@ version = "3.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "934d7a7dfc310d6ee06c87ffe88ef4eca7d3e37bb251dece2ef93da8f17d8ecd" dependencies = [ - "proc-macro-crate", + "proc-macro-crate 1.3.1", "proc-macro2", "quote", "syn 1.0.109", diff --git a/pkgs/applications/networking/instant-messengers/flare-signal/default.nix b/pkgs/applications/networking/instant-messengers/flare-signal/default.nix index 7770eb6af50c..361408314ee5 100644 --- a/pkgs/applications/networking/instant-messengers/flare-signal/default.nix +++ b/pkgs/applications/networking/instant-messengers/flare-signal/default.nix @@ -21,24 +21,23 @@ stdenv.mkDerivation rec { pname = "flare"; - version = "0.10.0"; + version = "0.11.0"; src = fetchFromGitLab { domain = "gitlab.com"; owner = "schmiddi-on-mobile"; repo = pname; rev = version; - hash = "sha256-+9zpYW9xjLe78c2GRL6raFDR5g+R/JWxQzU/ZS+5JtY="; + hash = "sha256-mOy16w6K/xUc28c2tRxifWxsBf9VxLuDPB+GXE2iYtE="; }; cargoDeps = rustPlatform.importCargoLock { lockFile = ./Cargo.lock; outputHashes = { - "blurhash-0.1.1" = "sha256-SLpszTL2CupMAfUQK5KlnsHTIBDB8hbJs1d6DQXaUiA="; - "curve25519-dalek-3.2.1" = "sha256-0hFRhn920tLBpo6ZNCl6DYtTMHMXY/EiDvuhOPVjvC0="; - "libsignal-protocol-0.1.0" = "sha256-VQwrGTNZnlDK5p8ZleAZYtbzDiVTHxc93/CRlCUjWtE="; - "libsignal-service-0.1.0" = "sha256-1ub0IPSvGhZ2tsC6IolusJ1NSWy+5SXSx8qlIdPngTE="; - "presage-0.6.0-dev" = "sha256-4isKBn/4yHoAYsYbBTULK/veZmaecU7t+PvE4Y0oNgk="; + "curve25519-dalek-4.0.0" = "sha256-KUXvYXeVvJEQ/+dydKzXWCZmA2bFa2IosDzaBL6/Si0="; + "libsignal-protocol-0.1.0" = "sha256-FCrJO7porlY5FrwZ2c67UPd4tgN7cH2/3DTwfPjihwM="; + "libsignal-service-0.1.0" = "sha256-OWLtaxldKgYPP/aJuWezNkNN0990l3RtDWK38R1fL90="; + "presage-0.6.0-dev" = "sha256-sd/kvdbrlJnKPSC/0SDXo6Z6Zc5Am0op/t6gprJf91w="; }; }; From cd8c758a052de5152f3c59066d9c365d6768f983 Mon Sep 17 00:00:00 2001 From: jakuzure Date: Mon, 25 Dec 2023 13:11:22 +0100 Subject: [PATCH 086/168] git-releaser: init at 0.1.1 --- pkgs/by-name/gi/git-releaser/package.nix | 32 ++++++++++++++++++++++++ 1 file changed, 32 insertions(+) create mode 100644 pkgs/by-name/gi/git-releaser/package.nix diff --git a/pkgs/by-name/gi/git-releaser/package.nix b/pkgs/by-name/gi/git-releaser/package.nix new file mode 100644 index 000000000000..f5b0518aaabc --- /dev/null +++ b/pkgs/by-name/gi/git-releaser/package.nix @@ -0,0 +1,32 @@ +{ lib +, buildGoModule +, fetchFromGitHub +, nix-update-script +}: + +buildGoModule rec { + pname = "git-releaser"; + version = "0.1.1"; + + src = fetchFromGitHub { + owner = "git-releaser"; + repo = "git-releaser"; + rev = "refs/tags/v${version}"; + hash = "sha256-owIXiLLnCkda9O0C0wW0nEuwXC4hipNpR9fdFqgbWts="; + }; + + vendorHash = "sha256-dTyHKSCEImySu6Tagqvh6jDvgDbOTL0fMUOjFBpp64k="; + + ldflags = [ "-X main.version=${version}" ]; + + passthru.updateScript = nix-update-script { }; + + meta = with lib; { + description = "Tool for creating Git releases based on Semantic Versioning"; + homepage = "https://github.com/git-releaser/git-releaser"; + changelog = "https://github.com/git-releaser/git-releaser/releases/tag/v${version}"; + maintainers = with maintainers; [ jakuzure ]; + license = licenses.asl20; + mainProgram = "git-releaser"; + }; +} From 20756d889175802681867d7ac74e7b51795d580e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Wed, 27 Dec 2023 15:17:59 +0100 Subject: [PATCH 087/168] chatty: 0.7.3 -> 0.8.0 Changelog: https://gitlab.gnome.org/World/Chatty/-/blob/v0.8.0/NEWS --- .../instant-messengers/chatty/default.nix | 32 ++++++++----------- 1 file changed, 13 insertions(+), 19 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/chatty/default.nix b/pkgs/applications/networking/instant-messengers/chatty/default.nix index 09ba8c4d1354..81c1f6656eaa 100644 --- a/pkgs/applications/networking/instant-messengers/chatty/default.nix +++ b/pkgs/applications/networking/instant-messengers/chatty/default.nix @@ -7,18 +7,17 @@ , meson , ninja , pkg-config -, python3 -, wrapGAppsHook +, wrapGAppsHook4 , evolution-data-server , feedbackd , glibmm , libsecret , gnome-desktop , gspell -, gtk3 +, gtk4 , json-glib , libgcrypt -, libhandy +, libadwaita , libphonenumber , modemmanager , olm @@ -30,21 +29,17 @@ stdenv.mkDerivation rec { pname = "chatty"; - version = "0.7.3"; + version = "0.8.0"; src = fetchFromGitLab { - domain = "source.puri.sm"; - owner = "Librem5"; - repo = "chatty"; + domain = "gitlab.gnome.org"; + owner = "World"; + repo = "Chatty"; rev = "v${version}"; fetchSubmodules = true; - hash = "sha256-zsZDpncnoj+0klJ2/220gY93c7mD0wIvQaP3QF8F3zQ="; + hash = "sha256-jyG6kubXTyHUw2F+MfjJiQ0us4PrbavF5PJS5Pg46Mw="; }; - postPatch = '' - patchShebangs build-aux/meson - ''; - nativeBuildInputs = [ appstream-glib desktop-file-utils @@ -52,8 +47,7 @@ stdenv.mkDerivation rec { meson ninja pkg-config - python3 - wrapGAppsHook + wrapGAppsHook4 ]; buildInputs = [ @@ -63,10 +57,10 @@ stdenv.mkDerivation rec { libsecret gnome-desktop gspell - gtk3 + gtk4 json-glib libgcrypt - libhandy + libadwaita libphonenumber modemmanager olm @@ -84,8 +78,8 @@ stdenv.mkDerivation rec { meta = with lib; { description = "XMPP and SMS messaging via libpurple and ModemManager"; - homepage = "https://source.puri.sm/Librem5/chatty"; - changelog = "https://source.puri.sm/Librem5/chatty/-/blob/${src.rev}/NEWS"; + homepage = "https://gitlab.gnome.org/World/Chatty"; + changelog = "https://gitlab.gnome.org/World/Chatty/-/blob/${src.rev}/NEWS"; license = licenses.gpl3Plus; maintainers = with maintainers; [ dotlambda tomfitzhenry ]; platforms = platforms.linux; From 4a31c957c17ec9fd4c04b24c071aa2f6c76ce613 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Wed, 27 Dec 2023 22:56:51 +0800 Subject: [PATCH 088/168] nixosTests.mate: Extend the test It is always nice to have some OCR tests and a coredump check. --- nixos/tests/mate.nix | 27 +++++++++++++++++++++++++-- 1 file changed, 25 insertions(+), 2 deletions(-) diff --git a/nixos/tests/mate.nix b/nixos/tests/mate.nix index 78ba59c5fc20..48582e18d520 100644 --- a/nixos/tests/mate.nix +++ b/nixos/tests/mate.nix @@ -27,9 +27,12 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: { hardware.pulseaudio.enable = true; }; + enableOCR = true; + testScript = { nodes, ... }: let user = nodes.machine.users.users.alice; + env = "DISPLAY=:0.0 DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/${toString user.uid}/bus"; in '' with subtest("Wait for login"): @@ -48,11 +51,31 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: { machine.wait_for_window("Bottom Panel") machine.wait_until_succeeds("pgrep caja") machine.wait_for_window("Caja") + machine.wait_for_text('(Applications|Places|System)') + machine.wait_for_text('(Computer|Home|Trash)') + + with subtest("Lock the screen"): + machine.wait_until_succeeds("su - ${user.name} -c '${env} mate-screensaver-command -q' | grep 'The screensaver is inactive'") + machine.succeed("su - ${user.name} -c '${env} mate-screensaver-command -l >&2 &'") + machine.wait_until_succeeds("su - ${user.name} -c '${env} mate-screensaver-command -q' | grep 'The screensaver is active'") + machine.sleep(2) + machine.send_chars("${user.password}", delay=0.2) + machine.wait_for_text("${user.description}") + machine.screenshot("screensaver") + machine.send_chars("\n") + machine.wait_until_succeeds("su - ${user.name} -c '${env} mate-screensaver-command -q' | grep 'The screensaver is inactive'") + + with subtest("Open MATE control center"): + machine.succeed("su - ${user.name} -c '${env} mate-control-center >&2 &'") + machine.wait_for_window("Control Center") + machine.wait_for_text('(Groups|Administration|Hardware)') with subtest("Open MATE terminal"): - machine.succeed("su - ${user.name} -c 'DISPLAY=:0.0 mate-terminal >&2 &'") + machine.succeed("su - ${user.name} -c '${env} mate-terminal >&2 &'") machine.wait_for_window("Terminal") - machine.sleep(20) + + with subtest("Check if MATE has ever coredumped"): + machine.fail("coredumpctl --json=short | grep -E 'mate|marco|caja'") machine.screenshot("screen") ''; }) From bf4be3573dcf33e56e4dfaa714b7953f4cb5b2cb Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Wed, 27 Dec 2023 22:13:49 +0800 Subject: [PATCH 089/168] mate.mate-control-center: Fix missing schema in nixosTests.mate This is introduced in generate_categories -> matemenu_tree_constructor -> org.mate.panel. Unfortunately we cannot hardcode gsettings in mate-menus because this will introduce circular dependency. https://bugs.archlinux.org/task/72603 --- pkgs/desktops/mate/mate-control-center/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/desktops/mate/mate-control-center/default.nix b/pkgs/desktops/mate/mate-control-center/default.nix index 5eb6df4f4453..8e2e3ea621c2 100644 --- a/pkgs/desktops/mate/mate-control-center/default.nix +++ b/pkgs/desktops/mate/mate-control-center/default.nix @@ -52,6 +52,7 @@ stdenv.mkDerivation rec { mate.mate-desktop mate.libmatekbd mate.mate-menus + mate.mate-panel # for org.mate.panel schema, see m-c-c#678 mate.marco mate.mate-settings-daemon ]; From ce70afc3c8b843264fa476874d29c6221b84b16c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Wed, 27 Dec 2023 16:49:36 +0100 Subject: [PATCH 090/168] python311Packages.recurring-ical-events: 2.1.1 -> 2.1.2 Diff: https://github.com/niccokunzmann/python-recurring-ical-events/compare/v2.1.1...v2.1.2 Changelog: https://github.com/niccokunzmann/python-recurring-ical-events/blob/v2.1.2/README.rst#changelog --- .../python-modules/recurring-ical-events/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/recurring-ical-events/default.nix b/pkgs/development/python-modules/recurring-ical-events/default.nix index 3ddc6bb4ccc9..8903d0134646 100644 --- a/pkgs/development/python-modules/recurring-ical-events/default.nix +++ b/pkgs/development/python-modules/recurring-ical-events/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "recurring-ical-events"; - version = "2.1.1"; + version = "2.1.2"; disabled = pythonOlder "3.7"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "niccokunzmann"; repo = "python-recurring-ical-events"; rev = "v${version}"; - hash = "sha256-I5D4CAk0C60H2hMBV62gOaIRA+wYF2ORKxHfWustQz0="; + hash = "sha256-6qFUw5xfZvDuM/UBEGtoiHON15/6oq1S8H0Z1qk3k8s="; }; nativeBuildInputs = [ From 4c37ea6ed3450368297441180a4cdec3c93496b0 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 27 Dec 2023 16:45:07 +0000 Subject: [PATCH 091/168] python310Packages.biopython: 1.81 -> 1.82 --- pkgs/development/python-modules/biopython/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/biopython/default.nix b/pkgs/development/python-modules/biopython/default.nix index 26aa0cf004fb..cb27d3231d4f 100644 --- a/pkgs/development/python-modules/biopython/default.nix +++ b/pkgs/development/python-modules/biopython/default.nix @@ -7,12 +7,12 @@ buildPythonPackage rec { pname = "biopython"; - version = "1.81"; + version = "1.82"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-LPOBErbYQVrTnWphGYjNEftfM+sJNGZmqHJjvrqWFOA="; + hash = "sha256-qbENlZroipdEqRxs42AfTIbn7EFnm8k8KfZ5IY9hZ7s="; }; disabled = !isPy3k; From 3c645e35e4d0de89f361fc8260c96336048f11cd Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 27 Dec 2023 16:59:03 +0000 Subject: [PATCH 092/168] python310Packages.boto3-stubs: 1.34.7 -> 1.34.8 --- pkgs/development/python-modules/boto3-stubs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/boto3-stubs/default.nix b/pkgs/development/python-modules/boto3-stubs/default.nix index 5146b223788d..db19b6b5b0b6 100644 --- a/pkgs/development/python-modules/boto3-stubs/default.nix +++ b/pkgs/development/python-modules/boto3-stubs/default.nix @@ -363,12 +363,12 @@ buildPythonPackage rec { pname = "boto3-stubs"; - version = "1.34.7"; + version = "1.34.8"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-UalmhfyiPlJ7x9Ua3vVXGl0GIZoQ97zE4Ijm2aeSdI8="; + hash = "sha256-A/4+po7ZeLAYiQnd2EjjYPEZns4GK6F0J53z3JDM/fA="; }; propagatedBuildInputs = [ From 2876dfc13cc0724fac14e5c71435fc8598b7ba18 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 27 Dec 2023 16:59:04 +0000 Subject: [PATCH 093/168] python310Packages.botocore-stubs: 1.34.7 -> 1.34.8 --- pkgs/development/python-modules/botocore-stubs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/botocore-stubs/default.nix b/pkgs/development/python-modules/botocore-stubs/default.nix index 4a6eb3aa9950..418af2721b7f 100644 --- a/pkgs/development/python-modules/botocore-stubs/default.nix +++ b/pkgs/development/python-modules/botocore-stubs/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "botocore-stubs"; - version = "1.34.7"; + version = "1.34.8"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "botocore_stubs"; inherit version; - hash = "sha256-iPbp3F0ZeZ9KWBO/aTMezo8ze6zziLO5YV+lfAXtJDs="; + hash = "sha256-1smqKxGai3dv6ofisZbGSLdOGYw0DbXAb43De6LWKvc="; }; nativeBuildInputs = [ From c6a3f827f2d2022f23f6b686e1e88b64657f3317 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 27 Dec 2023 17:37:12 +0000 Subject: [PATCH 094/168] python310Packages.cf-xarray: 0.8.6 -> 0.8.7 --- pkgs/development/python-modules/cf-xarray/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/cf-xarray/default.nix b/pkgs/development/python-modules/cf-xarray/default.nix index fdbfe0ff71a2..9e025568858c 100644 --- a/pkgs/development/python-modules/cf-xarray/default.nix +++ b/pkgs/development/python-modules/cf-xarray/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "cf-xarray"; - version = "0.8.6"; + version = "0.8.7"; pyproject = true; disabled = pythonOlder "3.9"; @@ -28,7 +28,7 @@ buildPythonPackage rec { owner = "xarray-contrib"; repo = "cf-xarray"; rev = "refs/tags/v${version}"; - hash = "sha256-qcoHz/yZoPVu0uBKKx4AV7MOokiuXSCaWPD/92VlRFk="; + hash = "sha256-ldnrEks6NkUkaRaev0X6aRHdOZHfsy9/Maihvq8xdSs="; }; nativeBuildInputs = [ From 345815f2858d32ca8b4c0130ac8a9127ac3359de Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Wed, 27 Dec 2023 10:30:14 -0800 Subject: [PATCH 095/168] github-backup: 0.43.1 -> 0.44.1 Changelog: https://github.com/josegonzalez/python-github-backup/blob/0.44.1/CHANGES.rst --- pkgs/tools/misc/github-backup/default.nix | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/github-backup/default.nix b/pkgs/tools/misc/github-backup/default.nix index ce16e2b788c1..0e4953ca6bc8 100644 --- a/pkgs/tools/misc/github-backup/default.nix +++ b/pkgs/tools/misc/github-backup/default.nix @@ -7,14 +7,18 @@ python3.pkgs.buildPythonApplication rec { pname = "github-backup"; - version = "0.43.1"; - format = "setuptools"; + version = "0.44.1"; + pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-S0674oTUsXftXlbP8fbF09FIWnWwq/Mgbv960tg3FNg="; + hash = "sha256-tOCIrquhBS7aNeFocu8M9JV19vfFwrfIsaaePCp2vPw="; }; + nativeBuildInputs = with python3.pkgs; [ + setuptools + ]; + makeWrapperArgs = [ "--prefix" "PATH" ":" (lib.makeBinPath [ git git-lfs ]) ]; From 6254d0ce133c0c25876016869adc83d58abcccf2 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 27 Dec 2023 19:41:10 +0000 Subject: [PATCH 096/168] python310Packages.django-import-export: 3.3.4 -> 3.3.5 --- .../python-modules/django-import-export/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/django-import-export/default.nix b/pkgs/development/python-modules/django-import-export/default.nix index 642fdf38e859..d4c9940c6b04 100644 --- a/pkgs/development/python-modules/django-import-export/default.nix +++ b/pkgs/development/python-modules/django-import-export/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "django-import-export"; - version = "3.3.4"; + version = "3.3.5"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "django-import-export"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-I8iOJXrqO/4GA6WajVH+w7NOnXlbzNpWd4iSWvtiejc="; + hash = "sha256-bYb000KRnvuMSMTTicqrJ+0zU/XguQFcLATqxUvc5V0="; }; propagatedBuildInputs = [ From c53dd4b2127e2751d321ce756793ebdfd4e395eb Mon Sep 17 00:00:00 2001 From: Sophie Tauchert Date: Wed, 27 Dec 2023 20:45:54 +0100 Subject: [PATCH 097/168] nitter: use guest_accounts branch in updateScript --- pkgs/by-name/ni/nitter/package.nix | 2 +- pkgs/by-name/ni/nitter/update.sh | 25 ------------------------- 2 files changed, 1 insertion(+), 26 deletions(-) delete mode 100755 pkgs/by-name/ni/nitter/update.sh diff --git a/pkgs/by-name/ni/nitter/package.nix b/pkgs/by-name/ni/nitter/package.nix index d3fc03b25ace..feaaa2f49097 100644 --- a/pkgs/by-name/ni/nitter/package.nix +++ b/pkgs/by-name/ni/nitter/package.nix @@ -40,7 +40,7 @@ buildNimPackage (finalAttrs: prevAttrs: { passthru = { tests = { inherit (nixosTests) nitter; }; - updateScript = unstableGitUpdater {}; + updateScript = unstableGitUpdater { branch = "guest_accounts"; }; }; meta = with lib; { diff --git a/pkgs/by-name/ni/nitter/update.sh b/pkgs/by-name/ni/nitter/update.sh deleted file mode 100755 index 30405f34b22e..000000000000 --- a/pkgs/by-name/ni/nitter/update.sh +++ /dev/null @@ -1,25 +0,0 @@ -#!/usr/bin/env nix-shell -#!nix-shell -i bash -p curl jq nix nix-update patchutils -set -euo pipefail - -info() { - if [ -t 2 ]; then - set -- '\033[32m%s\033[39m\n' "$@" - else - set -- '%s\n' "$@" - fi - printf "$@" >&2 -} - -nitter_old_rev=$(nix-instantiate --eval --strict --json -A nitter.src.rev . | jq -r .) -nix-update --version=branch --commit nitter -nitter_new_rev=$(nix-instantiate --eval --strict --json -A nitter.src.rev . | jq -r .) -if [ "$nitter_new_rev" = "$nitter_old_rev" ]; then - info "nitter is up-to-date." - exit -fi - -if curl -Sfs "https://github.com/zedeus/nitter/compare/$nitter_old_rev...$nitter_new_rev.patch" \ -| lsdiff | grep -Fxe 'a/nitter.nimble' -e 'b/nitter.nimble' > /dev/null; then - info "nitter.nimble changed, some dependencies probably need updating." -fi From 26e21bef1477b8cec699324a19da8876a077e43e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 27 Dec 2023 19:58:13 +0000 Subject: [PATCH 098/168] python310Packages.django-webpack-loader: 2.0.1 -> 3.0.0 --- .../python-modules/django-webpack-loader/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/django-webpack-loader/default.nix b/pkgs/development/python-modules/django-webpack-loader/default.nix index 1e9f0202bd70..3f1aa0138b90 100644 --- a/pkgs/development/python-modules/django-webpack-loader/default.nix +++ b/pkgs/development/python-modules/django-webpack-loader/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "django-webpack-loader"; - version = "2.0.1"; + version = "3.0.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-Do37L82znb/QG+dgPAYBMqRmT0g4Ec48dfLTwNOat2I="; + hash = "sha256-dND6btp4i4Sxq4KMLn786EFLBe7wpOsr8n0xGlDgpO0="; }; propagatedBuildInputs = [ From 8c1dcd8539cacad7874362dcf5622ad9a9e95ea0 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 27 Dec 2023 21:31:23 +0000 Subject: [PATCH 099/168] python310Packages.faraday-plugins: 1.15.0 -> 1.15.1 --- pkgs/development/python-modules/faraday-plugins/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/faraday-plugins/default.nix b/pkgs/development/python-modules/faraday-plugins/default.nix index 2e4d62ebb9c2..e3c96089cefe 100644 --- a/pkgs/development/python-modules/faraday-plugins/default.nix +++ b/pkgs/development/python-modules/faraday-plugins/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "faraday-plugins"; - version = "1.15.0"; + version = "1.15.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "infobyte"; repo = "faraday_plugins"; rev = "refs/tags/${version}"; - hash = "sha256-2Z3S5zojaRVaeeujFor/g3x+rxKppw/jSyq0GRJ49OY="; + hash = "sha256-cJ7gFE8zTN+7fp4EY8ZRwjS8i0r+8WaIH/EdY89nZew="; }; postPatch = '' From 834d0389341454f6348028faa0b524cb322dacb2 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 27 Dec 2023 21:55:28 +0000 Subject: [PATCH 100/168] kubedog: 0.10.0 -> 0.11.0 --- pkgs/applications/networking/cluster/kubedog/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/kubedog/default.nix b/pkgs/applications/networking/cluster/kubedog/default.nix index f9519a861995..92a785a468b7 100644 --- a/pkgs/applications/networking/cluster/kubedog/default.nix +++ b/pkgs/applications/networking/cluster/kubedog/default.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "kubedog"; - version = "0.10.0"; + version = "0.11.0"; src = fetchFromGitHub { owner = "werf"; repo = "kubedog"; rev = "v${version}"; - hash = "sha256-wbipB5hmf1J1t7lUBAhxbNASj7FSncghP4/VuKND7Kg="; + hash = "sha256-+mkzPOJPadHWyNq53AHX6kT5rr0vNjomWNfiAzeLeE4="; }; - vendorHash = "sha256-hjK4QvksT+K9zOLHWBwF7xlLGDIsp2jI1TlvhGLe0NU="; + vendorHash = "sha256-rHpP974zhx8kaw8sLGVGDe2CkodBK3mC8ssKIW0VG48="; subPackages = [ "cmd/kubedog" ]; From 8cb85ce23d7456614c4cfa7df92c1b9ef341d64f Mon Sep 17 00:00:00 2001 From: nikstur Date: Wed, 27 Dec 2023 23:08:43 +0100 Subject: [PATCH 101/168] python3Packages.ptpython: remove now superfluous black dependency When building systemd for example, black produces a long dependency chain. Since it's not required anymore, remove it. --- pkgs/development/python-modules/ptpython/default.nix | 3 --- 1 file changed, 3 deletions(-) diff --git a/pkgs/development/python-modules/ptpython/default.nix b/pkgs/development/python-modules/ptpython/default.nix index 355171856fbd..9db2e9c1d2c0 100644 --- a/pkgs/development/python-modules/ptpython/default.nix +++ b/pkgs/development/python-modules/ptpython/default.nix @@ -3,9 +3,7 @@ , pythonOlder , fetchPypi , appdirs -, black , importlib-metadata -, isPy3k , jedi , prompt-toolkit , pygments @@ -25,7 +23,6 @@ buildPythonPackage rec { propagatedBuildInputs = [ appdirs - black # yes, this is in install_requires jedi prompt-toolkit pygments From d6124574ea191e088e412e23cd83f26fefec3ed9 Mon Sep 17 00:00:00 2001 From: Sebastian Gabriel Trzpiot Date: Wed, 27 Dec 2023 23:19:20 +0100 Subject: [PATCH 102/168] sea-orm-cli: 0.12.2 -> 0.12.10 https://github.com/SeaQL/sea-orm/releases/tag/0.12.10 --- pkgs/development/tools/sea-orm-cli/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/sea-orm-cli/default.nix b/pkgs/development/tools/sea-orm-cli/default.nix index 623ad4f9e025..d70c7b83cb29 100644 --- a/pkgs/development/tools/sea-orm-cli/default.nix +++ b/pkgs/development/tools/sea-orm-cli/default.nix @@ -8,11 +8,11 @@ }: rustPlatform.buildRustPackage rec { pname = "sea-orm-cli"; - version = "0.12.2"; + version = "0.12.10"; src = fetchCrate { inherit pname version; - hash = "sha256-mg0PkWxlfwo4eAtbU1ZOphEUBB1P6VsSpODyJZhvwQs="; + hash = "sha256-BVQbzP/+TJFqhnBeerYiLMpJJ8q9x582DR5X10K027U="; }; nativeBuildInputs = [ pkg-config ]; @@ -20,7 +20,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.SystemConfiguration ]; - cargoHash = "sha256-6LXJtY844CyR6H0/IkEJrpSj4UNWcpO/XoTzUthcTUc="; + cargoHash = "sha256-qCcWReo72eHN9MoTVAmSHYVhpqw0kZ9VU/plYRcirVA="; meta = with lib; { homepage = "https://sea-ql.org/SeaORM"; From 1b7cd426f98d7fd736d3a35f74704edde79b0c92 Mon Sep 17 00:00:00 2001 From: Ben Darwin Date: Wed, 27 Dec 2023 17:32:14 -0500 Subject: [PATCH 103/168] python311Packages.einops: remove chainer from nativeCheckInputs Chainer is somewhat obsolete (and currently broken on master; see https://github.com/NixOS/nixpkgs/issues/277008) so doesn't necessarily make sense to pull into the build-time closure of a great deal of the Python deep learning dependency tree. --- pkgs/development/python-modules/einops/default.nix | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/einops/default.nix b/pkgs/development/python-modules/einops/default.nix index 9cc5de24e0a5..9c2de1bad9ce 100644 --- a/pkgs/development/python-modules/einops/default.nix +++ b/pkgs/development/python-modules/einops/default.nix @@ -1,6 +1,5 @@ { lib , buildPythonPackage -, chainer , fetchFromGitHub , hatchling , jupyter @@ -15,7 +14,7 @@ buildPythonPackage rec { pname = "einops"; version = "0.7.0"; - format = "pyproject"; + pyproject = true; disabled = pythonOlder "3.7"; @@ -29,7 +28,6 @@ buildPythonPackage rec { nativeBuildInputs = [ hatchling ]; nativeCheckInputs = [ - chainer jupyter nbconvert numpy @@ -38,7 +36,7 @@ buildPythonPackage rec { pytestCheckHook ]; - env.EINOPS_TEST_BACKENDS = "numpy,chainer"; + env.EINOPS_TEST_BACKENDS = "numpy"; preCheck = '' export HOME=$(mktemp -d); From 59fcbd9e2a48184e9e97f3c754726d790bae711b Mon Sep 17 00:00:00 2001 From: Sandro Date: Wed, 27 Dec 2023 23:47:51 +0100 Subject: [PATCH 104/168] rpi-imager: set meta.homepage to something useful, don't use finalAttrs.pname in src If we would overwrite pname then the FOD would be broken and the github repo doesn't chane if we would append some variant name to pname. meta.homepage was before a not very helpful download page which didn't even contain the version number of the program. --- pkgs/tools/misc/rpi-imager/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/rpi-imager/default.nix b/pkgs/tools/misc/rpi-imager/default.nix index cadea00d9016..6049efe04f80 100644 --- a/pkgs/tools/misc/rpi-imager/default.nix +++ b/pkgs/tools/misc/rpi-imager/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchFromGitHub { owner = "raspberrypi"; - repo = finalAttrs.pname; + repo = "rpi-imager"; rev = "refs/tags/v${finalAttrs.version}"; sha256 = "sha256-ZuS/fhPpVlLSdaD+t+qIw6fdEbi7c82X+BxcgWlPntg="; }; @@ -72,9 +72,8 @@ stdenv.mkDerivation (finalAttrs: { meta = with lib; { description = "Raspberry Pi Imaging Utility"; - homepage = "https://www.raspberrypi.com/software/"; + homepage = "https://github.com/raspberrypi/rpi-imager/"; changelog = "https://github.com/raspberrypi/rpi-imager/releases/tag/v${finalAttrs.version}"; - downloadPage = "https://github.com/raspberrypi/rpi-imager/"; license = licenses.asl20; mainProgram = "rpi-imager"; maintainers = with maintainers; [ ymarkus anthonyroussel ]; From 0493e502bbf474f293e8453213d8e438232f082a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 27 Dec 2023 23:29:22 +0000 Subject: [PATCH 105/168] python310Packages.garth: 0.4.41 -> 0.4.42 --- pkgs/development/python-modules/garth/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/garth/default.nix b/pkgs/development/python-modules/garth/default.nix index 20c26da372b6..fa77b0e6b8f3 100644 --- a/pkgs/development/python-modules/garth/default.nix +++ b/pkgs/development/python-modules/garth/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "garth"; - version = "0.4.41"; + version = "0.4.42"; format = "pyproject"; disabled = pythonOlder "3.9"; src = fetchPypi { inherit pname version; - hash = "sha256-1CnRgPJTG7cpfa/SyhBwVw0Lj6ENI/YY/q2yNeve9c0="; + hash = "sha256-tCQtT7KrM/CHqAaMsvgj4aS3tkpcCYpaagvkO9DljY0="; }; nativeBuildInputs = [ From 17d74ceaf1051069064be3f6e1015604d8c5c7b8 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 27 Dec 2023 23:29:33 +0000 Subject: [PATCH 106/168] python310Packages.garminconnect: 0.2.11 -> 0.2.12 --- 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 90b70e8906c8..43604aa29333 100644 --- a/pkgs/development/python-modules/garminconnect/default.nix +++ b/pkgs/development/python-modules/garminconnect/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "garminconnect"; - version = "0.2.11"; + version = "0.2.12"; pyproject = true; disabled = pythonOlder "3.10"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "cyberjunky"; repo = "python-garminconnect"; rev = "refs/tags/${version}"; - hash = "sha256-T8flktIBRhtXpxd17bqrocncgpIfinMDvVwvaoltZAs="; + hash = "sha256-uq3biWZvcORvrAMd/Ix0Cj1ol5fiqdDsO54zD82G2vA="; }; nativeBuildInputs = [ From ce097af2601860e7499ce1bd1e61e8403c0f1977 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 28 Dec 2023 00:33:03 +0000 Subject: [PATCH 107/168] python310Packages.graphene-django: 3.1.5 -> 3.2.0 --- pkgs/development/python-modules/graphene-django/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/graphene-django/default.nix b/pkgs/development/python-modules/graphene-django/default.nix index 5ad186d75476..6b6527c3bbd9 100644 --- a/pkgs/development/python-modules/graphene-django/default.nix +++ b/pkgs/development/python-modules/graphene-django/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { pname = "graphene-django"; - version = "3.1.5"; + version = "3.2.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -31,7 +31,7 @@ buildPythonPackage rec { owner = "graphql-python"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-1vl1Yj9MVBej5aFND8A63JMIog8aIW9SdwiOLIUwXxI="; + hash = "sha256-SOLY3NogovwQ5gr2gnvOcROWpbk9p134wI2f9FKr+5M="; }; postPatch = '' From 7dbad0481f6a50f9a887a6a2c888df52de35d133 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 28 Dec 2023 01:30:30 +0000 Subject: [PATCH 108/168] python310Packages.hvplot: 0.9.0 -> 0.9.1 --- pkgs/development/python-modules/hvplot/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/hvplot/default.nix b/pkgs/development/python-modules/hvplot/default.nix index 5047eb68ea96..29a14301ffd6 100644 --- a/pkgs/development/python-modules/hvplot/default.nix +++ b/pkgs/development/python-modules/hvplot/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "hvplot"; - version = "0.9.0"; + version = "0.9.1"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-BkxnV90QxJjQYqN0DdjGbjPmNDaDN9hUBjO7nQte7eg="; + hash = "sha256-KB0YmiEtJkGT9446k079oWqTwBZMSFTakzW0LuBlazo="; }; propagatedBuildInputs = [ From 272a5d14682a98f9867140916647a0b31c057165 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 28 Dec 2023 01:48:59 +0000 Subject: [PATCH 109/168] cnquery: 9.12.0 -> 9.12.1 --- pkgs/tools/security/cnquery/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/cnquery/default.nix b/pkgs/tools/security/cnquery/default.nix index b9e6769ea5ad..925195bb1353 100644 --- a/pkgs/tools/security/cnquery/default.nix +++ b/pkgs/tools/security/cnquery/default.nix @@ -5,18 +5,18 @@ buildGoModule rec { pname = "cnquery"; - version = "9.12.0"; + version = "9.12.1"; src = fetchFromGitHub { owner = "mondoohq"; repo = "cnquery"; rev = "v${version}"; - hash = "sha256-d2S9qEm0jvXvpU7IHpurDJ7A21bvjuM3HrdRPaujzTU="; + hash = "sha256-ezk9HgNf4FBW/PEaNUhsb3/l1ChTC42F3slXXa8ZJp4="; }; subPackages = [ "apps/cnquery" ]; - vendorHash = "sha256-vEJcdGgev9C/3vGx+SMmD9dLMau5Jyx2TjHiiQQ+16A="; + vendorHash = "sha256-iycKyidVpdWeccK4RxENUxEFUmQKkIyyW1c3JFZ3gx4="; meta = with lib; { description = "cloud-native, graph-based asset inventory"; From 0583bcd6df113b06bf6574f147644321f532e843 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 27 Dec 2023 21:08:49 +0000 Subject: [PATCH 110/168] python310Packages.enlighten: 1.12.3 -> 1.12.4 --- pkgs/development/python-modules/enlighten/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/enlighten/default.nix b/pkgs/development/python-modules/enlighten/default.nix index 8849f0f237fd..713370bbb786 100644 --- a/pkgs/development/python-modules/enlighten/default.nix +++ b/pkgs/development/python-modules/enlighten/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "enlighten"; - version = "1.12.3"; + version = "1.12.4"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-0lf4lQi0ICwj+uxBRfDMe1dVgkgBfpF/Z0sYKE8J6qM="; + hash = "sha256-dfPZK0ng715FT8Gg853Aq49tmUbL5TTbPe0wECF9W18="; }; propagatedBuildInputs = [ From 04d91e680429dd6a36417aac7d04b2081997c1fe Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 28 Dec 2023 02:04:47 +0000 Subject: [PATCH 111/168] cloudfox: 1.12.3 -> 1.13.0 --- pkgs/tools/security/cloudfox/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/cloudfox/default.nix b/pkgs/tools/security/cloudfox/default.nix index e5e47ce56f4e..6b1d7870c699 100644 --- a/pkgs/tools/security/cloudfox/default.nix +++ b/pkgs/tools/security/cloudfox/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "cloudfox"; - version = "1.12.3"; + version = "1.13.0"; src = fetchFromGitHub { owner = "BishopFox"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-V6zYEH2LACBcMY0ox8ZgqJGFLWFgCNR4l9Uo+hMgseE="; + hash = "sha256-4donwh7yG7R4+k+ydGto2CZclnM95qodQuL1Huu4GDo="; }; - vendorHash = "sha256-PZW1rNX8TLW0SZ9A2eF5N12J9BPWgRZJeGIb042Tinc="; + vendorHash = "sha256-RdcfAZVqCp+egLbgx1c/A/zk0YlBY6aeeq0Lv4cLivY="; # Some tests are failing because of wrong filename/path doCheck = false; From 13be39c2aefef04316a1cc840fc9630ca088dc1c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 28 Dec 2023 02:05:31 +0000 Subject: [PATCH 112/168] cntr: 1.5.2 -> 1.5.3 --- pkgs/applications/virtualization/cntr/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/virtualization/cntr/default.nix b/pkgs/applications/virtualization/cntr/default.nix index becc0308c469..01b9960a5e88 100644 --- a/pkgs/applications/virtualization/cntr/default.nix +++ b/pkgs/applications/virtualization/cntr/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "cntr"; - version = "1.5.2"; + version = "1.5.3"; src = fetchFromGitHub { owner = "Mic92"; repo = "cntr"; rev = version; - sha256 = "sha256-eDozoYN2iOFUY/w7Gjki4nnASyZo4V/YGPjdX2xjNGY="; + sha256 = "sha256-spa4qPEhpNSZIk16jeH9YEr4g9JcVmpetHz72A/ZAPY="; }; - cargoHash = "sha256-UZrVZBdaiIrMajePKWXDZI+Z+nXTGadNKmoa3gdfzp4="; + cargoHash = "sha256-YN8EtUXKtT8Xc0RnW7QqL+awyWy5xFKWhYMxgYG28I4="; passthru.tests = nixosTests.cntr; From 4c3c8d6041edb579575974ed5b4e8525f442bb4a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 28 Dec 2023 02:16:35 +0000 Subject: [PATCH 113/168] kubeclarity: 2.22.1 -> 2.23.0 --- pkgs/tools/security/kubeclarity/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/kubeclarity/default.nix b/pkgs/tools/security/kubeclarity/default.nix index 8430cb8f2f46..709ba817c585 100644 --- a/pkgs/tools/security/kubeclarity/default.nix +++ b/pkgs/tools/security/kubeclarity/default.nix @@ -8,13 +8,13 @@ buildGoModule rec { pname = "kubeclarity"; - version = "2.22.1"; + version = "2.23.0"; src = fetchFromGitHub { owner = "openclarity"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-gET+nrNYWV4ON0y9/oh9QihqffkJEn38k7CcScqzHWI="; + hash = "sha256-GtShdcBSa7QAwjPUPMXDrFBgNqvJEf8XQw3HbqWEieo="; }; vendorHash = "sha256-rYUbXkf0wOPehXvAzcww0WVycATWdK72LOqbQolqoWc="; From 7f364a5a9cec738b467753eafa8c8658f4460d5d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 28 Dec 2023 02:43:32 +0000 Subject: [PATCH 114/168] prqlc: 0.10.1 -> 0.11.1 --- pkgs/development/tools/database/prqlc/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/database/prqlc/default.nix b/pkgs/development/tools/database/prqlc/default.nix index d8de3dcf6d78..60baffb22a29 100644 --- a/pkgs/development/tools/database/prqlc/default.nix +++ b/pkgs/development/tools/database/prqlc/default.nix @@ -12,16 +12,16 @@ rustPlatform.buildRustPackage rec { pname = "prqlc"; - version = "0.10.1"; + version = "0.11.1"; src = fetchFromGitHub { owner = "prql"; repo = "prql"; rev = version; - hash = "sha256-E6++xmEzY9Ndq4RCKALEHF9mh1E1NBME1gaJN70O2sE="; + hash = "sha256-XKb19qevscNjFUMtLL1nk7fXJuPOyQYZvZ3/4BHS0jo="; }; - cargoHash = "sha256-WLJ9XrtCXDGfqhSccSdel28EARNxZgoGbC6B+W9CsTc="; + cargoHash = "sha256-cZkXz9sXfFo0OBQDrHKUfYJsTH1RiLEFb4xU6TDaZUQ="; nativeBuildInputs = [ pkg-config From 43dc0390242137d9ccf6df8c8753deebb41ddcb4 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 28 Dec 2023 03:41:35 +0000 Subject: [PATCH 115/168] python310Packages.kornia: 0.7.0 -> 0.7.1 --- pkgs/development/python-modules/kornia/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/kornia/default.nix b/pkgs/development/python-modules/kornia/default.nix index 5d98379045ed..a00b3d6487d3 100644 --- a/pkgs/development/python-modules/kornia/default.nix +++ b/pkgs/development/python-modules/kornia/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "kornia"; - version = "0.7.0"; + version = "0.7.1"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = pname; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-XcQXKn4F3DIgn+XQcN5ZcGZLehd/IPBgLuGzIkPSxZg="; + hash = "sha256-gHMrA4Uzazpw4TdswrXdoZG4+ek5g+wtLXNmhH3SlOM="; }; propagatedBuildInputs = [ From b22e9cb85999a8fe9662e95e92abd469db769e18 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 28 Dec 2023 03:56:06 +0000 Subject: [PATCH 116/168] python310Packages.lcgit: 0.2.0 -> 0.2.1 --- pkgs/development/python-modules/lcgit/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/lcgit/default.nix b/pkgs/development/python-modules/lcgit/default.nix index 967ef29fe2a2..0bb27d54cb1a 100644 --- a/pkgs/development/python-modules/lcgit/default.nix +++ b/pkgs/development/python-modules/lcgit/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "lcgit"; - version = "0.2.0"; + version = "0.2.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -16,7 +16,7 @@ buildPythonPackage rec { owner = "cisagov"; repo = "lcgit"; rev = "refs/tags/v${version}"; - hash = "sha256-MYRqlfz2MRayBT7YGZmcyqJdoDRfENmgxk/TmhyoAlQ="; + hash = "sha256-bLeblC68+j+YwvgnV1wgJiWm/jxZFzhTSDwXpoSzUTg="; }; postPatch = '' From 83268ad06280b15138a4caa4f218da5342e8e4ef Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 28 Dec 2023 04:15:51 +0000 Subject: [PATCH 117/168] python310Packages.linien-common: 1.0.0 -> 1.0.1 --- pkgs/development/python-modules/linien-common/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/linien-common/default.nix b/pkgs/development/python-modules/linien-common/default.nix index 23d49ba3605f..de05fab7f74d 100644 --- a/pkgs/development/python-modules/linien-common/default.nix +++ b/pkgs/development/python-modules/linien-common/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "linien-common"; - version = "1.0.0"; + version = "1.0.1"; pyproject = true; src = fetchFromGitHub { owner = "linien-org"; repo = "linien"; - rev = "v${version}"; - hash = "sha256-BMYFi1HsNKWHmYdrnX/mAehke7UxQZlruFmpaAvxWvQ="; + rev = "refs/tags/v${version}"; + hash = "sha256-ZgAp1SEiHijyjK74VZyRLYY3Hzfc3BQ6cnoO3hZzvbE="; }; sourceRoot = "source/linien-common"; From d6990a647829023ea6df2e2ac6819ca31389e02a Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Thu, 28 Dec 2023 04:20:00 +0000 Subject: [PATCH 118/168] starship: 1.16.0 -> 1.17.0 Diff: https://github.com/starship/starship/compare/v1.16.0...v1.17.0 --- pkgs/tools/misc/starship/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/starship/default.nix b/pkgs/tools/misc/starship/default.nix index f1e9a0246c5c..5608d64d9d57 100644 --- a/pkgs/tools/misc/starship/default.nix +++ b/pkgs/tools/misc/starship/default.nix @@ -13,13 +13,13 @@ rustPlatform.buildRustPackage rec { pname = "starship"; - version = "1.16.0"; + version = "1.17.0"; src = fetchFromGitHub { owner = "starship"; repo = pname; rev = "v${version}"; - hash = "sha256-CrD65nHE40n83HO+4QM1sLHvdFaqTvOb96hPBgXKuwk="; + hash = "sha256-Hf9tW1oBAw8/1KIRZpIpyVaEitLkVr2v6ilTHREzwvU="; }; nativeBuildInputs = [ installShellFiles cmake ]; @@ -39,7 +39,7 @@ rustPlatform.buildRustPackage rec { cp docs/.vuepress/public/presets/toml/*.toml $presetdir ''; - cargoHash = "sha256-ZHHrpepKZnSGufyEAjNDozaIKAt2GFRt+hU2ej7LceA="; + cargoHash = "sha256-OENey+brI3B2CThNm1KOxuX/OO8tHb7i5X0jXit7FrU="; nativeCheckInputs = [ git ]; From 73332dcbd82560298fb45265e97601ad34c3de28 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 28 Dec 2023 05:51:21 +0000 Subject: [PATCH 119/168] apprise: 1.6.0 -> 1.7.0 --- pkgs/development/python-modules/apprise/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/apprise/default.nix b/pkgs/development/python-modules/apprise/default.nix index 486b7fd6c25c..bde3bcea3055 100644 --- a/pkgs/development/python-modules/apprise/default.nix +++ b/pkgs/development/python-modules/apprise/default.nix @@ -19,14 +19,14 @@ buildPythonPackage rec { pname = "apprise"; - version = "1.6.0"; + version = "1.7.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-Pu+rHF15eLDmXFCR0c2+kgaGXcPLXRnKXPvdt26Kr/4="; + hash = "sha256-2NVxDTyVJYbCz633zp6g/mC4DsqTlGSX4+8Y88wO7Bk="; }; nativeBuildInputs = [ From e3e3eff41cc3c97ca2d6029b1a8da668b1e65a5a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 28 Dec 2023 05:58:14 +0000 Subject: [PATCH 120/168] gpxsee-qt6: 13.12 -> 13.13 --- pkgs/applications/misc/gpxsee/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/gpxsee/default.nix b/pkgs/applications/misc/gpxsee/default.nix index 6613995f2ce7..9f4b74447489 100644 --- a/pkgs/applications/misc/gpxsee/default.nix +++ b/pkgs/applications/misc/gpxsee/default.nix @@ -18,13 +18,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "gpxsee"; - version = "13.12"; + version = "13.13"; src = fetchFromGitHub { owner = "tumic0"; repo = "GPXSee"; rev = finalAttrs.version; - hash = "sha256-jHqxCOxkM7RJmJYq+nKJfSfd0LGQ7jZnUhuAZLFEG58="; + hash = "sha256-EUBExf2fpa4Y3T6pKnDoaZYhwE4XOJDMEn+LT1XxIYc="; }; buildInputs = [ From 15a672bf1f329115270ba2e63b0d4f0e49e58098 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Thu, 28 Dec 2023 06:49:32 +0000 Subject: [PATCH 121/168] nixosTests.tomcat: add `lib` to imports to fix eval Without the change eval fails as: $ nix build --no-link -f. nixosTests.tomcat error: undefined variable 'lib' --- nixos/tests/tomcat.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/tests/tomcat.nix b/nixos/tests/tomcat.nix index ff58ca8ac618..df5cb033b78f 100644 --- a/nixos/tests/tomcat.nix +++ b/nixos/tests/tomcat.nix @@ -1,4 +1,4 @@ -import ./make-test-python.nix ({ pkgs, ... }: { +import ./make-test-python.nix ({ lib, pkgs, ... }: { name = "tomcat"; meta.maintainers = [ lib.maintainers.anthonyroussel ]; From 0ea859af92f7da64d1e0394e0dd777db075b7047 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 28 Dec 2023 07:12:01 +0000 Subject: [PATCH 122/168] amber: 0.5.9 -> 0.6.0 --- pkgs/tools/text/amber/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/text/amber/default.nix b/pkgs/tools/text/amber/default.nix index 1cd9e74f1943..e4158b4bfc2d 100644 --- a/pkgs/tools/text/amber/default.nix +++ b/pkgs/tools/text/amber/default.nix @@ -4,16 +4,16 @@ rustPlatform.buildRustPackage rec { pname = "amber"; - version = "0.5.9"; + version = "0.6.0"; src = fetchFromGitHub { owner = "dalance"; repo = pname; rev = "v${version}"; - sha256 = "sha256-mmgJCD7kJjvpxyagsoe5CSzqIEZcIiYMAMP3axRphv4="; + sha256 = "sha256-q0o2PQngbDLumck27V0bIiB35zesn55Y+MwK2GjNVWo="; }; - cargoSha256 = "sha256-opRinhTmhZxpAwHNiVOLXL8boQf09Y1NXrWQ6HWQYQ0="; + cargoHash = "sha256-nBSgP30Izskq9RbhVIyqWzZgG5ZWHVdiukldw+Q0rco="; buildInputs = lib.optionals stdenv.isDarwin [ libiconv Security ]; From 0f376a4eed6855f7852d7a41f8d5d4995c5f9405 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 28 Dec 2023 07:12:19 +0000 Subject: [PATCH 123/168] python311Packages.pyatmo: 8.0.1 -> 8.0.2 --- pkgs/development/python-modules/pyatmo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyatmo/default.nix b/pkgs/development/python-modules/pyatmo/default.nix index 544990ba7521..74098c5ba877 100644 --- a/pkgs/development/python-modules/pyatmo/default.nix +++ b/pkgs/development/python-modules/pyatmo/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "pyatmo"; - version = "8.0.1"; + version = "8.0.2"; pyproject = true; disabled = pythonOlder "3.10"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "jabesq"; repo = "pyatmo"; rev = "refs/tags/v${version}"; - hash = "sha256-ASjAmkM/BFWzZYnLeXATbZzSG6KBDcmy66/R1MgzAwQ="; + hash = "sha256-AKpDXfNF2t/3F4SmMWIgfkxHgcJobYs225gIeJ31l6k="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; From 8f2b825017be008eb0cd05c5ab72b71828fd2b8f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 28 Dec 2023 07:24:29 +0000 Subject: [PATCH 124/168] python311Packages.wavinsentio: 0.4.0 -> 0.4.1 --- pkgs/development/python-modules/wavinsentio/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/wavinsentio/default.nix b/pkgs/development/python-modules/wavinsentio/default.nix index 8e994f8e9952..22ed0d177a36 100644 --- a/pkgs/development/python-modules/wavinsentio/default.nix +++ b/pkgs/development/python-modules/wavinsentio/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "wavinsentio"; - version = "0.4.0"; + version = "0.4.1"; format = "setuptools"; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-c3MpFoJrT2FBQrNce+zP/bfIZFqu8gSAA9oIa1jKYCo="; + hash = "sha256-Oko3Ivj95vajNWjQTQK18i5B/DIBngjw2HLlzYqLv2Y="; }; propagatedBuildInputs = [ From 1c6a5c70522655b648fb5c1a1ab80890534b1023 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 28 Dec 2023 07:32:18 +0000 Subject: [PATCH 125/168] dwarfs: 0.7.3 -> 0.7.4 --- pkgs/tools/filesystems/dwarfs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/filesystems/dwarfs/default.nix b/pkgs/tools/filesystems/dwarfs/default.nix index e48a7506db42..8703c11bf3c7 100644 --- a/pkgs/tools/filesystems/dwarfs/default.nix +++ b/pkgs/tools/filesystems/dwarfs/default.nix @@ -26,14 +26,14 @@ stdenv.mkDerivation rec { pname = "dwarfs"; - version = "0.7.3"; + version = "0.7.4"; src = fetchFromGitHub { owner = "mhx"; repo = "dwarfs"; rev = "v${version}"; fetchSubmodules = true; - hash = "sha256-lFJW9rmUhiHyu+unGuONcgbsJg9h9MSvNyECmarRF/M="; + hash = "sha256-wclUyATUZmF7EEkrK9nWASmfiB+MBrvEzc73ngOrhZ0="; }; patches = [ From 5920a80f0222ec610b659220f9003f79aee57de1 Mon Sep 17 00:00:00 2001 From: Michael Reilly Date: Thu, 28 Dec 2023 01:30:52 -0600 Subject: [PATCH 126/168] katago: 1.13.1 -> 1.14.0 --- pkgs/games/katago/default.nix | 6 +++--- pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/games/katago/default.nix b/pkgs/games/katago/default.nix index 0ca0deb518ff..4a66f6cc711e 100644 --- a/pkgs/games/katago/default.nix +++ b/pkgs/games/katago/default.nix @@ -27,14 +27,14 @@ assert lib.assertOneOf "backend" backend [ "opencl" "cuda" "tensorrt" "eigen" ]; # of gcc. If you need to use cuda10, please override stdenv with gcc8Stdenv stdenv.mkDerivation rec { pname = "katago"; - version = "1.13.1"; - githash = "3539a3d410b12f79658bb7a2cdaf1ecb6c95e6c1"; + version = "1.14.0"; + githash = "c6de1bbda837a0717eaeca46102f7326ed0da0d4"; src = fetchFromGitHub { owner = "lightvector"; repo = "katago"; rev = "v${version}"; - sha256 = "sha256-A2ZvFcklYQoxfqYrLrazksrJkfdELnn90aAbkm7pJg0="; + sha256 = "sha256-0WB/weQIJkLXedcOJO7D/N85oXTufvbmyfIp8XdrACg="; }; fakegit = writeShellScriptBin "git" "echo ${githash}"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index bb25cff7c785..5c31555434e5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -37913,6 +37913,7 @@ with pkgs; katagoWithCuda = katago.override { backend = "cuda"; + cudaPackages = cudaPackages_12; }; katagoCPU = katago.override { @@ -37921,6 +37922,7 @@ with pkgs; katagoTensorRT = katago.override { backend = "tensorrt"; + cudaPackages = cudaPackages_12; }; klavaro = callPackage ../games/klavaro { }; From 1765936f5ac1ae556ea4adf8e7814c029bfad949 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 28 Dec 2023 07:41:28 +0000 Subject: [PATCH 127/168] svlint: 0.9.1 -> 0.9.2 --- 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 dc60f5ec377b..a879e0a81153 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.9.1"; + version = "0.9.2"; src = fetchCrate { inherit pname version; - sha256 = "sha256-PfevtQpbJeo2U/qeYcJP4Et/HUASOZssRu2IXtOLWKw="; + sha256 = "sha256-5fPra4kgvykeQnvRtO3enbMIzbh5+nDJ2x0aHYMGiww="; }; - cargoHash = "sha256-1nPXyFzRmum1CvOFdcqNOQzFVcFFKwPdt2qzXxMssf0="; + cargoHash = "sha256-R7jqFgMj4YjUbEObdRxxvataYMXe9wq8B8k+t7+Dv30="; cargoBuildFlags = [ "--bin" "svlint" ]; From 8e4c0b99a679173f6e0660cee21b8e092ed88dc3 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 28 Dec 2023 08:46:44 +0100 Subject: [PATCH 128/168] python311Packages.elgato: 5.1.1 -> 5.1.2 Diff: https://github.com/frenck/python-elgato/compare/refs/tags/v5.1.1...v5.1.2 Changelog: https://github.com/frenck/python-elgato/releases/tag/v5.1.2 --- pkgs/development/python-modules/elgato/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/elgato/default.nix b/pkgs/development/python-modules/elgato/default.nix index 01973168b881..f17b502826ce 100644 --- a/pkgs/development/python-modules/elgato/default.nix +++ b/pkgs/development/python-modules/elgato/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "elgato"; - version = "5.1.1"; + version = "5.1.2"; format = "pyproject"; disabled = pythonOlder "3.11"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "frenck"; repo = "python-elgato"; rev = "refs/tags/v${version}"; - hash = "sha256-g0po3BtY2uiOmuyWVA+o08c3I86SE4zmvo1ps8HpNNw="; + hash = "sha256-NAU4tr0oaAPPrOUZYl9WoGOM68MlrBqGewHBIiIv2XY="; }; postPatch = '' From 0dc7c4d1902aea22687660e4df0302def5171f80 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 28 Dec 2023 08:48:00 +0100 Subject: [PATCH 129/168] python311Packages.evohome-async: 0.4.15 -> 0.4.16 Diff: https://github.com/zxdavb/evohome-async/compare/refs/tags/0.4.15...0.4.16 --- pkgs/development/python-modules/evohome-async/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/evohome-async/default.nix b/pkgs/development/python-modules/evohome-async/default.nix index 3f8372c0c898..aaeac9b847eb 100644 --- a/pkgs/development/python-modules/evohome-async/default.nix +++ b/pkgs/development/python-modules/evohome-async/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "evohome-async"; - version = "0.4.15"; + version = "0.4.16"; pyproject = true; disabled = pythonOlder "3.11"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "zxdavb"; repo = "evohome-async"; rev = "refs/tags/${version}"; - hash = "sha256-ulkLl3K62MFUzFWUdsog4Q+jJ9uZjxNvDQTaWDhkhjo="; + hash = "sha256-2tcfcM/XFPP/HO+MEcXdPA6/4BUOQBuEIUWCvjUTbdg="; }; nativeBuildInputs = [ From e036cfa87a9ef62239281e725c0a16f0a59fd3e2 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 28 Dec 2023 08:12:57 +0000 Subject: [PATCH 130/168] pdfhummus: 4.6.1 -> 4.6.2 --- pkgs/development/libraries/pdfhummus/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/pdfhummus/default.nix b/pkgs/development/libraries/pdfhummus/default.nix index a6b57f2b340c..bc587d83f158 100644 --- a/pkgs/development/libraries/pdfhummus/default.nix +++ b/pkgs/development/libraries/pdfhummus/default.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "pdfhummus"; - version = "4.6.1"; + version = "4.6.2"; src = fetchFromGitHub { owner = "galkahana"; repo = "PDF-Writer"; rev = "v${version}"; - hash = "sha256-4QJxYxLELBDg5GZISdO2xKzJej8F21BY+GD+KkrGXws="; + hash = "sha256-PXiLP0lgqBdDbHHfvRT/d0M1jGjMVZZ3VDYnByzkKeI="; }; nativeBuildInputs = [ From 64cb07fee6beaea0a238f89f9ae1f51073527894 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 28 Dec 2023 08:13:20 +0000 Subject: [PATCH 131/168] svls: 0.2.10 -> 0.2.11 --- 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 4044a8c10d2e..88cfac40bfb0 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.10"; + version = "0.2.11"; src = fetchFromGitHub { owner = "dalance"; repo = "svls"; rev = "v${version}"; - sha256 = "sha256-ylTiyqFVdT95a5DP4YYtoAIGThA+TacAE8ft0mcuolI="; + sha256 = "sha256-pvvtJOwb9N7CzCXoLG19iuLQjABABaOUe6wKfYizgQc="; }; - cargoHash = "sha256-+h2lxIbfHCGKCWX8ly9NXskMkeRGIpujkX3Zep1WhrE="; + cargoHash = "sha256-sMprdvBSfCIzoTHyUC447pyZWGgZkKa9t3A9BiGbQvY="; meta = with lib; { description = "SystemVerilog language server"; From 0a2a67c3db6b0ba52a4e06be26976568df103ae5 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 28 Dec 2023 08:22:36 +0000 Subject: [PATCH 132/168] sketchybar-app-font: 1.0.20 -> 1.0.21 --- pkgs/data/fonts/sketchybar-app-font/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/fonts/sketchybar-app-font/default.nix b/pkgs/data/fonts/sketchybar-app-font/default.nix index 8364c84f1ffc..006738fd4850 100644 --- a/pkgs/data/fonts/sketchybar-app-font/default.nix +++ b/pkgs/data/fonts/sketchybar-app-font/default.nix @@ -5,11 +5,11 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "sketchybar-app-font"; - version = "1.0.20"; + version = "1.0.21"; src = fetchurl { url = "https://github.com/kvndrsslr/sketchybar-app-font/releases/download/v${finalAttrs.version}/sketchybar-app-font.ttf"; - hash = "sha256-pf3SSxzlNIdbXXHfRauFCnrVUMOd5J9sSUE9MsfWrwo="; + hash = "sha256-k3Ok5qizXQvRCzW0oRilLWNJelYI0BGQ6qLbjhxosTA="; }; dontUnpack = true; From 60e3f7e322099518e52de6d4958f4fcf490f7896 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 28 Dec 2023 08:44:18 +0000 Subject: [PATCH 133/168] uthenticode: 2.0.0 -> 2.0.1 --- pkgs/development/libraries/uthenticode/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/uthenticode/default.nix b/pkgs/development/libraries/uthenticode/default.nix index 58d1d35be94f..68a896d13649 100644 --- a/pkgs/development/libraries/uthenticode/default.nix +++ b/pkgs/development/libraries/uthenticode/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "uthenticode"; - version = "2.0.0"; + version = "2.0.1"; src = fetchFromGitHub { owner = "trailofbits"; repo = "uthenticode"; rev = "v${version}"; - hash = "sha256-XGKROp+1AJWUjCwMOikh+yvNMGuENJGb/kzJsEOEFeY="; + hash = "sha256-NGVOGXMRlgpSRw56jr63rJc/5/qCmPjtAFa0D21ogd4="; }; cmakeFlags = [ "-DBUILD_TESTS=1" "-DUSE_EXTERNAL_GTEST=1" ]; From aaa37c5df3f963a808722d519bbf93d7db15fbfa Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 28 Dec 2023 08:44:21 +0000 Subject: [PATCH 134/168] cargo-mobile2: 0.9.0 -> 0.9.1 --- pkgs/development/tools/rust/cargo-mobile2/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/rust/cargo-mobile2/default.nix b/pkgs/development/tools/rust/cargo-mobile2/default.nix index b29c7bb64fb1..b6265429525f 100644 --- a/pkgs/development/tools/rust/cargo-mobile2/default.nix +++ b/pkgs/development/tools/rust/cargo-mobile2/default.nix @@ -12,7 +12,7 @@ let inherit (darwin.apple_sdk.frameworks) CoreServices; pname = "cargo-mobile2"; - version = "0.9.0"; + version = "0.9.1"; in rustPlatform.buildRustPackage { inherit pname version; @@ -20,14 +20,14 @@ rustPlatform.buildRustPackage { owner = "tauri-apps"; repo = pname; rev = "cargo-mobile2-v${version}"; - hash = "sha256-zLArfCUgBWx/xrcjvyhQbSxjH0JKI3JhoDVRX2/kBnQ="; + hash = "sha256-gyTA85eLVvDQKWo7D2zO6zFC8910AyNasXGjR1qkI6c="; }; # Manually specify the sourceRoot since this crate depends on other crates in the workspace. Relevant info at # https://discourse.nixos.org/t/difficulty-using-buildrustpackage-with-a-src-containing-multiple-cargo-workspaces/10202 # sourceRoot = "${src.name}/tooling/cli"; - cargoHash = "sha256-13iCSd2BQ4fEeXSOfDBVgnzFSl1fUAPrbZZJ3qx7oHc="; + cargoHash = "sha256-Zcs+Sm2+xd7OSPXv+QDd7Jh8YvlmVrhWotjVNMqyE60="; preBuild = '' mkdir -p $out/share/ From 47d3395b00494e2601f019347e7f1e1d4ab54522 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 28 Dec 2023 08:44:38 +0000 Subject: [PATCH 135/168] cloudfoundry-cli: 8.7.6 -> 8.7.7 --- .../networking/cluster/cloudfoundry-cli/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/cloudfoundry-cli/default.nix b/pkgs/applications/networking/cluster/cloudfoundry-cli/default.nix index cfaac49f25b5..cc7286dbd301 100644 --- a/pkgs/applications/networking/cluster/cloudfoundry-cli/default.nix +++ b/pkgs/applications/networking/cluster/cloudfoundry-cli/default.nix @@ -2,15 +2,15 @@ buildGoModule rec { pname = "cloudfoundry-cli"; - version = "8.7.6"; + version = "8.7.7"; src = fetchFromGitHub { owner = "cloudfoundry"; repo = "cli"; rev = "v${version}"; - sha256 = "sha256-QvQqFl8RcVO+oNKhAeKkX0bmjv8qrtiR2gQ5ufpfMBo="; + sha256 = "sha256-WPZLINtjH+VuWlXX1XNeSuasxn+UI89Klrehg806kvI="; }; - vendorHash = "sha256-MBV8GIxgAHFEturqlQgBuzGUQcRdMsYU7c1kcTlZf9I="; + vendorHash = "sha256-ZQSbupcY+Uc8tYWZY/hYBaeaNxYuSOOIo0v9e5Ax0m0="; subPackages = [ "." ]; From 5f1c63ac1f1d0d7cbbd0bc2913362cd7655ec1be Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Thu, 28 Dec 2023 09:03:16 +0000 Subject: [PATCH 136/168] nodePackages.@antora/cli: fix eval by removing `main-programs.nix` entry Without the change evaluation fails as: $ nix build -f . 'nodePackages."@antora/cli"' error: function 'anonymous lambda' called with unexpected argument 'meta' --- pkgs/development/node-packages/main-programs.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/development/node-packages/main-programs.nix b/pkgs/development/node-packages/main-programs.nix index 7b57757a07cc..8c243736594b 100644 --- a/pkgs/development/node-packages/main-programs.nix +++ b/pkgs/development/node-packages/main-programs.nix @@ -9,7 +9,6 @@ # Packages that provide a single executable. "@angular/cli" = "ng"; - "@antora/cli" = "antora"; "@astrojs/language-server" = "astro-ls"; "@babel/cli" = "babel"; "@commitlint/cli" = "commitlint"; From 3f0ccf9352dcc1b3039086e36787663a0a3f2530 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 28 Dec 2023 10:12:41 +0100 Subject: [PATCH 137/168] python311Packages.losant-rest: 1.19.2 -> 1.19.3 Diff: https://github.com/Losant/losant-rest-python/compare/v1.19.2...v1.19.3 --- pkgs/development/python-modules/losant-rest/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/losant-rest/default.nix b/pkgs/development/python-modules/losant-rest/default.nix index ee84d47edf55..fbc65794da26 100644 --- a/pkgs/development/python-modules/losant-rest/default.nix +++ b/pkgs/development/python-modules/losant-rest/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "losant-rest"; - version = "1.19.2"; + version = "1.19.3"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "Losant"; repo = "losant-rest-python"; rev = "v${version}"; - hash = "sha256-JaXADzNxRqumjx6FZxJj6ioMVdUMR6S1FQQ6QcP8S5Q="; + hash = "sha256-Ppy7vOA7ix76nvzVEP+BkL8dsoN0oXNX/5IZyhXDoSw="; }; propagatedBuildInputs = [ From f2a8ed2545db54780954645d9a660dffbee175d4 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 28 Dec 2023 10:15:25 +0100 Subject: [PATCH 138/168] qovery-cli: 0.76.0 -> 0.77.0 Diff: https://github.com/Qovery/qovery-cli/compare/refs/tags/v0.76.0...v0.77.0 Changelog: https://github.com/Qovery/qovery-cli/releases/tag/v0.77.0 --- pkgs/tools/admin/qovery-cli/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/admin/qovery-cli/default.nix b/pkgs/tools/admin/qovery-cli/default.nix index cbe2ede5ecdd..1aaad9c4ee8c 100644 --- a/pkgs/tools/admin/qovery-cli/default.nix +++ b/pkgs/tools/admin/qovery-cli/default.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "qovery-cli"; - version = "0.76.0"; + version = "0.77.0"; src = fetchFromGitHub { owner = "Qovery"; repo = "qovery-cli"; rev = "refs/tags/v${version}"; - hash = "sha256-Gf0wW+bv3+uvovsRa2AHn/N4sN8lc1ADK9t+jEVMA0c="; + hash = "sha256-247YXfZHxnH3IrCpM/BOmJclKdsC561R2m5seqEknaE="; }; - vendorHash = "sha256-R1CAB42moobsYuXNTtZXNLcCpSp8jfSt2FQi5fRnEdI="; + vendorHash = "sha256-uYmA6dYdCTf/oon202s6RBGNfOaXLllX+mPM8fRkCh0="; nativeBuildInputs = [ installShellFiles From 5a890624383b0dbc4a7522a289535ae501f2d3a7 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 28 Dec 2023 10:16:50 +0100 Subject: [PATCH 139/168] python311Packages.zha-quirks: 0.0.108 -> 0.0.109 Diff: https://github.com/zigpy/zha-device-handlers/compare/refs/tags/0.0.108...0.0.109 Changelog: https://github.com/zigpy/zha-device-handlers/releases/tag/0.0.109 --- pkgs/development/python-modules/zha-quirks/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/zha-quirks/default.nix b/pkgs/development/python-modules/zha-quirks/default.nix index c219a7d3c526..9063ecd02db0 100644 --- a/pkgs/development/python-modules/zha-quirks/default.nix +++ b/pkgs/development/python-modules/zha-quirks/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "zha-quirks"; - version = "0.0.108"; + version = "0.0.109"; pyproject = true; disabled = pythonOlder "3.8"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "zigpy"; repo = "zha-device-handlers"; rev = "refs/tags/${version}"; - hash = "sha256-tn6ZI8lanQhWallvi/NwAWYPuSea+SlJX/6D1VdXRxM="; + hash = "sha256-fkE44j+wXdIJekJJNoO67YzsghalTUpyNx9R/B2Vn1Y="; }; postPatch = '' From ee5ff73cfb247391cfcee22fae35c589b599d242 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 28 Dec 2023 09:31:15 +0000 Subject: [PATCH 140/168] doublecmd: 1.1.7 -> 1.1.8 --- pkgs/by-name/do/doublecmd/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/do/doublecmd/package.nix b/pkgs/by-name/do/doublecmd/package.nix index 8134e8264354..4a7077d1a80c 100644 --- a/pkgs/by-name/do/doublecmd/package.nix +++ b/pkgs/by-name/do/doublecmd/package.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "doublecmd"; - version = "1.1.7"; + version = "1.1.8"; src = fetchFromGitHub { owner = "doublecmd"; repo = "doublecmd"; rev = "v${finalAttrs.version}"; - hash = "sha256-eY8hYstNJ5RMiz3TUfgPFpvKycxTMVaZ6PE69Glxa0I="; + hash = "sha256-gUYn1b5X1uP1Ig2u/XiEP6MRhWs2ID64GSdBUSP5YEQ="; }; nativeBuildInputs = [ From abb91d7be3b327a7c58542623fed8a978246cd69 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 28 Dec 2023 09:41:43 +0000 Subject: [PATCH 141/168] monkeysAudio: 10.30 -> 10.38 --- pkgs/applications/audio/monkeys-audio/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/monkeys-audio/default.nix b/pkgs/applications/audio/monkeys-audio/default.nix index 0cbe6129e0d9..ffa2e3697c6d 100644 --- a/pkgs/applications/audio/monkeys-audio/default.nix +++ b/pkgs/applications/audio/monkeys-audio/default.nix @@ -5,13 +5,13 @@ }: stdenv.mkDerivation (finalAttrs: { - version = "10.30"; + version = "10.38"; pname = "monkeys-audio"; src = fetchzip { url = "https://monkeysaudio.com/files/MAC_${ builtins.concatStringsSep "" (lib.strings.splitString "." finalAttrs.version)}_SDK.zip"; - sha256 = "sha256-vTpfHw58WRRjS/h7FVYjYwHSqoXAF08i8Q/i9xI+9Io="; + sha256 = "sha256-cVWwbzKyoBYiSPjMVzCGhPr2gPPWp+ateBqzPZojRP0="; stripRoot = false; }; nativeBuildInputs = [ From 497dafcea056207ab2476bb23d26d78e2f0038e0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Vacek?= Date: Thu, 28 Dec 2023 11:22:38 +0100 Subject: [PATCH 142/168] asusctl: 5.0.2 -> 5.0.6 --- pkgs/applications/system/asusctl/Cargo.lock | 193 +++++++++---------- pkgs/applications/system/asusctl/default.nix | 4 +- 2 files changed, 94 insertions(+), 103 deletions(-) diff --git a/pkgs/applications/system/asusctl/Cargo.lock b/pkgs/applications/system/asusctl/Cargo.lock index 7629e4050758..3775e2e54ac5 100644 --- a/pkgs/applications/system/asusctl/Cargo.lock +++ b/pkgs/applications/system/asusctl/Cargo.lock @@ -164,9 +164,9 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.75" +version = "1.0.76" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4668cab20f66d8d020e1fbc0ebe47217433c1b6c8f2040faf858554e394ace6" +checksum = "59d2a3357dde987206219e78ecfbbb6e8dad06cbb65292758d3270e6254f7355" [[package]] name = "arboard" @@ -199,7 +199,7 @@ checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711" [[package]] name = "asusctl" -version = "5.0.2" +version = "5.0.6" dependencies = [ "asusd", "cargo-husky", @@ -218,7 +218,7 @@ dependencies = [ [[package]] name = "asusd" -version = "5.0.2" +version = "5.0.6" dependencies = [ "async-trait", "cargo-husky", @@ -226,7 +226,7 @@ dependencies = [ "config-traits", "dmi_id", "env_logger", - "futures-lite 1.13.0", + "futures-lite 2.1.0", "log", "logind-zbus", "rog_anime", @@ -243,7 +243,7 @@ dependencies = [ [[package]] name = "asusd-user" -version = "5.0.2" +version = "5.0.6" dependencies = [ "cargo-husky", "config-traits", @@ -289,7 +289,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1ca33f4bc4ed1babef42cad36cc1f51fa88be00420404e5b1e80ab1b18f7678c" dependencies = [ "concurrent-queue", - "event-listener 4.0.0", + "event-listener 4.0.1", "event-listener-strategy", "futures-core", "pin-project-lite", @@ -375,7 +375,7 @@ version = "3.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7125e42787d53db9dd54261812ef17e937c95a51e4d291373b670342fa44310c" dependencies = [ - "event-listener 4.0.0", + "event-listener 4.0.1", "event-listener-strategy", "pin-project-lite", ] @@ -416,7 +416,7 @@ checksum = "5fd55a5ba1179988837d24ab4c7cc8ed6efdeff578ede0416b4225a5fca35bd0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.40", + "syn 2.0.43", ] [[package]] @@ -439,19 +439,19 @@ dependencies = [ [[package]] name = "async-task" -version = "4.5.0" +version = "4.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4eb2cdb97421e01129ccb49169d8279ed21e829929144f4a22a6e54ac549ca1" +checksum = "e1d90cd0b264dfdd8eb5bad0a2c217c1f88fa96a8573f40e7b12de23fb468f46" [[package]] name = "async-trait" -version = "0.1.74" +version = "0.1.75" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a66537f1bb974b254c98ed142ff995236e81b9d0fe4db0575f46612cb15eb0f9" +checksum = "fdf6721fb0140e4f897002dd086c06f6c27775df19cfe1fccb21181a48fd2c98" dependencies = [ "proc-macro2", "quote", - "syn 2.0.40", + "syn 2.0.43", ] [[package]] @@ -567,7 +567,7 @@ dependencies = [ "regex", "rustc-hash", "shlex", - "syn 2.0.40", + "syn 2.0.43", ] [[package]] @@ -658,7 +658,7 @@ checksum = "965ab7eb5f8f97d2a083c799f3a1b994fc397b2fe2da5d1da1626ce15a39f2b1" dependencies = [ "proc-macro2", "quote", - "syn 2.0.40", + "syn 2.0.43", ] [[package]] @@ -832,7 +832,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f76990911f2267d837d9d0ad060aa63aaad170af40904b29461734c339030d4d" dependencies = [ "quote", - "syn 2.0.40", + "syn 2.0.43", ] [[package]] @@ -846,7 +846,7 @@ dependencies = [ [[package]] name = "config-traits" -version = "5.0.2" +version = "5.0.6" dependencies = [ "cargo-husky", "log", @@ -899,7 +899,7 @@ dependencies = [ [[package]] name = "cpuctl" -version = "5.0.2" +version = "5.0.6" [[package]] name = "cpufeatures" @@ -921,9 +921,9 @@ dependencies = [ [[package]] name = "crossbeam-utils" -version = "0.8.16" +version = "0.8.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a22b2d63d4d1dc0b7f1b6b2747dd0088008a9be28b6ddf0b1e7d335e3037294" +checksum = "c3a430a770ebd84726f584a90ee7f020d28db52c6d02138900f22341f866d39c" dependencies = [ "cfg-if", ] @@ -1021,12 +1021,12 @@ version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "330c60081dcc4c72131f8eb70510f1ac07223e5d4163db481a04a0befcffa412" dependencies = [ - "libloading 0.8.1", + "libloading", ] [[package]] name = "dmi_id" -version = "5.0.2" +version = "5.0.6" dependencies = [ "log", "udev", @@ -1165,7 +1165,7 @@ checksum = "f95e2801cd355d4a1a3e3953ce6ee5ae9603a5c833455343a8bfe3f44d418246" dependencies = [ "proc-macro2", "quote", - "syn 2.0.40", + "syn 2.0.43", ] [[package]] @@ -1242,9 +1242,9 @@ dependencies = [ [[package]] name = "event-listener" -version = "4.0.0" +version = "4.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "770d968249b5d99410d61f5bf89057f3199a077a04d087092f58e7d10692baae" +checksum = "84f2cdcf274580f2d63697192d744727b3198894b1bf02923643bf59e2c26712" dependencies = [ "concurrent-queue", "parking", @@ -1257,7 +1257,7 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "958e4d70b6d5e81971bebec42271ec641e7ff4e170a6fa605f2b8a8b65cb97d3" dependencies = [ - "event-listener 4.0.0", + "event-listener 4.0.1", "pin-project-lite", ] @@ -1278,9 +1278,9 @@ checksum = "25cbce373ec4653f1a01a31e8a5e5ec0c622dc27ff9c4e6606eefef5cbbed4a5" [[package]] name = "fdeflate" -version = "0.3.1" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64d6dafc854908ff5da46ff3f8f473c6984119a2876a383a860246dd7841a868" +checksum = "7caf4086251adeba90011a7ff9bd1f6d7f7595be0871867daa4dbb0fcf2ca932" dependencies = [ "simd-adler32", ] @@ -1340,24 +1340,24 @@ dependencies = [ [[package]] name = "futures-channel" -version = "0.3.29" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff4dd66668b557604244583e3e1e1eada8c5c2e96a6d0d6653ede395b78bbacb" +checksum = "eac8f7d7865dcb88bd4373ab671c8cf4508703796caa2b1985a9ca867b3fcb78" dependencies = [ "futures-core", ] [[package]] name = "futures-core" -version = "0.3.29" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb1d22c66e66d9d72e1758f0bd7d4fd0bee04cad842ee34587d68c07e45d088c" +checksum = "dfc6580bb841c5a68e9ef15c77ccc837b40a7504914d52e47b8b0e9bbda25a1d" [[package]] name = "futures-executor" -version = "0.3.29" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f4fb8693db0cf099eadcca0efe2a5a22e4550f98ed16aba6c48700da29597bc" +checksum = "a576fc72ae164fca6b9db127eaa9a9dda0d61316034f33a0a0d4eda41f02b01d" dependencies = [ "futures-core", "futures-task", @@ -1366,9 +1366,9 @@ dependencies = [ [[package]] name = "futures-io" -version = "0.3.29" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8bf34a163b5c4c52d0478a4d757da8fb65cabef42ba90515efee0f6f9fa45aaa" +checksum = "a44623e20b9681a318efdd71c299b6b222ed6f231972bfe2f224ebad6311f0c1" [[package]] name = "futures-lite" @@ -1400,32 +1400,32 @@ dependencies = [ [[package]] name = "futures-macro" -version = "0.3.29" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53b153fd91e4b0147f4aced87be237c98248656bb01050b96bf3ee89220a8ddb" +checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" dependencies = [ "proc-macro2", "quote", - "syn 2.0.40", + "syn 2.0.43", ] [[package]] name = "futures-sink" -version = "0.3.29" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e36d3378ee38c2a36ad710c5d30c2911d752cb941c00c72dbabfb786a7970817" +checksum = "9fb8e00e87438d937621c1c6269e53f536c14d3fbd6a042bb24879e57d474fb5" [[package]] name = "futures-task" -version = "0.3.29" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "efd193069b0ddadc69c46389b740bbccdd97203899b48d09c5f7969591d6bae2" +checksum = "38d84fa142264698cdce1a9f9172cf383a0c82de1bddcf3092901442c4097004" [[package]] name = "futures-util" -version = "0.3.29" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a19526d624e703a3179b3d322efec918b6246ea0fa51d41124525f00f1cc8104" +checksum = "3d6401deb83407ab3da39eba7e33987a73c3df0c82b4bb5813ee871c19c41d48" dependencies = [ "futures-core", "futures-io", @@ -1676,7 +1676,7 @@ dependencies = [ "glutin_egl_sys", "glutin_glx_sys", "glutin_wgl_sys", - "libloading 0.7.4", + "libloading", "objc2", "once_cell", "raw-window-handle", @@ -1838,11 +1838,11 @@ checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" [[package]] name = "home" -version = "0.5.5" +version = "0.5.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5444c27eef6923071f7ebcc33e3444508466a76f7a2b93da00ed6e19f30c1ddb" +checksum = "e3d1354bf6b7235cb4a0576c2619fd4ed18183f689b12b006a0ee7329eeff9a5" dependencies = [ - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] @@ -2043,7 +2043,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "08fcb2bea89cee9613982501ec83eaa2d09256b24540ae463c52a28906163918" dependencies = [ "gtk-sys", - "libloading 0.7.4", + "libloading", "once_cell", ] @@ -2063,16 +2063,6 @@ dependencies = [ "winapi", ] -[[package]] -name = "libloading" -version = "0.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c571b676ddfc9a8c12f1f3d3085a7b163966a8fd8098a90640953ce5f6170161" -dependencies = [ - "cfg-if", - "windows-sys 0.48.0", -] - [[package]] name = "libredox" version = "0.0.1" @@ -2415,7 +2405,7 @@ dependencies = [ "proc-macro-crate", "proc-macro2", "quote", - "syn 2.0.40", + "syn 2.0.43", ] [[package]] @@ -2475,9 +2465,9 @@ dependencies = [ [[package]] name = "object" -version = "0.32.1" +version = "0.32.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9cf5f9dd3933bd50a9e1f149ec995f39ae2c496d31fd772c1fd45ebc27e902b0" +checksum = "a6a622008b6e321afc04970976f62ee297fdbaa6f95318ca343e3eebb9648441" dependencies = [ "memchr", ] @@ -2620,9 +2610,9 @@ checksum = "5de5067af0cd27add969cdb4ef2eecc955f59235f3b7a75a3c6ac9562cfb6b81" [[package]] name = "pkg-config" -version = "0.3.27" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26072860ba924cbfa98ea39c8c19b4dd6a4a25423dbdf219c1eca91aa0cf6964" +checksum = "69d3587f8a9e599cc7ec2c00e331f71c4e69a5f9a4b8a6efd5b07466b9736f9a" [[package]] name = "png" @@ -2725,9 +2715,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.70" +version = "1.0.71" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39278fbbf5fb4f646ce651690877f89d1c5811a3d4acb27700c1cb3cdb78fd3b" +checksum = "75cb1540fadbd5b8fbccc4dddad2734eba435053f725621c070711a14bb5f4b8" dependencies = [ "unicode-ident", ] @@ -2846,7 +2836,7 @@ checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f" [[package]] name = "rog-control-center" -version = "5.0.2" +version = "5.0.6" dependencies = [ "asusd", "cargo-husky", @@ -2879,7 +2869,7 @@ dependencies = [ [[package]] name = "rog_anime" -version = "5.0.2" +version = "5.0.6" dependencies = [ "cargo-husky", "dmi_id", @@ -2896,7 +2886,7 @@ dependencies = [ [[package]] name = "rog_aura" -version = "5.0.2" +version = "5.0.6" dependencies = [ "cargo-husky", "dmi_id", @@ -2910,7 +2900,7 @@ dependencies = [ [[package]] name = "rog_dbus" -version = "5.0.2" +version = "5.0.6" dependencies = [ "asusd", "cargo-husky", @@ -2923,7 +2913,7 @@ dependencies = [ [[package]] name = "rog_platform" -version = "5.0.2" +version = "5.0.6" dependencies = [ "cargo-husky", "concat-idents", @@ -2940,7 +2930,7 @@ dependencies = [ [[package]] name = "rog_profiles" -version = "5.0.2" +version = "5.0.6" dependencies = [ "cargo-husky", "log", @@ -2954,7 +2944,7 @@ dependencies = [ [[package]] name = "rog_simulators" -version = "5.0.2" +version = "5.0.6" dependencies = [ "glam", "log", @@ -3119,7 +3109,7 @@ checksum = "43576ca501357b9b071ac53cdc7da8ef0cbd9493d8df094cd821777ea6e894d3" dependencies = [ "proc-macro2", "quote", - "syn 2.0.40", + "syn 2.0.43", ] [[package]] @@ -3141,14 +3131,14 @@ checksum = "3081f5ffbb02284dda55132aa26daecedd7372a42417bbbab6f14ab7d6bb9145" dependencies = [ "proc-macro2", "quote", - "syn 2.0.40", + "syn 2.0.43", ] [[package]] name = "serde_spanned" -version = "0.6.4" +version = "0.6.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12022b835073e5b11e90a14f86838ceb1c8fb0325b72416845c487ac0fa95e80" +checksum = "eb3622f419d1296904700073ea6cc23ad690adbd66f13ea683df73298736f0c1" dependencies = [ "serde", ] @@ -3321,9 +3311,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.40" +version = "2.0.43" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "13fa70a4ee923979ffb522cacce59d34421ebdea5625e1073c4326ef9d2dd42e" +checksum = "ee659fb5f3d355364e1f3e5bc10fb82068efbf824a1e9d1c9504244a6469ad53" dependencies = [ "proc-macro2", "quote", @@ -3393,29 +3383,29 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.50" +version = "1.0.52" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9a7210f5c9a7156bb50aa36aed4c95afb51df0df00713949448cf9e97d382d2" +checksum = "83a48fd946b02c0a526b2e9481c8e2a17755e47039164a86c4070446e3a4614d" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.50" +version = "1.0.52" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "266b2e40bc00e5a6c09c3584011e08b06f123c00362c92b975ba9843aaaa14b8" +checksum = "e7fbe9b594d6568a6a1443250a7e67d80b74e1e96f6d1715e1e21cc1888291d3" dependencies = [ "proc-macro2", "quote", - "syn 2.0.40", + "syn 2.0.43", ] [[package]] name = "time" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4a34ab300f2dee6e562c10a046fc05e358b29f9bf92277f30c3c8d82275f6f5" +checksum = "f657ba42c3f86e7680e53c8cd3af8abbe56b5491790b46e22e19c0d57463583e" dependencies = [ "deranged", "powerfmt", @@ -3480,9 +3470,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.35.0" +version = "1.35.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "841d45b238a16291a4e1584e61820b8ae57d696cc5015c459c229ccc6990cc1c" +checksum = "c89b4efa943be685f629b149f53829423f8f5531ea21249408e8e2f8671ec104" dependencies = [ "backtrace", "libc", @@ -3502,7 +3492,7 @@ checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.40", + "syn 2.0.43", ] [[package]] @@ -3578,7 +3568,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.40", + "syn 2.0.43", ] [[package]] @@ -3637,10 +3627,11 @@ dependencies = [ [[package]] name = "uds_windows" -version = "1.0.2" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce65604324d3cce9b966701489fbd0cf318cb1f7bd9dd07ac9a4ee6fb791930d" +checksum = "89daebc3e6fd160ac4aa9fc8b3bf71e1f74fbf92367ae71fb83a037e8bf164b9" dependencies = [ + "memoffset 0.9.0", "tempfile", "winapi", ] @@ -4264,9 +4255,9 @@ dependencies = [ [[package]] name = "winnow" -version = "0.5.28" +version = "0.5.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c830786f7720c2fd27a1a0e27a709dbd3c4d009b56d098fc742d4f4eab91fe2" +checksum = "9b5c3db89721d50d0e2a673f5043fc4722f76dcc352d7b1ab8b8288bed4ed2c5" dependencies = [ "memchr", ] @@ -4394,22 +4385,22 @@ dependencies = [ [[package]] name = "zerocopy" -version = "0.7.30" +version = "0.7.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "306dca4455518f1f31635ec308b6b3e4eb1b11758cefafc782827d0aa7acb5c7" +checksum = "74d4d3961e53fa4c9a25a8637fc2bfaf2595b3d3ae34875568a5cf64787716be" dependencies = [ "zerocopy-derive", ] [[package]] name = "zerocopy-derive" -version = "0.7.30" +version = "0.7.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be912bf68235a88fbefd1b73415cb218405958d1655b2ece9035a19920bdf6ba" +checksum = "9ce1b18ccd8e73a9321186f97e46f9f04b778851177567b1975109d26a08d2a6" dependencies = [ "proc-macro2", "quote", - "syn 2.0.40", + "syn 2.0.43", ] [[package]] diff --git a/pkgs/applications/system/asusctl/default.nix b/pkgs/applications/system/asusctl/default.nix index bc4ddfbf596c..9bc6d3e13379 100644 --- a/pkgs/applications/system/asusctl/default.nix +++ b/pkgs/applications/system/asusctl/default.nix @@ -13,13 +13,13 @@ rustPlatform.buildRustPackage rec { pname = "asusctl"; - version = "5.0.2"; + version = "5.0.6"; src = fetchFromGitLab { owner = "asus-linux"; repo = "asusctl"; rev = version; - hash = "sha256-0+HCqp/mn+O6Cnbmma7iw5EFBbLozvnkqGA378oj0G8="; + hash = "sha256-xeskbfpznXki+MnPt+Tli7+DYprRnpZaNb/O5mdnZy0="; }; cargoHash = ""; From bbaaa76e774723b926f7a67a2ab9d37fd3ad0cc4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Janne=20He=C3=9F?= Date: Thu, 28 Dec 2023 12:18:33 +0100 Subject: [PATCH 143/168] libao: Fix eval when config.pulseaudio is set Otherwise fails with: ``` error: attempt to call something which is not a function but a Boolean ``` --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 310c5e7d8af9..a5c2aaabbb21 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -22423,7 +22423,7 @@ with pkgs; libagar_test = callPackage ../development/libraries/libagar/libagar_test.nix { }; libao = callPackage ../development/libraries/libao { - usePulseAudio = config.pulseaudio or lib.meta.availableOn stdenv.hostPlatform libpulseaudio; + usePulseAudio = config.pulseaudio or (lib.meta.availableOn stdenv.hostPlatform libpulseaudio); inherit (darwin.apple_sdk.frameworks) CoreAudio CoreServices AudioUnit; }; From 9acd7a1737d5f6c8b9984ab2af3e2593d5593cdf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Thu, 28 Dec 2023 03:47:24 -0800 Subject: [PATCH 144/168] Revert "archivebox: 0.6.2 -> 0.7.1" --- pkgs/applications/misc/archivebox/default.nix | 29 +- .../node-packages/node-packages.json | 1 - .../node-packages/node-packages.nix | 466 ------------------ pkgs/development/node-packages/overrides.nix | 9 - 4 files changed, 8 insertions(+), 497 deletions(-) diff --git a/pkgs/applications/misc/archivebox/default.nix b/pkgs/applications/misc/archivebox/default.nix index 7b3f1d8e2cae..42f9feb421fe 100644 --- a/pkgs/applications/misc/archivebox/default.nix +++ b/pkgs/applications/misc/archivebox/default.nix @@ -2,11 +2,6 @@ , python3 , fetchFromGitHub , fetchPypi -, nodePackages -, curl -, wget -, ripgrep -, nodejs }: let @@ -39,7 +34,6 @@ let rev = "e43f383dae3a35237e42f6acfe1207a8e7e7bdf5"; hash = "sha256-NAMa78KhAuoJfp0Cb0Codz84sRfRQ1JhSLNYRI4GBPM="; }; - disabledTests = [ "test_should_highlight_bash_syntax_without_name" ]; }); }; }; @@ -47,33 +41,26 @@ in python.pkgs.buildPythonApplication rec { pname = "archivebox"; - version = "0.7.1"; + version = "0.6.2"; src = fetchPypi { inherit pname version; - sha256 = "sha256-IBKYp6AKQTC6LiCS2KLGFy51/U18R+eYhbRdhrq8/pw="; + sha256 = "sha256-zHty7lTra6yab9d0q3EqsPG3F+lrnZL6PjQAbL1A2NY="; }; propagatedBuildInputs = with python.pkgs; [ - croniter - dateparser + requests + mypy-extensions django django-extensions - ipython - mypy-extensions - pdm-backend + dateparser + youtube-dl python-crontab - requests + croniter w3lib - yt-dlp + ipython ]; - makeWrapperArgs = [ - "--prefix PATH : ${lib.makeBinPath [ curl wget ripgrep nodejs nodePackages.readability-extractor nodePackages.postlight-parser ]}" - ]; - - format = "pyproject"; - meta = with lib; { description = "Open source self-hosted web archiving"; homepage = "https://archivebox.io"; diff --git a/pkgs/development/node-packages/node-packages.json b/pkgs/development/node-packages/node-packages.json index 73e72769aec8..df6dc59e3c11 100644 --- a/pkgs/development/node-packages/node-packages.json +++ b/pkgs/development/node-packages/node-packages.json @@ -6,7 +6,6 @@ , "@commitlint/cli" , "@commitlint/config-conventional" , "@microsoft/rush" -, "@postlight/parser" , "@shopify/cli" , "@tailwindcss/aspect-ratio" , "@tailwindcss/forms" diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix index d6b4689b6083..a7e1580f8d58 100644 --- a/pkgs/development/node-packages/node-packages.nix +++ b/pkgs/development/node-packages/node-packages.nix @@ -2893,15 +2893,6 @@ let sha512 = "cTIudHnzuWLS56ik4DnRnqqNf8MkdUzV4iFFI1h7Jo9xvrpQROYaAnaSd2mHLQAzzZAPfATynX5ord6YlNYNMA=="; }; }; - "@babel/runtime-corejs2-7.23.6" = { - name = "_at_babel_slash_runtime-corejs2"; - packageName = "@babel/runtime-corejs2"; - version = "7.23.6"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/runtime-corejs2/-/runtime-corejs2-7.23.6.tgz"; - sha512 = "k8QKC2DmBqkwJDOLa4biAZjoCGPQIaAoA1HvHtZ+gR2E9AauudikJOB34h4ETEavN5UG21X0KPdM3IvBRxM0CA=="; - }; - }; "@babel/template-7.22.15" = { name = "_at_babel_slash_template"; packageName = "@babel/template"; @@ -7195,15 +7186,6 @@ let sha512 = "iA7+tyVqfrATAIsIRWQG+a7ZLLD0VaOCKV2Wd/v4mqIU3J9c4jx9p7S0nw1XH3gJCKNBOOwACOPYYSUu9pgT+w=="; }; }; - "@mozilla/readability-0.4.4" = { - name = "_at_mozilla_slash_readability"; - packageName = "@mozilla/readability"; - version = "0.4.4"; - src = fetchurl { - url = "https://registry.npmjs.org/@mozilla/readability/-/readability-0.4.4.tgz"; - sha512 = "MCgZyANpJ6msfvVMi6+A0UAsvZj//4OHREYUB9f2087uXHVoU+H+SWhuihvb1beKpM323bReQPRio0WNk2+V6g=="; - }; - }; "@msgpack/msgpack-2.8.0" = { name = "_at_msgpack_slash_msgpack"; packageName = "@msgpack/msgpack"; @@ -9085,15 +9067,6 @@ let sha512 = "OLkDZSqkA1mkoPNPvLFXyI6fb0enCuFji6Zfditi/CLAo9kmIhQFmEUDu4krSB8i908EljG8YwL5Xjxzm5wsWA=="; }; }; - "@postlight/ci-failed-test-reporter-1.0.26" = { - name = "_at_postlight_slash_ci-failed-test-reporter"; - packageName = "@postlight/ci-failed-test-reporter"; - version = "1.0.26"; - src = fetchurl { - url = "https://registry.npmjs.org/@postlight/ci-failed-test-reporter/-/ci-failed-test-reporter-1.0.26.tgz"; - sha512 = "xfXzxyOiKhco7Gx2OLTe9b66b0dFJw0elg94KGHoQXf5F8JqqFvdo35J8wayGOor64CSMvn+4Bjlu2NKV+yTGA=="; - }; - }; "@prisma/engines-5.6.0" = { name = "_at_prisma_slash_engines"; packageName = "@prisma/engines"; @@ -13873,15 +13846,6 @@ let sha512 = "ZQl7LOWaF5ePqqcX4hLuv/bLXYQNfNWw2c0/yX/TsPRKamzHcTGQnlCjHT3TsmkOUVEPS3crCxiPfdzE/Trlhg=="; }; }; - "acorn-globals-7.0.1" = { - name = "acorn-globals"; - packageName = "acorn-globals"; - version = "7.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/acorn-globals/-/acorn-globals-7.0.1.tgz"; - sha512 = "umOSDSDrfHbTNPuNpC2NSnnA3LUrqpevPb4T9jRx4MagXNS0rs+gwiTcAvqCRmsD6utzsrzNt+ebm00SNWiC3Q=="; - }; - }; "acorn-import-assertions-1.9.0" = { name = "acorn-import-assertions"; packageName = "acorn-import-assertions"; @@ -13972,15 +13936,6 @@ let sha512 = "FS7hV565M5l1R08MXqo8odwMTB02C2UqzB17RVgu9EyuYFBqJZ3/ZY97sQD5FewVu1UyDFc1yztUDrAwT0EypA=="; }; }; - "acorn-walk-8.3.1" = { - name = "acorn-walk"; - packageName = "acorn-walk"; - version = "8.3.1"; - src = fetchurl { - url = "https://registry.npmjs.org/acorn-walk/-/acorn-walk-8.3.1.tgz"; - sha512 = "TgUZgYvqZprrl7YldZNoa9OciCAyZR+Ejm9eXzKCmjsF5IKp/wgQ7Z/ZpjpGTIUPwrHQIcYeI8qDh4PsEwxMbw=="; - }; - }; "add-stream-1.0.0" = { name = "add-stream"; packageName = "add-stream"; @@ -16726,15 +16681,6 @@ let sha512 = "suhjmLI57Ewpmq00qaygS8UgEq2ly2PCItenIyhMqVjo4t4pGzqMvfgJuX8iWTeSDdfSSqS6j38fL4ToNL7Pfg=="; }; }; - "bluebird-2.11.0" = { - name = "bluebird"; - packageName = "bluebird"; - version = "2.11.0"; - src = fetchurl { - url = "https://registry.npmjs.org/bluebird/-/bluebird-2.11.0.tgz"; - sha512 = "UfFSr22dmHPQqPP9XWHRhq+gWnHCYguQGkXQlbyPtW5qTnhFWA8/iXg765tH0cAjy7l/zPJ1aBTO0g5XgA7kvQ=="; - }; - }; "bluebird-3.4.7" = { name = "bluebird"; packageName = "bluebird"; @@ -23441,16 +23387,6 @@ let sha512 = "D+mk+qE8VC/PAUrlAU34N+VfXev0ghe5ywmpqrawphmVZc1bEfn56uo9qpyGp1p4xpzOHkSW4ztBd6L7Xx4ACw=="; }; }; - "difflib-git+https://github.com/postlight/difflib.js" = { - name = "difflib"; - packageName = "difflib"; - version = "0.2.6"; - src = fetchgit { - url = "https://github.com/postlight/difflib.js"; - rev = "32e8e38c7fcd935241b9baab71bb432fd9b166ed"; - sha256 = "83d7e1db8e541657ce440df7cd0ff7a8df63481fba940ea7f4e2b6d00c7f38f6"; - }; - }; "diff-match-patch-1.0.5" = { name = "diff-match-patch"; packageName = "diff-match-patch"; @@ -23856,15 +23792,6 @@ let sha512 = "3VdM/SXBZX2omc9JF9nOPCtDaYQ67BGp5CoLpIQlO2KCAPETs8TcDHacF26jXadGbvUteZzRTeos2fhID5+ucQ=="; }; }; - "dompurify-2.4.7" = { - name = "dompurify"; - packageName = "dompurify"; - version = "2.4.7"; - src = fetchurl { - url = "https://registry.npmjs.org/dompurify/-/dompurify-2.4.7.tgz"; - sha512 = "kxxKlPEDa6Nc5WJi+qRgPbOAbgTpSULL+vI3NUXsZMlkJxTqYI9wg5ZTay2sFrdZRWHPWNi+EdAhcJf81WtoMQ=="; - }; - }; "dompurify-3.0.6" = { name = "dompurify"; packageName = "dompurify"; @@ -24000,15 +23927,6 @@ let sha512 = "IPzF4w4/Rd94bA9imS68tZBaYyBWSCE47V1RGuMrB94iyTOIEwRmVL2x/4An+6mETpLrKJ5hQkB8W4kFAadeIQ=="; }; }; - "dotenv-6.2.0" = { - name = "dotenv"; - packageName = "dotenv"; - version = "6.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/dotenv/-/dotenv-6.2.0.tgz"; - sha512 = "HygQCKUBSFl8wKQZBSemMywRWcEDNidvNbjGVyZu3nbZ8qq9ubiPoGLMdRDpfSrpkkm9BXYFkpKxxFX38o/76w=="; - }; - }; "dotenv-7.0.0" = { name = "dotenv"; packageName = "dotenv"; @@ -24351,15 +24269,6 @@ let sha512 = "L6uRgvZTH+4OF5NE/MBbzQx/WYpru1xCBE9respNj6qznEewGUIfhzmm7horWWxbNO2M0WckQypGctR8lH79xQ=="; }; }; - "ellipsize-0.1.0" = { - name = "ellipsize"; - packageName = "ellipsize"; - version = "0.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/ellipsize/-/ellipsize-0.1.0.tgz"; - sha512 = "5gxbEjcb/Z2n6TTmXZx9wVi3N/DOzE7RXY3Xg9dakDuhX/izwumB9rGjeWUV6dTA0D0+juvo+JonZgNR9sgA5A=="; - }; - }; "elliptic-6.5.4" = { name = "elliptic"; packageName = "elliptic"; @@ -31193,15 +31102,6 @@ let sha512 = "v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA=="; }; }; - "iconv-lite-0.5.0" = { - name = "iconv-lite"; - packageName = "iconv-lite"; - version = "0.5.0"; - src = fetchurl { - url = "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.5.0.tgz"; - sha512 = "NnEhI9hIEKHOzJ4f697DMz9IQEXr/MMJ5w64vN2/4Ai+wRnvV7SBrL0KLoRlwaKVghOc7LQ5YkPLuX146b6Ydw=="; - }; - }; "iconv-lite-0.6.3" = { name = "iconv-lite"; packageName = "iconv-lite"; @@ -34388,15 +34288,6 @@ let sha512 = "u9Smc2G1USStM+s/x1ru5Sxrl6mPYCbByG1U/hUmqaVsm4tbNyS7CicOSRyuGQYZhTu0h84qkZZQ/I+dzizSVw=="; }; }; - "jsdom-21.1.2" = { - name = "jsdom"; - packageName = "jsdom"; - version = "21.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/jsdom/-/jsdom-21.1.2.tgz"; - sha512 = "sCpFmK2jv+1sjff4u7fzft+pUh2KSUbUrEHYHyfSIbGTIcmnjyp83qg6qLwdJ/I3LpTXx33ACxeRL7Lsyc6lGQ=="; - }; - }; "jsdom-22.1.0" = { name = "jsdom"; packageName = "jsdom"; @@ -40185,15 +40076,6 @@ let sha512 = "zp8slBaeHVn8VOr7aTVzXYYayoVtEF3XI9gmgimyR3PBZsBk4JlXlFgxmcKxRjBZ1voh9ao77u/qwMGSZVZ9+A=="; }; }; - "moment-parseformat-3.0.0" = { - name = "moment-parseformat"; - packageName = "moment-parseformat"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/moment-parseformat/-/moment-parseformat-3.0.0.tgz"; - sha512 = "dVgXe6b6DLnv4CHG7a1zUe5mSXaIZ3c6lSHm/EKeVeQI2/4pwe0VRde8OyoCE1Ro2lKT5P6uT9JElF7KDLV+jw=="; - }; - }; "moment-timezone-0.5.43" = { name = "moment-timezone"; packageName = "moment-timezone"; @@ -41320,15 +41202,6 @@ let sha512 = "PbZERfeFdrHQOOXiAKOY0VPbykZy90ndPKk0d+CFDegTKmWp1VgOTz2xACVbr1BjCWxrQp68CXtvNsveFhqDJg=="; }; }; - "node-gyp-build-4.7.1" = { - name = "node-gyp-build"; - packageName = "node-gyp-build"; - version = "4.7.1"; - src = fetchurl { - url = "https://registry.npmjs.org/node-gyp-build/-/node-gyp-build-4.7.1.tgz"; - sha512 = "wTSrZ+8lsRRa3I3H8Xr65dLWSgCvY2l4AOnaeKdPA9TB/WYMPaTcrzf3rXvFoVvjKNVnu0CcWSx54qq9GKRUYg=="; - }; - }; "node-gyp-build-optional-packages-5.0.3" = { name = "node-gyp-build-optional-packages"; packageName = "node-gyp-build-optional-packages"; @@ -45739,24 +45612,6 @@ let sha512 = "z+16RoxK3fUPgwaIgH9NGnK1HKY9XIDpydky5eQGgAFVXTCSezalv9U2jQuNV+Z9qV1fDWNzldcw4eK0SSbqKA=="; }; }; - "postman-request-2.88.1-postman.8-beta.1" = { - name = "postman-request"; - packageName = "postman-request"; - version = "2.88.1-postman.8-beta.1"; - src = fetchurl { - url = "https://registry.npmjs.org/postman-request/-/postman-request-2.88.1-postman.8-beta.1.tgz"; - sha512 = "deC5UZlM1VimFhQdPN1NcbQMvLEtpUCTHZHMXWNv6vyNW7H98O3MJGTlk2xTlzB9BOpU2MCCgXNOPeNP2SU6iA=="; - }; - }; - "postman-url-encoder-1.0.1" = { - name = "postman-url-encoder"; - packageName = "postman-url-encoder"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/postman-url-encoder/-/postman-url-encoder-1.0.1.tgz"; - sha512 = "ned2lpcMpEG+n3ce2LEoGqUJeZsKNRYkViqKfJXe7rUQhLxjrrcp/lQ8TLycvX74lQZm52gkNVVgczmcJBOJ8w=="; - }; - }; "prebuild-install-7.1.1" = { name = "prebuild-install"; packageName = "prebuild-install"; @@ -47980,15 +47835,6 @@ let sha512 = "srw17NI0TUWHuGa5CFGGmhfNIeja30WMBfbslPNhf6JrqQlLN5gcrvig1oqPxiVaXb0oW0XRKtH6Nngs5lKCIA=="; }; }; - "regenerator-runtime-0.14.1" = { - name = "regenerator-runtime"; - packageName = "regenerator-runtime"; - version = "0.14.1"; - src = fetchurl { - url = "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.14.1.tgz"; - sha512 = "dYnhHh0nJoMfnkZs6GmmhFknAGRrLznOu5nc9ML+EJxGvrx6H7teuevqVqCuPcPK//3eDrrjQhehXVx9cnkGdw=="; - }; - }; "regenerator-transform-0.15.2" = { name = "regenerator-transform"; packageName = "regenerator-transform"; @@ -52435,15 +52281,6 @@ let sha512 = "HZfXngYHUAr1exT4fxlbc1IOce1RYxp2ldeaf97LYCOPSoOqY/1Psp7iGvpb+6JIOgkra9zDYnPX01hGAHzEPw=="; }; }; - "stream-length-1.0.2" = { - name = "stream-length"; - packageName = "stream-length"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/stream-length/-/stream-length-1.0.2.tgz"; - sha512 = "aI+qKFiwoDV4rsXiS7WRoCt+v2RX1nUj17+KJC5r2gfh5xoSJIfP6Y3Do/HtvesFcTSWthIuJ3l1cvKQY/+nZg=="; - }; - }; "stream-meter-1.0.4" = { name = "stream-meter"; packageName = "stream-meter"; @@ -52615,15 +52452,6 @@ let sha512 = "aqD2Q0144Z+/RqG52NeHEkZauTAUWJO8c6yTftGJKO3Tja5tUgIfmIl6kExvhtxSDP7fXB6DvzkfMpCd/F3G+Q=="; }; }; - "string-direction-0.1.2" = { - name = "string-direction"; - packageName = "string-direction"; - version = "0.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/string-direction/-/string-direction-0.1.2.tgz"; - sha512 = "NJHQRg6GlOEMLA6jEAlSy21KaXvJDNoAid/v6fBAJbqdvOEIiPpCrIPTHnl4636wUF/IGyktX5A9eddmETb1Cw=="; - }; - }; "string-env-interpolation-1.0.1" = { name = "string-env-interpolation"; packageName = "string-env-interpolation"; @@ -59834,15 +59662,6 @@ let sha512 = "wEBG1ftX4jcglPxgFCMJmZ2PLtSbJ2Peg6TmpJFTbe9GZYOQCDPdMYu/Tm0/bGZkw8paZnJY45J4K2PZrLYq8g=="; }; }; - "ws-8.15.1" = { - name = "ws"; - packageName = "ws"; - version = "8.15.1"; - src = fetchurl { - url = "https://registry.npmjs.org/ws/-/ws-8.15.1.tgz"; - sha512 = "W5OZiCjXEmk0yZ66ZN82beM5Sz7l7coYxpRkzS+p9PP+ToQry8szKh+61eNktr7EA9DOwvFGhfC605jDHbP6QQ=="; - }; - }; "ws-8.5.0" = { name = "ws"; packageName = "ws"; @@ -59861,15 +59680,6 @@ let sha512 = "bGy2JzvzkPowEJV++hF07hAD6niYSr0JzBNo/J29WsB57A2r7Wlc1UFcTR9IzrPvuNVO4B8LGqF8qcpsVOhJCA=="; }; }; - "wuzzy-0.1.8" = { - name = "wuzzy"; - packageName = "wuzzy"; - version = "0.1.8"; - src = fetchurl { - url = "https://registry.npmjs.org/wuzzy/-/wuzzy-0.1.8.tgz"; - sha512 = "FUzKQepFSTnANsDYwxpIzGJ/dIJaqxuMre6tzzbvWwFAiUHPsI1nVQVCLK4Xqr67KO7oYAK0kaCcI/+WYj/7JA=="; - }; - }; "xcase-2.0.1" = { name = "xcase"; packageName = "xcase"; @@ -90474,132 +90284,6 @@ in bypassCache = true; reconstructLock = true; }; - "@postlight/parser" = nodeEnv.buildNodePackage { - name = "_at_postlight_slash_parser"; - packageName = "@postlight/parser"; - version = "2.2.3"; - src = fetchurl { - url = "https://registry.npmjs.org/@postlight/parser/-/parser-2.2.3.tgz"; - sha512 = "4/syRvqJARgLN4yH8qtl634WO0+KINjkijU/SmhCJqqh8/aOfv5uQf+SquFpA+JwsAsbGzYQkIxSum29riOreg=="; - }; - dependencies = [ - sources."@babel/runtime-corejs2-7.23.6" - sources."@postlight/ci-failed-test-reporter-1.0.26" - sources."ajv-6.12.6" - sources."asn1-0.2.6" - sources."assert-plus-1.0.0" - sources."asynckit-0.4.0" - sources."aws-sign2-0.7.0" - sources."aws4-1.12.0" - sources."bcrypt-pbkdf-1.0.2" - sources."bluebird-2.11.0" - sources."boolbase-1.0.0" - sources."camelcase-5.3.1" - sources."caseless-0.12.0" - sources."cheerio-0.22.0" - sources."combined-stream-1.0.8" - sources."core-js-2.6.12" - sources."core-util-is-1.0.2" - sources."css-select-1.2.0" - sources."css-what-2.1.3" - sources."dashdash-1.14.1" - sources."decamelize-1.2.0" - sources."delayed-stream-1.0.0" - sources."difflib-git+https://github.com/postlight/difflib.js" - sources."dom-serializer-0.1.1" - sources."domelementtype-1.3.1" - sources."domhandler-2.4.2" - sources."domino-2.1.6" - sources."domutils-1.5.1" - sources."dotenv-6.2.0" - sources."ecc-jsbn-0.1.2" - sources."ellipsize-0.1.0" - (sources."encoding-0.1.13" // { - dependencies = [ - sources."iconv-lite-0.6.3" - ]; - }) - sources."entities-1.1.2" - sources."extend-3.0.2" - sources."extsprintf-1.3.0" - sources."fast-deep-equal-3.1.3" - sources."fast-json-stable-stringify-2.1.0" - sources."forever-agent-0.6.1" - sources."form-data-2.3.3" - sources."getpass-0.1.7" - sources."har-schema-2.0.0" - sources."har-validator-5.1.5" - sources."heap-0.2.7" - sources."htmlparser2-3.10.1" - sources."http-signature-1.2.0" - sources."iconv-lite-0.5.0" - sources."inherits-2.0.4" - sources."is-typedarray-1.0.0" - sources."isstream-0.1.2" - sources."jsbn-0.1.1" - sources."json-schema-0.4.0" - sources."json-schema-traverse-0.4.1" - sources."json-stringify-safe-5.0.1" - sources."jsprim-1.4.2" - sources."lodash-4.17.21" - sources."lodash.assignin-4.2.0" - sources."lodash.bind-4.2.1" - sources."lodash.defaults-4.2.0" - sources."lodash.filter-4.6.0" - sources."lodash.flatten-4.4.0" - sources."lodash.foreach-4.5.0" - sources."lodash.map-4.6.0" - sources."lodash.merge-4.6.2" - sources."lodash.pick-4.4.0" - sources."lodash.reduce-4.6.0" - sources."lodash.reject-4.6.0" - sources."lodash.some-4.6.0" - sources."mime-db-1.52.0" - sources."mime-types-2.1.35" - sources."moment-2.29.4" - sources."moment-parseformat-3.0.0" - sources."node-fetch-2.7.0" - sources."nth-check-1.0.2" - sources."oauth-sign-0.9.0" - sources."performance-now-2.1.0" - sources."postman-request-2.88.1-postman.8-beta.1" - sources."postman-url-encoder-1.0.1" - sources."psl-1.9.0" - sources."punycode-2.3.1" - sources."qs-6.5.3" - sources."readable-stream-3.6.2" - sources."regenerator-runtime-0.14.1" - sources."safe-buffer-5.2.1" - sources."safer-buffer-2.1.2" - sources."sshpk-1.18.0" - sources."stream-length-1.0.2" - sources."string-direction-0.1.2" - sources."string_decoder-1.3.0" - sources."tough-cookie-2.5.0" - sources."tr46-0.0.3" - sources."tunnel-agent-0.6.0" - sources."turndown-7.1.2" - sources."tweetnacl-0.14.5" - sources."uri-js-4.4.1" - sources."util-deprecate-1.0.2" - sources."uuid-3.4.0" - sources."valid-url-1.0.9" - sources."verror-1.10.0" - sources."webidl-conversions-3.0.1" - sources."whatwg-url-5.0.0" - sources."wuzzy-0.1.8" - sources."yargs-parser-15.0.3" - ]; - buildInputs = globalBuildInputs; - meta = { - description = "Postlight Parser transforms web pages into clean text. Publishers and programmers use it to make the web make sense, and readers use it to read any web article comfortably."; - homepage = "https://reader.postlight.com"; - license = "MIT"; - }; - production = true; - bypassCache = true; - reconstructLock = true; - }; prebuild-install = nodeEnv.buildNodePackage { name = "prebuild-install"; packageName = "prebuild-install"; @@ -91397,156 +91081,6 @@ in bypassCache = true; reconstructLock = true; }; - readability-extractor = nodeEnv.buildNodePackage { - name = "readability-extractor"; - packageName = "readability-extractor"; - version = "0.0.6"; - src = fetchurl { - url = "https://registry.npmjs.org/readability-extractor/-/readability-extractor-0.0.6.tgz"; - sha512 = "JJNUfhxI6OH9ZH8tfHK/hvC8M17S0F6f58yU6904gOJIvAi+287nBA3W/H+6DvhbCw7WJTKKlF2IxMfUKrqh+g=="; - }; - dependencies = [ - sources."@mapbox/node-pre-gyp-1.0.11" - sources."@mozilla/readability-0.4.4" - sources."@tootallnate/once-2.0.0" - sources."abab-2.0.6" - sources."abbrev-1.1.1" - sources."acorn-8.11.2" - sources."acorn-globals-7.0.1" - sources."acorn-walk-8.3.1" - sources."agent-base-6.0.2" - sources."ansi-regex-5.0.1" - sources."aproba-2.0.0" - sources."are-we-there-yet-2.0.0" - sources."asynckit-0.4.0" - sources."balanced-match-1.0.2" - sources."brace-expansion-1.1.11" - sources."bufferutil-4.0.8" - sources."canvas-2.11.2" - sources."chownr-2.0.0" - sources."color-support-1.1.3" - sources."combined-stream-1.0.8" - sources."concat-map-0.0.1" - sources."console-control-strings-1.1.0" - sources."cssstyle-3.0.0" - sources."data-urls-4.0.0" - sources."debug-4.3.4" - sources."decimal.js-10.4.3" - sources."decompress-response-4.2.1" - sources."delayed-stream-1.0.0" - sources."delegates-1.0.0" - sources."detect-libc-2.0.2" - sources."domexception-4.0.0" - sources."dompurify-2.4.7" - sources."emoji-regex-8.0.0" - sources."encoding-0.1.13" - sources."entities-4.5.0" - sources."escodegen-2.1.0" - sources."esprima-4.0.1" - sources."estraverse-5.3.0" - sources."esutils-2.0.3" - sources."form-data-4.0.0" - (sources."fs-minipass-2.1.0" // { - dependencies = [ - sources."minipass-3.3.6" - ]; - }) - sources."fs.realpath-1.0.0" - sources."gauge-3.0.2" - sources."glob-7.2.3" - sources."has-unicode-2.0.1" - sources."html-encoding-sniffer-3.0.0" - sources."http-proxy-agent-5.0.0" - sources."https-proxy-agent-5.0.1" - sources."iconv-lite-0.6.3" - sources."inflight-1.0.6" - sources."inherits-2.0.4" - sources."is-fullwidth-code-point-3.0.0" - sources."is-potential-custom-element-name-1.0.1" - sources."jsdom-21.1.2" - sources."lru-cache-6.0.0" - (sources."make-dir-3.1.0" // { - dependencies = [ - sources."semver-6.3.1" - ]; - }) - sources."mime-db-1.52.0" - sources."mime-types-2.1.35" - sources."mimic-response-2.1.0" - sources."minimatch-3.1.2" - sources."minipass-5.0.0" - (sources."minizlib-2.1.2" // { - dependencies = [ - sources."minipass-3.3.6" - ]; - }) - sources."mkdirp-1.0.4" - sources."ms-2.1.2" - sources."nan-2.18.0" - (sources."node-fetch-2.7.0" // { - dependencies = [ - sources."tr46-0.0.3" - sources."webidl-conversions-3.0.1" - sources."whatwg-url-5.0.0" - ]; - }) - sources."node-gyp-build-4.7.1" - sources."nopt-5.0.0" - sources."npmlog-5.0.1" - sources."nwsapi-2.2.7" - sources."object-assign-4.1.1" - sources."once-1.4.0" - sources."parse5-7.1.2" - sources."path-is-absolute-1.0.1" - sources."psl-1.9.0" - sources."punycode-2.3.1" - sources."querystringify-2.2.0" - sources."readable-stream-3.6.2" - sources."requires-port-1.0.0" - sources."rimraf-3.0.2" - sources."rrweb-cssom-0.6.0" - sources."safe-buffer-5.2.1" - sources."safer-buffer-2.1.2" - sources."saxes-6.0.0" - sources."semver-7.5.4" - sources."set-blocking-2.0.0" - sources."signal-exit-3.0.7" - sources."simple-concat-1.0.1" - sources."simple-get-3.1.1" - sources."source-map-0.6.1" - sources."string-width-4.2.3" - sources."string_decoder-1.3.0" - sources."strip-ansi-6.0.1" - sources."symbol-tree-3.2.4" - sources."tar-6.2.0" - sources."tough-cookie-4.1.3" - sources."tr46-4.1.1" - sources."universalify-0.2.0" - sources."url-parse-1.5.10" - sources."utf-8-validate-6.0.3" - sources."util-deprecate-1.0.2" - sources."w3c-xmlserializer-4.0.0" - sources."webidl-conversions-7.0.0" - sources."whatwg-encoding-2.0.0" - sources."whatwg-mimetype-3.0.0" - sources."whatwg-url-12.0.1" - sources."wide-align-1.1.5" - sources."wrappy-1.0.2" - sources."ws-8.15.1" - sources."xml-name-validator-4.0.0" - sources."xmlchars-2.2.0" - sources."yallist-4.0.0" - ]; - buildInputs = globalBuildInputs; - meta = { - description = "Javascript wrapper around Mozilla Readability for ArchiveBox to call as a oneshot CLI to extract article text"; - homepage = "https://github.com/ArchiveBox/readability-extractor"; - license = "MIT"; - }; - production = true; - bypassCache = true; - reconstructLock = true; - }; remod-cli = nodeEnv.buildNodePackage { name = "remod-cli"; packageName = "remod-cli"; diff --git a/pkgs/development/node-packages/overrides.nix b/pkgs/development/node-packages/overrides.nix index c8b00ed6d6b7..68f95a2f3b02 100644 --- a/pkgs/development/node-packages/overrides.nix +++ b/pkgs/development/node-packages/overrides.nix @@ -250,10 +250,6 @@ final: prev: { }; }); - postlight-parser = prev."@postlight/parser".override { - name = "postlight-parser"; - }; - # To update prisma, please first update prisma-engines to the latest # version. Then change the correct hash to this package. The PR should hold # two commits: one for the engines and the other one for the node package. @@ -293,11 +289,6 @@ final: prev: { ''; }; - readability-extractor = prev.readability-extractor.override { - nativeBuildInputs = [ pkgs.pkg-config ]; - buildInputs = [ pkgs.pango ]; - }; - rush = prev."@microsoft/rush".override { name = "rush"; }; From c3e2e79d6e029b29618a427e42a6b9e6f9850751 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Thu, 28 Dec 2023 04:11:05 -0800 Subject: [PATCH 145/168] ooniprobe-cli: 3.20.0 -> 3.20.1 Diff: https://github.com/ooni/probe-cli/compare/v3.20.0...v3.20.1 Changelog: https://github.com/ooni/probe-cli/releases/tag/v3.20.1 --- pkgs/tools/networking/ooniprobe-cli/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/ooniprobe-cli/default.nix b/pkgs/tools/networking/ooniprobe-cli/default.nix index a3c4c64a1097..c7f00061382d 100644 --- a/pkgs/tools/networking/ooniprobe-cli/default.nix +++ b/pkgs/tools/networking/ooniprobe-cli/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "ooniprobe-cli"; - version = "3.20.0"; + version = "3.20.1"; src = fetchFromGitHub { owner = "ooni"; repo = "probe-cli"; rev = "v${version}"; - hash = "sha256-kOARV3tnRyOAScc3Vn96TFQFgqvTgi6NFHWM7ZbpciU="; + hash = "sha256-XjIrae4HPFB1Rv8yIAUh6Xj9UVU55Wx7SuyKJ0BvmXY="; }; - vendorHash = "sha256-c922VpxtpNfua3Sx3vXKz4x1FsLMwbaSvRH4dyFrr9s="; + vendorHash = "sha256-HYU+oS+iqdl2jQJc3h9T+MSc/Hq2W6UqP+oPSEyfcOU="; subPackages = [ "cmd/ooniprobe" ]; From 1b1aa5c5ec1c43df9379f82b78ec543c75120ffc Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 28 Dec 2023 01:47:38 +0100 Subject: [PATCH 146/168] home-assistant: 2023.12.3 -> 2023.12.4 https://github.com/home-assistant/core/releases/tag/2023.12.4 --- .../home-assistant/component-packages.nix | 3 +- pkgs/servers/home-assistant/default.nix | 64 +++++++++++++++++-- 2 files changed, 62 insertions(+), 5 deletions(-) diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index b33a9ec352d9..6c8157496d45 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -2,7 +2,7 @@ # Do not edit! { - version = "2023.12.3"; + version = "2023.12.4"; components = { "3_day_blinds" = ps: with ps; [ ]; @@ -5603,6 +5603,7 @@ "android_ip_webcam" "androidtv" "androidtv_remote" + "anova" "anthemav" "apache_kafka" "apcupsd" diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index 29427a31c1be..6b492197d7ab 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -30,6 +30,16 @@ let # Override the version of some packages pinned in Home Assistant's setup.py and requirements_all.txt (self: super: { + aioairq = super.aioairq.overridePythonAttrs (oldAttrs: rec { + version = "0.3.1"; + src = fetchFromGitHub { + owner = "CorantGmbH"; + repo = "aioairq"; + rev = "refs/tags/v${version}"; + hash = "sha256-SRsDSHTZkkygaQZjHENKNLx3ZWMi/PubS1m/MonEKNk="; + }; + }); + aioesphomeapi = super.aioesphomeapi.overridePythonAttrs (oldAttrs: rec { version = "19.2.1"; src = fetchFromGitHub { @@ -52,6 +62,16 @@ let doCheck = false; }); + aiohttp-zlib-ng = super.aiohttp-zlib-ng.overridePythonAttrs (oldAttrs: rec { + version = "0.1.1"; + src = fetchFromGitHub { + owner = "bdraco"; + repo = "aiohttp-zlib-ng"; + rev = "refs/tags/v${version}"; + hash = "sha256-dTNwt4eX6ZQ8ySK2/9ziVbc3KFg2aL/EsiBWaJRC4x8="; + }; + }); + aiowatttime = super.aiowatttime.overridePythonAttrs (oldAttrs: rec { version = "0.1.1"; src = fetchFromGitHub { @@ -168,6 +188,32 @@ let doCheck = false; # no tests }); + openai = super.openai.overridePythonAttrs (oldAttrs: rec { + version = "0.28.1"; + src = fetchFromGitHub { + owner = "openai"; + repo = "openai-python"; + rev = "refs/tags/v${version}"; + hash = "sha256-liJyeGxnYIC/jUQKdeATHpVJb/12KGbeM94Y2YQphfY="; + }; + nativeBuildInputs = with self; [ + setuptools + ]; + propagatedBuildInputs = with self; [ + aiohttp + requests + tqdm + ]; + disabledTestPaths = [ + # Requires a real API key + "openai/tests/test_endpoints.py" + "openai/tests/asyncio/test_endpoints.py" + # openai: command not found + "openai/tests/test_file_cli.py" + "openai/tests/test_long_examples_validator.py" + ]; + }); + # Pinned due to API changes in 1.3.0 ovoenergy = super.ovoenergy.overridePythonAttrs (oldAttrs: rec { version = "1.2.0"; @@ -238,6 +284,16 @@ let }; }); + pydrawise = super.pydrawise.overridePythonAttrs (oldAttrs: rec { + version = "2023.11.0"; + src = fetchFromGitHub { + owner = "dknowles2"; + repo = "pydrawise"; + rev = "refs/tags/${version}"; + hash = "sha256-gKOyTvdETGzKlpU67UKaHYTIvnAX9znHIynP3BiVbt4="; + }; + }); + pykaleidescape = super.pykaleidescape.overridePythonAttrs (oldAttrs: rec { version = "1.0.1"; src = fetchFromGitHub { @@ -321,7 +377,7 @@ let extraBuildInputs = extraPackages python.pkgs; # Don't forget to run parse-requirements.py after updating - hassVersion = "2023.12.3"; + hassVersion = "2023.12.4"; in python.pkgs.buildPythonApplication rec { pname = "homeassistant"; @@ -329,7 +385,7 @@ in python.pkgs.buildPythonApplication rec { format = "pyproject"; # check REQUIRED_PYTHON_VER in homeassistant/const.py - disabled = python.pythonOlder "3.10"; + disabled = python.pythonOlder "3.11"; # don't try and fail to strip 6600+ python files, it takes minutes! dontStrip = true; @@ -339,13 +395,13 @@ in python.pkgs.buildPythonApplication rec { owner = "home-assistant"; repo = "core"; rev = "refs/tags/${version}"; - hash = "sha256-pTDYiy9Ux7Rgsf9rXXF3GbaiJkTX5FA/7K2hJtiNOkQ="; + hash = "sha256-XzjsSM0xKxLeuP30u8LReJtmJMbJq+yQ2Pp5xWmNLFw="; }; # Secondary source is pypi sdist for translations sdist = fetchPypi { inherit pname version; - hash = "sha256-cvsYkuQG4i3GG8VGJ+HGSjdvpSBLzh0BFYQQpoVq4FY="; + hash = "sha256-dea0PacCzCWhMh2gw/kVJHwYCoT7zJ52qTQbHmqcwU8="; }; nativeBuildInputs = with python.pkgs; [ From 84f73ec7b56510d2ff429ab17ca77225537331b5 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 28 Dec 2023 02:11:12 +0100 Subject: [PATCH 147/168] python311Packages.homeassistant-stubs: 2023.12.3 -> 2023.12.4 https://github.com/KapJI/homeassistant-stubs/releases/tag/2023.12.4 --- pkgs/servers/home-assistant/stubs.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/home-assistant/stubs.nix b/pkgs/servers/home-assistant/stubs.nix index e31c587258b7..0bdac4977ab4 100644 --- a/pkgs/servers/home-assistant/stubs.nix +++ b/pkgs/servers/home-assistant/stubs.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "homeassistant-stubs"; - version = "2023.12.3"; + version = "2023.12.4"; format = "pyproject"; disabled = python.version != home-assistant.python.version; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "KapJI"; repo = "homeassistant-stubs"; rev = "refs/tags/${version}"; - hash = "sha256-PQZsesdGqeZgQUgO7DkKDcBrWRM/CY8giPx8cK3531s="; + hash = "sha256-a27PeLEArT87+DOrKZ5rLM5o2T3swzLwY+mBhOtd9dQ="; }; nativeBuildInputs = [ From 16d613b330198adb50909157eb6fa07d27c3fbb5 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 28 Dec 2023 13:48:28 +0000 Subject: [PATCH 148/168] pict-rs: 0.4.6 -> 0.4.7 --- pkgs/servers/web-apps/pict-rs/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/web-apps/pict-rs/default.nix b/pkgs/servers/web-apps/pict-rs/default.nix index 0b87441ca208..f659802dd88f 100644 --- a/pkgs/servers/web-apps/pict-rs/default.nix +++ b/pkgs/servers/web-apps/pict-rs/default.nix @@ -13,17 +13,17 @@ rustPlatform.buildRustPackage rec { pname = "pict-rs"; - version = "0.4.6"; + version = "0.4.7"; src = fetchFromGitea { domain = "git.asonix.dog"; owner = "asonix"; repo = pname; rev = "v${version}"; - sha256 = "sha256-nFfGyOxzJZ2U/1FpY64BorRd5yncipsaBbr/TsYnmjM="; + sha256 = "sha256-s870SjFFjjugqNDEAPMvwZ8Q1QT+9RKwujs4zDPVYGc="; }; - cargoHash = "sha256-11TyKs+JQiKBzFzGJe5sOllbPVEhchZrsryZp6L2JFo="; + cargoHash = "sha256-lLE8N3IuSEoohjtENNc0ixMq80cWIsy6Vd8/sEiwQFw="; # needed for internal protobuf c wrapper library PROTOC = "${protobuf}/bin/protoc"; From 85fa37afc234de26d57926963d641bd42c7ccb2b Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Thu, 21 Dec 2023 15:43:49 +0100 Subject: [PATCH 149/168] lighttpd.meta.mainProgram: init --- pkgs/servers/http/lighttpd/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/servers/http/lighttpd/default.nix b/pkgs/servers/http/lighttpd/default.nix index 7a5d6f5e556d..7f457108f8e6 100644 --- a/pkgs/servers/http/lighttpd/default.nix +++ b/pkgs/servers/http/lighttpd/default.nix @@ -77,5 +77,6 @@ stdenv.mkDerivation rec { license = lib.licenses.bsd3; platforms = platforms.linux ++ platforms.darwin; maintainers = with maintainers; [ bjornfor brecht ]; + mainProgram = "lighttpd"; }; } From e9dbcaa4029af7bce4bc6f29fd7dfa8f95ea5a9a Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Thu, 21 Dec 2023 15:53:34 +0100 Subject: [PATCH 150/168] skalibs: 2.14.0.1 -> 2.14.1.0 --- pkgs/development/skaware-packages/skalibs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/skaware-packages/skalibs/default.nix b/pkgs/development/skaware-packages/skalibs/default.nix index a9af0cac6562..7dc87458b620 100644 --- a/pkgs/development/skaware-packages/skalibs/default.nix +++ b/pkgs/development/skaware-packages/skalibs/default.nix @@ -8,8 +8,8 @@ with skawarePackages; buildPackage { pname = "skalibs"; - version = "2.14.0.1"; - sha256 = "tD69s2+KjfQPGgjBOwg5O85J+vM05ioNuRmzrkr9FIg="; + version = "2.14.1.0"; + sha256 = "24YTUWEngQ2N/thutCRaX/JCBPHhb6KOiqrTRtlqrug="; description = "A set of general-purpose C programming libraries"; From b2e3c3c5509752948f9ccf77b574870927061d77 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Thu, 21 Dec 2023 15:53:49 +0100 Subject: [PATCH 151/168] s6: 2.12.0.2 -> 2.12.0.3 --- pkgs/development/skaware-packages/s6/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/skaware-packages/s6/default.nix b/pkgs/development/skaware-packages/s6/default.nix index e879bf6204d6..f16e3dacc10a 100644 --- a/pkgs/development/skaware-packages/s6/default.nix +++ b/pkgs/development/skaware-packages/s6/default.nix @@ -4,8 +4,8 @@ with skawarePackages; buildPackage { pname = "s6"; - version = "2.12.0.2"; - sha256 = "qpF+/+Eq6XN5CQ91/aSfDV8PZ81lVDaEz/BtyIFyj4w="; + version = "2.12.0.3"; + sha256 = "gA0xIm9sJc3T7AtlJA+AtWzl7BNzQdCo0VTndjjlgQM="; description = "skarnet.org's small & secure supervision software suite"; From 626df9ec03343ee7b6aedd06315d080bd2787bae Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Thu, 21 Dec 2023 15:54:02 +0100 Subject: [PATCH 152/168] s6-networking: 2.7.0.0 -> 2.7.0.1 --- pkgs/development/skaware-packages/s6-networking/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/skaware-packages/s6-networking/default.nix b/pkgs/development/skaware-packages/s6-networking/default.nix index 8c3e753fc2aa..6e3722ef5772 100644 --- a/pkgs/development/skaware-packages/s6-networking/default.nix +++ b/pkgs/development/skaware-packages/s6-networking/default.nix @@ -19,8 +19,8 @@ assert sslSupportEnabled -> sslLibs ? ${sslSupport}; buildPackage { pname = "s6-networking"; - version = "2.7.0.0"; - sha256 = "mf1uP5PW1qlb9+l4lVt9BTYpWReUsGjtogBKuLSQVVI="; + version = "2.7.0.1"; + sha256 = "36SWTU8b2umrX8RQh2n9b+/DOlJ9UVOjd3xrBG7upWQ="; description = "A suite of small networking utilities for Unix systems"; From 09bb287faabe4cd6ec2a0c377880a5a511a16ca0 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Thu, 21 Dec 2023 15:54:15 +0100 Subject: [PATCH 153/168] s6-dns: 2.3.7.0 -> 2.3.7.1 --- pkgs/development/skaware-packages/s6-dns/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/development/skaware-packages/s6-dns/default.nix b/pkgs/development/skaware-packages/s6-dns/default.nix index b75a03b65a78..b4229d2c216f 100644 --- a/pkgs/development/skaware-packages/s6-dns/default.nix +++ b/pkgs/development/skaware-packages/s6-dns/default.nix @@ -4,8 +4,8 @@ with skawarePackages; buildPackage { pname = "s6-dns"; - version = "2.3.7.0"; - sha256 = "rusndssjTpA5enjGqjclkkqgcQwQNcpw3VYouExnAdE="; + version = "2.3.7.1"; + sha256 = "zwJYV07H1itlTgwq14r0x9Z6xMnLN/eBSA9ZflSzD20="; description = "A suite of DNS client programs and libraries for Unix systems"; @@ -28,7 +28,6 @@ buildPackage { rm $(find -type f -mindepth 1 -maxdepth 1 -executable) rm libs6dns.* rm libskadns.* - rm libdcache.* mv doc $doc/share/doc/s6-dns/html ''; From 5751106b6059fb6ebd34a5bf82f3e42ee2a8cae2 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Thu, 21 Dec 2023 15:54:26 +0100 Subject: [PATCH 154/168] tipidee: 0.0.2.0 -> 0.0.3.0 --- pkgs/development/skaware-packages/tipidee/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/skaware-packages/tipidee/default.nix b/pkgs/development/skaware-packages/tipidee/default.nix index 85a8440ef1ed..942d37e525f9 100644 --- a/pkgs/development/skaware-packages/tipidee/default.nix +++ b/pkgs/development/skaware-packages/tipidee/default.nix @@ -4,8 +4,8 @@ with skawarePackages; buildPackage { pname = "tipidee"; - version = "0.0.2.0"; - sha256 = "5I+/gfvN8s4bf6Oi+5kzRndWeLV7movyRfznz0kNMoY="; + version = "0.0.3.0"; + sha256 = "0dk6k86UKgJ2ioX5H2Xoga9S+SwMy9NFrK2KEKoNxCA="; description = "A HTTP 1.1 webserver, serving static files and CGI/NPH"; From 88f719acbf6b09779722470de8f5d64264c0cc9a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Thu, 28 Dec 2023 06:23:06 -0800 Subject: [PATCH 155/168] unpaper: add meta.changelog --- pkgs/tools/graphics/unpaper/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/tools/graphics/unpaper/default.nix b/pkgs/tools/graphics/unpaper/default.nix index b4f298fadce2..c59353af5a11 100644 --- a/pkgs/tools/graphics/unpaper/default.nix +++ b/pkgs/tools/graphics/unpaper/default.nix @@ -50,6 +50,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://www.flameeyes.eu/projects/unpaper"; + changelog = "https://github.com/unpaper/unpaper/blob/unpaper-${version}/NEWS"; description = "Post-processing tool for scanned sheets of paper"; license = licenses.gpl2; platforms = platforms.all; From 685b4096784ca72199627bd2b51d5756c23b44d4 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 28 Dec 2023 15:48:53 +0100 Subject: [PATCH 156/168] python311Packages.aioairzone-cloud: 0.3.6 -> 0.3.7 Diff: https://github.com/Noltari/aioairzone-cloud/compare/refs/tags/0.3.6...0.3.7 Changelog: https://github.com/Noltari/aioairzone-cloud/releases/tag/0.3.7 --- pkgs/development/python-modules/aioairzone-cloud/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aioairzone-cloud/default.nix b/pkgs/development/python-modules/aioairzone-cloud/default.nix index c494b81b6335..836e344e3b88 100644 --- a/pkgs/development/python-modules/aioairzone-cloud/default.nix +++ b/pkgs/development/python-modules/aioairzone-cloud/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "aioairzone-cloud"; - version = "0.3.6"; + version = "0.3.7"; pyproject = true; disabled = pythonOlder "3.7"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "Noltari"; repo = "aioairzone-cloud"; rev = "refs/tags/${version}"; - hash = "sha256-K2/q4JQV6GkNXJ6pKDPfhwKvftdezMp5VdOa5iabmvk="; + hash = "sha256-7QFtWAgLnVX9bS4u/2mV0pga/72G237AWxga6V3vLXY="; }; nativeBuildInputs = [ From cfaa99f6261d72fe31735d2c7837e186be3159d9 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 28 Dec 2023 14:49:24 +0000 Subject: [PATCH 157/168] pluto: 5.19.0 -> 5.19.1 --- pkgs/applications/networking/cluster/pluto/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/pluto/default.nix b/pkgs/applications/networking/cluster/pluto/default.nix index 0db5126717e2..4223c0854f55 100644 --- a/pkgs/applications/networking/cluster/pluto/default.nix +++ b/pkgs/applications/networking/cluster/pluto/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "pluto"; - version = "5.19.0"; + version = "5.19.1"; src = fetchFromGitHub { owner = "FairwindsOps"; repo = "pluto"; rev = "v${version}"; - hash = "sha256-sudq7HILNZSGTwQgggSovrXAaY7VSTw6IJn+mIYwjv8="; + hash = "sha256-6TOHDjR5sFaIeR6Zuf4azQAIgUyev7vdlAKB7YNk8R0="; }; vendorHash = "sha256-8ZOYp/vM16PugmE+3QK7ZRDwIwRCMEwD0NRyiOBlh14="; From 978c5302b24c11e5f1b5e593bcc13fb7dd15783d Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 28 Dec 2023 16:31:55 +0100 Subject: [PATCH 158/168] checkov: 3.1.44 -> 3.1.46 Diff: https://github.com/bridgecrewio/checkov/compare/refs/tags/3.1.44...3.1.46 Changelog: https://github.com/bridgecrewio/checkov/releases/tag/3.1.46 --- pkgs/development/tools/analysis/checkov/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/analysis/checkov/default.nix b/pkgs/development/tools/analysis/checkov/default.nix index 5cc364c93eb4..650f58463823 100644 --- a/pkgs/development/tools/analysis/checkov/default.nix +++ b/pkgs/development/tools/analysis/checkov/default.nix @@ -5,14 +5,14 @@ python3.pkgs.buildPythonApplication rec { pname = "checkov"; - version = "3.1.44"; + version = "3.1.46"; pyproject = true; src = fetchFromGitHub { owner = "bridgecrewio"; repo = "checkov"; rev = "refs/tags/${version}"; - hash = "sha256-dh52+MSaF3f0XWYQLeIzWrn29YUduplhXj2z+4yAOr4="; + hash = "sha256-scGZtqAdAjRD0bNq9pWp699I9rxPh2CFP4lCz+1yAZ8="; }; patches = [ From 4096c9043f69d4b56876e2e31baf4b9b462da9ba Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 28 Dec 2023 15:43:49 +0000 Subject: [PATCH 159/168] nfpm: 2.35.0 -> 2.35.1 --- pkgs/tools/package-management/nfpm/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/package-management/nfpm/default.nix b/pkgs/tools/package-management/nfpm/default.nix index 1ad4b0e97873..0f4782af6689 100644 --- a/pkgs/tools/package-management/nfpm/default.nix +++ b/pkgs/tools/package-management/nfpm/default.nix @@ -8,13 +8,13 @@ buildGoModule rec { pname = "nfpm"; - version = "2.35.0"; + version = "2.35.1"; src = fetchFromGitHub { owner = "goreleaser"; repo = pname; rev = "v${version}"; - hash = "sha256-WYLXhRoB8+a5zhTs1qxJVrDjor5orCw6UJrqEt+fBBQ="; + hash = "sha256-ew0iXtOKQIYxpyeNFBHD2F7KflTEQ7qHQMHYaL35Rvw="; }; vendorHash = "sha256-P9jSQG6EyVGMZKtThy8Q7Y/pV7mbMl2eGrylea0VHRc="; From 2e79ed82ce71c14db7512f6a72c44443f3d2cabd Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 28 Dec 2023 15:58:45 +0000 Subject: [PATCH 160/168] podman-tui: 0.14.0 -> 0.15.0 --- pkgs/applications/virtualization/podman-tui/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/virtualization/podman-tui/default.nix b/pkgs/applications/virtualization/podman-tui/default.nix index 1c2422b25297..cc91256e4371 100644 --- a/pkgs/applications/virtualization/podman-tui/default.nix +++ b/pkgs/applications/virtualization/podman-tui/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "podman-tui"; - version = "0.14.0"; + version = "0.15.0"; src = fetchFromGitHub { owner = "containers"; repo = "podman-tui"; rev = "v${version}"; - hash = "sha256-RSQcpodippp4B4FM0yr+YFseoofas1M6xBqqtFD1BB0="; + hash = "sha256-DXodgpa/oWDBlJYTXcJb8cBkG1DCjFv8vKEzLhu0pN4="; }; vendorHash = null; From 8cdabf9cf8ce16babb2342e39bd44e85fc3d8f28 Mon Sep 17 00:00:00 2001 From: Luflosi Date: Thu, 28 Dec 2023 17:38:33 +0100 Subject: [PATCH 161/168] nixos/sysctl: cleanup - Use `options = {` instead of repeating `options` for every option - Change the description of "net.core.rmem_max" slightly to match the kernel documentation --- nixos/modules/config/sysctl.nix | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/nixos/modules/config/sysctl.nix b/nixos/modules/config/sysctl.nix index b779f12aca30..bedba984a3c2 100644 --- a/nixos/modules/config/sysctl.nix +++ b/nixos/modules/config/sysctl.nix @@ -31,16 +31,18 @@ in }; in types.submodule { freeformType = types.attrsOf sysctlOption; - options."net.core.rmem_max" = mkOption { - type = types.nullOr highestValueType; - default = null; - description = lib.mdDoc "The maximum socket receive buffer size. In case of conflicting values, the highest will be used."; - }; + options = { + "net.core.rmem_max" = mkOption { + type = types.nullOr highestValueType; + default = null; + description = lib.mdDoc "The maximum receive socket buffer size in bytes. In case of conflicting values, the highest will be used."; + }; - options."net.core.wmem_max" = mkOption { - type = types.nullOr highestValueType; - default = null; - description = lib.mdDoc "The maximum socket send buffer size. In case of conflicting values, the highest will be used."; + "net.core.wmem_max" = mkOption { + type = types.nullOr highestValueType; + default = null; + description = lib.mdDoc "The maximum send socket buffer size in bytes. In case of conflicting values, the highest will be used."; + }; }; }; default = {}; From f88af99311e688f02fbffe29df3a608a0b14756e Mon Sep 17 00:00:00 2001 From: Luflosi Date: Mon, 4 Dec 2023 22:07:46 +0100 Subject: [PATCH 162/168] nixos/aerospike: use NixOS option instead of custom script Since 2c5abd89c7e917acde9077fc4d12596e35b73e17 setting the option `boot.kernel.sysctl."net.core.rmem_max"` no longer has any downsides compared to what was previously used. Since 439350753ed2e27b0aa4fa1cfdf3ea80ea344644 the same is also true for `boot.kernel.sysctl."net.core.wmem_max"`. --- nixos/modules/services/databases/aerospike.nix | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/nixos/modules/services/databases/aerospike.nix b/nixos/modules/services/databases/aerospike.nix index 373c8f4bffb0..4923c0f00ddb 100644 --- a/nixos/modules/services/databases/aerospike.nix +++ b/nixos/modules/services/databases/aerospike.nix @@ -108,6 +108,11 @@ in }; users.groups.aerospike.gid = config.ids.gids.aerospike; + boot.kernel.sysctl = { + "net.core.rmem_max" = mkDefault 15728640; + "net.core.wmem_max" = mkDefault 5242880; + }; + systemd.services.aerospike = rec { description = "Aerospike server"; @@ -131,14 +136,6 @@ in echo "kernel.shmmax too low, setting to 1GB" ${pkgs.procps}/bin/sysctl -w kernel.shmmax=1073741824 fi - if [ $(echo "$(cat /proc/sys/net/core/rmem_max) < 15728640" | ${pkgs.bc}/bin/bc) == "1" ]; then - echo "increasing socket buffer limit (/proc/sys/net/core/rmem_max): $(cat /proc/sys/net/core/rmem_max) -> 15728640" - echo 15728640 > /proc/sys/net/core/rmem_max - fi - if [ $(echo "$(cat /proc/sys/net/core/wmem_max) < 5242880" | ${pkgs.bc}/bin/bc) == "1" ]; then - echo "increasing socket buffer limit (/proc/sys/net/core/wmem_max): $(cat /proc/sys/net/core/wmem_max) -> 5242880" - echo 5242880 > /proc/sys/net/core/wmem_max - fi install -d -m0700 -o ${serviceConfig.User} -g ${serviceConfig.Group} "${cfg.workDir}" install -d -m0700 -o ${serviceConfig.User} -g ${serviceConfig.Group} "${cfg.workDir}/smd" install -d -m0700 -o ${serviceConfig.User} -g ${serviceConfig.Group} "${cfg.workDir}/udf" From d578efaf68775aa11577d0952f64a771c1fdde96 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 27 Dec 2023 00:19:01 +0000 Subject: [PATCH 163/168] aiac: 2.5.0 -> 4.0.0 --- pkgs/applications/networking/cluster/aiac/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/networking/cluster/aiac/default.nix b/pkgs/applications/networking/cluster/aiac/default.nix index 92f04fa88815..8b9b3fcc8b7a 100644 --- a/pkgs/applications/networking/cluster/aiac/default.nix +++ b/pkgs/applications/networking/cluster/aiac/default.nix @@ -2,18 +2,18 @@ buildGoModule rec { pname = "aiac"; - version = "2.5.0"; + version = "4.0.0"; excludedPackages = [".ci"]; src = fetchFromGitHub { owner = "gofireflyio"; repo = pname; rev = "v${version}"; - hash = "sha256-BCcoMftnvfAqmabnSz/oRAlJg95KJ236mduxV2DfRG4="; + hash = "sha256-OXqHZlVo1rFt/hJbc14faXTbckLx9CvsL131qj6G1dw="; }; - vendorHash = "sha256-Uqr9wH7hCLdZEu6DXddgB7NuLtqcjUbOPJ2YX+9ehKM="; - ldflags = [ "-s" "-w" "-X github.com/gofireflyio/aiac/v3/libaiac.Version=v${version}" ]; + vendorHash = "sha256-JWQQUB4/yIDGzWeshtcWnkXQS7jYcDHwG/tef6sBizQ="; + ldflags = [ "-s" "-w" "-X github.com/gofireflyio/aiac/v4/libaiac.Version=v${version}" ]; meta = with lib; { description = ''Artificial Intelligence Infrastructure-as-Code Generator.''; From 9d0caade842caea4217b3804eea85dee3a681fc8 Mon Sep 17 00:00:00 2001 From: Adam Stephens Date: Thu, 28 Dec 2023 13:53:00 -0500 Subject: [PATCH 164/168] terraform-providers.incus: init at 0.0.2 --- .../cluster/terraform-providers/providers.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 70d87e6203a6..d2eea88e1f21 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -609,6 +609,15 @@ "spdx": "MPL-2.0", "vendorHash": null }, + "incus": { + "hash": "sha256-FWQaU2C1cRo+3SqnesJl5EXfEYR/ssSHHZ9/09zRSTQ=", + "homepage": "https://registry.terraform.io/providers/lxc/incus", + "owner": "lxc", + "repo": "terraform-provider-incus", + "rev": "v0.0.2", + "spdx": "MPL-2.0", + "vendorHash": "sha256-KdyhF1RUZoycsNqRnkME9Q7bTkV2xuNERx24+/p+j1w=" + }, "infoblox": { "hash": "sha256-rjqtqfmQQoJIhMtP6sFOu/XfJ691E77P0Bf9gjml2yg=", "homepage": "https://registry.terraform.io/providers/infobloxopen/infoblox", From d57d1d61b6de6eeced2db3eb5f70097a59adfad2 Mon Sep 17 00:00:00 2001 From: Pavel Sobolev Date: Sat, 23 Dec 2023 12:33:25 +0300 Subject: [PATCH 165/168] cppcheck: 2.12.1 -> 2.13.0 --- pkgs/development/tools/analysis/cppcheck/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/analysis/cppcheck/default.nix b/pkgs/development/tools/analysis/cppcheck/default.nix index 5dc77fff1634..1a7a1c0f4c95 100644 --- a/pkgs/development/tools/analysis/cppcheck/default.nix +++ b/pkgs/development/tools/analysis/cppcheck/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "cppcheck"; - version = "2.12.1"; + version = "2.13.0"; outputs = [ "out" "man" ]; @@ -22,7 +22,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "danmar"; repo = "cppcheck"; rev = finalAttrs.version; - hash = "sha256-I1z4OZaWUD1sqPf7Z0ISoRl5mrGTFq0l5u2ct29fOmQ="; + hash = "sha256-+z8mMwI4hHpE3enIriTsxZEocqifppYgjZz3UPGswIo="; }; nativeBuildInputs = [ From 3f8b1d2d26364f9f627055387804900f3f1e0624 Mon Sep 17 00:00:00 2001 From: Adam Stephens Date: Wed, 27 Dec 2023 22:47:02 -0500 Subject: [PATCH 166/168] nixos/lxd-agent: add system path for exec --- nixos/modules/virtualisation/lxd-agent.nix | 8 +++++++- nixos/tests/incus/virtual-machine.nix | 3 +++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/nixos/modules/virtualisation/lxd-agent.nix b/nixos/modules/virtualisation/lxd-agent.nix index 5386cc5c439a..41d08b515648 100644 --- a/nixos/modules/virtualisation/lxd-agent.nix +++ b/nixos/modules/virtualisation/lxd-agent.nix @@ -60,7 +60,13 @@ in { wantedBy = [ "multi-user.target" ]; before = [ "shutdown.target" ]; conflicts = [ "shutdown.target" ]; - path = [ pkgs.kmod pkgs.util-linux ]; + path = [ + pkgs.kmod + pkgs.util-linux + + # allow `incus exec` to find system binaries + "/run/current-system/sw" + ]; preStart = preStartScript; diff --git a/nixos/tests/incus/virtual-machine.nix b/nixos/tests/incus/virtual-machine.nix index be5746ef63e2..343a25ca7297 100644 --- a/nixos/tests/incus/virtual-machine.nix +++ b/nixos/tests/incus/virtual-machine.nix @@ -53,5 +53,8 @@ in with subtest("lxd-agent is started"): machine.succeed("incus exec ${instance-name} systemctl is-active lxd-agent") + + with subtest("lxd-agent has a valid path"): + machine.succeed("incus exec ${instance-name} -- bash -c 'true'") ''; }) From b908e175181a6d7df32cfa8d426fdffc5f7348fd Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Thu, 28 Dec 2023 17:11:45 +0100 Subject: [PATCH 167/168] maintainers/teams: remove primeos from the llvm team This is actually long overdue... :o I only maintained LLVM for a while because it became necessary to add new versions more quickly for updating Chromium. LLVM was pretty unmaintained at that time and I'm super glad that it's in very good hands now (thanks y'all!) :) --- maintainers/team-list.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/maintainers/team-list.nix b/maintainers/team-list.nix index 6bf83c6907d0..35aba906cffe 100644 --- a/maintainers/team-list.nix +++ b/maintainers/team-list.nix @@ -524,7 +524,6 @@ with lib.maintainers; { dtzWill ericson2314 lovek323 - primeos qyliss raitobezarius rrbutani From fb8c363b6ac8d4bc2dee0e65b6b9d0cc657bd6f6 Mon Sep 17 00:00:00 2001 From: netali Date: Thu, 28 Dec 2023 21:54:36 +0100 Subject: [PATCH 168/168] doc: fix python-updates branch name The python-updates branch was formerly called python-unstable, but the new branch name was never mentioned in the docs. This commit changes the branch name in the docs to python-updates. --- doc/languages-frameworks/python.section.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/languages-frameworks/python.section.md b/doc/languages-frameworks/python.section.md index 19d4496eef51..c921756bc511 100644 --- a/doc/languages-frameworks/python.section.md +++ b/doc/languages-frameworks/python.section.md @@ -2061,7 +2061,7 @@ and create update commits, and supports the `fetchPypi`, `fetchurl` and hosted on GitHub, exporting a `GITHUB_API_TOKEN` is highly recommended. Updating packages in bulk leads to lots of breakages, which is why a -stabilization period on the `python-unstable` branch is required. +stabilization period on the `python-updates` branch is required. If a package is fragile and often breaks during these bulks updates, it may be reasonable to set `passthru.skipBulkUpdate = true` in the