diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 1ebcd16a4c0e9..2f9d4e57eb1e3 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -5448,6 +5448,12 @@ githubId = 62989; name = "Demyan Rogozhin"; }; + Denommus = { + email = "yuridenommus@gmail.com"; + github = "Denommus"; + githubId = 721022; + name = "Yuri da Costa Albuquerque"; + }; denperidge = { email = "contact@denperidge.com"; github = "Denperidge"; @@ -6991,6 +6997,12 @@ githubId = 57543709; name = "Chris O'Brien"; }; + euxane = { + name = "euxane"; + email = "r9uhdi.nixpkgs@euxane.net"; + github = "pacien"; + githubId = 1449319; + }; evalexpr = { name = "Jonathan Wilkins"; email = "nixos@wilkins.tech"; @@ -13665,7 +13677,7 @@ }; Makuru = { email = "makuru@makuru.org"; - github = "makuru-dd"; + github = "makuru-org"; githubId = 58048293; name = "Makuru"; keys = [ { fingerprint = "5B22 7123 362F DEF1 8F79 BF2B 4792 3A0F EEB5 51C7"; } ]; @@ -17031,12 +17043,6 @@ githubId = 17091659; name = "Pablo Andres Dealbera"; }; - pacien = { - email = "b4gx3q.nixpkgs@pacien.net"; - github = "pacien"; - githubId = 1449319; - name = "Pacien Tran-Girard"; - }; pacman99 = { email = "pachum99@gmail.com"; matrix = "@pachumicchu:myrdd.info"; diff --git a/nixos/modules/programs/msmtp.nix b/nixos/modules/programs/msmtp.nix index b68f1cbeb9cca..7a1941e0f9492 100644 --- a/nixos/modules/programs/msmtp.nix +++ b/nixos/modules/programs/msmtp.nix @@ -10,7 +10,7 @@ let in { - meta.maintainers = with lib.maintainers; [ pacien ]; + meta.maintainers = with lib.maintainers; [ euxane ]; options = { programs.msmtp = { diff --git a/nixos/modules/services/backup/postgresql-wal-receiver.nix b/nixos/modules/services/backup/postgresql-wal-receiver.nix index 361f572d61d6d..3e021d99bd249 100644 --- a/nixos/modules/services/backup/postgresql-wal-receiver.nix +++ b/nixos/modules/services/backup/postgresql-wal-receiver.nix @@ -210,5 +210,5 @@ in ) receivers; }; - meta.maintainers = with lib.maintainers; [ pacien ]; + meta.maintainers = with lib.maintainers; [ euxane ]; } diff --git a/nixos/modules/services/mail/stalwart-mail.nix b/nixos/modules/services/mail/stalwart-mail.nix index 46c4bd7bf6824..dca87e7dc2622 100644 --- a/nixos/modules/services/mail/stalwart-mail.nix +++ b/nixos/modules/services/mail/stalwart-mail.nix @@ -198,7 +198,7 @@ in meta = { maintainers = with lib.maintainers; [ happysalada - pacien + euxane onny ]; }; diff --git a/nixos/modules/services/matrix/appservice-discord.nix b/nixos/modules/services/matrix/appservice-discord.nix index 5e7930a73c4c0..cf3c8ea20eae9 100644 --- a/nixos/modules/services/matrix/appservice-discord.nix +++ b/nixos/modules/services/matrix/appservice-discord.nix @@ -159,5 +159,5 @@ in }; }; - meta.maintainers = with lib.maintainers; [ pacien ]; + meta.maintainers = with lib.maintainers; [ euxane ]; } diff --git a/nixos/modules/services/matrix/mautrix-telegram.nix b/nixos/modules/services/matrix/mautrix-telegram.nix index 0dd0636bf6f01..a489c9c72485b 100644 --- a/nixos/modules/services/matrix/mautrix-telegram.nix +++ b/nixos/modules/services/matrix/mautrix-telegram.nix @@ -200,7 +200,7 @@ in }; meta.maintainers = with lib.maintainers; [ - pacien + euxane vskilet ]; } diff --git a/nixos/modules/services/misc/rmfakecloud.nix b/nixos/modules/services/misc/rmfakecloud.nix index b1f81c10b9a46..ec3ecc612fec9 100644 --- a/nixos/modules/services/misc/rmfakecloud.nix +++ b/nixos/modules/services/misc/rmfakecloud.nix @@ -145,5 +145,5 @@ in }; }; - meta.maintainers = with lib.maintainers; [ pacien ]; + meta.maintainers = with lib.maintainers; [ euxane ]; } diff --git a/nixos/tests/postgresql/postgresql-wal-receiver.nix b/nixos/tests/postgresql/postgresql-wal-receiver.nix index 579a56153386e..eb7671430c989 100644 --- a/nixos/tests/postgresql/postgresql-wal-receiver.nix +++ b/nixos/tests/postgresql/postgresql-wal-receiver.nix @@ -19,7 +19,7 @@ let in makeTest { name = "postgresql-wal-receiver-${package.name}"; - meta.maintainers = with lib.maintainers; [ pacien ]; + meta.maintainers = with lib.maintainers; [ euxane ]; nodes.machine = { ... }: diff --git a/nixos/tests/restic.nix b/nixos/tests/restic.nix index 49631d27ca801..72ce2ed58c125 100644 --- a/nixos/tests/restic.nix +++ b/nixos/tests/restic.nix @@ -132,8 +132,15 @@ import ./make-test-python.nix ( "cp -rT ${testDir} /opt", "touch /opt/excluded_file_1 /opt/excluded_file_2", "mkdir -p /root/restic-rclone-backup", - "restic-remote-noinit-backup init", + ) + + server.fail( + # test that noinit backup in fact does not initialize the repository + # and thus fails without a pre-initialized repository + "systemctl start restic-backups-remote-noinit-backup.service", + ) + server.succeed( # test that remotebackup runs custom commands and produces a snapshot "timedatectl set-time '2016-12-13 13:45'", "systemctl start restic-backups-remotebackup.service", @@ -152,7 +159,8 @@ import ./make-test-python.nix ( "restic-remote-from-file-backup restore latest -t /tmp/restore-2", "diff -ru ${testDir} /tmp/restore-2/opt", - # test that remote-noinit-backup produces a snapshot + # test that remote-noinit-backup produces a snapshot once initialized + "restic-remote-noinit-backup init", "systemctl start restic-backups-remote-noinit-backup.service", 'restic-remote-noinit-backup snapshots --json | ${pkgs.jq}/bin/jq "length | . == 1"', diff --git a/nixos/tests/stalwart-mail.nix b/nixos/tests/stalwart-mail.nix index fb5b9f7fc593e..38b47cb88f902 100644 --- a/nixos/tests/stalwart-mail.nix +++ b/nixos/tests/stalwart-mail.nix @@ -123,7 +123,7 @@ import ./make-test-python.nix ( meta = { maintainers = with lib.maintainers; [ happysalada - pacien + euxane onny ]; }; diff --git a/pkgs/applications/editors/vim/plugins/avante-nvim/default.nix b/pkgs/applications/editors/vim/plugins/avante-nvim/default.nix index d9280f5056b58..9d8a386e7826e 100644 --- a/pkgs/applications/editors/vim/plugins/avante-nvim/default.nix +++ b/pkgs/applications/editors/vim/plugins/avante-nvim/default.nix @@ -10,18 +10,18 @@ vimUtils, }: let - version = "0.0.13"; + version = "0.0.14"; src = fetchFromGitHub { owner = "yetone"; repo = "avante.nvim"; tag = "v${version}"; - hash = "sha256-JTuVq5fil2bpkptpw+kj0PFOp9Rk7RpOxc0GN/blL6M="; + hash = "sha256-0dkPejvupXhVZY/5qT45f4LZ4MIVcz8uZam+9TmB+Yo="; }; avante-nvim-lib = rustPlatform.buildRustPackage { pname = "avante-nvim-lib"; inherit version src; - cargoHash = "sha256-mCQm+ZBH5KehCbpKZ2zFl34sJh4yfKmA8GMcteK5SrA="; + cargoHash = "sha256-80++U7CIu6QtH1jQCHCEpv2tnYOuoWSczZIUmKyrqJE="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/applications/editors/vim/plugins/blink-cmp/default.nix b/pkgs/applications/editors/vim/plugins/blink-cmp/default.nix index aa53842b2c0c1..ec4281792607c 100644 --- a/pkgs/applications/editors/vim/plugins/blink-cmp/default.nix +++ b/pkgs/applications/editors/vim/plugins/blink-cmp/default.nix @@ -7,12 +7,12 @@ nix-update-script, }: let - version = "0.7.6"; + version = "0.8.0"; src = fetchFromGitHub { owner = "Saghen"; repo = "blink.cmp"; - rev = "refs/tags/v${version}"; - hash = "sha256-fzAqUqMx4zqN9dtTYRAibhWd5CKh2pvai9g7E/xxnE8="; + tag = "v${version}"; + hash = "sha256-YUADpn3kImYqlc96R3qMKC2V+ZD3+Na0WDP63dxKKbU="; }; libExt = if stdenv.hostPlatform.isDarwin then "dylib" else "so"; blink-fuzzy-lib = rustPlatform.buildRustPackage { diff --git a/pkgs/applications/office/beamerpresenter/default.nix b/pkgs/applications/office/beamerpresenter/default.nix index 7be305ba0249c..5bfb8a260b0b6 100644 --- a/pkgs/applications/office/beamerpresenter/default.nix +++ b/pkgs/applications/office/beamerpresenter/default.nix @@ -98,7 +98,7 @@ stdenv.mkDerivation rec { ]; platforms = platforms.all; maintainers = with maintainers; [ - pacien + euxane dotlambda ]; mainProgram = "beamerpresenter"; diff --git a/pkgs/applications/version-management/mercurial/default.nix b/pkgs/applications/version-management/mercurial/default.nix index 15b71c98c8133..aed17b3461e28 100644 --- a/pkgs/applications/version-management/mercurial/default.nix +++ b/pkgs/applications/version-management/mercurial/default.nix @@ -123,7 +123,7 @@ let license = licenses.gpl2Plus; maintainers = with maintainers; [ lukegb - pacien + euxane techknowlogick ]; platforms = platforms.unix; diff --git a/pkgs/applications/video/mpv/scripts/sponsorblock.nix b/pkgs/applications/video/mpv/scripts/sponsorblock.nix index 094aec727552b..0a9dadfaa7c61 100644 --- a/pkgs/applications/video/mpv/scripts/sponsorblock.nix +++ b/pkgs/applications/video/mpv/scripts/sponsorblock.nix @@ -47,6 +47,6 @@ buildLua { description = "Script for mpv to skip sponsored segments of YouTube videos"; homepage = "https://github.com/po5/mpv_sponsorblock"; license = licenses.gpl3; - maintainers = with maintainers; [ pacien ]; + maintainers = with maintainers; [ euxane ]; }; } diff --git a/pkgs/applications/virtualization/singularity/packages.nix b/pkgs/applications/virtualization/singularity/packages.nix index d2190fccc6cd1..7a6a89ecc6592 100644 --- a/pkgs/applications/virtualization/singularity/packages.nix +++ b/pkgs/applications/virtualization/singularity/packages.nix @@ -15,7 +15,7 @@ let src = fetchFromGitHub { owner = "apptainer"; repo = "apptainer"; - rev = "refs/tags/v${version}"; + tag = "v${version}"; hash = "sha256-ZdSo9bKZ7Q1xwMe4SR840U3+fVpKwtiZQA5KDM5qF9M="; }; @@ -46,19 +46,19 @@ let callPackage (import ./generic.nix rec { pname = "singularity-ce"; - version = "4.2.1"; + version = "4.2.2"; projectName = "singularity"; src = fetchFromGitHub { owner = "sylabs"; repo = "singularity"; - rev = "refs/tags/v${version}"; - hash = "sha256-Go4um/bIgq2lCZvjJ2GR81XpA/JvjPholi1PzNG9Hz8="; + tag = "v${version}"; + hash = "sha256-BW+oUZh82m2QDf0tUKRLcPk3mUpkukZkVzSIfXtQwio="; }; # Override vendorHash with overrideAttrs. # See https://nixos.org/manual/nixpkgs/unstable/#buildGoModule-vendorHash - vendorHash = "sha256-CRZ42NdmJhAkV6bkl5n7rEV4Tu/h65qF5qaQ4W5wQ3w="; + vendorHash = "sha256-ed779LFPL38i/+pGlGIty9I/SvOtjF4/dOAx8zY7Y5E="; # Do not build conmon and squashfuse from the Git submodule sources, # Use Nixpkgs provided version diff --git a/pkgs/applications/window-managers/i3/balance-workspace.nix b/pkgs/applications/window-managers/i3/balance-workspace.nix index 913802294862a..b89344613a84d 100644 --- a/pkgs/applications/window-managers/i3/balance-workspace.nix +++ b/pkgs/applications/window-managers/i3/balance-workspace.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { description = "Balance windows and workspaces in i3wm"; homepage = "https://pypi.org/project/i3-balance-workspace/"; license = lib.licenses.mit; - maintainers = with lib.maintainers; [ pacien ]; + maintainers = with lib.maintainers; [ euxane ]; mainProgram = "i3_balance_workspace"; }; } diff --git a/pkgs/by-name/db/dbgate/package.nix b/pkgs/by-name/db/dbgate/package.nix index 5b12be65146c8..4db7ca674a4e2 100644 --- a/pkgs/by-name/db/dbgate/package.nix +++ b/pkgs/by-name/db/dbgate/package.nix @@ -7,25 +7,25 @@ }: let pname = "dbgate"; - version = "6.0.0"; + version = "6.1.0"; src = fetchurl { aarch64-linux = { url = "https://github.com/dbgate/dbgate/releases/download/v${version}/dbgate-${version}-linux_arm64.AppImage"; - hash = "sha256-HWjz3S8y0lRvhEcYNaNY89fLKvLOzwoLFD2RstWgFPI="; + hash = "sha256-gUACJGegHFhOd9t/MVt5imwsTnOKA9Q66dKtzLHzjSo="; }; x86_64-linux = { url = "https://github.com/dbgate/dbgate/releases/download/v${version}/dbgate-${version}-linux_x86_64.AppImage"; - hash = "sha256-nUoncYH42maU5cAMkpvKeCnyE8SJTlcfdUCrO5WvhcY="; + hash = "sha256-hSqBwsroOWcyHuUimkiy13tdTKqdAjXOnECv5J9KRbw="; }; x86_64-darwin = { url = "https://github.com/dbgate/dbgate/releases/download/v${version}/dbgate-${version}-mac_x64.dmg"; - hash = "sha256-ru+TzZ7c9NSOujsHoLxghmKgI4dEMlc45hTHsto2gIY="; + hash = "sha256-tUY9TM/wP7N1giZpBlzCQlF+01XT7HA4v/kTrT57jX8="; }; aarch64-darwin = { url = "https://github.com/dbgate/dbgate/releases/download/v${version}/dbgate-${version}-mac_universal.dmg"; - hash = "sha256-H6RFzgnn/4HHdHrWedFLeLlXizC+TEbD8F/9C4rVMok="; + hash = "sha256-b5IJfpe3XnY1bSI6dzQro8PY4L72aFKy9GtolgFZzsA="; }; } .${stdenv.system} or (throw "dbgate: ${stdenv.system} is unsupported."); diff --git a/pkgs/by-name/gs/gscan2pdf/package.nix b/pkgs/by-name/gs/gscan2pdf/package.nix index c1f780ae2cbc7..9e1bba7bec9cc 100644 --- a/pkgs/by-name/gs/gscan2pdf/package.nix +++ b/pkgs/by-name/gs/gscan2pdf/package.nix @@ -161,7 +161,7 @@ perlPackages.buildPerlPackage rec { description = "GUI to produce PDFs or DjVus from scanned documents"; homepage = "https://gscan2pdf.sourceforge.net/"; license = licenses.gpl3; - maintainers = with maintainers; [ pacien ]; + maintainers = with maintainers; [ euxane ]; mainProgram = "gscan2pdf"; }; } diff --git a/pkgs/by-name/ha/ha-mqtt-discoverable-cli/package.nix b/pkgs/by-name/ha/ha-mqtt-discoverable-cli/package.nix index cf5d6c14112dd..00075888438a1 100644 --- a/pkgs/by-name/ha/ha-mqtt-discoverable-cli/package.nix +++ b/pkgs/by-name/ha/ha-mqtt-discoverable-cli/package.nix @@ -6,14 +6,14 @@ python3.pkgs.buildPythonApplication rec { pname = "ha-mqtt-discoverable-cli"; - version = "0.4.1"; + version = "0.16.2"; pyproject = true; src = fetchFromGitHub { owner = "unixorn"; repo = "ha-mqtt-discoverable-cli"; - rev = "refs/tags/v${version}"; - hash = "sha256-rGRsB5kAtzI5KP4tMiQqLJQZs7z5k657V8Di0OzB6F8="; + tag = "v${version}"; + hash = "sha256-RyAgwLMdeLZj+U7Ddp1t/Qy5K/U++3WssVHfzSQ7YoY="; }; pythonRelaxDeps = [ "ha-mqtt-discoverable" ]; diff --git a/pkgs/by-name/hi/hidrd/package.nix b/pkgs/by-name/hi/hidrd/package.nix index 53f4f2a6a3fd8..2eb5821afec6b 100644 --- a/pkgs/by-name/hi/hidrd/package.nix +++ b/pkgs/by-name/hi/hidrd/package.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation { description = "HID report descriptor I/O library and conversion tool"; homepage = "https://github.com/DIGImend/hidrd"; license = licenses.gpl2Plus; - maintainers = with maintainers; [ pacien ]; + maintainers = with maintainers; [ euxane ]; platforms = platforms.all; broken = stdenv.hostPlatform.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/trunk/hidrd.x86_64-darwin mainProgram = "hidrd-convert"; diff --git a/pkgs/by-name/ho/howl/package.nix b/pkgs/by-name/ho/howl/package.nix index 7456ac9582eae..0746b12eda17d 100644 --- a/pkgs/by-name/ho/howl/package.nix +++ b/pkgs/by-name/ho/howl/package.nix @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { homepage = "https://howl.io/"; description = "General purpose, fast and lightweight editor with a keyboard-centric minimalistic user interface"; license = licenses.mit; - maintainers = with maintainers; [ pacien ]; + maintainers = with maintainers; [ euxane ]; mainProgram = "howl"; # LuaJIT and Howl builds fail for x86_64-darwin and aarch64-linux respectively diff --git a/pkgs/by-name/iv/ivyterm/package.nix b/pkgs/by-name/iv/ivyterm/package.nix index b5c7c26f09cee..56cac36495a3a 100644 --- a/pkgs/by-name/iv/ivyterm/package.nix +++ b/pkgs/by-name/iv/ivyterm/package.nix @@ -4,27 +4,25 @@ fetchFromGitHub, pkg-config, wrapGAppsHook4, - cairo, - gdk-pixbuf, - glib, - gtk4, libadwaita, - pango, vte-gtk4, + openssl, + nix-update-script, }: -rustPlatform.buildRustPackage { +rustPlatform.buildRustPackage rec { pname = "ivyterm"; - version = "0-unstable-2024-10-23"; + version = "1.0.0"; src = fetchFromGitHub { owner = "Tomiyou"; repo = "ivyterm"; - rev = "13ee76dfc88bc92807e328991c7a8586a5b13ac7"; - hash = "sha256-RVHGDgaNYhR/eGTu4bhJvEfd14qFP+u8ApItVc00Bm8="; + tag = "v${version}"; + hash = "sha256-2wOTUJRFtT7lJ8Km7J7qT6CIRi7wZmNAp1UHfrksyss="; }; - cargoHash = "sha256-tdaI0diwRjqERmAiuKFhMw4AeqxgMq8YMsZWBjsmd0U="; + useFetchCargoVendor = true; + cargoHash = "sha256-SyyXpV4BfXFm5SHsrXHVNXFm8xM1gBv9lBRXuHVN+lQ="; nativeBuildInputs = [ pkg-config @@ -32,18 +30,24 @@ rustPlatform.buildRustPackage { ]; buildInputs = [ - cairo - gdk-pixbuf - glib - gtk4 + openssl libadwaita - pango vte-gtk4 ]; + postInstall = '' + install -D data/com.tomiyou.ivyTerm.desktop -t $out/share/applications + install -D data/com.tomiyou.ivyTerm.svg -t $out/share/icons + ''; + + passthru = { + updateScript = nix-update-script { }; + }; + meta = { description = "Terminal emulator implemented in gtk4-rs and VTE4"; homepage = "https://github.com/Tomiyou/ivyterm"; + changelog = "https://github.com/Tomiyou/ivyterm/releases/tag/${src.tag}"; license = lib.licenses.gpl3Only; maintainers = with lib.maintainers; [ genga898 ]; mainProgram = "ivyterm"; diff --git a/pkgs/by-name/ka/kazumi/package.nix b/pkgs/by-name/ka/kazumi/package.nix index 9f8406109e020..531a79a30abd7 100644 --- a/pkgs/by-name/ka/kazumi/package.nix +++ b/pkgs/by-name/ka/kazumi/package.nix @@ -1,33 +1,31 @@ { lib, fetchFromGitHub, - flutter324, + flutter327, webkitgtk_4_1, alsa-lib, libayatana-appindicator, autoPatchelfHook, - wrapGAppsHook3, gst_all_1, stdenv, mimalloc, mpv, mpv-unwrapped, }: -flutter324.buildFlutterApplication rec { +flutter327.buildFlutterApplication rec { pname = "kazumi"; - version = "1.4.6"; + version = "1.4.7"; src = fetchFromGitHub { owner = "Predidit"; repo = "Kazumi"; tag = version; - hash = "sha256-NB6veMxAbG4YB6Io+HNLK/N8irF8g+Vj0r5L94JG//A="; + hash = "sha256-/sr2CQ9ntwfR2QCgidQE3kwBSIG+qfpSR/XhRPpmBm0="; }; pubspecLock = lib.importJSON ./pubspec.lock.json; nativeBuildInputs = [ - wrapGAppsHook3 autoPatchelfHook ]; diff --git a/pkgs/by-name/ka/kazumi/pubspec.lock.json b/pkgs/by-name/ka/kazumi/pubspec.lock.json index c20cde6e19513..2857660189ff8 100644 --- a/pkgs/by-name/ka/kazumi/pubspec.lock.json +++ b/pkgs/by-name/ka/kazumi/pubspec.lock.json @@ -4,17 +4,17 @@ "dependency": "transitive", "description": { "name": "_fe_analyzer_shared", - "sha256": "f256b0c0ba6c7577c15e2e4e114755640a875e885099367bf6e012b19314c834", + "sha256": "16e298750b6d0af7ce8a3ba7c18c69c3785d11b15ec83f6dcd0ad2a0009b3cab", "url": "https://pub.dev" }, "source": "hosted", - "version": "72.0.0" + "version": "76.0.0" }, "_macros": { "dependency": "transitive", "description": "dart", "source": "sdk", - "version": "0.3.2" + "version": "0.3.3" }, "adaptive_theme": { "dependency": "direct main", @@ -30,11 +30,11 @@ "dependency": "transitive", "description": { "name": "analyzer", - "sha256": "b652861553cd3990d8ed361f7979dc6d7053a9ac8843fa73820ab68ce5410139", + "sha256": "1f14db053a8c23e260789e9b0980fa27f2680dd640932cae5e1137cce0e46e1e", "url": "https://pub.dev" }, "source": "hosted", - "version": "6.7.0" + "version": "6.11.0" }, "ansicolor": { "dependency": "transitive", @@ -280,11 +280,11 @@ "dependency": "transitive", "description": { "name": "collection", - "sha256": "ee67cb0715911d28db6bf4af1026078bd6f0128b07a5f66fb2ed94ec6783c09a", + "sha256": "a1ace0a119f20aabc852d165077c036cd864315bd99b7eaa10a60100341941bf", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.18.0" + "version": "1.19.0" }, "connectivity_plus": { "dependency": "direct main", @@ -609,16 +609,6 @@ "source": "hosted", "version": "4.0.1" }, - "flutter_smart_dialog": { - "dependency": "direct main", - "description": { - "name": "flutter_smart_dialog", - "sha256": "d7b915461fdc9bb8111d23a709b4ce910dbc4b9bef0fbd941655f74bf7de09a6", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "4.9.8+5" - }, "flutter_test": { "dependency": "direct dev", "description": "flutter", @@ -805,21 +795,21 @@ "dependency": "transitive", "description": { "name": "leak_tracker", - "sha256": "3f87a60e8c63aecc975dda1ceedbc8f24de75f09e4856ea27daf8958f2f0ce05", + "sha256": "7bb2830ebd849694d1ec25bf1f44582d6ac531a57a365a803a6034ff751d2d06", "url": "https://pub.dev" }, "source": "hosted", - "version": "10.0.5" + "version": "10.0.7" }, "leak_tracker_flutter_testing": { "dependency": "transitive", "description": { "name": "leak_tracker_flutter_testing", - "sha256": "932549fb305594d82d7183ecd9fa93463e9914e1b67cacc34bc40906594a1806", + "sha256": "9491a714cca3667b60b5c420da8217e6de0d1ba7a5ec322fab01758f6998f379", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.0.5" + "version": "3.0.8" }, "leak_tracker_testing": { "dependency": "transitive", @@ -865,11 +855,11 @@ "dependency": "transitive", "description": { "name": "macros", - "sha256": "0acaed5d6b7eab89f63350bccd82119e6c602df0f391260d0e32b5e23db79536", + "sha256": "1d9e801cd66f7ea3663c45fc708450db1fa57f988142c64289142c9b7ee80656", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.1.2-main.4" + "version": "0.1.3-main.0" }, "matcher": { "dependency": "transitive", @@ -1503,7 +1493,7 @@ "dependency": "transitive", "description": "flutter", "source": "sdk", - "version": "0.0.99" + "version": "0.0.0" }, "source_gen": { "dependency": "transitive", @@ -1599,11 +1589,11 @@ "dependency": "transitive", "description": { "name": "stack_trace", - "sha256": "73713990125a6d93122541237550ee3352a2d84baad52d375a4cad2eb9b7ce0b", + "sha256": "9f47fd3630d76be3ab26f0ee06d213679aa425996925ff3feffdec504931c377", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.11.1" + "version": "1.12.0" }, "stream_channel": { "dependency": "transitive", @@ -1629,11 +1619,11 @@ "dependency": "transitive", "description": { "name": "string_scanner", - "sha256": "556692adab6cfa87322a115640c11f13cb77b3f076ddcc5d6ae3c20242bedcde", + "sha256": "688af5ed3402a4bde5b3a6c15fd768dbf2621a614950b17f04626c431ab3c4c3", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.2.0" + "version": "1.3.0" }, "styled_text": { "dependency": "direct main", @@ -1669,11 +1659,11 @@ "dependency": "transitive", "description": { "name": "test_api", - "sha256": "5b8a98dafc4d5c4c9c72d8b31ab2b23fc13422348d2997120294d3bac86b4ddb", + "sha256": "664d3a9a64782fcdeb83ce9c6b39e78fd2971d4e37827b9b06c3aa1edc5e760c", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.7.2" + "version": "0.7.3" }, "timing": { "dependency": "transitive", @@ -1839,11 +1829,11 @@ "dependency": "transitive", "description": { "name": "vm_service", - "sha256": "5c5f338a667b4c644744b661f309fb8080bb94b18a7e91ef1dbd343bed00ed6d", + "sha256": "f6be3ed8bd01289b34d679c2b62226f63c0e69f9fd2e50a6b3c1c729a961041b", "url": "https://pub.dev" }, "source": "hosted", - "version": "14.2.5" + "version": "14.3.0" }, "volume_controller": { "dependency": "transitive", @@ -2069,6 +2059,6 @@ }, "sdks": { "dart": ">=3.5.0 <4.0.0", - "flutter": ">=3.24.5" + "flutter": ">=3.27.1" } } diff --git a/pkgs/by-name/li/librenms/broken-binary-paths.diff b/pkgs/by-name/li/librenms/broken-binary-paths.diff index 158ef779b10a6..6d98165bf7e63 100644 --- a/pkgs/by-name/li/librenms/broken-binary-paths.diff +++ b/pkgs/by-name/li/librenms/broken-binary-paths.diff @@ -1,18 +1,18 @@ -diff --git a/LibreNMS/Config.php b/LibreNMS/Config.php -index 5ed6b71..de7718a 100644 ---- a/LibreNMS/Config.php -+++ b/LibreNMS/Config.php -@@ -460,13 +460,6 @@ class Config - self::persist('device_display_default', $display_value); +diff --git a/app/ConfigRepository.php b/app/ConfigRepository.php +index 2d73cce81..b0110540b 100644 +--- a/app/ConfigRepository.php ++++ b/app/ConfigRepository.php +@@ -444,13 +444,6 @@ class ConfigRepository + $this->persist('device_display_default', $display_value); } - + - // make sure we have full path to binaries in case PATH isn't set - foreach (['fping', 'fping6', 'snmpgetnext', 'rrdtool', 'traceroute'] as $bin) { -- if (! is_executable(self::get($bin))) { -- self::persist($bin, self::locateBinary($bin)); +- if (! is_executable($this->get($bin))) { +- $this->persist($bin, $this->locateBinary($bin)); - } - } - - if (! self::has('rrdtool_version')) { - self::persist('rrdtool_version', Rrd::version()); + if (! $this->has('rrdtool_version')) { + $this->persist('rrdtool_version', (new Version($this))->rrdtool()); } diff --git a/pkgs/by-name/li/librenms/package.nix b/pkgs/by-name/li/librenms/package.nix index 2b0efaf6cf438..b96c4a2eb6f71 100644 --- a/pkgs/by-name/li/librenms/package.nix +++ b/pkgs/by-name/li/librenms/package.nix @@ -27,16 +27,16 @@ let in phpPackage.buildComposerProject rec { pname = "librenms"; - version = "24.11.0"; + version = "24.12.0"; src = fetchFromGitHub { owner = "librenms"; repo = pname; rev = "${version}"; - sha256 = "sha256-pcUkmcqD/NNedKlpNEBFf9Pmxkq6qXVdagRj/QTePzw="; + sha256 = "sha256-/0mc4wTx9WDxgDxqq+Kut8uX/Yr+bxqZ1BeJvmFDxG8="; }; - vendorHash = "sha256-0ZMQYODlXLHOjwWYvbrY/VQ2Zm9D7r1NvXRyP0q346M="; + vendorHash = "sha256-DNiTSXt/1Qr67BdlTu3ccP4Whw5pyybeFJ045c/e8Dc="; php = phpPackage; diff --git a/pkgs/by-name/li/libspf2/package.nix b/pkgs/by-name/li/libspf2/package.nix index 17663a5e10de1..eee1560f0fe5d 100644 --- a/pkgs/by-name/li/libspf2/package.nix +++ b/pkgs/by-name/li/libspf2/package.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { lgpl21Plus bsd2 ]; - maintainers = with maintainers; [ pacien ] ++ teams.helsinki-systems.members; + maintainers = with maintainers; [ euxane ] ++ teams.helsinki-systems.members; platforms = platforms.all; }; } diff --git a/pkgs/by-name/ma/malwoverview/package.nix b/pkgs/by-name/ma/malwoverview/package.nix index a7f2d3048e8eb..f613631919b47 100644 --- a/pkgs/by-name/ma/malwoverview/package.nix +++ b/pkgs/by-name/ma/malwoverview/package.nix @@ -6,14 +6,14 @@ python3.pkgs.buildPythonApplication rec { pname = "malwoverview"; - version = "6.0.1"; + version = "6.1.1"; pyproject = true; src = fetchFromGitHub { owner = "alexandreborges"; repo = "malwoverview"; - rev = "refs/tags/v${version}"; - hash = "sha256-N9jXMkX3Kt3ldw/QgJRAE2ItrzjXzQthQ9UULRtnN0A="; + tag = "v${version}"; + hash = "sha256-43LcrP89vhVFDRRRItFL6hl++mvdGoPugMwD3TEOSE0="; }; pythonRemoveDeps = [ diff --git a/pkgs/by-name/md/mdctags/package.nix b/pkgs/by-name/md/mdctags/package.nix index faac73aedf12f..a3a7705280edf 100644 --- a/pkgs/by-name/md/mdctags/package.nix +++ b/pkgs/by-name/md/mdctags/package.nix @@ -21,7 +21,7 @@ rustPlatform.buildRustPackage { description = "tags for markdown file"; homepage = "https://github.com/wsdjeg/mdctags.rs"; license = lib.licenses.mit; - maintainers = with lib.maintainers; [ pacien ]; + maintainers = with lib.maintainers; [ euxane ]; mainProgram = "mdctags"; }; } diff --git a/pkgs/by-name/pa/pandoc-katex/package.nix b/pkgs/by-name/pa/pandoc-katex/package.nix index 12cd5047819b8..fe92876f1c420 100644 --- a/pkgs/by-name/pa/pandoc-katex/package.nix +++ b/pkgs/by-name/pa/pandoc-katex/package.nix @@ -26,7 +26,7 @@ rustPlatform.buildRustPackage rec { ]; maintainers = with maintainers; [ minijackson - pacien + euxane ]; mainProgram = "pandoc-katex"; }; diff --git a/pkgs/by-name/pd/pdfium-binaries/package.nix b/pkgs/by-name/pd/pdfium-binaries/package.nix index 8d3450b30f603..5cff417d04942 100644 --- a/pkgs/by-name/pd/pdfium-binaries/package.nix +++ b/pkgs/by-name/pd/pdfium-binaries/package.nix @@ -4,7 +4,7 @@ stdenv, }: let - version = "6886"; + version = "6899"; src = let inherit (stdenv.hostPlatform) system; @@ -16,10 +16,10 @@ let aarch64-darwin = "mac-arm64"; }; hash = selectSystem { - x86_64-linux = "sha256-8o2PgbyHqU1ST2clx2NRB6/E1eBWjuyx2oIVvc1/ujI="; - aarch64-linux = "sha256-SUxtX7NMK+sMi5Fybc2P+bNrXET0TTBJTUhsMw0eBTc="; - x86_64-darwin = "sha256-p4lHxr1Do3pLKXn2bOt8gh2R5KHPr4HpAM9hphFUimU="; - aarch64-darwin = "sha256-Eb9I17GcuBaMAVKI9K0Rf/iD+nhBFDgYhWth46yU0xE="; + x86_64-linux = "sha256-JPXgjdGfQK1BztK3opqKfg5P2lAnmkcVj3qk2Ck8vHg="; + aarch64-linux = "sha256-za1d1jKM3LdeBFttBBHQ+Nx1O4KC6FFwotuRHTj8tFk="; + x86_64-darwin = "sha256-K2Sr4z4+WWmK9OxvkZB0k9LQDxCNnUvL0RArG5v2aYs="; + aarch64-darwin = "sha256-wLa61Af4G47AE99M+uPlBjR2rdP5yUenoW9gsrOmZpw="; }; in fetchzip { diff --git a/pkgs/by-name/pu/pure-prompt/package.nix b/pkgs/by-name/pu/pure-prompt/package.nix index 4339c54f3b4d8..036dd69c7fc35 100644 --- a/pkgs/by-name/pu/pure-prompt/package.nix +++ b/pkgs/by-name/pu/pure-prompt/package.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { license = licenses.mit; platforms = platforms.all; maintainers = with maintainers; [ - pacien + euxane pablovsky ]; }; diff --git a/pkgs/by-name/py/pyenv/package.nix b/pkgs/by-name/py/pyenv/package.nix index af316e7ced27d..1389fe87c783d 100644 --- a/pkgs/by-name/py/pyenv/package.nix +++ b/pkgs/by-name/py/pyenv/package.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "pyenv"; - version = "2.4.22"; + version = "2.4.23"; src = fetchFromGitHub { owner = "pyenv"; repo = "pyenv"; rev = "refs/tags/v${version}"; - hash = "sha256-TrsSihCXovToTFygs6WB67sQIbtx4EJjyMbBDCK0pR4="; + hash = "sha256-4IqHJpnGQKo/1U/Zkzg0mzm4xFbDC28F9ixgw+C0hAc="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/rm/rmfakecloud/package.nix b/pkgs/by-name/rm/rmfakecloud/package.nix index f68229b10a162..be0d53852c3e9 100644 --- a/pkgs/by-name/rm/rmfakecloud/package.nix +++ b/pkgs/by-name/rm/rmfakecloud/package.nix @@ -46,7 +46,7 @@ buildGoModule rec { homepage = "https://ddvk.github.io/rmfakecloud/"; license = licenses.agpl3Only; maintainers = with maintainers; [ - pacien + euxane martinetd ]; mainProgram = "rmfakecloud"; diff --git a/pkgs/by-name/si/simplex-chat-desktop/package.nix b/pkgs/by-name/si/simplex-chat-desktop/package.nix index 681ed7e7cb5e8..c1767f1388fde 100644 --- a/pkgs/by-name/si/simplex-chat-desktop/package.nix +++ b/pkgs/by-name/si/simplex-chat-desktop/package.nix @@ -7,11 +7,11 @@ let pname = "simplex-chat-desktop"; - version = "6.2.0"; + version = "6.2.1"; src = fetchurl { url = "https://github.com/simplex-chat/simplex-chat/releases/download/v${version}/simplex-desktop-x86_64.AppImage"; - hash = "sha256-2Ng77oggjdePDNeB0NdC8vkRY4duwzUdde22Hp6dXyM="; + hash = "sha256-JEe4dmbb/T2A4+t1ycvgJofes2CkEphytFMnWJgpZ7s="; }; appimageContents = appimageTools.extract { diff --git a/pkgs/by-name/sk/skypeforlinux/package.nix b/pkgs/by-name/sk/skypeforlinux/package.nix index bcf2d2ed38159..40d68b0bbe956 100644 --- a/pkgs/by-name/sk/skypeforlinux/package.nix +++ b/pkgs/by-name/sk/skypeforlinux/package.nix @@ -42,8 +42,8 @@ let # Please keep the version x.y.0.z and do not update to x.y.76.z because the # source of the latter disappears much faster. - version = "8.133.0.202"; - revision = "375"; + version = "8.134.0.202"; + revision = "378"; rpath = lib.makeLibraryPath [ @@ -103,7 +103,7 @@ let fetchurl { name = "skypeforlinux-${version}-${revision}.snap"; url = "https://api.snapcraft.io/api/v1/snaps/download/QRDEfjn4WJYnm0FzDKwqqRZZI77awQEV_${revision}.snap"; - hash = "sha512-xTkVc/0IWMzVOogWXsphX1YIRWqm7GYgKMeGBxi1lP19eVXjOCghUGIQEd431QkTc2WMdmkWtuYD2toFMtkfWA=="; + hash = "sha512-AJ2kPitiDcnpJwJtRO0Yc8ypFdrVEFACwCt2hJM163oKKsQEqdyhUdEBigT43HrFPW74T8kRcoTbRuPLOGw0FQ=="; } else throw "Skype for linux is not supported on ${stdenv.hostPlatform.system}"; diff --git a/pkgs/by-name/tg/tg-archive/package.nix b/pkgs/by-name/tg/tg-archive/package.nix index 0460e34108f34..6b1d765fd0539 100644 --- a/pkgs/by-name/tg/tg-archive/package.nix +++ b/pkgs/by-name/tg/tg-archive/package.nix @@ -42,7 +42,7 @@ python3.pkgs.buildPythonApplication { description = "A tool for exporting Telegram group chats into static websites like mailing list archives"; homepage = "https://github.com/knadh/tg-archive"; license = lib.licenses.mit; - maintainers = with lib.maintainers; [ pacien ]; + maintainers = with lib.maintainers; [ euxane ]; mainProgram = "tg-archive"; }; } diff --git a/pkgs/by-name/to/topiary/Cargo.lock b/pkgs/by-name/to/topiary/Cargo.lock deleted file mode 100644 index 0b0af1fcb05db..0000000000000 --- a/pkgs/by-name/to/topiary/Cargo.lock +++ /dev/null @@ -1,1741 +0,0 @@ -# This file is automatically @generated by Cargo. -# It is not intended for manual editing. -version = 3 - -[[package]] -name = "addr2line" -version = "0.20.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4fa78e18c64fce05e902adecd7a5eed15a5e0a3439f7b0e169f0252214865e3" -dependencies = [ - "gimli", -] - -[[package]] -name = "adler" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" - -[[package]] -name = "aho-corasick" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43f6cb1bf222025340178f382c426f13757b2960e89779dfcb319c32542a5a41" -dependencies = [ - "memchr", -] - -[[package]] -name = "anes" -version = "0.1.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b46cbb362ab8752921c97e041f5e366ee6297bd428a31275b9fcf1e380f7299" - -[[package]] -name = "ansi_term" -version = "0.12.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d52a9bb7ec0cf484c551830a7ce27bd20d67eac647e1befb56b0be4ee39a55d2" -dependencies = [ - "winapi", -] - -[[package]] -name = "anstream" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ca84f3628370c59db74ee214b3263d58f9aadd9b4fe7e711fd87dc452b7f163" -dependencies = [ - "anstyle", - "anstyle-parse", - "anstyle-query", - "anstyle-wincon", - "colorchoice", - "is-terminal", - "utf8parse", -] - -[[package]] -name = "anstyle" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3a30da5c5f2d5e72842e00bcb57657162cdabef0931f40e2deb9b4140440cecd" - -[[package]] -name = "anstyle-parse" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "938874ff5980b03a87c5524b3ae5b59cf99b1d6bc836848df7bc5ada9643c333" -dependencies = [ - "utf8parse", -] - -[[package]] -name = "anstyle-query" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ca11d4be1bab0c8bc8734a9aa7bf4ee8316d462a08c6ac5052f888fef5b494b" -dependencies = [ - "windows-sys", -] - -[[package]] -name = "anstyle-wincon" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "180abfa45703aebe0093f79badacc01b8fd4ea2e35118747e5811127f926e188" -dependencies = [ - "anstyle", - "windows-sys", -] - -[[package]] -name = "assert_cmd" -version = "2.0.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "88903cb14723e4d4003335bb7f8a14f27691649105346a0f0957466c096adfe6" -dependencies = [ - "anstyle", - "bstr", - "doc-comment", - "predicates", - "predicates-core", - "predicates-tree", - "wait-timeout", -] - -[[package]] -name = "async-scoped" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0e7a6a57c8aeb40da1ec037f5d455836852f7a57e69e1b1ad3d8f38ac1d6cadf" -dependencies = [ - "futures", - "pin-project", - "slab", - "tokio", -] - -[[package]] -name = "async-stream" -version = "0.3.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd56dd203fef61ac097dd65721a419ddccb106b2d2b70ba60a6b529f03961a51" -dependencies = [ - "async-stream-impl", - "futures-core", - "pin-project-lite", -] - -[[package]] -name = "async-stream-impl" -version = "0.3.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "16e62a023e7c117e27523144c5d2459f4397fcc3cab0085af8e2224f643a0193" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.26", -] - -[[package]] -name = "autocfg" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" - -[[package]] -name = "backtrace" -version = "0.3.68" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4319208da049c43661739c5fade2ba182f09d1dc2299b32298d3a31692b17e12" -dependencies = [ - "addr2line", - "cc", - "cfg-if", - "libc", - "miniz_oxide", - "object", - "rustc-demangle", -] - -[[package]] -name = "bitflags" -version = "1.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" - -[[package]] -name = "bitflags" -version = "2.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "630be753d4e58660abd17930c71b647fe46c27ea6b63cc59e1e3851406972e42" - -[[package]] -name = "bstr" -version = "1.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6798148dccfbff0fae41c7574d2fa8f1ef3492fba0face179de5d8d447d67b05" -dependencies = [ - "memchr", - "regex-automata", - "serde", -] - -[[package]] -name = "bumpalo" -version = "3.13.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3e2c3daef883ecc1b5d58c15adae93470a91d425f3532ba1695849656af3fc1" - -[[package]] -name = "bytes" -version = "1.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89b2fd2a0dcf38d7971e2194b6b6eebab45ae01067456a7fd93d5547a61b70be" - -[[package]] -name = "cast" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37b2a672a2cb129a2e41c10b1224bb368f9f37a2b16b612598138befd7b37eb5" - -[[package]] -name = "cc" -version = "1.0.83" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0" -dependencies = [ - "libc", -] - -[[package]] -name = "cfg-if" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" - -[[package]] -name = "ciborium" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "effd91f6c78e5a4ace8a5d3c0b6bfaec9e2baaef55f3efc00e45fb2e477ee926" -dependencies = [ - "ciborium-io", - "ciborium-ll", - "serde", -] - -[[package]] -name = "ciborium-io" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cdf919175532b369853f5d5e20b26b43112613fd6fe7aee757e35f7a44642656" - -[[package]] -name = "ciborium-ll" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "defaa24ecc093c77630e6c15e17c51f5e187bf35ee514f4e2d67baaa96dae22b" -dependencies = [ - "ciborium-io", - "half", -] - -[[package]] -name = "clap" -version = "4.3.21" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c27cdf28c0f604ba3f512b0c9a409f8de8513e4816705deb0498b627e7c3a3fd" -dependencies = [ - "clap_builder", - "clap_derive", - "once_cell", -] - -[[package]] -name = "clap_builder" -version = "4.3.21" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08a9f1ab5e9f01a9b81f202e8562eb9a10de70abf9eaeac1be465c28b75aa4aa" -dependencies = [ - "anstream", - "anstyle", - "clap_lex", - "strsim", - "terminal_size", -] - -[[package]] -name = "clap_complete" -version = "4.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4110a1e6af615a9e6d0a36f805d5c99099f8bab9b8042f5bc1fa220a4a89e36f" -dependencies = [ - "clap", -] - -[[package]] -name = "clap_derive" -version = "4.3.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "54a9bb5758fc5dfe728d1019941681eccaf0cf8a4189b692a0ee2f2ecf90a050" -dependencies = [ - "heck", - "proc-macro2", - "quote", - "syn 2.0.26", -] - -[[package]] -name = "clap_lex" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2da6da31387c7e4ef160ffab6d5e7f00c42626fe39aea70a7b0f1773f7dd6c1b" - -[[package]] -name = "colorchoice" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7" - -[[package]] -name = "criterion" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2b12d017a929603d80db1831cd3a24082f8137ce19c69e6447f54f5fc8d692f" -dependencies = [ - "anes", - "cast", - "ciborium", - "clap", - "criterion-plot", - "futures", - "is-terminal", - "itertools 0.10.5", - "num-traits", - "once_cell", - "oorandom", - "plotters", - "rayon", - "regex", - "serde", - "serde_derive", - "serde_json", - "tinytemplate", - "walkdir", -] - -[[package]] -name = "criterion-plot" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b50826342786a51a89e2da3a28f1c32b06e387201bc2d19791f622c673706b1" -dependencies = [ - "cast", - "itertools 0.10.5", -] - -[[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" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce6fd6f855243022dcecf8702fef0c297d4338e226845fe067f6341ad9fa0cef" -dependencies = [ - "cfg-if", - "crossbeam-epoch", - "crossbeam-utils", -] - -[[package]] -name = "crossbeam-epoch" -version = "0.9.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae211234986c545741a7dc064309f67ee1e5ad243d0e48335adc0484d960bcc7" -dependencies = [ - "autocfg", - "cfg-if", - "crossbeam-utils", - "memoffset", - "scopeguard", -] - -[[package]] -name = "crossbeam-utils" -version = "0.8.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a22b2d63d4d1dc0b7f1b6b2747dd0088008a9be28b6ddf0b1e7d335e3037294" -dependencies = [ - "cfg-if", -] - -[[package]] -name = "diff" -version = "0.1.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56254986775e3233ffa9c4d7d3faaf6d36a2c09d30b20687e9f88bc8bafc16c8" - -[[package]] -name = "difflib" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6184e33543162437515c2e2b48714794e37845ec9851711914eec9d308f6ebe8" - -[[package]] -name = "directories" -version = "5.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a49173b84e034382284f27f1af4dcbbd231ffa358c0fe316541a7337f376a35" -dependencies = [ - "dirs-sys", -] - -[[package]] -name = "dirs-sys" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "520f05a5cbd335fae5a99ff7a6ab8627577660ee5cfd6a94a6a929b52ff0321c" -dependencies = [ - "libc", - "option-ext", - "redox_users", - "windows-sys", -] - -[[package]] -name = "doc-comment" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fea41bba32d969b513997752735605054bc0dfa92b4c56bf1189f2e174be7a10" - -[[package]] -name = "either" -version = "1.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7fcaabb2fef8c910e7f4c7ce9f67a1283a1715879a7c230ca9d6d1ae31f16d91" - -[[package]] -name = "env_logger" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85cdab6a89accf66733ad5a1693a4dcced6aeff64602b634530dd73c1f3ee9f0" -dependencies = [ - "humantime", - "is-terminal", - "log", - "regex", - "termcolor", -] - -[[package]] -name = "equivalent" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" - -[[package]] -name = "errno" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4bcfec3a70f97c962c307b2d2c56e358cf1d00b558d74262b5f929ee8cc7e73a" -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", -] - -[[package]] -name = "fastrand" -version = "1.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e51093e27b0797c359783294ca4f0a911c270184cb10f85783b118614a1501be" -dependencies = [ - "instant", -] - -[[package]] -name = "float-cmp" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "98de4bbd547a563b716d8dfa9aad1cb19bfab00f4fa09a6a4ed21dbcf44ce9c4" -dependencies = [ - "num-traits", -] - -[[package]] -name = "futures" -version = "0.3.28" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23342abe12aba583913b2e62f22225ff9c950774065e4bfb61a19cd9770fec40" -dependencies = [ - "futures-channel", - "futures-core", - "futures-executor", - "futures-io", - "futures-sink", - "futures-task", - "futures-util", -] - -[[package]] -name = "futures-channel" -version = "0.3.28" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "955518d47e09b25bbebc7a18df10b81f0c766eaf4c4f1cccef2fca5f2a4fb5f2" -dependencies = [ - "futures-core", - "futures-sink", -] - -[[package]] -name = "futures-core" -version = "0.3.28" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4bca583b7e26f571124fe5b7561d49cb2868d79116cfa0eefce955557c6fee8c" - -[[package]] -name = "futures-executor" -version = "0.3.28" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ccecee823288125bd88b4d7f565c9e58e41858e47ab72e8ea2d64e93624386e0" -dependencies = [ - "futures-core", - "futures-task", - "futures-util", -] - -[[package]] -name = "futures-io" -version = "0.3.28" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fff74096e71ed47f8e023204cfd0aa1289cd54ae5430a9523be060cdb849964" - -[[package]] -name = "futures-macro" -version = "0.3.28" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.26", -] - -[[package]] -name = "futures-sink" -version = "0.3.28" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f43be4fe21a13b9781a69afa4985b0f6ee0e1afab2c6f454a8cf30e2b2237b6e" - -[[package]] -name = "futures-task" -version = "0.3.28" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76d3d132be6c0e6aa1534069c705a74a5997a356c0dc2f86a47765e5617c5b65" - -[[package]] -name = "futures-util" -version = "0.3.28" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26b01e40b772d54cf6c6d721c1d1abd0647a0106a12ecaa1c186273392a69533" -dependencies = [ - "futures-channel", - "futures-core", - "futures-io", - "futures-macro", - "futures-sink", - "futures-task", - "memchr", - "pin-project-lite", - "pin-utils", - "slab", -] - -[[package]] -name = "getrandom" -version = "0.2.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be4136b2a15dd319360be1c07d9933517ccf0be8f16bf62a3bee4f0d618df427" -dependencies = [ - "cfg-if", - "libc", - "wasi", -] - -[[package]] -name = "gimli" -version = "0.27.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6c80984affa11d98d1b88b66ac8853f143217b399d3c74116778ff8fdb4ed2e" - -[[package]] -name = "half" -version = "1.8.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eabb4a44450da02c90444cf74558da904edde8fb4e9035a9a6a4e15445af0bd7" - -[[package]] -name = "hashbrown" -version = "0.14.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c6201b9ff9fd90a5a3bac2e56a830d0caa509576f0e503818ee82c181b3437a" - -[[package]] -name = "heck" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" - -[[package]] -name = "hermit-abi" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "443144c8cdadd93ebf52ddb4056d257f5b52c04d3c804e657d19eb73fc33668b" - -[[package]] -name = "humantime" -version = "2.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" - -[[package]] -name = "indexmap" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d5477fe2230a79769d8dc68e0eabf5437907c0457a5614a9e8dddb67f65eb65d" -dependencies = [ - "equivalent", - "hashbrown", -] - -[[package]] -name = "indoc" -version = "2.0.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c785eefb63ebd0e33416dfcb8d6da0bf27ce752843a45632a67bf10d4d4b5c4" - -[[package]] -name = "instant" -version = "0.1.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c" -dependencies = [ - "cfg-if", -] - -[[package]] -name = "io-lifetimes" -version = "1.0.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eae7b9aee968036d54dce06cebaefd919e4472e753296daccd6d344e3e2df0c2" -dependencies = [ - "hermit-abi", - "libc", - "windows-sys", -] - -[[package]] -name = "is-terminal" -version = "0.4.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb0889898416213fab133e1d33a0e5858a48177452750691bde3666d0fdbaf8b" -dependencies = [ - "hermit-abi", - "rustix 0.38.4", - "windows-sys", -] - -[[package]] -name = "itertools" -version = "0.10.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0fd2260e829bddf4cb6ea802289de2f86d6a7a690192fbe91b3f46e0f2c8473" -dependencies = [ - "either", -] - -[[package]] -name = "itertools" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1c173a5686ce8bfa551b3563d0c2170bf24ca44da99c7ca4bfdab5418c3fe57" -dependencies = [ - "either", -] - -[[package]] -name = "itoa" -version = "1.0.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af150ab688ff2122fcef229be89cb50dd66af9e01a4ff320cc137eecc9bacc38" - -[[package]] -name = "js-sys" -version = "0.3.61" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "445dde2150c55e483f3d8416706b97ec8e8237c307e5b7b4b8dd15e6af2a0730" -dependencies = [ - "wasm-bindgen", -] - -[[package]] -name = "libc" -version = "0.2.147" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4668fb0ea861c1df094127ac5f1da3409a82116a4ba74fca2e58ef927159bb3" - -[[package]] -name = "linux-raw-sys" -version = "0.3.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519" - -[[package]] -name = "linux-raw-sys" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09fc20d2ca12cb9f044c93e3bd6d32d523e6e2ec3db4f7b2939cd99026ecd3f0" - -[[package]] -name = "log" -version = "0.4.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b06a4cde4c0f271a446782e3eff8de789548ce57dbc8eca9292c27f4a42004b4" - -[[package]] -name = "memchr" -version = "2.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" - -[[package]] -name = "memoffset" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a634b1c61a95585bd15607c6ab0c4e5b226e695ff2800ba0cdccddf208c406c" -dependencies = [ - "autocfg", -] - -[[package]] -name = "miniz_oxide" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7810e0be55b428ada41041c41f32c9f1a42817901b4ccf45fa3d4b6561e74c7" -dependencies = [ - "adler", -] - -[[package]] -name = "normalize-line-endings" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61807f77802ff30975e01f4f071c8ba10c022052f98b3294119f3e615d13e5be" - -[[package]] -name = "num-traits" -version = "0.2.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "578ede34cf02f8924ab9447f50c28075b4d3e5b269972345e7e0372b38c6cdcd" -dependencies = [ - "autocfg", -] - -[[package]] -name = "num_cpus" -version = "1.16.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43" -dependencies = [ - "hermit-abi", - "libc", -] - -[[package]] -name = "object" -version = "0.31.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8bda667d9f2b5051b8833f59f3bf748b28ef54f850f4fcb389a252aa383866d1" -dependencies = [ - "memchr", -] - -[[package]] -name = "once_cell" -version = "1.18.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d" - -[[package]] -name = "oorandom" -version = "11.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ab1bc2a289d34bd04a330323ac98a1b4bc82c9d9fcb1e66b63caa84da26b575" - -[[package]] -name = "option-ext" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d" - -[[package]] -name = "pad" -version = "0.1.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2ad9b889f1b12e0b9ee24db044b5129150d5eada288edc800f789928dc8c0e3" -dependencies = [ - "unicode-width", -] - -[[package]] -name = "pin-project" -version = "1.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fda4ed1c6c173e3fc7a83629421152e01d7b1f9b7f65fb301e490e8cfc656422" -dependencies = [ - "pin-project-internal", -] - -[[package]] -name = "pin-project-internal" -version = "1.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4359fd9c9171ec6e8c62926d6faaf553a8dc3f64e1507e76da7911b4f6a04405" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.26", -] - -[[package]] -name = "pin-project-lite" -version = "0.2.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8afb450f006bf6385ca15ef45d71d2288452bc3683ce2e2cacc0d18e4be60b58" - -[[package]] -name = "pin-utils" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" - -[[package]] -name = "plotters" -version = "0.3.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2c224ba00d7cadd4d5c660deaf2098e5e80e07846537c51f9cfa4be50c1fd45" -dependencies = [ - "num-traits", - "plotters-backend", - "plotters-svg", - "wasm-bindgen", - "web-sys", -] - -[[package]] -name = "plotters-backend" -version = "0.3.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e76628b4d3a7581389a35d5b6e2139607ad7c75b17aed325f210aa91f4a9609" - -[[package]] -name = "plotters-svg" -version = "0.3.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38f6d39893cca0701371e3c27294f09797214b86f1fb951b89ade8ec04e2abab" -dependencies = [ - "plotters-backend", -] - -[[package]] -name = "predicates" -version = "3.0.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09963355b9f467184c04017ced4a2ba2d75cbcb4e7462690d388233253d4b1a9" -dependencies = [ - "anstyle", - "difflib", - "float-cmp", - "itertools 0.10.5", - "normalize-line-endings", - "predicates-core", - "regex", -] - -[[package]] -name = "predicates-core" -version = "1.0.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b794032607612e7abeb4db69adb4e33590fa6cf1149e95fd7cb00e634b92f174" - -[[package]] -name = "predicates-tree" -version = "1.0.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "368ba315fb8c5052ab692e68a0eefec6ec57b23a36959c14496f0b0df2c0cecf" -dependencies = [ - "predicates-core", - "termtree", -] - -[[package]] -name = "pretty_assertions" -version = "1.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af7cee1a6c8a5b9208b3cb1061f10c0cb689087b3d8ce85fb9d2dd7a29b6ba66" -dependencies = [ - "diff", - "yansi", -] - -[[package]] -name = "prettydiff" -version = "0.6.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ff1fec61082821f8236cf6c0c14e8172b62ce8a72a0eedc30d3b247bb68dc11" -dependencies = [ - "ansi_term", - "pad", -] - -[[package]] -name = "proc-macro2" -version = "1.0.66" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "18fb31db3f9bddb2ea821cde30a9f70117e3f119938b5ee630b7403aa6e2ead9" -dependencies = [ - "unicode-ident", -] - -[[package]] -name = "quote" -version = "1.0.31" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5fe8a65d69dd0808184ebb5f836ab526bb259db23c657efa38711b1072ee47f0" -dependencies = [ - "proc-macro2", -] - -[[package]] -name = "rayon" -version = "1.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d2df5196e37bcc87abebc0053e20787d73847bb33134a69841207dd0a47f03b" -dependencies = [ - "either", - "rayon-core", -] - -[[package]] -name = "rayon-core" -version = "1.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b8f95bd6966f5c87776639160a66bd8ab9895d9d4ab01ddba9fc60661aebe8d" -dependencies = [ - "crossbeam-channel", - "crossbeam-deque", - "crossbeam-utils", - "num_cpus", -] - -[[package]] -name = "redox_syscall" -version = "0.2.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a" -dependencies = [ - "bitflags 1.3.2", -] - -[[package]] -name = "redox_syscall" -version = "0.3.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29" -dependencies = [ - "bitflags 1.3.2", -] - -[[package]] -name = "redox_users" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b033d837a7cf162d7993aded9304e30a83213c648b6e389db233191f891e5c2b" -dependencies = [ - "getrandom", - "redox_syscall 0.2.16", - "thiserror", -] - -[[package]] -name = "regex" -version = "1.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2eae68fc220f7cf2532e4494aded17545fce192d59cd996e0fe7887f4ceb575" -dependencies = [ - "aho-corasick", - "memchr", - "regex-automata", - "regex-syntax", -] - -[[package]] -name = "regex-automata" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39354c10dd07468c2e73926b23bb9c2caca74c5501e38a35da70406f1d923310" -dependencies = [ - "aho-corasick", - "memchr", - "regex-syntax", -] - -[[package]] -name = "regex-syntax" -version = "0.7.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5ea92a5b6195c6ef2a0295ea818b312502c6fc94dde986c5553242e18fd4ce2" - -[[package]] -name = "rustc-demangle" -version = "0.1.23" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76" - -[[package]] -name = "rustix" -version = "0.37.23" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d69718bf81c6127a49dc64e44a742e8bb9213c0ff8869a22c308f84c1d4ab06" -dependencies = [ - "bitflags 1.3.2", - "errno", - "io-lifetimes", - "libc", - "linux-raw-sys 0.3.8", - "windows-sys", -] - -[[package]] -name = "rustix" -version = "0.38.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0a962918ea88d644592894bc6dc55acc6c0956488adcebbfb6e273506b7fd6e5" -dependencies = [ - "bitflags 2.3.3", - "errno", - "libc", - "linux-raw-sys 0.4.3", - "windows-sys", -] - -[[package]] -name = "ryu" -version = "1.0.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ad4cc8da4ef723ed60bced201181d83791ad433213d8c24efffda1eec85d741" - -[[package]] -name = "same-file" -version = "1.0.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502" -dependencies = [ - "winapi-util", -] - -[[package]] -name = "scopeguard" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" - -[[package]] -name = "serde" -version = "1.0.171" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30e27d1e4fd7659406c492fd6cfaf2066ba8773de45ca75e855590f856dc34a9" -dependencies = [ - "serde_derive", -] - -[[package]] -name = "serde-toml-merge" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a78072b550e5c20bc4a9d1384be28809cbdb7b25b2b4707ddc6d908b7e6de3bf" -dependencies = [ - "toml", -] - -[[package]] -name = "serde_derive" -version = "1.0.171" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "389894603bd18c46fa56231694f8d827779c0951a667087194cf9de94ed24682" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.26", -] - -[[package]] -name = "serde_json" -version = "1.0.103" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d03b412469450d4404fe8499a268edd7f8b79fecb074b0d812ad64ca21f4031b" -dependencies = [ - "itoa", - "ryu", - "serde", -] - -[[package]] -name = "serde_spanned" -version = "0.6.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96426c9936fd7a0124915f9185ea1d20aa9445cc9821142f0a73bc9207a2e186" -dependencies = [ - "serde", -] - -[[package]] -name = "slab" -version = "0.4.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6528351c9bc8ab22353f9d776db39a20288e8d6c37ef8cfe3317cf875eecfc2d" -dependencies = [ - "autocfg", -] - -[[package]] -name = "strsim" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" - -[[package]] -name = "syn" -version = "1.0.109" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" -dependencies = [ - "proc-macro2", - "quote", - "unicode-ident", -] - -[[package]] -name = "syn" -version = "2.0.26" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "45c3457aacde3c65315de5031ec191ce46604304d2446e803d71ade03308d970" -dependencies = [ - "proc-macro2", - "quote", - "unicode-ident", -] - -[[package]] -name = "tempfile" -version = "3.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31c0432476357e58790aaa47a8efb0c5138f137343f3b5f23bd36a27e3b0a6d6" -dependencies = [ - "autocfg", - "cfg-if", - "fastrand", - "redox_syscall 0.3.5", - "rustix 0.37.23", - "windows-sys", -] - -[[package]] -name = "termcolor" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be55cf8942feac5c765c2c993422806843c9a9a45d4d5c407ad6dd2ea95eb9b6" -dependencies = [ - "winapi-util", -] - -[[package]] -name = "terminal_size" -version = "0.2.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e6bf6f19e9f8ed8d4048dc22981458ebcf406d67e94cd422e5ecd73d63b3237" -dependencies = [ - "rustix 0.37.23", - "windows-sys", -] - -[[package]] -name = "termtree" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3369f5ac52d5eb6ab48c6b4ffdc8efbcad6b89c765749064ba298f2c68a16a76" - -[[package]] -name = "test-log" -version = "0.2.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9601d162c1d77e62c1ea0bc8116cd1caf143ce3af947536c3c9052a1677fe0c" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "thiserror" -version = "1.0.43" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a35fc5b8971143ca348fa6df4f024d4d55264f3468c71ad1c2f365b0a4d58c42" -dependencies = [ - "thiserror-impl", -] - -[[package]] -name = "thiserror-impl" -version = "1.0.43" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "463fe12d7993d3b327787537ce8dd4dfa058de32fc2b195ef3cde03dc4771e8f" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.26", -] - -[[package]] -name = "tinytemplate" -version = "1.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be4d6b5f19ff7664e8c98d03e2139cb510db9b0a60b55f8e8709b689d939b6bc" -dependencies = [ - "serde", - "serde_json", -] - -[[package]] -name = "tokio" -version = "1.32.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17ed6077ed6cd6c74735e21f37eb16dc3935f96878b1fe961074089cc80893f9" -dependencies = [ - "backtrace", - "num_cpus", - "pin-project-lite", - "tokio-macros", -] - -[[package]] -name = "tokio-macros" -version = "2.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "630bdcf245f78637c13ec01ffae6187cca34625e8c63150d424b59e55af2675e" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.26", -] - -[[package]] -name = "tokio-stream" -version = "0.1.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "397c988d37662c7dda6d2208364a706264bf3d6138b11d436cbac0ad38832842" -dependencies = [ - "futures-core", - "pin-project-lite", - "tokio", -] - -[[package]] -name = "tokio-test" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53474327ae5e166530d17f2d956afcb4f8a004de581b3cae10f12006bc8163e3" -dependencies = [ - "async-stream", - "bytes", - "futures-core", - "tokio", - "tokio-stream", -] - -[[package]] -name = "toml" -version = "0.7.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c17e963a819c331dcacd7ab957d80bc2b9a9c1e71c804826d2f283dd65306542" -dependencies = [ - "serde", - "serde_spanned", - "toml_datetime", - "toml_edit", -] - -[[package]] -name = "toml_datetime" -version = "0.6.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7cda73e2f1397b1262d6dfdcef8aafae14d1de7748d66822d3bfeeb6d03e5e4b" -dependencies = [ - "serde", -] - -[[package]] -name = "toml_edit" -version = "0.19.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8123f27e969974a3dfba720fdb560be359f57b44302d280ba72e76a74480e8a" -dependencies = [ - "indexmap", - "serde", - "serde_spanned", - "toml_datetime", - "winnow", -] - -[[package]] -name = "topiary" -version = "0.3.0" -dependencies = [ - "clap", - "criterion", - "env_logger", - "futures", - "itertools 0.11.0", - "log", - "pretty_assertions", - "prettydiff", - "regex", - "serde", - "serde_json", - "test-log", - "tokio", - "tokio-test", - "toml", - "tree-sitter-bash", - "tree-sitter-facade", - "tree-sitter-json", - "tree-sitter-nickel", - "tree-sitter-ocaml", - "tree-sitter-ocamllex", - "tree-sitter-query", - "tree-sitter-rust", - "tree-sitter-toml", - "unescape", - "web-tree-sitter-sys", -] - -[[package]] -name = "topiary-cli" -version = "0.3.0" -dependencies = [ - "assert_cmd", - "async-scoped", - "clap", - "clap_complete", - "directories", - "env_logger", - "futures", - "indoc", - "itertools 0.11.0", - "log", - "predicates", - "serde-toml-merge", - "tempfile", - "tokio", - "toml", - "topiary", - "topiary-queries", - "tree-sitter-bash", - "tree-sitter-facade", - "tree-sitter-json", - "tree-sitter-nickel", - "tree-sitter-ocaml", - "tree-sitter-ocamllex", - "tree-sitter-query", - "tree-sitter-rust", - "tree-sitter-toml", -] - -[[package]] -name = "topiary-playground" -version = "0.3.0" -dependencies = [ - "cfg-if", - "itertools 0.11.0", - "topiary", - "tree-sitter-facade", - "wasm-bindgen", - "wasm-bindgen-futures", -] - -[[package]] -name = "topiary-queries" -version = "0.3.0" - -[[package]] -name = "tree-sitter" -version = "0.20.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e747b1f9b7b931ed39a548c1fae149101497de3c1fc8d9e18c62c1a66c683d3d" -dependencies = [ - "cc", - "regex", -] - -[[package]] -name = "tree-sitter-bash" -version = "0.19.0" -source = "git+https://github.com/tree-sitter/tree-sitter-bash#1b0321ee85701d5036c334a6f04761cdc672e64c" -dependencies = [ - "cc", - "tree-sitter", -] - -[[package]] -name = "tree-sitter-facade" -version = "0.9.3" -source = "git+https://github.com/tweag/tree-sitter-facade#1b290e795e700a57d8bd303f98a9715ab1c4f598" -dependencies = [ - "js-sys", - "tree-sitter", - "wasm-bindgen", - "web-sys", - "web-tree-sitter-sys", -] - -[[package]] -name = "tree-sitter-json" -version = "0.20.0" -source = "git+https://github.com/tree-sitter/tree-sitter-json.git#ca3f8919800e3c1ad4508de3bfd7b0b860ce434f" -dependencies = [ - "cc", - "tree-sitter", -] - -[[package]] -name = "tree-sitter-nickel" -version = "0.0.1" -source = "git+https://github.com/nickel-lang/tree-sitter-nickel?rev=b1a4718601ebd29a62bf3a7fd1069a99ccf48093#b1a4718601ebd29a62bf3a7fd1069a99ccf48093" -dependencies = [ - "cc", - "tree-sitter", -] - -[[package]] -name = "tree-sitter-ocaml" -version = "0.20.4" -source = "git+https://github.com/tree-sitter/tree-sitter-ocaml.git#694c57718fd85d514f8b81176038e7a4cfabcaaf" -dependencies = [ - "cc", - "tree-sitter", -] - -[[package]] -name = "tree-sitter-ocamllex" -version = "0.20.2" -source = "git+https://github.com/314eter/tree-sitter-ocamllex.git#4b9898ccbf198602bb0dec9cd67cc1d2c0a4fad2" -dependencies = [ - "cc", - "tree-sitter", -] - -[[package]] -name = "tree-sitter-query" -version = "0.1.0" -source = "git+https://github.com/nvim-treesitter/tree-sitter-query#3a9808b22742d5bd906ef5d1a562f2f1ae57406d" -dependencies = [ - "cc", - "tree-sitter", -] - -[[package]] -name = "tree-sitter-rust" -version = "0.20.4" -source = "git+https://github.com/tree-sitter/tree-sitter-rust.git#17a6b15562b09db1f27b8f5f26f17edbb2aac097" -dependencies = [ - "cc", - "tree-sitter", -] - -[[package]] -name = "tree-sitter-toml" -version = "0.5.1" -source = "git+https://github.com/tree-sitter/tree-sitter-toml.git#342d9be207c2dba869b9967124c679b5e6fd0ebe" -dependencies = [ - "cc", - "tree-sitter", -] - -[[package]] -name = "unescape" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ccb97dac3243214f8d8507998906ca3e2e0b900bf9bf4870477f125b82e68f6e" - -[[package]] -name = "unicode-ident" -version = "1.0.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "301abaae475aa91687eb82514b328ab47a211a533026cb25fc3e519b86adfc3c" - -[[package]] -name = "unicode-width" -version = "0.1.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0edd1e5b14653f783770bce4a4dabb4a5108a5370a5f5d8cfe8710c361f6c8b" - -[[package]] -name = "utf8parse" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a" - -[[package]] -name = "wait-timeout" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f200f5b12eb75f8c1ed65abd4b2db8a6e1b138a20de009dacee265a2498f3f6" -dependencies = [ - "libc", -] - -[[package]] -name = "walkdir" -version = "2.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "36df944cda56c7d8d8b7496af378e6b16de9284591917d307c9b4d313c44e698" -dependencies = [ - "same-file", - "winapi-util", -] - -[[package]] -name = "wasi" -version = "0.11.0+wasi-snapshot-preview1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" - -[[package]] -name = "wasm-bindgen" -version = "0.2.84" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31f8dcbc21f30d9b8f2ea926ecb58f6b91192c17e9d33594b3df58b2007ca53b" -dependencies = [ - "cfg-if", - "wasm-bindgen-macro", -] - -[[package]] -name = "wasm-bindgen-backend" -version = "0.2.84" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95ce90fd5bcc06af55a641a86428ee4229e44e07033963a2290a8e241607ccb9" -dependencies = [ - "bumpalo", - "log", - "once_cell", - "proc-macro2", - "quote", - "syn 1.0.109", - "wasm-bindgen-shared", -] - -[[package]] -name = "wasm-bindgen-futures" -version = "0.4.34" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f219e0d211ba40266969f6dbdd90636da12f75bee4fc9d6c23d1260dadb51454" -dependencies = [ - "cfg-if", - "js-sys", - "wasm-bindgen", - "web-sys", -] - -[[package]] -name = "wasm-bindgen-macro" -version = "0.2.84" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c21f77c0bedc37fd5dc21f897894a5ca01e7bb159884559461862ae90c0b4c5" -dependencies = [ - "quote", - "wasm-bindgen-macro-support", -] - -[[package]] -name = "wasm-bindgen-macro-support" -version = "0.2.84" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2aff81306fcac3c7515ad4e177f521b5c9a15f2b08f4e32d823066102f35a5f6" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", - "wasm-bindgen-backend", - "wasm-bindgen-shared", -] - -[[package]] -name = "wasm-bindgen-shared" -version = "0.2.84" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0046fef7e28c3804e5e38bfa31ea2a0f73905319b677e57ebe37e49358989b5d" - -[[package]] -name = "web-sys" -version = "0.3.61" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e33b99f4b23ba3eec1a53ac264e35a755f00e966e0065077d6027c0f575b0b97" -dependencies = [ - "js-sys", - "wasm-bindgen", -] - -[[package]] -name = "web-tree-sitter-sys" -version = "1.3.0" -source = "git+https://github.com/tweag/web-tree-sitter-sys#9e9755b9ab59055092de4717ba0bafe6483f4e5c" -dependencies = [ - "js-sys", - "wasm-bindgen", - "wasm-bindgen-futures", - "web-sys", -] - -[[package]] -name = "winapi" -version = "0.3.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" -dependencies = [ - "winapi-i686-pc-windows-gnu", - "winapi-x86_64-pc-windows-gnu", -] - -[[package]] -name = "winapi-i686-pc-windows-gnu" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" - -[[package]] -name = "winapi-util" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178" -dependencies = [ - "winapi", -] - -[[package]] -name = "winapi-x86_64-pc-windows-gnu" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" - -[[package]] -name = "windows-sys" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" -dependencies = [ - "windows-targets", -] - -[[package]] -name = "windows-targets" -version = "0.48.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05d4b17490f70499f20b9e791dcf6a299785ce8af4d709018206dc5b4953e95f" -dependencies = [ - "windows_aarch64_gnullvm", - "windows_aarch64_msvc", - "windows_i686_gnu", - "windows_i686_msvc", - "windows_x86_64_gnu", - "windows_x86_64_gnullvm", - "windows_x86_64_msvc", -] - -[[package]] -name = "windows_aarch64_gnullvm" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91ae572e1b79dba883e0d315474df7305d12f569b400fcf90581b06062f7e1bc" - -[[package]] -name = "windows_aarch64_msvc" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2ef27e0d7bdfcfc7b868b317c1d32c641a6fe4629c171b8928c7b08d98d7cf3" - -[[package]] -name = "windows_i686_gnu" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "622a1962a7db830d6fd0a69683c80a18fda201879f0f447f065a3b7467daa241" - -[[package]] -name = "windows_i686_msvc" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4542c6e364ce21bf45d69fdd2a8e455fa38d316158cfd43b3ac1c5b1b19f8e00" - -[[package]] -name = "windows_x86_64_gnu" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca2b8a661f7628cbd23440e50b05d705db3686f894fc9580820623656af974b1" - -[[package]] -name = "windows_x86_64_gnullvm" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7896dbc1f41e08872e9d5e8f8baa8fdd2677f29468c4e156210174edc7f7b953" - -[[package]] -name = "windows_x86_64_msvc" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a" - -[[package]] -name = "winnow" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81fac9742fd1ad1bd9643b991319f72dd031016d44b77039a26977eb667141e7" -dependencies = [ - "memchr", -] - -[[package]] -name = "yansi" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09041cd90cf85f7f8b2df60c646f853b7f535ce68f85244eb6731cf89fa498ec" diff --git a/pkgs/by-name/to/topiary/package.nix b/pkgs/by-name/to/topiary/package.nix index 6be5eedcca5fb..f8bba2cf257b6 100644 --- a/pkgs/by-name/to/topiary/package.nix +++ b/pkgs/by-name/to/topiary/package.nix @@ -1,53 +1,86 @@ -{ lib -, rustPlatform -, fetchFromGitHub -, nix-update-script +{ + lib, + stdenv, + rustPlatform, + fetchFromGitHub, + iconv, + installShellFiles, + versionCheckHook, + nix-update-script, }: rustPlatform.buildRustPackage rec { pname = "topiary"; - version = "0.3.0"; + version = "0.5.1"; src = fetchFromGitHub { owner = "tweag"; - repo = pname; - rev = "v${version}"; - hash = "sha256-zt4uXkO6Y0Yc1Wt8l5O79oKbgNLrgip40ftD7UfUPwo="; + repo = "topiary"; + tag = "v${version}"; + hash = "sha256-Vsyl4tZ9AWTydpXw9IyvrD2tYiG8ySAD39lPwxRflSc="; }; - cargoLock = { - lockFile = ./Cargo.lock; - outputHashes = { - "tree-sitter-bash-0.19.0" = "sha256-a0/KyHV2jUpytsZSHI7tVw8GfYnuqVjfs5KScLZkB0I="; - "tree-sitter-facade-0.9.3" = "sha256-M/npshnHJkU70pP3I4WMXp3onlCSWM5mMIqXP45zcUs="; - "tree-sitter-json-0.20.0" = "sha256-cyrea0Y13OVGkXbYE0Cwc7nUsDGEZyoQmPAS9wVuHw0="; - "tree-sitter-nickel-0.0.1" = "sha256-aYsEx1Y5oDEqSPCUbf1G3J5Y45ULT9OkD+fn6stzrOU="; - "tree-sitter-ocaml-0.20.4" = "sha256-j3Hv2qOMxeBNOW+WIgIYzG3zMIFWPQpoHe94b2rT+A8="; - "tree-sitter-ocamllex-0.20.2" = "sha256-YhmEE7I7UF83qMuldHqc/fD/no/7YuZd6CaAIaZ1now="; - "tree-sitter-query-0.1.0" = "sha256-5N7FT0HTK3xzzhAlk3wBOB9xlEpKSNIfakgFnsxEi18="; - "tree-sitter-rust-0.20.4" = "sha256-seWoMuA87ZWCq3mUXopVeDCcTxX/Bh+B4PFLVa0CBQA="; - "tree-sitter-toml-0.5.1" = "sha256-5nLNBxFeOGE+gzbwpcrTVnuL1jLUA0ZLBVw2QrOLsDQ="; - "web-tree-sitter-sys-1.3.0" = "sha256-9rKB0rt0y9TD/HLRoB9LjEP9nO4kSWR9ylbbOXo2+2M="; - }; - }; + nativeBuildInputs = [ installShellFiles ]; + nativeInstallCheckInputs = [ versionCheckHook ]; + + useFetchCargoVendor = true; + cargoHash = "sha256-bk5993v0wn/emzJKvxaPBYjqCmP0BpOuFMga7ZOyqXg="; + + # https://github.com/NixOS/nixpkgs/pull/359145#issuecomment-2542418786 + depsExtraArgs.postBuild = '' + find $out -name '*.ps1' -print | while read -r file; do + if [ "$(file --brief --mime-encoding "$file")" == utf-16be ]; then + ${iconv}/bin/iconv -f UTF-16BE -t UTF16LE "$file" > tmp && mv tmp "$file" + fi + done + ''; - cargoBuildFlags = [ "-p" "topiary-cli" ]; + cargoBuildFlags = [ + "-p" + "topiary-cli" + ]; cargoTestFlags = cargoBuildFlags; + # Skip tests that cannot be executed in sandbox (operation not permited) + checkFlags = [ + "--skip=test_fmt_dir" + "--skip=test_fmt_files" + "--skip=test_fmt_files_query_fallback" + "--skip=test_fmt_stdin" + "--skip=test_fmt_stdin_query" + "--skip=test_fmt_stdin_query_fallback" + "--skip=test_vis" + "--skip=formatted_query_tester" + "--skip=input_output_tester" + ]; + env.TOPIARY_LANGUAGE_DIR = "${placeholder "out"}/share/queries"; - postInstall = '' - install -Dm444 queries/* -t $out/share/queries - ''; + postInstall = + '' + install -Dm444 topiary-queries/queries/* -t $out/share/queries + '' + + lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' + installShellCompletion --cmd topiary \ + --bash <($out/bin/topiary completion bash) \ + --fish <($out/bin/topiary completion fish) \ + --zsh <($out/bin/topiary completion zsh) + ''; + + doInstallCheck = true; + versionCheckProgramArg = [ "--version" ]; passthru.updateScript = nix-update-script { }; - meta = with lib; { + meta = { description = "Uniform formatter for simple languages, as part of the Tree-sitter ecosystem"; mainProgram = "topiary"; homepage = "https://github.com/tweag/topiary"; - changelog = "https://github.com/tweag/topiary/blob/${src.rev}/CHANGELOG.md"; - license = licenses.mit; - maintainers = with maintainers; [ figsoda ]; + changelog = "https://github.com/tweag/topiary/blob/${src.tag}/CHANGELOG.md"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ + figsoda + nartsiss + ]; }; } diff --git a/pkgs/by-name/tr/translatelocally/package.nix b/pkgs/by-name/tr/translatelocally/package.nix index babc0bfeb3e45..4249331b2b080 100644 --- a/pkgs/by-name/tr/translatelocally/package.nix +++ b/pkgs/by-name/tr/translatelocally/package.nix @@ -88,7 +88,7 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://translatelocally.com/"; description = "Fast and secure translation on your local machine, powered by marian and Bergamot"; license = licenses.mit; - maintainers = with maintainers; [ pacien ]; + maintainers = with maintainers; [ euxane ]; platforms = platforms.linux; }; }) diff --git a/pkgs/by-name/tr/trayscale/package.nix b/pkgs/by-name/tr/trayscale/package.nix index 449426e62c53d..ce29bad32b2b6 100644 --- a/pkgs/by-name/tr/trayscale/package.nix +++ b/pkgs/by-name/tr/trayscale/package.nix @@ -12,16 +12,16 @@ buildGoModule rec { pname = "trayscale"; - version = "0.14.0"; + version = "0.14.1"; src = fetchFromGitHub { owner = "DeedleFake"; repo = "trayscale"; rev = "v${version}"; - hash = "sha256-QUHWcAwyS+A9PzYk+bkDzHr7JPzJluq1+iOt25Z+TPc="; + hash = "sha256-LPONM7RxKlUp2LltoQaU0BLpFkYlH9EIqb6HQjVAtm8="; }; - vendorHash = "sha256-jEX+7d/2lmNKq3PLoRYyZrcy3A8+9fcQbmVmGacgX2w="; + vendorHash = "sha256-bG9ATj9fYBBReMyEUABtIS6zEh04raov0pSfMmZNfd8="; subPackages = [ "cmd/trayscale" ]; diff --git a/pkgs/by-name/wa/wakapi/package.nix b/pkgs/by-name/wa/wakapi/package.nix index 3648227346292..87aa0da39261c 100644 --- a/pkgs/by-name/wa/wakapi/package.nix +++ b/pkgs/by-name/wa/wakapi/package.nix @@ -4,7 +4,7 @@ fetchFromGitHub, }: let - version = "2.12.2"; + version = "2.12.3"; in buildGoModule { pname = "wakapi"; @@ -13,8 +13,8 @@ buildGoModule { src = fetchFromGitHub { owner = "muety"; repo = "wakapi"; - rev = "refs/tags/${version}"; - hash = "sha256-6wlFgIof4uzQ3phd7paHZ6Sezp0Dfj8qFzsudFKfNdU="; + tag = version; + hash = "sha256-kgzxeU5hM9fSidyJEmdTr26/w5OaBk1VdjSztmOgMYs="; }; vendorHash = "sha256-q5o88fwc1S14ZwGyDS9aFtJMfPZ4pmMjffmeXODhajg="; diff --git a/pkgs/by-name/yo/youtrack/package.nix b/pkgs/by-name/yo/youtrack/package.nix index bd577d54ddfe4..8e7c8694c58a3 100644 --- a/pkgs/by-name/yo/youtrack/package.nix +++ b/pkgs/by-name/yo/youtrack/package.nix @@ -10,11 +10,11 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "youtrack"; - version = "2024.3.52635"; + version = "2024.3.53776"; src = fetchzip { url = "https://download.jetbrains.com/charisma/youtrack-${finalAttrs.version}.zip"; - hash = "sha256-aCNKlZmOdIJsyYrh6c6dg21X3H+r6nThrw1HUg8iTqk="; + hash = "sha256-hTezfXdOvNsUiw60lnxLJLk39w39EdqnMzVQIjLCu3g="; }; nativeBuildInputs = [ makeBinaryWrapper ]; diff --git a/pkgs/by-name/zs/zsh-autosuggestions/package.nix b/pkgs/by-name/zs/zsh-autosuggestions/package.nix index b1df50a9c6813..e20f6fa85dbb0 100644 --- a/pkgs/by-name/zs/zsh-autosuggestions/package.nix +++ b/pkgs/by-name/zs/zsh-autosuggestions/package.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "zsh-autosuggestions"; - version = "0.7.0"; + version = "0.7.1"; src = fetchFromGitHub { owner = "zsh-users"; repo = "zsh-autosuggestions"; rev = "v${version}"; - sha256 = "1g3pij5qn2j7v7jjac2a63lxd97mcsgw6xq6k5p7835q9fjiid98"; + sha256 = "sha256-vpTyYq9ZgfgdDsWzjxVAE7FZH4MALMNZIFyEOBLm5Qo="; }; strictDeps = true; diff --git a/pkgs/development/ada-modules/gnatcoll/bindings.nix b/pkgs/development/ada-modules/gnatcoll/bindings.nix index 32d490c1e1bac..b5ca0bead755b 100644 --- a/pkgs/development/ada-modules/gnatcoll/bindings.nix +++ b/pkgs/development/ada-modules/gnatcoll/bindings.nix @@ -27,19 +27,20 @@ let python3 = [ python3 ncurses ]; syslog = [ ]; zlib = [ zlib ]; + cpp = [ ]; }; in stdenv.mkDerivation rec { pname = "gnatcoll-${component}"; - version = "24.0.0"; + version = "25.0.0"; src = fetchFromGitHub { owner = "AdaCore"; repo = "gnatcoll-bindings"; rev = "v${version}"; - sha256 = "00aakpmr67r72l1h3jpkaw83p1a2mjjvfk635yy5c1nss3ji1qjm"; + sha256 = "0ayc7zvv8w90v0xzhrjk2x88zrsk62xxcm27ya9crlp6affn5idk"; }; nativeBuildInputs = [ @@ -59,7 +60,7 @@ stdenv.mkDerivation rec { gnatcoll-core ] ++ libsFor."${component}" or []; - # explicit flag for GPL acceptance because upstreams + # explicit flag for GPL acceptance because upstream # allows a gcc runtime exception for all bindings # except for readline (since it is GPL w/o exceptions) buildFlags = lib.optionals (component == "readline") [ diff --git a/pkgs/development/ada-modules/gnatcoll/core.nix b/pkgs/development/ada-modules/gnatcoll/core.nix index 0180558e1b967..a121eec212eb8 100644 --- a/pkgs/development/ada-modules/gnatcoll/core.nix +++ b/pkgs/development/ada-modules/gnatcoll/core.nix @@ -3,39 +3,80 @@ , gnat , gprbuild , fetchFromGitHub +, fetchpatch2 , which +, python3 +, rsync +, enableGnatcollCore ? true + # TODO(@sternenseemann): figure out a way to split this up into three packages +, enableGnatcollProjects ? true + # for tests +, gnatcoll-core }: +# gnatcoll-projects depends on gnatcoll-core +assert enableGnatcollProjects -> enableGnatcollCore; + stdenv.mkDerivation rec { pname = "gnatcoll-core"; - version = "24.0.0"; + version = "25.0.0"; src = fetchFromGitHub { owner = "AdaCore"; repo = "gnatcoll-core"; rev = "v${version}"; - sha256 = "1cks2w0inj9hvamsdxjriwxnx1igmx2khhr6kwxshsl30rs8nzvb"; + sha256 = "1srnh7vhs46c2zy4hcy4pg0a0prghfzlpv7c82k0jan384yz1g6g"; }; + patches = [ + # Fix compilation with GNAT 12 https://github.com/AdaCore/gnatcoll-core/issues/88 + (fetchpatch2 { + name = "gnatcoll-core-gnat-12.patch"; + url = "https://github.com/AdaCore/gnatcoll-core/commit/515db1c9f1eea8095f2d9ff9570159a78c981ec6.patch"; + sha256 = "1ghnkhp5fncb7qcmf59kyqvy0sd0pzf1phnr2z7b4ljwlkbmcp36"; + }) + ]; + + postPatch = '' + patchShebangs */*.gpr.py + ''; + nativeBuildInputs = [ gprbuild which gnat + python3 + rsync ]; # propagate since gprbuild needs to find # referenced GPR project definitions - propagatedBuildInputs = [ + propagatedBuildInputs = lib.optionals enableGnatcollProjects [ gprbuild # libgpr ]; + strictDeps = true; + makeFlags = [ "prefix=${placeholder "out"}" "PROCESSORS=$(NIX_BUILD_CORES)" # confusingly, for gprbuild --target is autoconf --host "TARGET=${stdenv.hostPlatform.config}" + "GNATCOLL_MINIMAL_ONLY=${if !enableGnatcollCore then "yes" else "no"}" + "GNATCOLL_PROJECTS=${if enableGnatcollProjects then "yes" else "no"}" ]; + passthru.tests = { + minimalOnly = gnatcoll-core.override { + enableGnatcollProjects = false; + enableGnatcollCore = false; + }; + noProjects = gnatcoll-core.override { + enableGnatcollProjects = false; + enableGnatcollCore = true; + }; + }; + meta = with lib; { homepage = "https://github.com/AdaCore/gnatcoll-core"; description = "GNAT Components Collection - Core packages"; diff --git a/pkgs/development/ada-modules/gnatcoll/db.nix b/pkgs/development/ada-modules/gnatcoll/db.nix index 017a51e2fb750..1a670b5abf60e 100644 --- a/pkgs/development/ada-modules/gnatcoll/db.nix +++ b/pkgs/development/ada-modules/gnatcoll/db.nix @@ -54,13 +54,13 @@ stdenv.mkDerivation rec { if onlyExecutable then builtins.replaceStrings [ "_" ] [ "-" ] component else "gnatcoll-${component}"; - version = "24.0.0"; + version = "25.0.0"; src = fetchFromGitHub { owner = "AdaCore"; repo = "gnatcoll-db"; rev = "v${version}"; - sha256 = "0jq76s4s7q2x93jh8la6r0i3jkpvgsfj12vbbaqabh410xccyr3p"; + sha256 = "0q35ii0aa4hh59v768l5cilg1b30a4ckcvlbfy0lkcbp3rcfnbz3"; }; # Link executables dynamically unless specified by the platform, diff --git a/pkgs/development/ada-modules/gnatprove/default.nix b/pkgs/development/ada-modules/gnatprove/default.nix index 6e0eda57e8dba..e08461a44c41d 100644 --- a/pkgs/development/ada-modules/gnatprove/default.nix +++ b/pkgs/development/ada-modules/gnatprove/default.nix @@ -13,7 +13,10 @@ let gnat_version = lib.versions.major gnat.version; # gnatprove fsf-14 requires gpr2 from a special branch - gpr2_24_2_next = gpr2.overrideAttrs(old: rec { + gpr2_24_2_next = (gpr2.override { + # pregenerated kb db is not included + gpr2kbdir = "${gprbuild}/share/gprconfig"; + }).overrideAttrs(old: rec { version = "24.2.0-next"; src = fetchFromGitHub { owner = "AdaCore"; diff --git a/pkgs/development/ada-modules/gpr2/default.nix b/pkgs/development/ada-modules/gpr2/default.nix index 1ad58b125db42..db7fd76264cb0 100644 --- a/pkgs/development/ada-modules/gpr2/default.nix +++ b/pkgs/development/ada-modules/gpr2/default.nix @@ -5,19 +5,22 @@ gprbuild, which, gnat, + xmlada, gnatcoll-core, gnatcoll-iconv, gnatcoll-gmp, enableShared ? !stdenv.hostPlatform.isStatic, + # kb database source, if null assume it is pregenerated + gpr2kbdir ? null, }: stdenv.mkDerivation rec { pname = "gpr2"; - version = "24.0.0"; + version = "25.0.0"; src = fetchurl { - url = "https://github.com/AdaCore/gpr/releases/download/v${version}/gpr2-with-lkparser-${lib.versions.majorMinor version}.tgz"; - sha256 = "1g90689k94q3ma7q76gnjipfblgfvcq6ldwbzcf0l5hx6n8vbly8"; + url = "https://github.com/AdaCore/gpr/releases/download/v${version}/gpr2-with-gprconfig_kb-${lib.versions.majorMinor version}.tgz"; + sha512 = "70fe0fcf541f6d3d90a34cab1638bbc0283dcd765c000406e0cfb73bae1817b30ddfe73f3672247a97c6b6bfc41900bc96a4440ca0c660f9c2f7b9d3cc8f8dcf"; }; nativeBuildInputs = [ @@ -26,15 +29,30 @@ stdenv.mkDerivation rec { gprbuild ]; - makeFlags = [ - "prefix=$(out)" - "GPR2KBDIR=${gprbuild}/share/gprconfig" - "PROCESSORS=$(NIX_BUILD_CORES)" - "ENABLE_SHARED=${if enableShared then "yes" else "no"}" - ]; + makeFlags = + [ + "prefix=$(out)" + "PROCESSORS=$(NIX_BUILD_CORES)" + "ENABLE_SHARED=${if enableShared then "yes" else "no"}" + "GPR2_BUILD=release" + ] + ++ lib.optionals (gpr2kbdir != null) [ + "GPR2KBDIR=${gpr2kbdir}" + ]; + + configurePhase = '' + runHook preConfigure + make setup "''${makeFlagsArray[@]}" $makeFlags + runHook postConfigure + ''; + + # fool make into thinking pregenerated targets are up to date + preBuild = lib.optionalString (gpr2kbdir == null) '' + touch .build/kb/{*.adb,*.ads,collect_kb} + ''; propagatedBuildInputs = [ - gprbuild + xmlada gnatcoll-gmp gnatcoll-core gnatcoll-iconv @@ -49,5 +67,7 @@ stdenv.mkDerivation rec { ]; maintainers = with maintainers; [ heijligen ]; platforms = platforms.all; + # TODO(@sternenseemann): investigate failure with gnat 13 + broken = lib.versionOlder gnat.version "14"; }; } diff --git a/pkgs/development/ada-modules/gprbuild/boot.nix b/pkgs/development/ada-modules/gprbuild/boot.nix index 4207b3649594f..0fd3f3c5e8e92 100644 --- a/pkgs/development/ada-modules/gprbuild/boot.nix +++ b/pkgs/development/ada-modules/gprbuild/boot.nix @@ -7,14 +7,14 @@ }: let - version = "24.0.0"; + version = "25.0.0"; gprConfigKbSrc = fetchFromGitHub { name = "gprconfig-kb-${version}-src"; owner = "AdaCore"; repo = "gprconfig_kb"; rev = "v${version}"; - sha256 = "1vnjv2q63l8nq2w4wya75m40isvs78j5ss9b5ga3zx3cpdx3xh09"; + sha256 = "09x1njq0i0z7fbwg0mg39r5ghy7369avbqvdycfj67lpmw17gb1r"; }; in @@ -27,7 +27,7 @@ stdenv.mkDerivation { owner = "AdaCore"; repo = "gprbuild"; rev = "v${version}"; - sha256 = "096a43453z2xknn6x4hyk2ldp2wh0qhfdfmzsrks50zqcvmkq4v7"; + sha256 = "1mqsmc0q5bzg8223ls18kbvaz6mhzjz7ik8d3sqhhn24c0j6wjaw"; }; nativeBuildInputs = [ diff --git a/pkgs/development/ada-modules/xmlada/default.nix b/pkgs/development/ada-modules/xmlada/default.nix index 77e8094277a71..d3429606c6da2 100644 --- a/pkgs/development/ada-modules/xmlada/default.nix +++ b/pkgs/development/ada-modules/xmlada/default.nix @@ -9,14 +9,14 @@ stdenv.mkDerivation rec { pname = "xmlada"; - version = "24.0.0"; + version = "25.0.0"; src = fetchFromGitHub { name = "xmlada-${version}-src"; owner = "AdaCore"; repo = "xmlada"; rev = "v${version}"; - sha256 = "sha256-vvM7bdf3dAa3zKgxbGeAGlBT6fvafzmleimJHyRdlvc="; + sha256 = "sha256-UMJiXSHMS8+X5gyV1nmC29gF71BFnz7LNPQnwUMD3Yg="; }; nativeBuildInputs = [ diff --git a/pkgs/development/ocaml-modules/mlx/default.nix b/pkgs/development/ocaml-modules/mlx/default.nix new file mode 100644 index 0000000000000..436fc41ab5da2 --- /dev/null +++ b/pkgs/development/ocaml-modules/mlx/default.nix @@ -0,0 +1,33 @@ +{ + lib, + fetchFromGitHub, + buildDunePackage, + ppxlib, + menhir, +}: + +buildDunePackage rec { + pname = "mlx"; + version = "0.9"; + + minimalOCamlVersion = "4.14"; + + src = fetchFromGitHub { + owner = "ocaml-mlx"; + repo = "mlx"; + rev = version; + hash = "sha256-3hPtyBKD2dp4UJBykOudW6KR2KXPnBuDnuJ1UNLpAp0="; + }; + + buildInputs = [ + ppxlib + menhir + ]; + + meta = with lib; { + description = "OCaml syntax dialect which adds JSX syntax expressions"; + homepage = "https://github.com/ocaml-mlx/mlx"; + license = licenses.lgpl21Plus; + maintainers = with maintainers; [ Denommus ]; + }; +} diff --git a/pkgs/development/python-modules/dbt-bigquery/default.nix b/pkgs/development/python-modules/dbt-bigquery/default.nix index 7c29273ff82d5..bcae9b616be71 100644 --- a/pkgs/development/python-modules/dbt-bigquery/default.nix +++ b/pkgs/development/python-modules/dbt-bigquery/default.nix @@ -2,6 +2,8 @@ lib, agate, buildPythonPackage, + dbt-adapters, + dbt-common, dbt-core, fetchFromGitHub, google-cloud-bigquery, @@ -14,16 +16,16 @@ buildPythonPackage rec { pname = "dbt-bigquery"; - version = "1.8.3"; + version = "1.9.0"; pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "dbt-labs"; repo = "dbt-bigquery"; - rev = "refs/tags/v${version}"; - hash = "sha256-PlYQo4jqCQiHmlPB4aEhecZs3U6miDjhGR7Qct9IPbM="; + tag = "v${version}"; + hash = "sha256-jn4U01aUpnjBnOJNyzJXPqmXJZc16pSLN9WkRxsC0zo="; }; pythonRelaxDeps = [ "agate" ]; @@ -34,6 +36,8 @@ buildPythonPackage rec { dependencies = [ agate + dbt-common + dbt-adapters dbt-core google-cloud-bigquery google-cloud-storage diff --git a/pkgs/development/python-modules/dbt-postgres/default.nix b/pkgs/development/python-modules/dbt-postgres/default.nix index f3503eac82d02..2db1292cb24c2 100644 --- a/pkgs/development/python-modules/dbt-postgres/default.nix +++ b/pkgs/development/python-modules/dbt-postgres/default.nix @@ -13,20 +13,18 @@ buildPythonPackage rec { pname = "dbt-postgres"; - version = "1.8.2"; + version = "1.9.0"; pyproject = true; - disabled = pythonOlder "3.8"; + disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "dbt-labs"; repo = "dbt-postgres"; - rev = "refs/tags/v${version}"; - hash = "sha256-E7Y2lY8aCiAZx5sLWwpOBLTrdOsCQAdWWJTvR2jGOaA="; + tag = "v${version}"; + hash = "sha256-lywWf78rluX17D5bcfehHd7X18tAdw3HZ65v440jETc="; }; - env.DBT_PSYCOPG2_NAME = "psycopg2"; - build-system = [ hatchling ]; pythonRemoveDeps = [ "psycopg2-binary" ]; diff --git a/pkgs/development/python-modules/dbt-redshift/default.nix b/pkgs/development/python-modules/dbt-redshift/default.nix index 6bd42b7fadba7..ef9cf7aed30cc 100644 --- a/pkgs/development/python-modules/dbt-redshift/default.nix +++ b/pkgs/development/python-modules/dbt-redshift/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "dbt-redshift"; - version = "1.8.1"; + version = "1.9.0"; pyproject = true; disabled = pythonOlder "3.10"; @@ -22,8 +22,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "dbt-labs"; repo = "dbt-redshift"; - rev = "refs/tags/v${version}"; - hash = "sha256-SmFN1GXX14L+3jtAo5Vqm53HLRaear2U/KI2Afx0ztU="; + tag = "v${version}"; + hash = "sha256-ayt5KRH3jAoi7k+0yfk1ZSqG4qsM+zny8tDnWOWO5oA="; }; pythonRelaxDeps = [ diff --git a/pkgs/development/python-modules/embrace/default.nix b/pkgs/development/python-modules/embrace/default.nix index 4ad658d7736c5..8fe77b069ead2 100644 --- a/pkgs/development/python-modules/embrace/default.nix +++ b/pkgs/development/python-modules/embrace/default.nix @@ -41,6 +41,6 @@ buildPythonPackage rec { description = "Embrace SQL keeps your SQL queries in SQL files"; homepage = "https://pypi.org/project/embrace/"; license = licenses.asl20; - maintainers = with maintainers; [ pacien ]; + maintainers = with maintainers; [ euxane ]; }; } diff --git a/pkgs/development/python-modules/jupysql-plugin/default.nix b/pkgs/development/python-modules/jupysql-plugin/default.nix index 4ca16978ac1b1..357a971cb17d6 100644 --- a/pkgs/development/python-modules/jupysql-plugin/default.nix +++ b/pkgs/development/python-modules/jupysql-plugin/default.nix @@ -43,6 +43,6 @@ buildPythonPackage rec { homepage = "https://github.com/ploomber/jupysql-plugin"; changelog = "https://github.com/ploomber/jupysql-plugin/blob/${version}/CHANGELOG.md"; license = licenses.bsd3; - maintainers = with maintainers; [ pacien ]; + maintainers = with maintainers; [ euxane ]; }; } diff --git a/pkgs/development/python-modules/jupysql/default.nix b/pkgs/development/python-modules/jupysql/default.nix index 56326d52d8378..6c2110d5df381 100644 --- a/pkgs/development/python-modules/jupysql/default.nix +++ b/pkgs/development/python-modules/jupysql/default.nix @@ -134,6 +134,6 @@ buildPythonPackage rec { homepage = "https://github.com/ploomber/jupysql"; changelog = "https://github.com/ploomber/jupysql/blob/${version}/CHANGELOG.md"; license = lib.licenses.asl20; - maintainers = with lib.maintainers; [ pacien ]; + maintainers = with lib.maintainers; [ euxane ]; }; } diff --git a/pkgs/development/python-modules/mediafire-dl/default.nix b/pkgs/development/python-modules/mediafire-dl/default.nix index d4f5235007a56..3598ff215df7a 100644 --- a/pkgs/development/python-modules/mediafire-dl/default.nix +++ b/pkgs/development/python-modules/mediafire-dl/default.nix @@ -30,7 +30,7 @@ buildPythonPackage { description = "Simple command-line script to download files from mediafire based on gdown"; homepage = "https://github.com/Juvenal-Yescas/mediafire-dl"; license = licenses.mit; - maintainers = with maintainers; [ pacien ]; + maintainers = with maintainers; [ euxane ]; mainProgram = "mediafire-dl"; }; } diff --git a/pkgs/development/python-modules/ploomber-core/default.nix b/pkgs/development/python-modules/ploomber-core/default.nix index e5d8eb2e480ae..e05f4d9f9246b 100644 --- a/pkgs/development/python-modules/ploomber-core/default.nix +++ b/pkgs/development/python-modules/ploomber-core/default.nix @@ -44,6 +44,6 @@ buildPythonPackage rec { homepage = "https://github.com/ploomber/core"; changelog = "https://github.com/ploomber/core/blob/${version}/CHANGELOG.md"; license = licenses.asl20; - maintainers = with maintainers; [ pacien ]; + maintainers = with maintainers; [ euxane ]; }; } diff --git a/pkgs/development/python-modules/ploomber-extension/default.nix b/pkgs/development/python-modules/ploomber-extension/default.nix index 9c020f25fa6fd..c19c0267fe41e 100644 --- a/pkgs/development/python-modules/ploomber-extension/default.nix +++ b/pkgs/development/python-modules/ploomber-extension/default.nix @@ -46,6 +46,6 @@ buildPythonPackage rec { description = "Ploomber extension"; homepage = "https://pypi.org/project/ploomber-extension"; license = licenses.bsd3; - maintainers = with maintainers; [ pacien ]; + maintainers = with maintainers; [ euxane ]; }; } diff --git a/pkgs/development/tools/continuous-integration/woodpecker/common.nix b/pkgs/development/tools/continuous-integration/woodpecker/common.nix index ac4a3ce79c510..67875a83fe413 100644 --- a/pkgs/development/tools/continuous-integration/woodpecker/common.nix +++ b/pkgs/development/tools/continuous-integration/woodpecker/common.nix @@ -1,7 +1,7 @@ { lib, fetchzip }: let - version = "2.8.0"; - srcHash = "sha256-0aYEZaLFPLyGoHplyGZsn4xerUlYi00aLfgkqO2Yb2E="; + version = "2.8.2"; + srcHash = "sha256-1TfD5CXOQKHyO7ARo7oqc2LdiHOyOU/OYNY8j+9QpQ8="; # The tarball contains vendored dependencies vendorHash = null; in diff --git a/pkgs/servers/matrix-appservice-discord/default.nix b/pkgs/servers/matrix-appservice-discord/default.nix index 0b139fb2b50be..dcd43ba0d8529 100644 --- a/pkgs/servers/matrix-appservice-discord/default.nix +++ b/pkgs/servers/matrix-appservice-discord/default.nix @@ -103,7 +103,7 @@ mkYarnPackage rec { description = "Bridge between Matrix and Discord"; homepage = "https://github.com/Half-Shot/matrix-appservice-discord"; license = lib.licenses.asl20; - maintainers = with lib.maintainers; [ pacien ]; + maintainers = with lib.maintainers; [ euxane ]; platforms = lib.platforms.linux; mainProgram = "matrix-appservice-discord"; }; diff --git a/pkgs/shells/fish/plugins/clownfish.nix b/pkgs/shells/fish/plugins/clownfish.nix index 386ba8d6332f6..c70dc11fd3e4e 100644 --- a/pkgs/shells/fish/plugins/clownfish.nix +++ b/pkgs/shells/fish/plugins/clownfish.nix @@ -19,6 +19,6 @@ buildFishPlugin { description = "Fish function to mock the behaviour of commands"; homepage = "https://github.com/IlanCosman/clownfish"; license = licenses.mit; - maintainers = with maintainers; [ pacien ]; + maintainers = with maintainers; [ euxane ]; }; } diff --git a/pkgs/shells/fish/plugins/fishtape.nix b/pkgs/shells/fish/plugins/fishtape.nix index ab94045c107ee..6bfe0dba1a7d2 100644 --- a/pkgs/shells/fish/plugins/fishtape.nix +++ b/pkgs/shells/fish/plugins/fishtape.nix @@ -31,6 +31,6 @@ buildFishPlugin rec { description = "TAP-based test runner for Fish"; homepage = "https://github.com/jorgebucaran/fishtape"; license = lib.licenses.mit; - maintainers = with lib.maintainers; [ pacien ]; + maintainers = with lib.maintainers; [ euxane ]; }; } diff --git a/pkgs/shells/fish/plugins/fishtape_3.nix b/pkgs/shells/fish/plugins/fishtape_3.nix index 04814634c6cfa..fa9d1c3839a05 100644 --- a/pkgs/shells/fish/plugins/fishtape_3.nix +++ b/pkgs/shells/fish/plugins/fishtape_3.nix @@ -24,6 +24,6 @@ buildFishPlugin rec { description = "100% pure-Fish test runner"; homepage = "https://github.com/jorgebucaran/fishtape"; license = licenses.mit; - maintainers = with maintainers; [ pacien ]; + maintainers = with maintainers; [ euxane ]; }; } diff --git a/pkgs/shells/fish/plugins/fzf-fish.nix b/pkgs/shells/fish/plugins/fzf-fish.nix index a77207a8829bd..1bf3f640e3095 100644 --- a/pkgs/shells/fish/plugins/fzf-fish.nix +++ b/pkgs/shells/fish/plugins/fzf-fish.nix @@ -64,7 +64,7 @@ buildFishPlugin rec { changelog = "https://github.com/PatrickF1/fzf.fish/releases/tag/${src.rev}"; license = licenses.mit; maintainers = with maintainers; [ - pacien + euxane natsukium ]; }; diff --git a/pkgs/shells/fish/plugins/pure.nix b/pkgs/shells/fish/plugins/pure.nix index 717c72dcf3222..c5a288b8f0279 100644 --- a/pkgs/shells/fish/plugins/pure.nix +++ b/pkgs/shells/fish/plugins/pure.nix @@ -30,6 +30,6 @@ buildFishPlugin rec { description = "Pretty, minimal and fast Fish prompt, ported from zsh"; homepage = "https://github.com/rafaelrinaldi/pure"; license = lib.licenses.mit; - maintainers = with lib.maintainers; [ pacien ]; + maintainers = with lib.maintainers; [ euxane ]; }; } diff --git a/pkgs/tools/misc/esphome/default.nix b/pkgs/tools/misc/esphome/default.nix index 9713114f6fb04..8d2e388b0688d 100644 --- a/pkgs/tools/misc/esphome/default.nix +++ b/pkgs/tools/misc/esphome/default.nix @@ -22,14 +22,14 @@ let in python.pkgs.buildPythonApplication rec { pname = "esphome"; - version = "2024.12.1"; + version = "2024.12.2"; pyproject = true; src = fetchFromGitHub { owner = pname; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-XWjWmp5lfdyJxD8dPCFq3HbcCzfAtTyzpOSa+IjUNm0="; + hash = "sha256-VW9p3VNVJOw5vkjCU4fujG0ie4N2D2QLidBANPV512U="; }; build-systems = with python.pkgs; [ diff --git a/pkgs/tools/security/pass/wofi-pass.nix b/pkgs/tools/security/pass/wofi-pass.nix index 0356cd23d8458..68039864ffb5c 100644 --- a/pkgs/tools/security/pass/wofi-pass.nix +++ b/pkgs/tools/security/pass/wofi-pass.nix @@ -30,13 +30,13 @@ let in stdenv.mkDerivation rec { pname = "wofi-pass"; - version = "24.0.2"; + version = "24.1.0"; src = fetchFromGitHub { owner = "schmidtandreas"; repo = "wofi-pass"; rev = "v${version}"; - sha256 = "sha256-OtUz0YLKuEzA4kv+llrOll0L84nMTkYH6JPxrkQKB6I="; + sha256 = "sha256-oRGDhr28UQjr+g//fWcLKWXqKSsRUWtdh39UMFSaPfw="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/top-level/ada-packages.nix b/pkgs/top-level/ada-packages.nix index ad29103deb226..d2f86c0c1301e 100644 --- a/pkgs/top-level/ada-packages.nix +++ b/pkgs/top-level/ada-packages.nix @@ -26,11 +26,12 @@ makeScopeWithSplicing' { gnatcoll-core = self.callPackage ../development/ada-modules/gnatcoll/core.nix { }; # gnatcoll-bindings repository + gnatcoll-cpp = self.callPackage ../development/ada-modules/gnatcoll/bindings.nix { component = "cpp"; }; gnatcoll-gmp = self.callPackage ../development/ada-modules/gnatcoll/bindings.nix { component = "gmp"; }; gnatcoll-iconv = self.callPackage ../development/ada-modules/gnatcoll/bindings.nix { component = "iconv"; }; gnatcoll-lzma = self.callPackage ../development/ada-modules/gnatcoll/bindings.nix { component = "lzma"; }; gnatcoll-omp = self.callPackage ../development/ada-modules/gnatcoll/bindings.nix { component = "omp"; }; - gnatcoll-python3 = self.callPackage ../development/ada-modules/gnatcoll/bindings.nix { component = "python3"; python3 = pkgs.python39; }; + gnatcoll-python3 = self.callPackage ../development/ada-modules/gnatcoll/bindings.nix { component = "python3"; python3 = pkgs.python312; }; gnatcoll-readline = self.callPackage ../development/ada-modules/gnatcoll/bindings.nix { component = "readline"; }; gnatcoll-syslog = self.callPackage ../development/ada-modules/gnatcoll/bindings.nix { component = "syslog"; }; gnatcoll-zlib = self.callPackage ../development/ada-modules/gnatcoll/bindings.nix { component = "zlib"; }; diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 618e94b927211..1eb7e48874fd4 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -1205,6 +1205,8 @@ let mlgmpidl = callPackage ../development/ocaml-modules/mlgmpidl { }; + mlx = callPackage ../development/ocaml-modules/mlx { }; + mm = callPackage ../development/ocaml-modules/mm { }; mmap = callPackage ../development/ocaml-modules/mmap { };