From 20b99b975998eb39a9aa8ca2cecd088db1901f23 Mon Sep 17 00:00:00 2001 From: "Alexander V. Nikolaev" Date: Sun, 5 May 2024 16:51:00 +0300 Subject: [PATCH 001/235] fallout-ce: Fix broken game load/save due to case sensitive filesystem (fix fallout2-ce as well) --- pkgs/games/fallout-ce/build.nix | 3 ++- pkgs/games/fallout-ce/fallout-ce.nix | 9 +++++++++ pkgs/games/fallout-ce/fallout2-ce.nix | 9 +++++++++ 3 files changed, 20 insertions(+), 1 deletion(-) diff --git a/pkgs/games/fallout-ce/build.nix b/pkgs/games/fallout-ce/build.nix index c220895db08c..74d2e706324a 100644 --- a/pkgs/games/fallout-ce/build.nix +++ b/pkgs/games/fallout-ce/build.nix @@ -7,6 +7,7 @@ , extraBuildInputs ? [ ] , extraMeta +, patches , pname , version , src @@ -45,7 +46,7 @@ let ''; in stdenv.mkDerivation { - inherit pname version src; + inherit pname version src patches; nativeBuildInputs = [ cmake ]; buildInputs = [ SDL2 ] ++ extraBuildInputs; diff --git a/pkgs/games/fallout-ce/fallout-ce.nix b/pkgs/games/fallout-ce/fallout-ce.nix index 2f229fdf7380..c1b77d25b610 100644 --- a/pkgs/games/fallout-ce/fallout-ce.nix +++ b/pkgs/games/fallout-ce/fallout-ce.nix @@ -1,5 +1,6 @@ { callPackage , fetchFromGitHub +, fetchpatch2 }: callPackage ./build.nix rec { @@ -13,6 +14,14 @@ callPackage ./build.nix rec { hash = "sha256-ZiBoF3SL00sN0QrD3fkWG9SAknumOvzRB1oQJff6ITA="; }; + patches = [ + # Fix case-sensitive filesystems issue when save/load games + (fetchpatch2 { + url = "https://github.com/alexbatalov/fallout1-ce/commit/aa3c5c1e3e3f9642d536406b2d8d6b362c9e402f.patch"; + sha256 = "sha256-quFRbKMS2pNDCNTWc1ZoB3jnB5qzw0b+2OeJUi8IPBc="; + }) + ]; + extraMeta = { description = "A fully working re-implementation of Fallout, with the same original gameplay, engine bugfixes, and some quality of life improvements"; homepage = "https://github.com/alexbatalov/fallout1-ce"; diff --git a/pkgs/games/fallout-ce/fallout2-ce.nix b/pkgs/games/fallout-ce/fallout2-ce.nix index 6d665c96a0e2..de73fd239921 100644 --- a/pkgs/games/fallout-ce/fallout2-ce.nix +++ b/pkgs/games/fallout-ce/fallout2-ce.nix @@ -1,5 +1,6 @@ { callPackage , fetchFromGitHub +, fetchpatch2 , zlib }: @@ -14,6 +15,14 @@ callPackage ./build.nix rec { hash = "sha256-r1pnmyuo3uw2R0x9vGScSHIVNA6t+txxABzgHkUEY5U="; }; + patches = [ + # Fix case-sensitive filesystems issue when save/load games + (fetchpatch2 { + url = "https://github.com/alexbatalov/fallout2-ce/commit/d843a662b3ceaf01ac363e9abb4bfceb8b805c36.patch"; + sha256 = "sha256-u4E9+DE6sGYikIGwKDmSBj3ErCfIo6YzIw2eMiqXw/E="; + }) + ]; + extraBuildInputs = [ zlib ]; extraMeta = { From d66d7578a7977894abc6a04d8e5d509ec4ebdc36 Mon Sep 17 00:00:00 2001 From: Thom <136716995+thom-cameron@users.noreply.github.com> Date: Tue, 11 Jun 2024 10:33:27 +0100 Subject: [PATCH 002/235] ardour: add to vst plugin search path --- .../applications/audio/ardour/default-plugin-search-paths.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/audio/ardour/default-plugin-search-paths.patch b/pkgs/applications/audio/ardour/default-plugin-search-paths.patch index 8cd3118b9573..68d67ce8b9bc 100644 --- a/pkgs/applications/audio/ardour/default-plugin-search-paths.patch +++ b/pkgs/applications/audio/ardour/default-plugin-search-paths.patch @@ -21,7 +21,7 @@ index a572ed55dd..3dd6c2fda6 100644 lxvst_path = "/usr/local/lib64/lxvst:/usr/local/lib/lxvst:/usr/lib64/lxvst:/usr/lib/lxvst:" "/usr/local/lib64/linux_vst:/usr/local/lib/linux_vst:/usr/lib64/linux_vst:/usr/lib/linux_vst:" - "/usr/lib/vst:/usr/local/lib/vst"; -+ "/usr/lib/vst:/usr/local/lib/vst:" ++ "/usr/lib/vst:/usr/local/lib/vst:$HOME/.nix-profile/lib/vst:" + "$HOME/.lxvst:$HOME/.nix-profile/lib/lxvst:/run/current-system/sw/lib/lxvst:/etc/profiles/per-user/$USER/lib/lxvst"; } From aca603a8e4dae1f448815dcd3ba48c27a2767a49 Mon Sep 17 00:00:00 2001 From: Vladimir Panteleev Date: Tue, 25 Jun 2024 09:27:57 +0000 Subject: [PATCH 003/235] redshift: Fix missing "vidmode" support Fixes "-m vidmode". --- pkgs/applications/misc/redshift/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/applications/misc/redshift/default.nix b/pkgs/applications/misc/redshift/default.nix index 70d30ea054e6..9cd8a6b28152 100644 --- a/pkgs/applications/misc/redshift/default.nix +++ b/pkgs/applications/misc/redshift/default.nix @@ -6,6 +6,7 @@ , withQuartz ? stdenv.isDarwin, ApplicationServices , withRandr ? stdenv.isLinux, libxcb , withDrm ? stdenv.isLinux, libdrm +, withVidmode ? stdenv.isLinux, libXxf86vm , withGeolocation ? true , withCoreLocation ? withGeolocation && stdenv.isDarwin, CoreLocation, Foundation, Cocoa @@ -40,6 +41,7 @@ let "--enable-randr=${if withRandr then "yes" else "no"}" "--enable-geoclue2=${if withGeoclue then "yes" else "no"}" "--enable-drm=${if withDrm then "yes" else "no"}" + "--enable-vidmode=${if withVidmode then "yes" else "no"}" "--enable-quartz=${if withQuartz then "yes" else "no"}" "--enable-corelocation=${if withCoreLocation then "yes" else "no"}" ] ++ lib.optionals (pname == "gammastep") [ @@ -53,6 +55,7 @@ let ] ++ lib.optional withRandr libxcb ++ lib.optional withGeoclue geoclue ++ lib.optional withDrm libdrm + ++ lib.optional withVidmode libXxf86vm ++ lib.optional withQuartz ApplicationServices ++ lib.optionals withCoreLocation [ CoreLocation Foundation Cocoa ] ++ lib.optional withAppIndicator (if (pname != "gammastep") From 0dfc820f4a915a979ccb4ba420a8fcad48345170 Mon Sep 17 00:00:00 2001 From: Ihor Stuzhuk Date: Thu, 18 Jul 2024 15:45:13 +0300 Subject: [PATCH 004/235] e2fsprogs: build fuse2fs on darwin --- pkgs/tools/filesystems/e2fsprogs/default.nix | 8 ++++---- .../tools/filesystems/e2fsprogs/macfuse.patch | 20 +++++++++++++++++++ 2 files changed, 24 insertions(+), 4 deletions(-) create mode 100644 pkgs/tools/filesystems/e2fsprogs/macfuse.patch diff --git a/pkgs/tools/filesystems/e2fsprogs/default.nix b/pkgs/tools/filesystems/e2fsprogs/default.nix index 1ed100a3fe6b..9ac3808dc4a5 100644 --- a/pkgs/tools/filesystems/e2fsprogs/default.nix +++ b/pkgs/tools/filesystems/e2fsprogs/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, buildPackages, fetchurl, fetchpatch, pkg-config, libuuid, gettext, texinfo -, withFuse ? stdenv.isLinux, fuse3 +, withFuse ? stdenv.isLinux || stdenv.isDarwin, fuse3, macfuse-stubs , shared ? !stdenv.hostPlatform.isStatic , e2fsprogs, runCommand }: @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { depsBuildBuild = [ buildPackages.stdenv.cc ]; nativeBuildInputs = [ pkg-config texinfo ]; buildInputs = [ libuuid gettext ] - ++ lib.optionals withFuse [ fuse3 ]; + ++ lib.optional withFuse (if stdenv.isDarwin then macfuse-stubs else fuse3); patches = [ # Avoid trouble with older systems like NixOS 23.05. @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { url = "https://lore.kernel.org/linux-ext4/20240527091542.4121237-2-hi@alyssa.is/raw"; hash = "sha256-pMoqm2eo5zYaTdU+Ppa4+posCVFb2A9S4uo5oApaaqc="; }) - ]; + ] ++ lib.optional stdenv.isDarwin ./macfuse.patch; configureFlags = if stdenv.isLinux then [ @@ -57,7 +57,7 @@ stdenv.mkDerivation rec { "--disable-uuidd" ] else [ "--enable-libuuid --disable-e2initrd-helper" - ]; + ] ++ lib.optional stdenv.isDarwin "CFLAGS=-D_FILE_OFFSET_BITS=64"; nativeCheckInputs = [ buildPackages.perl ]; doCheck = true; diff --git a/pkgs/tools/filesystems/e2fsprogs/macfuse.patch b/pkgs/tools/filesystems/e2fsprogs/macfuse.patch new file mode 100644 index 000000000000..2445958edd79 --- /dev/null +++ b/pkgs/tools/filesystems/e2fsprogs/macfuse.patch @@ -0,0 +1,20 @@ +--- a/misc/fuse2fs.c ++++ b/misc/fuse2fs.c +@@ -2441,7 +2441,7 @@ + #undef XATTR_TRANSLATOR + + static int op_getxattr(const char *path, const char *key, char *value, +- size_t len) ++ size_t len, uint32_t position EXT2FS_ATTR((unused))) + { + struct fuse_context *ctxt = fuse_get_context(); + struct fuse2fs *ff = (struct fuse2fs *)ctxt->private_data; +@@ -2623,7 +2623,7 @@ + + static int op_setxattr(const char *path EXT2FS_ATTR((unused)), + const char *key, const char *value, +- size_t len, int flags EXT2FS_ATTR((unused))) ++ size_t len, int flags EXT2FS_ATTR((unused)), uint32_t position EXT2FS_ATTR((unused))) + { + struct fuse_context *ctxt = fuse_get_context(); + struct fuse2fs *ff = (struct fuse2fs *)ctxt->private_data; From 2b99603e3188a4f2a84515bb92c9695c3879ecb9 Mon Sep 17 00:00:00 2001 From: Tobias Mayer Date: Sun, 21 Jul 2024 09:44:00 +0200 Subject: [PATCH 005/235] opentelemetry-cpp: fix CMake target include dirs --- pkgs/by-name/op/opentelemetry-cpp/package.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/by-name/op/opentelemetry-cpp/package.nix b/pkgs/by-name/op/opentelemetry-cpp/package.nix index 5efc256b5467..50fea23f761d 100644 --- a/pkgs/by-name/op/opentelemetry-cpp/package.nix +++ b/pkgs/by-name/op/opentelemetry-cpp/package.nix @@ -66,6 +66,11 @@ stdenv.mkDerivation (finalAttrs: { outputs = [ "out" "dev" ]; + postInstall = '' + substituteInPlace $out/lib/cmake/opentelemetry-cpp/opentelemetry-cpp-target.cmake \ + --replace-fail "\''${_IMPORT_PREFIX}/include" "$dev/include" + ''; + passthru.updateScript = nix-update-script { }; meta = { From 7bea0cc7215b98f48de946d27b347551dd6f2323 Mon Sep 17 00:00:00 2001 From: Michal Sojka Date: Thu, 25 Jul 2024 15:16:08 +0200 Subject: [PATCH 006/235] libtraceevent: 1.8.2 -> 1.8.3 --- pkgs/os-specific/linux/libtraceevent/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/libtraceevent/default.nix b/pkgs/os-specific/linux/libtraceevent/default.nix index 6571c46eb680..da038595bde2 100644 --- a/pkgs/os-specific/linux/libtraceevent/default.nix +++ b/pkgs/os-specific/linux/libtraceevent/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { pname = "libtraceevent"; - version = "1.8.2"; + version = "1.8.3"; src = fetchgit { url = "https://git.kernel.org/pub/scm/libs/libtrace/libtraceevent.git"; rev = "libtraceevent-${version}"; - hash = "sha256-2oa3pR8DOPaeHcoqcLX00ihx1lpXablnsf0IZR2sOm8="; + hash = "sha256-yftCaZ3mEPOreENd9Q/te/WqM7etokO+D8RZbB1epSA="; }; postPatch = '' From d34d5280d16cadd203685497c7a5f5aeb992fce1 Mon Sep 17 00:00:00 2001 From: Bryan Lai Date: Wed, 28 Feb 2024 12:40:39 +0800 Subject: [PATCH 007/235] python2Packages.wcwidth: fix build As of version 0.2.13 upstream still supports python2. In the future, this package should be dropped or pinned to the last working version after the final release for python2. --- pkgs/development/python2-modules/wcwidth/default.nix | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python2-modules/wcwidth/default.nix b/pkgs/development/python2-modules/wcwidth/default.nix index 023b92a86907..87d3f3848da1 100644 --- a/pkgs/development/python2-modules/wcwidth/default.nix +++ b/pkgs/development/python2-modules/wcwidth/default.nix @@ -6,5 +6,12 @@ wcwidth.overridePythonAttrs(oldAttrs: { propagatedBuildInputs = oldAttrs.propagatedBuildInputs or [] ++ [ backports-functools-lru-cache ]; -}) + /** + As of version 0.2.13 upstream still supports python2. In the future, this + package should be dropped or pinned to the last working version after the + final release for python2. See: + https://github.com/jquast/wcwidth/pull/117#issuecomment-1946609638 + */ + disabled = false; +}) From 5ebb67ecc9c23648876c092224ea2f4702730bdc Mon Sep 17 00:00:00 2001 From: Bryan Lai Date: Mon, 11 Mar 2024 23:35:39 +0800 Subject: [PATCH 008/235] python2Packages.wcwidth: @bryango in maintainers Add myself in maintainers, and make sure that python3 maintainers is _not_ pinged for python2 issues. --- pkgs/development/python2-modules/wcwidth/default.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/development/python2-modules/wcwidth/default.nix b/pkgs/development/python2-modules/wcwidth/default.nix index 87d3f3848da1..eccaadf66c54 100644 --- a/pkgs/development/python2-modules/wcwidth/default.nix +++ b/pkgs/development/python2-modules/wcwidth/default.nix @@ -1,5 +1,6 @@ { backports-functools-lru-cache , wcwidth +, lib }: wcwidth.overridePythonAttrs(oldAttrs: { @@ -14,4 +15,10 @@ wcwidth.overridePythonAttrs(oldAttrs: { https://github.com/jquast/wcwidth/pull/117#issuecomment-1946609638 */ disabled = false; + + meta = oldAttrs.meta // { + /** maintainers overridden here for python2; this makes sure that python3 + maintainers are not blamed for the breakage here. */ + maintainers = with lib.maintainers; [ bryango ]; + }; }) From 5a22d11caca3c16d880e60a18f0f1176f30cfc02 Mon Sep 17 00:00:00 2001 From: TomaSajt <62384384+TomaSajt@users.noreply.github.com> Date: Thu, 23 Nov 2023 23:58:37 +0100 Subject: [PATCH 009/235] mouse-actions-gui: init at 0.4.4 --- .../mouse-actions-gui/80-mouse-actions.rules | 2 + pkgs/by-name/mo/mouse-actions-gui/package.nix | 97 +++++++++++++++++++ 2 files changed, 99 insertions(+) create mode 100644 pkgs/by-name/mo/mouse-actions-gui/80-mouse-actions.rules create mode 100644 pkgs/by-name/mo/mouse-actions-gui/package.nix diff --git a/pkgs/by-name/mo/mouse-actions-gui/80-mouse-actions.rules b/pkgs/by-name/mo/mouse-actions-gui/80-mouse-actions.rules new file mode 100644 index 000000000000..7d07d034c0fb --- /dev/null +++ b/pkgs/by-name/mo/mouse-actions-gui/80-mouse-actions.rules @@ -0,0 +1,2 @@ +KERNEL=="uinput", SUBSYSTEM=="misc", TAG+="uaccess", OPTIONS+="static_node=uinput" +KERNEL=="/dev/input/event*", SUBSYSTEM=="misc", TAG+="uaccess", OPTIONS+="static_node=uinput" diff --git a/pkgs/by-name/mo/mouse-actions-gui/package.nix b/pkgs/by-name/mo/mouse-actions-gui/package.nix new file mode 100644 index 000000000000..96051b6ab3e6 --- /dev/null +++ b/pkgs/by-name/mo/mouse-actions-gui/package.nix @@ -0,0 +1,97 @@ +{ + lib, + stdenv, + fetchFromGitHub, + + npmHooks, + fetchNpmDeps, + nodejs, + + rustPlatform, + cargo, + rustc, + cargo-tauri, + + pkg-config, + wrapGAppsHook3, + libXtst, + libevdev, + gtk3, + libsoup, + webkitgtk, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "mouse-actions-gui"; + version = "0.4.4"; + + src = fetchFromGitHub { + owner = "jersou"; + repo = "mouse-actions"; + rev = "v${finalAttrs.version}"; + hash = "sha256-02E4HrKIoBV3qZPVH6Tjz9Bv/mh5C8amO1Ilmd+YO5g="; + }; + + sourceRoot = "${finalAttrs.src.name}/config-editor"; + + nativeBuildInputs = [ + npmHooks.npmConfigHook + nodejs + rustPlatform.cargoSetupHook + cargo + rustc + cargo-tauri + pkg-config + wrapGAppsHook3 + ]; + + buildInputs = [ + # Base deps + libXtst + libevdev + + # Tauri deps + gtk3 + libsoup + webkitgtk + ]; + + npmDeps = fetchNpmDeps { + inherit (finalAttrs) src sourceRoot; + hash = "sha256-Rnr5jRupdUu6mIsWvdN6AnQnsxB5h31n/24pYslGs5g="; + }; + + cargoRoot = "src-tauri"; + + cargoDeps = rustPlatform.fetchCargoTarball { + name = "${finalAttrs.pname}-${finalAttrs.version}"; + inherit (finalAttrs) src; + sourceRoot = "${finalAttrs.sourceRoot}/${finalAttrs.cargoRoot}"; + hash = "sha256-VQFRatnxzmywAiMLfkVgB7g8AFoqfWFYjt/vezpE1o8="; + }; + + buildPhase = '' + runHook preBuild + cargo-tauri build -b deb + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + + install -Dm644 ${./80-mouse-actions.rules} $out/etc/udev/rules.d/80-mouse-actions.rules + cp -r src-tauri/target/release/bundle/deb/*/data/usr/* $out + + runHook postInstall + ''; + + meta = { + changelog = "https://github.com/jersou/mouse-actions/blob/${finalAttrs.src.rev}/CHANGELOG.md"; + description = "Mouse event based command executor, a mix between Easystroke and Comiz edge commands"; + homepage = "https://github.com/jersou/mouse-actions"; + license = lib.licenses.mit; + mainProgram = "mouse-actions-gui"; + maintainers = with lib.maintainers; [ tomasajt ]; + platforms = lib.platforms.linux; + }; +}) From 1899cb0f36b7db56ec57e43a69d126eab576f751 Mon Sep 17 00:00:00 2001 From: TomaSajt <62384384+TomaSajt@users.noreply.github.com> Date: Tue, 26 Mar 2024 15:52:16 +0100 Subject: [PATCH 010/235] nixos/mouse-actions: add user service, allow different package --- nixos/modules/programs/mouse-actions.nix | 40 +++++++++++++++++++----- 1 file changed, 33 insertions(+), 7 deletions(-) diff --git a/nixos/modules/programs/mouse-actions.nix b/nixos/modules/programs/mouse-actions.nix index 73dc783e3100..297cc4d3bfe7 100644 --- a/nixos/modules/programs/mouse-actions.nix +++ b/nixos/modules/programs/mouse-actions.nix @@ -3,13 +3,39 @@ let cfg = config.programs.mouse-actions; in - { - options.programs.mouse-actions = { - enable = lib.mkEnableOption '' - mouse-actions udev rules. This is a prerequisite for using mouse-actions without being root +{ + options.programs.mouse-actions = { + enable = lib.mkEnableOption "" // { + description = '' + Whether to install and set up mouse-actions and it's udev rules. + + Note that only users in the "uinput" group will be able to use the package ''; }; - config = lib.mkIf cfg.enable { - services.udev.packages = [ pkgs.mouse-actions ]; + package = lib.mkPackageOption pkgs "mouse-actions" { + example = "mouse-actions-gui"; }; - } + autorun = lib.mkOption { + type = lib.types.bool; + default = false; + description = '' + Whether to start a user service to run mouse-actions on startup. + ''; + }; + }; + config = lib.mkIf cfg.enable { + environment.systemPackages = [ cfg.package ]; + services.udev.packages = [ cfg.package ]; + systemd.user.services.mouse-actions = lib.mkIf cfg.autorun { + description = "mouse-actions launcher"; + wantedBy = [ "graphical-session.target" ]; + bindsTo = [ "graphical-session.target" ]; + after = [ "graphical-session.target" ]; + environment.PATH = lib.mkForce null; # don't use the default PATH provided by NixOS + serviceConfig = { + ExecStart = "${lib.getExe cfg.package} start"; + PassEnvironment = "PATH"; # inherit PATH from user environment + }; + }; + }; +} From 9377b40c509bddf7ad2c1ee7ae51fcf4a76501af Mon Sep 17 00:00:00 2001 From: Aaron Jheng Date: Sun, 4 Aug 2024 03:36:26 +0000 Subject: [PATCH 011/235] containerlab: move to by-name --- .../default.nix => by-name/co/containerlab/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 2 deletions(-) rename pkgs/{tools/networking/containerlab/default.nix => by-name/co/containerlab/package.nix} (100%) diff --git a/pkgs/tools/networking/containerlab/default.nix b/pkgs/by-name/co/containerlab/package.nix similarity index 100% rename from pkgs/tools/networking/containerlab/default.nix rename to pkgs/by-name/co/containerlab/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ea869ed21a37..92d9cb16efef 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -525,8 +525,6 @@ with pkgs; conserver = callPackage ../tools/misc/conserver { }; - containerlab = callPackage ../tools/networking/containerlab { }; - coolercontrol = recurseIntoAttrs (callPackage ../applications/system/coolercontrol { }); confetty = callPackage ../applications/misc/confetty { }; From 8d34d0e6a7b0a3fb7485828e9d01d14c65d48c2a Mon Sep 17 00:00:00 2001 From: Michal Sojka Date: Thu, 25 Jul 2024 15:57:25 +0200 Subject: [PATCH 012/235] libtracefs: add updateScript --- pkgs/os-specific/linux/libtracefs/default.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/os-specific/linux/libtracefs/default.nix b/pkgs/os-specific/linux/libtracefs/default.nix index 3d99466c8f34..19ab804e3242 100644 --- a/pkgs/os-specific/linux/libtracefs/default.nix +++ b/pkgs/os-specific/linux/libtracefs/default.nix @@ -15,6 +15,7 @@ , bison , ninja , cunit +, gitUpdater }: stdenv.mkDerivation rec { @@ -52,6 +53,12 @@ stdenv.mkDerivation rec { doCheck = true; checkInputs = [ cunit ]; + passthru.updateScript = gitUpdater { + # No nicer place to find latest release. + url = "https://git.kernel.org/pub/scm/libs/libtrace/libtracefs.git"; + rev-prefix = "libtracefs-"; + }; + meta = with lib; { description = "Linux kernel trace file system library"; mainProgram = "sqlhist"; From 619b92b24cc4c6efd5a2673637d2d3ce1d0f3c94 Mon Sep 17 00:00:00 2001 From: Michal Sojka Date: Thu, 25 Jul 2024 15:58:56 +0200 Subject: [PATCH 013/235] libtracefs: 1.7.0 -> 1.8.1 --- pkgs/os-specific/linux/libtracefs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/libtracefs/default.nix b/pkgs/os-specific/linux/libtracefs/default.nix index 19ab804e3242..288a2b0629ba 100644 --- a/pkgs/os-specific/linux/libtracefs/default.nix +++ b/pkgs/os-specific/linux/libtracefs/default.nix @@ -20,11 +20,11 @@ stdenv.mkDerivation rec { pname = "libtracefs"; - version = "1.7.0"; + version = "1.8.1"; src = fetchzip { url = "https://git.kernel.org/pub/scm/libs/libtrace/libtracefs.git/snapshot/libtracefs-libtracefs-${version}.tar.gz"; - hash = "sha256-64eXFFdnZHHf4C3vbADtPuIMsfJ85VZ6t8A1gIc1CW0="; + hash = "sha256-2UiEgY4mQRLpWah+2rVfPiiUYBSSzRAy5gOv4YELQFQ="; }; postPatch = '' From bf0bf51934fe869f6a3d5693de81d04fcdba00f0 Mon Sep 17 00:00:00 2001 From: Michal Sojka Date: Thu, 25 Jul 2024 16:35:01 +0200 Subject: [PATCH 014/235] libtracefs: remove unused argument --- pkgs/os-specific/linux/libtracefs/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/os-specific/linux/libtracefs/default.nix b/pkgs/os-specific/linux/libtracefs/default.nix index 288a2b0629ba..d96f028e39aa 100644 --- a/pkgs/os-specific/linux/libtracefs/default.nix +++ b/pkgs/os-specific/linux/libtracefs/default.nix @@ -7,7 +7,6 @@ , xmlto , docbook_xml_dtd_45 , docbook_xsl -, coreutils , valgrind , sourceHighlight , meson From 7de6d04e7ac629a118101667acae2b5e9fe20c9d Mon Sep 17 00:00:00 2001 From: Michal Sojka Date: Sun, 4 Aug 2024 09:33:50 +0200 Subject: [PATCH 015/235] libtracefs: Add patch to compile all documentation --- pkgs/os-specific/linux/libtracefs/default.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkgs/os-specific/linux/libtracefs/default.nix b/pkgs/os-specific/linux/libtracefs/default.nix index d96f028e39aa..d35b9e709626 100644 --- a/pkgs/os-specific/linux/libtracefs/default.nix +++ b/pkgs/os-specific/linux/libtracefs/default.nix @@ -15,6 +15,7 @@ , ninja , cunit , gitUpdater +, fetchpatch }: stdenv.mkDerivation rec { @@ -26,6 +27,14 @@ stdenv.mkDerivation rec { hash = "sha256-2UiEgY4mQRLpWah+2rVfPiiUYBSSzRAy5gOv4YELQFQ="; }; + patches = [ + (fetchpatch { + name = "add-missing-documentation-to-meson-build.patch"; + url = "https://git.kernel.org/pub/scm/libs/libtrace/libtracefs.git/patch/?id=4cbebed79b1fe933367e298ea7ddef694b9f98d0"; + hash = "sha256-tSaR0wpxrm50IyMgMoUCcHBB9r8lQQZZYGru6Znre50="; + }) + ]; + postPatch = '' chmod +x samples/extract-example.sh patchShebangs --build check-manpages.sh samples/extract-example.sh Documentation/install-docs.sh.in From 0912bbf38662d1209dd47eaea6ea939516652a2e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 8 Aug 2024 07:01:52 +0000 Subject: [PATCH 016/235] wlr-which-key: 0.1.3 -> 1.0.1 --- pkgs/tools/wayland/wlr-which-key/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/wayland/wlr-which-key/default.nix b/pkgs/tools/wayland/wlr-which-key/default.nix index 3eaa2822c190..4bb349e3c301 100644 --- a/pkgs/tools/wayland/wlr-which-key/default.nix +++ b/pkgs/tools/wayland/wlr-which-key/default.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage rec { pname = "wlr-which-key"; - version = "0.1.3"; + version = "1.0.1"; src = fetchFromGitHub { owner = "MaxVerevkin"; repo = "wlr-which-key"; rev = "v${version}"; - hash = "sha256-DedmLWjK0a6AoGaKGRKfsmK/NIAFV2EYY8MgfiEj4+o="; + hash = "sha256-+LOu1iJ4ciqJMemNKV0cNpAxn857izu9j8pu+3Z0msk="; }; - cargoHash = "sha256-ZGaQX5raMSCwt88xhctwCxGWa9HZtcNqTKM35Z8QvAc="; + cargoHash = "sha256-4aVBaKwvGSpePw64UwrqHhDYcSvM8zADrXAK5SBEfm0="; nativeBuildInputs = [ pkg-config From 7dce60342b4795365d10c569676efb5fc8671d5d Mon Sep 17 00:00:00 2001 From: Hraban Luyat Date: Mon, 5 Aug 2024 18:47:39 -0400 Subject: [PATCH 017/235] smc-fuzzer: init at 0-unstable-2020-12-23 --- pkgs/by-name/sm/smc-fuzzer/package.nix | 47 ++++++++++++++++++++++++++ 1 file changed, 47 insertions(+) create mode 100644 pkgs/by-name/sm/smc-fuzzer/package.nix diff --git a/pkgs/by-name/sm/smc-fuzzer/package.nix b/pkgs/by-name/sm/smc-fuzzer/package.nix new file mode 100644 index 000000000000..7d10da09bed5 --- /dev/null +++ b/pkgs/by-name/sm/smc-fuzzer/package.nix @@ -0,0 +1,47 @@ +{ + lib, + swiftPackages, + fetchFromGitHub, + stdenv, +}: + +stdenv.mkDerivation { + pname = "smc-fuzzer"; + version = "0-unstable-2020-12-23"; + + src = fetchFromGitHub { + repo = "smc-fuzzer"; + owner = "theopolis"; + rev = "ed60c4efeddea8a9778a976c49c650eee3840eac"; + hash = "sha256-FyiFSVeO46UnBrpC8AhSuGe7alo37pT8J1qQWGPqV2U="; + }; + + buildInputs = [ swiftPackages.apple_sdk.frameworks.AppKit ]; + + installPhase = '' + runHook preInstall + + install -Dm 755 smc -t $out/bin + + runHook postInstall + ''; + + meta = { + description = "Apple SMC (System Management Controller) API fuzzer"; + longDescription = '' + smc-fuzzer uses the AppleSMC IOKit interface and a userland API for + interacting with the System Management Controller (Mac embedded + controllers). The tool focuses on the SMC key/value API. + + smc-fuzzer is not just useful for fuzzing the SMC itself: it can also be + used to explicitly control or query the SMC. That makes it useful in + system management, e.g. controlling and querying the charge status of an + Apple laptop. + ''; + homepage = "https://github.com/theopolis/smc-fuzzer"; + license = lib.licenses.gpl2Plus; + maintainers = with lib.maintainers; [ hraban ]; + mainProgram = "smc"; + platforms = lib.platforms.darwin; + }; +} From 5a04de283e3d3c00d4aabd8122678b0e46f3e4d2 Mon Sep 17 00:00:00 2001 From: Stefan Frijters Date: Sun, 11 Aug 2024 12:09:49 +0200 Subject: [PATCH 018/235] python3Packages.ziafont: 0.8 -> 0.9 The update to 0.9 now also introduces a required font file in test.ipynb, so we provide it and we might as well re-instate manyfonts.ipynb. --- .../python-modules/ziafont/checkfonts.nix | 88 +++++++++++++++++++ .../python-modules/ziafont/default.nix | 26 ++++-- 2 files changed, 105 insertions(+), 9 deletions(-) create mode 100644 pkgs/development/python-modules/ziafont/checkfonts.nix diff --git a/pkgs/development/python-modules/ziafont/checkfonts.nix b/pkgs/development/python-modules/ziafont/checkfonts.nix new file mode 100644 index 000000000000..773d8a1ea066 --- /dev/null +++ b/pkgs/development/python-modules/ziafont/checkfonts.nix @@ -0,0 +1,88 @@ +# Based on the calls to testfont(url) in test/manyfonts.ipynb +# Note that Tinos-Regular is also needed for test/test.ipynb +[ + { + url = "https://mirrors.ctan.org/fonts/qualitype/opentype/QTAbbie.otf"; + hash = "sha256-/Lu7EGtF7kZgP0dYyaIFPIO7jWCbtc3iT0ux3bFhe9w="; + } + { + url = "https://mirrors.ctan.org/fonts/qualitype/opentype/QTJupiter.otf"; + hash = "sha256-BocJZnrGGt1fpq5Jmnl1fiuo7YllN5xCF6lgWZyVcXE="; + } + { + url = "https://mirrors.ctan.org/fonts/qualitype/opentype/QTVagaRound.otf"; + hash = "sha256-JffWcGdBN2OIZXdZxf7G3G+kZRZi2cKFUIOAOCuR8gM="; + } + { + url = "https://mirrors.ctan.org/fonts/qualitype/opentype/QTBlackForest.otf"; + hash = "sha256-P4TQSCBHPfty3l+IhY1CuVkr0KNk2t6bbeieT21fz9A="; + } + { + url = "https://mirrors.ctan.org/fonts/punknova/punknova-regular.otf"; + hash = "sha256-UC4Zdh647wTBYXRyOzFDliVA0ukK88K8CcIS8nzxeoo="; + } + { + url = "https://mirrors.ctan.org/fonts/qualitype/opentype/QTSnowCaps.otf"; + hash = "sha256-XtZbEhCcHlc1eHEkR+52tuVoA6GTf//5mU/ehHq/H8g="; + } + { + url = "https://mirrors.ctan.org/fonts/qualitype/opentype/QTStoryTimeCaps.otf"; + hash = "sha256-bwW8KZD40i8rpGqZuoVBeosfjk/tWHex4KPm8mlQ4po="; + } + { + url = "https://mirrors.ctan.org/fonts/alegreya/opentype/Alegreya-Regular.otf"; + hash = "sha256-oZo6XeaTcnaSymYWrkl71t3JsWvLuKgKsNAirONNax4="; + } + { + url = "https://mirrors.ctan.org/fonts/nimbus15/opentype/zco-Oblique.otf"; + hash = "sha256-j7WbsSnLGh+OdpdBwIlp3cPL8rpYS3OcW3jtxltgArE="; + } + { + url = "https://mirrors.ctan.org/fonts/merriweather/opentype/Merriweather-Black.otf"; + hash = "sha256-3pQdqHw1eRUVCRwnVbZBbftrZ7fJ7USD+CyNfA41u3g="; + } + { + url = "https://mirrors.ctan.org/fonts/qualitype/opentype/QTArtiston.otf"; + hash = "sha256-6bfL3Po4erta9q49EgzYZXZs9NtdoWFjnpR3WT1y+vU="; + } + { + url = "https://mirrors.ctan.org/fonts/nunito/opentype/Nunito-Black.otf"; + hash = "sha256-/QJud/q2MVwrXEibDDe/gty3a3x2weodNBqCOkVV7fA="; + } + { + url = "https://mirrors.ctan.org/fonts/kurier/fonts/opentype/nowacki/kurier/KurierHeavy-Regular.otf"; + hash = "sha256-ynFz+IIntQeEK2+Cu64wJRTffZvmuYdx1IrKKDe1VA0="; + } + { + url = "https://mirrors.ctan.org/fonts/clearsans/truetype/ClearSans-MediumItalic.ttf"; + hash = "sha256-Bv+6I2ClJo71iZbj3XmUpJ3NHBZ/+8h07azt7ucbmyE="; + } + { + url = "https://mirrors.ctan.org/fonts/tinos/truetype/Tinos-Regular.ttf"; + hash = "sha256-/03rOV/yQmu9CNt0ywBbIjJhdd8A8KFWuH5tKu8e9Qg="; + } + { + url = "https://mirrors.ctan.org/fonts/gofonts/truetype/Go-Medium.ttf"; + hash = "sha256-GvMsI34wBeBQUC9RQjVNS6TukXf5faoVrPoI9L9qPEY="; + } + { + url = "https://mirrors.ctan.org/fonts/comfortaa/truetype/Comfortaa-Regular.ttf"; + hash = "sha256-eu7K9MeZ8k8i6HGm9UbKiRFs8RKIx6j/QvEUAd1URcY="; + } + { + url = "https://mirrors.ctan.org/fonts/quattrocento/truetype/Quattrocento-Regular.ttf"; + hash = "sha256-kv5NsgyBybySJha4xJ4VIEaCdMfJwyz19VRCJOwVeHs="; + } + { + url = "https://mirrors.ctan.org/fonts/kurier/fonts/opentype/nowacki/kurier/KurierCond-Regular.otf"; + hash = "sha256-y9gD/ovTuZeh5/OaQelhGLuTPFjLcPSMLfIUyHe1QXI="; + } + { + url = "https://mirrors.ctan.org/fonts/garamond-math/Garamond-Math.otf"; + hash = "sha256-xhYTd+lwhBUrlI9iq+h0y+J0BZOJVjRrVKTGSIpQCfE="; + } + { + url = "https://github.com/google/fonts/raw/main/ofl/arizonia/Arizonia-Regular.ttf"; + hash = "sha256-jfHBC8FdCroUXUWZwlyvrYPbaG0s76QmGfBptvG7zmI="; + } +] diff --git a/pkgs/development/python-modules/ziafont/default.nix b/pkgs/development/python-modules/ziafont/default.nix index 8f4f9f876991..c25177dc23c1 100644 --- a/pkgs/development/python-modules/ziafont/default.nix +++ b/pkgs/development/python-modules/ziafont/default.nix @@ -6,20 +6,20 @@ setuptools, pytestCheckHook, nbval, + fetchurl, }: - buildPythonPackage rec { pname = "ziafont"; - version = "0.8"; + version = "0.9"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "cdelker"; - repo = pname; - rev = version; - hash = "sha256-C+dC+mNquDuj6RfJpiEbeuGZOIXcgSrTB4XM21reBPs="; + repo = "ziafont"; + rev = "refs/tags/${version}"; + hash = "sha256-S7IDL3ItP14/GrCUtSTT+JWuqRAY/Po0Kerq8mggDdg="; }; build-system = [ setuptools ]; @@ -29,16 +29,24 @@ buildPythonPackage rec { nbval ]; - preCheck = "rm test/manyfonts.ipynb"; # Tries to download fonts + preCheck = + let + # The test notebooks try to download font files, unless they already exist in the test directory, + # so we prepare them in advance. + checkFonts = lib.map fetchurl (import ./checkfonts.nix); + copyFontCmd = font: "cp ${font} test/${lib.last (lib.splitString "/" font.url)}\n"; + in + lib.concatMapStrings copyFontCmd checkFonts; pytestFlagsArray = [ "--nbval-lax" ]; pythonImportsCheck = [ "ziafont" ]; - meta = with lib; { + meta = { description = "Convert TTF/OTF font glyphs to SVG paths"; homepage = "https://ziafont.readthedocs.io/en/latest/"; - license = licenses.mit; - maintainers = with maintainers; [ sfrijters ]; + changelog = "https://github.com/cdelker/ziafont/blob/main/CHANGES.md"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.sfrijters ]; }; } From b8ea3d2bd61eaf309e6fa7902476fe89c99fceac Mon Sep 17 00:00:00 2001 From: Stefan Frijters Date: Sun, 11 Aug 2024 12:22:33 +0200 Subject: [PATCH 019/235] python3Packages.ziamath: 0.10 -> 0.11 --- .../python-modules/ziamath/checkfonts.nix | 19 +++++++++++ .../python-modules/ziamath/default.nix | 32 ++++++++++--------- 2 files changed, 36 insertions(+), 15 deletions(-) create mode 100644 pkgs/development/python-modules/ziamath/checkfonts.nix diff --git a/pkgs/development/python-modules/ziamath/checkfonts.nix b/pkgs/development/python-modules/ziamath/checkfonts.nix new file mode 100644 index 000000000000..ce29060d3f18 --- /dev/null +++ b/pkgs/development/python-modules/ziamath/checkfonts.nix @@ -0,0 +1,19 @@ +# Based on the calls to testfont(url) in test/styles.ipynb +[ + { + url = "https://mirrors.ctan.org/fonts/libertinus-fonts/otf/LibertinusMath-Regular.otf"; + hash = "sha256-PY4QUzxz9/vO4k2rl5GBfno0r3/Zh1FAhif1OPDic7w="; + } + { + url = "https://mirrors.ctan.org/fonts/firamath/FiraMath-Regular.otf"; + hash = "sha256-ICjL091NjAzxYIUg60dZlWqDpnkx17bY58MTUgGG41s="; + } + { + url = "https://mirrors.ctan.org/fonts/erewhon-math/Erewhon-Math.otf"; + hash = "sha256-7SjKC+XP9KpFAWtZxc+FZZ4VETnDxokUGz+nZ/CWIbI="; + } + { + url = "https://mirrors.ctan.org/fonts/concmath-otf/Concrete-Math.otf"; + hash = "sha256-YCukkUgNQoBlotuD0vF1ts9JL8x6xaEW9JxK++GVGZ4="; + } +] diff --git a/pkgs/development/python-modules/ziamath/default.nix b/pkgs/development/python-modules/ziamath/default.nix index ac2cd8610929..7505d578ba52 100644 --- a/pkgs/development/python-modules/ziamath/default.nix +++ b/pkgs/development/python-modules/ziamath/default.nix @@ -8,20 +8,20 @@ pytestCheckHook, nbval, latex2mathml, + fetchurl, }: - buildPythonPackage rec { pname = "ziamath"; - version = "0.10"; + version = "0.11"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "cdelker"; - repo = pname; - rev = version; - hash = "sha256-Drssi+YySh4OhVYAOvgIwzeeu5dQbUUXuhwTedhUUt8="; + repo = "ziamath"; + rev = "refs/tags/${version}"; + hash = "sha256-DLpbidQEeQVKxGCbS2jeeCvmVK9ElDIDQMj5bh/x7/Q="; }; build-system = [ setuptools ]; @@ -34,22 +34,24 @@ buildPythonPackage rec { latex2mathml ]; - pytestFlagsArray = [ "--nbval-lax" ]; + preCheck = + let + # The test notebooks try to download font files, unless they already exist in the test directory, + # so we prepare them in advance. + checkFonts = lib.map fetchurl (import ./checkfonts.nix); + copyFontCmd = font: "cp ${font} test/${lib.last (lib.splitString "/" font.url)}\n"; + in + lib.concatMapStrings copyFontCmd checkFonts; - # Prevent the test suite from attempting to download fonts - postPatch = '' - substituteInPlace test/styles.ipynb \ - --replace '"def testfont(exprs, fonturl):\n",' '"def testfont(exprs, fonturl):\n", " return\n",' \ - --replace "mathfont='FiraMath-Regular.otf', " "" - ''; + pytestFlagsArray = [ "--nbval-lax" ]; pythonImportsCheck = [ "ziamath" ]; - meta = with lib; { + meta = { description = "Render MathML and LaTeX Math to SVG without Latex installation"; homepage = "https://ziamath.readthedocs.io/en/latest/"; changelog = "https://ziamath.readthedocs.io/en/latest/changes.html"; - license = licenses.mit; - maintainers = with maintainers; [ sfrijters ]; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.sfrijters ]; }; } From bb9591b7bc3461f37c5e60745e07d5976e0f2292 Mon Sep 17 00:00:00 2001 From: Stefan Frijters Date: Mon, 12 Aug 2024 17:16:58 +0200 Subject: [PATCH 020/235] python3Packages.dbus-next: add missing preCheck/postCheck hooks --- pkgs/development/python-modules/dbus-next/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/dbus-next/default.nix b/pkgs/development/python-modules/dbus-next/default.nix index bbbabdc08375..117fa8c08948 100644 --- a/pkgs/development/python-modules/dbus-next/default.nix +++ b/pkgs/development/python-modules/dbus-next/default.nix @@ -37,9 +37,11 @@ buildPythonPackage rec { # test_tcp_connection_with_forwarding fails due to dbus # creating unix socket anyway on v1.14.4 checkPhase = '' + runHook preCheck dbus-run-session --config-file=${dbus}/share/dbus-1/session.conf \ ${python.interpreter} -m pytest -sv --cov=dbus_next \ -k "not test_peer_interface and not test_tcp_connection_with_forwarding" + runHook postCheck ''; meta = with lib; { From f64849977d80eecb0eda825f75041bad7b86d297 Mon Sep 17 00:00:00 2001 From: ruro Date: Thu, 15 Aug 2024 22:31:38 +0300 Subject: [PATCH 021/235] magma: fix missing libgfortran.so dependency --- pkgs/development/libraries/science/math/magma/generic.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/science/math/magma/generic.nix b/pkgs/development/libraries/science/math/magma/generic.nix index 08dac598f7d9..b1b2b80be0fc 100644 --- a/pkgs/development/libraries/science/math/magma/generic.nix +++ b/pkgs/development/libraries/science/math/magma/generic.nix @@ -31,7 +31,7 @@ let - inherit (lib) lists strings trivial; + inherit (lib) getLib lists strings trivial; inherit (magmaRelease) version hash supportedGpuTargets; # Per https://icl.utk.edu/magma/downloads, support for CUDA 12 wasn't added until 2.7.1. @@ -133,6 +133,7 @@ stdenv.mkDerivation { lapack blas python3 + (getLib gfortran.cc) # libgfortran.so ] ++ lists.optionals cudaSupport (with effectiveCudaPackages; [ cuda_cudart # cuda_runtime.h libcublas # cublas_v2.h From 82e87efc98676844a975a906bb66c06b8a9b9a57 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=A9clairevoyant?= <848000+eclairevoyant@users.noreply.github.com> Date: Sat, 17 Aug 2024 09:04:34 -0400 Subject: [PATCH 022/235] cpu-x: nixfmt --- pkgs/by-name/cp/cpu-x/package.nix | 77 ++++++++++++++++++++++++------- 1 file changed, 60 insertions(+), 17 deletions(-) diff --git a/pkgs/by-name/cp/cpu-x/package.nix b/pkgs/by-name/cp/cpu-x/package.nix index bb1b7cf10f03..08fd73a5e0f4 100644 --- a/pkgs/by-name/cp/cpu-x/package.nix +++ b/pkgs/by-name/cp/cpu-x/package.nix @@ -1,12 +1,34 @@ -{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, gtk3, ncurses -, libcpuid, pciutils, procps, wrapGAppsHook3, nasm, makeWrapper -, opencl-headers, ocl-icd -, vulkan-headers, vulkan-loader, glfw -, libXdmcp, pcre, util-linux -, libselinux, libsepol -, libthai, libdatrie, libxkbcommon, libepoxy -, dbus, at-spi2-core -, libXtst +{ + lib, + stdenv, + fetchFromGitHub, + cmake, + pkg-config, + gtk3, + ncurses, + libcpuid, + pciutils, + procps, + wrapGAppsHook3, + nasm, + makeWrapper, + opencl-headers, + ocl-icd, + vulkan-headers, + vulkan-loader, + glfw, + libXdmcp, + pcre, + util-linux, + libselinux, + libsepol, + libthai, + libdatrie, + libxkbcommon, + libepoxy, + dbus, + at-spi2-core, + libXtst, }: # Known issues: @@ -25,15 +47,36 @@ stdenv.mkDerivation rec { sha256 = "sha256-8jJP0gxH3B6qLrhKNa4P9ZfSjxaXTeBB1+UuadflLQo="; }; - nativeBuildInputs = [ cmake pkg-config wrapGAppsHook3 nasm makeWrapper ]; + nativeBuildInputs = [ + cmake + pkg-config + wrapGAppsHook3 + nasm + makeWrapper + ]; + buildInputs = [ - gtk3 ncurses libcpuid pciutils procps - vulkan-headers vulkan-loader glfw - opencl-headers ocl-icd - libXdmcp pcre util-linux - libselinux libsepol - libthai libdatrie libxkbcommon libepoxy - dbus at-spi2-core + gtk3 + ncurses + libcpuid + pciutils + procps + vulkan-headers + vulkan-loader + glfw + opencl-headers + ocl-icd + libXdmcp + pcre + util-linux + libselinux + libsepol + libthai + libdatrie + libxkbcommon + libepoxy + dbus + at-spi2-core libXtst ]; From d4436a5fad20d3dec03fa536db8d0434b14044f9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=A9clairevoyant?= <848000+eclairevoyant@users.noreply.github.com> Date: Sat, 17 Aug 2024 09:05:24 -0400 Subject: [PATCH 023/235] cpu-x: avoid double-wrapping --- pkgs/by-name/cp/cpu-x/package.nix | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/cp/cpu-x/package.nix b/pkgs/by-name/cp/cpu-x/package.nix index 08fd73a5e0f4..ee148ac4decf 100644 --- a/pkgs/by-name/cp/cpu-x/package.nix +++ b/pkgs/by-name/cp/cpu-x/package.nix @@ -11,7 +11,6 @@ procps, wrapGAppsHook3, nasm, - makeWrapper, opencl-headers, ocl-icd, vulkan-headers, @@ -52,7 +51,6 @@ stdenv.mkDerivation rec { pkg-config wrapGAppsHook3 nasm - makeWrapper ]; buildInputs = [ @@ -80,10 +78,11 @@ stdenv.mkDerivation rec { libXtst ]; - postInstall = '' - wrapProgram $out/bin/cpu-x \ - --prefix PATH : ${lib.makeBinPath [ stdenv.cc ]} \ + preFixup = '' + gappsWrapperArgs+=( + --prefix PATH : ${lib.makeBinPath [ stdenv.cc ]} --prefix LD_LIBRARY_PATH : ${vulkan-loader}/lib + ) ''; meta = with lib; { From 392c09c842886831f1456ebac4623e27c03988cc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=A9clairevoyant?= <848000+eclairevoyant@users.noreply.github.com> Date: Sat, 17 Aug 2024 09:18:13 -0400 Subject: [PATCH 024/235] cpu-x: fix gtk support --- pkgs/by-name/cp/cpu-x/package.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/by-name/cp/cpu-x/package.nix b/pkgs/by-name/cp/cpu-x/package.nix index ee148ac4decf..0e49d8b20181 100644 --- a/pkgs/by-name/cp/cpu-x/package.nix +++ b/pkgs/by-name/cp/cpu-x/package.nix @@ -28,6 +28,7 @@ dbus, at-spi2-core, libXtst, + gtkmm3, }: # Known issues: @@ -55,6 +56,7 @@ stdenv.mkDerivation rec { buildInputs = [ gtk3 + gtkmm3 ncurses libcpuid pciutils From 6a23789fdac6a7579c2b0680791b3624e67a8e38 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=A9clairevoyant?= <848000+eclairevoyant@users.noreply.github.com> Date: Sat, 17 Aug 2024 10:32:36 -0400 Subject: [PATCH 025/235] cpu-x: modernise --- pkgs/by-name/cp/cpu-x/package.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/by-name/cp/cpu-x/package.nix b/pkgs/by-name/cp/cpu-x/package.nix index 0e49d8b20181..d4ab11c1e537 100644 --- a/pkgs/by-name/cp/cpu-x/package.nix +++ b/pkgs/by-name/cp/cpu-x/package.nix @@ -36,15 +36,15 @@ # registered in /etc/shells. The nix's bash is not in there when running # cpu-x from nixpkgs. -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "cpu-x"; version = "5.0.4"; src = fetchFromGitHub { owner = "X0rg"; repo = "CPU-X"; - rev = "v${version}"; - sha256 = "sha256-8jJP0gxH3B6qLrhKNa4P9ZfSjxaXTeBB1+UuadflLQo="; + rev = "refs/tags/v${finalAttrs.version}"; + hash = "sha256-8jJP0gxH3B6qLrhKNa4P9ZfSjxaXTeBB1+UuadflLQo="; }; nativeBuildInputs = [ @@ -87,12 +87,12 @@ stdenv.mkDerivation rec { ) ''; - meta = with lib; { + meta = { description = "Free software that gathers information on CPU, motherboard and more"; mainProgram = "cpu-x"; homepage = "https://thetumultuousunicornofdarkness.github.io/CPU-X"; - license = licenses.gpl3Plus; + license = lib.licenses.gpl3Plus; platforms = [ "x86_64-linux" ]; - maintainers = with maintainers; [ viraptor ]; + maintainers = with lib.maintainers; [ viraptor ]; }; -} +}) From 9cd5d1183c001d9766b4189d1ccc370efd742d49 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=A9clairevoyant?= <848000+eclairevoyant@users.noreply.github.com> Date: Sat, 17 Aug 2024 10:48:42 -0400 Subject: [PATCH 026/235] cpu-x: add version test --- pkgs/by-name/cp/cpu-x/package.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/by-name/cp/cpu-x/package.nix b/pkgs/by-name/cp/cpu-x/package.nix index d4ab11c1e537..372ebbce2a50 100644 --- a/pkgs/by-name/cp/cpu-x/package.nix +++ b/pkgs/by-name/cp/cpu-x/package.nix @@ -1,5 +1,6 @@ { lib, + testers, stdenv, fetchFromGitHub, cmake, @@ -87,6 +88,12 @@ stdenv.mkDerivation (finalAttrs: { ) ''; + passthru = { + tests = { + version = testers.testVersion { package = finalAttrs.finalPackage; }; + }; + }; + meta = { description = "Free software that gathers information on CPU, motherboard and more"; mainProgram = "cpu-x"; From 07494f99f6093a65a9110896151407b89a7df996 Mon Sep 17 00:00:00 2001 From: maralorn Date: Tue, 20 Aug 2024 00:32:18 +0200 Subject: [PATCH 027/235] haskellPackages: stackage LTS 22.31 -> LTS 22.33 This commit has been generated by maintainers/scripts/haskell/update-stackage.sh --- .../configuration-hackage2nix/stackage.yaml | 36 ++++++++++--------- 1 file changed, 19 insertions(+), 17 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml index 12634d4e314c..4384b2254f46 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml @@ -1,4 +1,4 @@ -# Stackage LTS 22.31 +# Stackage LTS 22.33 # This file is auto-generated by # maintainers/scripts/haskell/update-stackage.sh default-package-overrides: @@ -419,7 +419,7 @@ default-package-overrides: - autodocodec-yaml ==0.2.0.3 - autoexporter ==2.0.0.12 - auto-update ==0.1.6 - - avro ==0.6.2.0 + - avro ==0.6.2.1 - aws ==0.24.1 - aws-cloudfront-signed-cookies ==0.2.0.12 - aws-sns-verify ==0.0.0.3 @@ -603,7 +603,7 @@ default-package-overrides: - case-insensitive ==1.2.1.0 - cases ==0.1.4.3 - casing ==0.1.4.1 - - cassava ==0.5.3.1 + - cassava ==0.5.3.2 - cassava-conduit ==0.6.6 - cassava-megaparsec ==2.0.4 - cast ==0.1.0.2 @@ -1084,11 +1084,11 @@ default-package-overrides: - fields-json ==0.4.0.0 - file-embed ==0.0.16.0 - file-embed-lzma ==0.0.1 - - file-io ==0.1.2 + - file-io ==0.1.4 - filelock ==0.1.1.7 - filemanip ==0.3.6.3 - file-modules ==0.1.2.4 - - filepath-bytestring ==1.4.2.1.13 + - filepath-bytestring ==1.4.100.3.2 - file-path-th ==0.1.0.0 - filepattern ==0.1.3 - fileplow ==0.1.0.0 @@ -1334,7 +1334,7 @@ default-package-overrides: - handwriting ==0.1.0.3 - happstack-jmacro ==7.0.12.6 - happstack-server ==7.8.0.2 - - happstack-server-tls ==7.2.1.5 + - happstack-server-tls ==7.2.1.6 - happy ==1.20.1.1 - happy-meta ==0.2.1.0 - HasBigDecimal ==0.2.0.0 @@ -1373,7 +1373,7 @@ default-package-overrides: - hasty-hamiltonian ==1.3.4 - HaTeX ==3.22.4.2 - HaXml ==1.25.13 - - haxr ==3000.11.5 + - haxr ==3000.11.5.1 - HCodecs ==0.5.2 - hdaemonize ==0.5.7 - HDBC ==2.4.0.4 @@ -1418,7 +1418,7 @@ default-package-overrides: - hledger-iadd ==1.3.20 - hledger-interest ==1.6.6 - hledger-lib ==1.32.3 - - hledger-stockquotes ==0.1.2.1 + - hledger-stockquotes ==0.1.3.1 - hledger-web ==1.32.3 - hlibcpuid ==0.2.0 - hlibgit2 ==0.18.0.16 @@ -1969,7 +1969,7 @@ default-package-overrides: - mongoDB ==2.7.1.4 - monoidal-containers ==0.6.5.0 - monoidal-functors ==0.2.3.0 - - monoid-extras ==0.6.2 + - monoid-extras ==0.6.3 - monoid-subclasses ==1.2.5.1 - monoid-transformer ==0.0.4 - monomer ==1.6.0.1 @@ -2083,7 +2083,7 @@ default-package-overrides: - numeric-prelude ==0.4.4 - numeric-quest ==0.2.0.2 - numhask ==0.11.1.0 - - numhask-array ==0.11.0.1 + - numhask-array ==0.11.1.0 - numhask-space ==0.11.1.0 - NumInstances ==1.4 - numtype-dk ==0.5.0.3 @@ -2229,6 +2229,7 @@ default-package-overrides: - persistent-template ==2.12.0.0 - persistent-test ==2.13.1.3 - persistent-typed-db ==0.1.0.7 + - pfile ==0.1.0.1 - pg-harness-client ==0.6.0 - pg-transact ==0.3.2.0 - phantom-state ==0.2.1.4 @@ -2253,6 +2254,7 @@ default-package-overrides: - pipes-safe ==2.3.5 - pipes-text ==1.0.1 - pipes-wai ==3.2.0 + - pipes-zlib ==0.4.4.2 - pkgtreediff ==0.6.0 - place-cursor-at ==1.0.1 - placeholders ==0.1 @@ -2498,7 +2500,7 @@ default-package-overrides: - rosezipper ==0.2 - rot13 ==0.2.0.1 - row-types ==1.0.1.2 - - rpmbuild-order ==0.4.11 + - rpmbuild-order ==0.4.12 - rpm-nvr ==0.1.2 - rp-tree ==0.7.1 - rrb-vector ==0.2.1.0 @@ -2572,7 +2574,7 @@ default-package-overrides: - seqalign ==0.2.0.4 - seqid ==0.6.3 - seqid-streams ==0.7.2 - - sequence-formats ==1.8.0.1 + - sequence-formats ==1.8.1.0 - sequenceTools ==1.5.3.1 - serialise ==0.2.6.1 - servant ==0.20.1 @@ -2628,7 +2630,7 @@ default-package-overrides: - shake-language-c ==0.12.0 - shake-plus ==0.3.4.0 - shake-plus-extended ==0.4.1.0 - - shakespeare ==2.1.0.1 + - shakespeare ==2.1.1 - shakespeare-text ==1.1.0 - shared-memory ==0.2.0.1 - shell-conduit ==5.0.0 @@ -2886,7 +2888,7 @@ default-package-overrides: - teardown ==0.5.0.1 - tempgres-client ==1.0.0 - template ==0.2.0.10 - - template-haskell-compat-v0208 ==0.1.9.3 + - template-haskell-compat-v0208 ==0.1.9.4 - temporary ==1.3 - temporary-rc ==1.2.0.3 - temporary-resourcet ==0.1.0.1 @@ -3147,7 +3149,7 @@ default-package-overrides: - vector-buffer ==0.4.1 - vector-builder ==0.3.8.5 - vector-bytes-instances ==0.1.1 - - vector-extras ==0.2.8.1 + - vector-extras ==0.2.8.2 - vector-hashtables ==0.1.2.0 - vector-instances ==3.4.2 - vector-mmap ==0.0.3 @@ -3245,7 +3247,7 @@ default-package-overrides: - writer-cps-transformers ==0.5.6.1 - ws ==0.0.6 - wss-client ==0.3.0.0 - - wuss ==2.0.1.9 + - wuss ==2.0.2.0 - X11 ==1.10.3 - X11-xft ==0.3.4 - x11-xim ==0.0.9.0 @@ -3280,7 +3282,7 @@ default-package-overrides: - xxhash-ffi ==0.2.0.0 - yaml ==0.11.11.2 - yaml-unscrambler ==0.1.0.19 - - Yampa ==0.14.9 + - Yampa ==0.14.10 - yarn-lock ==0.6.5 - yeshql-core ==4.2.0.0 - yesod ==1.6.2.1 From 299d0e8ce55897cf14d128cea2f3d07570ea20ba Mon Sep 17 00:00:00 2001 From: maralorn Date: Tue, 20 Aug 2024 00:32:30 +0200 Subject: [PATCH 028/235] all-cabal-hashes: 2024-07-31T18:11:52Z -> 2024-08-19T17:17:03Z This commit has been generated by maintainers/scripts/haskell/update-hackage.sh --- pkgs/data/misc/hackage/pin.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/data/misc/hackage/pin.json b/pkgs/data/misc/hackage/pin.json index c1ad4080dd81..6449d77aee04 100644 --- a/pkgs/data/misc/hackage/pin.json +++ b/pkgs/data/misc/hackage/pin.json @@ -1,6 +1,6 @@ { - "commit": "32e512a9cd79f962a8023e1c8c1a4db17d9b2fd8", - "url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/32e512a9cd79f962a8023e1c8c1a4db17d9b2fd8.tar.gz", - "sha256": "1wiy2fsz8a1gx6mbzq8ns6wvns6kh2aigxczw0f9q7qbkd22kdil", - "msg": "Update from Hackage at 2024-07-31T18:11:52Z" + "commit": "4670ba3f52eae6737137ddcb817182f3daad4f26", + "url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/4670ba3f52eae6737137ddcb817182f3daad4f26.tar.gz", + "sha256": "18q5shdmh12147502135q6132rmzp29qfjhwrcjwidl0pi9ki70i", + "msg": "Update from Hackage at 2024-08-19T17:17:03Z" } From fbb895e278eb1cefee09bb67d078c245f217057b Mon Sep 17 00:00:00 2001 From: maralorn Date: Tue, 20 Aug 2024 00:33:35 +0200 Subject: [PATCH 029/235] haskellPackages: regenerate package set based on current config This commit has been generated by maintainers/scripts/haskell/regenerate-hackage-packages.sh --- .../haskell-modules/hackage-packages.nix | 2123 ++++++++++++----- 1 file changed, 1509 insertions(+), 614 deletions(-) diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 067237427b2d..44ca3cf8bbac 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -814,16 +814,14 @@ self: { , containers, data-hash, deepseq, directory, dlist, edit-distance , emacs, equivalence, exceptions, filepath, ghc-compact, gitrev , happy, hashable, haskeline, monad-control, mtl, murmur-hash - , parallel, peano, pretty, process, regex-tdfa, split, stm - , STMonadTrans, strict, text, time, time-compat, transformers + , parallel, peano, pqueue, pretty, process, regex-tdfa, split, stm + , STMonadTrans, strict, text, time, transformers , unordered-containers, uri-encode, vector, vector-hashtables, zlib }: mkDerivation { pname = "Agda"; - version = "2.6.4.3"; - sha256 = "18h3vwj182sp6pkh4274x0b3qg3cn3v0571jicabqhvxqmpckvbl"; - revision = "1"; - editedCabalFile = "0z1zbj4gba5xqgrb3lz3fpmsv6mv8zyrhvl4338k8xc22m5ns1m8"; + version = "2.7.0"; + sha256 = "005rsk46b7rl516n58cfzg5aqzqwb1gkz7wpz2lqg0qlrlw0jyh0"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -833,8 +831,8 @@ self: { bytestring case-insensitive containers data-hash deepseq directory dlist edit-distance equivalence exceptions filepath ghc-compact gitrev hashable haskeline monad-control mtl murmur-hash parallel - peano pretty process regex-tdfa split stm STMonadTrans strict text - time time-compat transformers unordered-containers uri-encode + peano pqueue pretty process regex-tdfa split stm STMonadTrans + strict text time transformers unordered-containers uri-encode vector vector-hashtables zlib ]; libraryToolDepends = [ alex happy ]; @@ -2127,7 +2125,7 @@ self: { license = lib.licenses.mit; }) {}; - "Blammo_2_0_0_0" = callPackage + "Blammo_2_1_0_0" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, dlist , envparse, exceptions, fast-logger, hspec, lens, markdown-unlit , monad-logger-aeson, mtl, text, time, unliftio, unliftio-core @@ -2135,8 +2133,8 @@ self: { }: mkDerivation { pname = "Blammo"; - version = "2.0.0.0"; - sha256 = "1f51pyvxq5is5j942b0iqbadnkdjxb8gyzcqvb0wic9ba594hwkn"; + version = "2.1.0.0"; + sha256 = "0cdif1n1s7isqhfdwk3azdbipwpsxzf7g274hllclx9fbg6l48y9"; libraryHaskellDepends = [ aeson base bytestring containers dlist envparse exceptions fast-logger lens monad-logger-aeson mtl text time unliftio @@ -2159,8 +2157,8 @@ self: { }: mkDerivation { pname = "Blammo-wai"; - version = "0.0.0.1"; - sha256 = "1w63xyjsrhn2hsi0gw2xca8464r4mk3sj3bwkidsa28m73xz93xb"; + version = "0.0.0.2"; + sha256 = "1yblxnjfmcjnlr76b1vs9wdjq9rnm3mgjhi3f472a69v1pbg9ngi"; libraryHaskellDepends = [ aeson base Blammo bytestring case-insensitive clock http-types monad-logger-aeson text unliftio-core wai @@ -11510,6 +11508,21 @@ self: { license = lib.licenses.publicDomain; }) {inherit (pkgs) openssl;}; + "HsOpenSSL_0_11_7_8" = callPackage + ({ mkDerivation, base, bytestring, Cabal, network, openssl, time }: + mkDerivation { + pname = "HsOpenSSL"; + version = "0.11.7.8"; + sha256 = "0y46ygdyi195d2ns74gbyabwrvnh5w10xqxdd6jrw43f70jsa5xw"; + setupHaskellDepends = [ base Cabal ]; + libraryHaskellDepends = [ base bytestring network time ]; + librarySystemDepends = [ openssl ]; + testHaskellDepends = [ base bytestring ]; + description = "Partial OpenSSL binding for Haskell"; + license = lib.licenses.publicDomain; + hydraPlatforms = lib.platforms.none; + }) {inherit (pkgs) openssl;}; + "HsOpenSSL-x509-system" = callPackage ({ mkDerivation, base, bytestring, HsOpenSSL, unix }: mkDerivation { @@ -14353,8 +14366,8 @@ self: { }: mkDerivation { pname = "MicroHs"; - version = "0.9.14.0"; - sha256 = "0b5bivfis0xc81nnld82jgwcpk6mkpcn09w00l53fab2a88jkxq0"; + version = "0.9.16.0"; + sha256 = "0p3lzl1yh1r25s7mr0pipf6ym56syydi9ljbkyfp1i0yv4ynqy17"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; @@ -23343,8 +23356,8 @@ self: { }: mkDerivation { pname = "Yampa"; - version = "0.14.9"; - sha256 = "0khlr63l3xrhylapr5ql62b3kzfak97vlz1cjd15pzfain7pvbds"; + version = "0.14.10"; + sha256 = "1la2v70pzjmvw4j0v5sacb6vxclby86jx68jq6czzxyrl8ydijzc"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -26106,6 +26119,8 @@ self: { pname = "aeson"; version = "2.2.3.0"; sha256 = "1akbrh8iz47f0ai30yabg1n4vcf1fx0a9gzj45fx0si553s5r8ns"; + revision = "1"; + editedCabalFile = "0q1nw6p4p0c4mjgi4hmiqj7npb5kbdsdbprq90a7mn5qnnfd4rpg"; libraryHaskellDepends = [ base bytestring character-ps containers data-fix deepseq dlist exceptions generically ghc-prim hashable indexed-traversable @@ -37206,6 +37221,19 @@ self: { mainProgram = "ironforge-yesod"; }) {}; + "antelude" = callPackage + ({ mkDerivation, array, base, bytestring, containers, HUnit, text + }: + mkDerivation { + pname = "antelude"; + version = "0.1.0"; + sha256 = "1wzv4i5bcpkn0vij5z7abn1y323bnpbfjjlc6qfjcjh9857jm632"; + libraryHaskellDepends = [ array base bytestring containers text ]; + testHaskellDepends = [ base HUnit ]; + description = "Yet another alternative Prelude for Haskell"; + license = lib.licenses.mit; + }) {}; + "antfarm" = callPackage ({ mkDerivation, base, containers, HUnit, minimorph, mtl, parsec , test-framework, test-framework-hunit, text, transformers @@ -38703,16 +38731,16 @@ self: { "apple" = callPackage ({ mkDerivation, alex, array, base, bytestring, c2hs , composition-prelude, containers, cpphs, criterion, deepseq - , directory, dom-lt, erf, extra, filepath, happy, haskeline - , hypergeometric, libffi, microlens, microlens-mtl, mtl + , directory, dom-lt, erf, extra, fast-arithmetic, filepath, happy + , haskeline, hypergeometric, libffi, microlens, microlens-mtl, mtl , optparse-applicative, prettyprinter, process, QuickCheck, split - , statistics, tasty, tasty-hunit, temporary, text, transformers - , unix + , statistics, tasty, tasty-hunit, tasty-quickcheck, temporary, text + , transformers, unix }: mkDerivation { pname = "apple"; - version = "0.1.0.0"; - sha256 = "02xrw3q1i4aswbvvzl8rv9v2vwhyk86i3yklwqwpc9jh7bxh8262"; + version = "0.2.0.0"; + sha256 = "0si1yqwplmxggfd4gifakk9hy2fwycgb4m6vhmzwpx08gjwdls08"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -38728,8 +38756,9 @@ self: { split text transformers ]; testHaskellDepends = [ - base bytestring directory filepath hypergeometric process tasty - tasty-hunit temporary text + base bytestring directory fast-arithmetic filepath hypergeometric + process QuickCheck tasty tasty-hunit tasty-quickcheck temporary + text ]; testToolDepends = [ cpphs ]; benchmarkHaskellDepends = [ @@ -41604,8 +41633,8 @@ self: { pname = "async"; version = "2.2.5"; sha256 = "1xqnixmcxbird7rxl124bn5swpyyxxx2jxpdsbx2l8drp8z4f60q"; - revision = "1"; - editedCabalFile = "1y1cd3dkllrwbqj9ca8rr4vv2v751vrvia0kkq4qv5ajbxh9wpcx"; + revision = "2"; + editedCabalFile = "0ddz3q3b478ahz8q0b3ni2b3ikw1sjc2p89j1p530670m3xnm7ng"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base hashable stm ]; @@ -43308,18 +43337,18 @@ self: { license = lib.licenses.mit; }) {}; - "autodocodec_0_4_0_0" = callPackage - ({ mkDerivation, aeson, base, bytestring, containers, doctest - , hashable, mtl, scientific, text, time, unordered-containers - , validity, validity-scientific, vector + "autodocodec_0_4_2_0" = callPackage + ({ mkDerivation, aeson, base, bytestring, containers, dlist + , doctest, hashable, mtl, scientific, text, time + , unordered-containers, validity, validity-scientific, vector }: mkDerivation { pname = "autodocodec"; - version = "0.4.0.0"; - sha256 = "0rlv4w51is5fis2vi58wgyldsr5wv5qyiv3js5nx8zp594sh9xrm"; + version = "0.4.2.0"; + sha256 = "041lkn9msxgbq9fkn90a44j3cygn98l6c90f7mjwzg6a2519r6fh"; libraryHaskellDepends = [ - aeson base bytestring containers hashable mtl scientific text time - unordered-containers validity validity-scientific vector + aeson base bytestring containers dlist hashable mtl scientific text + time unordered-containers validity validity-scientific vector ]; testHaskellDepends = [ base doctest ]; description = "Self-documenting encoder and decoder"; @@ -43472,15 +43501,15 @@ self: { license = lib.licenses.mit; }) {}; - "autodocodec-yaml_0_3_0_2" = callPackage + "autodocodec-yaml_0_4_0_0" = callPackage ({ mkDerivation, autodocodec, autodocodec-schema, base, bytestring , containers, path, path-io, safe-coloured-text, scientific, text , vector, yaml }: mkDerivation { pname = "autodocodec-yaml"; - version = "0.3.0.2"; - sha256 = "1jy7wzbndjvkdkfjxbcbz7r1x3c7dpnqjzyvm1n92fbj74f4n9rz"; + version = "0.4.0.0"; + sha256 = "1al2k668czis10klcicrxns89nks7b6b003wrpgaa0alx2imjsy1"; libraryHaskellDepends = [ autodocodec autodocodec-schema base bytestring containers path path-io safe-coloured-text scientific text vector yaml @@ -43950,8 +43979,8 @@ self: { "avro" = callPackage ({ mkDerivation, aeson, array, base, base16-bytestring, bifunctors - , binary, bytestring, containers, data-binary-ieee754, deepseq - , directory, doctest, doctest-discover, extra, fail, gauge + , binary, bytestring, containers, criterion, data-binary-ieee754 + , deepseq, directory, doctest, doctest-discover, extra, fail , generic-lens, HasBigDecimal, hashable, hedgehog, hspec , hspec-discover, hw-hspec-hedgehog, lens, lens-aeson, mtl , QuickCheck, random, raw-strings-qq, scientific, semigroups @@ -43960,8 +43989,8 @@ self: { }: mkDerivation { pname = "avro"; - version = "0.6.2.0"; - sha256 = "078616j4lz6kdakdckbyipgan0ldnvfs3314flavcgmwi1fnv89a"; + version = "0.6.2.1"; + sha256 = "0ng8kyc4xi8nirkl387gyi0daw8sxki701q169llcx51abf7jaqf"; libraryHaskellDepends = [ aeson array base base16-bytestring bifunctors binary bytestring containers data-binary-ieee754 deepseq fail HasBigDecimal hashable @@ -43979,8 +44008,9 @@ self: { ]; testToolDepends = [ doctest-discover hspec-discover ]; benchmarkHaskellDepends = [ - aeson base binary bytestring containers deepseq gauge hashable mtl - random raw-strings-qq text transformers unordered-containers vector + aeson base binary bytestring containers criterion deepseq hashable + mtl random raw-strings-qq text transformers unordered-containers + vector ]; description = "Avro serialization support for Haskell"; license = lib.licenses.bsd3; @@ -45360,6 +45390,21 @@ self: { mainProgram = "babylon"; }) {}; + "babynf" = callPackage + ({ mkDerivation, attoparsec, base, bytestring, tasty, tasty-hunit + }: + mkDerivation { + pname = "babynf"; + version = "0.1.0.2"; + sha256 = "0p84scb30ddgyxbvq4pshimsqzk0qc0x02f7bq4vjd1s6zba7r0i"; + libraryHaskellDepends = [ attoparsec base bytestring ]; + testHaskellDepends = [ + attoparsec base bytestring tasty tasty-hunit + ]; + description = "Library for generating parsers from ABNF"; + license = lib.licenses.mit; + }) {}; + "backblaze-b2-hs" = callPackage ({ mkDerivation, aeson, base, base64-bytestring, bytestring , case-insensitive, conduit, containers, cryptonite, formatting @@ -49156,6 +49201,8 @@ self: { pname = "binary-instances"; version = "1.0.5"; sha256 = "01ycp0dn96n4zavrw1rr5ly0isr3kq16jihwcdg6c022v9w73wkf"; + revision = "1"; + editedCabalFile = "1wxcp6cy7lp3bbn45jlihqdl43ix84szs55n7vwd5vjxvs695hjl"; libraryHaskellDepends = [ aeson base binary binary-orphans case-insensitive hashable primitive scientific tagged text time-compat unordered-containers @@ -51454,8 +51501,8 @@ self: { }: mkDerivation { pname = "bitfield"; - version = "0.0.0.0"; - sha256 = "1b9jqbcyzp1ajcgjiipjgn1h514kl6zav4ai474x6xalhvwfcpx9"; + version = "0.0.0.1"; + sha256 = "17x4i0i4ndmzhx0xbh78m57iwqbgl0md74hvqxnmxllnjg93bxm1"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base genvalidity genvalidity-sydtest QuickCheck sydtest validity @@ -52915,6 +52962,35 @@ self: { license = lib.licenses.bsd3; }) {}; + "bloodhound_0_22_0_0" = callPackage + ({ mkDerivation, aeson, base, blaze-builder, bytestring, containers + , errors, exceptions, generic-random, hashable, hspec, http-client + , http-types, microlens, microlens-aeson, mtl, network-uri + , pretty-simple, QuickCheck, quickcheck-properties, scientific + , semigroups, semver, temporary, text, time, transformers + , unix-compat, unordered-containers, vector + }: + mkDerivation { + pname = "bloodhound"; + version = "0.22.0.0"; + sha256 = "0w96zrv2rrhwiahf2x619l2ivqrj5jnih5ck216wrnzj6axlh9j4"; + libraryHaskellDepends = [ + aeson base blaze-builder bytestring containers exceptions hashable + http-client http-types mtl network-uri scientific semigroups semver + text time transformers unordered-containers vector + ]; + testHaskellDepends = [ + aeson base blaze-builder bytestring containers errors exceptions + generic-random hashable hspec http-client http-types microlens + microlens-aeson mtl network-uri pretty-simple QuickCheck + quickcheck-properties scientific semigroups semver temporary text + time transformers unix-compat unordered-containers vector + ]; + description = "Elasticsearch client library for Haskell"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "bloodhound-amazonka-auth" = callPackage ({ mkDerivation, aeson, amazonka, amazonka-core , amazonka-elasticsearch, base, bloodhound, exceptions, http-client @@ -53140,8 +53216,8 @@ self: { ({ mkDerivation, bluefin-internal }: mkDerivation { pname = "bluefin"; - version = "0.0.6.0"; - sha256 = "17w2830azxwals84hza77rpglz4bq6q3109h7wxnbvc9vcjy39ya"; + version = "0.0.6.1"; + sha256 = "1ihs05h8mbp205swlx2zbh3fi2d9m33sg06d43nqxmrgdvbh57rd"; libraryHaskellDepends = [ bluefin-internal ]; description = "The Bluefin effect system"; license = lib.licenses.mit; @@ -53170,10 +53246,8 @@ self: { }: mkDerivation { pname = "bluefin-internal"; - version = "0.0.6.0"; - sha256 = "0z7c7aalgs02asqp2nz9f0hcdxgwyxd3qnklq5h73f2lkyy4qi3p"; - revision = "1"; - editedCabalFile = "0miyxxmdsyaq740na4z7a3qqjgcy8yvmx6sn9fjydlgsban37kdr"; + version = "0.0.6.1"; + sha256 = "12k7h2qs912nyy482h2cddwp0xafdk8pj7zc983lhw07pwdy0mi4"; libraryHaskellDepends = [ base monad-control transformers transformers-base unliftio-core ]; @@ -54365,10 +54439,8 @@ self: { }: mkDerivation { pname = "bound-extras"; - version = "0.0.2"; - sha256 = "1mrsr75yd55p3rgqqjlhs0f498qgbmj12ldadj4frmkhjqf3vf9y"; - revision = "3"; - editedCabalFile = "0b5zywbbps0j7m3cndgwvg8d8kgcyvi4rnmnv2shavlhwnjlbawa"; + version = "0.0.3"; + sha256 = "1apzrjalgdsjcx0c3251hfwgqw5ard3vxqm6zfg3f9wlfy58vp6q"; libraryHaskellDepends = [ base bound deepseq hashable transformers ]; @@ -54732,33 +54804,35 @@ self: { "brassica" = callPackage ({ mkDerivation, aeson, attoparsec-aeson, base, bytestring, conduit - , conduit-extra, containers, criterion, deepseq, file-embed - , megaparsec, mtl, optparse-applicative, parser-combinators, split - , tasty, tasty-golden, text, transformers, utf8-string, vector + , conduit-extra, containers, criterion, deepseq, fast-myers-diff + , file-embed, megaparsec, mtl, optparse-applicative, parallel + , parser-combinators, split, tasty, tasty-golden, text + , transformers, utf8-string, vector }: mkDerivation { pname = "brassica"; - version = "0.2.0"; - sha256 = "11myl3ir4vla6d6cvhfrjxvsfxvasj109ljxa0kjiyrqjhrv0s1z"; + version = "0.3.0"; + sha256 = "10ydb5w79y1jqa34mzrdl7s8ns29w1vxplv55ik51mkayclfgx3n"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base containers deepseq megaparsec mtl parser-combinators split - transformers vector + base containers deepseq fast-myers-diff megaparsec mtl + parser-combinators split transformers vector ]; executableHaskellDepends = [ aeson attoparsec-aeson base bytestring conduit conduit-extra - deepseq optparse-applicative text + deepseq optparse-applicative parallel text ]; testHaskellDepends = [ base bytestring conduit tasty tasty-golden text transformers utf8-string ]; - benchmarkHaskellDepends = [ base criterion file-embed text ]; + benchmarkHaskellDepends = [ + base criterion file-embed parallel text + ]; description = "Featureful sound change applier"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - mainProgram = "brassica"; broken = true; }) {}; @@ -58630,19 +58704,19 @@ self: { "cabal-flatpak" = callPackage ({ mkDerivation, aeson, aeson-pretty, base, bytestring, cabal-plan - , containers, cryptohash-sha256, http-client, http-client-tls - , http-types, optparse-applicative, pathtype, shell-utility, tar - , text, utility-ht, yaml, zlib + , containers, cryptohash-sha256, directory, http-client + , http-client-tls, http-types, optparse-applicative, pathtype + , shell-utility, tar, text, utility-ht, yaml, zlib }: mkDerivation { pname = "cabal-flatpak"; - version = "0.1.1"; - sha256 = "0p54np4q1xfqja0vxpin61pr6imligscxwpqk0fjz38idqa2ys56"; + version = "0.1.2"; + sha256 = "05ig175b2glxppn5wr05pnncqkp8yhhy1m7ymmc1jk5pmiy3zvzi"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ aeson aeson-pretty base bytestring cabal-plan containers - cryptohash-sha256 http-client http-client-tls http-types + cryptohash-sha256 directory http-client http-client-tls http-types optparse-applicative pathtype shell-utility tar text utility-ht yaml zlib ]; @@ -59265,23 +59339,22 @@ self: { mainProgram = "cabal-rpm"; }) {}; - "cabal-rpm_2_2_0" = callPackage + "cabal-rpm_2_2_1" = callPackage ({ mkDerivation, aeson, base, bytestring, Cabal, cached-json-file , directory, extra, filepath, http-client, http-client-tls - , http-conduit, http-query, optparse-applicative, process - , simple-cabal, simple-cmd, simple-cmd-args, text, time, unix + , http-query, simple-cabal, simple-cmd, simple-cmd-args, text, time + , unix }: mkDerivation { pname = "cabal-rpm"; - version = "2.2.0"; - sha256 = "1lrcqgbl3l6if9sa5qylm87yssl5gsinnidzx19q6z2nm5wbnyh7"; + version = "2.2.1"; + sha256 = "0dsbnnvzss0flknf1c2fq85y9a4d26nbrlnrh2xcyfwh2mz20c9d"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ aeson base bytestring Cabal cached-json-file directory extra - filepath http-client http-client-tls http-conduit http-query - optparse-applicative process simple-cabal simple-cmd - simple-cmd-args text time unix + filepath http-client http-client-tls http-query simple-cabal + simple-cmd simple-cmd-args text time unix ]; description = "RPM packaging tool for Haskell Cabal-based packages"; license = lib.licenses.gpl3Only; @@ -61003,6 +61076,8 @@ self: { pname = "cantor-pairing"; version = "0.2.0.2"; sha256 = "1h95xbc1lhwd40qk64qw2cmr7prwygli1q2wy5hscny7jyah95c2"; + revision = "1"; + editedCabalFile = "10dsxgdpxa5hxz5zrij8h2whwsz0l1fvkkwdmidqpv09is55wmz5"; libraryHaskellDepends = [ base containers integer-gmp integer-logarithms integer-roots ]; @@ -62100,8 +62175,8 @@ self: { }: mkDerivation { pname = "cassava"; - version = "0.5.3.1"; - sha256 = "14kz47i6f9c747h2mf8cf6r22gib4a2ggh57fviz0z9sr6y760av"; + version = "0.5.3.2"; + sha256 = "1jd9s10z2y3hizrpy3iaw2vvqmk342zxhwkky57ba39cbli5vlis"; configureFlags = [ "-f-bytestring--lt-0_10_4" ]; libraryHaskellDepends = [ array attoparsec base bytestring containers deepseq hashable Only @@ -62588,6 +62663,29 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; + "cauldron" = callPackage + ({ mkDerivation, algebraic-graphs, base, bytestring, containers + , multicurryable, sop-core, tasty, tasty-hunit, text, transformers + }: + mkDerivation { + pname = "cauldron"; + version = "0.4.0.0"; + sha256 = "1apyjq74xscjzc03wibv9zm0kzqggm8rw0jg52xb8lj5bh5wxgmj"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + algebraic-graphs base bytestring containers multicurryable sop-core + text + ]; + executableHaskellDepends = [ base ]; + testHaskellDepends = [ + base containers tasty tasty-hunit text transformers + ]; + description = "Toy dependency injection framework"; + license = lib.licenses.bsd3; + mainProgram = "cauldron-example-wiring"; + }) {}; + "cautious" = callPackage ({ mkDerivation, aeson, base, transformers, validity }: mkDerivation { @@ -77993,8 +78091,8 @@ self: { }: mkDerivation { pname = "crdt-event-fold"; - version = "1.8.1.0"; - sha256 = "1lalg8gi8rcpgzangqbf9j51fpgdsq3k5j6wqbd45nbyyym5zmjj"; + version = "1.8.1.1"; + sha256 = "07nqvmlpbcy88k7lmwl5n0mq2n0lxq48nigyqgzibadwg3i20r8q"; libraryHaskellDepends = [ aeson base binary containers data-default-class data-dword exceptions monad-logger mtl transformers @@ -82877,8 +82975,8 @@ self: { ({ mkDerivation, base, hspec }: mkDerivation { pname = "data-elevator"; - version = "0.1.0.1"; - sha256 = "0j2adsqn3r23jjwl5p0kyf2z1wd2kibfqivdcchngsmf3yfr34sz"; + version = "0.1.0.2"; + sha256 = "109vff7i8jrz3n6748hj8vf1x4a8r91d2p1cwmcgs0rad536zl0m"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base hspec ]; description = "Coerce between unlifted boxed and lifted types"; @@ -86543,6 +86641,18 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; + "delivery-status-notification" = callPackage + ({ mkDerivation, attoparsec, base, text }: + mkDerivation { + pname = "delivery-status-notification"; + version = "0.2.0.0"; + sha256 = "0vmvgwq9g3kqdmfqs4gg7h1a926jqg7g8n065qvq0b4c4pmn7dy1"; + libraryHaskellDepends = [ attoparsec base text ]; + testHaskellDepends = [ attoparsec base ]; + description = "Parse bounce messages per RFC3464, RFC3463"; + license = lib.licenses.bsd3; + }) {}; + "delta" = callPackage ({ mkDerivation, base, containers, directory, filepath, hspec , optparse-applicative, process, sodium, time @@ -88689,14 +88799,30 @@ self: { ({ mkDerivation, aeson, base, containers, QuickCheck, random }: mkDerivation { pname = "dhscanner-ast"; - version = "0.1.0.0"; - sha256 = "14qdx79rgz61ajiags6w8v5zzv95n0hng6y3amwz2dyki65sckah"; + version = "0.1.0.2"; + sha256 = "1q8wklhn4nyw2ryb8bdgfwvx4v5maf2minms5zkigqb1rh1snc8g"; libraryHaskellDepends = [ aeson base containers ]; testHaskellDepends = [ base QuickCheck random ]; description = "abstract syntax tree for multiple programming languages"; license = lib.licenses.gpl3Only; }) {}; + "dhscanner-bitcode" = callPackage + ({ mkDerivation, aeson, base, containers, dhscanner-ast, QuickCheck + , random + }: + mkDerivation { + pname = "dhscanner-bitcode"; + version = "0.1.0.1"; + sha256 = "036m2iix36ybcc8bqr9wz92rp4zq63qzyqgbm8bzk79zwdc432q2"; + libraryHaskellDepends = [ aeson base containers dhscanner-ast ]; + testHaskellDepends = [ + base containers dhscanner-ast QuickCheck random + ]; + description = "Intermediate language for static code analysis"; + license = lib.licenses.gpl3Only; + }) {}; + "di" = callPackage ({ mkDerivation, base, containers, df1, di-core, di-df1, di-handle , di-monad, exceptions @@ -88959,8 +89085,8 @@ self: { pname = "diagrams-cairo"; version = "1.4.2.1"; sha256 = "0fqma8m4xrqha079aqqynk23y252x47xfzvb0gss4bvgdmwa0lzc"; - revision = "2"; - editedCabalFile = "0fyy1iqfwzk1b4vvqnfh31gd8g8qjry7cc9g2nhg505rbafflcn5"; + revision = "3"; + editedCabalFile = "1qdx7k5z6bw70y6rmjs5pkwdypsmrl0gmp7qdjmsbkjv2sah7hq4"; libraryHaskellDepends = [ array base bytestring cairo colour containers data-default-class diagrams-core diagrams-lib filepath hashable JuicyPixels lens mtl @@ -92578,20 +92704,17 @@ self: { }) {}; "dns-patterns" = callPackage - ({ mkDerivation, attoparsec, base, bytestring, criterion, HUnit + ({ mkDerivation, attoparsec, base, bytestring, HUnit , parser-combinators, text }: mkDerivation { pname = "dns-patterns"; - version = "0.2.3"; - sha256 = "0vs3qn4pdpk13imxp8pz106ra504jwx629h62vv9z5nnjwq81d6y"; + version = "0.3.1"; + sha256 = "1b39ycdw9ws8sd6nxdcrk6snrl8yifda1a5n89fdpfvsaybhly83"; libraryHaskellDepends = [ attoparsec base bytestring parser-combinators text ]; testHaskellDepends = [ attoparsec base bytestring HUnit text ]; - benchmarkHaskellDepends = [ - attoparsec base bytestring criterion text - ]; description = "DNS name parsing and pattern matching utilities"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; @@ -93247,7 +93370,7 @@ self: { mainProgram = "doctest"; }) {}; - "doctest_0_22_8" = callPackage + "doctest_0_22_9" = callPackage ({ mkDerivation, base, code-page, containers, deepseq, directory , exceptions, filepath, ghc, ghc-paths, hspec, hspec-core , hspec-discover, HUnit, mockery, process, QuickCheck, silently @@ -93255,8 +93378,8 @@ self: { }: mkDerivation { pname = "doctest"; - version = "0.22.8"; - sha256 = "1wa64p2myk2rcpyz7pn1d7mj28bl0n9nnjnzkm5q267rmsa5vhf6"; + version = "0.22.9"; + sha256 = "182952jr58hz83ckmbc33nwx9ndad808d8cn9z0ay7ds6p11i46s"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -95613,6 +95736,8 @@ self: { pname = "dupIO"; version = "0.1.0"; sha256 = "1j2xi1hskmgkknmg01fbkfa3ry2a1f7mzkvjhkqlsz27v3f3q4lm"; + revision = "1"; + editedCabalFile = "0hpph3a26q0jj0bhvxkngj02m5s3amibjgbazd7aq91phrhykz6z"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base ghc-prim ]; @@ -100591,12 +100716,12 @@ self: { license = lib.licenses.bsd3; }) {}; - "envparse_0_5_2" = callPackage + "envparse_0_6_0" = callPackage ({ mkDerivation, base, containers, hspec, text }: mkDerivation { pname = "envparse"; - version = "0.5.2"; - sha256 = "1kc41wdl75qld93ch4cymji1sz72gpzs4yv7zak8cx4ha8wykns0"; + version = "0.6.0"; + sha256 = "1a46ljsrdha0pccfyxpii1lbwzbbj1960n5hcr47gdy1w3vcwjwk"; libraryHaskellDepends = [ base containers ]; testHaskellDepends = [ base containers hspec text ]; description = "Parse environment variables"; @@ -101083,8 +101208,8 @@ self: { }: mkDerivation { pname = "erebos"; - version = "0.1.5"; - sha256 = "0w4qxr527m6qda3b6s79iyg38ynz4kwjcddp1k5524pgzs3v62j9"; + version = "0.1.6"; + sha256 = "153akrq6541k5m0gwhdw6bgk83b9pj3gdmzi0gafgypp0lhrg1f2"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -101113,8 +101238,8 @@ self: { }: mkDerivation { pname = "erebos-tester"; - version = "0.2.2"; - sha256 = "156597h0sriwjm5rivlmvizn76i5c984bs87v39zj0yyr2qzk0f7"; + version = "0.2.4"; + sha256 = "1nfhkwva75qwrhmrhccvy52ga0fxig7ddqhgnl0cpcsll3hfkmdn"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -102539,6 +102664,8 @@ self: { pname = "evdev"; version = "2.3.1.1"; sha256 = "1jq7ayi4rv8v02wyxva9776iqymv0ac1h7jbfxf96gmk5ifwyinf"; + revision = "1"; + editedCabalFile = "05v90azm7rfmzbcbm2rmbl20977nk1m41m0l8sryf64zk6sxpw3n"; libraryHaskellDepends = [ base bytestring containers extra filepath-bytestring monad-loops mtl rawfilepath time unix @@ -102556,17 +102683,15 @@ self: { "evdev-streamly" = callPackage ({ mkDerivation, base, bytestring, containers, evdev, extra - , filepath-bytestring, rawfilepath, streamly, streamly-fsnotify - , unix + , filepath-bytestring, mtl, rawfilepath, streamly + , streamly-fsnotify, unix }: mkDerivation { pname = "evdev-streamly"; - version = "0.0.2.0"; - sha256 = "0vrkg3d1171lsr71k3vrcf9vbl18mdnvpi02sxvzjp2zbv3gs7v6"; - revision = "1"; - editedCabalFile = "11w831ml0dn9v3gchv8465w43ml8cgcfwgxmpwnjy6v8p34q14qm"; + version = "0.0.2.1"; + sha256 = "00q5i41al5p1f70a44v922qxlafq54pfmbgvh7v0h43rkqjzkj4r"; libraryHaskellDepends = [ - base bytestring containers evdev extra filepath-bytestring + base bytestring containers evdev extra filepath-bytestring mtl rawfilepath streamly streamly-fsnotify unix ]; description = "Bridge for working with evdev and streamly"; @@ -102904,10 +103029,8 @@ self: { }: mkDerivation { pname = "eventlog2html"; - version = "0.11.0"; - sha256 = "0yj50j9jijw8is19d2afpgc3dv45ji911rlhbjvcz7x441valqx8"; - revision = "1"; - editedCabalFile = "11zza33mqh34l9rsryzjpr04whx284wjvjbybaz1m83sc8c8blhx"; + version = "0.11.1"; + sha256 = "1rfyw285g48c7dck8kjykx9n4brw7ngm275n64g1wwwkm4ybn43n"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -106545,26 +106668,26 @@ self: { "fbrnch" = callPackage ({ mkDerivation, aeson, async, base, bodhi, bugzilla-redhat - , bytestring, config-ini, copr-api, directory, email-validate - , extra, fedora-dists, filepath, http-conduit, http-directory - , http-query, koji, network-uri, pagure, pretty-terminal, process - , rpm-nvr, rpmbuild-order, simple-cmd, simple-cmd-args - , simple-prompt, text, time, typed-process, unix, utf8-string - , xdg-basedir + , bytestring, config-ini, copr-api, directory, either + , email-validate, extra, fedora-releases, filepath, http-conduit + , http-directory, http-query, koji, network-uri, pagure + , pretty-terminal, process, rpm-nvr, rpmbuild-order, say + , select-rpms, simple-cmd, simple-cmd-args, simple-prompt, text + , time, typed-process, unix, utf8-string, xdg-basedir }: mkDerivation { pname = "fbrnch"; - version = "1.4"; - sha256 = "0zcwqihcmvpd3vbbzrn9qy41hd4yapdv7b405gqpz10fbil5w5mq"; + version = "1.5"; + sha256 = "1jj2nnjqpqj1fxx7vliq1ayzwdp6xaphbdln8w2fifwbp8k3znjj"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ aeson async base bodhi bugzilla-redhat bytestring config-ini - copr-api directory email-validate extra fedora-dists filepath - http-conduit http-directory http-query koji network-uri pagure - pretty-terminal process rpm-nvr rpmbuild-order simple-cmd - simple-cmd-args simple-prompt text time typed-process unix - utf8-string xdg-basedir + copr-api directory either email-validate extra fedora-releases + filepath http-conduit http-directory http-query koji network-uri + pagure pretty-terminal process rpm-nvr rpmbuild-order say + select-rpms simple-cmd simple-cmd-args simple-prompt text time + typed-process unix utf8-string xdg-basedir ]; description = "Fedora packager tool to build package branches"; license = lib.licenses.gpl2Only; @@ -107055,6 +107178,19 @@ self: { broken = true; }) {}; + "fedora-releases" = callPackage + ({ mkDerivation, aeson, base, bodhi, cached-json-file, extra }: + mkDerivation { + pname = "fedora-releases"; + version = "0.1.0"; + sha256 = "0f93dnjbf1nznblj5y2a4w4y5fz7f6rvami57f8zslz4a90iw8pl"; + libraryHaskellDepends = [ + aeson base bodhi cached-json-file extra + ]; + description = "Library for Fedora release versions"; + license = lib.licenses.gpl3Only; + }) {}; + "fedora-repoquery" = callPackage ({ mkDerivation, base, bodhi, cached-json-file, case-insensitive , curl, directory, extra, filepath, Glob, regex-compat, safe @@ -108003,16 +108139,16 @@ self: { }) {}; "fields-and-cases" = callPackage - ({ mkDerivation, base, lima, process, regex-compat, relude + ({ mkDerivation, base, process, regex-compat, relude , string-conversions, tasty, tasty-hunit }: mkDerivation { pname = "fields-and-cases"; - version = "0.1.0.0"; - sha256 = "1d43xg9qss83h1sghy0ki8rfwcq05c00fqks45m2gfvsfx36qxmf"; + version = "0.2.0.0"; + sha256 = "0bw3xdja63zvi1w1i3r5d9jsdpx9dyi1pniv6y4s8w7ryblcg2dw"; libraryHaskellDepends = [ base relude string-conversions ]; testHaskellDepends = [ - base lima process regex-compat relude string-conversions tasty + base process regex-compat relude string-conversions tasty tasty-hunit ]; description = "Codegen Haskell types to other languages"; @@ -108174,8 +108310,8 @@ self: { }: mkDerivation { pname = "file-io"; - version = "0.1.2"; - sha256 = "0yimw53z6j8jb38jhkyjfzziccxvlpd74x6kkn83zkqy120y6rds"; + version = "0.1.4"; + sha256 = "0lkgx2v92zv9r9ndkzlia8k4my242p250i99qbcf6msw04x13ng3"; libraryHaskellDepends = [ base bytestring deepseq filepath unix ]; testHaskellDepends = [ base bytestring filepath tasty tasty-hunit temporary @@ -108398,8 +108534,8 @@ self: { }: mkDerivation { pname = "filepath-bytestring"; - version = "1.4.2.1.13"; - sha256 = "0dvsn98xb5hjczs21r8868n79jygaava1pp5l1mdr823hqlz1bcw"; + version = "1.4.100.3.2"; + sha256 = "1zfhzpbh798n57k3hncingpk2ls1y2b1ap6iznn69sn3v59q2mbq"; libraryHaskellDepends = [ base bytestring unix ]; testHaskellDepends = [ base bytestring filepath QuickCheck ]; benchmarkHaskellDepends = [ base criterion filepath ]; @@ -108893,8 +109029,8 @@ self: { }: mkDerivation { pname = "finitary"; - version = "2.1.3.0"; - sha256 = "14b7qjqya36yk19qivcf4lir0pd89mvrh52pd54niq5sx0c8nxj9"; + version = "2.2.0.0"; + sha256 = "035pbixg74z7xbjw33y50xxgkhml5l3y93izmlilgd8dil8biwl3"; libraryHaskellDepends = [ base bitvec finite-typelits ghc-typelits-knownnat ghc-typelits-natnormalise primitive template-haskell @@ -109069,14 +109205,14 @@ self: { maintainers = [ lib.maintainers.turion ]; }) {}; - "finite-typelits_0_2_0_1" = callPackage + "finite-typelits_0_2_1_0" = callPackage ({ mkDerivation, base, deepseq, QuickCheck, tagged , template-haskell }: mkDerivation { pname = "finite-typelits"; - version = "0.2.0.1"; - sha256 = "1zq3dy1w2h46ybc0ifqdn5f1hnbvsw32vk9ash19lffmqj569di0"; + version = "0.2.1.0"; + sha256 = "0i786r2l3k9fxkpyy6rsi8my6kkar7y8yxk7h9gncm0z6kmvrnvk"; libraryHaskellDepends = [ base deepseq tagged template-haskell ]; testHaskellDepends = [ base deepseq QuickCheck ]; description = "A type inhabited by finitely many values, indexed by type-level naturals"; @@ -111698,24 +111834,27 @@ self: { }) {}; "fontconfig-pure" = callPackage - ({ mkDerivation, base, containers, css-syntax, fontconfig - , freetype2, hashable, hspec, linear, QuickCheck, scientific - , stylist-traits, text + ({ mkDerivation, base, bytestring, containers, css-syntax + , fontconfig, freetype2, hashable, hspec, linear, msgpack + , QuickCheck, scientific, stylist-traits, text, vector }: mkDerivation { pname = "fontconfig-pure"; - version = "0.4.0.0"; - sha256 = "05nlnr5v1gfi0wrksdpzszpvj1vj5ff2wv2nzm7g43dr9j33xyf6"; + version = "0.5.0.0"; + sha256 = "0r4mqizi9bffaf5azny6lwl9ifmqaw8l6r7c4vsc7f4qlpp7w9yi"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base containers css-syntax freetype2 hashable linear scientific - stylist-traits text + base bytestring containers css-syntax freetype2 hashable linear + msgpack QuickCheck scientific stylist-traits text vector ]; libraryPkgconfigDepends = [ fontconfig ]; executableHaskellDepends = [ base ]; - testHaskellDepends = [ base hspec QuickCheck ]; - description = "Pure-functional language bindings to FontConfig"; + testHaskellDepends = [ + base containers css-syntax hspec msgpack QuickCheck stylist-traits + text + ]; + description = "Resolves font descriptions to font libraries, including ones installed on your freedesktop (Linux or BSD system)"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; mainProgram = "fontconfig-pure"; @@ -113020,53 +113159,47 @@ self: { ({ mkDerivation, aeson, annotated-exception, async, autodocodec , autodocodec-openapi3, base, bcp47, Blammo, Blammo-wai, bugsnag , bytestring, case-insensitive, cassava, conduit, conduit-extra - , containers, cookie, datadog, directory, doctest, dotenv, ekg-core - , errors, exceptions, extra, faktory, filepath, freckle-env, Glob - , hashable, hs-opentelemetry-api - , hs-opentelemetry-instrumentation-persistent + , containers, cookie, datadog, doctest, ekg-core, exceptions, extra + , faktory, freckle-env, freckle-http, freckle-otel, Glob, hashable + , hs-opentelemetry-api, hs-opentelemetry-instrumentation-persistent , hs-opentelemetry-instrumentation-wai, hs-opentelemetry-sdk, hspec - , hspec-core, hspec-expectations-json, hspec-expectations-lifted - , hspec-junit-formatter, http-client, http-conduit - , http-link-header, http-types, immortal, lens, lens-aeson - , memcache, monad-control, monad-logger, monad-logger-aeson - , monad-validate, MonadRandom, mtl, network-uri + , hspec-core, hspec-expectations-lifted, hspec-junit-formatter + , http-client, http-types, immortal, lens, monad-control + , monad-logger-aeson, monad-validate, MonadRandom, mtl , nonempty-containers, openapi3, path-pieces, persistent - , persistent-postgresql, postgresql-simple, primitive, pureMD5 - , QuickCheck, resource-pool, resourcet, retry, safe, scientist - , semigroupoids, serialise, template-haskell, text, time - , transformers, transformers-base, typed-process, unliftio - , unordered-containers, vector, wai, wai-extra, yaml, yesod-core - , yesod-test, zlib + , persistent-postgresql, postgresql-simple, primitive, QuickCheck + , resource-pool, resourcet, safe, scientist, semigroupoids + , template-haskell, text, time, transformers, transformers-base + , typed-process, unliftio, unordered-containers, vector, wai + , wai-extra, yaml, yesod-core, yesod-test }: mkDerivation { pname = "freckle-app"; - version = "1.19.0.0"; - sha256 = "19kpkirbaaxs8pis8137fy0xw8b7v38hs8x37piz7cjcmmycwkxk"; + version = "1.20.0.1"; + sha256 = "1lzs43japwnkn4gaxamnsjchimc2v2w8fkjb90j1jjvw1dnnaj8h"; libraryHaskellDepends = [ aeson annotated-exception autodocodec autodocodec-openapi3 base bcp47 Blammo Blammo-wai bugsnag bytestring case-insensitive cassava - conduit conduit-extra containers cookie datadog directory doctest - dotenv ekg-core errors exceptions extra faktory filepath - freckle-env Glob hashable hs-opentelemetry-api + conduit conduit-extra containers cookie datadog doctest ekg-core + exceptions extra faktory freckle-env freckle-http freckle-otel Glob + hashable hs-opentelemetry-api hs-opentelemetry-instrumentation-persistent hs-opentelemetry-instrumentation-wai hs-opentelemetry-sdk hspec hspec-core hspec-expectations-lifted hspec-junit-formatter - http-client http-conduit http-link-header http-types immortal lens - memcache monad-control monad-logger monad-logger-aeson - monad-validate MonadRandom mtl network-uri nonempty-containers - openapi3 path-pieces persistent persistent-postgresql - postgresql-simple primitive pureMD5 QuickCheck resource-pool - resourcet retry safe scientist semigroupoids serialise + http-client http-types immortal lens monad-control + monad-logger-aeson monad-validate MonadRandom mtl + nonempty-containers openapi3 path-pieces persistent + persistent-postgresql postgresql-simple primitive QuickCheck + resource-pool resourcet safe scientist semigroupoids template-haskell text time transformers transformers-base typed-process unliftio unordered-containers vector wai wai-extra yaml yesod-core yesod-test ]; testHaskellDepends = [ - aeson async base Blammo bugsnag bytestring cassava conduit errors - freckle-env hs-opentelemetry-api hspec hspec-expectations-json - hspec-expectations-lifted http-types lens lens-aeson memcache - monad-validate mtl nonempty-containers postgresql-simple QuickCheck - text time unordered-containers vector wai wai-extra zlib + aeson async base Blammo bugsnag bytestring cassava conduit + hs-opentelemetry-api hspec http-types monad-validate + nonempty-containers postgresql-simple QuickCheck vector wai + wai-extra ]; description = "Haskell application toolkit used at Freckle"; license = lib.licenses.mit; @@ -113074,33 +113207,82 @@ self: { }) {}; "freckle-env" = callPackage - ({ mkDerivation, base, doctest, envparse, errors, relude, text - , time + ({ mkDerivation, base, doctest, dotenv, envparse, errors, filepath + , text, time, unliftio }: mkDerivation { pname = "freckle-env"; - version = "0.0.0.0"; - sha256 = "1qhbp7l966kvdaw0bxfzhpckvbqwf251yr0x9s3ppdjn7b7cvkiy"; - libraryHaskellDepends = [ base envparse errors relude text time ]; + version = "0.0.1.1"; + sha256 = "1vvmczv4z4gpp5h3k1ws6ghv6am7xdgx5l3v11bnwyp21fzmzp3n"; + libraryHaskellDepends = [ + base dotenv envparse errors filepath text time unliftio + ]; testHaskellDepends = [ base doctest ]; description = "Some extension to the envparse library"; license = lib.licenses.mit; }) {}; + "freckle-exception" = callPackage + ({ mkDerivation, aeson, annotated-exception, base, exceptions + , monad-logger-aeson, unliftio + }: + mkDerivation { + pname = "freckle-exception"; + version = "0.0.0.0"; + sha256 = "1yxgrg0vqr9qhldww6fz1j9y5cj2rc3kbd40w59cq540plmcmylp"; + libraryHaskellDepends = [ + aeson annotated-exception base exceptions monad-logger-aeson + unliftio + ]; + description = "Some extensions to the annotated-exception library"; + license = lib.licenses.mit; + }) {}; + + "freckle-http" = callPackage + ({ mkDerivation, aeson, annotated-exception, base, Blammo + , bytestring, case-insensitive, conduit, directory, errors, extra + , filepath, freckle-memcached, Glob, hs-opentelemetry-api, hspec + , hspec-expectations-json, hspec-expectations-lifted, http-client + , http-conduit, http-link-header, http-types, lens, lens-aeson + , memcache, monad-logger, monad-validate, mtl, network-uri, retry + , safe, semigroupoids, serialise, text, time, transformers + , unliftio, unordered-containers, zlib + }: + mkDerivation { + pname = "freckle-http"; + version = "0.0.0.0"; + sha256 = "16sli2gcaczrzfmdms6xm9g73yy4vbm7spmigd23nil8g9bab4l2"; + libraryHaskellDepends = [ + aeson annotated-exception base Blammo bytestring case-insensitive + conduit directory errors extra filepath freckle-memcached Glob + hs-opentelemetry-api hspec http-client http-conduit + http-link-header http-types lens lens-aeson memcache monad-logger + monad-validate mtl network-uri retry safe semigroupoids serialise + text time transformers unliftio unordered-containers + ]; + testHaskellDepends = [ + aeson base bytestring hspec hspec-expectations-json + hspec-expectations-lifted http-types lens mtl time + unordered-containers zlib + ]; + description = "..."; + license = lib.licenses.mit; + }) {}; + "freckle-kafka" = callPackage ({ mkDerivation, aeson, annotated-exception, base, Blammo - , containers, freckle-env, hs-opentelemetry-sdk, hw-kafka-client - , lens, relude, resource-pool, text, time, unliftio + , bytestring, containers, freckle-env, hs-opentelemetry-sdk + , hw-kafka-client, lens, mtl, resource-pool, text, time, unliftio , unordered-containers, yesod-core }: mkDerivation { pname = "freckle-kafka"; - version = "0.0.0.0"; - sha256 = "0p8nyh0v038j315y0ia6bi7q4c14anfik3ad9bpck62ximabqa72"; + version = "0.0.0.1"; + sha256 = "1ifm5axxng5bknz4v7zv8pjv0fv91hnv2l8jh22s4llj0wax1l28"; libraryHaskellDepends = [ - aeson annotated-exception base Blammo containers freckle-env - hs-opentelemetry-sdk hw-kafka-client lens relude resource-pool text - time unliftio unordered-containers yesod-core + aeson annotated-exception base Blammo bytestring containers + freckle-env hs-opentelemetry-sdk hw-kafka-client lens mtl + resource-pool text time unliftio unordered-containers yesod-core ]; description = "Some extensions to the hw-kafka-client library"; license = lib.licenses.mit; @@ -113108,6 +113290,74 @@ self: { broken = true; }) {}; + "freckle-memcached" = callPackage + ({ mkDerivation, aeson, annotated-exception, base, Blammo + , bytestring, errors, exceptions, freckle-env, freckle-otel + , hashable, hs-opentelemetry-sdk, hspec, hspec-core + , hspec-expectations-lifted, lens, lens-aeson, memcache, mtl + , network-uri, pureMD5, safe, serialise, text, unliftio + , unordered-containers + }: + mkDerivation { + pname = "freckle-memcached"; + version = "0.0.0.2"; + sha256 = "1qqjribjzmpfqqygvl4frxy447sjqs5fin22y9aq075yfvgjq75a"; + libraryHaskellDepends = [ + aeson annotated-exception base Blammo bytestring errors + freckle-otel hashable hs-opentelemetry-sdk lens memcache mtl + network-uri pureMD5 serialise text unliftio unordered-containers + ]; + testHaskellDepends = [ + aeson base Blammo errors exceptions freckle-env + hs-opentelemetry-sdk hspec hspec-core hspec-expectations-lifted + lens lens-aeson memcache mtl safe text unliftio + ]; + description = ".."; + license = lib.licenses.mit; + }) {}; + + "freckle-otel" = callPackage + ({ mkDerivation, aeson, base, Blammo, bytestring, case-insensitive + , errors, exceptions, faktory, freckle-env, hs-opentelemetry-api + , hs-opentelemetry-sdk, hspec, hspec-core + , hspec-expectations-lifted, http-client, http-conduit, http-types + , lens, mtl, text, unliftio, unordered-containers + }: + mkDerivation { + pname = "freckle-otel"; + version = "0.0.0.2"; + sha256 = "0x70wcqbpzy8x5xd88kvf2k5pg9655w1xqp94ryq2yprkq6vhils"; + libraryHaskellDepends = [ + aeson base Blammo bytestring case-insensitive errors exceptions + faktory hs-opentelemetry-api hs-opentelemetry-sdk http-client + http-conduit http-types lens text unliftio unordered-containers + ]; + testHaskellDepends = [ + base Blammo exceptions freckle-env hs-opentelemetry-api + hs-opentelemetry-sdk hspec hspec-core hspec-expectations-lifted + http-types lens mtl text unliftio + ]; + description = "..."; + license = lib.licenses.mit; + }) {}; + + "freckle-prelude" = callPackage + ({ mkDerivation, base, containers, freckle-exception, hashable, mtl + , primitive, safe, semigroupoids, text, time, unordered-containers + , vector + }: + mkDerivation { + pname = "freckle-prelude"; + version = "0.0.1.1"; + sha256 = "0mvfh2yw63njx3jmqjzpxzk370gyslfwhss40cysji5j6f9514yf"; + libraryHaskellDepends = [ + base containers freckle-exception hashable mtl primitive safe + semigroupoids text time unordered-containers vector + ]; + description = "Standard prelude for Freckle applications"; + license = lib.licenses.mit; + }) {}; + "freddy" = callPackage ({ mkDerivation, amqp, async, base, broadcast-chan, bytestring , data-default, hspec, random, text, uuid @@ -113258,8 +113508,8 @@ self: { }: mkDerivation { pname = "free-foil"; - version = "0.0.3"; - sha256 = "0gafhqwdzz8zqyfiw50w5zkyg5989hzqlcdq2lgqcqpzvhjg9x1r"; + version = "0.1.0"; + sha256 = "0a0mpacwpyj46p79l3imwazp7a3hlm1bwjh5v1x7sk93kyb8d9fg"; libraryHaskellDepends = [ array base bifunctors containers deepseq template-haskell text ]; @@ -115586,8 +115836,8 @@ self: { }: mkDerivation { pname = "futhark"; - version = "0.25.19"; - sha256 = "1zqqfadxzl9ggs1jarnka9rzdd4f71ikqjhbhfcxkdq0bzj50244"; + version = "0.25.20"; + sha256 = "149fzcd6rijr5vzpn42xfjr8k9pgijmqm4c754na1vj8d926sjgw"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -117243,15 +117493,15 @@ self: { }) {}; "gemmula" = callPackage - ({ mkDerivation, base, HUnit, raw-strings-qq, text }: + ({ mkDerivation, base, HUnit, text }: mkDerivation { pname = "gemmula"; - version = "1.1.1"; - sha256 = "1vrpqigr40injcm07jpga31x0kdaqbxbi35lk6q8p7idaqs6qj8g"; + version = "1.2.0"; + sha256 = "04w3v3sky6rhznqz3izibl24cbrvqywgdd5i8bacg2bdafxbx2qy"; libraryHaskellDepends = [ base text ]; - testHaskellDepends = [ base HUnit raw-strings-qq text ]; - description = "A tiny gemtext parser"; - license = lib.licenses.agpl3Only; + testHaskellDepends = [ base HUnit text ]; + description = "a tiny gemtext parser"; + license = lib.licenses.lgpl3Plus; }) {}; "gemmula-altera" = callPackage @@ -117686,8 +117936,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "generic-enumeration"; - version = "0.1.0.2"; - sha256 = "1j9pdg0ib2ysx4wv357gwvg5j9djm038rj16wpyfc90lsl9m8gdg"; + version = "0.1.0.3"; + sha256 = "02ywn0byg4g42hl28mqc07jifj48jxzmnjm4plfdz4pnxs40kwzg"; libraryHaskellDepends = [ base ]; description = "Generically derived enumerations"; license = lib.licenses.mit; @@ -117860,8 +118110,8 @@ self: { pname = "generic-monoid"; version = "0.1.0.1"; sha256 = "1pradfv1i2z73f3vxx78ahmfsdszcgi44kn29aww2hdgf2np5l6g"; - revision = "3"; - editedCabalFile = "0pyf3yr4haja32nkm3vb28dhdh47cf6h5vqkqih2l6zmbdc2f0lq"; + revision = "4"; + editedCabalFile = "0vdqgq19xr8b8v7i189qcj21m79ncgdscnm8qdp3ynnva74l19j7"; libraryHaskellDepends = [ base ]; description = "Derive monoid instances for product types"; license = lib.licenses.bsd3; @@ -118692,6 +118942,17 @@ self: { license = lib.licenses.mit; }) {}; + "genvalidity-dlist" = callPackage + ({ mkDerivation, base, dlist, genvalidity, validity-dlist }: + mkDerivation { + pname = "genvalidity-dlist"; + version = "0.1.0.1"; + sha256 = "1n7a4hfg71y1zlspf86dmsgj9hzjcwf0ikkrlhr96g622phvsjw6"; + libraryHaskellDepends = [ base dlist genvalidity validity-dlist ]; + description = "GenValidity support for dlist"; + license = lib.licenses.mit; + }) {}; + "genvalidity-hspec" = callPackage ({ mkDerivation, base, genvalidity, genvalidity-property, hspec , hspec-core, QuickCheck, transformers, validity @@ -119802,6 +120063,8 @@ self: { pname = "ghc-boot"; version = "9.10.1"; sha256 = "02sqxmc2f8lb95hrabj088618sd9by9ypvsrs2f2753dg1xqlbzg"; + revision = "1"; + editedCabalFile = "07pn68dhxfmkh7j49vfswjd480j0f60r87azbwqyglv8cl19bz4h"; setupHaskellDepends = [ base Cabal directory filepath ]; libraryHaskellDepends = [ base binary bytestring containers deepseq directory filepath @@ -121379,6 +121642,8 @@ self: { pname = "ghc-tags"; version = "1.6"; sha256 = "0iiqapx4v4jz4d7ni4dcvpfl948ydx2a7kxvjsk2irdcknzymblw"; + revision = "1"; + editedCabalFile = "1piwibafkgq2z6h36jpiszs8bzg6xqz954g6b2dr93gfya0qh5jv"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -121402,6 +121667,8 @@ self: { pname = "ghc-tags"; version = "1.7"; sha256 = "17189yi1zffgcdwx0nb6n4pbv3jhfajhfnag84fnqwy4kbvl5ma4"; + revision = "1"; + editedCabalFile = "0vcqlsrs9zgf3jjl2zc0ibjrgx1sbwvh4vwadmmqm2kkgrkhg7ic"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -121425,6 +121692,8 @@ self: { pname = "ghc-tags"; version = "1.8"; sha256 = "0gljssyq1ahgl65vnqqa5s1vglzdisx8wp5p2hwh09diwa2ms9mw"; + revision = "1"; + editedCabalFile = "0b0myml4c6dnjyq519ngwfd3n0ym30z4cqn1934g2z7i1lj59d4l"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -121448,6 +121717,8 @@ self: { pname = "ghc-tags"; version = "1.9"; sha256 = "0s0gipypdz9d7ny8bz38msqlr88y5b3fcd3xzdcsm5mlbra4m904"; + revision = "1"; + editedCabalFile = "0id8whk4dabyrr7kcbgzn3770ypyqin24fqpc0yn5d5x5jm0ynhz"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -124398,8 +124669,8 @@ self: { }: mkDerivation { pname = "git-annex"; - version = "10.20240731"; - sha256 = "03kj5vg98ixjkwnxi6bdwpmyc888hk2w0ah0n59gi9wjlspbgdmi"; + version = "10.20240808"; + sha256 = "0593kq47kv8zqlknsicih5kh0f0qxy3xwadaqmi5gffrjpvapdf5"; configureFlags = [ "-fassistant" "-f-benchmark" "-fcrypton" "-fdbus" "-f-debuglocks" "-fmagicmime" "-fpairing" "-fproduction" "-ftorrentparser" @@ -126035,8 +126306,8 @@ self: { }: mkDerivation { pname = "glirc"; - version = "2.40.1"; - sha256 = "1214r64pyikz4j4na65ki6glvplm3vpx0glizh2divn1cm8q0zch"; + version = "2.41"; + sha256 = "1sigh9154jxsisszj4sm3zbjja0mgqk9hrv7a4rr2c976pqri9yb"; isLibrary = true; isExecutable = true; setupHaskellDepends = [ base Cabal filepath ]; @@ -131931,30 +132202,29 @@ self: { "grisette" = callPackage ({ mkDerivation, array, async, base, bytestring, containers - , deepseq, doctest, generic-deriving, Glob, hashable, hashtables - , HUnit, intern, loch-th, mtl, parallel, prettyprinter, QuickCheck + , deepseq, doctest, generic-deriving, hashable, hashtables, HUnit + , intern, libBF, loch-th, mtl, parallel, prettyprinter, QuickCheck , sbv, stm, template-haskell, test-framework, test-framework-hunit , test-framework-quickcheck2, text, th-abstraction, th-compat - , transformers, unordered-containers + , th-lift-instances, transformers, unordered-containers }: mkDerivation { pname = "grisette"; - version = "0.7.0.0"; - sha256 = "143a0ghpa3y0dhy7b81f95jiixfhr0pw0fmgvijs6pfsaijw91p0"; - revision = "1"; - editedCabalFile = "0lpxksrphlkfr5njszkfhks19nc7b9pzy84znkyl5g73w35pk91x"; + version = "0.8.0.0"; + sha256 = "0q4s9bflngg7bisj1mds8fr1c5wr58di2rll81j9xwppa45n1qb9"; libraryHaskellDepends = [ array async base bytestring containers deepseq generic-deriving - hashable hashtables intern loch-th mtl parallel prettyprinter + hashable hashtables intern libBF loch-th mtl parallel prettyprinter QuickCheck sbv stm template-haskell text th-abstraction th-compat - transformers unordered-containers + th-lift-instances transformers unordered-containers ]; testHaskellDepends = [ array async base bytestring containers deepseq doctest - generic-deriving Glob hashable hashtables HUnit intern loch-th mtl + generic-deriving hashable hashtables HUnit intern libBF loch-th mtl parallel prettyprinter QuickCheck sbv stm template-haskell test-framework test-framework-hunit test-framework-quickcheck2 text - th-abstraction th-compat transformers unordered-containers + th-abstraction th-compat th-lift-instances transformers + unordered-containers ]; description = "Symbolic evaluation as a library"; license = lib.licenses.bsd3; @@ -133636,8 +133906,8 @@ self: { }: mkDerivation { pname = "h3spec"; - version = "0.1.10"; - sha256 = "0cqqhskk4rip3j903ynml1dcbm2v8si15c2kfwy2l42rj2fj0s1g"; + version = "0.1.11"; + sha256 = "0h519wf2a9swgi695ynydvfcrmmbr70kin49qk04a4nx9b4lcln1"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -135983,6 +136253,8 @@ self: { pname = "hakyll"; version = "4.16.2.2"; sha256 = "0hnqf4xxgf1qgk262qvq0b0mx51jfv67y2kn6ca8jsp43dxy9941"; + revision = "1"; + editedCabalFile = "10ifx60yb8fi9y8xmqb446nzgqs5r0jh0cbrwkm2iy8valb8z63x"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -137978,7 +138250,7 @@ self: { license = lib.licenses.bsd3; }) {}; - "happstack-server_7_9_0" = callPackage + "happstack-server_7_9_2_1" = callPackage ({ mkDerivation, base, base64-bytestring, blaze-html, bytestring , containers, directory, exceptions, extensible-exceptions , filepath, hslogger, html, HUnit, monad-control, mtl, network @@ -137989,10 +138261,8 @@ self: { }: mkDerivation { pname = "happstack-server"; - version = "7.9.0"; - sha256 = "1chia8km9pd6ys1vgy6ybsqj48zmvhb2iqs60lmizdyhc5yxk0c6"; - revision = "1"; - editedCabalFile = "13fmnkl9rrvdskrzhjbdfm9478mwz2pdmhyds33b32v8jaml08qc"; + version = "7.9.2.1"; + sha256 = "177qzsny5gn409j5l8ixyrs22dg8rnvrcjipv313rzkr449bl6sx"; libraryHaskellDepends = [ base base64-bytestring blaze-html bytestring containers directory exceptions extensible-exceptions filepath hslogger html @@ -138015,8 +138285,8 @@ self: { }: mkDerivation { pname = "happstack-server-tls"; - version = "7.2.1.5"; - sha256 = "0mm5pw6nkg53s3k7ljx3r1l36wf41k2xfkn7cc2g6mhh6l5srzyd"; + version = "7.2.1.6"; + sha256 = "05gdqkgrvkv6qbcdfwyblnv4bs03gr1nl467kr6g4x4cwj77fmf3"; libraryHaskellDepends = [ base bytestring extensible-exceptions happstack-server hslogger HsOpenSSL network sendfile time unix @@ -140222,8 +140492,8 @@ self: { }: mkDerivation { pname = "haskell-ffprobe"; - version = "0.1.0.0"; - sha256 = "12cah6yyzbkd8k44h4dlhbw0jza557mcnw994hig2p8xd89vk4bz"; + version = "0.1.0.1"; + sha256 = "00b7pacn8bn7xhhznpbnnxzqjzf615winq6pnhs08yhawyvb0af3"; libraryHaskellDepends = [ aeson base bytestring process scientific text ]; @@ -143630,18 +143900,18 @@ self: { }) {}; "haskus-utils-data" = callPackage - ({ mkDerivation, base, containers, doctest, ghc-prim - , haskus-utils-types, mtl, recursion-schemes, transformers + ({ mkDerivation, base, containers, ghc-prim, haskus-utils-types + , mtl, recursion-schemes, transformers }: mkDerivation { pname = "haskus-utils-data"; - version = "1.4"; - sha256 = "18k8kbfy60l60pzc3c3kwny87avwp6sn766cg4b0z47hx8d70i5k"; + version = "1.5"; + sha256 = "0hwvmg1zhi2i3hwpjg9siq06hllgrk41zs19fxw9xz3i652b2b9j"; libraryHaskellDepends = [ base containers ghc-prim haskus-utils-types mtl recursion-schemes transformers ]; - testHaskellDepends = [ base doctest ]; + testHaskellDepends = [ base ]; description = "Haskus data utility modules"; license = lib.licenses.bsd3; }) {}; @@ -143809,8 +144079,8 @@ self: { }: mkDerivation { pname = "hasmtlib"; - version = "2.1.0"; - sha256 = "071aslizvy9bx3k8aixraz57s2qwg2fg751mghbk057y62az56wv"; + version = "2.3.2"; + sha256 = "11vbxn0lkfnasc9qvk8bjqd7nk7fwbs9zjgwwsfzgz5ann3aja8p"; libraryHaskellDepends = [ attoparsec base bitvec bytestring containers data-default dependent-map finite-typelits lens mtl smtlib-backends @@ -145303,28 +145573,6 @@ self: { }) {}; "haxr" = callPackage - ({ mkDerivation, array, base, base-compat, base64-bytestring - , blaze-builder, bytestring, HaXml, HsOpenSSL, http-streams - , http-types, io-streams, mtl, mtl-compat, network, network-uri - , old-locale, old-time, template-haskell, text, time, utf8-string - }: - mkDerivation { - pname = "haxr"; - version = "3000.11.5"; - sha256 = "1n2q7r0a6c24xbvdnl7ql5cc25sbbalmdc75rmlpazhkazq8jy99"; - revision = "4"; - editedCabalFile = "14cmszqfr4c8zp9zzz1729m3a4fhiglp3h04zqza4capf2cw5mr5"; - libraryHaskellDepends = [ - array base base-compat base64-bytestring blaze-builder bytestring - HaXml HsOpenSSL http-streams http-types io-streams mtl mtl-compat - network network-uri old-locale old-time template-haskell text time - utf8-string - ]; - description = "XML-RPC client and server library"; - license = lib.licenses.bsd3; - }) {}; - - "haxr_3000_11_5_1" = callPackage ({ mkDerivation, array, base, base-compat, base64-bytestring , blaze-builder, bytestring, HaXml, HsOpenSSL, http-streams , http-types, io-streams, mtl, mtl-compat, network, network-uri @@ -145342,7 +145590,6 @@ self: { ]; description = "XML-RPC client and server library"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "haxr-th" = callPackage @@ -146272,19 +146519,19 @@ self: { }) {}; "hdf5" = callPackage - ({ mkDerivation, base, bindings-DSL, bytestring, exceptions - , hdf5-serial, hspec, libffi, lifted-base, monad-control, primitive - , QuickCheck, tagged, temporary, transformers, vector + ({ mkDerivation, base, bindings-DSL, bytestring, exceptions, hdf5 + , hspec, libffi, lifted-base, monad-control, primitive, QuickCheck + , tagged, temporary, transformers, vector }: mkDerivation { pname = "hdf5"; - version = "1.8.11"; - sha256 = "1vczdmm389zg002ay1x4ia4xx6k41zz0qj5979di03mjlrzq9nws"; + version = "1.8.12"; + sha256 = "07hcb2hld6wh5d8av77rzj1pr3gj5xpnk4364ks7xr38hx6lmiz3"; libraryHaskellDepends = [ base bindings-DSL bytestring libffi lifted-base monad-control primitive tagged transformers vector ]; - libraryPkgconfigDepends = [ hdf5-serial ]; + libraryPkgconfigDepends = [ hdf5 ]; testHaskellDepends = [ base bytestring exceptions hspec QuickCheck temporary vector ]; @@ -146292,7 +146539,7 @@ self: { license = lib.licenses.publicDomain; hydraPlatforms = lib.platforms.none; broken = true; - }) {hdf5-serial = null;}; + }) {inherit (pkgs) hdf5;}; "hdf5-lite" = callPackage ({ mkDerivation, base, c2hs, containers, exceptions, ghc-prim, hdf5 @@ -147190,8 +147437,8 @@ self: { pname = "hedgehog-fn"; version = "1.0"; sha256 = "05drd7jsz54kgwxr5z9vifmql6xif7ma7878qddw2nss5s6wa2qp"; - revision = "3"; - editedCabalFile = "1nz3ndndvb0xpnlrkx02l02a62jmrx01jcgxd36k843aacjklyax"; + revision = "4"; + editedCabalFile = "1hsykw437b402bkbys1ajr6w1g0s3a1hsbp0k0207hrclrbf1s95"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -148220,6 +148467,23 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; + "heptapod" = callPackage + ({ mkDerivation, base, bytestring, entropy, tasty, tasty-bench + , tasty-hunit, time, uuid, uuid-types + }: + mkDerivation { + pname = "heptapod"; + version = "1.0.0.0"; + sha256 = "0a25m30q0blsmylj2k8qjnp4nkx06fyxdn73p3cbp15y5l128i2h"; + libraryHaskellDepends = [ + base bytestring entropy time uuid-types + ]; + testHaskellDepends = [ base tasty tasty-hunit time uuid-types ]; + benchmarkHaskellDepends = [ base tasty-bench uuid ]; + description = "Generate UUIDv7 values"; + license = lib.licenses.mit; + }) {}; + "her-lexer" = callPackage ({ mkDerivation, base, mtl, split }: mkDerivation { @@ -152982,10 +153246,8 @@ self: { }: mkDerivation { pname = "hledger-stockquotes"; - version = "0.1.2.1"; - sha256 = "09h021dcpya8492kgyqkd2irxa10kwc9dgzk5xn7r121hl55jp50"; - revision = "1"; - editedCabalFile = "1b10qfxps3iz69l05gagshphifhxw5nvsx79yfyc4iq1rb8hnxc7"; + version = "0.1.3.1"; + sha256 = "111zpplj059iyxwy8rnjq7jrspm5sjqcx9jx0lrrz7yrj608id0g"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -152993,7 +153255,7 @@ self: { split text time unordered-containers ]; executableHaskellDepends = [ - aeson base bytestring cmdargs directory raw-strings-qq + aeson base bytestring cmdargs containers directory raw-strings-qq safe-exceptions text time xdg-basedir yaml ]; testHaskellDepends = [ @@ -153473,8 +153735,8 @@ self: { pname = "hlrdb"; version = "0.4.0.0"; sha256 = "0cj2ff40n3v171xhvdips3als1f2x91ksxcqm7i570mwkdgbh1jr"; - revision = "1"; - editedCabalFile = "0ymp486cfw71vv2ydn9dgaixmq5dgcpy5x1jzibrld5cd14fs3gg"; + revision = "2"; + editedCabalFile = "0yfd3l9hiplva8dp4l21pfqycswbwgvy9588gmm3h71dnr6md1sg"; libraryHaskellDepends = [ base base64 bytestring cryptonite hashable hedis hlrdb-core memory random store time unordered-containers zstd @@ -153492,8 +153754,8 @@ self: { pname = "hlrdb-core"; version = "0.2.0.0"; sha256 = "0hkjll4v4kxc133b19kk9k4dkrbag6qdw24gwrhikrxlk666jsbl"; - revision = "3"; - editedCabalFile = "169a7j9n3sgya96xkklcrbqv08prh41r024dgzr6q0a1wn5j7f04"; + revision = "5"; + editedCabalFile = "1wd5fx9q9h8ypc1rzpgpdcdvrvmd7v9rricy0k856jl1r7blsm93"; libraryHaskellDepends = [ base bytestring hashable hedis lens mtl profunctors random time unordered-containers @@ -158642,6 +158904,21 @@ self: { hydraPlatforms = lib.platforms.none; }) {inherit (pkgs) gsl;}; + "hqcsim" = callPackage + ({ mkDerivation, base, hmatrix, random }: + mkDerivation { + pname = "hqcsim"; + version = "0.1.0.0"; + sha256 = "0qb9xi2z9k8a33536zrqsycs52q0x78f9jf36mdzcrgj4972sygh"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base hmatrix random ]; + executableHaskellDepends = [ base hmatrix random ]; + description = "A library for simulating quantum circuits"; + license = lib.licenses.bsd3; + mainProgram = "hqcsim-exe"; + }) {}; + "hquantlib" = callPackage ({ mkDerivation, base, containers, hmatrix, hmatrix-gsl , hmatrix-special, hquantlib-time, HUnit, mersenne-random-pure64 @@ -165524,19 +165801,42 @@ self: { }) {}; "htmx" = callPackage - ({ mkDerivation, base, lucid, servant, text }: + ({ mkDerivation, base, http-api-data, text }: mkDerivation { pname = "htmx"; - version = "0.0.0.1"; - sha256 = "0l799xcynf03g6kw6p3pp9j3ild2cr870jwccjswkgy1hsbcxjkk"; - libraryHaskellDepends = [ base lucid servant text ]; - testHaskellDepends = [ base lucid servant text ]; + version = "0.1.0.0"; + sha256 = "0b2rjq3qv68vr7ljy844w9fiz93f0v0y2dykybhl5addbyz6z4nm"; + libraryHaskellDepends = [ base http-api-data text ]; description = "Use htmx with various haskell libraries"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; broken = true; }) {}; + "htmx-lucid" = callPackage + ({ mkDerivation, base, htmx, lucid2, text }: + mkDerivation { + pname = "htmx-lucid"; + version = "0.2.0.0"; + sha256 = "1ilr1xarmavzfcy53asazk64gkww7wsjsmz0jyrbr4qj076dqj36"; + libraryHaskellDepends = [ base htmx lucid2 text ]; + description = "Use htmx with lucid"; + license = lib.licenses.mit; + }) {}; + + "htmx-servant" = callPackage + ({ mkDerivation, base, htmx, htmx-lucid, lucid2, servant, text }: + mkDerivation { + pname = "htmx-servant"; + version = "0.2.0.0"; + sha256 = "0xckwxigcjfsf9idw056fnks7b3chdd9bawilwf252mcm45ywaqy"; + libraryHaskellDepends = [ + base htmx htmx-lucid lucid2 servant text + ]; + description = "Use htmx with servant"; + license = lib.licenses.mit; + }) {}; + "htn" = callPackage ({ mkDerivation, base, containers, hspec }: mkDerivation { @@ -165807,6 +166107,8 @@ self: { pname = "http-api-data"; version = "0.6.1"; sha256 = "1kz3qjjazl61q7iad6q67zdsm2gynsjdfcn34rzmybjhq27wylas"; + revision = "1"; + editedCabalFile = "0gw1hahhc5pyagvmvbpwqbm7sqpyfccy59p249jrmz667hsz92g3"; libraryHaskellDepends = [ base bytestring containers cookie hashable http-types tagged text text-iso8601 time-compat transformers unordered-containers @@ -167103,7 +167405,7 @@ self: { license = lib.licenses.bsd3; }) {}; - "http2_5_3_1" = callPackage + "http2_5_3_2" = callPackage ({ mkDerivation, aeson, aeson-pretty, array, async, base , base16-bytestring, bytestring, case-insensitive, containers , crypton, directory, filepath, gauge, Glob, hspec, hspec-discover @@ -167114,8 +167416,8 @@ self: { }: mkDerivation { pname = "http2"; - version = "5.3.1"; - sha256 = "0kc6akdinvgr4vigrh8zhaly8qy3r52sqazlqm6zgxm79ypb7djj"; + version = "5.3.2"; + sha256 = "18nhxfshlddf8dgl1lbnkswjrm1zw91hsbcmvlw9ninnaqvzz93k"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -167260,8 +167562,8 @@ self: { }: mkDerivation { pname = "http2-tls"; - version = "0.4.1"; - sha256 = "0sfzvbif14bszfbyal79q1lhha2hknmp0ala2r7sw1kdg824c6dr"; + version = "0.4.2"; + sha256 = "0fqdad7lrw7m942xl3k0yipm2qr48j3qd14a9a6m87dv2rypsqg4"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -167276,7 +167578,7 @@ self: { }) {}; "http3" = callPackage - ({ mkDerivation, array, attoparsec, base, base16-bytestring + ({ mkDerivation, array, async, attoparsec, base, base16-bytestring , bytestring, case-insensitive, conduit, conduit-extra, containers , crypton, hspec, hspec-discover, http-semantics, http-types, http2 , iproute, network, network-byte-order, quic, QuickCheck, sockaddr @@ -167284,14 +167586,14 @@ self: { }: mkDerivation { pname = "http3"; - version = "0.0.16"; - sha256 = "1b8zi7qklvz11793qi1whlnbx2c87c714p7faz9j2j6lc1i2dvwd"; + version = "0.0.17"; + sha256 = "1dq8qbrq1gfpdvkahpxgg11diyfqk59srnp4hl8sbw0fsdxmiawp"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - array base bytestring case-insensitive containers http-semantics - http-types http2 network network-byte-order quic sockaddr stm - time-manager unliftio + array async base bytestring case-insensitive containers + http-semantics http-types http2 network network-byte-order quic + sockaddr stm time-manager unliftio ]; testHaskellDepends = [ attoparsec base base16-bytestring bytestring conduit conduit-extra @@ -167310,6 +167612,8 @@ self: { pname = "httpd-shed"; version = "0.4.1.2"; sha256 = "0ls6aim2glhmn8ncskvgkjbh3cyq3a6r7a5623ciir57nwd5g85k"; + revision = "1"; + editedCabalFile = "0f6ffi5gb77ma78fwvnq8ahzz8cj671dq0klbxd0sbnkmibvs3xb"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base network network-bsd network-uri ]; @@ -168693,8 +168997,8 @@ self: { pname = "hw-ip"; version = "2.4.2.1"; sha256 = "1cwj6402314lblh7cm77j1bkpnjqpsk7rn8z94awqp4pfp4x8dk0"; - revision = "2"; - editedCabalFile = "0jkn9474ldwm3dy24lscjv16rx8hb2yr2r10lfgrw3i2y72c7gax"; + revision = "3"; + editedCabalFile = "1bg84h0iq648byy42ra06fpgdb7kzlaaq28q3rjwcx5pzjah4bb6"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -168929,8 +169233,8 @@ self: { }: mkDerivation { pname = "hw-kafka-avro"; - version = "6.0.0"; - sha256 = "1dbii37kgh4gsa30a7wqsl5vdwir7v2y3kksk9ab4djfir154anv"; + version = "6.0.1"; + sha256 = "1910yzn569x9iicd8c8ykkq3p5vz3py6d4j0pvwqy1h07xp528sk"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -169348,10 +169652,8 @@ self: { }: mkDerivation { pname = "hw-streams"; - version = "0.0.1.0"; - sha256 = "0hzpx1j06h98y0zcmysklzn3s3mvpbb1nkwg4zkbdxvzzqs5hnm5"; - revision = "5"; - editedCabalFile = "0a34xli9sdvqzc571k72hl3a2jhbhxs24y03k6pdzzz3akznhbn0"; + version = "0.0.1.1"; + sha256 = "1v6zinwzmss62n39h8l41i3h0spd6qam27h8nkap856jlrv9n9gr"; libraryHaskellDepends = [ base bytestring ghc-prim hw-bits hw-prim mmap primitive transformers vector @@ -170159,20 +170461,20 @@ self: { "hydra" = callPackage ({ mkDerivation, aeson, aeson-pretty, base, bytestring, containers , directory, filepath, hspec, hspec-discover, HsYAML, HUnit - , QuickCheck, scientific, split, text, unordered-containers, vector + , QuickCheck, scientific, split, text, vector }: mkDerivation { pname = "hydra"; - version = "0.1.1"; - sha256 = "1ljr6id1z4ym6ipmjhz1msmnqfbsj1z5klhx27dhxwmbfv5ndhyn"; + version = "0.5.1"; + sha256 = "0jg4dailiw0h8img3syhkxdzdlh3z11lya5azaqf0ki5kwh349n8"; libraryHaskellDepends = [ aeson aeson-pretty base bytestring containers directory filepath - HsYAML scientific split text unordered-containers vector + HsYAML scientific split text vector ]; testHaskellDepends = [ aeson aeson-pretty base bytestring containers directory filepath hspec hspec-discover HsYAML HUnit QuickCheck scientific split text - unordered-containers vector + vector ]; testToolDepends = [ hspec-discover ]; description = "Type-aware transformations for data and programs"; @@ -176730,6 +177032,23 @@ self: { mainProgram = "ip6addr"; }) {}; + "ip6addr_2_0_0" = callPackage + ({ mkDerivation, base, IPv6Addr, optparse-applicative, text }: + mkDerivation { + pname = "ip6addr"; + version = "2.0.0"; + sha256 = "1drhjv6xmwfnx2yvxxs03ds415gxdgylzkmb5wy9g7b12q91kxf5"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + base IPv6Addr optparse-applicative text + ]; + description = "Commandline tool to deal with IPv6 address text representations"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + mainProgram = "ip6addr"; + }) {}; + "ipa" = callPackage ({ mkDerivation, attoparsec, base, hspec, template-haskell, text , unicode-transforms @@ -177100,8 +177419,8 @@ self: { }: mkDerivation { pname = "irc-core"; - version = "2.12"; - sha256 = "09w4i2f7zsl82w6ly6f9khwk9ki3k2yv9izhhxsjjwpffam2lxs2"; + version = "2.13"; + sha256 = "0z95cl8pg6zhzmz642bzgxc0525645whvxbmz6h1i8g1mll3i6kx"; libraryHaskellDepends = [ attoparsec base base64-bytestring bytestring hashable primitive text time vector @@ -181102,8 +181421,8 @@ self: { }: mkDerivation { pname = "json-spec"; - version = "0.5.0.0"; - sha256 = "1jdr9l8jvy4r11z6qxpicyafs48z792qkl24r20hddggq0kiac8z"; + version = "0.5.0.1"; + sha256 = "19kbipnr0v5pg95bvjc2j8wznyri9i0mb2ldx5zp9a1x5kmifwm7"; libraryHaskellDepends = [ aeson base containers scientific text time vector ]; @@ -181123,8 +181442,8 @@ self: { }: mkDerivation { pname = "json-spec-elm"; - version = "0.4.0.2"; - sha256 = "1l49x5bzqra0s2xpf8azbq07kkj9zkqj0qya83bgyg1wrsnv0ivl"; + version = "0.4.0.3"; + sha256 = "13gwqcgi08wc0zjx5vd5sx83rqp2nlh6wiyzh8idagv4f3xnm174"; libraryHaskellDepends = [ base bound containers elm-syntax json-spec mtl text ]; @@ -181142,8 +181461,8 @@ self: { }: mkDerivation { pname = "json-spec-elm-servant"; - version = "0.4.1.0"; - sha256 = "1l4gx5s8knf1f2s22qn4p8gnr8hbgys1b1pbcsmg0dvsac785871"; + version = "0.4.1.1"; + sha256 = "0g81dzs512rmgzk6h817d04sdacbdhd19j2qkmihlj6xzjd3gmbf"; libraryHaskellDepends = [ base bound containers directory elm-syntax filepath http-types json-spec json-spec-elm mtl prettyprinter process servant text @@ -181165,8 +181484,8 @@ self: { }: mkDerivation { pname = "json-spec-openapi"; - version = "0.3.1.0"; - sha256 = "0zypr3lxyqaywml7bkkvp00x4a6l4r8wggsplafvcvlanyz7b23i"; + version = "0.3.1.1"; + sha256 = "1dq93wscynxzkknwwad7alvi6n7908j7nzzgz7q5753wbxwqj5yp"; libraryHaskellDepends = [ aeson base insert-ordered-containers json-spec lens openapi3 text ]; @@ -182811,6 +183130,43 @@ self: { license = lib.licenses.bsd3; }) {}; + "katip_0_8_8_1" = callPackage + ({ mkDerivation, aeson, async, auto-update, base, blaze-builder + , bytestring, containers, criterion, deepseq, directory, either + , filepath, hostname, microlens, microlens-th, monad-control, mtl + , old-locale, quickcheck-instances, regex-tdfa, resourcet + , safe-exceptions, scientific, semigroups, stm, string-conv, tasty + , tasty-golden, tasty-hunit, tasty-quickcheck, template-haskell + , text, time, time-locale-compat, transformers, transformers-base + , transformers-compat, unix, unliftio-core, unordered-containers + , vector + }: + mkDerivation { + pname = "katip"; + version = "0.8.8.1"; + sha256 = "1745h9rkrm8dzvx1px62vq1rbgnwqxwrrz72m6vc4yyj1pzhhykc"; + libraryHaskellDepends = [ + aeson async auto-update base bytestring containers either hostname + microlens microlens-th monad-control mtl old-locale resourcet + safe-exceptions scientific semigroups stm string-conv + template-haskell text time transformers transformers-base + transformers-compat unix unliftio-core unordered-containers vector + ]; + testHaskellDepends = [ + aeson base bytestring containers directory microlens + quickcheck-instances regex-tdfa safe-exceptions stm tasty + tasty-golden tasty-hunit tasty-quickcheck template-haskell text + time time-locale-compat unordered-containers + ]; + benchmarkHaskellDepends = [ + aeson async base blaze-builder criterion deepseq directory filepath + safe-exceptions text time transformers unix + ]; + description = "A structured logging framework"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "katip-datadog" = callPackage ({ mkDerivation, aeson, async, attoparsec, base, binary, bytestring , conduit, conduit-extra, connection, containers, katip, network @@ -184945,8 +185301,8 @@ self: { }: mkDerivation { pname = "knit"; - version = "0.3.0.0"; - sha256 = "0wp16yrlibfl32b4akcwali074wxar96mvaykgh0xsf4pq1czx3q"; + version = "0.4.0.0"; + sha256 = "0g0wajlhsbg6lamlf42z6k0h29zf7y0l6wjnc8ik47sx3l8r6agy"; libraryHaskellDepends = [ base bytestring containers deepseq hashtables vector ]; @@ -188905,6 +189261,8 @@ self: { pname = "lattices"; version = "2.2.1"; sha256 = "0rknzbzwcbg87hjiz4jwqb81w14pywkipxjrrlrp0m5i8ciky1i7"; + revision = "1"; + editedCabalFile = "1cjbshr1y2fa06sj60bk38x2h2fqirjr6y1y5xbnlj2ikszviq3b"; libraryHaskellDepends = [ base containers deepseq hashable integer-logarithms QuickCheck tagged transformers universe-base universe-reverse-instances @@ -194307,8 +194665,8 @@ self: { }: mkDerivation { pname = "lion"; - version = "0.4.0.0"; - sha256 = "0vh5krw9z7b7a6bvhc63l5m1rg3g0wyci055qarhsfw27dgbkfx8"; + version = "0.4.0.1"; + sha256 = "05c4pipqxism8scf8c5jmzwyh7gim3c1qwjpfgxv6fygb6lp2d2r"; libraryHaskellDepends = [ base clash-prelude generic-monoid ghc-typelits-extra ghc-typelits-knownnat ghc-typelits-natnormalise ice40-prim lens mtl @@ -194941,6 +195299,8 @@ self: { pname = "list-tuple"; version = "0.1.4.1"; sha256 = "1xikv5wq6xqq8wcxw9vjp5s5ci9qqyw2kxbxp03madzaawdqq0g6"; + revision = "1"; + editedCabalFile = "0bhaqprrhmdlbpy1ga73zia7a831mcwgdmvvk2bn5mzzgcscp57d"; setupHaskellDepends = [ base Cabal directory ]; libraryHaskellDepends = [ base OneTuple Only single-tuple ]; testHaskellDepends = [ @@ -195006,6 +195366,17 @@ self: { broken = true; }) {}; + "list1" = callPackage + ({ mkDerivation, base, smash }: + mkDerivation { + pname = "list1"; + version = "0.0.2"; + sha256 = "0lxx1m2vrf14fb8r4qzfp6y8iqxai3cdpg2dzh9az383qxhy0zmh"; + libraryHaskellDepends = [ base smash ]; + description = "Helpers for working with NonEmpty lists"; + license = lib.licenses.bsd3; + }) {}; + "listenbrainz-client" = callPackage ({ mkDerivation, aeson, base, free, freer-effects, http-client , kan-extensions, mtl, servant, servant-client, text, time @@ -198048,22 +198419,22 @@ self: { ({ mkDerivation, aeson, aeson-pretty, base, bytestring, co-log-core , containers, data-default, dependent-map, Diff, directory, extra , filepath, generic-lens, Glob, hspec, lens, lsp, lsp-types, mtl - , process, QuickCheck, row-types, stm, text, text-rope, unix-compat - , unliftio, unordered-containers + , process, QuickCheck, stm, text, text-rope, transformers + , unix-compat, unliftio, unordered-containers }: mkDerivation { pname = "lsp-client"; - version = "0.3.0.0"; - sha256 = "0d5d0rzscq9gc4jnl02584908g50mrqgxs3b6nly6wfpjaprklsd"; + version = "0.4.0.0"; + sha256 = "15f6inp47vw0k0hqgzxyy9ybq2kpv5ggvb3qj9m570miri6z4mr2"; libraryHaskellDepends = [ aeson aeson-pretty base bytestring co-log-core containers data-default dependent-map Diff directory extra filepath - generic-lens Glob lens lsp lsp-types mtl row-types stm text - text-rope unix-compat unliftio unordered-containers + generic-lens Glob lens lsp lsp-types mtl stm text text-rope + transformers unix-compat unliftio unordered-containers ]; testHaskellDepends = [ aeson base bytestring extra hspec lens lsp-types process QuickCheck - row-types unliftio + unliftio ]; description = "Haskell library for Language Server Protocol clients"; license = lib.licenses.asl20; @@ -200047,22 +200418,19 @@ self: { "mail-pool" = callPackage ({ mkDerivation, aeson, base, HaskellNet, HaskellNet-SSL, microlens - , mime-mail, network, optparse-applicative, resource-pool, time + , mime-mail, network, optparse-applicative, resource-pool }: mkDerivation { pname = "mail-pool"; - version = "2.2.3"; - sha256 = "1pqizx02p2iiqkl4kg3izkg477bh69jrk75insbfw30k3ay3g330"; + version = "2.3.1"; + sha256 = "0krawz58vjzkxj5y0ss3m575913xj90vpb5hmdnyspxlzp0fcpp4"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson base HaskellNet HaskellNet-SSL microlens mime-mail network - optparse-applicative resource-pool time - ]; - executableHaskellDepends = [ - aeson base HaskellNet HaskellNet-SSL microlens mime-mail network - optparse-applicative resource-pool time + optparse-applicative resource-pool ]; + executableHaskellDepends = [ base mime-mail optparse-applicative ]; description = "Preconfigured email connection pool on top of smtp"; license = lib.licenses.mit; mainProgram = "exe"; @@ -207786,14 +208154,14 @@ self: { }) {}; "mockcat" = callPackage - ({ mkDerivation, base, hspec, template-haskell, text }: + ({ mkDerivation, base, hspec, mtl, template-haskell, text }: mkDerivation { pname = "mockcat"; - version = "0.2.1.0"; - sha256 = "1i0l3znnimnps022zk8z97bfsravr4w8l4rghh5app8ww01yjvhl"; - libraryHaskellDepends = [ base template-haskell text ]; - testHaskellDepends = [ base hspec template-haskell text ]; - description = "Simple mock function library for test in Haskell"; + version = "0.3.1.0"; + sha256 = "1akg2r96qxqpis3m0xrnaxi26c0nvwr91f3yczai0pzhrp6887g4"; + libraryHaskellDepends = [ base mtl template-haskell text ]; + testHaskellDepends = [ base hspec mtl template-haskell text ]; + description = "Mock library for test in Haskell"; license = lib.licenses.mit; }) {}; @@ -210484,10 +210852,8 @@ self: { }: mkDerivation { pname = "monoid-extras"; - version = "0.6.2"; - sha256 = "1qaxp0cf2cvzvfpk7x9mjz1zmlpjfzxij8v2n45w89s7bq9ckvlw"; - revision = "3"; - editedCabalFile = "16ff0ffc8my9jkylcsyskb6bpb1hpjsg2shv2vnrb54r7gqfqy8v"; + version = "0.6.3"; + sha256 = "1j908w0xmh6kdh0ilka3lhasf4vwnaic8srycdmwmyi94i5kh93i"; libraryHaskellDepends = [ base groups semigroupoids ]; benchmarkHaskellDepends = [ base criterion semigroups ]; description = "Various extra monoid-related definitions and utilities"; @@ -210906,6 +211272,8 @@ self: { pname = "months"; version = "0.2.1"; sha256 = "18ysiyj5vqp96nvrkaa1k58ci6l08x03lkiq6cmi5vyg4gw734ig"; + revision = "1"; + editedCabalFile = "1lmikm7y31wlk634fr2l6ba74mn5a1h5y3p1phx7xjxvahjf3li7"; libraryHaskellDepends = [ aeson attoparsec base deepseq hashable intervals QuickCheck text time-compat @@ -220008,8 +220376,8 @@ self: { }: mkDerivation { pname = "ngx-export-distribution"; - version = "0.5.6.0"; - sha256 = "18ad3kkkl3aapsc95r7n7vwhjqzyyw0plbjv7vkc5hm0366picvl"; + version = "0.6.0.0"; + sha256 = "0j2z8k5grxz570gbf931v7b06v1yd94gr3l6wv960xdlwl1145qw"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base Cabal directory filepath ]; @@ -221848,15 +222216,15 @@ self: { license = lib.licenses.asl20; }) {}; - "nothunks_0_2_1_1" = callPackage + "nothunks_0_3_0_0" = callPackage ({ mkDerivation, base, bytestring, containers, ghc-heap, ghc-prim , hedgehog, random, stm, tasty, tasty-hedgehog, text, time, vector , wherefrom-compat }: mkDerivation { pname = "nothunks"; - version = "0.2.1.1"; - sha256 = "1nhwa7w62rgfjim3hyq6ryvfh24f7g20ghhkykyj7sjxmwyri9yc"; + version = "0.3.0.0"; + sha256 = "0fnwad49mv0q46wrnapkqh4hm4rm43gw0papppqrg0z96r658yc4"; libraryHaskellDepends = [ base bytestring containers ghc-heap stm text time vector wherefrom-compat @@ -222986,20 +223354,6 @@ self: { }) {}; "numhask-array" = callPackage - ({ mkDerivation, adjunctions, base, distributive, numhask, vector - }: - mkDerivation { - pname = "numhask-array"; - version = "0.11.0.1"; - sha256 = "1z9n5ls08b3329kh4hidcm0p6kx3672svkqaci6nlq2zxj6szgda"; - libraryHaskellDepends = [ - adjunctions base distributive numhask vector - ]; - description = "Multi-dimensional arrays"; - license = lib.licenses.bsd3; - }) {}; - - "numhask-array_0_11_1_0" = callPackage ({ mkDerivation, adjunctions, base, distributive, numhask, vector }: mkDerivation { @@ -223011,7 +223365,6 @@ self: { ]; description = "Multi-dimensional arrays"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "numhask-free" = callPackage @@ -224668,8 +225021,8 @@ self: { }: mkDerivation { pname = "om-doh"; - version = "0.1.0.2"; - sha256 = "036vqn7p7ha9dibsmsn0f0hiwr8570zdrnij98377ysn21xl5gzz"; + version = "0.1.0.3"; + sha256 = "0zk87kycigpzycrr898xgn5lzazmfcqcghf7qacj0cgzqsw62xww"; libraryHaskellDepends = [ base base64 bytestring http-api-data resolv servant servant-server text @@ -224699,13 +225052,32 @@ self: { broken = true; }) {}; + "om-elm_2_0_0_7" = callPackage + ({ mkDerivation, base, bytestring, Cabal, containers, directory + , http-types, safe, safe-exceptions, template-haskell, text, unix + , wai + }: + mkDerivation { + pname = "om-elm"; + version = "2.0.0.7"; + sha256 = "0xf775929s76galzqfaq2zx0ks1wkcfqzqi3a1z3zg6w4fswiw67"; + libraryHaskellDepends = [ + base bytestring Cabal containers directory http-types safe + safe-exceptions template-haskell text unix wai + ]; + description = "Haskell utilities for building embedded Elm programs"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {}; + "om-fail" = callPackage ({ mkDerivation, base, monad-logger, safe-exceptions, transformers }: mkDerivation { pname = "om-fail"; - version = "0.1.0.4"; - sha256 = "0nf4hdx8a2invk0wjq3ryk8l5psl8jjkixskadmk8zd8r06mf3ky"; + version = "0.1.0.5"; + sha256 = "0a3h016vy2czq0bdkagljz9dpy1133ym07a61sk5drq76jcq5byn"; libraryHaskellDepends = [ base monad-logger safe-exceptions transformers ]; @@ -224721,8 +225093,8 @@ self: { }: mkDerivation { pname = "om-fork"; - version = "0.7.1.10"; - sha256 = "1p9sf45mcswz7z6a1m3axyk7kn0yb7dblxv90r7m8b1lbk67mgws"; + version = "0.7.1.11"; + sha256 = "03gln694nn2v16ccljgqr9a795skw5js9j76mamc803qgnrdsdj1"; libraryHaskellDepends = [ aeson base exceptions ki-unlifted monad-logger om-show text unliftio @@ -224743,8 +225115,8 @@ self: { }: mkDerivation { pname = "om-http"; - version = "0.3.1.0"; - sha256 = "1whs8v3m4ldxlw7as3jnw9snk3jx0biqkid2rr63c0kkxazlxjpp"; + version = "0.3.1.1"; + sha256 = "1nxc0bckjm0nm46rvnhs4vglrcrzwim114x912a4mdgwwi82fkax"; libraryHaskellDepends = [ async base bytestring directory filepath http-types mime-types monad-logger network om-show safe-exceptions servant @@ -224802,8 +225174,8 @@ self: { }: mkDerivation { pname = "om-legion"; - version = "6.9.0.6"; - sha256 = "05kh6raq4fbqcbj2add7q6s7r3m12cgskbsh1kp39zlibkgvl81d"; + version = "6.9.0.7"; + sha256 = "0cpmk7qi50d1az4sdq0qdishs7pp58pxv85mq3x8qmmrmiz4qs8l"; libraryHaskellDepends = [ aeson async base binary bytestring clock containers crdt-event-fold data-default-class http-api-data monad-logger mtl network om-fork @@ -224821,8 +225193,8 @@ self: { }: mkDerivation { pname = "om-logging"; - version = "1.1.0.8"; - sha256 = "1v6qdp0k6jccsbmcx127bj0y3aw0rwjwgzbw8022ny5x2yhw7wgf"; + version = "1.1.0.9"; + sha256 = "0k8yw4v1xxh2vm5507wxxfl3dvxfaz8nip3apri22aqyxjg05w45"; libraryHaskellDepends = [ aeson base bytestring fast-logger monad-logger om-show split text time @@ -224837,8 +225209,8 @@ self: { ({ mkDerivation, base, containers, ghc, safe }: mkDerivation { pname = "om-plugin-imports"; - version = "0.2.0.0.9.6"; - sha256 = "1whwipj1dqka4dhjigcmq4c74gv0r6y5y5px8m3fp08v62dbvbf2"; + version = "0.3.0.0.9.10"; + sha256 = "0x3h9maja4vq3zzh0swi6yfhc149gh4m01mdbhy0v2l6054mfl51"; libraryHaskellDepends = [ base containers ghc safe ]; description = "Plugin-based import warnings"; license = lib.licenses.mit; @@ -224850,8 +225222,8 @@ self: { ({ mkDerivation, aeson, base, text }: mkDerivation { pname = "om-show"; - version = "0.1.2.9"; - sha256 = "154x7l81chfj91bwrh9v1a8bcazkn99a8hzxkaadszb65wwi6jr8"; + version = "0.1.2.10"; + sha256 = "1ngwdci1pqf2wmhqfn54372wv7w7v8p5hr56k37kb0aslkdci8qa"; libraryHaskellDepends = [ aeson base text ]; description = "Utilities for showing string-like things"; license = lib.licenses.mit; @@ -224865,8 +225237,8 @@ self: { }: mkDerivation { pname = "om-socket"; - version = "1.0.0.1"; - sha256 = "1jgg1wfvxl36xgmhaaa7ri0grdhakzfrq1ivzh6788mxfdb4dkj7"; + version = "1.0.0.3"; + sha256 = "0slvcxz4s81w8wagqyrlawlss4sgwcxqnpjaayvxgf8d0rq5add6"; libraryHaskellDepends = [ aeson base binary bytestring containers exceptions megaparsec monad-logger network om-fork om-show stm streaming streaming-binary @@ -224886,8 +225258,8 @@ self: { ({ mkDerivation, aeson, base, binary, clock, time, transformers }: mkDerivation { pname = "om-time"; - version = "0.3.0.4"; - sha256 = "14afibgh8r0zakgx4inlmnmllyz0x51fm70q7rd73x1q03w9icd1"; + version = "0.3.1.0"; + sha256 = "1ri7hp3jb0nnc5j02n5wh0ninsng58w79hx9rmmq9z972m4vbqfn"; libraryHaskellDepends = [ aeson base binary clock time transformers ]; @@ -225878,8 +226250,8 @@ self: { }: mkDerivation { pname = "opencascade-hs"; - version = "0.3.0.1"; - sha256 = "13yvcsibh600mhsvj30hflwb2f2pyvh8yhm69j693vxwxirvgpi2"; + version = "0.4.0.0"; + sha256 = "1dhasjjhcg54qihcihid69z70l75dn7xsbsd765lsgzc35m1qbrl"; libraryHaskellDepends = [ base resourcet ]; librarySystemDepends = [ TKBO TKBRep TKDEGLTF TKDEOBJ TKDESTEP TKDESTL TKernel TKFillet @@ -227085,8 +227457,8 @@ self: { }: mkDerivation { pname = "opt-env-conf"; - version = "0.4.0.5"; - sha256 = "08pkrdxy9fsbqdp6qz4y3q5my04h2rfrhhyd64rqbbdfvz2biygz"; + version = "0.5.0.1"; + sha256 = "1x0zb436yrcvihr6g7g7gz2w0nhlbv3nqgf0rmaa3clp72a272rk"; libraryHaskellDepends = [ aeson autodocodec autodocodec-nix autodocodec-schema autodocodec-yaml base containers hashable mtl path path-io @@ -227186,8 +227558,8 @@ self: { pname = "optics-extra"; version = "0.4.2.1"; sha256 = "0hfa5yb7l3l310lfxkii13fjzb69g619agadc5a86i734nisf8vy"; - revision = "3"; - editedCabalFile = "1dh1w543nkhy09rndmcx5qmm5j9a76p4hcyqqafq8yz5fm60hmzs"; + revision = "4"; + editedCabalFile = "0ravf8rwqdaqkbpc8vh566snh52mmpxwqxvp8bzk85a4cyi509sd"; libraryHaskellDepends = [ array base bytestring containers hashable indexed-profunctors indexed-traversable-instances mtl optics-core text transformers @@ -229037,22 +229409,19 @@ self: { "package-version" = callPackage ({ mkDerivation, base, bytestring, deepseq, doctest, env-guard - , hedgehog, prettyprinter, safe-exceptions, tagged, tasty - , tasty-hedgehog, tasty-hunit, template-haskell, text + , hedgehog, tasty, tasty-hedgehog, tasty-hunit, template-haskell + , text }: mkDerivation { pname = "package-version"; - version = "0.3"; - sha256 = "01d0345qs5c02gmh3ccsl0xbmiqwcbdpzlqgx2pwj6iv9vvjrf5l"; - revision = "4"; - editedCabalFile = "08pjfpib8g8ci9d9p3461bg37k64f0360cx35v4i8lqj8ny69xvh"; + version = "0.4"; + sha256 = "00ack16vq6c1pqrnm5pl8m0p5dx0rgrzk2ylsl22l9fj70v730a6"; libraryHaskellDepends = [ - base bytestring deepseq prettyprinter safe-exceptions - template-haskell text + base bytestring deepseq template-haskell text ]; testHaskellDepends = [ - base doctest env-guard hedgehog safe-exceptions tagged tasty - tasty-hedgehog tasty-hunit text + base doctest env-guard hedgehog tasty tasty-hedgehog tasty-hunit + text ]; description = "A package for retrieving a package's version number"; license = lib.licenses.bsd3; @@ -229987,8 +230356,8 @@ self: { pname = "pandoc-crossref"; version = "0.3.17.1"; sha256 = "0md7i54rnvgn0yll7mwhi124nak0pfmpga34vnd996r6fgmnq5fb"; - revision = "1"; - editedCabalFile = "0vfhhzqihc911l8j94pn8mljl9l1zfgzrihm3967g0y43agp6h2s"; + revision = "2"; + editedCabalFile = "00x3nqlrp872wq2alaahkiv34ifj36bs2ql0n4vn2h19wlg1f578"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -233282,6 +233651,30 @@ self: { license = lib.licenses.bsd3; }) {}; + "path_0_9_6" = callPackage + ({ mkDerivation, aeson, base, bytestring, deepseq, exceptions + , filepath, genvalidity, genvalidity-hspec, hashable, hspec + , QuickCheck, template-haskell, text, validity-bytestring + }: + mkDerivation { + pname = "path"; + version = "0.9.6"; + sha256 = "1zwrwyvlj9n1qplvxixd6rjc0y0yzjdhfvh4lwp2g42qaabhal2q"; + libraryHaskellDepends = [ + aeson base deepseq exceptions filepath hashable template-haskell + text + ]; + testHaskellDepends = [ + aeson base bytestring exceptions filepath genvalidity + genvalidity-hspec hspec QuickCheck template-haskell + validity-bytestring + ]; + doHaddock = false; + description = "Support for well-typed paths"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "path-binary-instance" = callPackage ({ mkDerivation, base, binary, path }: mkDerivation { @@ -237726,23 +238119,23 @@ self: { "photoname" = callPackage ({ mkDerivation, ansi-wl-pprint, base, containers, directory - , filepath, heredoc, hsexif, hslogger, mtl, newtype-generics - , optparse-applicative, parsec, process, regex-posix, tasty - , tasty-hunit, tasty-quickcheck, time, unix + , filepath, heredoc, hsexif, hslogger, mtl, optparse-applicative + , parsec, process, regex-posix, tasty, tasty-hunit + , tasty-quickcheck, time, unix }: mkDerivation { pname = "photoname"; - version = "5.1"; - sha256 = "0ihw0pjiqwfny8nqbdglg13dch622m2agp2y328n7fqar79xx6dv"; + version = "5.2"; + sha256 = "0sf7hj6xa7bj074jamhm8jribbdjywdgg2z7wxjzmb2aliji5syi"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base containers directory filepath hsexif hslogger mtl - newtype-generics parsec process time unix + base containers directory filepath hsexif hslogger mtl parsec + process time unix ]; executableHaskellDepends = [ ansi-wl-pprint base directory filepath heredoc hslogger - newtype-generics optparse-applicative unix + optparse-applicative unix ]; testHaskellDepends = [ base directory filepath process regex-posix tasty tasty-hunit @@ -239527,8 +239920,8 @@ self: { pname = "pipes-safe"; version = "2.3.5"; sha256 = "13npagy597g6zfr2f3vj4a98h2ssg2ps7lmdzrgdsvm8m28x3cph"; - revision = "2"; - editedCabalFile = "04yyjgqr81b10635bw0f2i5kfh0qzp7l3v9k9qbzskvlsl3kdyjy"; + revision = "3"; + editedCabalFile = "1wic8km3c17g2xrmxd4qj5qmppb76k7srxrgj8jg1vs6g2l7v6cs"; libraryHaskellDepends = [ base containers exceptions monad-control mtl pipes primitive transformers transformers-base @@ -242974,6 +243367,8 @@ self: { pname = "popkey"; version = "0.1.0.2"; sha256 = "0ibk4qwcizsqvyvb8lgad5c0szgw7571bi2c54b5r3rrm7vzpx05"; + revision = "1"; + editedCabalFile = "0iwzwckvlvaxqk92f700zgxqwf1s2i5siabi0dlr89gzb2ljil2j"; libraryHaskellDepends = [ base bitvec bytestring containers hw-bits hw-prim hw-rankselect hw-rankselect-base store text vector @@ -244032,24 +244427,34 @@ self: { license = lib.licenses.bsd3; }) {inherit (pkgs) postgresql;}; - "postgresql-libpq_0_10_1_0" = callPackage - ({ mkDerivation, base, bytestring, Cabal, postgresql, tasty - , tasty-hunit, unix + "postgresql-libpq_0_10_2_0" = callPackage + ({ mkDerivation, base, bytestring, postgresql-libpq-configure + , tasty, tasty-hunit, unix }: mkDerivation { pname = "postgresql-libpq"; - version = "0.10.1.0"; - sha256 = "1w49zp3izxi3s4mq71i93i4s08kwcv1j0j6m5cfpxcp5s4h12pwq"; - revision = "1"; - editedCabalFile = "1d7hvi969ksdzg4fzyy448k354h4jl3k2i3fv8nb6c4y1bzysiba"; - setupHaskellDepends = [ base Cabal ]; - libraryHaskellDepends = [ base bytestring unix ]; - librarySystemDepends = [ postgresql ]; + version = "0.10.2.0"; + sha256 = "1vsb95m7k7j7k1156bb2kn1iavj4x3mvczpybw0mypa76a1ppsck"; + libraryHaskellDepends = [ + base bytestring postgresql-libpq-configure unix + ]; testHaskellDepends = [ base bytestring tasty tasty-hunit ]; description = "low-level binding to libpq"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - }) {inherit (pkgs) postgresql;}; + }) {}; + + "postgresql-libpq-configure" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "postgresql-libpq-configure"; + version = "0.10"; + sha256 = "00483rfqa65ivxlm3smbr3n4k397izifarjx408pnibqcj4s6yd7"; + libraryHaskellDepends = [ base ]; + doHaddock = false; + description = "low-level binding to libpq: configure based provider"; + license = lib.licenses.bsd3; + }) {}; "postgresql-libpq-notify" = callPackage ({ mkDerivation, async, base, hspec, postgres-options @@ -244068,6 +244473,19 @@ self: { license = lib.licenses.bsd3; }) {}; + "postgresql-libpq-pkgconfig" = callPackage + ({ mkDerivation, base, libpq }: + mkDerivation { + pname = "postgresql-libpq-pkgconfig"; + version = "0.10"; + sha256 = "1vjfq3iiwygfyb16q84xfa1zhhr63ammfdzq6ks1si02na3k3paw"; + libraryHaskellDepends = [ base ]; + libraryPkgconfigDepends = [ libpq ]; + doHaddock = false; + description = "low-level binding to libpq: pkg-config based provider"; + license = lib.licenses.bsd3; + }) {libpq = null;}; + "postgresql-lo-stream" = callPackage ({ mkDerivation, base, bytestring, io-streams, lifted-base , monad-loops, mtl, postgresql-simple @@ -244345,8 +244763,8 @@ self: { pname = "postgresql-simple"; version = "0.7.0.0"; sha256 = "0gm1wk2zq35h46v0l1qc0z63jv3gxgqd059j1mcmww80a6sipf4c"; - revision = "1"; - editedCabalFile = "0yhggx06wbg57psqa8sswf85qfzy8ndssv13vwmxj0gc1ca1zv4l"; + revision = "2"; + editedCabalFile = "0y86qpm3pffk08d6smpqjfbqmn7bh8yyahc901vk86aln22nqf6w"; libraryHaskellDepends = [ aeson attoparsec base bytestring case-insensitive containers hashable Only postgresql-libpq scientific template-haskell text @@ -247553,14 +247971,12 @@ self: { license = lib.licenses.mit; }) {}; - "process_1_6_20_0" = callPackage + "process_1_6_22_0" = callPackage ({ mkDerivation, base, deepseq, directory, filepath, unix }: mkDerivation { pname = "process"; - version = "1.6.20.0"; - sha256 = "16prkmaj4dz394pg40w5xgbxlh5kbhhliwawdcqs57q0qchs5zff"; - revision = "1"; - editedCabalFile = "00yabbj6vjlxnslp516a824gwkx9hxx9a9j8izxib17i6gg974ra"; + version = "1.6.22.0"; + sha256 = "1yv8pk2g8d5wrw3306ar76fzgd6iyra9ci0syjl0b4pmwxff41ps"; libraryHaskellDepends = [ base deepseq directory filepath unix ]; description = "Process libraries"; license = lib.licenses.bsd3; @@ -248606,6 +249022,26 @@ self: { license = lib.licenses.bsd3; }) {}; + "prometheus_2_3_0" = callPackage + ({ mkDerivation, atomic-primops, base, bytestring, containers + , http-client, http-client-tls, http-types, network-uri, text + , transformers, wai, warp + }: + mkDerivation { + pname = "prometheus"; + version = "2.3.0"; + sha256 = "0mawlfpx34nv44a46z1s68xdrnxmrwsbi3rq9hhfbq9jpj161rk5"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + atomic-primops base bytestring containers http-client + http-client-tls http-types network-uri text transformers wai warp + ]; + description = "Prometheus Haskell Client"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "prometheus-client" = callPackage ({ mkDerivation, atomic-primops, base, bytestring, clock , containers, criterion, data-sketches, deepseq, doctest @@ -250723,6 +251159,29 @@ self: { mainProgram = "purenix"; }) {}; + "puresat" = callPackage + ({ mkDerivation, base, bytestring, containers, filepath, minisat + , parsec, primitive, QuickCheck, tasty, tasty-hunit + , tasty-quickcheck + }: + mkDerivation { + pname = "puresat"; + version = "0.1"; + sha256 = "14jkk4wkmwh0pqai9zzsq214pc3g9fr3bv2lvq72k50cg49dc72a"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base bytestring containers parsec primitive + ]; + testHaskellDepends = [ + base filepath minisat primitive QuickCheck tasty tasty-hunit + tasty-quickcheck + ]; + doHaddock = false; + description = "Pure Haskell SAT-solver"; + license = lib.licenses.bsd3; + }) {}; + "purescheme-wai-routing-core" = callPackage ({ mkDerivation, aeson, base, bytestring, case-insensitive , http-media, http-types, interpolate, text, wai, warp @@ -252565,8 +253024,8 @@ self: { }: mkDerivation { pname = "quic"; - version = "0.2.0"; - sha256 = "1mjy4kv05zk7c7ygkfj95i8c8bzh1n11y4q5bnick2bwhn1wd94k"; + version = "0.2.2"; + sha256 = "0bx6bccnfrqm7593mwi1c52pmb2dimxp3pllc6m818bgwrkii61w"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -252867,8 +253326,8 @@ self: { pname = "quickcheck-instances"; version = "0.3.31"; sha256 = "0bsfh6fwc8h3jzkqrqk56rm6iphrmlrp80pa2z1gs79mz4d7w64v"; - revision = "1"; - editedCabalFile = "1l92l30ghks35wr4im54h44ipw8ddwh3jsinl5snmy2jgv3jaz89"; + revision = "2"; + editedCabalFile = "1zigggr5i4ikmc34p97x5md1nvpgkwvnvky7saxxsi5w3s3g3zqz"; libraryHaskellDepends = [ array base bytestring case-insensitive containers data-fix hashable integer-logarithms old-time OneTuple primitive QuickCheck @@ -255032,6 +255491,8 @@ self: { pname = "range-set-list"; version = "0.1.4"; sha256 = "1w5kvqi66wg13m6ibzkjkn1gf725msr6ks4nfm5chhk30ad4lvj1"; + revision = "1"; + editedCabalFile = "0819grvps1rb88s1a93mh1mwhxqk67rpijjk13lpfib9948scnfy"; libraryHaskellDepends = [ base containers deepseq hashable ]; testHaskellDepends = [ base containers deepseq hashable tasty tasty-quickcheck @@ -255689,8 +256150,8 @@ self: { pname = "raven-haskell"; version = "0.1.4.1"; sha256 = "0977rwafdwljz3444asvjsikpwc89diahmmzl9f5xc8dzfqcnzay"; - revision = "1"; - editedCabalFile = "1107g5f6sr7sjxnh2d3g727ncfqni6dsvda5hr99fh86vhm2g1wi"; + revision = "2"; + editedCabalFile = "0d6mw3il9qd9ja0828sh1w3x8aib88m37s8ymmdwjp41bkwcrny0"; libraryHaskellDepends = [ aeson base bytestring http-conduit mtl network random resourcet text time unordered-containers uuid-types @@ -255706,8 +256167,8 @@ self: { }: mkDerivation { pname = "raven-haskell-scotty"; - version = "0.1.0.3"; - sha256 = "0vllfasn4rky8r8fg3mpln8pdkxbcvrvx8wamn0xswfwf1rvcf6k"; + version = "0.1.1.0"; + sha256 = "05zk3z5y9vi143mb9asxrd0nzbndhinv6mp4f6lfpcdn9ir9bgaq"; libraryHaskellDepends = [ base bytestring case-insensitive mtl raven-haskell scotty text wai ]; @@ -263665,8 +264126,10 @@ self: { pname = "ribbit"; version = "1.1.0.1"; sha256 = "076m5w4w08z8migb0v8vb6lybs06x1bfvxqfi9g633lz464hyi9v"; + revision = "1"; + editedCabalFile = "00mymcg55bli8a70wvfdssmmrp221p9igv1963m3lzxz9nfi7186"; libraryHaskellDepends = [ base Only postgresql-simple text time ]; - description = "Type-level Relational DB combinators"; + description = "[Unmaintained] Type-level Relational DB combinators"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; broken = true; @@ -265891,8 +266354,8 @@ self: { }: mkDerivation { pname = "rpmbuild-order"; - version = "0.4.11"; - sha256 = "0yvv524cy8iblxgkf125s8b6xjhg7a0l36xrfb51hl6y71b5cdx5"; + version = "0.4.12"; + sha256 = "16l3pxzqndjhnycpnn9jnxisp9mjdbyvglfpra1is07ssr0ckqn0"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -266763,6 +267226,43 @@ self: { broken = true; }) {}; + "rzk_0_7_5" = callPackage + ({ mkDerivation, aeson, alex, array, base, bifunctors, BNFC + , bytestring, Cabal, co-log-core, data-default-class, directory + , doctest, filepath, Glob, happy, hspec, hspec-discover, lens, lsp + , lsp-types, mtl, optparse-generic, process, QuickCheck, stm + , template-haskell, text, with-utf8, yaml + }: + mkDerivation { + pname = "rzk"; + version = "0.7.5"; + sha256 = "0x9485rs2hc51jfaczcmx89jn2nnppfnrk717xc559rzb64s2sgk"; + isLibrary = true; + isExecutable = true; + setupHaskellDepends = [ base Cabal process ]; + libraryHaskellDepends = [ + aeson array base bifunctors bytestring co-log-core + data-default-class directory filepath Glob lens lsp lsp-types mtl + stm template-haskell text yaml + ]; + libraryToolDepends = [ alex BNFC happy ]; + executableHaskellDepends = [ + array base bifunctors bytestring directory Glob mtl + optparse-generic template-haskell text with-utf8 yaml + ]; + executableToolDepends = [ alex BNFC happy ]; + testHaskellDepends = [ + array base bifunctors bytestring directory doctest Glob hspec + hspec-discover mtl QuickCheck template-haskell text yaml + ]; + testToolDepends = [ alex BNFC happy hspec-discover ]; + description = "An experimental proof assistant for synthetic ∞-categories"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + mainProgram = "rzk"; + broken = true; + }) {}; + "s-cargot" = callPackage ({ mkDerivation, base, containers, HUnit, parsec, QuickCheck, text }: @@ -266782,8 +267282,8 @@ self: { ({ mkDerivation, base, HUnit, parsec, s-cargot, text }: mkDerivation { pname = "s-cargot-letbind"; - version = "0.2.4.0"; - sha256 = "1q6rn25c95y9pa96v3p715hkqdagcf92ih9myqimp107c4ma8gn1"; + version = "0.2.5.0"; + sha256 = "1wivljmfpq0llk7pydyc2awkx03jdcln4r0gl5zmmr2diwvjzadc"; libraryHaskellDepends = [ base s-cargot text ]; testHaskellDepends = [ base HUnit parsec s-cargot text ]; description = "Enables let-binding and let-expansion for s-cargot defined S-expressions"; @@ -266978,19 +267478,13 @@ self: { broken = true; }) {}; - "safe-coloured-text-layout_0_2_0_0" = callPackage - ({ mkDerivation, base, bytestring, safe-coloured-text, sydtest - , sydtest-discover, text, validity - }: + "safe-coloured-text-layout_0_2_0_1" = callPackage + ({ mkDerivation, base, safe-coloured-text, text, validity }: mkDerivation { pname = "safe-coloured-text-layout"; - version = "0.2.0.0"; - sha256 = "0hhmhbm7zw45nxqy24k8za30k4z0wr2hclgh3kzn72sdb0cq5jir"; + version = "0.2.0.1"; + sha256 = "0pqpsjjsjrnl4dg7nzjspb13iwajph2phyy1056kljnr0yfvysc6"; libraryHaskellDepends = [ base safe-coloured-text text validity ]; - testHaskellDepends = [ - base bytestring safe-coloured-text sydtest text - ]; - testToolDepends = [ sydtest-discover ]; description = "Safely layout output coloured text"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; @@ -267018,6 +267512,27 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; + "safe-coloured-text-layout-gen_0_0_0_1" = callPackage + ({ mkDerivation, base, genvalidity, genvalidity-sydtest + , safe-coloured-text, safe-coloured-text-gen + , safe-coloured-text-layout, sydtest, sydtest-discover, text + }: + mkDerivation { + pname = "safe-coloured-text-layout-gen"; + version = "0.0.0.1"; + sha256 = "1yk5xdx9qwfq32407857kfcf7jdxhpz1k70j27741jnfjws8jwb0"; + libraryHaskellDepends = [ + base genvalidity safe-coloured-text-gen safe-coloured-text-layout + ]; + testHaskellDepends = [ + base genvalidity-sydtest safe-coloured-text + safe-coloured-text-layout sydtest text + ]; + testToolDepends = [ sydtest-discover ]; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "safe-coloured-text-terminfo" = callPackage ({ mkDerivation, base, safe-coloured-text, terminfo }: mkDerivation { @@ -268880,7 +269395,7 @@ self: { broken = true; }) {inherit (pkgs) z3;}; - "sbv_10_11" = callPackage + "sbv_10_12" = callPackage ({ mkDerivation, array, async, base, bytestring, containers , deepseq, directory, filepath, libBF, mtl, pretty, process , QuickCheck, random, syb, tasty, tasty-bench, tasty-golden @@ -268889,8 +269404,8 @@ self: { }: mkDerivation { pname = "sbv"; - version = "10.11"; - sha256 = "0q1xjhkbg6pv5hsnyl64ycfqbkq8kk8glmhh28rh2llj7r4lzmh0"; + version = "10.12"; + sha256 = "1siavgsc0a25rl4x22jcff2d9h1bqif4vm1nymz6niglbqnnrsv8"; enableSeparateDataOutput = true; libraryHaskellDepends = [ array async base containers deepseq directory filepath libBF mtl @@ -270268,10 +270783,12 @@ self: { pname = "scotty-resource"; version = "0.2.0.2"; sha256 = "1lhaajsx34hlci76wjvab7a1sjd42silxsvf94ncf0pc0rmjqg1n"; + revision = "1"; + editedCabalFile = "11nwgmfc25bifdfwjs6jpjdrm080hdxqmn4vl5w61zza4972ykmp"; libraryHaskellDepends = [ base containers http-types scotty text transformers wai ]; - description = "A Better way of modeling web resources"; + description = "[Deprecated] A Better way of modeling web resources"; license = lib.licenses.asl20; hydraPlatforms = lib.platforms.none; broken = true; @@ -271755,6 +272272,22 @@ self: { license = lib.licenses.bsd3; }) {}; + "select-rpms" = callPackage + ({ mkDerivation, base, directory, extra, filepath, Glob, rpm-nvr + , safe, simple-cmd, simple-cmd-args, simple-prompt + }: + mkDerivation { + pname = "select-rpms"; + version = "0.1.0"; + sha256 = "056an1cn0zx3ibbfx0qpv8aw19vnc8igkhz5phjmvypxzls75qd6"; + libraryHaskellDepends = [ + base directory extra filepath Glob rpm-nvr safe simple-cmd + simple-cmd-args simple-prompt + ]; + description = "Select a subset of RPM packages"; + license = lib.licenses.mit; + }) {}; + "selections" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -271994,6 +272527,8 @@ self: { pname = "semialign"; version = "1.3.1"; sha256 = "1xwx1icyggjbjflgn75bsqw34dmpsd15qqmz13ljxv7zak17ps36"; + revision = "1"; + editedCabalFile = "047n3dfaci8igd7dawxj0ni5452w26ay36lr259qrb5zqfwzvfhf"; libraryHaskellDepends = [ base containers hashable indexed-traversable indexed-traversable-instances semigroupoids tagged these @@ -272734,17 +273269,17 @@ self: { "sequence-formats" = callPackage ({ mkDerivation, attoparsec, base, bytestring, containers, errors , exceptions, foldl, hspec, lens-family, pipes, pipes-attoparsec - , pipes-bytestring, pipes-safe, tasty, tasty-hunit, transformers - , vector + , pipes-bytestring, pipes-safe, pipes-zlib, tasty, tasty-hunit + , transformers, vector }: mkDerivation { pname = "sequence-formats"; - version = "1.8.0.1"; - sha256 = "093w13dy7p2i77pc94b32n8j47q8c05kih597a9h107plzy97zxk"; + version = "1.8.1.0"; + sha256 = "105kxxczmdq6k2mnfsr5k6ixnlcllkhk9w70c5jcf96wz4gm6ydz"; libraryHaskellDepends = [ attoparsec base bytestring containers errors exceptions foldl lens-family pipes pipes-attoparsec pipes-bytestring pipes-safe - transformers vector + pipes-zlib transformers vector ]; testHaskellDepends = [ base bytestring containers foldl hspec pipes pipes-safe tasty @@ -273133,8 +273668,8 @@ self: { pname = "servant"; version = "0.20.1"; sha256 = "1s8vapj8qb8l5snjzxd63d9rvxwa1vw6g77cg8nynrzzppwp7xwl"; - revision = "4"; - editedCabalFile = "0yd1v3vk7lay3f9jnkybqc57am4qkgnxaz5s8rnc243agmrd4shs"; + revision = "5"; + editedCabalFile = "1lp44k8vsjwscjc5palvr930pznrm40adqksm3jcmhjsq63xmmji"; libraryHaskellDepends = [ aeson attoparsec base base-compat bifunctors bytestring case-insensitive constraints deepseq http-api-data http-media @@ -275531,8 +276066,8 @@ self: { pname = "servant-server"; version = "0.20"; sha256 = "1gp8pslk2sspi5vzrl1nimndpif7jhgzlffi2mzf1ap1bdwgxchk"; - revision = "5"; - editedCabalFile = "1k9rfv4pql4x7qb6gs4yzrfmyp2snfw8640mqaknbg9mc8ic28bc"; + revision = "6"; + editedCabalFile = "1n70k1n65lyqx4lhbmg1gw5mfl584smlyaxzrllmp9flh50z64nf"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -277916,7 +278451,7 @@ self: { license = lib.licenses.mit; }) {}; - "shakespeare" = callPackage + "shakespeare_2_1_0_1" = callPackage ({ mkDerivation, aeson, base, blaze-html, blaze-markup, bytestring , containers, directory, exceptions, file-embed, ghc-prim, hspec , HUnit, parsec, process, scientific, template-haskell, text @@ -277939,6 +278474,33 @@ self: { ]; description = "A toolkit for making compile-time interpolated templates"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + maintainers = [ lib.maintainers.psibi ]; + }) {}; + + "shakespeare" = callPackage + ({ mkDerivation, aeson, base, blaze-html, blaze-markup, bytestring + , containers, directory, exceptions, file-embed, ghc-prim, hspec + , HUnit, parsec, process, scientific, template-haskell, text + , th-lift, time, transformers, unordered-containers, vector + }: + mkDerivation { + pname = "shakespeare"; + version = "2.1.1"; + sha256 = "1j6jniy8d8dgc61h4n2kw668y8f30cqnsfwmgad1s4fqj1bplh0r"; + libraryHaskellDepends = [ + aeson base blaze-html blaze-markup bytestring containers directory + exceptions file-embed ghc-prim parsec process scientific + template-haskell text th-lift time transformers + unordered-containers vector + ]; + testHaskellDepends = [ + aeson base blaze-html blaze-markup bytestring containers directory + exceptions ghc-prim hspec HUnit parsec process template-haskell + text time transformers + ]; + description = "A toolkit for making compile-time interpolated templates"; + license = lib.licenses.mit; maintainers = [ lib.maintainers.psibi ]; }) {}; @@ -278607,6 +279169,8 @@ self: { pname = "shh"; version = "0.7.3.0"; sha256 = "18rb6jhkazl64mixnw0s4v824m4vvmnpap3lvv917xsjj605xx1a"; + revision = "6"; + editedCabalFile = "1wqmdm902lf06l400drvzqjcnb89vx817q1z91klvky8bnxp1ksg"; isLibrary = true; isExecutable = true; setupHaskellDepends = [ base Cabal ]; @@ -278633,8 +279197,8 @@ self: { pname = "shh-extras"; version = "0.1.0.2"; sha256 = "0yax761d0xgc8nqg8h7y69fb1mwf88w73sznh3kffhlaladavskx"; - revision = "1"; - editedCabalFile = "1rk56bpsdiyylay8kmgky2i4bvxs6xjc3xdc1yssb2qv74gcl8wq"; + revision = "2"; + editedCabalFile = "176mjl67pjdzz92281qipj250gc3dixdfpb3x8v14w0f28r4ja55"; libraryHaskellDepends = [ base hostname shh time ]; testHaskellDepends = [ base tasty ]; description = "Utility functions for using shh"; @@ -281099,8 +281663,8 @@ self: { pname = "single-tuple"; version = "0.1.3.0"; sha256 = "1axr5bv92pc9261mpcjq8wn0871i4n18hn9qpk8gpqj6zvh9gjcc"; - revision = "1"; - editedCabalFile = "0lcg7rjy51rja8f4575cssrhyb86f03w13aw440mqs85mnzx75km"; + revision = "2"; + editedCabalFile = "0in3mgf3mdc8zh8zj9sqipfjnb4007r0zzbswkn9ydwz0hi0q09n"; libraryHaskellDepends = [ base ghc-prim OneTuple Only ]; testHaskellDepends = [ base ghc-prim hspec OneTuple Only ]; testToolDepends = [ hspec-discover ]; @@ -281837,6 +282401,33 @@ self: { broken = true; }) {}; + "skeletest" = callPackage + ({ mkDerivation, aeson, aeson-pretty, ansi-terminal, base + , containers, Diff, directory, filepath, ghc, hedgehog, megaparsec + , ordered-containers, parser-combinators, pretty, process + , recover-rtti, template-haskell, text, transformers, unliftio + }: + mkDerivation { + pname = "skeletest"; + version = "0.1.0"; + sha256 = "1bl02qvmxwa2nswi11lhgp6gnyg3jych6qscmwfyw2d9pawpq4d1"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson aeson-pretty ansi-terminal base containers Diff directory + filepath ghc hedgehog megaparsec ordered-containers + parser-combinators pretty recover-rtti template-haskell text + transformers unliftio + ]; + executableHaskellDepends = [ base text ]; + testHaskellDepends = [ + aeson base containers directory filepath process text unliftio + ]; + description = "Batteries-included, opinionated test framework"; + license = lib.licenses.bsd3; + mainProgram = "skeletest-preprocessor"; + }) {}; + "skeleton" = callPackage ({ mkDerivation, argparser, attoparsec, base, bytestring, filepath , hex, posix-escape, process, time @@ -282559,6 +283150,23 @@ self: { license = lib.licenses.bsd3; }) {}; + "slick_1_3_1_0" = callPackage + ({ mkDerivation, aeson, base, bytestring, directory, extra + , mustache, pandoc, shake, text, unordered-containers + }: + mkDerivation { + pname = "slick"; + version = "1.3.1.0"; + sha256 = "1jg6vhy60g2l58asifsz4642zfdmih2nw9f964prglhhkxdgisc2"; + libraryHaskellDepends = [ + aeson base bytestring directory extra mustache pandoc shake text + unordered-containers + ]; + description = "A quick & easy static site builder built with shake and pandoc"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "slidemews" = callPackage ({ mkDerivation, aeson, base, bytestring, MonadCatchIO-transformers , mtl, pandoc, snap-core, snap-server, utf8-string @@ -283445,6 +284053,8 @@ self: { pname = "smtlib-backends"; version = "0.4"; sha256 = "16n2ig71wjqp1ziplwrq3639fqn582ymx5g9ls7f814ddjgc70xg"; + revision = "1"; + editedCabalFile = "0iwszfbf4r02jvl362n8i597ymwhcsdwyhakfa67lwk48j7j5bm7"; libraryHaskellDepends = [ base bytestring ]; description = "Low-level functions for SMT-LIB-based interaction with SMT solvers"; license = lib.licenses.mit; @@ -283458,8 +284068,8 @@ self: { pname = "smtlib-backends-process"; version = "0.3"; sha256 = "0jc7fmf3x53w8v0a8cj8v8r2f4gpn1jhndl80hyqzsblvrw5hcfg"; - revision = "3"; - editedCabalFile = "1kc9643lrpz8yxcnda54kb2cakxcmbdaxszkhadjmz7in7xv1xi6"; + revision = "4"; + editedCabalFile = "0plbkwkam6r16ls74j2iwinqslcxqhq0smib24jfnklpqmahlwxv"; libraryHaskellDepends = [ base bytestring process smtlib-backends ]; @@ -283479,8 +284089,8 @@ self: { pname = "smtlib-backends-tests"; version = "0.3"; sha256 = "0lj4bpl4nkw6w2hfjzz16zmrbaj5g3myvbmzlsc5rdsz0xwisfb8"; - revision = "2"; - editedCabalFile = "1c7xag17kfvzlz7w8sd9f8nwj3znmfbwlp0049byr9nlmv1nq7lr"; + revision = "3"; + editedCabalFile = "1bh34im8411jx9rqqr0yqa0ncwrcifbk2x0bi57yp8kcxhhdnfwp"; libraryHaskellDepends = [ base smtlib-backends tasty tasty-hunit ]; description = "Testing SMT-LIB backends"; license = lib.licenses.mit; @@ -283494,8 +284104,8 @@ self: { pname = "smtlib-backends-z3"; version = "0.3.1"; sha256 = "1mgjlfhqcbqc84a87g6bp0i9pnmpz87b7w43x200mwx1k877zddy"; - revision = "1"; - editedCabalFile = "18rj2yj3w4cqdirycxavfhwhaalg8v4qjacs25iy3c1qmm3jwrvb"; + revision = "2"; + editedCabalFile = "10sxc9pswjsf2d2b6qcz97kyps5b4jzvgm4ljwfvb6c79m22wfz1"; libraryHaskellDepends = [ base bytestring smtlib-backends ]; librarySystemDepends = [ gomp z3 ]; testHaskellDepends = [ @@ -286575,10 +287185,10 @@ self: { }) {}; "spade" = callPackage - ({ mkDerivation, aeson, ansi-terminal, base, bytestring - , constraints, containers, cryptonite, Decimal, directory - , exceptions, file-embed, filepath, hedgehog, hex-text, hspec - , hspec-discover, hspec-hedgehog, memory, monad-loops, mtl + ({ mkDerivation, aeson, ansi-terminal, base, bounded-queue + , bytestring, constraints, containers, cryptonite, Decimal, deepseq + , directory, exceptions, file-embed, filepath, hedgehog, hex-text + , hspec, hspec-discover, hspec-hedgehog, memory, monad-loops, mtl , neat-interpolation, ordered-containers, process, random , regex-tdfa, scientific, sdl2, sdl2-gfx, sdl2-mixer, sdl2-ttf, stm , strip-ansi-escape, template-haskell, terminal, text, time, unix @@ -286587,36 +287197,39 @@ self: { }: mkDerivation { pname = "spade"; - version = "0.1.0.9"; - sha256 = "0m11a7nszp3i6wg73274pj5hd7m6sw45n2h6rdrfbxc4xm08vs64"; + version = "0.1.0.10"; + sha256 = "1fxrn1nf2yh6r9m93sc5wxk60cd9vccl994w4pva90fp78a3p69n"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - aeson ansi-terminal base bytestring constraints containers - cryptonite Decimal directory exceptions file-embed filepath - hedgehog hex-text hspec hspec-discover hspec-hedgehog memory - monad-loops mtl neat-interpolation ordered-containers process - random regex-tdfa scientific sdl2 sdl2-gfx sdl2-mixer sdl2-ttf stm - strip-ansi-escape template-haskell terminal text time unix unliftio - unliftio-core unordered-containers vector WAVE with-utf8 + aeson ansi-terminal base bounded-queue bytestring constraints + containers cryptonite Decimal deepseq directory exceptions + file-embed filepath hedgehog hex-text hspec hspec-discover + hspec-hedgehog memory monad-loops mtl neat-interpolation + ordered-containers process random regex-tdfa scientific sdl2 + sdl2-gfx sdl2-mixer sdl2-ttf stm strip-ansi-escape template-haskell + terminal text time unix unliftio unliftio-core unordered-containers + vector WAVE with-utf8 ]; executableHaskellDepends = [ - aeson ansi-terminal base bytestring constraints containers - cryptonite Decimal directory exceptions file-embed filepath - hedgehog hex-text hspec hspec-discover hspec-hedgehog memory - monad-loops mtl neat-interpolation ordered-containers process - random regex-tdfa scientific sdl2 sdl2-gfx sdl2-mixer sdl2-ttf stm - strip-ansi-escape template-haskell terminal text time unix unliftio - unliftio-core unordered-containers vector WAVE with-utf8 + aeson ansi-terminal base bounded-queue bytestring constraints + containers cryptonite Decimal deepseq directory exceptions + file-embed filepath hedgehog hex-text hspec hspec-discover + hspec-hedgehog memory monad-loops mtl neat-interpolation + ordered-containers process random regex-tdfa scientific sdl2 + sdl2-gfx sdl2-mixer sdl2-ttf stm strip-ansi-escape template-haskell + terminal text time unix unliftio unliftio-core unordered-containers + vector WAVE with-utf8 ]; testHaskellDepends = [ - aeson ansi-terminal base bytestring constraints containers - cryptonite Decimal directory exceptions file-embed filepath - hedgehog hex-text hspec hspec-discover hspec-hedgehog memory - monad-loops mtl neat-interpolation ordered-containers process - random regex-tdfa scientific sdl2 sdl2-gfx sdl2-mixer sdl2-ttf stm - strip-ansi-escape template-haskell terminal text time unix unliftio - unliftio-core unordered-containers vector WAVE with-utf8 + aeson ansi-terminal base bounded-queue bytestring constraints + containers cryptonite Decimal deepseq directory exceptions + file-embed filepath hedgehog hex-text hspec hspec-discover + hspec-hedgehog memory monad-loops mtl neat-interpolation + ordered-containers process random regex-tdfa scientific sdl2 + sdl2-gfx sdl2-mixer sdl2-ttf stm strip-ansi-escape template-haskell + terminal text time unix unliftio unliftio-core unordered-containers + vector WAVE with-utf8 ]; testToolDepends = [ hspec-discover ]; description = "A simple programming and debugging environment"; @@ -287012,19 +287625,19 @@ self: { }) {}; "spdx" = callPackage - ({ mkDerivation, base, base-compat, Cabal, containers, QuickCheck - , tasty, tasty-quickcheck, transformers + ({ mkDerivation, base, Cabal-syntax, containers, puresat + , QuickCheck, tasty, tasty-quickcheck, transformers }: mkDerivation { pname = "spdx"; - version = "1.0.0.3"; - sha256 = "1xrar0mzr7y02gw1hfabd6jyz31p3qz0jxp2mcs5kbhv0a3rc91m"; - libraryHaskellDepends = [ base Cabal containers transformers ]; - testHaskellDepends = [ - base base-compat Cabal tasty tasty-quickcheck + version = "1.1"; + sha256 = "14x1kk4baq4a3am4hp5ax2smc0h5dizlc22w2jkc63f3013dxvp3"; + libraryHaskellDepends = [ + base Cabal-syntax containers puresat transformers ]; + testHaskellDepends = [ base Cabal-syntax tasty tasty-quickcheck ]; benchmarkHaskellDepends = [ - base base-compat Cabal QuickCheck tasty-quickcheck + base Cabal-syntax QuickCheck tasty-quickcheck ]; description = "SPDX license expression language, Extras"; license = lib.licenses.bsd3; @@ -293218,6 +293831,31 @@ self: { broken = true; }) {}; + "streamly-zip" = callPackage + ({ mkDerivation, base, base16-bytestring, bytestring, containers + , cryptohash, directory, filepath, QuickCheck, streamly + , streamly-core, tar, tasty, tasty-hunit, tasty-quickcheck + , temporary, zip, zlib + }: + mkDerivation { + pname = "streamly-zip"; + version = "0.0.1"; + sha256 = "0wys2yfrwb06sw64960z17zqmcqxdij6cw51mbqw6ak12ax6k0xz"; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + base bytestring containers streamly streamly-core + ]; + librarySystemDepends = [ zip ]; + testHaskellDepends = [ + base base16-bytestring bytestring containers cryptohash directory + filepath QuickCheck streamly streamly-core tar tasty tasty-hunit + tasty-quickcheck temporary zlib + ]; + testSystemDepends = [ zip ]; + description = "Stream data from zip archives using the streamly library"; + license = lib.licenses.bsd3; + }) {inherit (pkgs) zip;}; + "streamproc" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -293349,6 +293987,8 @@ self: { pname = "strict"; version = "0.5.1"; sha256 = "12rgzrxb1dz5qb1sqmwdyiyhxbpa5rrzlyr293ki4qx8qa094wbp"; + revision = "1"; + editedCabalFile = "1wh1p76sahrzqd58kdlvk85c38cr7w3ib33cb95bp33lqyvp7hsq"; libraryHaskellDepends = [ assoc base binary bytestring deepseq ghc-prim hashable text these transformers @@ -293426,10 +294066,8 @@ self: { }: mkDerivation { pname = "strict-containers"; - version = "0.2"; - sha256 = "128aw17c2m3rh2v23c2vdgk7f7rk11plwkzq2carrm1x5nvhrki7"; - revision = "2"; - editedCabalFile = "1gkb90gsx8ls5c86jjxs1c01r09lkv9jxzx6g0c0rc1n45n6w5ph"; + version = "0.2.1"; + sha256 = "0y9pprfcrqlqv0px2p97wsk3zddbzc7qcgl7cvjl4m7k64sya0ia"; libraryHaskellDepends = [ array base binary containers deepseq hashable indexed-traversable primitive strict template-haskell unordered-containers vector @@ -295342,6 +295980,23 @@ self: { license = lib.licenses.mit; }) {}; + "suffix" = callPackage + ({ mkDerivation, base, bytestring, containers, deepseq, primitive + , tasty, tasty-hunit, tasty-quickcheck + }: + mkDerivation { + pname = "suffix"; + version = "0.1.0.0"; + sha256 = "1kjlmbljwp14mc5l177apkv5iwcls2y7jng0din6z3gfbja90j4z"; + libraryHaskellDepends = [ base bytestring deepseq primitive ]; + testHaskellDepends = [ + base bytestring containers primitive tasty tasty-hunit + tasty-quickcheck + ]; + description = "Suffix arrays and friends"; + license = lib.licenses.bsd3; + }) {}; + "suffix-array" = callPackage ({ mkDerivation, array, base, containers, criterion, random, tasty , tasty-hunit, tasty-quickcheck @@ -296953,6 +297608,29 @@ self: { license = "unknown"; }) {}; + "sydtest_0_17_0_0" = callPackage + ({ mkDerivation, async, autodocodec, base, bytestring, containers + , dlist, fast-myers-diff, filepath, MonadRandom, mtl, opt-env-conf + , path, path-io, pretty-show, QuickCheck, quickcheck-io, random + , random-shuffle, safe, safe-coloured-text + , safe-coloured-text-terminfo, stm, svg-builder, text, vector + }: + mkDerivation { + pname = "sydtest"; + version = "0.17.0.0"; + sha256 = "1l8ji5qny7wq6n10ys1mxclqbzk54g3fsdi99pjb9sigd99s550n"; + libraryHaskellDepends = [ + async autodocodec base bytestring containers dlist fast-myers-diff + filepath MonadRandom mtl opt-env-conf path path-io pretty-show + QuickCheck quickcheck-io random random-shuffle safe + safe-coloured-text safe-coloured-text-terminfo stm svg-builder text + vector + ]; + description = "A modern testing framework for Haskell with good defaults and advanced testing features"; + license = "unknown"; + hydraPlatforms = lib.platforms.none; + }) {}; + "sydtest-aeson" = callPackage ({ mkDerivation, aeson, aeson-pretty, base, bytestring, deepseq , directory, path, path-io, sydtest, sydtest-discover, text @@ -296971,6 +297649,25 @@ self: { license = "unknown"; }) {}; + "sydtest-aeson_0_2_0_0" = callPackage + ({ mkDerivation, aeson, aeson-pretty, base, bytestring, deepseq + , directory, path, path-io, sydtest, sydtest-discover, text + }: + mkDerivation { + pname = "sydtest-aeson"; + version = "0.2.0.0"; + sha256 = "14acwqaxb3dizpqa6xz7wpnb2qssyfzqh4g3g7dxdbk04sypz34h"; + libraryHaskellDepends = [ + aeson aeson-pretty base bytestring deepseq path path-io sydtest + text + ]; + testHaskellDepends = [ aeson base directory sydtest text ]; + testToolDepends = [ sydtest-discover ]; + description = "An aeson companion library for sydtest"; + license = "unknown"; + hydraPlatforms = lib.platforms.none; + }) {}; + "sydtest-amqp" = callPackage ({ mkDerivation, aeson, amqp, async, base, bytestring, network , path, path-io, port-utils, process, stm, sydtest @@ -297105,6 +297802,25 @@ self: { broken = true; }) {}; + "sydtest-mongo_0_1_0_0" = callPackage + ({ mkDerivation, base, binary, bson, bytestring, mongoDB, network + , path, path-io, port-utils, process, sydtest, sydtest-process + , text, yaml + }: + mkDerivation { + pname = "sydtest-mongo"; + version = "0.1.0.0"; + sha256 = "1wqhqyg513mh8vxc2ddsxd04iywlz3gwgx35zawgldi215zdfnqi"; + libraryHaskellDepends = [ + base binary bson bytestring mongoDB network path path-io port-utils + process sydtest sydtest-process text yaml + ]; + description = "An mongoDB companion library for sydtest"; + license = "unknown"; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {}; + "sydtest-persistent" = callPackage ({ mkDerivation, base, bytestring, mtl, persistent, sydtest, text , unliftio @@ -297120,6 +297836,22 @@ self: { license = "unknown"; }) {}; + "sydtest-persistent_0_1_0_0" = callPackage + ({ mkDerivation, base, bytestring, mtl, persistent, sydtest, text + , unliftio + }: + mkDerivation { + pname = "sydtest-persistent"; + version = "0.1.0.0"; + sha256 = "1hvx5101vwdwd5p7d7x7cg44byflnm9gwr6pfnzfvlw75fpdfb3i"; + libraryHaskellDepends = [ + base bytestring mtl persistent sydtest text unliftio + ]; + description = "A persistent companion library for sydtest"; + license = "unknown"; + hydraPlatforms = lib.platforms.none; + }) {}; + "sydtest-persistent-postgresql" = callPackage ({ mkDerivation, base, monad-logger, mtl, persistent , persistent-postgresql, sydtest, sydtest-discover @@ -297298,6 +298030,29 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; + "sydtest-webdriver-screenshot_0_1_0_0" = callPackage + ({ mkDerivation, base, bytestring, http-types, JuicyPixels, mtl + , network-uri, path, path-io, sydtest, sydtest-discover + , sydtest-wai, sydtest-webdriver, vector, wai, webdriver + }: + mkDerivation { + pname = "sydtest-webdriver-screenshot"; + version = "0.1.0.0"; + sha256 = "1jcgnawxf6ag8zg8wc5hq47yv55ps45v2xw01d9xpd1lq1mc6xkw"; + libraryHaskellDepends = [ + base bytestring JuicyPixels mtl path path-io sydtest + sydtest-webdriver vector webdriver + ]; + testHaskellDepends = [ + base http-types network-uri sydtest sydtest-wai sydtest-webdriver + wai + ]; + testToolDepends = [ sydtest-discover ]; + description = "A webdriver screenshot companion library for sydtest"; + license = "unknown"; + hydraPlatforms = lib.platforms.none; + }) {}; + "sydtest-webdriver-yesod" = callPackage ({ mkDerivation, base, bytestring, http-client, http-types, mtl , network-uri, path, path-io, sydtest, sydtest-discover @@ -298714,8 +299469,8 @@ self: { pname = "system-linux-proc"; version = "0.1.1.1"; sha256 = "12nvsvmchhsqs5f3x2075v8v68inb1xz8dbv1q5x48big1bf4vv5"; - revision = "2"; - editedCabalFile = "0bf4zrx2x3h6wln257k7fjwszvkxg9phjscfkhrl403wiz1kjxqz"; + revision = "3"; + editedCabalFile = "0mkjwv2yw130rpmxby32hqrj26q268wiyfv6f71q09wp1axl6qfc"; libraryHaskellDepends = [ attoparsec base bytestring containers directory errors text ]; @@ -301143,8 +301898,8 @@ self: { pname = "tasty-hedgehog"; version = "1.4.0.2"; sha256 = "0lki03z0p38x0dkqx5cqga30zy5m31gxn1saqylja9bi6bbq8d25"; - revision = "4"; - editedCabalFile = "1qibqxwh3f0c2n7fcj2dni12mhixfwbywli6qrqii6wi7n325gd9"; + revision = "5"; + editedCabalFile = "19csv89pdva2d5fa0f9kwiq9cdcr51gsnaay62icjpkjw9anapch"; libraryHaskellDepends = [ base hedgehog tagged tasty ]; testHaskellDepends = [ base hedgehog tasty tasty-expected-failure @@ -302797,17 +303552,6 @@ self: { }) {}; "template-haskell-compat-v0208" = callPackage - ({ mkDerivation, base, template-haskell }: - mkDerivation { - pname = "template-haskell-compat-v0208"; - version = "0.1.9.3"; - sha256 = "0qidpj5w8m3qd8xn3vd8z1mym34m6aw1ds16p0yf2anwdn4knilj"; - libraryHaskellDepends = [ base template-haskell ]; - description = "Backward-compatibility layer for Template Haskell newer than 2.8"; - license = lib.licenses.mit; - }) {}; - - "template-haskell-compat-v0208_0_1_9_4" = callPackage ({ mkDerivation, base, template-haskell }: mkDerivation { pname = "template-haskell-compat-v0208"; @@ -302816,7 +303560,6 @@ self: { libraryHaskellDepends = [ base template-haskell ]; description = "Backward-compatibility layer for Template Haskell newer than 2.8"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "template-haskell-optics" = callPackage @@ -302967,8 +303710,8 @@ self: { }: mkDerivation { pname = "templatise"; - version = "0.1.5.0"; - sha256 = "092vbmng2jpcb2vc9bqg2gm132zrvi3b9qh7lfw6d1as9qf8f43v"; + version = "0.1.6.0"; + sha256 = "07dp87h0hn77ccg8acnfpki1yvxx4h1h6nqdjfxwc0kwji1svzia"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; @@ -303743,6 +304486,8 @@ self: { pname = "terminal-size"; version = "0.3.4"; sha256 = "0jbznrlf95lc6ajhh26h1qgcmbr3bj753i8jlkrsrnkcjbb71w5h"; + revision = "1"; + editedCabalFile = "0w2pjmravr1fnvmrcnj13dxrf43miqypmh0fhrz1g1pb1qrg3mr1"; libraryHaskellDepends = [ base ]; description = "Get terminal window height and width"; license = lib.licenses.bsd3; @@ -307059,6 +307804,8 @@ self: { pname = "these"; version = "1.2.1"; sha256 = "1pp44amwvpl0m762zahg632prlxx0ca2r10n3a0bznjy6qrxkmhp"; + revision = "1"; + editedCabalFile = "12qb2g87kwprcxa8kksh2v8sm9m723h4c407dd868y5k64smfky0"; libraryHaskellDepends = [ assoc base binary deepseq hashable ]; description = "An either-or-both data type"; license = lib.licenses.bsd3; @@ -312716,6 +313463,8 @@ self: { pname = "tree-diff"; version = "0.3.1"; sha256 = "0ixv5122yz6p6a0vfjn5hgp81bs6dx6x3q731cwjyx03dr9lzicb"; + revision = "1"; + editedCabalFile = "1ga0xnyv24fgjiifypq95l7nhlm86swqscakfm98kxqi91gbzr5y"; libraryHaskellDepends = [ aeson ansi-terminal ansi-wl-pprint base bytestring containers deepseq hashable parsec parsers pretty primitive QuickCheck @@ -316258,8 +317007,8 @@ self: { }: mkDerivation { pname = "typed-fsm"; - version = "0.3.0.0"; - sha256 = "0994ajxfl1q834zazp3307dr4b1k16jm7k117gw5i3l74bkskqqm"; + version = "0.3.0.1"; + sha256 = "0zm3hi25sp79b588dkrgc4r7k9s9lxi3wqjk4d042h4m5nvxaw1y"; libraryHaskellDepends = [ base dependent-map dependent-sum mtl singletons-base ]; @@ -316269,6 +317018,22 @@ self: { broken = true; }) {}; + "typed-gui" = callPackage + ({ mkDerivation, base, mtl, singletons-base, stm, threepenny-gui + , typed-fsm + }: + mkDerivation { + pname = "typed-gui"; + version = "0.1.0.0"; + sha256 = "1xsparfq3gwzsir8mfawlz7900i9y8dk7qhwhy53ca236q4n0m6d"; + libraryHaskellDepends = [ + base mtl singletons-base stm threepenny-gui typed-fsm + ]; + testHaskellDepends = [ base ]; + description = "GUI framework based on typed-fsm"; + license = lib.licenses.mit; + }) {}; + "typed-process" = callPackage ({ mkDerivation, async, base, base64-bytestring, bytestring, hspec , hspec-discover, process, stm, temporary, transformers @@ -316310,6 +317075,23 @@ self: { broken = true; }) {}; + "typed-session" = callPackage + ({ mkDerivation, base, containers, fused-effects + , fused-effects-random, io-classes, io-sim, random + }: + mkDerivation { + pname = "typed-session"; + version = "0.1.0.0"; + sha256 = "172gsby1jpqvyqpfh6jjnq7crhqmac9ka9h7kil4zk3b4sig5hz1"; + libraryHaskellDepends = [ base containers io-classes ]; + testHaskellDepends = [ + base containers fused-effects fused-effects-random io-classes + io-sim random + ]; + description = "typed session framework"; + license = lib.licenses.mit; + }) {}; + "typed-spreadsheet" = callPackage ({ mkDerivation, async, base, diagrams-cairo, diagrams-gtk , diagrams-lib, foldl, gtk, microlens, stm, text, transformers @@ -320100,15 +320882,14 @@ self: { }) {}; "unliftio-servant-server" = callPackage - ({ mkDerivation, base, mtl, servant, servant-server, unliftio }: + ({ mkDerivation, base, mtl, servant, servant-server, unliftio-core + }: mkDerivation { pname = "unliftio-servant-server"; - version = "0.1.0.0"; - sha256 = "1lpvkzpi9yl4h42nvvwacd7mg1ky45n64dzrjs12lbv2c0m8i3pp"; - revision = "1"; - editedCabalFile = "0ddhn9x6m0r0pd63hrxgzfj535i9ikmwjkjiysghhhzfvd1p82k3"; + version = "0.1.0.1"; + sha256 = "16ddmcacd1laa5y1k8x1xddhbbfw03xad6yc2hsca4kih1lsiw61"; libraryHaskellDepends = [ - base mtl servant servant-server unliftio + base mtl servant servant-server unliftio-core ]; description = "Use MonadUnliftIO on servant APIs"; license = lib.licenses.bsd3; @@ -321786,8 +322567,8 @@ self: { }: mkDerivation { pname = "utxorpc"; - version = "0.0.7.0"; - sha256 = "1jy44jnqfd2h1aq2bqi6yq8yn34i1kl2jvl12fjbv4h29skvmvpg"; + version = "0.0.9.0"; + sha256 = "1n86awygbq0gf9bl35hhsx0wxwnyk63ydxkz6i93dbbp22lfnmgc"; libraryHaskellDepends = [ base proto-lens proto-lens-protobuf-types proto-lens-runtime ]; @@ -322813,6 +323594,17 @@ self: { license = lib.licenses.mit; }) {}; + "validity-dlist" = callPackage + ({ mkDerivation, base, dlist, validity }: + mkDerivation { + pname = "validity-dlist"; + version = "0.1.0.1"; + sha256 = "091vriixm5s1xdpdi78vb27b8x77llnk1s7akivrhpg6zsxcs31w"; + libraryHaskellDepends = [ base dlist validity ]; + description = "Validity instances for containers"; + license = lib.licenses.mit; + }) {}; + "validity-network-uri" = callPackage ({ mkDerivation, base, network-uri, validity }: mkDerivation { @@ -323136,6 +323928,25 @@ self: { license = lib.licenses.bsd3; }) {}; + "variant" = callPackage + ({ mkDerivation, base, criterion, deepseq, exceptions, mtl + , QuickCheck, recursion-schemes, tasty, tasty-quickcheck + , template-haskell, transformers, unliftio-core + }: + mkDerivation { + pname = "variant"; + version = "1.0"; + sha256 = "13k50y8ap5gnbag5v1j2abddz98fzlay3kjzg93gs7fyz2dil7j2"; + libraryHaskellDepends = [ + base deepseq exceptions mtl recursion-schemes template-haskell + transformers unliftio-core + ]; + testHaskellDepends = [ base tasty tasty-quickcheck ]; + benchmarkHaskellDepends = [ base criterion deepseq QuickCheck ]; + description = "Variant and EADT"; + license = lib.licenses.bsd3; + }) {}; + "variation" = callPackage ({ mkDerivation, base, cereal, containers, deepseq, semigroupoids }: @@ -323829,22 +324640,6 @@ self: { }) {}; "vector-extras" = callPackage - ({ mkDerivation, base, containers, deferred-folds, foldl, hashable - , unordered-containers, vector - }: - mkDerivation { - pname = "vector-extras"; - version = "0.2.8.1"; - sha256 = "0bnjh4c001v6ia6ac40i508jdzfdlccp8v0fhy7ayv4scrvpwip2"; - libraryHaskellDepends = [ - base containers deferred-folds foldl hashable unordered-containers - vector - ]; - description = "Utilities for the \"vector\" library"; - license = lib.licenses.mit; - }) {}; - - "vector-extras_0_2_8_2" = callPackage ({ mkDerivation, base, containers, deferred-folds, foldl, hashable , unordered-containers, vector }: @@ -323858,7 +324653,6 @@ self: { ]; description = "Utilities for the \"vector\" library"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "vector-fft" = callPackage @@ -324117,6 +324911,18 @@ self: { license = lib.licenses.bsd3; }) {}; + "vector-space_0_19" = callPackage + ({ mkDerivation, base, Boolean, MemoTrie, NumInstances }: + mkDerivation { + pname = "vector-space"; + version = "0.19"; + sha256 = "09gbkwq0z47ahc5brq72i7xr7rwqvl3sy04j1h4my5ij282d25w9"; + libraryHaskellDepends = [ base Boolean MemoTrie NumInstances ]; + description = "Vector & affine spaces, linear maps, and derivatives"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "vector-space-map" = callPackage ({ mkDerivation, base, containers, doctest, vector-space }: mkDerivation { @@ -328682,8 +329488,8 @@ self: { }: mkDerivation { pname = "waterfall-cad"; - version = "0.3.0.1"; - sha256 = "1d5k2n1lx1lxg8zm9qr3rmk3wml6mq1p9b5bqmqfhair88llrasj"; + version = "0.4.0.0"; + sha256 = "062q7ip6ifk8si1nk0brmbd7qh6b05xar7dds9wrjbbhz1fyjcs5"; libraryHaskellDepends = [ base filepath lattices lens linear opencascade-hs primitive resourcet @@ -328699,8 +329505,8 @@ self: { }: mkDerivation { pname = "waterfall-cad-examples"; - version = "0.3.0.1"; - sha256 = "0nk4y5rzyfsmllvbf2c5qxnbglw0jqkbpl8b3lgshhirab3rchcz"; + version = "0.4.0.0"; + sha256 = "046k22r5q32y21r7fpg07301x12xmc8nwj9m4xgw100sxy66vvdg"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -330596,29 +331402,29 @@ self: { "weeder" = callPackage ({ mkDerivation, aeson, algebraic-graphs, async, base, bytestring - , containers, directory, filepath, generic-lens, ghc, hspec, lens - , mtl, optparse-applicative, parallel, process, regex-tdfa, text - , toml-reader, transformers + , containers, directory, filepath, generic-lens, ghc, Glob + , hspec-discover, hspec-expectations, lens, mtl + , optparse-applicative, parallel, process, regex-tdfa, tasty + , tasty-golden, tasty-hunit-compat, text, toml-reader, transformers }: mkDerivation { pname = "weeder"; - version = "2.8.0"; - sha256 = "086vni1i0sqy2xva63xdx1ppvwygyn1dav2bykggd6j1jrwi0m5p"; + version = "2.9.0"; + sha256 = "0fgxsyijn5flxzhjy3096qjlv0avlwchwyb46pizwh2s6i1nwil3"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ algebraic-graphs async base bytestring containers directory - filepath generic-lens ghc lens mtl optparse-applicative parallel - regex-tdfa text toml-reader transformers - ]; - executableHaskellDepends = [ - base bytestring containers directory filepath ghc - optparse-applicative transformers + filepath generic-lens ghc Glob lens mtl optparse-applicative + parallel regex-tdfa text toml-reader transformers ]; + executableHaskellDepends = [ base ]; testHaskellDepends = [ - aeson algebraic-graphs base containers directory filepath ghc hspec - process text toml-reader + aeson algebraic-graphs base bytestring containers directory + filepath ghc hspec-expectations process tasty tasty-golden + tasty-hunit-compat text toml-reader ]; + testToolDepends = [ hspec-discover ]; description = "Detect dead code"; license = lib.licenses.bsd3; mainProgram = "weeder"; @@ -331150,8 +331956,8 @@ self: { pname = "wide-word"; version = "0.1.6.0"; sha256 = "15wp0mdjbaacvzwkjlmdr7w6bm239g5v3ylkczwr3cfj30da0snz"; - revision = "2"; - editedCabalFile = "0d21qdyx80yac09j31sy1xndwx5by257hy2cyx8www795dl5inh4"; + revision = "3"; + editedCabalFile = "01vy3civ7vzninmn6xdadfd9xfwn6hv002prpm9fb5i68qgbp8dr"; libraryHaskellDepends = [ base binary deepseq ghc-prim hashable primitive ]; @@ -331226,6 +332032,109 @@ self: { broken = true; }) {}; + "wikimusic-api" = callPackage + ({ mkDerivation, aeson, async, base, base64-bytestring, bytestring + , containers, contravariant-extras, directory, filepath + , free-alacarte, hasql, hasql-implicits, hasql-migration + , hasql-optparse-applicative, hasql-pool, hasql-transaction, hedis + , HTTP, keuringsdienst, keys, mime-mail, mtl, neat-interpolation + , openapi3, optics, optparse-applicative, password, password-types + , postgresql-libpq, relude, servant, servant-openapi3 + , servant-rate-limit, servant-server, smtp-mail, tasty, tasty-hunit + , text, time, tomland, uuid, vector, wai, wai-cors, wai-extra + , wai-rate-limit, wai-rate-limit-redis, warp, wikimusic-api-spec + , wikimusic-model-hs + }: + mkDerivation { + pname = "wikimusic-api"; + version = "1.1.0.1"; + sha256 = "11axz65b4zswca53q0scywl6qnbm6qpfy6dhzgi7n8s0d0518js5"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson async base base64-bytestring bytestring containers + contravariant-extras directory filepath free-alacarte hasql + hasql-implicits hasql-migration hasql-optparse-applicative + hasql-pool hasql-transaction hedis HTTP keuringsdienst keys + mime-mail mtl neat-interpolation openapi3 optics + optparse-applicative password password-types postgresql-libpq + relude servant servant-openapi3 servant-rate-limit servant-server + smtp-mail text time tomland uuid vector wai wai-cors wai-extra + wai-rate-limit wai-rate-limit-redis warp wikimusic-api-spec + wikimusic-model-hs + ]; + executableHaskellDepends = [ base ]; + testHaskellDepends = [ base tasty tasty-hunit ]; + license = lib.licenses.gpl3Only; + mainProgram = "wikimusic-api-exe"; + }) {}; + + "wikimusic-api-spec" = callPackage + ({ mkDerivation, aeson, base, bytestring, directory, filepath, keys + , mtl, openapi3, relude, servant, servant-openapi3 + , servant-rate-limit, servant-server, text, time, uuid, vector + , wikimusic-model-hs + }: + mkDerivation { + pname = "wikimusic-api-spec"; + version = "1.2.0.0"; + sha256 = "11jfj3z3b47hc3dfm7zfxxdgspzm0yisc0ihrplnjb9rrc0vva9b"; + libraryHaskellDepends = [ + aeson base bytestring directory filepath keys mtl openapi3 relude + servant servant-openapi3 servant-rate-limit servant-server text + time uuid vector wikimusic-model-hs + ]; + license = lib.licenses.gpl3Only; + }) {}; + + "wikimusic-model-hs" = callPackage + ({ mkDerivation, aeson, async, base, bytestring, containers + , directory, filepath, keuringsdienst, keys, mtl + , neat-interpolation, openapi3, optics, password, password-types + , relude, text, time, tomland, uuid + }: + mkDerivation { + pname = "wikimusic-model-hs"; + version = "1.2.0.0"; + sha256 = "1a1k7997yr8cz4p2x5z92ngxd7fxaxx8cqh0mldlv2cngiab9l08"; + libraryHaskellDepends = [ + aeson async base bytestring containers directory filepath + keuringsdienst keys mtl neat-interpolation openapi3 optics password + password-types relude text time tomland uuid + ]; + license = lib.licenses.gpl3Only; + }) {}; + + "wikimusic-ssr" = callPackage + ({ mkDerivation, aeson, async, base, base16-bytestring + , base64-bytestring, blaze-html, bytestring, containers, directory + , filepath, free-alacarte, HTTP, http-client, http-client-tls + , keuringsdienst, keys, mtl, neat-interpolation, optics + , optparse-applicative, relude, servant, servant-auth-server + , servant-blaze, servant-client, servant-multipart, servant-server + , text, time, tomland, uuid, wai, wai-cors, wai-extra, warp + , wikimusic-api-spec, wikimusic-model-hs + }: + mkDerivation { + pname = "wikimusic-ssr"; + version = "0.6.0.1"; + sha256 = "0jd319qmr4x74zwa13hzkxhqicmjidhgny02nymqyscg6an3cv94"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson async base base16-bytestring base64-bytestring blaze-html + bytestring containers directory filepath free-alacarte HTTP + http-client http-client-tls keuringsdienst keys mtl + neat-interpolation optics optparse-applicative relude servant + servant-auth-server servant-blaze servant-client servant-multipart + servant-server text time tomland uuid wai wai-cors wai-extra warp + wikimusic-api-spec wikimusic-model-hs + ]; + executableHaskellDepends = [ base relude ]; + license = lib.licenses.gpl3Only; + mainProgram = "wikimusic-ssr-exe"; + }) {}; + "wikipedia4epub" = callPackage ({ mkDerivation, base, bytestring, directory, epub, filepath , haskell98, HTTP, network, regex-base, regex-posix, tagsoup, url @@ -331740,6 +332649,8 @@ self: { pname = "witherable"; version = "0.5"; sha256 = "1lccj7s6b2x3w1zq15fffwxwj9yqq0z0ra9k06y3rcb5wk0lqhs8"; + revision = "1"; + editedCabalFile = "1pl1m14hhz03rx5j4i4zdi9v0ph65s5rs6qpqdprjdyaxf4bbfl5"; libraryHaskellDepends = [ base base-orphans containers hashable indexed-traversable indexed-traversable-instances transformers unordered-containers @@ -332002,8 +332913,8 @@ self: { pname = "wl-pprint-text"; version = "1.2.0.2"; sha256 = "0axivwh7bxmljxpfnccs66knxzrqck07byxmp2j737xbb26pf5cj"; - revision = "2"; - editedCabalFile = "1zp64js72l8kkqn47hkl6rcangz14njfrhgdhq0w5x4nhvfi77md"; + revision = "3"; + editedCabalFile = "1gc1vjzdhax9ybkjynsxkq4ah9ds14cy81wm1c4p9fnw2h356jhw"; libraryHaskellDepends = [ base base-compat text ]; description = "A Wadler/Leijen Pretty Printer for Text values"; license = lib.licenses.bsd3; @@ -333579,22 +334490,6 @@ self: { }) {}; "wuss" = callPackage - ({ mkDerivation, base, bytestring, crypton-connection, data-default - , exceptions, network, websockets - }: - mkDerivation { - pname = "wuss"; - version = "2.0.1.9"; - sha256 = "0v3jqyh21iq8d3vkij4gkzdq7ks8ykxi9lz2v4caskwvnj5bdvs9"; - libraryHaskellDepends = [ - base bytestring crypton-connection data-default exceptions network - websockets - ]; - description = "Secure WebSocket (WSS) clients"; - license = lib.licenses.mit; - }) {}; - - "wuss_2_0_2_0" = callPackage ({ mkDerivation, base, bytestring, crypton-connection, data-default , exceptions, network, websockets }: @@ -333608,7 +334503,6 @@ self: { ]; description = "Secure WebSocket (WSS) clients"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "wx" = callPackage @@ -336000,10 +336894,10 @@ self: { }: mkDerivation { pname = "xnobar"; - version = "0.0.0.0"; - sha256 = "0dai29w9m2hjq2wjymk82bh9xi9hqxrvgc2jiy0wra6dw3x68jhk"; - revision = "1"; - editedCabalFile = "1la624kbaq9lhjbh7hk1vwkbs983cz86sxksszavvp2gsmwdlai1"; + version = "0.0.0.1"; + sha256 = "15j9drn1igv5s1z7p5v71vy2i2a2f4gsaz5z6my1vkm097rbz51z"; + revision = "3"; + editedCabalFile = "122chc3px07ij5kk69bsbzrppkxxqd29cxma9zp48pjjakibwp3n"; libraryHaskellDepends = [ async base containers dbus directory extra flow mtl process transformers xmobar @@ -337338,8 +338232,8 @@ self: { }: mkDerivation { pname = "yampa-test"; - version = "0.14.9"; - sha256 = "19d53gl477ik0zb8fxq5irvjddgg7n2hjrg4j0x36pvsq3sy2zz9"; + version = "0.14.10"; + sha256 = "0as6k36cq8w1p8nqjlnlc8ji45slynxg4aj3p6ping177lw5232h"; libraryHaskellDepends = [ base normaldistribution QuickCheck Yampa ]; @@ -340953,8 +341847,9 @@ self: { }: mkDerivation { pname = "yosys-rtl"; - version = "0.1.0.0"; - sha256 = "0mi46c6v353zp8qyabpqpxyry0zimz338kkv8cp9aihk14w6cg01"; + version = "0.1.0.1"; + sha256 = "10kwg8j61ijvy6pdw9im4wcin3fn8xry0nl2cgqm50k22aziqj80"; + enableSeparateDataOutput = true; libraryHaskellDepends = [ base prettyprinter text ]; testHaskellDepends = [ base extra filepath prettyprinter process tasty tasty-golden From 291255600b608b470f6f6e2fd966bf5126b090ed Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Na=C3=AFm=20Favier?= Date: Tue, 20 Aug 2024 11:01:53 +0200 Subject: [PATCH 030/235] agdaPackages._1lab: unstable-2024-03-07 -> unstable-2024-08-05 Updates to a version compatible with Agda 2.7.0. --- pkgs/development/libraries/agda/1lab/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/agda/1lab/default.nix b/pkgs/development/libraries/agda/1lab/default.nix index 3e8f3f0de318..b9cea79b582a 100644 --- a/pkgs/development/libraries/agda/1lab/default.nix +++ b/pkgs/development/libraries/agda/1lab/default.nix @@ -2,13 +2,13 @@ mkDerivation rec { pname = "1lab"; - version = "unstable-2024-03-07"; + version = "unstable-2024-08-05"; src = fetchFromGitHub { - owner = "plt-amy"; + owner = "the1lab"; repo = pname; - rev = "d698f21793c4815082c94d174b9eafae912abb1a"; - hash = "sha256-v8avF9zNNz32kLuAacPdEVeUI9rjn6JCiWPzkXfzBS0="; + rev = "7cc9bf7bbe90be5491e0d64da90a36afa29a540b"; + hash = "sha256-hOyf6ZzejDAFDRj6liFZsBc9bKdxV5bzTPP4kGXIhW0="; }; postPatch = '' From 1816263f05c550874f22dae8ce996f1815f1abca Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Tue, 20 Aug 2024 12:17:58 +0200 Subject: [PATCH 031/235] haskellPackages.Cabal_3_{10_3,12_1}_0: use process 1.6.22.0 --- pkgs/development/haskell-modules/configuration-common.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 478838c72090..5346f639557d 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -27,14 +27,14 @@ self: super: { Cabal-syntax = self.Cabal-syntax_3_10_3_0; } // lib.optionalAttrs (lib.versionOlder self.ghc.version "9.2.5") { # Use process core package when possible - process = self.process_1_6_20_0; + process = self.process_1_6_22_0; })); Cabal_3_12_1_0 = doDistribute (super.Cabal_3_12_1_0.override ({ Cabal-syntax = self.Cabal-syntax_3_12_1_0; } // lib.optionalAttrs (lib.versionOlder self.ghc.version "9.2.5") { # Use process core package when possible - process = self.process_1_6_20_0; + process = self.process_1_6_22_0; })); # hackage-security == 0.6.2.6 has a wider support range in theory, but it only From 9aacff10553b648240b25c203875cdd7e6c7cfe3 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Tue, 20 Aug 2024 12:18:35 +0200 Subject: [PATCH 032/235] haskellPackages.feedback: use safe-coloured-text-layout 0.2.0.1 --- pkgs/development/haskell-modules/configuration-common.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 5346f639557d..4c613cbf222f 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -3086,7 +3086,7 @@ self: super: { # 2024-08-09: The stackage versions of safe-coloured-text* are old and broken safe-coloured-text = unmarkBroken self.safe-coloured-text_0_3_0_2; safe-coloured-text-gen = unmarkBroken self.safe-coloured-text-gen_0_0_0_3; - safe-coloured-text-layout = unmarkBroken self.safe-coloured-text-layout_0_2_0_0; + safe-coloured-text-layout = unmarkBroken self.safe-coloured-text-layout_0_2_0_1; safe-coloured-text-layout-gen = unmarkBroken self.safe-coloured-text-layout-gen_0_0_0_1; safe-coloured-text-terminfo = unmarkBroken self.safe-coloured-text-terminfo_0_3_0_0; }))); From 88d7f8a482c45cec110f6310337f5e35a083d1de Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 20 Aug 2024 10:28:39 +0000 Subject: [PATCH 033/235] gallia: 1.8.0 -> 1.9.0 --- pkgs/tools/security/gallia/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/gallia/default.nix b/pkgs/tools/security/gallia/default.nix index d9dfc13c07de..1788e2784cc6 100644 --- a/pkgs/tools/security/gallia/default.nix +++ b/pkgs/tools/security/gallia/default.nix @@ -7,14 +7,14 @@ python3.pkgs.buildPythonApplication rec { pname = "gallia"; - version = "1.8.0"; + version = "1.9.0"; pyproject = true; src = fetchFromGitHub { owner = "Fraunhofer-AISEC"; repo = "gallia"; rev = "refs/tags/v${version}"; - hash = "sha256-x1sTvb+Z/AttYJVBEfXMx2/Ps34ZbqdLeGN8qHkFXsQ="; + hash = "sha256-izMTTZrp4aizq5jS51BNtq3lv9Kr+xI7scZfYKXA/oY="; }; pythonRelaxDeps = [ "aiofiles" ]; From 7ce990f1d22cbe89f71155026e26f758b3f18499 Mon Sep 17 00:00:00 2001 From: Emily Date: Tue, 20 Aug 2024 17:50:05 +0100 Subject: [PATCH 034/235] haskellPackages.ffmpeg-light: remove override This package has been marked as broken for a year. If anyone wants to fix it, there is a pull request updating it to the current FFmpeg API: . --- pkgs/development/haskell-modules/configuration-common.nix | 4 ---- 1 file changed, 4 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 478838c72090..fe50f572b38c 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -2865,10 +2865,6 @@ self: super: { editedCabalFile = null; }) super.true-name); - # ffmpeg-light works against the ffmpeg-4 API, but the default ffmpeg in nixpkgs is ffmpeg-5. - # https://github.com/NixOS/nixpkgs/pull/220972#issuecomment-1484017192 - ffmpeg-light = super.ffmpeg-light.override { ffmpeg = pkgs.ffmpeg_4; }; - # 2024-08-15: primitive >=0.9 && <0.10 posix-api = doJailbreak super.posix-api; From 0aa968f1b699bcd5e92651f90743b79238987ee3 Mon Sep 17 00:00:00 2001 From: Alexandre Esteves Date: Wed, 21 Aug 2024 01:10:59 +0100 Subject: [PATCH 035/235] haskellPackages.entropy: build with js backend --- pkgs/development/haskell-modules/configuration-ghcjs-9.x.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-ghcjs-9.x.nix b/pkgs/development/haskell-modules/configuration-ghcjs-9.x.nix index 77ce56a9124c..044a3a8f69d8 100644 --- a/pkgs/development/haskell-modules/configuration-ghcjs-9.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghcjs-9.x.nix @@ -27,6 +27,8 @@ in jsaddle = addBuildDepend self.ghcjs-base super.jsaddle; jsaddle-dom = addBuildDepend self.ghcjs-base super.jsaddle-dom; + entropy = addBuildDepend self.ghcjs-dom super.entropy; + reflex-dom = super.reflex-dom.override (drv: { jsaddle-webkit2gtk = null; }); From bf1bd6d4e737a07e89911ba6d52e168cb0f279cd Mon Sep 17 00:00:00 2001 From: Ingo Blechschmidt Date: Wed, 21 Aug 2024 18:06:44 +0200 Subject: [PATCH 036/235] agdaPackages.standard-library: 2.1 -> 2.1.1-rc2 --- pkgs/development/libraries/agda/agda-prelude/default.nix | 1 + pkgs/development/libraries/agda/standard-library/default.nix | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/agda/agda-prelude/default.nix b/pkgs/development/libraries/agda/agda-prelude/default.nix index fcc100e7a7bb..f2959f203a6f 100644 --- a/pkgs/development/libraries/agda/agda-prelude/default.nix +++ b/pkgs/development/libraries/agda/agda-prelude/default.nix @@ -24,5 +24,6 @@ mkDerivation rec { license = lib.licenses.mit; platforms = lib.platforms.unix; maintainers = with maintainers; [ mudri alexarice turion ]; + broken = true; # currently not compatible with Agda 2.7.0 }; } diff --git a/pkgs/development/libraries/agda/standard-library/default.nix b/pkgs/development/libraries/agda/standard-library/default.nix index cbf3100347ef..2b0a2c63aca5 100644 --- a/pkgs/development/libraries/agda/standard-library/default.nix +++ b/pkgs/development/libraries/agda/standard-library/default.nix @@ -2,13 +2,13 @@ mkDerivation rec { pname = "standard-library"; - version = "2.1"; + version = "2.1.1-rc2"; src = fetchFromGitHub { repo = "agda-stdlib"; owner = "agda"; rev = "v${version}"; - hash = "sha256-tv/Fj8ZJgSvieNLlXBjyIR7MSmDp0e2QbN1d/0xBpFg="; + hash = "sha256-F/LwPRzorkIoGsObB9m/hNpRBIJFy/GuaEotq0CQMH4="; }; nativeBuildInputs = [ (ghcWithPackages (self : [ self.filemanip ])) ]; From e9d0064b02c2d03b95ad73c1387f3d2a2c2ba1b1 Mon Sep 17 00:00:00 2001 From: atagen Date: Thu, 22 Aug 2024 09:55:50 +1000 Subject: [PATCH 037/235] murex: make package a shellPackage --- pkgs/shells/murex/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/shells/murex/default.nix b/pkgs/shells/murex/default.nix index 66d24292ce8a..871b07bc6e03 100644 --- a/pkgs/shells/murex/default.nix +++ b/pkgs/shells/murex/default.nix @@ -25,4 +25,8 @@ buildGoModule rec { license = licenses.gpl2Only; maintainers = with maintainers; [ dit7ya kashw2 ]; }; + + passthru = { + shellPath = "/bin/murex"; + }; } From 606a1663e55845c8c5d95d18644c15bd904a26b2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Na=C3=AFm=20Favier?= Date: Thu, 22 Aug 2024 10:55:32 +0200 Subject: [PATCH 038/235] agdaPackages.agda-prelude: unstable-2023-10-04 -> unstable-2024-08-22 --- pkgs/development/libraries/agda/agda-prelude/default.nix | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/agda/agda-prelude/default.nix b/pkgs/development/libraries/agda/agda-prelude/default.nix index f2959f203a6f..661ffd71f839 100644 --- a/pkgs/development/libraries/agda/agda-prelude/default.nix +++ b/pkgs/development/libraries/agda/agda-prelude/default.nix @@ -1,14 +1,14 @@ { lib, mkDerivation, fetchFromGitHub }: mkDerivation rec { - version = "unstable-2023-10-04"; + version = "unstable-2024-08-22"; pname = "agda-prelude"; src = fetchFromGitHub { owner = "UlfNorell"; repo = "agda-prelude"; - rev = "ff3b13253612caf0784a06e2d7d0f30be16c32e4"; - hash = "sha256-A05uDv3fJqKncea9AL6eQa0XAskLZwAIUl1OAOVeP8I="; + rev = "4230566d3ae229b6a00258587651ac7bfd38d088"; + hash = "sha256-ab+KojzRbkUTAFNH5OA78s0F5SUuXTbliai6badveg4="; }; preConfigure = '' @@ -24,6 +24,5 @@ mkDerivation rec { license = lib.licenses.mit; platforms = lib.platforms.unix; maintainers = with maintainers; [ mudri alexarice turion ]; - broken = true; # currently not compatible with Agda 2.7.0 }; } From 79872e05394ca417d45ab1cd75eed4e2e09101d9 Mon Sep 17 00:00:00 2001 From: Emily Date: Tue, 20 Aug 2024 17:50:05 +0100 Subject: [PATCH 039/235] haskellPackages.opencv{,-extra}: remove overrides These packages have been broken since before the 24.05 release. There is a pull request open to update them to a newer OpenCV and get them working again: . --- .../haskell-modules/configuration-common.nix | 4 ---- .../development/haskell-modules/configuration-nix.nix | 3 --- .../haskell-modules/patches/opencv-fix-116.patch | 11 ----------- 3 files changed, 18 deletions(-) delete mode 100644 pkgs/development/haskell-modules/patches/opencv-fix-116.patch diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index fe50f572b38c..1419ab9f5ed6 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -605,10 +605,6 @@ self: super: { focuslist = dontCheck super.focuslist; search = dontCheck super.search; - # see https://github.com/LumiGuide/haskell-opencv/commit/cd613e200aa20887ded83256cf67d6903c207a60 - opencv = dontCheck (appendPatch ./patches/opencv-fix-116.patch super.opencv); - opencv-extra = dontCheck (appendPatch ./patches/opencv-fix-116.patch super.opencv-extra); - # https://github.com/ekmett/structures/issues/3 structures = dontCheck super.structures; diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index 922bf1d601b6..eeacccc79342 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -683,9 +683,6 @@ self: super: builtins.intersectAttrs super { liquid-fixpoint = disableSharedExecutables super.liquid-fixpoint; liquidhaskell = dontCheck (disableSharedExecutables super.liquidhaskell); - # Without this override, the builds lacks pkg-config. - opencv-extra = addPkgconfigDepend pkgs.opencv3 super.opencv-extra; - # Break cyclic reference that results in an infinite recursion. partial-semigroup = dontCheck super.partial-semigroup; colour = dontCheck super.colour; diff --git a/pkgs/development/haskell-modules/patches/opencv-fix-116.patch b/pkgs/development/haskell-modules/patches/opencv-fix-116.patch deleted file mode 100644 index bf89d8daf9fc..000000000000 --- a/pkgs/development/haskell-modules/patches/opencv-fix-116.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -ur opencv-0.0.2.1.bak/Setup.hs opencv-0.0.2.1/Setup.hs ---- opencv-0.0.2.1.bak/Setup.hs 2018-11-10 17:18:41.355731189 +0100 -+++ opencv-0.0.2.1/Setup.hs 2018-11-10 17:18:56.901681162 +0100 -@@ -3,6 +3,6 @@ - - main = do - args <- getArgs -- let args' | "configure" `elem` args = args ++ ["--with-gcc","c++", "--with-ld","c++"] -+ let args' | "configure" `elem` args = args ++ ["--with-gcc","c++"] - | otherwise = args - defaultMainArgs args' From 3971d8f97c98d697868cf6525c339e7ec6ca2bcd Mon Sep 17 00:00:00 2001 From: Samir Talwar Date: Thu, 22 Aug 2024 23:35:53 +0200 Subject: [PATCH 040/235] haskell.ghc910: overrides for cabal-install and haskell-language-server. --- .../configuration-ghc-9.10.x.nix | 69 ++++++++++++++++++- .../configuration-hackage2nix/main.yaml | 1 + .../haskell-modules/hackage-packages.nix | 21 ++++++ 3 files changed, 89 insertions(+), 2 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-ghc-9.10.x.nix b/pkgs/development/haskell-modules/configuration-ghc-9.10.x.nix index 98a8cb4d49b8..612bd27798b2 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-9.10.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-9.10.x.nix @@ -1,5 +1,7 @@ { pkgs, haskellLib }: +with haskellLib; + let inherit (pkgs) lib; @@ -14,7 +16,7 @@ self: super: { base = null; binary = null; bytestring = null; - Cabal = null; + Cabal = doDistribute self.Cabal_3_12_1_0; # GHC ships with Cabal 3.12.0.0, but there is no corresponding cabal-install Cabal-syntax = null; containers = null; deepseq = null; @@ -46,7 +48,7 @@ self: super: { system-cxx-std-lib = null; template-haskell = null; # GHC only builds terminfo if it is a native compiler - terminfo = if pkgs.stdenv.hostPlatform == pkgs.stdenv.buildPlatform then null else haskellLib.doDistribute self.terminfo_0_4_1_6; + terminfo = if pkgs.stdenv.hostPlatform == pkgs.stdenv.buildPlatform then null else doDistribute self.terminfo_0_4_1_6; text = null; time = null; transformers = null; @@ -55,4 +57,67 @@ self: super: { # https://gitlab.haskell.org/ghc/ghc/-/issues/23392 gi-gtk = disableParallelBuilding super.gi-gtk; + + # + # Version upgrades + # + + # Upgrade to accommodate new core library versions, where the authors have + # already made the relevant changes. + aeson = doDistribute self.aeson_2_2_3_0; + apply-refact = doDistribute self.apply-refact_0_14_0_0; + attoparsec-aeson = doDistribute self.attoparsec-aeson_2_2_2_0; + extensions = doDistribute self.extensions_0_1_0_2; + hashable = doDistribute self.hashable_1_4_7_0; + integer-conversion = doDistribute self.integer-conversion_0_1_1; + ghc-lib-parser = doDistribute self.ghc-lib-parser_9_10_1_20240511; + lens = doDistribute self.lens_5_3_2; + lukko = doDistribute self.lukko_0_1_2; + primitive = doDistribute (dontCheck self.primitive_0_9_0_0); # tests introduce a recursive dependency via hspec + quickcheck-instances = doDistribute self.quickcheck-instances_0_3_31; + rebase = doDistribute self.rebase_1_21_1; + rerebase = doDistribute self.rerebase_1_21_1; + scientific = doDistribute self.scientific_0_3_8_0; + semirings = doDistribute self.semirings_0_7; + th-abstraction = doDistribute self.th-abstraction_0_7_0_0; + uuid-types = doDistribute self.uuid-types_1_0_6; + + # A given major version of ghc-exactprint only supports one version of GHC. + ghc-exactprint = doDistribute self.ghc-exactprint_1_10_0_0; + ghc-exactprint_1_10_0_0 = addBuildDepends [ + self.Diff + self.extra + self.ghc-paths + self.silently + self.syb + self.HUnit + ] super.ghc-exactprint_1_10_0_0; + + # + # Jailbreaks + # + base64 = doJailbreak super.base64; # base <4.20 + commutative-semigroups = doJailbreak super.commutative-semigroups; # base <4.20 + floskell = doJailbreak super.floskell; # base <4.20 + lucid = doJailbreak super.lucid; # base <4.20 + tar = doJailbreak super.tar; # base <4.20 + tree-diff = doJailbreak super.tree-diff; # base <4.20 + time-compat = doJailbreak super.time-compat; # base <4.20 + + bitvec = doJailbreak super.bitvec; # primitive <0.9 + + apply-refact_0_14_0_0 = doJailbreak super.apply-refact_0_14_0_0; # ghc-exactprint <1.9 + retrie = doJailbreak super.retrie; # base <4.20, ghc<9.9, ghc-exactprint<1.9 + + hashable_1_4_7_0 = doJailbreak super.hashable_1_4_7_0; # relax bounds for QuickCheck, tasty, and tasty-quickcheck + hashable_1_5_0_0 = doJailbreak super.hashable_1_5_0_0; # relax bounds for QuickCheck, tasty, and tasty-quickcheck + + # + # Test suite issues + # + call-stack = dontCheck super.call-stack; # expects the package to be named "main", but we generate a name + lifted-base = dontCheck super.lifted-base; # doesn't compile with transformers ==0.6.* + lukko_0_1_2 = dontCheck super.lukko_0_1_2; # doesn't compile with tasty ==1.4.* + resolv = dontCheck super.resolv; # doesn't compile with filepath ==1.5.* + primitive-unlifted = dontCheck super.primitive-unlifted; # doesn't compile with primitive ==0.9.* } diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml index a51a50abe0bd..02b7ad3de004 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml @@ -76,6 +76,7 @@ extra-packages: - haddock-api == 2.23.* # required on GHC < 8.10.x - haddock-library ==1.7.* # required by stylish-cabal-0.5.0.0 - happy == 1.19.12 # for ghcjs + - hashable == 1.4.7.0 # allows GHC 9.10 - hinotify == 0.3.9 # for xmonad-0.26: https://github.com/kolmodin/hinotify/issues/29 - ansi-wl-pprint >= 0.6 && < 0.7 # 2024-03-23: required for ghcjs - hlint == 3.2.8 # 2022-09-21: needed for hls on ghc 8.8 diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 44ca3cf8bbac..2688772a0570 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -139269,6 +139269,27 @@ self: { license = lib.licenses.bsd3; }) {}; + "hashable_1_4_7_0" = callPackage + ({ mkDerivation, base, bytestring, containers, deepseq, filepath + , ghc-bignum, ghc-prim, HUnit, os-string, primitive, QuickCheck + , random, tasty, tasty-hunit, tasty-quickcheck, text, unix + }: + mkDerivation { + pname = "hashable"; + version = "1.4.7.0"; + sha256 = "1np8y26pbwhfg136shp8w52yc7a7q35j9icf2h6q623s0b4y9biv"; + libraryHaskellDepends = [ + base bytestring containers deepseq filepath ghc-bignum ghc-prim + os-string text + ]; + testHaskellDepends = [ + base bytestring filepath ghc-prim HUnit os-string primitive + QuickCheck random tasty tasty-hunit tasty-quickcheck text unix + ]; + description = "A class for types that can be converted to a hash value"; + license = lib.licenses.bsd3; + }) {}; + "hashable_1_5_0_0" = callPackage ({ mkDerivation, base, bytestring, containers, deepseq, filepath , ghc-bignum, ghc-prim, HUnit, os-string, primitive, QuickCheck From 3c9d0c6cbfb811d9bc868b7ee36b61f2377a1a08 Mon Sep 17 00:00:00 2001 From: Aaron Jheng Date: Fri, 23 Aug 2024 03:26:54 +0000 Subject: [PATCH 041/235] containerlab: 0.56.0 -> 0.57.0 --- pkgs/by-name/co/containerlab/package.nix | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/pkgs/by-name/co/containerlab/package.nix b/pkgs/by-name/co/containerlab/package.nix index b0b639c8d718..e2a6ed418df5 100644 --- a/pkgs/by-name/co/containerlab/package.nix +++ b/pkgs/by-name/co/containerlab/package.nix @@ -6,27 +6,32 @@ buildGoModule rec { pname = "containerlab"; - version = "0.56.0"; + version = "0.57.0"; src = fetchFromGitHub { owner = "srl-labs"; repo = "containerlab"; rev = "v${version}"; - hash = "sha256-7jQvfEplGIwTtIAOBc6R5OfcxPQuEbBnzBoAI9mE+7E="; + hash = "sha256-dqREbTDRhSEQg8swZ5ljhAtu3Yv421/QNmpkWopPWbk="; }; nativeBuildInputs = [ installShellFiles ]; - vendorHash = "sha256-SPxpi9jG3Xtit9JOAv0xWd89qWJZXeIjMwoNTkVeDgk="; + vendorHash = "sha256-3ESz1wnbm6KfXSO5Fw4c7uUxL3K8Lsib5KAYoRD6vrw="; ldflags = [ "-s" "-w" - "-X" "github.com/srl-labs/containerlab/cmd.version=${version}" - "-X" "github.com/srl-labs/containerlab/cmd.commit=${src.rev}" - "-X" "github.com/srl-labs/containerlab/cmd.date=1970-01-01T00:00:00Z" + "-X github.com/srl-labs/containerlab/cmd.version=${version}" + "-X github.com/srl-labs/containerlab/cmd.commit=${src.rev}" + "-X github.com/srl-labs/containerlab/cmd.date=1970-01-01T00:00:00Z" ]; + preCheck = '' + # Fix failed TestLabelsInit test + export USER="runner" + ''; + postInstall = '' local INSTALL="$out/bin/containerlab" installShellCompletion --cmd containerlab \ From 5c4430d9afb8f4a98a91fcafd4e7b90421e813fa Mon Sep 17 00:00:00 2001 From: Samir Talwar Date: Fri, 23 Aug 2024 09:57:43 +0200 Subject: [PATCH 042/235] Override Cabal for cabal-install < 9.10.2. --- pkgs/development/haskell-modules/configuration-common.nix | 2 +- pkgs/development/haskell-modules/configuration-ghc-9.10.x.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 9e31affad333..a9865d70debe 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -52,7 +52,7 @@ self: super: { cabalInstallOverlay = cself: csuper: { hackage-security = self.hackage-security_0_6_2_6; - } // lib.optionalAttrs (lib.versionOlder self.ghc.version "9.10") { + } // lib.optionalAttrs (lib.versionOlder self.ghc.version "9.10.2") { Cabal = cself.Cabal_3_12_1_0; Cabal-syntax = cself.Cabal-syntax_3_12_1_0; }; diff --git a/pkgs/development/haskell-modules/configuration-ghc-9.10.x.nix b/pkgs/development/haskell-modules/configuration-ghc-9.10.x.nix index 612bd27798b2..a41e2cebc2bf 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-9.10.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-9.10.x.nix @@ -16,7 +16,7 @@ self: super: { base = null; binary = null; bytestring = null; - Cabal = doDistribute self.Cabal_3_12_1_0; # GHC ships with Cabal 3.12.0.0, but there is no corresponding cabal-install + Cabal = null; Cabal-syntax = null; containers = null; deepseq = null; From 5b910ae5391ddd23cf2897871963d1d31f24cc89 Mon Sep 17 00:00:00 2001 From: Matteo Pacini Date: Fri, 23 Aug 2024 17:06:33 +0100 Subject: [PATCH 043/235] smatch: clang build fix --- pkgs/development/tools/analysis/smatch/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/tools/analysis/smatch/default.nix b/pkgs/development/tools/analysis/smatch/default.nix index b55e8c5bcfa4..ef5b3ab2d1d5 100644 --- a/pkgs/development/tools/analysis/smatch/default.nix +++ b/pkgs/development/tools/analysis/smatch/default.nix @@ -21,6 +21,10 @@ stdenv.mkDerivation rec { sha256 = "sha256-Pv3bd2cjnQKnhH7TrkYWfDEeaq6u/q/iK1ZErzn6bME="; }; + NIX_CFLAGS_COMPILE = lib.optionals stdenv.cc.isClang [ + "-Wno-incompatible-function-pointer-types" + ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ sqlite openssl ] From 05440aa73b5add33e2871a63269d42fe2a43b09d Mon Sep 17 00:00:00 2001 From: Anders Kaseorg Date: Fri, 23 Aug 2024 17:15:22 -0700 Subject: [PATCH 044/235] =?UTF-8?q?zulip:=205.11.0=20=E2=86=92=205.11.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Anders Kaseorg --- .../networking/instant-messengers/zulip/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/zulip/default.nix b/pkgs/applications/networking/instant-messengers/zulip/default.nix index f7bb1ea099ca..850883cbe289 100644 --- a/pkgs/applications/networking/instant-messengers/zulip/default.nix +++ b/pkgs/applications/networking/instant-messengers/zulip/default.nix @@ -5,11 +5,11 @@ let pname = "zulip"; - version = "5.11.0"; + version = "5.11.1"; src = fetchurl { url = "https://github.com/zulip/zulip-desktop/releases/download/v${version}/Zulip-${version}-x86_64.AppImage"; - hash = "sha256-snxeMgcLFMYDEsog7Xqeybw8GkU4kPqHMds1174bPd0="; + hash = "sha256-t5qBm5+kTdeRMvcHpNbS5mp184UG/IqgJrtj7Ntcbb0="; name="${pname}-${version}.AppImage"; }; @@ -27,7 +27,7 @@ in appimageTools.wrapType2 { install -m 444 -D ${appimageContents}/usr/share/icons/hicolor/512x512/apps/zulip.png \ $out/share/icons/hicolor/512x512/apps/zulip.png substituteInPlace $out/share/applications/zulip.desktop \ - --replace 'Exec=AppRun' 'Exec=${pname}' + --replace-fail 'Exec=AppRun' 'Exec=${pname}' ''; meta = with lib; { From af1a940b2734d3ee638ca262c7d818560709f5d6 Mon Sep 17 00:00:00 2001 From: Bruno Bigras Date: Wed, 7 Aug 2024 15:29:07 -0400 Subject: [PATCH 045/235] k8s-manifest-sigstore: init at 0.5.4 --- .../k8/k8s-manifest-sigstore/package.nix | 66 +++++++++++++++++++ 1 file changed, 66 insertions(+) create mode 100644 pkgs/by-name/k8/k8s-manifest-sigstore/package.nix diff --git a/pkgs/by-name/k8/k8s-manifest-sigstore/package.nix b/pkgs/by-name/k8/k8s-manifest-sigstore/package.nix new file mode 100644 index 000000000000..17c12ad9e415 --- /dev/null +++ b/pkgs/by-name/k8/k8s-manifest-sigstore/package.nix @@ -0,0 +1,66 @@ +{ + lib, + buildGoModule, + fetchFromGitHub, + installShellFiles, + testers, + k8s-manifest-sigstore, + gitUpdater, +}: + +buildGoModule rec { + pname = "k8s-manifest-sigstore"; + version = "0.5.4"; + + src = fetchFromGitHub { + owner = "sigstore"; + repo = pname; + rev = "v${version}"; + hash = "sha256-BDBkPXDg9DruIt5f7RrpStFeuTGiOOpsb6JiKaCTOOk="; + }; + + nativeBuildInputs = [ installShellFiles ]; + + vendorHash = "sha256-dIReCe+Qoq/chBrd/X5s4hucuDquvd7OTUSj0WpcIDE="; + + subPackages = [ "cmd/kubectl-sigstore" ]; + + ldflags = + let + prefix = "github.com/sigstore/k8s-manifest-sigstore/pkg/util"; + in + [ + "-s" + "-w" + # https://github.com/sigstore/k8s-manifest-sigstore/blob/e740581a4652dd44eb65495ed071fd0258dcbeb4/Makefile#L22 + "-X ${prefix}.buildDate=1970-01-01T00:00:00Z" + "-X ${prefix}.gitCommit=v${version}" + "-X ${prefix}.gitTreeState=clean" + "-X ${prefix}.GitVersion=v${version}" + ]; + + postInstall = '' + installShellCompletion --cmd kubectl-sigstore \ + --bash <($out/bin/kubectl-sigstore completion bash) \ + --fish <($out/bin/kubectl-sigstore completion fish) \ + --zsh <($out/bin/kubectl-sigstore completion zsh) + ''; + + passthru = { + updateScript = gitUpdater { rev-prefix = "v"; }; + tests.version = testers.testVersion { + package = k8s-manifest-sigstore; + command = "kubectl-sigstore version"; + version = "v${version}"; + }; + }; + + meta = with lib; { + homepage = "https://github.com/sigstore/k8s-manifest-sigstore"; + changelog = "https://github.com/sigstore/k8s-manifest-sigstore/releases/tag/v${version}"; + description = "Kubectl plugin for signing Kubernetes manifest YAML files with sigstore"; + mainProgram = "kubectl-sigstore"; + license = licenses.asl20; + maintainers = with maintainers; [ bbigras ]; + }; +} From 46da6473780f2b3914a5ad258be2595dd3451ef9 Mon Sep 17 00:00:00 2001 From: Konstantin Alekseev Date: Sat, 1 Jun 2024 17:13:03 +0300 Subject: [PATCH 046/235] playwright: apply nixfmt --- pkgs/development/web/playwright/driver.nix | 199 +++++++++++---------- 1 file changed, 106 insertions(+), 93 deletions(-) diff --git a/pkgs/development/web/playwright/driver.nix b/pkgs/development/web/playwright/driver.nix index a4fe8272be4c..abf2f43c0948 100644 --- a/pkgs/development/web/playwright/driver.nix +++ b/pkgs/development/web/playwright/driver.nix @@ -1,85 +1,94 @@ -{ lib -, stdenv -, chromium -, ffmpeg -, git -, jq -, nodejs -, fetchurl -, makeFontsConf -, makeWrapper -, runCommand -, unzip -, cacert +{ + lib, + stdenv, + chromium, + ffmpeg, + git, + jq, + nodejs, + fetchurl, + makeFontsConf, + makeWrapper, + runCommand, + unzip, + cacert, }: let inherit (stdenv.hostPlatform) system; throwSystem = throw "Unsupported system: ${system}"; - driver = stdenv.mkDerivation (finalAttrs: + driver = stdenv.mkDerivation ( + finalAttrs: let - suffix = { - x86_64-linux = "linux"; - aarch64-linux = "linux-arm64"; - x86_64-darwin = "mac"; - aarch64-darwin = "mac-arm64"; - }.${system} or throwSystem; + suffix = + { + x86_64-linux = "linux"; + aarch64-linux = "linux-arm64"; + x86_64-darwin = "mac"; + aarch64-darwin = "mac-arm64"; + } + .${system} or throwSystem; filename = "playwright-${finalAttrs.version}-${suffix}.zip"; in { - pname = "playwright-driver"; - # run ./pkgs/development/python-modules/playwright/update.sh to update - version = "1.40.0"; + pname = "playwright-driver"; + # run ./pkgs/development/python-modules/playwright/update.sh to update + version = "1.40.0"; - src = fetchurl { - url = "https://playwright.azureedge.net/builds/driver/${filename}"; - sha256 = { - x86_64-linux = "0y9n23r4yfcgm4a50rfgicl91vrllak0d8h26yagh6h8hl0r3nhh"; - aarch64-linux = "0zd456klidi4sg7wahfrdbs2bwiq3q6ngxd4iv3vi9f9w9nq2p2k"; - x86_64-darwin = "0yaiwg9821w9nszzkrp5skzf5792nahvfqnr4axk84dcngslxvmk"; - aarch64-darwin = "1b1jmv6l97ss8c4sc3n1xckn05fpq3fihjbjxr2qz6i9dsy3xj57"; - }.${system} or throwSystem; - }; + src = fetchurl { + url = "https://playwright.azureedge.net/builds/driver/${filename}"; + sha256 = + { + x86_64-linux = "0y9n23r4yfcgm4a50rfgicl91vrllak0d8h26yagh6h8hl0r3nhh"; + aarch64-linux = "0zd456klidi4sg7wahfrdbs2bwiq3q6ngxd4iv3vi9f9w9nq2p2k"; + x86_64-darwin = "0yaiwg9821w9nszzkrp5skzf5792nahvfqnr4axk84dcngslxvmk"; + aarch64-darwin = "1b1jmv6l97ss8c4sc3n1xckn05fpq3fihjbjxr2qz6i9dsy3xj57"; + } + .${system} or throwSystem; + }; - sourceRoot = "."; + sourceRoot = "."; - nativeBuildInputs = [ unzip ]; + nativeBuildInputs = [ unzip ]; - postPatch = '' - # Use Nix's NodeJS instead of the bundled one. - substituteInPlace playwright.sh --replace '"$SCRIPT_PATH/node"' '"${nodejs}/bin/node"' - rm node + postPatch = '' + # Use Nix's NodeJS instead of the bundled one. + substituteInPlace playwright.sh --replace '"$SCRIPT_PATH/node"' '"${nodejs}/bin/node"' + rm node - # Hard-code the script path to $out directory to avoid a dependency on coreutils - substituteInPlace playwright.sh \ - --replace 'SCRIPT_PATH="$(cd "$(dirname "$0")" ; pwd -P)"' "SCRIPT_PATH=$out" + # Hard-code the script path to $out directory to avoid a dependency on coreutils + substituteInPlace playwright.sh \ + --replace 'SCRIPT_PATH="$(cd "$(dirname "$0")" ; pwd -P)"' "SCRIPT_PATH=$out" - patchShebangs playwright.sh package/bin/*.sh - ''; + patchShebangs playwright.sh package/bin/*.sh + ''; - installPhase = '' - runHook preInstall + installPhase = '' + runHook preInstall - mkdir -p $out/bin - mv playwright.sh $out/bin/playwright - mv package $out/ + mkdir -p $out/bin + mv playwright.sh $out/bin/playwright + mv package $out/ - runHook postInstall - ''; + runHook postInstall + ''; - passthru = { - inherit filename; - browsers = { - x86_64-linux = browsers-linux { }; - aarch64-linux = browsers-linux { }; - x86_64-darwin = browsers-mac; - aarch64-darwin = browsers-mac; - }.${system} or throwSystem; - browsers-chromium = browsers-linux {}; - }; - meta.mainProgram = "playwright"; - }); + passthru = { + inherit filename; + browsers = + { + x86_64-linux = browsers-linux { }; + aarch64-linux = browsers-linux { }; + x86_64-darwin = browsers-mac; + aarch64-darwin = browsers-mac; + } + .${system} or throwSystem; + browsers-chromium = browsers-linux { }; + }; + meta.mainProgram = "playwright"; + } + ); browsers-mac = stdenv.mkDerivation { pname = "playwright-browsers"; @@ -87,9 +96,7 @@ let dontUnpack = true; - nativeBuildInputs = [ - cacert - ]; + nativeBuildInputs = [ cacert ]; installPhase = '' runHook preInstall @@ -104,33 +111,39 @@ let meta.platforms = lib.platforms.darwin; }; - browsers-linux = { withChromium ? true }: let - fontconfig = makeFontsConf { - fontDirectories = []; - }; - in - runCommand ("playwright-browsers" - + lib.optionalString withChromium "-chromium") - { - nativeBuildInputs = [ - makeWrapper - jq - ]; - } ('' - BROWSERS_JSON=${driver}/package/browsers.json - '' + lib.optionalString withChromium '' - CHROMIUM_REVISION=$(jq -r '.browsers[] | select(.name == "chromium").revision' $BROWSERS_JSON) - mkdir -p $out/chromium-$CHROMIUM_REVISION/chrome-linux + browsers-linux = + { + withChromium ? true, + }: + let + fontconfig = makeFontsConf { fontDirectories = [ ]; }; + in + runCommand ("playwright-browsers" + lib.optionalString withChromium "-chromium") + { + nativeBuildInputs = [ + makeWrapper + jq + ]; + } + ( + '' + BROWSERS_JSON=${driver}/package/browsers.json + '' + + lib.optionalString withChromium '' + CHROMIUM_REVISION=$(jq -r '.browsers[] | select(.name == "chromium").revision' $BROWSERS_JSON) + mkdir -p $out/chromium-$CHROMIUM_REVISION/chrome-linux - # See here for the Chrome options: - # https://github.com/NixOS/nixpkgs/issues/136207#issuecomment-908637738 - makeWrapper ${chromium}/bin/chromium $out/chromium-$CHROMIUM_REVISION/chrome-linux/chrome \ - --set SSL_CERT_FILE /etc/ssl/certs/ca-bundle.crt \ - --set FONTCONFIG_FILE ${fontconfig} - '' + '' - FFMPEG_REVISION=$(jq -r '.browsers[] | select(.name == "ffmpeg").revision' $BROWSERS_JSON) - mkdir -p $out/ffmpeg-$FFMPEG_REVISION - ln -s ${ffmpeg}/bin/ffmpeg $out/ffmpeg-$FFMPEG_REVISION/ffmpeg-linux - ''); + # See here for the Chrome options: + # https://github.com/NixOS/nixpkgs/issues/136207#issuecomment-908637738 + makeWrapper ${chromium}/bin/chromium $out/chromium-$CHROMIUM_REVISION/chrome-linux/chrome \ + --set SSL_CERT_FILE /etc/ssl/certs/ca-bundle.crt \ + --set FONTCONFIG_FILE ${fontconfig} + '' + + '' + FFMPEG_REVISION=$(jq -r '.browsers[] | select(.name == "ffmpeg").revision' $BROWSERS_JSON) + mkdir -p $out/ffmpeg-$FFMPEG_REVISION + ln -s ${ffmpeg}/bin/ffmpeg $out/ffmpeg-$FFMPEG_REVISION/ffmpeg-linux + '' + ); in - driver +driver From 4519015fd06f5c2dda1a7bfe0b632fc8f5a9656b Mon Sep 17 00:00:00 2001 From: Konstantin Alekseev Date: Mon, 29 Apr 2024 16:08:07 +0300 Subject: [PATCH 047/235] playwright: build from source playwright-driver: 1.40.0 -> 1.46.0 python3Packages.playwright: 1.44.0 -> 1.46.0 --- .../python-modules/playwright/default.nix | 8 +- .../playwright/driver-location.patch | 19 +- .../python-modules/playwright/update.sh | 57 +- .../web/playwright-test/default.nix | 17 - .../web/playwright-test/node-env.nix | 689 ------------------ .../web/playwright-test/node-packages.json | 3 - .../web/playwright-test/node-packages.nix | 50 -- .../web/playwright-test/wrapped.nix | 29 - pkgs/development/web/playwright/driver.nix | 236 ++++-- pkgs/top-level/all-packages.nix | 4 +- 10 files changed, 222 insertions(+), 890 deletions(-) delete mode 100644 pkgs/development/web/playwright-test/default.nix delete mode 100644 pkgs/development/web/playwright-test/node-env.nix delete mode 100644 pkgs/development/web/playwright-test/node-packages.json delete mode 100644 pkgs/development/web/playwright-test/node-packages.nix delete mode 100644 pkgs/development/web/playwright-test/wrapped.nix diff --git a/pkgs/development/python-modules/playwright/default.nix b/pkgs/development/python-modules/playwright/default.nix index 42472024e020..217e8d7cd292 100644 --- a/pkgs/development/python-modules/playwright/default.nix +++ b/pkgs/development/python-modules/playwright/default.nix @@ -21,7 +21,7 @@ in buildPythonPackage rec { pname = "playwright"; # run ./pkgs/development/python-modules/playwright/update.sh to update - version = "1.44.0"; + version = "1.46.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -29,7 +29,7 @@ buildPythonPackage rec { owner = "microsoft"; repo = "playwright-python"; rev = "refs/tags/v${version}"; - hash = "sha256-RM04I1QiyJhPvKdAdy8w2GmOOR+BWilxrZ5QUrwxBWA="; + hash = "sha256-88ZFhP8Bd10czoW71ltelWStypX4z4g18LT3Zo5ACMg="; }; patches = [ @@ -51,11 +51,11 @@ buildPythonPackage rec { git commit -m "workaround setuptools-scm" substituteInPlace setup.py \ - --replace "setuptools-scm==8.0.4" "setuptools-scm" \ + --replace "setuptools-scm==8.1.0" "setuptools-scm" \ --replace-fail "wheel==0.42.0" "wheel" substituteInPlace pyproject.toml \ - --replace 'requires = ["setuptools==68.2.2", "setuptools-scm==8.0.4", "wheel==0.42.0", "auditwheel==5.4.0"]' \ + --replace 'requires = ["setuptools==68.2.2", "setuptools-scm==8.1.0", "wheel==0.42.0", "auditwheel==5.4.0"]' \ 'requires = ["setuptools", "setuptools-scm", "wheel"]' # Skip trying to download and extract the driver. diff --git a/pkgs/development/python-modules/playwright/driver-location.patch b/pkgs/development/python-modules/playwright/driver-location.patch index 033b785e4eed..87e193f6812e 100644 --- a/pkgs/development/python-modules/playwright/driver-location.patch +++ b/pkgs/development/python-modules/playwright/driver-location.patch @@ -1,19 +1,22 @@ diff --git a/playwright/_impl/_driver.py b/playwright/_impl/_driver.py -index 9e8cdc1..7ee382d 100644 +index 22b53b8..2d86626 100644 --- a/playwright/_impl/_driver.py +++ b/playwright/_impl/_driver.py -@@ -23,11 +23,7 @@ from playwright._repo_version import version - - +@@ -23,14 +23,7 @@ from playwright._repo_version import version + + def compute_driver_executable() -> Tuple[str, str]: - driver_path = Path(inspect.getfile(playwright)).parent / "driver" - cli_path = str(driver_path / "package" / "cli.js") - if sys.platform == "win32": -- return (str(driver_path / "node.exe"), cli_path) +- return ( +- os.getenv("PLAYWRIGHT_NODEJS_PATH", str(driver_path / "node.exe")), +- cli_path, +- ) - return (os.getenv("PLAYWRIGHT_NODEJS_PATH", str(driver_path / "node")), cli_path) -+ return "@node@", "@driver@" - - ++ return "@node@", "@driver@" + + def get_driver_env() -> dict: diff --git a/setup.py b/setup.py index 8709e52..59784dd 100644 diff --git a/pkgs/development/python-modules/playwright/update.sh b/pkgs/development/python-modules/playwright/update.sh index 23c327608865..eb04e619feb6 100755 --- a/pkgs/development/python-modules/playwright/update.sh +++ b/pkgs/development/python-modules/playwright/update.sh @@ -1,35 +1,54 @@ #!/usr/bin/env nix-shell -#!nix-shell -i bash -p curl gnused nix-prefetch common-updater-scripts node2nix jq +#!nix-shell -i bash -p curl gnused common-updater-scripts jq prefetch-npm-deps set -euo pipefail root="$(dirname "$(readlink -f "$0")")" -driver_file="$root/../../web/playwright/driver.nix" -playwright_test="$root/../../web/playwright-test" version=$(curl ${GITHUB_TOKEN:+" -u \":$GITHUB_TOKEN\""} -s https://api.github.com/repos/microsoft/playwright-python/releases/latest | jq -r '.tag_name | sub("^v"; "")') - # Most of the time, this should be the latest stable release of the Node-based # Playwright version, but that isn't a guarantee, so this needs to be specified # as well: setup_py_url="https://github.com/microsoft/playwright-python/raw/v${version}/setup.py" driver_version=$(curl -Ls "$setup_py_url" | grep '^driver_version =' | grep -Eo '[0-9]+\.[0-9]+\.[0-9]+') -fetch_driver_arch() { - nix-prefetch-url "https://playwright.azureedge.net/builds/driver/playwright-${driver_version}-${1}.zip" +update-source-version playwright-driver "$driver_version" +update-source-version python3Packages.playwright "$version" + +# Update package-lock.json files for all npm deps that are built in playwright +# TODO: skip if update-source-version reported the same version +driver_file="$root/../../web/playwright/driver.nix" +repo_url_prefix="https://github.com/microsoft/playwright/raw" +temp_dir=$(mktemp -d) + +trap 'rm -rf "$temp_dir"' EXIT + + +# Function to download `package-lock.json` for a given source path and update hash +update_hash() { + local source_root_path="$1" + local existing_hash="$2" + + # Formulate download URL + local download_url="${repo_url_prefix}/v${driver_version}${source_root_path}/package-lock.json" + + # Download package-lock.json to temporary directory + curl -fsSL -o "${temp_dir}/package-lock.json" "$download_url" + + # Calculate the new hash + local new_hash + new_hash=$(prefetch-npm-deps "${temp_dir}/package-lock.json") + + # Update npmDepsHash in the original file + sed -i "s|$existing_hash|${new_hash}|" "$driver_file" } -replace_sha() { - sed -i "s|$1 = \".\{44,52\}\"|$1 = \"$2\"|" "$driver_file" -} +while IFS= read -r source_root_line; do + [[ "$source_root_line" =~ sourceRoot ]] || continue + source_root_path=$(echo "$source_root_line" | sed -e 's/^.*"${src.name}\(.*\)";.*$/\1/') -# Replace SHAs for the driver downloads -replace_sha "x86_64-linux" "$(fetch_driver_arch "linux")" -replace_sha "x86_64-darwin" "$(fetch_driver_arch "mac")" -replace_sha "aarch64-linux" "$(fetch_driver_arch "linux-arm64")" -replace_sha "aarch64-darwin" "$(fetch_driver_arch "mac-arm64")" + # Extract the current npmDepsHash for this sourceRoot + existing_hash=$(grep -A1 "$source_root_line" "$driver_file" | grep 'npmDepsHash' | sed -e 's/^.*npmDepsHash = "\(.*\)";$/\1/') -# Update the version stamps -sed -i "s/version =\s*\"[^\$]*\"/version = \"$driver_version\"/" "$driver_file" -sed -i "s/\"@playwright\/test\": \"[^\$]*\"/\"@playwright\/test\": \"$driver_version\"/" "$playwright_test/node-packages.json" -(cd "$playwright_test"; node2nix -i node-packages.json) -update-source-version playwright "$version" --rev="v$version" + # Call the function to download and update the hash + update_hash "$source_root_path" "$existing_hash" +done < "$driver_file" diff --git a/pkgs/development/web/playwright-test/default.nix b/pkgs/development/web/playwright-test/default.nix deleted file mode 100644 index e59fd8a77f51..000000000000 --- a/pkgs/development/web/playwright-test/default.nix +++ /dev/null @@ -1,17 +0,0 @@ -# This file has been generated by node2nix 1.11.1. Do not edit! - -{pkgs ? import { - inherit system; - }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs_18"}: - -let - nodeEnv = import ./node-env.nix { - inherit (pkgs) stdenv lib python2 runCommand writeTextFile writeShellScript; - inherit pkgs nodejs; - libtool = if pkgs.stdenv.isDarwin then pkgs.darwin or pkgs.darwin.cctools else null; - }; -in -import ./node-packages.nix { - inherit (pkgs) fetchurl nix-gitignore stdenv lib fetchgit; - inherit nodeEnv; -} diff --git a/pkgs/development/web/playwright-test/node-env.nix b/pkgs/development/web/playwright-test/node-env.nix deleted file mode 100644 index bc1e36628ac8..000000000000 --- a/pkgs/development/web/playwright-test/node-env.nix +++ /dev/null @@ -1,689 +0,0 @@ -# This file originates from node2nix - -{lib, stdenv, nodejs, python2, pkgs, libtool, runCommand, writeTextFile, writeShellScript}: - -let - # Workaround to cope with utillinux in Nixpkgs 20.09 and util-linux in Nixpkgs master - utillinux = if pkgs ? utillinux then pkgs.utillinux else pkgs.util-linux; - - python = if nodejs ? python then nodejs.python else python2; - - # Create a tar wrapper that filters all the 'Ignoring unknown extended header keyword' noise - tarWrapper = runCommand "tarWrapper" {} '' - mkdir -p $out/bin - - cat > $out/bin/tar <> $out/nix-support/hydra-build-products - ''; - }; - - # Common shell logic - installPackage = writeShellScript "install-package" '' - installPackage() { - local packageName=$1 src=$2 - - local strippedName - - local DIR=$PWD - cd $TMPDIR - - unpackFile $src - - # Make the base dir in which the target dependency resides first - mkdir -p "$(dirname "$DIR/$packageName")" - - if [ -f "$src" ] - then - # Figure out what directory has been unpacked - packageDir="$(find . -maxdepth 1 -type d | tail -1)" - - # Restore write permissions to make building work - find "$packageDir" -type d -exec chmod u+x {} \; - chmod -R u+w "$packageDir" - - # Move the extracted tarball into the output folder - mv "$packageDir" "$DIR/$packageName" - elif [ -d "$src" ] - then - # Get a stripped name (without hash) of the source directory. - # On old nixpkgs it's already set internally. - if [ -z "$strippedName" ] - then - strippedName="$(stripHash $src)" - fi - - # Restore write permissions to make building work - chmod -R u+w "$strippedName" - - # Move the extracted directory into the output folder - mv "$strippedName" "$DIR/$packageName" - fi - - # Change to the package directory to install dependencies - cd "$DIR/$packageName" - } - ''; - - # Bundle the dependencies of the package - # - # Only include dependencies if they don't exist. They may also be bundled in the package. - includeDependencies = {dependencies}: - lib.optionalString (dependencies != []) ( - '' - mkdir -p node_modules - cd node_modules - '' - + (lib.concatMapStrings (dependency: - '' - if [ ! -e "${dependency.packageName}" ]; then - ${composePackage dependency} - fi - '' - ) dependencies) - + '' - cd .. - '' - ); - - # Recursively composes the dependencies of a package - composePackage = { name, packageName, src, dependencies ? [], ... }@args: - builtins.addErrorContext "while evaluating node package '${packageName}'" '' - installPackage "${packageName}" "${src}" - ${includeDependencies { inherit dependencies; }} - cd .. - ${lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."} - ''; - - pinpointDependencies = {dependencies, production}: - let - pinpointDependenciesFromPackageJSON = writeTextFile { - name = "pinpointDependencies.js"; - text = '' - var fs = require('fs'); - var path = require('path'); - - function resolveDependencyVersion(location, name) { - if(location == process.env['NIX_STORE']) { - return null; - } else { - var dependencyPackageJSON = path.join(location, "node_modules", name, "package.json"); - - if(fs.existsSync(dependencyPackageJSON)) { - var dependencyPackageObj = JSON.parse(fs.readFileSync(dependencyPackageJSON)); - - if(dependencyPackageObj.name == name) { - return dependencyPackageObj.version; - } - } else { - return resolveDependencyVersion(path.resolve(location, ".."), name); - } - } - } - - function replaceDependencies(dependencies) { - if(typeof dependencies == "object" && dependencies !== null) { - for(var dependency in dependencies) { - var resolvedVersion = resolveDependencyVersion(process.cwd(), dependency); - - if(resolvedVersion === null) { - process.stderr.write("WARNING: cannot pinpoint dependency: "+dependency+", context: "+process.cwd()+"\n"); - } else { - dependencies[dependency] = resolvedVersion; - } - } - } - } - - /* Read the package.json configuration */ - var packageObj = JSON.parse(fs.readFileSync('./package.json')); - - /* Pinpoint all dependencies */ - replaceDependencies(packageObj.dependencies); - if(process.argv[2] == "development") { - replaceDependencies(packageObj.devDependencies); - } - else { - packageObj.devDependencies = {}; - } - replaceDependencies(packageObj.optionalDependencies); - replaceDependencies(packageObj.peerDependencies); - - /* Write the fixed package.json file */ - fs.writeFileSync("package.json", JSON.stringify(packageObj, null, 2)); - ''; - }; - in - '' - node ${pinpointDependenciesFromPackageJSON} ${if production then "production" else "development"} - - ${lib.optionalString (dependencies != []) - '' - if [ -d node_modules ] - then - cd node_modules - ${lib.concatMapStrings (dependency: pinpointDependenciesOfPackage dependency) dependencies} - cd .. - fi - ''} - ''; - - # Recursively traverses all dependencies of a package and pinpoints all - # dependencies in the package.json file to the versions that are actually - # being used. - - pinpointDependenciesOfPackage = { packageName, dependencies ? [], production ? true, ... }@args: - '' - if [ -d "${packageName}" ] - then - cd "${packageName}" - ${pinpointDependencies { inherit dependencies production; }} - cd .. - ${lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."} - fi - ''; - - # Extract the Node.js source code which is used to compile packages with - # native bindings - nodeSources = runCommand "node-sources" {} '' - tar --no-same-owner --no-same-permissions -xf ${nodejs.src} - mv node-* $out - ''; - - # Script that adds _integrity fields to all package.json files to prevent NPM from consulting the cache (that is empty) - addIntegrityFieldsScript = writeTextFile { - name = "addintegrityfields.js"; - text = '' - var fs = require('fs'); - var path = require('path'); - - function augmentDependencies(baseDir, dependencies) { - for(var dependencyName in dependencies) { - var dependency = dependencies[dependencyName]; - - // Open package.json and augment metadata fields - var packageJSONDir = path.join(baseDir, "node_modules", dependencyName); - var packageJSONPath = path.join(packageJSONDir, "package.json"); - - if(fs.existsSync(packageJSONPath)) { // Only augment packages that exist. Sometimes we may have production installs in which development dependencies can be ignored - console.log("Adding metadata fields to: "+packageJSONPath); - var packageObj = JSON.parse(fs.readFileSync(packageJSONPath)); - - if(dependency.integrity) { - packageObj["_integrity"] = dependency.integrity; - } else { - packageObj["_integrity"] = "sha1-000000000000000000000000000="; // When no _integrity string has been provided (e.g. by Git dependencies), add a dummy one. It does not seem to harm and it bypasses downloads. - } - - if(dependency.resolved) { - packageObj["_resolved"] = dependency.resolved; // Adopt the resolved property if one has been provided - } else { - packageObj["_resolved"] = dependency.version; // Set the resolved version to the version identifier. This prevents NPM from cloning Git repositories. - } - - if(dependency.from !== undefined) { // Adopt from property if one has been provided - packageObj["_from"] = dependency.from; - } - - fs.writeFileSync(packageJSONPath, JSON.stringify(packageObj, null, 2)); - } - - // Augment transitive dependencies - if(dependency.dependencies !== undefined) { - augmentDependencies(packageJSONDir, dependency.dependencies); - } - } - } - - if(fs.existsSync("./package-lock.json")) { - var packageLock = JSON.parse(fs.readFileSync("./package-lock.json")); - - if(![1, 2].includes(packageLock.lockfileVersion)) { - process.stderr.write("Sorry, I only understand lock file versions 1 and 2!\n"); - process.exit(1); - } - - if(packageLock.dependencies !== undefined) { - augmentDependencies(".", packageLock.dependencies); - } - } - ''; - }; - - # Reconstructs a package-lock file from the node_modules/ folder structure and package.json files with dummy sha1 hashes - reconstructPackageLock = writeTextFile { - name = "reconstructpackagelock.js"; - text = '' - var fs = require('fs'); - var path = require('path'); - - var packageObj = JSON.parse(fs.readFileSync("package.json")); - - var lockObj = { - name: packageObj.name, - version: packageObj.version, - lockfileVersion: 2, - requires: true, - packages: { - "": { - name: packageObj.name, - version: packageObj.version, - license: packageObj.license, - bin: packageObj.bin, - dependencies: packageObj.dependencies, - engines: packageObj.engines, - optionalDependencies: packageObj.optionalDependencies - } - }, - dependencies: {} - }; - - function augmentPackageJSON(filePath, packages, dependencies) { - var packageJSON = path.join(filePath, "package.json"); - if(fs.existsSync(packageJSON)) { - var packageObj = JSON.parse(fs.readFileSync(packageJSON)); - packages[filePath] = { - version: packageObj.version, - integrity: "sha1-000000000000000000000000000=", - dependencies: packageObj.dependencies, - engines: packageObj.engines, - optionalDependencies: packageObj.optionalDependencies - }; - dependencies[packageObj.name] = { - version: packageObj.version, - integrity: "sha1-000000000000000000000000000=", - dependencies: {} - }; - processDependencies(path.join(filePath, "node_modules"), packages, dependencies[packageObj.name].dependencies); - } - } - - function processDependencies(dir, packages, dependencies) { - if(fs.existsSync(dir)) { - var files = fs.readdirSync(dir); - - files.forEach(function(entry) { - var filePath = path.join(dir, entry); - var stats = fs.statSync(filePath); - - if(stats.isDirectory()) { - if(entry.substr(0, 1) == "@") { - // When we encounter a namespace folder, augment all packages belonging to the scope - var pkgFiles = fs.readdirSync(filePath); - - pkgFiles.forEach(function(entry) { - if(stats.isDirectory()) { - var pkgFilePath = path.join(filePath, entry); - augmentPackageJSON(pkgFilePath, packages, dependencies); - } - }); - } else { - augmentPackageJSON(filePath, packages, dependencies); - } - } - }); - } - } - - processDependencies("node_modules", lockObj.packages, lockObj.dependencies); - - fs.writeFileSync("package-lock.json", JSON.stringify(lockObj, null, 2)); - ''; - }; - - # Script that links bins defined in package.json to the node_modules bin directory - # NPM does not do this for top-level packages itself anymore as of v7 - linkBinsScript = writeTextFile { - name = "linkbins.js"; - text = '' - var fs = require('fs'); - var path = require('path'); - - var packageObj = JSON.parse(fs.readFileSync("package.json")); - - var nodeModules = Array(packageObj.name.split("/").length).fill("..").join(path.sep); - - if(packageObj.bin !== undefined) { - fs.mkdirSync(path.join(nodeModules, ".bin")) - - if(typeof packageObj.bin == "object") { - Object.keys(packageObj.bin).forEach(function(exe) { - if(fs.existsSync(packageObj.bin[exe])) { - console.log("linking bin '" + exe + "'"); - fs.symlinkSync( - path.join("..", packageObj.name, packageObj.bin[exe]), - path.join(nodeModules, ".bin", exe) - ); - } - else { - console.log("skipping non-existent bin '" + exe + "'"); - } - }) - } - else { - if(fs.existsSync(packageObj.bin)) { - console.log("linking bin '" + packageObj.bin + "'"); - fs.symlinkSync( - path.join("..", packageObj.name, packageObj.bin), - path.join(nodeModules, ".bin", packageObj.name.split("/").pop()) - ); - } - else { - console.log("skipping non-existent bin '" + packageObj.bin + "'"); - } - } - } - else if(packageObj.directories !== undefined && packageObj.directories.bin !== undefined) { - fs.mkdirSync(path.join(nodeModules, ".bin")) - - fs.readdirSync(packageObj.directories.bin).forEach(function(exe) { - if(fs.existsSync(path.join(packageObj.directories.bin, exe))) { - console.log("linking bin '" + exe + "'"); - fs.symlinkSync( - path.join("..", packageObj.name, packageObj.directories.bin, exe), - path.join(nodeModules, ".bin", exe) - ); - } - else { - console.log("skipping non-existent bin '" + exe + "'"); - } - }) - } - ''; - }; - - prepareAndInvokeNPM = {packageName, bypassCache, reconstructLock, npmFlags, production}: - let - forceOfflineFlag = if bypassCache then "--offline" else "--registry http://www.example.com"; - in - '' - # Pinpoint the versions of all dependencies to the ones that are actually being used - echo "pinpointing versions of dependencies..." - source $pinpointDependenciesScriptPath - - # Patch the shebangs of the bundled modules to prevent them from - # calling executables outside the Nix store as much as possible - patchShebangs . - - # Deploy the Node.js package by running npm install. Since the - # dependencies have been provided already by ourselves, it should not - # attempt to install them again, which is good, because we want to make - # it Nix's responsibility. If it needs to install any dependencies - # anyway (e.g. because the dependency parameters are - # incomplete/incorrect), it fails. - # - # The other responsibilities of NPM are kept -- version checks, build - # steps, postprocessing etc. - - export HOME=$TMPDIR - cd "${packageName}" - runHook preRebuild - - ${lib.optionalString bypassCache '' - ${lib.optionalString reconstructLock '' - if [ -f package-lock.json ] - then - echo "WARNING: Reconstruct lock option enabled, but a lock file already exists!" - echo "This will most likely result in version mismatches! We will remove the lock file and regenerate it!" - rm package-lock.json - else - echo "No package-lock.json file found, reconstructing..." - fi - - node ${reconstructPackageLock} - ''} - - node ${addIntegrityFieldsScript} - ''} - - npm ${forceOfflineFlag} --nodedir=${nodeSources} ${npmFlags} ${lib.optionalString production "--production"} rebuild - - runHook postRebuild - - if [ "''${dontNpmInstall-}" != "1" ] - then - # NPM tries to download packages even when they already exist if npm-shrinkwrap is used. - rm -f npm-shrinkwrap.json - - npm ${forceOfflineFlag} --nodedir=${nodeSources} --no-bin-links --ignore-scripts ${npmFlags} ${lib.optionalString production "--production"} install - fi - - # Link executables defined in package.json - node ${linkBinsScript} - ''; - - # Builds and composes an NPM package including all its dependencies - buildNodePackage = - { name - , packageName - , version ? null - , dependencies ? [] - , buildInputs ? [] - , production ? true - , npmFlags ? "" - , dontNpmInstall ? false - , bypassCache ? false - , reconstructLock ? false - , preRebuild ? "" - , dontStrip ? true - , unpackPhase ? "true" - , buildPhase ? "true" - , meta ? {} - , ... }@args: - - let - extraArgs = removeAttrs args [ "name" "dependencies" "buildInputs" "dontStrip" "dontNpmInstall" "preRebuild" "unpackPhase" "buildPhase" "meta" ]; - in - stdenv.mkDerivation ({ - name = "${name}${if version == null then "" else "-${version}"}"; - buildInputs = [ tarWrapper python nodejs ] - ++ lib.optional (stdenv.isLinux) utillinux - ++ lib.optional (stdenv.isDarwin) libtool - ++ buildInputs; - - inherit nodejs; - - inherit dontStrip; # Stripping may fail a build for some package deployments - inherit dontNpmInstall preRebuild unpackPhase buildPhase; - - compositionScript = composePackage args; - pinpointDependenciesScript = pinpointDependenciesOfPackage args; - - passAsFile = [ "compositionScript" "pinpointDependenciesScript" ]; - - installPhase = '' - source ${installPackage} - - # Create and enter a root node_modules/ folder - mkdir -p $out/lib/node_modules - cd $out/lib/node_modules - - # Compose the package and all its dependencies - source $compositionScriptPath - - ${prepareAndInvokeNPM { inherit packageName bypassCache reconstructLock npmFlags production; }} - - # Create symlink to the deployed executable folder, if applicable - if [ -d "$out/lib/node_modules/.bin" ] - then - ln -s $out/lib/node_modules/.bin $out/bin - - # Fixup all executables - ls $out/bin/* | while read i - do - file="$(readlink -f "$i")" - chmod u+rwx "$file" - if isScript "$file" - then - sed -i 's/\r$//' "$file" # convert crlf to lf - fi - done - fi - - # Create symlinks to the deployed manual page folders, if applicable - if [ -d "$out/lib/node_modules/${packageName}/man" ] - then - mkdir -p $out/share - for dir in "$out/lib/node_modules/${packageName}/man/"* - do - mkdir -p $out/share/man/$(basename "$dir") - for page in "$dir"/* - do - ln -s $page $out/share/man/$(basename "$dir") - done - done - fi - - # Run post install hook, if provided - runHook postInstall - ''; - - meta = { - # default to Node.js' platforms - platforms = nodejs.meta.platforms; - } // meta; - } // extraArgs); - - # Builds a node environment (a node_modules folder and a set of binaries) - buildNodeDependencies = - { name - , packageName - , version ? null - , src - , dependencies ? [] - , buildInputs ? [] - , production ? true - , npmFlags ? "" - , dontNpmInstall ? false - , bypassCache ? false - , reconstructLock ? false - , dontStrip ? true - , unpackPhase ? "true" - , buildPhase ? "true" - , ... }@args: - - let - extraArgs = removeAttrs args [ "name" "dependencies" "buildInputs" ]; - in - stdenv.mkDerivation ({ - name = "node-dependencies-${name}${if version == null then "" else "-${version}"}"; - - buildInputs = [ tarWrapper python nodejs ] - ++ lib.optional (stdenv.isLinux) utillinux - ++ lib.optional (stdenv.isDarwin) libtool - ++ buildInputs; - - inherit dontStrip; # Stripping may fail a build for some package deployments - inherit dontNpmInstall unpackPhase buildPhase; - - includeScript = includeDependencies { inherit dependencies; }; - pinpointDependenciesScript = pinpointDependenciesOfPackage args; - - passAsFile = [ "includeScript" "pinpointDependenciesScript" ]; - - installPhase = '' - source ${installPackage} - - mkdir -p $out/${packageName} - cd $out/${packageName} - - source $includeScriptPath - - # Create fake package.json to make the npm commands work properly - cp ${src}/package.json . - chmod 644 package.json - ${lib.optionalString bypassCache '' - if [ -f ${src}/package-lock.json ] - then - cp ${src}/package-lock.json . - chmod 644 package-lock.json - fi - ''} - - # Go to the parent folder to make sure that all packages are pinpointed - cd .. - ${lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."} - - ${prepareAndInvokeNPM { inherit packageName bypassCache reconstructLock npmFlags production; }} - - # Expose the executables that were installed - cd .. - ${lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."} - - mv ${packageName} lib - ln -s $out/lib/node_modules/.bin $out/bin - ''; - } // extraArgs); - - # Builds a development shell - buildNodeShell = - { name - , packageName - , version ? null - , src - , dependencies ? [] - , buildInputs ? [] - , production ? true - , npmFlags ? "" - , dontNpmInstall ? false - , bypassCache ? false - , reconstructLock ? false - , dontStrip ? true - , unpackPhase ? "true" - , buildPhase ? "true" - , ... }@args: - - let - nodeDependencies = buildNodeDependencies args; - extraArgs = removeAttrs args [ "name" "dependencies" "buildInputs" "dontStrip" "dontNpmInstall" "unpackPhase" "buildPhase" ]; - in - stdenv.mkDerivation ({ - name = "node-shell-${name}${if version == null then "" else "-${version}"}"; - - buildInputs = [ python nodejs ] ++ lib.optional (stdenv.isLinux) utillinux ++ buildInputs; - buildCommand = '' - mkdir -p $out/bin - cat > $out/bin/shell < Date: Sun, 25 Aug 2024 02:51:24 +0000 Subject: [PATCH 048/235] glow: 1.5.1 -> 2.0.0 --- pkgs/applications/editors/glow/default.nix | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 deletions(-) diff --git a/pkgs/applications/editors/glow/default.nix b/pkgs/applications/editors/glow/default.nix index 79e871561c07..5da1e6e2f07a 100644 --- a/pkgs/applications/editors/glow/default.nix +++ b/pkgs/applications/editors/glow/default.nix @@ -3,34 +3,27 @@ , fetchFromGitHub , installShellFiles , stdenv -, fetchpatch }: buildGoModule rec { pname = "glow"; - version = "1.5.1"; + version = "2.0.0"; src = fetchFromGitHub { owner = "charmbracelet"; repo = "glow"; rev = "v${version}"; - hash = "sha256-12UziCf3BO1z+W02slNCCvXhIkvZuVgXk++BdHG3gDI="; + hash = "sha256-gPy3MnQHmBJl06oVOpwQB4qIpJ10kUNMNMPkpsIujeI="; }; - vendorHash = "sha256-xxFC87t12bZKea9Snscul+xx8IGFAcoIr9Z8wxHL7nM="; + vendorHash = "sha256-vxw8yqY6MxIIWeSX1D+unb0VbBmIpz1431N7UNORJP0="; - # Remove whenever a release with it is available - patches = [(fetchpatch { - url = "https://github.com/charmbracelet/glow/commit/f0734709f0be19a34e648caaf63340938a50caa2.patch"; - name = "go-1-17-patch"; - hash = "sha256-vpMiVb/7SFT9xcSpVGQriEjkexh1F/ljpfpIswdBx2Y="; - })]; - - doCheck = false; + nativeBuildInputs = [ installShellFiles ]; ldflags = [ "-s" "-w" "-X=main.Version=${version}" ]; - nativeBuildInputs = [ installShellFiles ]; + doCheck = false; + postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' installShellCompletion --cmd glow \ --bash <($out/bin/glow completion bash) \ From 9b89ce40e594d080d46bce8c4e473708a60b42aa Mon Sep 17 00:00:00 2001 From: Aidan Gauland Date: Sat, 24 Aug 2024 20:05:33 +1200 Subject: [PATCH 049/235] oama: add to haskell-updates Hydra jobset --- pkgs/top-level/release-haskell.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/top-level/release-haskell.nix b/pkgs/top-level/release-haskell.nix index 7774800660e6..a38f17663711 100644 --- a/pkgs/top-level/release-haskell.nix +++ b/pkgs/top-level/release-haskell.nix @@ -345,6 +345,7 @@ let nixfmt-rfc-style nota nvfetcher + oama ormolu # pakcs broken by set-extra on 2024-03-15 pandoc From fd7cfbba484950f9ad8bf854a028ca5e439fc72d Mon Sep 17 00:00:00 2001 From: Nash Pillai Date: Sun, 25 Aug 2024 02:38:31 -0400 Subject: [PATCH 050/235] cpupower-gui: fix crash when freq is set --- pkgs/os-specific/linux/cpupower-gui/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/os-specific/linux/cpupower-gui/default.nix b/pkgs/os-specific/linux/cpupower-gui/default.nix index be11dff2bd35..ca6ce58bad45 100644 --- a/pkgs/os-specific/linux/cpupower-gui/default.nix +++ b/pkgs/os-specific/linux/cpupower-gui/default.nix @@ -42,6 +42,11 @@ buildPythonApplication rec { url = "https://github.com/vagnum08/cpupower-gui/commit/97f8ac02fe33e412b59d3f3968c16a217753e74b.patch"; sha256 = "XYnpm03kq8JLMjAT73BMCJWlzz40IAuHESm715VV6G0="; }) + # Fixes https://github.com/vagnum08/cpupower-gui/issues/86 + (fetchpatch { + url = "https://github.com/vagnum08/cpupower-gui/commit/22ea668aa4ecf848149ea4c150aa840a25dc6ff8.patch"; + sha256 = "sha256-Mri7Af1Y79lt2pvZl4DQSvrqSLIJLIjzyXwMPFEbGVI="; + }) ]; nativeBuildInputs = [ From 787b1ebf040be1962f93deb5b324547bcadc5e92 Mon Sep 17 00:00:00 2001 From: ghpzin Date: Sun, 25 Aug 2024 12:20:13 +0300 Subject: [PATCH 051/235] swiftshader: fix build on hydra --- pkgs/development/libraries/swiftshader/default.nix | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/swiftshader/default.nix b/pkgs/development/libraries/swiftshader/default.nix index 3d6a3653d267..624d239fa35c 100644 --- a/pkgs/development/libraries/swiftshader/default.nix +++ b/pkgs/development/libraries/swiftshader/default.nix @@ -7,7 +7,14 @@ stdenv.mkDerivation rec { src = fetchgit { url = "https://swiftshader.googlesource.com/SwiftShader"; rev = "4e40d502c440cc59b25fa3a5fee0eadbab7442aa"; - sha256 = "085bdqn80s7zw5h2pz6xff3j34hmkxb9wxzgjmzdr9c24zwp2k1c"; + hash = "sha256-YtbTaOkFhVMKdu3jiRHQsPmoEu3KDzIQXLZ5HFBSmWI="; + # Remove 1GB of test files to get under Hydra output limit + postFetch = '' + rm -r $out/third_party/llvm-project/llvm/test + rm -r $out/third_party/json/test + rm -r $out/third_party/cppdap/third_party/json/test + rm -r $out/third_party/llvm-project/clang/test + ''; }; nativeBuildInputs = [ cmake python3 jq ]; From 948c196ec7558895553be4b7f69d8043dc6d3124 Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Sun, 25 Aug 2024 11:05:11 -0400 Subject: [PATCH 052/235] qqwing: fix cross compilation and pkgconfig generation --- pkgs/games/qqwing/default.nix | 55 +++++++++++++++++++++++------------ 1 file changed, 37 insertions(+), 18 deletions(-) diff --git a/pkgs/games/qqwing/default.nix b/pkgs/games/qqwing/default.nix index 39f1d43fb46e..8fa696de889f 100644 --- a/pkgs/games/qqwing/default.nix +++ b/pkgs/games/qqwing/default.nix @@ -1,4 +1,12 @@ -{ lib, stdenv, fetchFromGitHub, perl, autoconf, automake, libtool }: +{ + lib, + stdenv, + fetchFromGitHub, + perl, + autoconf, + automake, + libtool, +}: stdenv.mkDerivation rec { pname = "qqwing"; @@ -7,31 +15,42 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "stephenostermiller"; repo = "qqwing"; - rev = "v${version}"; - sha256 = "1qq0vi4ch4y3a5fb1ncr0yzkj3mbvdiwa3d51qpabq94sh0cz09i"; + rev = "refs/tags/v${version}"; + hash = "sha256-MYHPANQk4aUuDqUNxWPbqw45vweZ2bBcUcMTyEjcAOM="; }; + strictDeps = true; + + nativeBuildInputs = [ + autoconf + automake + libtool + perl + ]; + + configureFlags = [ + "--prefix=${placeholder "out"}" + ]; + + buildFlags = [ + "cppcompile" + ]; + postPatch = '' - for file in "src-first-comment.pl" "src_neaten.pl"; do - substituteInPlace "build/$file" \ - --replace "#!/usr/bin/perl" "#!${perl}/bin/perl" - done + patchShebangs --build build/src-first-comment.pl build/src_neaten.pl - substituteInPlace "build/cpp_install.sh" \ - --replace "sudo " "" + substituteInPlace build/cpp_configure.sh \ + --replace-fail "./configure" "./configure $configureFlags" + substituteInPlace build/cpp_install.sh \ + --replace-fail "sudo " "" ''; - nativeBuildInputs = [ autoconf automake ]; - buildInputs = [ perl libtool ]; - - makeFlags = [ "prefix=$(out)" "tgz" ]; - - meta = with lib; { + meta = { homepage = "https://qqwing.com"; description = "Sudoku generating and solving software"; + license = lib.licenses.gpl2Plus; + platforms = lib.platforms.unix; + maintainers = with lib.maintainers; [ nickcao ]; mainProgram = "qqwing"; - license = licenses.gpl2Plus; - platforms = platforms.unix; - maintainers = [ ]; }; } From 693f9402ddbc721d09cf258afe54781f693dda5c Mon Sep 17 00:00:00 2001 From: Ashish SHUKLA Date: Mon, 26 Aug 2024 11:22:27 +0530 Subject: [PATCH 053/235] aerc: import a patch fix a bug with gpg signed messages The mentioned patch[0] is already upstream, and can be removed when the derivation is updated to the next release. [0] https://lists.sr.ht/~rjarry/aerc-devel/patches/54675 --- pkgs/by-name/ae/aerc/package.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/by-name/ae/aerc/package.nix b/pkgs/by-name/ae/aerc/package.nix index d6697cf1558d..6291681a4fbf 100644 --- a/pkgs/by-name/ae/aerc/package.nix +++ b/pkgs/by-name/ae/aerc/package.nix @@ -1,6 +1,7 @@ { lib , buildGoModule , fetchFromSourcehut +, fetchpatch , ncurses , notmuch , scdoc @@ -31,6 +32,12 @@ buildGoModule rec { patches = [ ./runtime-libexec.patch + + # patch to fix a encoding problem with gpg signed messages + (fetchpatch { + url ="https://git.sr.ht/~rjarry/aerc/commit/7346d20.patch"; + hash = "sha256-OCm8BcovYN2IDSgslZklQxkGVkSYQ8HLCrf2+DRB2mM="; + }) ]; postPatch = '' From 1bce2914b3a814febcf9089fe88cfa11203709a1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kristoffer=20K=2E=20F=C3=B8llesdal?= Date: Tue, 6 Aug 2024 13:38:55 +0200 Subject: [PATCH 054/235] licenses: Update databricks metadata Link to offical Databricks License URL --- lib/licenses.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/lib/licenses.nix b/lib/licenses.nix index ff68d1486437..11275486c29c 100644 --- a/lib/licenses.nix +++ b/lib/licenses.nix @@ -715,10 +715,9 @@ lib.mapAttrs mkLicense ({ fullName = "ISC License"; }; - # Proprietary binaries; free to redistribute without modification. databricks = { - fullName = "Databricks Proprietary License"; - url = "https://pypi.org/project/databricks-connect"; + fullName = "Databricks License"; + url = "https://www.databricks.com/legal/db-license"; free = false; }; From c8e37dbf521f57e6273d4d1ff93537cdaa3878a6 Mon Sep 17 00:00:00 2001 From: kfollesdal Date: Fri, 2 Aug 2024 18:02:39 +0200 Subject: [PATCH 055/235] databricks-cli: init at 0.227.0 --- pkgs/by-name/da/databricks-cli/package.nix | 62 ++++++++++++++++++++++ 1 file changed, 62 insertions(+) create mode 100644 pkgs/by-name/da/databricks-cli/package.nix diff --git a/pkgs/by-name/da/databricks-cli/package.nix b/pkgs/by-name/da/databricks-cli/package.nix new file mode 100644 index 000000000000..6ef7fb885233 --- /dev/null +++ b/pkgs/by-name/da/databricks-cli/package.nix @@ -0,0 +1,62 @@ +{ + lib, + buildGoModule, + fetchFromGitHub, + git, + python3, +}: + +buildGoModule rec { + pname = "databricks-cli"; + version = "0.227.0"; + + src = fetchFromGitHub { + owner = "databricks"; + repo = "cli"; + rev = "v${version}"; + hash = "sha256-bmTPtxkVtGzjxgmXpIHus7vUUg3IKGWmlUT8iOU+dtM="; + }; + + vendorHash = "sha256-ItcGzgGIDQOnAwUA/mPy+oNjChKPTVo7QK3gsidB1xQ="; + + excludedPackages = [ "bundle/internal" ]; + + postBuild = '' + mv "$GOPATH/bin/cli" "$GOPATH/bin/databricks" + ''; + + checkFlags = + "-skip=" + + (lib.concatStringsSep "|" [ + # Need network + "TestTerraformArchiveChecksums" + "TestExpandPipelineGlobPaths" + "TestRelativePathTranslationDefault" + "TestRelativePathTranslationOverride" + ]); + + nativeCheckInputs = [ + git + (python3.withPackages ( + ps: with ps; [ + setuptools + wheel + ] + )) + ]; + + preCheck = '' + # Some tested depends on git and remote url + git init + git remote add origin https://github.com/databricks/cli.git + ''; + + meta = with lib; { + description = "Databricks CLI"; + mainProgram = "databricks"; + homepage = "https://github.com/databricks/cli"; + changelog = "https://github.com/databricks/cli/releases/tag/v${version}"; + license = licenses.databricks; + maintainers = with maintainers; [ kfollesdal ]; + }; +} From 134eef34ebd558ac6808b6c3a8084317c1c20849 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Mon, 26 Aug 2024 14:51:07 +0200 Subject: [PATCH 056/235] haskellPackages.weeder: restrict to < 2.9 2.9.0 gives us a test failure and no extra compatibility, so let's wait for that to sort itself out: https://github.com/ocharles/weeder/issues/176 --- .../configuration-hackage2nix/main.yaml | 2 ++ .../haskell-modules/hackage-packages.nix | 33 +++++++++++++++++++ 2 files changed, 35 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml index 02b7ad3de004..bac7d621854b 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml @@ -34,6 +34,8 @@ default-package-overrides: - chs-cabal < 0.1.1.2 # Incompatible with Cabal < 3.12 # 2024-08-17: Stackage doesn't contain hnix-store-core >= 0.8 yet, so we need to restrict hnix-store-remote - hnix-store-remote < 0.7 + # 2024-08-26: test failure for >= 2.9 https://github.com/ocharles/weeder/issues/176 + - weeder < 2.9.0 extra-packages: diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 2688772a0570..4cceafb56bc2 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -139288,6 +139288,7 @@ self: { ]; description = "A class for types that can be converted to a hash value"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "hashable_1_5_0_0" = callPackage @@ -331422,6 +331423,37 @@ self: { }) {}; "weeder" = callPackage + ({ mkDerivation, aeson, algebraic-graphs, async, base, bytestring + , containers, directory, filepath, generic-lens, ghc, hspec, lens + , mtl, optparse-applicative, parallel, process, regex-tdfa, text + , toml-reader, transformers + }: + mkDerivation { + pname = "weeder"; + version = "2.8.0"; + sha256 = "086vni1i0sqy2xva63xdx1ppvwygyn1dav2bykggd6j1jrwi0m5p"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + algebraic-graphs async base bytestring containers directory + filepath generic-lens ghc lens mtl optparse-applicative parallel + regex-tdfa text toml-reader transformers + ]; + executableHaskellDepends = [ + base bytestring containers directory filepath ghc + optparse-applicative transformers + ]; + testHaskellDepends = [ + aeson algebraic-graphs base containers directory filepath ghc hspec + process text toml-reader + ]; + description = "Detect dead code"; + license = lib.licenses.bsd3; + mainProgram = "weeder"; + maintainers = [ lib.maintainers.maralorn ]; + }) {}; + + "weeder_2_9_0" = callPackage ({ mkDerivation, aeson, algebraic-graphs, async, base, bytestring , containers, directory, filepath, generic-lens, ghc, Glob , hspec-discover, hspec-expectations, lens, mtl @@ -331448,6 +331480,7 @@ self: { testToolDepends = [ hspec-discover ]; description = "Detect dead code"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; mainProgram = "weeder"; maintainers = [ lib.maintainers.maralorn ]; }) {}; From d8c52fa28235936faf257f65d980b2757dd52b42 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Mon, 26 Aug 2024 17:29:20 +0200 Subject: [PATCH 057/235] haskellPackages.shakespeare: 2.1.1 -> 2.1.0.1 Version 2.1.1 is deprecated and has failing tests --- pkgs/development/haskell-modules/configuration-common.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index a9865d70debe..ef008a59aeb6 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -199,6 +199,11 @@ self: super: { ]) ]; + # Version 2.1.1 is deprecated, but part of Stackage LTS at the moment. + # https://github.com/commercialhaskell/stackage/issues/7500 + # https://github.com/yesodweb/shakespeare/issues/280 + shakespeare = doDistribute self.shakespeare_2_1_0_1; + # https://github.com/mpickering/eventlog2html/pull/187 eventlog2html = lib.pipe super.eventlog2html [ doJailbreak From 177ccd9be746acc9daee7779d6a51bac7e8a63f2 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Mon, 26 Aug 2024 17:29:46 +0200 Subject: [PATCH 058/235] git-annex: update sha256 for 10.20240808 --- pkgs/development/haskell-modules/configuration-common.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index ef008a59aeb6..7c67794e7451 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -414,7 +414,7 @@ self: super: { name = "git-annex-${super.git-annex.version}-src"; url = "git://git-annex.branchable.com/"; rev = "refs/tags/" + super.git-annex.version; - sha256 = "1y25ac341d77dkb94qny3h5id2xlpqh9hrjr0s6pp66xghbcvzn4"; + sha256 = "1h0vbz95jgj8c380rpy688frnbwind5c2y3ylaw06l2l3j6gdaq3"; # delete android and Android directories which cause issues on # darwin (case insensitive directory). Since we don't need them # during the build process, we can delete it to prevent a hash From 8894a160fe9b855b8d3a15981e24cd1bec49e232 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Mon, 26 Aug 2024 17:33:11 +0200 Subject: [PATCH 059/235] haskellPackages.eventlog2html: drop upstreamed patches --- .../haskell-modules/configuration-common.nix | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 7c67794e7451..d35f9da323d5 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -204,16 +204,6 @@ self: super: { # https://github.com/yesodweb/shakespeare/issues/280 shakespeare = doDistribute self.shakespeare_2_1_0_1; - # https://github.com/mpickering/eventlog2html/pull/187 - eventlog2html = lib.pipe super.eventlog2html [ - doJailbreak - (appendPatch (fetchpatch { - name = "blaze-html-compat.patch"; - url = "https://github.com/mpickering/eventlog2html/commit/666aee9ee44c571173a73036b36ad4154c188481.patch"; - sha256 = "sha256-9PLygLEpJ6pAZ31gSWiEMqWxmvElT6Unc/pgr6ULIaw="; - })) - ]; - # 2023-08-09: Jailbreak because of vector < 0.13 # 2023-11-09: don't check because of https://github.com/tweag/monad-bayes/pull/326 monad-bayes = dontCheck (doJailbreak super.monad-bayes); From 23cd1324dcd384b245ec6107844a646433f0f5a7 Mon Sep 17 00:00:00 2001 From: Matteo Pacini Date: Tue, 27 Aug 2024 16:27:03 +0100 Subject: [PATCH 060/235] pcsx2-bin: 2.1.17 -> 2.1.116 --- pkgs/by-name/pc/pcsx2-bin/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/pc/pcsx2-bin/package.nix b/pkgs/by-name/pc/pcsx2-bin/package.nix index cb38ebac1c76..be8b07aab425 100644 --- a/pkgs/by-name/pc/pcsx2-bin/package.nix +++ b/pkgs/by-name/pc/pcsx2-bin/package.nix @@ -7,11 +7,11 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "pcsx2-bin"; - version = "2.1.17"; + version = "2.1.116"; src = fetchurl { url = "https://github.com/PCSX2/pcsx2/releases/download/v${finalAttrs.version}/pcsx2-v${finalAttrs.version}-macos-Qt.tar.xz"; - hash = "sha256-WuxvMcGuCyTAc99JkUjG0qcV7SXWy9fmaZR0+8iGepQ="; + hash = "sha256-QKblXvqziToYOhSf7k9c/5J5NviRqo4NBLFCN1Q+0VA="; }; nativeBuildInputs = [ makeWrapper ]; From ebaf3f00acf638862db61cf1852eddf53e476adb Mon Sep 17 00:00:00 2001 From: Matteo Pacini Date: Wed, 28 Aug 2024 08:11:13 +0100 Subject: [PATCH 061/235] pcsx2-bin: simplified updateScript --- pkgs/by-name/pc/pcsx2-bin/update.sh | 39 ++++++----------------------- 1 file changed, 8 insertions(+), 31 deletions(-) diff --git a/pkgs/by-name/pc/pcsx2-bin/update.sh b/pkgs/by-name/pc/pcsx2-bin/update.sh index 872899694278..8748a75a3bbc 100755 --- a/pkgs/by-name/pc/pcsx2-bin/update.sh +++ b/pkgs/by-name/pc/pcsx2-bin/update.sh @@ -3,41 +3,18 @@ set -euo pipefail -ROOT="$(dirname "$(readlink -f "$0")")" -if [[ ! "$(basename "$ROOT")" == "pcsx2-bin" || ! -f "$ROOT/package.nix" ]]; then - echo "error: Not in the pcsx2-bin folder" >&2 - exit 1 -fi +cd "$(dirname "$0")" || exit 1 -PACKAGE_NIX="$ROOT/package.nix" +# Grab latest version, ignoring "latest" and "preview" tags +LATEST_VER="$(curl --fail -s ${GITHUB_TOKEN:+-u ":$GITHUB_TOKEN"} "https://api.github.com/repos/PCSX2/pcsx2/releases" | jq -r '.[0].tag_name' | sed 's/^v//')" +CURRENT_VER="$(grep -oP 'version = "\K[^"]+' package.nix)" -# Grab latest (pre)release version -PCSX2_LATEST_VER="$(curl --fail -s ${GITHUB_TOKEN:+-u ":$GITHUB_TOKEN"} "https://api.github.com/repos/PCSX2/pcsx2/releases" | jq -r '.[0].tag_name' | sed 's/^v//')" -PCSX2_CURRENT_VER="$(grep -oP 'version = "\K[^"]+' "$PACKAGE_NIX")" - -if [[ "$PCSX2_LATEST_VER" == "$PCSX2_CURRENT_VER" ]]; then +if [[ "$LATEST_VER" == "$CURRENT_VER" ]]; then echo "pcsx2-bin is up-to-date" exit 0 fi -get_hash() { - # $1: URL - nix-hash --to-sri --type sha256 "$(nix-prefetch-url --type sha256 "$1")" -} +HASH="$(nix-hash --to-sri --type sha256 "$(nix-prefetch-url --type sha256 "https://github.com/PCSX2/pcsx2/releases/download/v${LATEST_VER}/pcsx2-v${LATEST_VER}-macos-Qt.tar.xz")")" -replace_hash_in_file() { - # $1: file - # $2: new hash - sed -i "s#hash = \".*\"#hash = \"$2\"#g" "$1" -} - -replace_version_in_file() { - # $1: file - # $2: new version - sed -i "s#version = \".*\";#version = \"$2\";#g" "$1" -} - -PCSX2_DARWIN_HASH="$(get_hash "https://github.com/PCSX2/pcsx2/releases/download/v${PCSX2_LATEST_VER}/pcsx2-v${PCSX2_LATEST_VER}-macos-Qt.tar.xz")" - -replace_hash_in_file "$PACKAGE_NIX" "$PCSX2_DARWIN_HASH" -replace_version_in_file "$PACKAGE_NIX" "$PCSX2_LATEST_VER" +sed -i "s#hash = \".*\"#hash = \"$HASH\"#g" package.nix +sed -i "s#version = \".*\";#version = \"$LATEST_VER\";#g" package.nix From 78e1247f1bcd3740f742adc5ced9380586c9deb7 Mon Sep 17 00:00:00 2001 From: a-kenji Date: Wed, 28 Aug 2024 11:18:20 +0200 Subject: [PATCH 062/235] cosmic-bg: subtituteInPlace use --replace-fail --- pkgs/by-name/co/cosmic-bg/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/co/cosmic-bg/package.nix b/pkgs/by-name/co/cosmic-bg/package.nix index e6b7d37c2696..f0a81198f680 100644 --- a/pkgs/by-name/co/cosmic-bg/package.nix +++ b/pkgs/by-name/co/cosmic-bg/package.nix @@ -30,7 +30,7 @@ rustPlatform.buildRustPackage rec { }; postPatch = '' - substituteInPlace justfile --replace '#!/usr/bin/env' "#!$(command -v env)" + substituteInPlace justfile --replace-fail '#!/usr/bin/env' "#!$(command -v env)" ''; nativeBuildInputs = [ just pkg-config makeBinaryWrapper ]; From 60fbd9b7d9b5d369dbe510344ddde1c06186685e Mon Sep 17 00:00:00 2001 From: maralorn Date: Thu, 29 Aug 2024 01:31:03 +0200 Subject: [PATCH 063/235] haskellPackages: regenerate package set based on current config This commit has been generated by maintainers/scripts/haskell/regenerate-hackage-packages.sh --- .../transitive-broken.yaml | 17 +++++++++++++++-- .../haskell-modules/hackage-packages.nix | 12 +++++++++++- 2 files changed, 26 insertions(+), 3 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml index b5c5719ff0d2..6f0206c3e7c7 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml @@ -783,6 +783,7 @@ dont-distribute-packages: - category - category-extras - cattrap + - cauldron - cctools-workqueue - cef3-simple - ceilometer-common @@ -1418,6 +1419,9 @@ dont-distribute-packages: - fpnla-examples - frame-markdown - freckle-app + - freckle-http + - freckle-memcached + - freckle-otel - free-functors - free-game - free-theorems-seq-webui @@ -2213,6 +2217,8 @@ dont-distribute-packages: - hsyslog-tcp - html-kure - html2hamlet + - htmx-lucid + - htmx-servant - htoml-parse - htsn-import - http-client-auth @@ -2585,6 +2591,7 @@ dont-distribute-packages: - list-t-html-parser - list-tuple - list-witnesses + - list1 - listenbrainz-client - liszt - lit @@ -2913,7 +2920,7 @@ dont-distribute-packages: - nonlinear-optimization-backprop - not-gloss - not-gloss-examples - - nothunks_0_2_1_1 + - nothunks_0_3_0_0 - notmuch-web - now-haskell - nri-env-parser @@ -2963,7 +2970,6 @@ dont-distribute-packages: - opc-xml-da-client - open-adt-tutorial - open-typerep - - opencv-extra - openpgp-Crypto - openpgp-crypto-api - openssh-github-keys @@ -3463,6 +3469,7 @@ dont-distribute-packages: - rv - s-expression - safe-coloured-text-layout-gen + - safe-coloured-text-layout-gen_0_0_0_1 - safe-coupling - safe-failure - safe-failure-cme @@ -3820,8 +3827,10 @@ dont-distribute-packages: - syb-with-class-instances-text - sydtest-amqp - sydtest-webdriver-screenshot + - sydtest-webdriver-screenshot_0_1_0_0 - sydtest-webdriver-yesod - sydtest-yesod + - sydtest_0_17_0_0 - sylvia - symantic-atom - symantic-http-demo @@ -4004,6 +4013,7 @@ dont-distribute-packages: - type-sub-th - typed-admin - typed-encoding-encoding + - typed-gui - typed-streams - typedflow - typelevel @@ -4185,6 +4195,9 @@ dont-distribute-packages: - wheb-strapped - whitespace - wholepixels + - wikimusic-api + - wikimusic-api-spec + - wikimusic-ssr - wikipedia4epub - wild-bind-indicator - wild-bind-task-x11 diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 4cceafb56bc2..2a4a28a9f893 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -62683,6 +62683,7 @@ self: { ]; description = "Toy dependency injection framework"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; mainProgram = "cauldron-example-wiring"; }) {}; @@ -113267,6 +113268,7 @@ self: { ]; description = "..."; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; }) {}; "freckle-kafka" = callPackage @@ -113314,6 +113316,7 @@ self: { ]; description = ".."; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; }) {}; "freckle-otel" = callPackage @@ -113339,6 +113342,7 @@ self: { ]; description = "..."; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; }) {}; "freckle-prelude" = callPackage @@ -165844,6 +165848,7 @@ self: { libraryHaskellDepends = [ base htmx lucid2 text ]; description = "Use htmx with lucid"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; }) {}; "htmx-servant" = callPackage @@ -165857,6 +165862,7 @@ self: { ]; description = "Use htmx with servant"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; }) {}; "htn" = callPackage @@ -195397,6 +195403,7 @@ self: { libraryHaskellDepends = [ base smash ]; description = "Helpers for working with NonEmpty lists"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "listenbrainz-client" = callPackage @@ -226391,7 +226398,6 @@ self: { ]; description = "Haskell binding to OpenCV-3.x extra modules"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "opencv-raw" = callPackage @@ -317054,6 +317060,7 @@ self: { testHaskellDepends = [ base ]; description = "GUI framework based on typed-fsm"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; }) {}; "typed-process" = callPackage @@ -332120,6 +332127,7 @@ self: { executableHaskellDepends = [ base ]; testHaskellDepends = [ base tasty tasty-hunit ]; license = lib.licenses.gpl3Only; + hydraPlatforms = lib.platforms.none; mainProgram = "wikimusic-api-exe"; }) {}; @@ -332139,6 +332147,7 @@ self: { time uuid vector wikimusic-model-hs ]; license = lib.licenses.gpl3Only; + hydraPlatforms = lib.platforms.none; }) {}; "wikimusic-model-hs" = callPackage @@ -332186,6 +332195,7 @@ self: { ]; executableHaskellDepends = [ base relude ]; license = lib.licenses.gpl3Only; + hydraPlatforms = lib.platforms.none; mainProgram = "wikimusic-ssr-exe"; }) {}; From 9ac9aaddf04b3a371450bb8bca60b52854b4755e Mon Sep 17 00:00:00 2001 From: maralorn Date: Thu, 29 Aug 2024 01:35:31 +0200 Subject: [PATCH 064/235] haskellPackages.opencv-extra: Mark broken --- .../haskell-modules/configuration-hackage2nix/broken.yaml | 1 + pkgs/development/haskell-modules/hackage-packages.nix | 2 ++ 2 files changed, 3 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml index d921f4dd1c83..44e92038874d 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml @@ -4255,6 +4255,7 @@ broken-packages: - OpenCLWrappers # failure in job https://hydra.nixos.org/build/233222391 at 2023-09-02 - opencog-atomspace # failure in job https://hydra.nixos.org/build/233237785 at 2023-09-02 - opencv # failure in job https://hydra.nixos.org/build/252717564 at 2024-03-16 + - opencv-extra # broken eval by missing system dependency - opencv-raw # failure in job https://hydra.nixos.org/build/233211286 at 2023-09-02 - opendatatable # failure in job https://hydra.nixos.org/build/233254960 at 2023-09-02 - openexchangerates # failure in job https://hydra.nixos.org/build/233203238 at 2023-09-02 diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 2a4a28a9f893..8c71a28fcfdd 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -226398,6 +226398,8 @@ self: { ]; description = "Haskell binding to OpenCV-3.x extra modules"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "opencv-raw" = callPackage From 6cd5fa6f0656ad90623186a711ff1c6a53b22fcb Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 29 Aug 2024 01:50:03 +0000 Subject: [PATCH 065/235] codeql: 2.18.2 -> 2.18.3 --- pkgs/development/tools/analysis/codeql/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/analysis/codeql/default.nix b/pkgs/development/tools/analysis/codeql/default.nix index 47ca566551d5..d241890f406c 100644 --- a/pkgs/development/tools/analysis/codeql/default.nix +++ b/pkgs/development/tools/analysis/codeql/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "codeql"; - version = "2.18.2"; + version = "2.18.3"; dontConfigure = true; dontBuild = true; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { src = fetchzip { url = "https://github.com/github/codeql-cli-binaries/releases/download/v${version}/codeql.zip"; - hash = "sha256-WyfBiYvPi+iQkrsYMdTUFP5yStzyRQMqNbgD9IKFEMs="; + hash = "sha256-GLk8ayrOZJGu4NzU6qW4HvCbW5lil31sZ70kWHuJVwA="; }; nativeBuildInputs = [ From 747970800ed2623933f81ce3ad2a4fa879386567 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 29 Aug 2024 04:33:48 +0000 Subject: [PATCH 066/235] jbrowse: 2.13.1 -> 2.14.0 --- pkgs/applications/science/biology/jbrowse/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/biology/jbrowse/default.nix b/pkgs/applications/science/biology/jbrowse/default.nix index ce39ca8f425a..de3e1138970b 100644 --- a/pkgs/applications/science/biology/jbrowse/default.nix +++ b/pkgs/applications/science/biology/jbrowse/default.nix @@ -2,11 +2,11 @@ let pname = "jbrowse"; - version = "2.13.1"; + version = "2.14.0"; src = fetchurl { url = "https://github.com/GMOD/jbrowse-components/releases/download/v${version}/jbrowse-desktop-v${version}-linux.AppImage"; - sha256 = "sha256-JxV7ZxA3/YMG6ziYOA8QiBVth9UunVGJLTy1E110y6w="; + sha256 = "sha256-fxXOUB+glJmg4WdL+mNfkp0O4iUsl8L1EuIYpBO1gRA="; }; appimageContents = appimageTools.extractType2 { From a69b64acdc2b0d7b8a64eaba18cd2e10d87cd15c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 29 Aug 2024 04:34:47 +0000 Subject: [PATCH 067/235] metal-cli: 0.24.0 -> 0.25.0 --- pkgs/development/tools/metal-cli/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/metal-cli/default.nix b/pkgs/development/tools/metal-cli/default.nix index 42bf1ac0d5f7..62b69b6318ff 100644 --- a/pkgs/development/tools/metal-cli/default.nix +++ b/pkgs/development/tools/metal-cli/default.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "metal-cli"; - version = "0.24.0"; + version = "0.25.0"; src = fetchFromGitHub { owner = "equinix"; repo = pname; rev = "v${version}"; - hash = "sha256-fHX0bQj065aPihd/4jPUWWSi5kAmHov8720KOjsFeFs="; + hash = "sha256-+hpsGFZHuVhh+fKVcap0vhoUmRs3xPgUwW8SD56m6uI="; }; vendorHash = "sha256-X+GfM73LAWk2pT4ZOPT2pg8YaKyT+SNjQ14LgB+C7Wo="; From bbc4d99f2e7dfcfcd76fa5c40cfd2b144f4ae809 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 29 Aug 2024 09:18:26 +0000 Subject: [PATCH 068/235] retrospy: 6.5 -> 6.6 --- pkgs/by-name/re/retrospy/deps.nix | 125 +++++++-------------------- pkgs/by-name/re/retrospy/package.nix | 4 +- 2 files changed, 31 insertions(+), 98 deletions(-) diff --git a/pkgs/by-name/re/retrospy/deps.nix b/pkgs/by-name/re/retrospy/deps.nix index ba40f58191cf..1c0186bf83e8 100644 --- a/pkgs/by-name/re/retrospy/deps.nix +++ b/pkgs/by-name/re/retrospy/deps.nix @@ -2,135 +2,68 @@ # Please dont edit it manually, your changes might get overwritten! { fetchNuGet }: [ - (fetchNuGet { pname = "Avalonia"; version = "11.0.11"; hash = "sha256-vyX1hwqHQBIckXl/IYctR7BtYzM/62iZ6Y3Hsrlgww8="; }) - (fetchNuGet { pname = "Avalonia.Angle.Windows.Natives"; version = "2.1.0.2023020321"; hash = "sha256-TWop9cvak6cMv2vrA/GlpuYBxS8Fuj5UmupGIV7Q5Ks="; }) + (fetchNuGet { pname = "Avalonia"; version = "11.1.3"; hash = "sha256-kz+k/vkuWoL0XBvRT8SadMOmmRCFk9W/J4k/IM6oYX0="; }) + (fetchNuGet { pname = "Avalonia.Angle.Windows.Natives"; version = "2.1.22045.20230930"; hash = "sha256-RxPcWUT3b/+R3Tu5E5ftpr5ppCLZrhm+OTsi0SwW3pc="; }) (fetchNuGet { pname = "Avalonia.BuildServices"; version = "0.0.29"; hash = "sha256-WPHRMNowRnYSCh88DWNBCltWsLPyOfzXGzBqLYE7tRY="; }) - (fetchNuGet { pname = "Avalonia.Controls.ColorPicker"; version = "11.0.10"; hash = "sha256-G0ooIjNRW5YHKvQ6qPxe5gaE3HPwGfiCQUo34PSxXGg="; }) - (fetchNuGet { pname = "Avalonia.Controls.DataGrid"; version = "11.0.10"; hash = "sha256-0v4evkV0jbLffwfQG/QO/RQbHXlCBmFv8A2pBZjS5Y0="; }) - (fetchNuGet { pname = "Avalonia.Desktop"; version = "11.0.11"; hash = "sha256-62JpECNZV60qiS1KCTm9ojnUXOx5yEP4Mjo3/OZszMQ="; }) - (fetchNuGet { pname = "Avalonia.Diagnostics"; version = "11.0.10"; hash = "sha256-itnN+LIZ2S+1CjD0ZS/woKtpgWbC/srMYzbYfX3a8LA="; }) - (fetchNuGet { pname = "Avalonia.FreeDesktop"; version = "11.0.11"; hash = "sha256-fVM+D16obEbRwRu+QF617jpQQWiHpA/Lzx2m0qK7BZ4="; }) - (fetchNuGet { pname = "Avalonia.Native"; version = "11.0.11"; hash = "sha256-8Co6wR74u5jdAeN0Fx7LJf8vOUt84auomZz3TFSdlWw="; }) - (fetchNuGet { pname = "Avalonia.ReactiveUI"; version = "11.0.11"; hash = "sha256-8/ixQaKhkv6Jk8Y/VF6HtCkm/9M6MEV7XFNLwOsjtzo="; }) - (fetchNuGet { pname = "Avalonia.Remote.Protocol"; version = "11.0.10"; hash = "sha256-qtvlczTg2yUZWyyqXkkboB8lK9aYv+STbfDvSKb55Vw="; }) - (fetchNuGet { pname = "Avalonia.Remote.Protocol"; version = "11.0.11"; hash = "sha256-A4X9fY26YtydAn4TjJ7bYdBi7R+Ncghr4F2DTl/Riaw="; }) - (fetchNuGet { pname = "Avalonia.Skia"; version = "11.0.11"; hash = "sha256-s5fmFi207DZVRejw5PlvnPsdo9voet/l2VJtgwLDJYs="; }) - (fetchNuGet { pname = "Avalonia.Themes.Fluent"; version = "11.0.11"; hash = "sha256-cvLzWHt2P2dmJ690mv0wejk2VCa0n1xX4sYCim+7Gxo="; }) - (fetchNuGet { pname = "Avalonia.Themes.Simple"; version = "11.0.10"; hash = "sha256-54fc2g1yvM7pPRaF062lSjXaQDe2i61xQRM8m81vWm8="; }) - (fetchNuGet { pname = "Avalonia.Win32"; version = "11.0.11"; hash = "sha256-NvAN79jLjoqZrp5yWkJoihjO83r49j8N57PAWDY/kwE="; }) - (fetchNuGet { pname = "Avalonia.X11"; version = "11.0.11"; hash = "sha256-1hsU8zBxQGUp/wAx3qSQfxte+fGsSmH9TN3OHW0rNOk="; }) + (fetchNuGet { pname = "Avalonia.Controls.ColorPicker"; version = "11.1.3"; hash = "sha256-W17Wvmi8/47cf5gCF3QRcaKLz0ZpXtZYCCkaERkbyXU="; }) + (fetchNuGet { pname = "Avalonia.Controls.DataGrid"; version = "11.1.3"; hash = "sha256-OOKTovi5kckn0x/8dMcq56cvq57UVMLzA9LRXDxm2Vc="; }) + (fetchNuGet { pname = "Avalonia.Desktop"; version = "11.1.3"; hash = "sha256-mNFscbtyqLlodzGa3SJ3oVY467JjWwY45LxZiKDAn/w="; }) + (fetchNuGet { pname = "Avalonia.Diagnostics"; version = "11.1.3"; hash = "sha256-PD9ZIeBZJrLaVDjmWBz4GocrdUSNUou11gAERU+xWDo="; }) + (fetchNuGet { pname = "Avalonia.FreeDesktop"; version = "11.1.3"; hash = "sha256-nUBhSRE0Bly3dVC14wXwU19vP3g0VbE4bCUohx7DCVI="; }) + (fetchNuGet { pname = "Avalonia.Native"; version = "11.1.3"; hash = "sha256-byAVGW7XgkyzDj1TnqaCeDU/xTD9z8ACGrSJgwJ+XXs="; }) + (fetchNuGet { pname = "Avalonia.ReactiveUI"; version = "11.1.3"; hash = "sha256-1VCFAJPKpLx9KyM5AK/8XbGtxNpGriQEFqidgN9eCtE="; }) + (fetchNuGet { pname = "Avalonia.Remote.Protocol"; version = "11.1.3"; hash = "sha256-CKF+62zCbK1Rd/HiC6MGrags3ylXrVQ1lni3Um0Muqk="; }) + (fetchNuGet { pname = "Avalonia.Skia"; version = "11.1.3"; hash = "sha256-EtB86g+nz6i8wL6xytMkYl2Ehgt3GFMMNPzQfhbfopM="; }) + (fetchNuGet { pname = "Avalonia.Themes.Fluent"; version = "11.1.3"; hash = "sha256-qfmRK2gLGSgHx4dNIeVesWxLUjcook9ET2xru/Xyiw8="; }) + (fetchNuGet { pname = "Avalonia.Themes.Simple"; version = "11.1.3"; hash = "sha256-Q6jL5J/6aBtOY85I641RVp8RpuqJbPy6C6LxnRkFtMM="; }) + (fetchNuGet { pname = "Avalonia.Win32"; version = "11.1.3"; hash = "sha256-zcxTpEnpLf50p8Yaiylk5/CS9MNDe7lK1uX1CPaJBUc="; }) + (fetchNuGet { pname = "Avalonia.X11"; version = "11.1.3"; hash = "sha256-M2+y661/znDxZRdwNRIQi4mS2m6T4kQkBbYeE7KyQAw="; }) (fetchNuGet { pname = "ColorTextBlock.Avalonia"; version = "11.0.2"; hash = "sha256-FmaYhszWp/VCIp4BUnWXGMQr62WzVNUo/IKEbN59bX8="; }) (fetchNuGet { pname = "Desktop.Robot"; version = "1.5.0"; hash = "sha256-ITeVX2oAcST/HMbG4Ygg+inPuciXZaBVJ5Ozk/Zl6Pg="; }) (fetchNuGet { pname = "DialogHost.Avalonia"; version = "0.7.7"; hash = "sha256-pXRv4P4i/zxZ1Ucq3kaGs9HKNG+4CNB4n33YswbjEio="; }) (fetchNuGet { pname = "DynamicData"; version = "7.9.5"; hash = "sha256-3XjOMuFathku9oWyss360+Ze5UMP7tSmUbMoax7qONU="; }) - (fetchNuGet { pname = "HarfBuzzSharp"; version = "7.3.0"; hash = "sha256-LlPQO/NYgIMWicvLOtWsQzCp512QpIImYDP9/n2rDOc="; }) - (fetchNuGet { pname = "HarfBuzzSharp.NativeAssets.Linux"; version = "7.3.0"; hash = "sha256-AEHjgqX0o+Fob0SeZ6EikGKoEe6rRxess5fVJ31UL0U="; }) - (fetchNuGet { pname = "HarfBuzzSharp.NativeAssets.macOS"; version = "7.3.0"; hash = "sha256-6oFcdKb17UX5wyAUeCCKXGvzkf0w3MNdZOVMvs54tqw="; }) - (fetchNuGet { pname = "HarfBuzzSharp.NativeAssets.WebAssembly"; version = "7.3.0"; hash = "sha256-9VI0xCavuuIIStuQ7ipBfWu5HrAt+Kk/F2j57C1llTU="; }) - (fetchNuGet { pname = "HarfBuzzSharp.NativeAssets.Win32"; version = "7.3.0"; hash = "sha256-WnB7l73hneU9Kpbm8S9zEYbZHjFre24vWz0vl8+v28M="; }) + (fetchNuGet { pname = "HarfBuzzSharp"; version = "7.3.0.2"; hash = "sha256-ibgoqzT1NV7Qo5e7X2W6Vt7989TKrkd2M2pu+lhSDg8="; }) + (fetchNuGet { pname = "HarfBuzzSharp.NativeAssets.Linux"; version = "7.3.0.2"; hash = "sha256-SSfyuyBaduGobJW+reqyioWHhFWsQ+FXa2Gn7TiWxrU="; }) + (fetchNuGet { pname = "HarfBuzzSharp.NativeAssets.macOS"; version = "7.3.0.2"; hash = "sha256-dmEqR9MmpCwK8AuscfC7xUlnKIY7+Nvi06V0u5Jff08="; }) + (fetchNuGet { pname = "HarfBuzzSharp.NativeAssets.WebAssembly"; version = "7.3.0.2"; hash = "sha256-aEZr9uKAlCTeeHoYNR1Rs6L3P54765CemyrgJF8x09c="; }) + (fetchNuGet { pname = "HarfBuzzSharp.NativeAssets.Win32"; version = "7.3.0.2"; hash = "sha256-x4iM3NHs9VyweG57xA74yd4uLuXly147ooe0mvNQ8zo="; }) (fetchNuGet { pname = "LibUsbDotNet"; version = "3.0.102-alpha"; hash = "sha256-oJGtzJvnKM53fcZLnvQZKvBOwjAiH/T7o+b8IhUyHxY="; }) (fetchNuGet { pname = "Markdown.Avalonia.Tight"; version = "11.0.2"; hash = "sha256-9P3/ZCF1psp8VoZMzJJlnoqz2y2EytmBGDc4QXIS4tc="; }) - (fetchNuGet { pname = "MessageBox.Avalonia"; version = "3.1.5.1"; hash = "sha256-C15vOuNgsvdXq4e0G2C2Umwmq2rF7IoHxV5lUSSMFdA="; }) + (fetchNuGet { pname = "MessageBox.Avalonia"; version = "3.1.6"; hash = "sha256-Jg7Ul2JkLq9eUvd42vD8B7itsZYtxHhm4XRQWHkhLN0="; }) (fetchNuGet { pname = "MicroCom.Runtime"; version = "0.11.0"; hash = "sha256-VdwpP5fsclvNqJuppaOvwEwv2ofnAI5ZSz2V+UEdLF0="; }) - (fetchNuGet { pname = "Microsoft.CodeAnalysis.Analyzers"; version = "3.0.0"; hash = "sha256-KDbCfsBWSJ5ohEXUKp1s1LX9xA2NPvXE/xVzj68EdC0="; }) - (fetchNuGet { pname = "Microsoft.CodeAnalysis.Common"; version = "3.8.0"; hash = "sha256-3G9vSc/gHH7FWgOySLTut1+eEaf3H66qcPOvNPLOx4o="; }) - (fetchNuGet { pname = "Microsoft.CodeAnalysis.CSharp"; version = "3.8.0"; hash = "sha256-i/r3V/No/VzqmJlWxpGoirvlbJDbBPa/ONZtzYrxuc4="; }) - (fetchNuGet { pname = "Microsoft.CodeAnalysis.CSharp.Scripting"; version = "3.8.0"; hash = "sha256-fA9Qu+vTyMZ9REzxJ4aMg/SHCDRk4q9k4ZGUdynoHnA="; }) - (fetchNuGet { pname = "Microsoft.CodeAnalysis.Scripting.Common"; version = "3.8.0"; hash = "sha256-866jMHp8kbc1FYpKuUWnd7ViU6kGJTAxPcL/IjXrT0I="; }) - (fetchNuGet { pname = "Microsoft.CSharp"; version = "4.3.0"; hash = "sha256-a3dAiPaVuky0wpcHmpTVtAQJNGZ2v91/oArA+dpJgj8="; }) - (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.1.0"; hash = "sha256-FeM40ktcObQJk4nMYShB61H/E8B7tIKfl9ObJ0IOcCM="; }) - (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "2.1.2"; hash = "sha256-gYQQO7zsqG+OtN4ywYQyfsiggS2zmxw4+cPXlK+FB5Q="; }) - (fetchNuGet { pname = "Microsoft.NETCore.Targets"; version = "1.1.0"; hash = "sha256-0AqQ2gMS8iNlYkrD+BxtIg7cXMnr9xZHtKAuN4bjfaQ="; }) (fetchNuGet { pname = "Microsoft.Win32.SystemEvents"; version = "6.0.0"; hash = "sha256-N9EVZbl5w1VnMywGXyaVWzT9lh84iaJ3aD48hIBk1zA="; }) (fetchNuGet { pname = "Newtonsoft.Json"; version = "13.0.3"; hash = "sha256-hy/BieY4qxBWVVsDqqOPaLy1QobiIapkbrESm6v2PHc="; }) (fetchNuGet { pname = "NodaTime"; version = "3.1.11"; hash = "sha256-ZvJlCEjq61KS3qr4Lw/C+yyagic4rESZ7qa0RGul/sU="; }) (fetchNuGet { pname = "ReactiveUI"; version = "18.3.1"; hash = "sha256-1rf4icGRKTR3XIWJpkQJCG7ObRM+72ITB5K+ND1is9M="; }) - (fetchNuGet { pname = "runtime.any.System.Collections"; version = "4.3.0"; hash = "sha256-4PGZqyWhZ6/HCTF2KddDsbmTTjxs2oW79YfkberDZS8="; }) - (fetchNuGet { pname = "runtime.any.System.Globalization"; version = "4.3.0"; hash = "sha256-PaiITTFI2FfPylTEk7DwzfKeiA/g/aooSU1pDcdwWLU="; }) - (fetchNuGet { pname = "runtime.any.System.IO"; version = "4.3.0"; hash = "sha256-vej7ySRhyvM3pYh/ITMdC25ivSd0WLZAaIQbYj/6HVE="; }) - (fetchNuGet { pname = "runtime.any.System.Reflection"; version = "4.3.0"; hash = "sha256-ns6f++lSA+bi1xXgmW1JkWFb2NaMD+w+YNTfMvyAiQk="; }) - (fetchNuGet { pname = "runtime.any.System.Reflection.Extensions"; version = "4.3.0"; hash = "sha256-Y2AnhOcJwJVYv7Rp6Jz6ma0fpITFqJW+8rsw106K2X8="; }) - (fetchNuGet { pname = "runtime.any.System.Reflection.Primitives"; version = "4.3.0"; hash = "sha256-LkPXtiDQM3BcdYkAm5uSNOiz3uF4J45qpxn5aBiqNXQ="; }) - (fetchNuGet { pname = "runtime.any.System.Resources.ResourceManager"; version = "4.3.0"; hash = "sha256-9EvnmZslLgLLhJ00o5MWaPuJQlbUFcUF8itGQNVkcQ4="; }) - (fetchNuGet { pname = "runtime.any.System.Runtime"; version = "4.3.0"; hash = "sha256-qwhNXBaJ1DtDkuRacgHwnZmOZ1u9q7N8j0cWOLYOELM="; }) - (fetchNuGet { pname = "runtime.any.System.Runtime.Handles"; version = "4.3.0"; hash = "sha256-PQRACwnSUuxgVySO1840KvqCC9F8iI9iTzxNW0RcBS4="; }) - (fetchNuGet { pname = "runtime.any.System.Runtime.InteropServices"; version = "4.3.0"; hash = "sha256-Kaw5PnLYIiqWbsoF3VKJhy7pkpoGsUwn4ZDCKscbbzA="; }) - (fetchNuGet { pname = "runtime.any.System.Text.Encoding"; version = "4.3.0"; hash = "sha256-Q18B9q26MkWZx68exUfQT30+0PGmpFlDgaF0TnaIGCs="; }) - (fetchNuGet { pname = "runtime.any.System.Threading.Tasks"; version = "4.3.0"; hash = "sha256-agdOM0NXupfHbKAQzQT8XgbI9B8hVEh+a/2vqeHctg4="; }) - (fetchNuGet { pname = "runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; hash = "sha256-LXUPLX3DJxsU1Pd3UwjO1PO9NM2elNEDXeu2Mu/vNps="; }) - (fetchNuGet { pname = "runtime.fedora.23-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; hash = "sha256-qeSqaUI80+lqw5MK4vMpmO0CZaqrmYktwp6L+vQAb0I="; }) - (fetchNuGet { pname = "runtime.fedora.24-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; hash = "sha256-SrHqT9wrCBsxILWtaJgGKd6Odmxm8/Mh7Kh0CUkZVzA="; }) (fetchNuGet { pname = "runtime.linux-arm.runtime.native.System.IO.Ports"; version = "8.0.0"; hash = "sha256-m5+od7ZhlzImwSE9E7Qq1nH3A3muXwCnsvrVUoJ7+WE="; }) (fetchNuGet { pname = "runtime.linux-arm64.runtime.native.System.IO.Ports"; version = "8.0.0"; hash = "sha256-IgbG3HT3A0VItWl5asE7Hk0zaQjQneKQS9f65cQAjLI="; }) (fetchNuGet { pname = "runtime.linux-x64.runtime.native.System.IO.Ports"; version = "8.0.0"; hash = "sha256-44oujSHhc0Nl2WCvLYkScrAyqNAlbGfOnlzPwCofwlA="; }) - (fetchNuGet { pname = "runtime.native.System"; version = "4.3.0"; hash = "sha256-ZBZaodnjvLXATWpXXakFgcy6P+gjhshFXmglrL5xD5Y="; }) (fetchNuGet { pname = "runtime.native.System.IO.Ports"; version = "8.0.0"; hash = "sha256-BqExVU/zHj7o++mzOpY9y+i9yZZVbcGmO/D4mRzigY8="; }) - (fetchNuGet { pname = "runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; hash = "sha256-Jy01KhtcCl2wjMpZWH+X3fhHcVn+SyllWFY8zWlz/6I="; }) - (fetchNuGet { pname = "runtime.opensuse.13.2-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; hash = "sha256-wyv00gdlqf8ckxEdV7E+Ql9hJIoPcmYEuyeWb5Oz3mM="; }) - (fetchNuGet { pname = "runtime.opensuse.42.1-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; hash = "sha256-zi+b4sCFrA9QBiSGDD7xPV27r3iHGlV99gpyVUjRmc4="; }) (fetchNuGet { pname = "runtime.osx-arm64.runtime.native.System.IO.Ports"; version = "8.0.0"; hash = "sha256-oFMF60yyTy3fXwLlXJkNUtzdRz4EyxevAUIcfcVESCE="; }) (fetchNuGet { pname = "runtime.osx-x64.runtime.native.System.IO.Ports"; version = "8.0.0"; hash = "sha256-b2J9DcunMtChpuyNC0XN39Z01Wr738HI/syJW1n9bfE="; }) - (fetchNuGet { pname = "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; hash = "sha256-gybQU6mPgaWV3rBG2dbH6tT3tBq8mgze3PROdsuWnX0="; }) - (fetchNuGet { pname = "runtime.rhel.7-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; hash = "sha256-VsP72GVveWnGUvS/vjOQLv1U80H2K8nZ4fDAmI61Hm4="; }) - (fetchNuGet { pname = "runtime.ubuntu.14.04-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; hash = "sha256-4yKGa/IrNCKuQ3zaDzILdNPD32bNdy6xr5gdJigyF5g="; }) - (fetchNuGet { pname = "runtime.ubuntu.16.04-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; hash = "sha256-HmdJhhRsiVoOOCcUvAwdjpMRiyuSwdcgEv2j9hxi+Zc="; }) - (fetchNuGet { pname = "runtime.ubuntu.16.10-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; hash = "sha256-pVFUKuPPIx0edQKjzRon3zKq8zhzHEzko/lc01V/jdw="; }) - (fetchNuGet { pname = "runtime.unix.System.Diagnostics.Debug"; version = "4.3.0"; hash = "sha256-ReoazscfbGH+R6s6jkg5sIEHWNEvjEoHtIsMbpc7+tI="; }) - (fetchNuGet { pname = "runtime.unix.System.Private.Uri"; version = "4.3.0"; hash = "sha256-c5tXWhE/fYbJVl9rXs0uHh3pTsg44YD1dJvyOA0WoMs="; }) - (fetchNuGet { pname = "runtime.unix.System.Runtime.Extensions"; version = "4.3.0"; hash = "sha256-l8S9gt6dk3qYG6HYonHtdlYtBKyPb29uQ6NDjmrt3V4="; }) (fetchNuGet { pname = "SharpGen.Runtime"; version = "2.1.2-beta"; hash = "sha256-wM8plHp9m+pnKPK0vu9BRburPMIL2lwxdRkQFEhjbDk="; }) (fetchNuGet { pname = "SharpGen.Runtime.COM"; version = "2.1.2-beta"; hash = "sha256-VGmWpeLV4v8gfqtJKKU43rUad9CDgdIO+lmUUa65XJE="; }) - (fetchNuGet { pname = "SixLabors.ImageSharp"; version = "3.1.4"; hash = "sha256-zOqHVIInvJiqmx4JF+8USYvdKAGRZVUqQpdncrrjRjM="; }) - (fetchNuGet { pname = "SkiaSharp"; version = "2.88.7"; hash = "sha256-Ip3afwTr4QOqtwOUKqK6g/9Ug4dMSebTci5K29Jc3Dg="; }) - (fetchNuGet { pname = "SkiaSharp.NativeAssets.Linux"; version = "2.88.7"; hash = "sha256-QdQRN1IBjqohmI8U+6WJRPgOsh8a9soN2UvVObs1H1w="; }) - (fetchNuGet { pname = "SkiaSharp.NativeAssets.macOS"; version = "2.88.7"; hash = "sha256-WgPldXSqPMm0TrdUWAyjge5rcRhd9G3/Ix/v/2NQvBc="; }) - (fetchNuGet { pname = "SkiaSharp.NativeAssets.WebAssembly"; version = "2.88.7"; hash = "sha256-oIjFF+Rv+g8AKyNaaVAgnHX3eeP/l8K2sgHs9bRyUMw="; }) - (fetchNuGet { pname = "SkiaSharp.NativeAssets.Win32"; version = "2.88.7"; hash = "sha256-+7RxCAr+ne9MZWdXKKpV4ZbHW0k6hLD20ZFWWOCiNYU="; }) + (fetchNuGet { pname = "SixLabors.ImageSharp"; version = "3.1.5"; hash = "sha256-3UehX9T+I81nfgv2dTHlpoPgYzXFk7kHr1mmlQOCBfw="; }) + (fetchNuGet { pname = "SkiaSharp"; version = "2.88.8"; hash = "sha256-rD5gc4SnlRTXwz367uHm8XG5eAIQpZloGqLRGnvNu0A="; }) + (fetchNuGet { pname = "SkiaSharp.NativeAssets.Linux"; version = "2.88.8"; hash = "sha256-fOmNbbjuTazIasOvPkd2NPmuQHVCWPnow7AxllRGl7Y="; }) + (fetchNuGet { pname = "SkiaSharp.NativeAssets.macOS"; version = "2.88.8"; hash = "sha256-CdcrzQHwCcmOCPtS8EGtwsKsgdljnH41sFytW7N9PmI="; }) + (fetchNuGet { pname = "SkiaSharp.NativeAssets.WebAssembly"; version = "2.88.8"; hash = "sha256-GWWsE98f869LiOlqZuXMc9+yuuIhey2LeftGNk3/z3w="; }) + (fetchNuGet { pname = "SkiaSharp.NativeAssets.Win32"; version = "2.88.8"; hash = "sha256-b8Vb94rNjwPKSJDQgZ0Xv2dWV7gMVFl5GwTK/QiZPPM="; }) (fetchNuGet { pname = "Splat"; version = "14.4.1"; hash = "sha256-i1yzIVpKdFjZMI4J8H970nZCxszklgDitYTEKKz0zA8="; }) - (fetchNuGet { pname = "SSH.NET"; version = "2024.0.0"; hash = "sha256-WfJc+ykcWQaYkTkMgy3fBbC1MrwVptF8Cb9PI0iQEMo="; }) + (fetchNuGet { pname = "SSH.NET"; version = "2024.1.0"; hash = "sha256-R1KYZTq0XGO2gIiCeGzgw36ByQRxb+2Oip/NvDeZqzs="; }) (fetchNuGet { pname = "System.CodeDom"; version = "8.0.0"; hash = "sha256-uwVhi3xcvX7eiOGQi7dRETk3Qx1EfHsUfchZsEto338="; }) - (fetchNuGet { pname = "System.Collections"; version = "4.3.0"; hash = "sha256-afY7VUtD6w/5mYqrce8kQrvDIfS2GXDINDh73IjxJKc="; }) - (fetchNuGet { pname = "System.Collections.Immutable"; version = "5.0.0"; hash = "sha256-GdwSIjLMM0uVfE56VUSLVNgpW0B//oCeSFj8/hSlbM8="; }) - (fetchNuGet { pname = "System.ComponentModel.Annotations"; version = "4.5.0"; hash = "sha256-15yE2NoT9vmL9oGCaxHClQR1jLW1j1ef5hHMg55xRso="; }) (fetchNuGet { pname = "System.Configuration.ConfigurationManager"; version = "8.0.0"; hash = "sha256-xhljqSkNQk8DMkEOBSYnn9lzCSEDDq4yO910itptqiE="; }) - (fetchNuGet { pname = "System.Diagnostics.Debug"; version = "4.3.0"; hash = "sha256-fkA79SjPbSeiEcrbbUsb70u9B7wqbsdM9s1LnoKj0gM="; }) (fetchNuGet { pname = "System.Diagnostics.EventLog"; version = "8.0.0"; hash = "sha256-rt8xc3kddpQY4HEdghlBeOK4gdw5yIj4mcZhAVtk2/Y="; }) (fetchNuGet { pname = "System.Drawing.Common"; version = "6.0.0"; hash = "sha256-/9EaAbEeOjELRSMZaImS1O8FmUe8j4WuFUw1VOrPyAo="; }) - (fetchNuGet { pname = "System.Dynamic.Runtime"; version = "4.3.0"; hash = "sha256-k75gjOYimIQtLBD5NDzwwi3ZMUBPRW3jmc3evDMMJbU="; }) - (fetchNuGet { pname = "System.Globalization"; version = "4.3.0"; hash = "sha256-caL0pRmFSEsaoeZeWN5BTQtGrAtaQPwFi8YOZPZG5rI="; }) - (fetchNuGet { pname = "System.IO"; version = "4.3.0"; hash = "sha256-ruynQHekFP5wPrDiVyhNiRIXeZ/I9NpjK5pU+HPDiRY="; }) (fetchNuGet { pname = "System.IO.Pipelines"; version = "6.0.0"; hash = "sha256-xfjF4UqTMJpf8KsBWUyJlJkzPTOO/H5MW023yTYNQSA="; }) (fetchNuGet { pname = "System.IO.Ports"; version = "8.0.0"; hash = "sha256-G8j9c0erBzZfJAVlW08XoE58gPhiNWJE78sFaBV2e4Q="; }) - (fetchNuGet { pname = "System.Linq"; version = "4.3.0"; hash = "sha256-R5uiSL3l6a3XrXSSL6jz+q/PcyVQzEAByiuXZNSqD/A="; }) - (fetchNuGet { pname = "System.Linq.Expressions"; version = "4.3.0"; hash = "sha256-+3pvhZY7rip8HCbfdULzjlC9FPZFpYoQxhkcuFm2wk8="; }) (fetchNuGet { pname = "System.Management"; version = "8.0.0"; hash = "sha256-HwpfDb++q7/vxR6q57mGFgl5U0vxy+oRJ6orFKORfP0="; }) - (fetchNuGet { pname = "System.Memory"; version = "4.5.4"; hash = "sha256-3sCEfzO4gj5CYGctl9ZXQRRhwAraMQfse7yzKoRe65E="; }) (fetchNuGet { pname = "System.Numerics.Vectors"; version = "4.5.0"; hash = "sha256-qdSTIFgf2htPS+YhLGjAGiLN8igCYJnCCo6r78+Q+c8="; }) - (fetchNuGet { pname = "System.ObjectModel"; version = "4.3.0"; hash = "sha256-gtmRkWP2Kwr3nHtDh0yYtce38z1wrGzb6fjm4v8wN6Q="; }) - (fetchNuGet { pname = "System.Private.Uri"; version = "4.3.0"; hash = "sha256-fVfgcoP4AVN1E5wHZbKBIOPYZ/xBeSIdsNF+bdukIRM="; }) (fetchNuGet { pname = "System.Reactive"; version = "6.0.0"; hash = "sha256-hXB18OsiUHSCmRF3unAfdUEcbXVbG6/nZxcyz13oe9Y="; }) (fetchNuGet { pname = "System.Reactive"; version = "6.0.1"; hash = "sha256-Lo5UMqp8DsbVSUxa2UpClR1GoYzqQQcSxkfyFqB/d4Q="; }) - (fetchNuGet { pname = "System.Reflection"; version = "4.3.0"; hash = "sha256-NQSZRpZLvtPWDlvmMIdGxcVuyUnw92ZURo0hXsEshXY="; }) - (fetchNuGet { pname = "System.Reflection.Emit"; version = "4.3.0"; hash = "sha256-5LhkDmhy2FkSxulXR+bsTtMzdU3VyyuZzsxp7/DwyIU="; }) - (fetchNuGet { pname = "System.Reflection.Emit.ILGeneration"; version = "4.3.0"; hash = "sha256-mKRknEHNls4gkRwrEgi39B+vSaAz/Gt3IALtS98xNnA="; }) - (fetchNuGet { pname = "System.Reflection.Emit.Lightweight"; version = "4.3.0"; hash = "sha256-rKx4a9yZKcajloSZHr4CKTVJ6Vjh95ni+zszPxWjh2I="; }) - (fetchNuGet { pname = "System.Reflection.Extensions"; version = "4.3.0"; hash = "sha256-mMOCYzUenjd4rWIfq7zIX9PFYk/daUyF0A8l1hbydAk="; }) - (fetchNuGet { pname = "System.Reflection.Metadata"; version = "5.0.0"; hash = "sha256-Wo+MiqhcP9dQ6NuFGrQTw6hpbJORFwp+TBNTq2yhGp8="; }) - (fetchNuGet { pname = "System.Reflection.Primitives"; version = "4.3.0"; hash = "sha256-5ogwWB4vlQTl3jjk1xjniG2ozbFIjZTL9ug0usZQuBM="; }) - (fetchNuGet { pname = "System.Reflection.TypeExtensions"; version = "4.3.0"; hash = "sha256-4U4/XNQAnddgQIHIJq3P2T80hN0oPdU2uCeghsDTWng="; }) - (fetchNuGet { pname = "System.Resources.ResourceManager"; version = "4.3.0"; hash = "sha256-idiOD93xbbrbwwSnD4mORA9RYi/D/U48eRUsn/WnWGo="; }) - (fetchNuGet { pname = "System.Runtime"; version = "4.3.0"; hash = "sha256-51813WXpBIsuA6fUtE5XaRQjcWdQ2/lmEokJt97u0Rg="; }) (fetchNuGet { pname = "System.Runtime.CompilerServices.Unsafe"; version = "4.7.1"; hash = "sha256-UvyoDV8O0oY3HPG1GbA56YVdvwTGEfjYR5gW1O7IK4U="; }) - (fetchNuGet { pname = "System.Runtime.Extensions"; version = "4.3.0"; hash = "sha256-wLDHmozr84v1W2zYCWYxxj0FR0JDYHSVRaRuDm0bd/o="; }) - (fetchNuGet { pname = "System.Runtime.Handles"; version = "4.3.0"; hash = "sha256-KJ5aXoGpB56Y6+iepBkdpx/AfaJDAitx4vrkLqR7gms="; }) - (fetchNuGet { pname = "System.Runtime.InteropServices"; version = "4.3.0"; hash = "sha256-8sDH+WUJfCR+7e4nfpftj/+lstEiZixWUBueR2zmHgI="; }) (fetchNuGet { pname = "System.Security.Cryptography.ProtectedData"; version = "8.0.0"; hash = "sha256-fb0pa9sQxN+mr0vnXg1Igbx49CaOqS+GDkTfWNboUvs="; }) - (fetchNuGet { pname = "System.Text.Encoding"; version = "4.3.0"; hash = "sha256-GctHVGLZAa/rqkBNhsBGnsiWdKyv6VDubYpGkuOkBLg="; }) - (fetchNuGet { pname = "System.Text.Encoding.CodePages"; version = "4.5.1"; hash = "sha256-PIhkv59IXjyiuefdhKxS9hQfEwO9YWRuNudpo53HQfw="; }) - (fetchNuGet { pname = "System.Threading"; version = "4.3.0"; hash = "sha256-ZDQ3dR4pzVwmaqBg4hacZaVenQ/3yAF/uV7BXZXjiWc="; }) - (fetchNuGet { pname = "System.Threading.Tasks"; version = "4.3.0"; hash = "sha256-Z5rXfJ1EXp3G32IKZGiZ6koMjRu0n8C1NGrwpdIen4w="; }) - (fetchNuGet { pname = "System.Threading.Tasks.Extensions"; version = "4.5.4"; hash = "sha256-owSpY8wHlsUXn5xrfYAiu847L6fAKethlvYx97Ri1ng="; }) - (fetchNuGet { pname = "Tmds.DBus.Protocol"; version = "0.15.0"; hash = "sha256-4gk2vXDjKFaBh82gTkwg3c/5GRjiH+bvM5elfDSbKTU="; }) + (fetchNuGet { pname = "Tmds.DBus.Protocol"; version = "0.16.0"; hash = "sha256-vKYEaa1EszR7alHj48R8G3uYArhI+zh2ZgiBv955E98="; }) (fetchNuGet { pname = "Vortice.DirectInput"; version = "3.5.0"; hash = "sha256-TxUIn0YXlzWHGyMAOVVC0SiNaM2vFqa0ddFpoWH0fwI="; }) (fetchNuGet { pname = "Vortice.DirectX"; version = "3.5.0"; hash = "sha256-cHoY2+czSdj3w3qcGeCTN0iU2nY9xbMrfK80RGEoDzk="; }) (fetchNuGet { pname = "Vortice.Mathematics"; version = "1.7.8"; hash = "sha256-8tHkHDvHMT3iDKDkVIms9tZnspBaw0nbvYyXUsUGv8A="; }) diff --git a/pkgs/by-name/re/retrospy/package.nix b/pkgs/by-name/re/retrospy/package.nix index 7757fb9c44a0..a68b08617f43 100644 --- a/pkgs/by-name/re/retrospy/package.nix +++ b/pkgs/by-name/re/retrospy/package.nix @@ -12,13 +12,13 @@ , runCommandLocal }: let - version = "6.5"; + version = "6.6"; src = fetchFromGitHub { owner = "retrospy"; repo = "RetroSpy"; rev = "v${version}"; - hash = "sha256-gnk/cOxCZuBNrBgvzvEeUjGIeCGtC1uXpYBrWwTqeCQ="; + hash = "sha256-vYhFpmP9CmZz/lqNwNAvpf7pQnhKR/pdetPJqorUtMY="; }; executables = [ From c4f8cd1a4498e9803ef00b77ba9a6ea8e7884a4a Mon Sep 17 00:00:00 2001 From: Eldritch Cookie Date: Tue, 27 Aug 2024 11:02:28 -0300 Subject: [PATCH 069/235] haskell.packages.ghc910.haskell-language-server: fix package --- .../haskell-modules/configuration-ghc-9.10.x.nix | 13 ++++++++++--- .../configuration-hackage2nix/main.yaml | 1 + .../haskell-modules/hackage-packages.nix | 13 +++++++++++++ 3 files changed, 24 insertions(+), 3 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-ghc-9.10.x.nix b/pkgs/development/haskell-modules/configuration-ghc-9.10.x.nix index a41e2cebc2bf..0dd47690b4dc 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-9.10.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-9.10.x.nix @@ -68,11 +68,14 @@ self: super: { apply-refact = doDistribute self.apply-refact_0_14_0_0; attoparsec-aeson = doDistribute self.attoparsec-aeson_2_2_2_0; extensions = doDistribute self.extensions_0_1_0_2; + fourmolu = doDistribute self.fourmolu_0_16_2_0; hashable = doDistribute self.hashable_1_4_7_0; integer-conversion = doDistribute self.integer-conversion_0_1_1; ghc-lib-parser = doDistribute self.ghc-lib-parser_9_10_1_20240511; + ghc-lib-parser-ex = doDistribute self.ghc-lib-parser-ex_9_10_0_0; lens = doDistribute self.lens_5_3_2; lukko = doDistribute self.lukko_0_1_2; + ormolu = doDistribute self.ormolu_0_7_7_0; primitive = doDistribute (dontCheck self.primitive_0_9_0_0); # tests introduce a recursive dependency via hspec quickcheck-instances = doDistribute self.quickcheck-instances_0_3_31; rebase = doDistribute self.rebase_1_21_1; @@ -83,15 +86,15 @@ self: super: { uuid-types = doDistribute self.uuid-types_1_0_6; # A given major version of ghc-exactprint only supports one version of GHC. - ghc-exactprint = doDistribute self.ghc-exactprint_1_10_0_0; - ghc-exactprint_1_10_0_0 = addBuildDepends [ + ghc-exactprint = doDistribute self.ghc-exactprint_1_9_0_0; + ghc-exactprint_1_9_0_0 = addBuildDepends [ self.Diff self.extra self.ghc-paths self.silently self.syb self.HUnit - ] super.ghc-exactprint_1_10_0_0; + ] super.ghc-exactprint_1_9_0_0; # # Jailbreaks @@ -120,4 +123,8 @@ self: super: { lukko_0_1_2 = dontCheck super.lukko_0_1_2; # doesn't compile with tasty ==1.4.* resolv = dontCheck super.resolv; # doesn't compile with filepath ==1.5.* primitive-unlifted = dontCheck super.primitive-unlifted; # doesn't compile with primitive ==0.9.* + + haskell-language-server = disableCabalFlag "retrie" (disableCabalFlag "hlint" (disableCabalFlag "stylishhaskel" (super.haskell-language-server.override {stylish-haskell = null;retrie = null;apply-refact=null;hlint = null;}))); + + } diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml index bac7d621854b..cb0e9538c901 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml @@ -66,6 +66,7 @@ extra-packages: - ghc-exactprint == 1.5.* # 2023-03-30: needed for GHC == 9.2 - ghc-exactprint == 1.6.* # 2023-03-30: needed for GHC == 9.4 - ghc-exactprint == 1.8.* # 2024-05-20: needed for GHC == 9.8 + - ghc-exactprint == 1.9.* # 2024-08-27: needed for GHC == 9.10 - ghc-lib == 9.2.* # 2022-02-17: preserve for GHC 8.10, 9.0 - ghc-lib == 9.8.* # 2024-05-19: preserve for GHC 9.8 - ghc-lib-parser == 9.2.* # 2022-02-17: preserve for GHC 8.10, 9.0 diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 8c71a28fcfdd..917fa6657031 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -120625,6 +120625,19 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; + "ghc-exactprint_1_9_0_0" = callPackage + ({ mkDerivation }: + mkDerivation { + pname = "ghc-exactprint"; + version = "1.9.0.0"; + sha256 = "195y3yy7bjrx3b21nqrhxrnbxidaydb9g28i37wqx5glv8y65v51"; + isLibrary = true; + isExecutable = true; + description = "ExactPrint for GHC"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "ghc-exactprint_1_10_0_0" = callPackage ({ mkDerivation }: mkDerivation { From 702ae3e748131bd87381f384985ecea66fa629ad Mon Sep 17 00:00:00 2001 From: Michael Bishop Date: Thu, 29 Aug 2024 14:22:16 -0300 Subject: [PATCH 070/235] blockbook: 0.3.6 -> 0.4.0 --- pkgs/servers/blockbook/default.nix | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/pkgs/servers/blockbook/default.nix b/pkgs/servers/blockbook/default.nix index dc9243f32024..f4ffeeb33471 100644 --- a/pkgs/servers/blockbook/default.nix +++ b/pkgs/servers/blockbook/default.nix @@ -1,33 +1,35 @@ { lib -, stdenv , buildGoModule -, fetchFromGitHub -, pkg-config , bzip2 +, fetchFromGitHub , lz4 -, rocksdb_6_23 +, nixosTests +, pkg-config +, rocksdb_7_10 , snappy +, stdenv , zeromq , zlib -, nixosTests }: let - rocksdb = rocksdb_6_23; + rocksdb = rocksdb_7_10; in buildGoModule rec { pname = "blockbook"; - version = "0.3.6"; - commit = "5f8cf45"; + version = "0.4.0"; + commit = "b227dfe"; src = fetchFromGitHub { owner = "trezor"; repo = "blockbook"; rev = "v${version}"; - hash = "sha256-WwphMHFEuF5PavaPv+uc/k3DKT3P77Tr1WsOD1lJYck="; + hash = "sha256-98tp3QYaHfhVIiJ4xkA3bUanXwK1q05t+YNroFtBUxE="; }; - vendorHash = "sha256-KJ92WztrtKjibvGBYRdnRag4XeZS4d7kyskJqD4GLPE="; + proxyVendor = true; + + vendorHash = "sha256-n03eWWy+58KAbYnKxI3/ulWIpmR+ivtImQSqbe2kpYU="; nativeBuildInputs = [ pkg-config ]; @@ -39,7 +41,7 @@ buildGoModule rec { "-X github.com/trezor/blockbook/common.buildDate=unknown" ]; - tags = [ "rocksdb_6_16" ]; + tags = [ "rocksdb_7_10" ]; CGO_LDFLAGS = [ "-L${stdenv.cc.cc.lib}/lib" From 5ad2d0ac3bde8371d87856ec4e39ddb62d0c234d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 30 Aug 2024 01:10:57 +0000 Subject: [PATCH 071/235] clj-kondo: 2024.08.01 -> 2024.08.29 --- pkgs/development/tools/clj-kondo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/clj-kondo/default.nix b/pkgs/development/tools/clj-kondo/default.nix index 00f5a9bc928f..16b480505b92 100644 --- a/pkgs/development/tools/clj-kondo/default.nix +++ b/pkgs/development/tools/clj-kondo/default.nix @@ -3,12 +3,12 @@ buildGraalvmNativeImage rec { pname = "clj-kondo"; - version = "2024.08.01"; + version = "2024.08.29"; src = fetchurl { url = "https://github.com/clj-kondo/${pname}/releases/download/v${version}/${pname}-${version}-standalone.jar"; - sha256 = "sha256-sDEZ3Tk2QRlL8oclV7vUZfdXpEdYCfCT45vP82Dccz4="; + sha256 = "sha256-0Mvj8FW6/Q9GudaD3lnRFvTjMkkAGwpAokdNJa/HfsI="; }; graalvmDrv = graalvmCEPackages.graalvm-ce; From d6b8983cab9bff0d4587a15bc1586dcbca269a45 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 30 Aug 2024 03:54:45 +0000 Subject: [PATCH 072/235] reaper: 7.20 -> 7.22 --- pkgs/applications/audio/reaper/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/audio/reaper/default.nix b/pkgs/applications/audio/reaper/default.nix index f020e68baab4..4eae7ae4c2e3 100644 --- a/pkgs/applications/audio/reaper/default.nix +++ b/pkgs/applications/audio/reaper/default.nix @@ -28,13 +28,13 @@ let in stdenv.mkDerivation rec { pname = "reaper"; - version = "7.20"; + version = "7.22"; src = fetchurl { url = url_for_platform version stdenv.hostPlatform.qemuArch; - hash = if stdenv.isDarwin then "sha256-RtGGGbiEEPXYUqK5qpKcCEfIwhlP7/0bAOPMCG7tqZw=" else { - x86_64-linux = "sha256-/6Ee8YCHM9nJhyelEfH62jhkbDwypKXljM305mWY2io="; - aarch64-linux = "sha256-YnKlONKCmXeV19oREJnXD5t3nEQZ5hVOOvDPtUIFw1A="; + hash = if stdenv.isDarwin then "sha256-dIRZCUIfqnGTxBaLzczwzD6hA/PyAxPqfa+FfCRKdu0=" else { + x86_64-linux = "sha256-aa2KcL8yZYG+Dki7J6U473E2BQgdACAIzRLtD9zuHV0="; + aarch64-linux = "sha256-NECEEUKtTQajl0MZK8/NsbhcuyihHOo0Q5Y5UpAAgrM="; }.${stdenv.hostPlatform.system}; }; From 6cc8c10fe01947a2c6d59b3a4c8b176953fc5941 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Fri, 30 Aug 2024 12:13:50 +0200 Subject: [PATCH 073/235] oama: ignore erroneous references on aarch64-darwin The use of the Paths_ module causes erroneous references on aarch64-darwin (due to a lack of dead code elimination), so we can't use justStaticExecutables. See #318013. --- pkgs/by-name/oa/oama/package.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/oa/oama/package.nix b/pkgs/by-name/oa/oama/package.nix index c408ef4e87f8..e938805bac86 100644 --- a/pkgs/by-name/oa/oama/package.nix +++ b/pkgs/by-name/oa/oama/package.nix @@ -2,6 +2,7 @@ haskell, haskellPackages, lib, + stdenv, }: let inherit (haskell.lib.compose) overrideCabal justStaticExecutables; @@ -25,5 +26,7 @@ let in lib.pipe raw-pkg [ (overrideCabal overrides) - justStaticExecutables + # FIXME: eliminate all erroneous references on aarch64-darwin manually, + # see https://github.com/NixOS/nixpkgs/issues/318013 + (if stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64 then lib.id else justStaticExecutables) ] From ffb13b56cadac2f571d18bc592290a76cf840ea3 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Fri, 30 Aug 2024 12:56:40 +0200 Subject: [PATCH 074/235] haskellPackages.{spdx,puresat}: relax lower bounds in new releases --- .../haskell-modules/configuration-common.nix | 22 +++++-------------- 1 file changed, 6 insertions(+), 16 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index d35f9da323d5..0a56e978c11d 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -943,22 +943,6 @@ self: super: { ''; }) super.ghc-mod; - # Apply compatibility patches until a new release arrives - # https://github.com/phadej/spdx/issues/33 - spdx = appendPatches [ - (fetchpatch { - name = "spdx-ghc-9.4.patch"; - url = "https://github.com/phadej/spdx/pull/30/commits/545dc69f433225c837375fba4cbbdb7f9cc7b09b.patch"; - sha256 = "0p2h8dxkjy2v0dx7h6v62clmx5n5j3c4zh4myh926fijympi1glz"; - }) - (fetchpatch { - name = "spdx-ghc-9.6.patch"; - url = "https://github.com/phadej/spdx/pull/32/commits/b51f665e9960614274ff6a9ac658802c1a785687.patch"; - sha256 = "01vf1h0djr84yxsjfhym715ncx0w5q4l02k3dkbmg40pnc62ql4h"; - excludes = [ ".github/**" ]; - }) - ] super.spdx; - # 2022-03-19: Testsuite is failing: https://github.com/puffnfresh/haskell-jwt/issues/2 jwt = dontCheck super.jwt; @@ -2357,6 +2341,12 @@ self: super: { language-docker = self.language-docker_11_0_0; }; + # Too strict lower bounds on (test) deps + # https://github.com/phadej/puresat/issues/6 + puresat = doJailbreak super.puresat; + # https://github.com/phadej/spdx/issues/62 + spdx = doJailbreak super.spdx; + # test suite requires stack to run, https://github.com/dino-/photoname/issues/24 photoname = dontCheck super.photoname; From 6b6a7fbc3aef95cddbc9661a986f42607cb58878 Mon Sep 17 00:00:00 2001 From: phaer Date: Fri, 30 Aug 2024 17:31:56 +0200 Subject: [PATCH 075/235] virtualisation/azure-images: drop outdated list... This list of microsoft-hosted, pre-built azure-images might have been useful, but it hasn't seen any updates since NixOS 16.0.9, eight years ago. As there is also no in-tree usage, and the results of a quick GitHub search yielded no out-tree usage which was *not* either about the same age or looked like vendored copies of this list, this seems safe to drop to me. --- nixos/modules/virtualisation/azure-images.nix | 5 ----- 1 file changed, 5 deletions(-) delete mode 100644 nixos/modules/virtualisation/azure-images.nix diff --git a/nixos/modules/virtualisation/azure-images.nix b/nixos/modules/virtualisation/azure-images.nix deleted file mode 100644 index 22c82fc14f65..000000000000 --- a/nixos/modules/virtualisation/azure-images.nix +++ /dev/null @@ -1,5 +0,0 @@ -let self = { - "16.09" = "https://nixos.blob.core.windows.net/images/nixos-image-16.09.1694.019dcc3-x86_64-linux.vhd"; - - latest = self."16.09"; -}; in self From 5115bc51cf523ef4a43c479c976124249548e834 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 30 Aug 2024 19:59:06 +0000 Subject: [PATCH 076/235] dolt: 1.42.14 -> 1.42.17 --- pkgs/servers/sql/dolt/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/sql/dolt/default.nix b/pkgs/servers/sql/dolt/default.nix index 1cc5a99c51c1..71bdc7875a40 100644 --- a/pkgs/servers/sql/dolt/default.nix +++ b/pkgs/servers/sql/dolt/default.nix @@ -2,18 +2,18 @@ buildGoModule rec { pname = "dolt"; - version = "1.42.14"; + version = "1.42.17"; src = fetchFromGitHub { owner = "dolthub"; repo = "dolt"; rev = "v${version}"; - sha256 = "sha256-KcaYoQgSDcALmYBtIKgE+C/Nmm+FrwV36bJ1EyQ4UoA="; + sha256 = "sha256-DXi81DkD/YgMWfwwruheGYXqs+5f/2eX8sTYzj8HzKw="; }; modRoot = "./go"; subPackages = [ "cmd/dolt" ]; - vendorHash = "sha256-OU6b4h+sLN/9kdLGM3f9Are3sbBGqUxKAsSBph4jxVM="; + vendorHash = "sha256-qzCk9Ze4Ss0Ks2FeLw3BMpW6WnQA+owweL+5ZxFR2pI="; proxyVendor = true; doCheck = false; From c62dfc3ad90014a4284ebcf3cc1e719f41cbfe99 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 31 Aug 2024 01:56:40 +0000 Subject: [PATCH 077/235] nixpacks: 1.26.1 -> 1.27.0 --- pkgs/applications/virtualization/nixpacks/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/virtualization/nixpacks/default.nix b/pkgs/applications/virtualization/nixpacks/default.nix index ae7fdf3edc26..6f7142cace5f 100644 --- a/pkgs/applications/virtualization/nixpacks/default.nix +++ b/pkgs/applications/virtualization/nixpacks/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "nixpacks"; - version = "1.26.1"; + version = "1.27.0"; src = fetchFromGitHub { owner = "railwayapp"; repo = pname; rev = "v${version}"; - sha256 = "sha256-xwuW6bncNK9zhI6gWDpI5imdAd0+mALxyUQW433AeMA="; + sha256 = "sha256-aIg+CuWa97FlSs8kOFe6BxV2lB4M6R8QosoSomFPqFA="; }; - cargoHash = "sha256-uxvFeoooz7aSM7ZAgUsxGO3LE/zinW5D/GwXcWoKLA0="; + cargoHash = "sha256-4Q6nduLEK2ym+3o3OD8jJwpl+sLbryk/TzoOSd/d4yE="; # skip test due FHS dependency doCheck = false; From 4eae74adfe8c054957fb780803465af771b135e6 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 31 Aug 2024 11:54:39 +0000 Subject: [PATCH 078/235] python312Packages.eigenpy: 3.8.1 -> 3.9.0 --- pkgs/development/python-modules/eigenpy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/eigenpy/default.nix b/pkgs/development/python-modules/eigenpy/default.nix index d1b1b5c539b8..41066ba788a6 100644 --- a/pkgs/development/python-modules/eigenpy/default.nix +++ b/pkgs/development/python-modules/eigenpy/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "eigenpy"; - version = "3.8.1"; + version = "3.9.0"; pyproject = false; # Built with cmake src = fetchFromGitHub { owner = "stack-of-tasks"; repo = "eigenpy"; rev = "refs/tags/v${version}"; - hash = "sha256-U+amWjvA4r2S9qoVW0h8daiUO9g7rMQWmq4aH3/wd+w="; + hash = "sha256-fJLX3ZhcgevXcXkR00fzDh9LtfMwaHsJWQgUexmuKLc="; }; outputs = [ From 2e41a59bbb4f79def51b9540ed51058fa457fead Mon Sep 17 00:00:00 2001 From: Steven Keuchel Date: Sat, 31 Aug 2024 11:34:24 +0200 Subject: [PATCH 079/235] cdrtools: fix riscv64-linux build Also apply the fixes for aarch64-darwin unconditionall. --- pkgs/tools/cd-dvd/cdrtools/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/cd-dvd/cdrtools/default.nix b/pkgs/tools/cd-dvd/cdrtools/default.nix index 1a3e58df2cc8..053aebecaf41 100644 --- a/pkgs/tools/cd-dvd/cdrtools/default.nix +++ b/pkgs/tools/cd-dvd/cdrtools/default.nix @@ -16,10 +16,11 @@ stdenv.mkDerivation rec { sed "/\.mk3/d" -i libschily/Targets.man substituteInPlace man/Makefile --replace "man4" "" substituteInPlace RULES/rules.prg --replace "/bin/" "" - '' + lib.optionalString (stdenv.isDarwin && stdenv.isAarch64) '' + ln -sv i386-darwin-clang64.rul RULES/arm64-darwin-cc.rul ln -sv i386-darwin-clang64.rul RULES/arm64-darwin-clang.rul ln -sv i386-darwin-clang64.rul RULES/arm64-darwin-clang64.rul + ln -sv i586-linux-cc.rul RULES/riscv64-linux-cc.rul ''; dontConfigure = true; From 13413a728126be4cdb5357bd7de30f2978344b1b Mon Sep 17 00:00:00 2001 From: Bot_wxt1221 <3264117476@qq.com> Date: Mon, 26 Aug 2024 08:57:14 +0000 Subject: [PATCH 080/235] cf-tool: init at 202405140250 --- pkgs/by-name/cf/cf-tool/package.nix | 31 +++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) create mode 100644 pkgs/by-name/cf/cf-tool/package.nix diff --git a/pkgs/by-name/cf/cf-tool/package.nix b/pkgs/by-name/cf/cf-tool/package.nix new file mode 100644 index 000000000000..044a7f7e602b --- /dev/null +++ b/pkgs/by-name/cf/cf-tool/package.nix @@ -0,0 +1,31 @@ +{ + buildGoModule, + fetchFromGitHub, + lib, + nix-update-script, +}: +buildGoModule rec { + pname = "cf-tool"; + version = "202405140250"; + + src = fetchFromGitHub { + owner = "sempr"; + repo = "cf-tool"; + rev = version; + hash = "sha256-D+mJJw1+ImCrFpsv8HmaAwWqjYvUWouh8mgQ7hJxMrc="; + }; + + vendorHash = "sha256-R+mzfH9f422+WTiwIbDoBeEc+YYbW3tisUPlqrnFWbg="; + + doCheck = false; + + passthru.updateScript = nix-update-script { }; + + meta = with lib; { + description = "Codeforces CLI (Submit, Parse, Test, etc.). Support Contests, Gym, Groups, acmsguru, Windows, macOS, Linux, 7 MB"; + homepage = "https://github.com/sempr/cf-tool"; + license = licenses.mit; + maintainers = with maintainers; [ bot-wxt1221 ]; + mainProgram = "cf"; + }; +} From 7ffc5523d613e40bed10679a2a32c326e7db7b3d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 31 Aug 2024 15:39:47 +0000 Subject: [PATCH 081/235] reveal-md: 6.1.2 -> 6.1.3 --- pkgs/tools/text/reveal-md/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/text/reveal-md/default.nix b/pkgs/tools/text/reveal-md/default.nix index 5f6bf17eb459..e16e29ec37e8 100644 --- a/pkgs/tools/text/reveal-md/default.nix +++ b/pkgs/tools/text/reveal-md/default.nix @@ -5,16 +5,16 @@ buildNpmPackage rec { pname = "reveal-md"; - version = "6.1.2"; + version = "6.1.3"; src = fetchFromGitHub { owner = "webpro"; repo = "reveal-md"; rev = version; - hash = "sha256-MPNxQpof36XHg3Zl7fHkyCXnoDOcRvMiMiPH29GEWqE="; + hash = "sha256-m2aCC+ATymqKLn+aGEV8yzXASJJX4CI1YcPwt25T8k4="; }; - npmDepsHash = "sha256-535tauun6ysPDC096ttPpvJZ+RSZ75aY8mVKj8mnMJI="; + npmDepsHash = "sha256-QREJaF3aEHJA41fYTsJLlJU1l9bcVPS0BUkIzZIqZAA="; env = { PUPPETEER_SKIP_DOWNLOAD = true; From d36980f098518a66a7cf732a7f6b1a30eefa9368 Mon Sep 17 00:00:00 2001 From: brokenpip3 Date: Sat, 31 Aug 2024 20:50:59 +0200 Subject: [PATCH 082/235] bats.libraries.bats-detik: 1.3.0 -> 1.3.2 --- pkgs/development/interpreters/bats/libraries.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/bats/libraries.nix b/pkgs/development/interpreters/bats/libraries.nix index 9f3f63609fd6..f766bef8dfb1 100644 --- a/pkgs/development/interpreters/bats/libraries.nix +++ b/pkgs/development/interpreters/bats/libraries.nix @@ -53,12 +53,12 @@ bats-detik = stdenv.mkDerivation (finalAttrs: { pname = "bats-detik"; - version = "1.3.0"; + version = "1.3.2"; src = fetchFromGitHub { owner = "bats-core"; repo = "bats-detik"; rev = "v${finalAttrs.version}"; - hash = "sha256-cbWNZ9a/Q9reJLQxUyTdqfLykOJcJKnoKB123ao8/xM="; + hash = "sha256-Lz5BPKHtgdakKRALPZFFgz91d07Ubk5rUgA+Ep2aoG8="; }; dontBuild = true; installPhase = '' From 4bbb84280b5f69e2e364726cb741cdbe30ee153e Mon Sep 17 00:00:00 2001 From: Emily Date: Sun, 1 Sep 2024 01:54:52 +0100 Subject: [PATCH 083/235] pianobar: 2022.04.01 -> 2022.04.01-unstable-2024-08-16 Includes fixes for FFmpeg 7. --- pkgs/applications/audio/pianobar/default.nix | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/audio/pianobar/default.nix b/pkgs/applications/audio/pianobar/default.nix index 7854203d8939..11116c7ffa5f 100644 --- a/pkgs/applications/audio/pianobar/default.nix +++ b/pkgs/applications/audio/pianobar/default.nix @@ -1,17 +1,19 @@ -{ fetchurl, lib, stdenv, pkg-config, libao, json_c, libgcrypt, ffmpeg, curl }: +{ fetchFromGitHub, lib, stdenv, pkg-config, libao, json_c, libgcrypt, ffmpeg_7, curl }: stdenv.mkDerivation rec { pname = "pianobar"; - version = "2022.04.01"; + version = "2022.04.01-unstable-2024-08-16"; - src = fetchurl { - url = "https://6xq.net/projects/pianobar/${pname}-${version}.tar.bz2"; - sha256 = "sha256-FnCyiGWouCpXu23+p/FuL6QUXS81SRC7FzgLMsm5R2M="; + src = fetchFromGitHub { + owner = "PromyLOPh"; + repo = "pianobar"; + rev = "41ac06c8585dc535c4b1737b4c2943bb3fe7beb0"; + hash = "sha256-5LTZ6J9bvfsnpD/bGuojekutFVdH9feWLF+nLFvkeOA="; }; nativeBuildInputs = [ pkg-config ]; buildInputs = [ - libao json_c libgcrypt ffmpeg curl + libao json_c libgcrypt ffmpeg_7 curl ]; makeFlags = [ "PREFIX=$(out)" ]; From f1f27be07d4fb0cd208ae444d8561d0747faab9e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 1 Sep 2024 01:10:24 +0000 Subject: [PATCH 084/235] libcyaml: 1.4.1 -> 1.4.2 --- pkgs/development/libraries/libcyaml/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libcyaml/default.nix b/pkgs/development/libraries/libcyaml/default.nix index 99ad390896f6..9a7ce9ea1541 100644 --- a/pkgs/development/libraries/libcyaml/default.nix +++ b/pkgs/development/libraries/libcyaml/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "libcyaml"; - version = "1.4.1"; + version = "1.4.2"; src = fetchFromGitHub { owner = "tlsa"; repo = "libcyaml"; rev = "v${version}"; - sha256 = "sha256-iS1T8R0SW+qu0TlP5FVlDzUfQitiZMUkbJUigbxeW0Y="; + sha256 = "sha256-JIN/cvh9PRl4/K0Z3WZtSCA3casBxyaxNxjXZZdQRWQ="; }; buildInputs = [ libyaml ]; From e84c5104d5052ceda551cf850842e8bee800c32e Mon Sep 17 00:00:00 2001 From: qwqawawow Date: Sun, 1 Sep 2024 09:35:12 +0800 Subject: [PATCH 085/235] groovy: add completion,desktop support --- .../interpreters/groovy/default.nix | 55 +++++++++++++++++-- 1 file changed, 50 insertions(+), 5 deletions(-) diff --git a/pkgs/development/interpreters/groovy/default.nix b/pkgs/development/interpreters/groovy/default.nix index 8ed9bfe11736..ba597c6e7135 100644 --- a/pkgs/development/interpreters/groovy/default.nix +++ b/pkgs/development/interpreters/groovy/default.nix @@ -1,4 +1,15 @@ -{ lib, stdenv, fetchurl, unzip, which, makeWrapper, jdk }: +{ + lib, + stdenv, + fetchurl, + unzip, + which, + makeWrapper, + installShellFiles, + jdk, + copyDesktopItems, + makeDesktopItem, +}: # at runtime, need jdk @@ -11,12 +22,44 @@ stdenv.mkDerivation rec { sha256 = "sha256-2Ro93+NThx1MJlbT0KBcgovD/zbp1J29vsE9zZjwWHc="; }; - nativeBuildInputs = [ makeWrapper unzip ]; + nativeBuildInputs = [ + makeWrapper + unzip + installShellFiles + copyDesktopItems + ]; + + desktopItems = [ + (makeDesktopItem { + name = "groovy"; + desktopName = "Groovy Console"; + exec = "groovyConsole"; + icon = "groovy"; + comment = meta.description; + terminal = false; + startupNotify = false; + categories = [ "Development" ]; + }) + ]; installPhase = '' + runHook preInstall + + rm bin/*.bat + mkdir -p $out mkdir -p $out/share/doc/groovy - rm bin/*.bat + + #Install icons + mkdir -p $out/share/icons + mv bin/groovy.ico $out/share/icons/ + + #Install Completion + for p in grape groovy{,doc,c,sh,Console}; do + installShellCompletion --cmd $p --bash bin/''${p}_completion + done + rm bin/*_completion + mv {bin,conf,grooid,lib} $out mv {licenses,LICENSE,NOTICE} $out/share/doc/groovy @@ -24,9 +67,11 @@ stdenv.mkDerivation rec { for p in grape java2groovy groovy{,doc,c,sh,Console}; do wrapProgram $out/bin/$p \ - --set JAVA_HOME "${jdk}" \ - --prefix PATH ":" "${jdk}/bin" + --set JAVA_HOME "${jdk}" \ + --prefix PATH ":" "${jdk}/bin" done + + runHook postInstall ''; meta = with lib; { From 5319e12489319ec313e2d5ab8c94cb2a3a11d7a9 Mon Sep 17 00:00:00 2001 From: Morgan Helton Date: Sat, 31 Aug 2024 21:19:51 -0500 Subject: [PATCH 086/235] sonarr: 4.0.8.1874 -> 4.0.9.2244 --- pkgs/by-name/so/sonarr/deps.nix | 18 ++++++------------ pkgs/by-name/so/sonarr/package.nix | 6 +++--- 2 files changed, 9 insertions(+), 15 deletions(-) diff --git a/pkgs/by-name/so/sonarr/deps.nix b/pkgs/by-name/so/sonarr/deps.nix index dbf3a2421aa4..d668314809f9 100644 --- a/pkgs/by-name/so/sonarr/deps.nix +++ b/pkgs/by-name/so/sonarr/deps.nix @@ -36,7 +36,6 @@ (fetchNuGet { pname = "Microsoft.Extensions.Configuration"; version = "6.0.0"; hash = "sha256-SIO/Q+OD2bG+Q0EoOXRgJYzZMhahGXDG1fXZn0VUvv0="; }) (fetchNuGet { pname = "Microsoft.Extensions.Configuration"; version = "6.0.1"; hash = "sha256-v55PAURxnSGYgbv9x+4/pMeI51H27ikRfHBuUB+N5nE="; }) (fetchNuGet { pname = "Microsoft.Extensions.Configuration.Abstractions"; version = "2.0.1"; hash = "sha256-UXWzOFT0lc2Jtt3zNJ4xCEv0LCRPnWCnSoHQO2s3kZg="; }) - (fetchNuGet { pname = "Microsoft.Extensions.Configuration.Abstractions"; version = "5.0.0"; hash = "sha256-0+ywPdqMkx32+HcMHqAp00cWBE7aCNc09Xh2eRObHTs="; }) (fetchNuGet { pname = "Microsoft.Extensions.Configuration.Abstractions"; version = "6.0.0"; hash = "sha256-Evg+Ynj2QUa6Gz+zqF+bUyfGD0HI5A2fHmxZEXbn3HA="; }) (fetchNuGet { pname = "Microsoft.Extensions.Configuration.Binder"; version = "6.0.0"; hash = "sha256-7NZcKkiXWSuhhVcA/fXHPY/62aGUyMsRdiHm91cWC5Y="; }) (fetchNuGet { pname = "Microsoft.Extensions.Configuration.CommandLine"; version = "6.0.0"; hash = "sha256-jFACPqLvGo14eg4G3hV/UYY/d9i3hNKvgL+3nnDGZME="; }) @@ -45,12 +44,10 @@ (fetchNuGet { pname = "Microsoft.Extensions.Configuration.Json"; version = "6.0.0"; hash = "sha256-owzLlamhIWWEoV2oumAxv4G3IlYzYGaDse0GVb8u1LA="; }) (fetchNuGet { pname = "Microsoft.Extensions.Configuration.UserSecrets"; version = "6.0.1"; hash = "sha256-YTbqJElzPCfph1Nxyq2PUGV5lSY5GXFdshpKOPdvTTk="; }) (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection"; version = "2.2.0"; hash = "sha256-k/3UKceE1hbgv1sfV9H85hzWvMwooE8PcasHvHMhe1M="; }) - (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection"; version = "5.0.0"; hash = "sha256-RN478YJQE0YM0g+JztXp00w57CIF4bb48hSD/z3jTZc="; }) (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection"; version = "6.0.0"; hash = "sha256-gZuMaunMJVyvvepuzNodGPRc6eqKH//bks3957dYkPI="; }) (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection"; version = "6.0.1"; hash = "sha256-V+CulDoU3NXWn5EjH64JhDVQ0h+ev5BW95T+2uL1hU4="; }) (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection.Abstractions"; version = "2.0.0"; hash = "sha256-H1rEnq/veRWvmp8qmUsrQkQIcVlKilUNzmmKsxJ0md8="; }) (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection.Abstractions"; version = "2.2.0"; hash = "sha256-pf+UQToJnhAe8VuGjxyCTvua1nIX8n5NHzAUk3Jz38s="; }) - (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection.Abstractions"; version = "5.0.0"; hash = "sha256-0sfuxZ07HsMZJpKatDrW6I671uJBYWsUgAyoDZA2n50="; }) (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection.Abstractions"; version = "6.0.0"; hash = "sha256-SZke0jNKIqJvvukdta+MgIlGsrP2EdPkkS8lfLg7Ju4="; }) (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection.Abstractions"; version = "7.0.0"; hash = "sha256-55lsa2QdX1CJn1TpW1vTnkvbGXKCeE9P0O6AkW49LaA="; }) (fetchNuGet { pname = "Microsoft.Extensions.DependencyModel"; version = "2.1.0"; hash = "sha256-7dFo5itkB2OgSgS7dN87h0Xf2p5/f6fl2Ka6+CTEhDY="; }) @@ -61,10 +58,8 @@ (fetchNuGet { pname = "Microsoft.Extensions.Hosting"; version = "6.0.1"; hash = "sha256-L57B/mAxkzK7QEipV0KtHzxMtsxEZ+a4FdFkn/3/XIY="; }) (fetchNuGet { pname = "Microsoft.Extensions.Hosting.Abstractions"; version = "6.0.0"; hash = "sha256-ksIPO6RhfbYx/i3su4J3sDhoL+TDnITKsgIpEqnpktc="; }) (fetchNuGet { pname = "Microsoft.Extensions.Hosting.WindowsServices"; version = "6.0.2"; hash = "sha256-hgLydinnGforEzR2SCq6568IWhjnIoX8vyR3Z8xRIxg="; }) - (fetchNuGet { pname = "Microsoft.Extensions.Logging"; version = "5.0.0"; hash = "sha256-IyJiQk0xhESWjr231L7MsbFvFbphP6T8VwlKgVGgQeE="; }) (fetchNuGet { pname = "Microsoft.Extensions.Logging"; version = "6.0.0"; hash = "sha256-8WsZKRGfXW5MsXkMmNVf6slrkw+cR005czkOP2KUqTk="; }) (fetchNuGet { pname = "Microsoft.Extensions.Logging.Abstractions"; version = "2.0.1"; hash = "sha256-J/NwPGVWtiNpwHP9M0tDR1eNUcFiz/r1Sn5v2xuE0tA="; }) - (fetchNuGet { pname = "Microsoft.Extensions.Logging.Abstractions"; version = "5.0.0"; hash = "sha256-jJtcchUS8Spt/GddcDtWa4lN1RAVQ2sxDnu1cgwa6vs="; }) (fetchNuGet { pname = "Microsoft.Extensions.Logging.Abstractions"; version = "6.0.0"; hash = "sha256-QNqcQ3x+MOK7lXbWkCzSOWa/2QyYNbdM/OEEbWN15Sw="; }) (fetchNuGet { pname = "Microsoft.Extensions.Logging.Configuration"; version = "6.0.0"; hash = "sha256-IeMOza71UDzsEIVIlYuI0RYKk+d+VOC6zCqYCQs6nV4="; }) (fetchNuGet { pname = "Microsoft.Extensions.Logging.Console"; version = "6.0.0"; hash = "sha256-LQw/najhYDdvtrsogHEQue+U+/+YJcgyBP+3MTJYA40="; }) @@ -72,11 +67,9 @@ (fetchNuGet { pname = "Microsoft.Extensions.Logging.EventLog"; version = "6.0.0"; hash = "sha256-1BXQjw/ySWmddAZ79bv3OhmC4SPTG8PHyTOlrNEUb0g="; }) (fetchNuGet { pname = "Microsoft.Extensions.Logging.EventSource"; version = "6.0.0"; hash = "sha256-j2Begn1+Xoa+9yPoQC6b6aPmUIpBrjkTGQhRhYfJaDI="; }) (fetchNuGet { pname = "Microsoft.Extensions.Options"; version = "2.0.1"; hash = "sha256-hbe+3YXlSQ3urCX11D2MIZl1XrWvr+mmnBc/bj53zfY="; }) - (fetchNuGet { pname = "Microsoft.Extensions.Options"; version = "5.0.0"; hash = "sha256-Xq2JIa2Rg9vnLnZ75k4ydyT4j2A+G6UUx6iDc959teU="; }) (fetchNuGet { pname = "Microsoft.Extensions.Options"; version = "6.0.0"; hash = "sha256-DxnEgGiCXpkrxFkxXtOXqwaiAtoIjA8VSSWCcsW0FwE="; }) (fetchNuGet { pname = "Microsoft.Extensions.Options.ConfigurationExtensions"; version = "6.0.0"; hash = "sha256-au0Y13cGk/dQFKuvSA5NnP/++bErTk0oOTlgmHdI2Mw="; }) (fetchNuGet { pname = "Microsoft.Extensions.Primitives"; version = "2.0.0"; hash = "sha256-q44LtMvyNEKSvgERvA+BrasKapP92Sc91QR4u2TJ9/Y="; }) - (fetchNuGet { pname = "Microsoft.Extensions.Primitives"; version = "5.0.0"; hash = "sha256-pj1BdHlmYm5HZifp/yB3lwDkdw0/jcIF0vYg6O1kmGs="; }) (fetchNuGet { pname = "Microsoft.Extensions.Primitives"; version = "6.0.0"; hash = "sha256-AgvysszpQ11AiTBJFkvSy8JnwIWTj15Pfek7T7ThUc4="; }) (fetchNuGet { pname = "Microsoft.Identity.Client"; version = "4.21.1"; hash = "sha256-Q+d1QuLmjIoNGNUxm5GWzQI4hthiP6qCEl0D6/CMn4U="; }) (fetchNuGet { pname = "Microsoft.IdentityModel.JsonWebTokens"; version = "6.8.0"; hash = "sha256-4mCms3v1kknXCgRp51SluUFy2o7BqHCMfGMwHmlFrok="; }) @@ -118,10 +111,10 @@ (fetchNuGet { pname = "Newtonsoft.Json"; version = "13.0.1"; hash = "sha256-K2tSVW4n4beRPzPu3rlVaBEMdGvWSv/3Q1fxaDh4Mjo="; }) (fetchNuGet { pname = "Newtonsoft.Json"; version = "13.0.3"; hash = "sha256-hy/BieY4qxBWVVsDqqOPaLy1QobiIapkbrESm6v2PHc="; }) (fetchNuGet { pname = "Newtonsoft.Json"; version = "9.0.1"; hash = "sha256-mYCBrgUhIJFzRuLLV9SIiIFHovzfR8Uuqfg6e08EnlU="; }) - (fetchNuGet { pname = "NLog"; version = "4.7.11"; hash = "sha256-XEl2ISxP2sx5b+av3QVF6LWim4JPyepdnr8zA/H1b28="; }) - (fetchNuGet { pname = "NLog"; version = "4.7.14"; hash = "sha256-dogq2n5I62JnY+qsTnWHsLlhSvDqc5PRSjBvIBztU94="; }) - (fetchNuGet { pname = "NLog.Extensions.Logging"; version = "1.7.4"; hash = "sha256-RGQxi7tcoGLLn1kQbXc3cA3DUetwAwqHeDLJsXWaNNI="; }) - (fetchNuGet { pname = "NLog.Targets.Syslog"; version = "6.0.3"; hash = "sha256-3ZXMJzzKNFKkZn43adJgZx+fdA2TnMdfeMMl3SNkoZ0="; }) + (fetchNuGet { pname = "NLog"; version = "5.3.2"; hash = "sha256-b/y/IFUSe7qsSeJ8JVB0VFmJlkviFb8h934ktnn9Fgc="; }) + (fetchNuGet { pname = "NLog.Extensions.Logging"; version = "5.3.11"; hash = "sha256-DP3R51h+9kk06N63U+1C4/JCZTFiADeYTROToAA2R0g="; }) + (fetchNuGet { pname = "NLog.Layouts.ClefJsonLayout"; version = "1.0.0"; hash = "sha256-WLtMT2pa+hQoZe8joknTEoJEVARNzdKRLYIn++L1kX0="; }) + (fetchNuGet { pname = "NLog.Targets.Syslog"; version = "7.0.0"; hash = "sha256-Yy6REt1UxkdFz+twa0zJVm635YHch7B6t9Pjj5FZUZc="; }) (fetchNuGet { pname = "NodaTime"; version = "3.0.0"; hash = "sha256-kOiGkTez5eIWsBJVYURe8WRuyIhQgMiq/c/m42+XZuY="; }) (fetchNuGet { pname = "Npgsql"; version = "7.0.7"; hash = "sha256-AvHPEO2QP7r0kCOHSLhXLJDzYMOLGH2dyhHgEUPSWuc="; }) (fetchNuGet { pname = "NuGet.Frameworks"; version = "5.0.0"; hash = "sha256-WWLh+v9Y9as+WURW8tUPowQB8HWIiVJzbpKzEWTdMqI="; }) @@ -131,6 +124,7 @@ (fetchNuGet { pname = "NUnit3TestAdapter"; version = "3.17.0"; hash = "sha256-ZlpEM9IQlqsRPmYPMN6yCbICfakSoY89y40xtMY3rE8="; }) (fetchNuGet { pname = "NunitXml.TestLogger"; version = "3.0.131"; hash = "sha256-5IqI/e+nm90CAaZHrcbYfCY+zu5FVcpAbV0CmsdOKyg="; }) (fetchNuGet { pname = "Polly"; version = "8.3.1"; hash = "sha256-VPPoVGvEJBHoUR4hU57sdY2pF3P9igLSQSBtPRLRB6c="; }) + (fetchNuGet { pname = "Polly.Contrib.WaitAndRetry"; version = "1.1.1"; hash = "sha256-InJ8IXAsZDAR4B/YzWCuEWRa/6Xf5oB049UJUkTOoSg="; }) (fetchNuGet { pname = "Polly.Core"; version = "8.3.1"; hash = "sha256-i1R9e4aKZ5U+y96+GOxTknsAtGn7fmeBNSdfzhqe1Jc="; }) (fetchNuGet { pname = "Portable.BouncyCastle"; version = "1.9.0"; hash = "sha256-GOXM4TdTTodWlGzEfbMForTfTQI/ObJGnFZMSD6X8E4="; }) (fetchNuGet { pname = "RestSharp"; version = "106.15.0"; hash = "sha256-8UChXxz7AQmQpoozSBfwB6NVmt2+uJcN8TH7RtVfT7w="; }) @@ -200,7 +194,7 @@ (fetchNuGet { pname = "Servarr.FluentMigrator.Runner.SqlServer"; version = "3.3.2.9"; hash = "sha256-mDIfUT35CqEUbf858hrtJE0E65U7ZJlygoZAHi2Hlf8="; url = "https://pkgs.dev.azure.com/Servarr/7ab38f4e-5a57-4d70-84f4-94dd9bc5d6df/_packaging/323efe4e-c7d8-4bcd-acfe-5afb38d520bf/nuget/v3/flat2/servarr.fluentmigrator.runner.sqlserver/3.3.2.9/servarr.fluentmigrator.runner.sqlserver.3.3.2.9.nupkg"; }) (fetchNuGet { pname = "Servarr.FluentMigrator.Runner.SqlServerCe"; version = "3.3.2.9"; hash = "sha256-kx3ZjLj1zz/1buiWrAJPuB5GXCohpntpq4ak5WG1SR4="; url = "https://pkgs.dev.azure.com/Servarr/7ab38f4e-5a57-4d70-84f4-94dd9bc5d6df/_packaging/323efe4e-c7d8-4bcd-acfe-5afb38d520bf/nuget/v3/flat2/servarr.fluentmigrator.runner.sqlserverce/3.3.2.9/servarr.fluentmigrator.runner.sqlserverce.3.3.2.9.nupkg"; }) (fetchNuGet { pname = "SharpZipLib"; version = "1.4.2"; hash = "sha256-/giVqikworG2XKqfN9uLyjUSXr35zBuZ2FX2r8X/WUY="; }) - (fetchNuGet { pname = "SixLabors.ImageSharp"; version = "3.1.4"; hash = "sha256-zOqHVIInvJiqmx4JF+8USYvdKAGRZVUqQpdncrrjRjM="; }) + (fetchNuGet { pname = "SixLabors.ImageSharp"; version = "3.1.5"; hash = "sha256-3UehX9T+I81nfgv2dTHlpoPgYzXFk7kHr1mmlQOCBfw="; }) (fetchNuGet { pname = "Swashbuckle.AspNetCore.Annotations"; version = "6.6.2"; hash = "sha256-iL7TcRFy7g6EB8usWALwdOEaiqLsD0b+RXkepHk43+o="; }) (fetchNuGet { pname = "Swashbuckle.AspNetCore.Swagger"; version = "6.6.2"; hash = "sha256-HqMmHMZXYHlRMoT3vIZF8iwhYmfknQmi3N8VmyfwI0k="; }) (fetchNuGet { pname = "Swashbuckle.AspNetCore.SwaggerGen"; version = "6.6.2"; hash = "sha256-km+bNoRDakEBa2dIjtxK0V6YVvm9hEpdi8xWQ8TJigI="; }) diff --git a/pkgs/by-name/so/sonarr/package.nix b/pkgs/by-name/so/sonarr/package.nix index 6ba68993bf49..f5967bbb9010 100644 --- a/pkgs/by-name/so/sonarr/package.nix +++ b/pkgs/by-name/so/sonarr/package.nix @@ -17,12 +17,12 @@ , prefetch-yarn-deps }: let - version = "4.0.8.1874"; + version = "4.0.9.2244"; src = fetchFromGitHub { owner = "Sonarr"; repo = "Sonarr"; rev = "v${version}"; - hash = "sha256-4WjeuVqzuUmgbKIjcQOJCNrTnT9Wn6kpVxS+1T1hqyQ="; + hash = "sha256-RDhJUf8P2STTug69EGozW0q87qDE40jf5G7n7pezWeY="; }; in buildDotnetModule { @@ -38,7 +38,7 @@ buildDotnetModule { yarnOfflineCache = fetchYarnDeps { yarnLock = "${src}/yarn.lock"; - hash = "sha256-dSZBifvUGJx5lj7C+Sj+kJprK8JG6SE5vg6+X6QdCZ8="; + hash = "sha256-qL8vNKf0XqpO/TUfKMXbfrmRVAqnvKLREAjcsAYDqeE="; }; ffprobe = lib.optionalDrvAttr withFFmpeg (lib.getExe' ffmpeg "ffprobe"); From 3b5e411a5faafb30fd8c65e2620572f9cbe669f9 Mon Sep 17 00:00:00 2001 From: brokenpip3 Date: Sun, 1 Sep 2024 10:34:28 +0200 Subject: [PATCH 087/235] bats.libraries: Add brokenpip3 as maintainer --- pkgs/development/interpreters/bats/libraries.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/interpreters/bats/libraries.nix b/pkgs/development/interpreters/bats/libraries.nix index f766bef8dfb1..3e17a931270e 100644 --- a/pkgs/development/interpreters/bats/libraries.nix +++ b/pkgs/development/interpreters/bats/libraries.nix @@ -21,7 +21,7 @@ platforms = lib.platforms.all; homepage = "https://github.com/bats-core/bats-assert"; license = lib.licenses.cc0; - maintainers = [ ]; + maintainers = with lib.maintainers; [ brokenpip3 ]; }; }); @@ -47,7 +47,7 @@ platforms = lib.platforms.all; homepage = "https://github.com/bats-core/bats-file"; license = lib.licenses.cc0; - maintainers = [ ]; + maintainers = with lib.maintainers; [ brokenpip3 ]; }; }); @@ -98,7 +98,7 @@ platforms = lib.platforms.all; homepage = "https://github.com/bats-core/bats-support"; license = lib.licenses.cc0; - maintainers = [ ]; + maintainers = with lib.maintainers; [ brokenpip3 ]; }; }); } From 0223b738382e899fe644e905022cc0a93a99cda8 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Sat, 31 Aug 2024 17:12:19 +0200 Subject: [PATCH 088/235] haskellPackages.sequence-formats: disable tests due to missing files --- pkgs/development/haskell-modules/configuration-common.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 0a56e978c11d..f526895d171b 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1959,6 +1959,9 @@ self: super: { "--haddock-option=--optghc=-fno-safe-haskell" ] super.alg; + # Missing test files in 1.8.1.0, fixed in 1.8.1.1 + sequence-formats = dontCheck super.sequence-formats; + # Windows.normalise changed in filepath >= 1.4.100.4 which fails the equivalency # test suite. This is of no great consequence for us, though. # Patch solving this has been submitted to upstream by me (@sternenseemann). From 9e95a875b0316829cadfd281e84dd1be92b3a8b4 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Sat, 31 Aug 2024 17:12:46 +0200 Subject: [PATCH 089/235] haskellPackages.streamly-zip: provide correct package for libzip --- pkgs/development/haskell-modules/configuration-nix.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index 5d668f49ba72..c03f19c939d0 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -129,6 +129,9 @@ self: super: builtins.intersectAttrs super { # Link the proper version. zeromq4-haskell = super.zeromq4-haskell.override { zeromq = pkgs.zeromq4; }; + # cabal2nix incorrectly resolves this to pkgs.zip (could be improved over there). + streamly-zip = super.streamly-zip.override { zip = pkgs.libzip; }; + threadscope = enableSeparateBinOutput super.threadscope; # Use the default version of mysql to build this package (which is actually mariadb). From b385174fedd55d8a8c42d8aa354ef02a1314a1fd Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Sat, 31 Aug 2024 17:17:49 +0200 Subject: [PATCH 090/235] haskellPackages: mark builds failing on hydra as broken This commit has been generated by maintainers/scripts/haskell/mark-broken.sh based on *evaluation [1808565](https://hydra.nixos.org/eval/1808565) of nixpkgs commit [179b0a9](https://github.com/NixOS/nixpkgs/commits/179b0a961bbf76c374331d5952a7415656639d2f) as of 2024-08-31 14:05 UTC* from the haskell-updates jobset on hydra under https://hydra.nixos.org/jobset/nixpkgs/haskell-updates --- .../configuration-hackage2nix/broken.yaml | 11 ++++++++++- .../haskell-modules/hackage-packages.nix | 18 ++++++++++++++++++ 2 files changed, 28 insertions(+), 1 deletion(-) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml index 44e92038874d..9a23304d6e66 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml @@ -509,6 +509,7 @@ broken-packages: - blosum # failure in job https://hydra.nixos.org/build/233198029 at 2023-09-02 - blubber-server # failure in job https://hydra.nixos.org/build/233199530 at 2023-09-02 - bludigon # failure in job https://hydra.nixos.org/build/233248190 at 2023-09-02 + - bluefin-algae # failure in job https://hydra.nixos.org/build/270092011 at 2024-08-31 - Blueprint # failure in job https://hydra.nixos.org/build/233252987 at 2023-09-02 - bluetileutils # failure in job https://hydra.nixos.org/build/233197334 at 2023-09-02 - blunk-hask-tests # failure in job https://hydra.nixos.org/build/233240288 at 2023-09-02 @@ -529,6 +530,7 @@ broken-packages: - botpp # failure in job https://hydra.nixos.org/build/233201674 at 2023-09-02 - bottom # failure in job https://hydra.nixos.org/build/233225154 at 2023-09-02 - bounded-array # failure in job https://hydra.nixos.org/build/233200854 at 2023-09-02 + - bound-extras # failure in job https://hydra.nixos.org/build/270090014 at 2024-08-31 - bound-simple # failure in job https://hydra.nixos.org/build/233201896 at 2023-09-02 - bowntz # failure in job https://hydra.nixos.org/build/234439552 at 2023-09-13 - box-csv # failure in job https://hydra.nixos.org/build/233253321 at 2023-09-02 @@ -1281,6 +1283,7 @@ broken-packages: - dhall-to-cabal # failure in job https://hydra.nixos.org/build/233193270 at 2023-09-02 - dhcp-lease-parser # failure in job https://hydra.nixos.org/build/233229124 at 2023-09-02 - dhrun # failure in job https://hydra.nixos.org/build/233227529 at 2023-09-02 + - dhscanner-bitcode # failure in job https://hydra.nixos.org/build/270090641 at 2024-08-31 - dia-base # failure in job https://hydra.nixos.org/build/233230896 at 2023-09-02 - diagnose # failure in job https://hydra.nixos.org/build/233231767 at 2023-09-02 - diagrams-boolean # failure in job https://hydra.nixos.org/build/233202036 at 2023-09-02 @@ -2515,6 +2518,7 @@ broken-packages: - helm # failure in job https://hydra.nixos.org/build/233251620 at 2023-09-02 - help-esb # failure in job https://hydra.nixos.org/build/233202622 at 2023-09-02 - hemkay # failure in job https://hydra.nixos.org/build/233227889 at 2023-09-02 + - heptapod # failure in job https://hydra.nixos.org/build/270087935 at 2024-08-31 - HERA # failure in job https://hydra.nixos.org/build/233204724 at 2023-09-02 - herbalizer # failure in job https://hydra.nixos.org/build/233214866 at 2023-09-02 - HerbiePlugin # failure in job https://hydra.nixos.org/build/233193018 at 2023-09-02 @@ -2771,6 +2775,7 @@ broken-packages: - hpygments # failure in job https://hydra.nixos.org/build/233258827 at 2023-09-02 - hpylos # failure in job https://hydra.nixos.org/build/234451400 at 2023-09-13 - hpyrg # failure in job https://hydra.nixos.org/build/233225042 at 2023-09-02 + - hqcsim # failure in job https://hydra.nixos.org/build/270086589 at 2024-08-31 - hquantlib-time # failure in job https://hydra.nixos.org/build/233192009 at 2023-09-02 - hquery # failure in job https://hydra.nixos.org/build/233203709 at 2023-09-02 - h-raylib # failure in job https://hydra.nixos.org/build/236686375 at 2023-10-04 @@ -2925,6 +2930,7 @@ broken-packages: - HTicTacToe # failure in job https://hydra.nixos.org/build/233235397 at 2023-09-02 - htiled # failure in job https://hydra.nixos.org/build/233219305 at 2023-09-02 - htlset # failure in job https://hydra.nixos.org/build/233203886 at 2023-09-02 + - html-email-validate # failure in job https://hydra.nixos.org/build/270088744 at 2024-08-31 - html-rules # failure in job https://hydra.nixos.org/build/233200615 at 2023-09-02 - html-tokenizer # failure in job https://hydra.nixos.org/build/233243581 at 2023-09-02 - htmx # failure in job https://hydra.nixos.org/build/269658709 at 2024-08-19 @@ -4254,8 +4260,8 @@ broken-packages: - OpenCLRaw # failure in job https://hydra.nixos.org/build/233247133 at 2023-09-02 - OpenCLWrappers # failure in job https://hydra.nixos.org/build/233222391 at 2023-09-02 - opencog-atomspace # failure in job https://hydra.nixos.org/build/233237785 at 2023-09-02 - - opencv # failure in job https://hydra.nixos.org/build/252717564 at 2024-03-16 - opencv-extra # broken eval by missing system dependency + - opencv # failure in job https://hydra.nixos.org/build/252717564 at 2024-03-16 - opencv-raw # failure in job https://hydra.nixos.org/build/233211286 at 2023-09-02 - opendatatable # failure in job https://hydra.nixos.org/build/233254960 at 2023-09-02 - openexchangerates # failure in job https://hydra.nixos.org/build/233203238 at 2023-09-02 @@ -5502,6 +5508,7 @@ broken-packages: - sjsp # failure in job https://hydra.nixos.org/build/233225141 at 2023-09-02 - SJW # failure in job https://hydra.nixos.org/build/233209689 at 2023-09-02 - skeletal-set # failure in job https://hydra.nixos.org/build/233254711 at 2023-09-02 + - skeletest # failure in job https://hydra.nixos.org/build/270083279 at 2024-08-31 - skell # failure in job https://hydra.nixos.org/build/233245484 at 2023-09-02 - skemmtun # failure in job https://hydra.nixos.org/build/233223893 at 2023-09-02 - skews # timeout @@ -6132,6 +6139,7 @@ broken-packages: - tokenify # failure in job https://hydra.nixos.org/build/233249392 at 2023-09-02 - tokenizer # failure in job https://hydra.nixos.org/build/233259112 at 2023-09-02 - tokenizer-streaming # failure in job https://hydra.nixos.org/build/233232725 at 2023-09-02 + - token-limiter-concurrent # failure in job https://hydra.nixos.org/build/270092009 at 2024-08-31 - token-limiter # failure in job https://hydra.nixos.org/build/233255093 at 2023-09-02 - token-search # failure in job https://hydra.nixos.org/build/233212111 at 2023-09-02 - tokyocabinet-haskell # failure in job https://hydra.nixos.org/build/233193492 at 2023-09-02 @@ -6252,6 +6260,7 @@ broken-packages: - typed-fsm # failure in job https://hydra.nixos.org/build/269663128 at 2024-08-19 - typed-process-effectful # failure in job https://hydra.nixos.org/build/236684332 at 2023-10-04 - typedquery # failure in job https://hydra.nixos.org/build/233215307 at 2023-09-02 + - typed-session # failure in job https://hydra.nixos.org/build/270089993 at 2024-08-31 - typed-spreadsheet # failure in job https://hydra.nixos.org/build/233248967 at 2023-09-02 - typed-time # failure in job https://hydra.nixos.org/build/233246930 at 2023-09-02 - typed-wire # failure in job https://hydra.nixos.org/build/233237626 at 2023-09-02 diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 917fa6657031..f2b07300c453 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -53238,6 +53238,8 @@ self: { ]; description = "Algebraic effects and named handlers in Bluefin"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "bluefin-internal" = callPackage @@ -54450,6 +54452,8 @@ self: { ]; description = "ScopeH and ScopeT extras for bound"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "bound-gen" = callPackage @@ -88822,6 +88826,8 @@ self: { ]; description = "Intermediate language for static code analysis"; license = lib.licenses.gpl3Only; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "di" = callPackage @@ -148521,6 +148527,8 @@ self: { benchmarkHaskellDepends = [ base tasty-bench uuid ]; description = "Generate UUIDv7 values"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "her-lexer" = callPackage @@ -158955,7 +158963,9 @@ self: { executableHaskellDepends = [ base hmatrix random ]; description = "A library for simulating quantum circuits"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; mainProgram = "hqcsim-exe"; + broken = true; }) {}; "hquantlib" = callPackage @@ -165601,6 +165611,8 @@ self: { benchmarkHaskellDepends = [ base criterion text ]; description = "Validating an email address against HTML standard"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "html-entities" = callPackage @@ -282468,7 +282480,9 @@ self: { ]; description = "Batteries-included, opinionated test framework"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; mainProgram = "skeletest-preprocessor"; + broken = true; }) {}; "skeleton" = callPackage @@ -311248,6 +311262,8 @@ self: { testToolDepends = [ sydtest-discover ]; description = "A thread-safe concurrent token-bucket rate limiter that guarantees fairness"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "token-search" = callPackage @@ -317134,6 +317150,8 @@ self: { ]; description = "typed session framework"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "typed-spreadsheet" = callPackage From 569f3e8c5bb3cf6fe0aec295099a6c1a41973e28 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Sun, 1 Sep 2024 11:22:22 +0200 Subject: [PATCH 091/235] haskellPackages.postgresql-libpq: >= 0.10.2 and deps are broken postgresql-libpq >= 0.10.2 invented a frankly bizarre way to discover the libpq dependency of never actually declaring the dependency in any cabal file, but instead discovering during configure whether it happens to be installed anyways. Obviously this will require special consideration from our side. (Probably we'll continue using pkg-config which requires us to manually add pkg-config and libpq to the build environment of postgresql-libpq-pkgconfig.) Since Stackage LTS doesn't contain >= 0.10.2 yet, I'll ignore this for now as I lack the patience at the moment. --- .../haskell-modules/configuration-hackage2nix/broken.yaml | 2 ++ .../configuration-hackage2nix/transitive-broken.yaml | 1 + pkgs/development/haskell-modules/hackage-packages.nix | 4 ++++ 3 files changed, 7 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml index 9a23304d6e66..c33342ff0efb 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml @@ -4689,6 +4689,8 @@ broken-packages: - postgresql-config # failure in job https://hydra.nixos.org/build/233197788 at 2023-09-02 - postgresql-cube # failure in job https://hydra.nixos.org/build/233195283 at 2023-09-02 - PostgreSQL # failure in job https://hydra.nixos.org/build/233258066 at 2023-09-02 + - postgresql-libpq-configure # doesn't declare system deps, but only needed for postgresql-libpq >= 0.11 + - postgresql-libpq-pkgconfig # doesn't declare system deps, but only needed for postgresql-libpq >= 0.11 - postgresql-lo-stream # failure in job https://hydra.nixos.org/build/233194012 at 2023-09-02 - postgresql-ltree # failure in job https://hydra.nixos.org/build/233199998 at 2023-09-02 - postgresql-named # failure in job https://hydra.nixos.org/build/233241920 at 2023-09-02 diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml index 6f0206c3e7c7..edc45698252a 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml @@ -3160,6 +3160,7 @@ dont-distribute-packages: - poseidon - poseidon-postgis - postgresql-common-persistent + - postgresql-libpq_0_10_2_0 - postgresql-pure - postgresql-simple-ltree - postgresql-simple-queue diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index f2b07300c453..48e52489f39a 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -244509,6 +244509,8 @@ self: { doHaddock = false; description = "low-level binding to libpq: configure based provider"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "postgresql-libpq-notify" = callPackage @@ -244539,6 +244541,8 @@ self: { doHaddock = false; description = "low-level binding to libpq: pkg-config based provider"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {libpq = null;}; "postgresql-lo-stream" = callPackage From 6bf5e0917ef0c68a1e85c409b12bd689cc0817b2 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Sun, 1 Sep 2024 12:58:09 +0200 Subject: [PATCH 092/235] haskellPackages.sdl2-ttf: move pkg-config override to proper place --- pkgs/development/haskell-modules/configuration-common.nix | 1 - pkgs/development/haskell-modules/configuration-nix.nix | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index f526895d171b..23139af6fda2 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -2901,7 +2901,6 @@ self: super: { # Workaround for Cabal failing to find nonexistent SDL2 library?! # https://github.com/NixOS/nixpkgs/issues/260863 sdl2-gfx = overrideCabal { __propagatePkgConfigDepends = false; } super.sdl2-gfx; - sdl2-ttf = overrideCabal { __onlyPropagateKnownPkgConfigModules = true; } super.sdl2-ttf; # Needs git for compile-time insertion of commit hash into --version string. kmonad = overrideCabal (drv: { diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index c03f19c939d0..d63895d4b343 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -1371,6 +1371,7 @@ self: super: builtins.intersectAttrs super { gi-gdk_4_0_8 gi-gsk gi-adwaita + sdl2-ttf ; webkit2gtk3-javascriptcore = lib.pipe super.webkit2gtk3-javascriptcore [ From 38778097cafeb87a1e0479b0b8802ff9a73c453b Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Sun, 1 Sep 2024 12:59:51 +0200 Subject: [PATCH 093/235] haskellPackages.gi-gtk_4_0_9: ensure override is applied correctly --- pkgs/development/haskell-modules/configuration-nix.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index d63895d4b343..b7610cea7240 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -1367,7 +1367,7 @@ self: super: builtins.intersectAttrs super { }) super) gi-javascriptcore gi-webkit2webextension - gi-gtk_4_0_8 + gi-gtk_4_0_9 gi-gdk_4_0_8 gi-gsk gi-adwaita From 0c924ab22aa8818c701ad9d94be34dc7934d692c Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Sun, 1 Sep 2024 13:21:09 +0200 Subject: [PATCH 094/235] haskellPackages.sdl2: work around argv limit --- .../configuration-hackage2nix/broken.yaml | 1 - .../configuration-hackage2nix/transitive-broken.yaml | 7 ------- pkgs/development/haskell-modules/configuration-nix.nix | 1 + pkgs/development/haskell-modules/hackage-packages.nix | 9 --------- 4 files changed, 1 insertion(+), 17 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml index c33342ff0efb..f76679137c90 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml @@ -5268,7 +5268,6 @@ broken-packages: - sde-solver # failure in job https://hydra.nixos.org/build/233251017 at 2023-09-02 - sdl2-cairo-image # failure in job https://hydra.nixos.org/build/233210135 at 2023-09-02 - sdl2-compositor # failure in job https://hydra.nixos.org/build/233198910 at 2023-09-02 - - sdl2 # failure in job https://hydra.nixos.org/build/269670352 at 2024-08-19 - sdl2-fps # failure in job https://hydra.nixos.org/build/233195346 at 2023-09-02 - sdl2-image # failure in job https://hydra.nixos.org/build/233216837 at 2023-09-02 - sdl2-mixer # failure in job https://hydra.nixos.org/build/233228951 at 2023-09-02 diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml index edc45698252a..2471fca15bfe 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml @@ -22,7 +22,6 @@ dont-distribute-packages: - Advise-me - AlgoRhythm - AlignmentAlgorithms - - Allure - AndroidViewHierarchyImporter - Annotations - ApplePush @@ -247,7 +246,6 @@ dont-distribute-packages: - KiCS-prophecy - LDAPv3 - LPPaver - - LambdaHack - LambdaINet - LambdaPrettyQuote - LambdaShell @@ -2771,7 +2769,6 @@ dont-distribute-packages: - monetdb-mapi - mongrel2-handler - monky - - monomer - monomer-flatpak-example - monte-carlo - moo @@ -3529,11 +3526,7 @@ dont-distribute-packages: - scrabble-bot - scrapbook - scroll - - sdl-try-drivers - - sdl2-cairo - - sdl2-gfx - sdl2-sprite - - sdl2-ttf - sdp-binary - sdp-deepseq - sdp-hashable diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index b7610cea7240..8477d68dfaf5 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -1372,6 +1372,7 @@ self: super: builtins.intersectAttrs super { gi-gsk gi-adwaita sdl2-ttf + sdl2 ; webkit2gtk3-javascriptcore = lib.pipe super.webkit2gtk3-javascriptcore [ diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 48e52489f39a..ab91a00f78d3 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -992,7 +992,6 @@ self: { description = "Near-future Sci-Fi roguelike and tactical squad combat game"; license = lib.licenses.agpl3Plus; badPlatforms = lib.platforms.darwin; - hydraPlatforms = lib.platforms.none; mainProgram = "Allure"; }) {}; @@ -13209,7 +13208,6 @@ self: { description = "A game engine library for tactical squad ASCII roguelike dungeon crawlers"; license = lib.licenses.bsd3; badPlatforms = lib.platforms.darwin; - hydraPlatforms = lib.platforms.none; mainProgram = "LambdaHack"; }) {}; @@ -211167,7 +211165,6 @@ self: { description = "A GUI library for writing native Haskell applications"; license = lib.licenses.bsd3; badPlatforms = lib.platforms.darwin; - hydraPlatforms = lib.platforms.none; mainProgram = "dev-test-app"; }) {inherit (pkgs) glew;}; @@ -271350,7 +271347,6 @@ self: { executableHaskellDepends = [ base pretty-simple sdl2 text ]; description = "small testing tool for sdl2 and accelerated drivers"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; mainProgram = "sdl-try-drivers"; }) {}; @@ -271375,8 +271371,6 @@ self: { testHaskellDepends = [ base deepseq linear vector weigh ]; description = "Both high- and low-level bindings to the SDL library (version 2.0.6+)."; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {inherit (pkgs) SDL2;}; "sdl2-cairo" = callPackage @@ -271388,7 +271382,6 @@ self: { libraryHaskellDepends = [ base cairo linear sdl2 ]; description = "Render with Cairo on SDL textures"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "sdl2-cairo-image" = callPackage @@ -271468,7 +271461,6 @@ self: { executablePkgconfigDepends = [ SDL2 SDL2_gfx ]; description = "Haskell bindings to SDL2_gfx"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; mainProgram = "sdl2-gfx-example"; }) {inherit (pkgs) SDL2; inherit (pkgs) SDL2_gfx;}; @@ -271563,7 +271555,6 @@ self: { description = "Bindings to SDL2_ttf"; license = lib.licenses.bsd3; badPlatforms = lib.platforms.darwin; - hydraPlatforms = lib.platforms.none; }) {inherit (pkgs) SDL2; inherit (pkgs) SDL2_ttf;}; "sdnv" = callPackage From 87bc034f9bf40043a7bcfde1c50a1888947d8d07 Mon Sep 17 00:00:00 2001 From: wxt <3264117476@qq.com> Date: Sun, 1 Sep 2024 19:35:47 +0800 Subject: [PATCH 095/235] qq: add update-date into version --- pkgs/by-name/qq/qq/update.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/qq/qq/update.sh b/pkgs/by-name/qq/qq/update.sh index 777ea2a90103..fd6658a8177f 100755 --- a/pkgs/by-name/qq/qq/update.sh +++ b/pkgs/by-name/qq/qq/update.sh @@ -9,7 +9,7 @@ payload=$(curl https://im.qq.com/rainbow/linuxQQDownload | grep -oP "var params= amd64_url=$(jq -r .x64DownloadUrl.deb <<< "$payload") arm64_url=$(jq -r .armDownloadUrl.deb <<< "$payload") -version=$(grep -oP "(?<=/QQ_).*(?=_[0-9]{6})" <<< "$amd64_url") +version=$(jq -r .version <<< "$payload")-$(jq -r .updateDate <<< "$payload") amd64_hash=$(nix-prefetch-url $amd64_url) arm64_hash=$(nix-prefetch-url $arm64_url) From 03f4b385f7e85d1c3a1f9523c3d9f4982ab223b9 Mon Sep 17 00:00:00 2001 From: wxt <3264117476@qq.com> Date: Sun, 1 Sep 2024 19:36:57 +0800 Subject: [PATCH 096/235] qq: 3.2.12 -> 3.2.12-2024.8.19 --- pkgs/by-name/qq/qq/sources.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/by-name/qq/qq/sources.nix b/pkgs/by-name/qq/qq/sources.nix index 8621a5af5308..c9ba6f38208b 100644 --- a/pkgs/by-name/qq/qq/sources.nix +++ b/pkgs/by-name/qq/qq/sources.nix @@ -1,9 +1,9 @@ # Generated by ./update.sh - do not update manually! -# Last updated: 2024-08-10 +# Last updated: 2024-09-01 { - version = "3.2.12"; - amd64_url = "https://dldir1.qq.com/qqfile/qq/QQNT/Linux/QQ_3.2.12_240808_amd64_01.deb"; - arm64_url = "https://dldir1.qq.com/qqfile/qq/QQNT/Linux/QQ_3.2.12_240808_arm64_01.deb"; - arm64_hash = "sha256-fx1+CNabeWNCRHzYh/nRnnBeFt5WyrMBIfzuw7e/CTc="; - amd64_hash = "sha256-gzoM8xq51iUwzHWirXLd7LPMPQ36KxOyp0iS6az3y6E="; + version = "3.2.12-2024.8.19"; + amd64_url = "https://dldir1.qq.com/qqfile/qq/QQNT/Linux/QQ_3.2.12_240819_amd64_01.deb"; + arm64_url = "https://dldir1.qq.com/qqfile/qq/QQNT/Linux/QQ_3.2.12_240819_arm64_01.deb"; + arm64_hash = "sha256-iPi7RwAHSWnRBl2U+D1acghFjjF+vCH+Nz1Wf1bQFJY="; + amd64_hash = "sha256-yuMHl/PIxAYUBXKNiI7u2upEc32mixAjjgLjO9xooVI="; } From 436aff262d00b6bcf2311c10e8f2a255e1c550a6 Mon Sep 17 00:00:00 2001 From: nat Date: Sun, 1 Sep 2024 15:37:47 +0200 Subject: [PATCH 097/235] feather: 2.6.7 -> 2.6.8 --- pkgs/by-name/fe/feather/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/fe/feather/package.nix b/pkgs/by-name/fe/feather/package.nix index 6ef42e918f34..643775892bbd 100644 --- a/pkgs/by-name/fe/feather/package.nix +++ b/pkgs/by-name/fe/feather/package.nix @@ -22,13 +22,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "feather"; - version = "2.6.7"; + version = "2.6.8"; src = fetchFromGitHub { owner = "feather-wallet"; repo = "feather"; rev = finalAttrs.version; - hash = "sha256-zXNpNhBOtDvuuxzZ8o2XDLqNSi/XK4I6eYAfWuiCgRI="; + hash = "sha256-l1kyNpUIqezMfInhrKgnTnArqeSjvhBwdqVi0aUlKF8="; fetchSubmodules = true; }; From 29c84f4a192e897ab0d6ba65b463bd6bfb5057c4 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Sun, 1 Sep 2024 16:20:37 +0200 Subject: [PATCH 098/235] haskellPackages.kqueue: apply patch for GHC 9.6 core libs --- .../haskell-modules/configuration-ghc-9.6.x.nix | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-ghc-9.6.x.nix b/pkgs/development/haskell-modules/configuration-ghc-9.6.x.nix index fcd97a908af5..90d8bc7ff034 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-9.6.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-9.6.x.nix @@ -156,6 +156,17 @@ self: super: { })]; }) super.ConfigFile; + # Compatibility with core libs of GHC 9.6 + # Jailbreak to lift bound on time + kqueue = doJailbreak (appendPatches [ + (pkgs.fetchpatch { + name = "kqueue-ghc-9.6.patch"; + url = "https://github.com/hesselink/kqueue/pull/10/commits/a2735e807d761410e776482ec04515d9cf76a7f5.patch"; + sha256 = "18rilz4nrwcmlvll3acjx2lp7s129pviggb8fy3hdb0z34ls5j84"; + excludes = [ ".gitignore" ]; + }) + ] super.kqueue); + # This runs into the following GHC bug currently affecting 9.6.* and 9.8.* as # well as 9.10.1: https://gitlab.haskell.org/ghc/ghc/-/issues/24432 inherit (lib.mapAttrs (_: overrideCabal (drv: { From 56b92e141a610b8b40595a673396a38d93ccfa4c Mon Sep 17 00:00:00 2001 From: Nikolay Korotkiy Date: Sun, 1 Sep 2024 18:39:15 +0400 Subject: [PATCH 099/235] libcyaml: migrate to by-name --- .../libcyaml/default.nix => by-name/li/libcyaml/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 2 deletions(-) rename pkgs/{development/libraries/libcyaml/default.nix => by-name/li/libcyaml/package.nix} (100%) diff --git a/pkgs/development/libraries/libcyaml/default.nix b/pkgs/by-name/li/libcyaml/package.nix similarity index 100% rename from pkgs/development/libraries/libcyaml/default.nix rename to pkgs/by-name/li/libcyaml/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b005d902b096..9637be2698b5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -22410,8 +22410,6 @@ with pkgs; yas = callPackage ../development/libraries/yas { }; - libcyaml = callPackage ../development/libraries/libcyaml { }; - rang = callPackage ../development/libraries/rang { }; libykclient = callPackage ../development/libraries/libykclient { }; From 735662bf16490b20d7b5206a633bed14c1d50b1c Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Sun, 1 Sep 2024 16:47:45 +0200 Subject: [PATCH 100/235] prometheus-openldap-exporter: remove 2.3.0 is the final release, the repo is now archived. Also I don't use it anymore for quite a while, so it didn't have a real nixpkgs maintainer either. Closes #338712 --- .../manual/release-notes/rl-2411.section.md | 2 + .../monitoring/prometheus/exporters.nix | 1 - .../prometheus/exporters/openldap.nix | 66 ------------------- nixos/tests/prometheus-exporters.nix | 60 ----------------- .../prometheus/openldap-exporter.nix | 31 --------- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 1 - 7 files changed, 3 insertions(+), 159 deletions(-) delete mode 100644 nixos/modules/services/monitoring/prometheus/exporters/openldap.nix delete mode 100644 pkgs/servers/monitoring/prometheus/openldap-exporter.nix diff --git a/nixos/doc/manual/release-notes/rl-2411.section.md b/nixos/doc/manual/release-notes/rl-2411.section.md index a471d605a454..f336b8b996cf 100644 --- a/nixos/doc/manual/release-notes/rl-2411.section.md +++ b/nixos/doc/manual/release-notes/rl-2411.section.md @@ -431,6 +431,8 @@ - The `shadowstack` hardening flag has been added, though disabled by default. +- `prometheus-openldap-exporter` was removed since it was unmaintained upstream and had no nixpkgs maintainers. + - `restic` module now has an option for inhibiting system sleep while backups are running, defaulting to off (not inhibiting sleep), available as [`services.restic.backups..inhibitsSleep`](#opt-services.restic.backups._name_.inhibitsSleep). - Support for *runner registration tokens* has been [deprecated](https://gitlab.com/gitlab-org/gitlab/-/issues/380872) diff --git a/nixos/modules/services/monitoring/prometheus/exporters.nix b/nixos/modules/services/monitoring/prometheus/exporters.nix index 7b02e815cdbb..1471f97f1c24 100644 --- a/nixos/modules/services/monitoring/prometheus/exporters.nix +++ b/nixos/modules/services/monitoring/prometheus/exporters.nix @@ -63,7 +63,6 @@ let "nginxlog" "node" "nut" - "openldap" "pgbouncer" "php-fpm" "pihole" diff --git a/nixos/modules/services/monitoring/prometheus/exporters/openldap.nix b/nixos/modules/services/monitoring/prometheus/exporters/openldap.nix deleted file mode 100644 index bb65bd270933..000000000000 --- a/nixos/modules/services/monitoring/prometheus/exporters/openldap.nix +++ /dev/null @@ -1,66 +0,0 @@ -{ config, lib, pkgs, ... }: - -let - cfg = config.services.prometheus.exporters.openldap; - inherit (lib) mkOption types concatStringsSep; -in { - port = 9330; - extraOpts = { - ldapCredentialFile = mkOption { - type = types.path; - example = "/run/keys/ldap_pass"; - description = '' - Environment file to contain the credentials to authenticate against - `openldap`. - - The file should look like this: - ``` - --- - ldapUser: "cn=monitoring,cn=Monitor" - ldapPass: "secret" - ``` - ''; - }; - protocol = mkOption { - default = "tcp"; - example = "udp"; - type = types.str; - description = '' - Which protocol to use to connect against `openldap`. - ''; - }; - ldapAddr = mkOption { - default = "localhost:389"; - type = types.str; - description = '' - Address of the `openldap`-instance. - ''; - }; - metricsPath = mkOption { - default = "/metrics"; - type = types.str; - description = '' - URL path where metrics should be exposed. - ''; - }; - interval = mkOption { - default = "30s"; - type = types.str; - example = "1m"; - description = '' - Scrape interval of the exporter. - ''; - }; - }; - serviceOpts.serviceConfig = { - ExecStart = '' - ${pkgs.prometheus-openldap-exporter}/bin/openldap_exporter \ - --promAddr ${cfg.listenAddress}:${toString cfg.port} \ - --metrPath ${cfg.metricsPath} \ - --ldapNet ${cfg.protocol} \ - --interval ${cfg.interval} \ - --config ${cfg.ldapCredentialFile} \ - ${concatStringsSep " \\\n " cfg.extraFlags} - ''; - }; -} diff --git a/nixos/tests/prometheus-exporters.nix b/nixos/tests/prometheus-exporters.nix index 6a4abab7cc12..4cc65b87137a 100644 --- a/nixos/tests/prometheus-exporters.nix +++ b/nixos/tests/prometheus-exporters.nix @@ -932,66 +932,6 @@ let ''; }; - openldap = { - exporterConfig = { - enable = true; - ldapCredentialFile = "${pkgs.writeText "exporter.yml" '' - ldapUser: "cn=root,dc=example" - ldapPass: "notapassword" - ''}"; - }; - metricProvider = { - services.openldap = { - enable = true; - settings.children = { - "cn=schema".includes = [ - "${pkgs.openldap}/etc/schema/core.ldif" - "${pkgs.openldap}/etc/schema/cosine.ldif" - "${pkgs.openldap}/etc/schema/inetorgperson.ldif" - "${pkgs.openldap}/etc/schema/nis.ldif" - ]; - "olcDatabase={1}mdb" = { - attrs = { - objectClass = [ "olcDatabaseConfig" "olcMdbConfig" ]; - olcDatabase = "{1}mdb"; - olcDbDirectory = "/var/lib/openldap/db"; - olcSuffix = "dc=example"; - olcRootDN = { - # cn=root,dc=example - base64 = "Y249cm9vdCxkYz1leGFtcGxl"; - }; - olcRootPW = { - path = "${pkgs.writeText "rootpw" "notapassword"}"; - }; - }; - }; - "olcDatabase={2}monitor".attrs = { - objectClass = [ "olcDatabaseConfig" ]; - olcDatabase = "{2}monitor"; - olcAccess = [ "to dn.subtree=cn=monitor by users read" ]; - }; - }; - declarativeContents."dc=example" = '' - dn: dc=example - objectClass: domain - dc: example - - dn: ou=users,dc=example - objectClass: organizationalUnit - ou: users - ''; - }; - }; - exporterTest = '' - wait_for_unit("prometheus-openldap-exporter.service") - wait_for_open_port(389) - wait_for_open_port(9330) - wait_until_succeeds( - "curl -sSf http://localhost:9330/metrics | grep 'openldap_scrape{result=\"ok\"} 1'" - ) - ''; - }; - pgbouncer = { exporterConfig = { enable = true; diff --git a/pkgs/servers/monitoring/prometheus/openldap-exporter.nix b/pkgs/servers/monitoring/prometheus/openldap-exporter.nix deleted file mode 100644 index 49181699d65a..000000000000 --- a/pkgs/servers/monitoring/prometheus/openldap-exporter.nix +++ /dev/null @@ -1,31 +0,0 @@ -{ lib, buildGoModule, fetchFromGitHub }: - -buildGoModule rec { - pname = "openldap_exporter"; - version = "2.2.2"; - - src = fetchFromGitHub { - owner = "tomcz"; - repo = pname; - rev = "v${version}"; - sha256 = "sha256-1u+89odwV/lz34wtrK91lET2bOqkH6kRA7JCjzsmiEg="; - }; - - vendorHash = null; - - ldflags = [ - "-s" - "-w" - "-X github.com/tomcz/openldap_exporter.tag=v${version}" - "-X github.com/tomcz/openldap_exporter.commit=unknown" - ]; - - - meta = with lib; { - homepage = "https://github.com/tomcz/openldap_exporter"; - description = "Simple service that scrapes metrics from OpenLDAP and exports them via HTTP for Prometheus consumption"; - mainProgram = "openldap_exporter"; - license = licenses.mit; - maintainers = with maintainers; [ ma27 ]; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 65ac0671b249..e28f80f34a96 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1238,6 +1238,7 @@ mapAliases ({ processing3 = throw "'processing3' has been renamed to/replaced by 'processing'"; # Converted to throw 2023-09-10 prometheus-dmarc-exporter = dmarc-metrics-exporter; # added 2022-05-31 prometheus-dovecot-exporter = dovecot_exporter; # Added 2024-06-10 + prometheus-openldap-exporter = throw "'prometheus-openldap-exporter' has been removed from nixpkgs, as it was unmaintained"; # Added 2024-09-01 prometheus-openvpn-exporter = throw "'prometheus-openvpn-exporter' has been removed from nixpkgs, as it was broken and unmaintained"; # Added 2023-12-23 prometheus-minio-exporter = throw "'prometheus-minio-exporter' has been removed from nixpkgs, use Minio's built-in Prometheus integration instead"; # Added 2024-06-10 prometheus-speedtest-exporter = throw "prometheus-speedtest-exporter was removed as unmaintained"; # Added 2023-07-31 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f224b59658bf..d33a3225baaf 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -25611,7 +25611,6 @@ with pkgs; prometheus-nginx-exporter = callPackage ../servers/monitoring/prometheus/nginx-exporter.nix { }; prometheus-nginxlog-exporter = callPackage ../servers/monitoring/prometheus/nginxlog-exporter.nix { }; prometheus-nut-exporter = callPackage ../servers/monitoring/prometheus/nut-exporter.nix { }; - prometheus-openldap-exporter = callPackage ../servers/monitoring/prometheus/openldap-exporter.nix { } ; prometheus-pgbouncer-exporter = callPackage ../servers/monitoring/prometheus/pgbouncer-exporter.nix { }; prometheus-php-fpm-exporter = callPackage ../servers/monitoring/prometheus/php-fpm-exporter.nix { }; prometheus-pihole-exporter = callPackage ../servers/monitoring/prometheus/pihole-exporter.nix { }; From 3b9271352c8fbef68a9ad46d8e6d2489b39d4e86 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sun, 1 Sep 2024 11:37:05 -0700 Subject: [PATCH 101/235] python312Packages.matrix-nio: 0.24.0 -> 0.25.0 Diff: https://github.com/poljar/matrix-nio/compare/0.24.0...0.25.0 Changelog: https://github.com/poljar/matrix-nio/blob/0.25.0/CHANGELOG.md --- .../matrix-nio/allow-tests-without-olm.patch | 20 +++++++++---------- .../python-modules/matrix-nio/default.nix | 9 +++++---- 2 files changed, 15 insertions(+), 14 deletions(-) diff --git a/pkgs/development/python-modules/matrix-nio/allow-tests-without-olm.patch b/pkgs/development/python-modules/matrix-nio/allow-tests-without-olm.patch index f8ae4015a3f9..392f163e4be9 100644 --- a/pkgs/development/python-modules/matrix-nio/allow-tests-without-olm.patch +++ b/pkgs/development/python-modules/matrix-nio/allow-tests-without-olm.patch @@ -1,26 +1,26 @@ diff --git a/tests/async_client_test.py b/tests/async_client_test.py -index 846c854a32..3a66af2baa 100644 +index b0f7a5a..2494fc6 100644 --- a/tests/async_client_test.py +++ b/tests/async_client_test.py -@@ -129,7 +129,10 @@ +@@ -140,7 +140,10 @@ from nio.api import ( + ThreadInclusion, ) - from nio.api import EventFormat, ResizingMethod, RoomPreset, RoomVisibility from nio.client.async_client import connect_wrapper, on_request_chunk_sent -from nio.crypto import OlmDevice, Session, decrypt_attachment +try: + from nio.crypto import OlmDevice, Session, decrypt_attachment +except ImportError: + pass + from nio.responses import PublicRoom, PublicRoomsResponse - TEST_ROOM_ID = "!testroom:example.org" - + BASE_URL_V1 = f"https://example.org{MATRIX_API_PATH_V1}" diff --git a/tests/conftest.py b/tests/conftest.py -index ae37ca1169..e5f791a31e 100644 +index 0c67ee0..6b77e02 100644 --- a/tests/conftest.py +++ b/tests/conftest.py -@@ -9,11 +9,17 @@ - async_client_pair, +@@ -10,11 +10,17 @@ from conftest_async import ( # noqa: F401 async_client_pair_same_user, + unauthed_async_client, ) -from olm import Account +try: @@ -40,10 +40,10 @@ index ae37ca1169..e5f791a31e 100644 ALICE_ID = "@alice:example.org" ALICE_DEVICE_ID = "JLAFKJWSCS" diff --git a/tests/helpers.py b/tests/helpers.py -index 63445b605a..05096d1dc3 100644 +index 63445b6..05096d1 100644 --- a/tests/helpers.py +++ b/tests/helpers.py -@@ -26,8 +26,11 @@ +@@ -26,8 +26,11 @@ from hyperframe.frame import ( WindowUpdateFrame, ) diff --git a/pkgs/development/python-modules/matrix-nio/default.nix b/pkgs/development/python-modules/matrix-nio/default.nix index 2ddbc6bb58a3..537a80408c66 100644 --- a/pkgs/development/python-modules/matrix-nio/default.nix +++ b/pkgs/development/python-modules/matrix-nio/default.nix @@ -44,14 +44,14 @@ buildPythonPackage rec { pname = "matrix-nio"; - version = "0.24.0"; - format = "pyproject"; + version = "0.25.0"; + pyproject = true; src = fetchFromGitHub { owner = "poljar"; repo = "matrix-nio"; - rev = version; - hash = "sha256-XlswVHLvKOi1qr+I7Mbm4IBjn1DG7glgDsNY48NA5Ew="; + rev = "refs/tags/${version}"; + hash = "sha256-wk1UjnazBdK4BCWXRG5Bn9Rasrk+yy3qqideS8tEAk8="; }; patches = [ @@ -82,6 +82,7 @@ buildPythonPackage rec { }; pythonRelaxDeps = [ + "aiofiles" "aiohttp-socks" # Pending matrix-nio/matrix-nio#516 ]; From 864c720e58ad135b14819e8ecbef575a6d6725e5 Mon Sep 17 00:00:00 2001 From: qubitnano <146656568+qubitnano@users.noreply.github.com> Date: Sun, 1 Sep 2024 16:15:21 -0400 Subject: [PATCH 102/235] mongodb: fix building with python312 --- pkgs/servers/nosql/mongodb/5.0.nix | 2 ++ pkgs/servers/nosql/mongodb/6.0.nix | 3 +++ .../nosql/mongodb/mongodb-python312.patch | 22 +++++++++++++++++++ pkgs/servers/nosql/mongodb/mongodb.nix | 4 ++-- 4 files changed, 29 insertions(+), 2 deletions(-) create mode 100644 pkgs/servers/nosql/mongodb/mongodb-python312.patch diff --git a/pkgs/servers/nosql/mongodb/5.0.nix b/pkgs/servers/nosql/mongodb/5.0.nix index 1738ba2f05e1..5f93244442ec 100644 --- a/pkgs/servers/nosql/mongodb/5.0.nix +++ b/pkgs/servers/nosql/mongodb/5.0.nix @@ -29,6 +29,8 @@ buildMongoDB { ./forget-build-dependencies-4-4.patch ./asio-no-experimental-string-view-4-4.patch ./fix-gcc-Wno-exceptions-5.0.patch + # Fix building with python 3.12 since the imp module was removed + ./mongodb-python312.patch ] ++ variants.patches; passthru.tests = { inherit (nixosTests) mongodb; }; } diff --git a/pkgs/servers/nosql/mongodb/6.0.nix b/pkgs/servers/nosql/mongodb/6.0.nix index 170aeec068cf..7132039908b0 100644 --- a/pkgs/servers/nosql/mongodb/6.0.nix +++ b/pkgs/servers/nosql/mongodb/6.0.nix @@ -21,6 +21,9 @@ buildMongoDB { url = "https://github.com/mongodb/mongo/commit/5435f9585f857f6145beaf6d31daf336453ba86f.patch"; sha256 = "sha256-gWlE2b/NyGe2243iNCXzjcERIY8/4ZWI4Gjh5SF0tYA="; }) + + # Fix building with python 3.12 since the imp module was removed + ./mongodb-python312.patch ]; # passthru.tests = { inherit (nixosTests) mongodb; }; # currently tests mongodb-5_0 } diff --git a/pkgs/servers/nosql/mongodb/mongodb-python312.patch b/pkgs/servers/nosql/mongodb/mongodb-python312.patch new file mode 100644 index 000000000000..c0fa630dddca --- /dev/null +++ b/pkgs/servers/nosql/mongodb/mongodb-python312.patch @@ -0,0 +1,22 @@ +diff --git a/buildscripts/moduleconfig.py b/buildscripts/moduleconfig.py +index b4d0bba0490..f59ddd7bc5c 100644 +--- a/buildscripts/moduleconfig.py ++++ b/buildscripts/moduleconfig.py +@@ -27,7 +27,7 @@ MongoDB SConscript files do. + __all__ = ('discover_modules', 'discover_module_directories', 'configure_modules', + 'register_module_test') # pylint: disable=undefined-all-variable + +-import imp ++import importlib + import inspect + import os + +@@ -71,7 +71,7 @@ def discover_modules(module_root, allowed_modules): + print("adding module: %s" % (name)) + fp = open(build_py, "r") + try: +- module = imp.load_module("module_" + name, fp, build_py, ++ module = importlib.load_module("module_" + name, fp, build_py, + (".py", "r", imp.PY_SOURCE)) + if getattr(module, "name", None) is None: + module.name = name diff --git a/pkgs/servers/nosql/mongodb/mongodb.nix b/pkgs/servers/nosql/mongodb/mongodb.nix index 47d788b753e3..9c26f5fa701d 100644 --- a/pkgs/servers/nosql/mongodb/mongodb.nix +++ b/pkgs/servers/nosql/mongodb/mongodb.nix @@ -13,7 +13,6 @@ , openldap , openssl , libpcap -, python311Packages , curl , Security , CoreFoundation @@ -32,12 +31,13 @@ }: let - scons = buildPackages.scons.override{ python3Packages = python311Packages; }; + scons = buildPackages.scons; python = scons.python.withPackages (ps: with ps; [ pyyaml cheetah3 psutil setuptools + distutils ] ++ lib.optionals (lib.versionAtLeast version "6.0") [ packaging pymongo From 422ae9928a5ccb0c3be3a0255a5ffb79ef497cd8 Mon Sep 17 00:00:00 2001 From: Zhong Jianxin Date: Mon, 2 Sep 2024 19:23:52 +0800 Subject: [PATCH 103/235] nixos/services.bees: Fix evaluation ``` error: undefined variable 'mod' ``` --- nixos/modules/services/misc/bees.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/misc/bees.nix b/nixos/modules/services/misc/bees.nix index 170f92253c63..0824e0a8835c 100644 --- a/nixos/modules/services/misc/bees.nix +++ b/nixos/modules/services/misc/bees.nix @@ -23,7 +23,7 @@ let example = "LABEL=MyBulkDataDrive"; }; options.hashTableSizeMB = lib.mkOption { - type = lib.types.addCheck lib.types.int (n: mod n 16 == 0); + type = lib.types.addCheck lib.types.int (n: lib.mod n 16 == 0); default = 1024; # 1GB; default from upstream beesd script description = '' Hash table size in MB; must be a multiple of 16. From a8f5ef66e5d6e7f03a2c7af026d096372f651c74 Mon Sep 17 00:00:00 2001 From: Hritwik Date: Mon, 2 Sep 2024 17:30:57 +0530 Subject: [PATCH 104/235] bookstack: 24.05.2 -> 24.05.4 --- pkgs/servers/web-apps/bookstack/default.nix | 4 +- .../web-apps/bookstack/php-packages.nix | 258 +++++++++--------- 2 files changed, 131 insertions(+), 131 deletions(-) diff --git a/pkgs/servers/web-apps/bookstack/default.nix b/pkgs/servers/web-apps/bookstack/default.nix index c99f93625f97..f8e4be274be4 100644 --- a/pkgs/servers/web-apps/bookstack/default.nix +++ b/pkgs/servers/web-apps/bookstack/default.nix @@ -16,13 +16,13 @@ let in package.override rec { pname = "bookstack"; - version = "24.05.2"; + version = "24.05.4"; src = fetchFromGitHub { owner = "bookstackapp"; repo = pname; rev = "v${version}"; - sha256 = "13yln6b5j9plkcrp1mwfvgcv67gm2ayb2l2grhw2h4ncqnvmxhwv"; + sha256 = "1aa4im2khxycv5i2ff23ss91p4kr7d2a4yhjm0k0n6av64zhz2x3"; }; meta = with lib; { diff --git a/pkgs/servers/web-apps/bookstack/php-packages.nix b/pkgs/servers/web-apps/bookstack/php-packages.nix index b5bed1867065..423fd28c8736 100644 --- a/pkgs/servers/web-apps/bookstack/php-packages.nix +++ b/pkgs/servers/web-apps/bookstack/php-packages.nix @@ -5,20 +5,20 @@ let "aws/aws-crt-php" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "aws-aws-crt-php-0ea1f04ec5aa9f049f97e012d1ed63b76834a31b"; + name = "aws-aws-crt-php-a63485b65b6b3367039306496d49737cf1995408"; src = fetchurl { - url = "https://api.github.com/repos/awslabs/aws-crt-php/zipball/0ea1f04ec5aa9f049f97e012d1ed63b76834a31b"; - sha256 = "1xx5yhq99z752pagij5djja4812p4s711188j8qk8wi0dl7331zm"; + url = "https://api.github.com/repos/awslabs/aws-crt-php/zipball/a63485b65b6b3367039306496d49737cf1995408"; + sha256 = "0sga71rp99dxjx524wxrn9lrjca4fd5iniphzwd9ss97w9nihq9i"; }; }; }; "aws/aws-sdk-php" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "aws-aws-sdk-php-731cd73062909594c5f7443413c4c4c40ed1c25c"; + name = "aws-aws-sdk-php-702b9955160d2dacdf2cdf4d4476fcf95eae1aaf"; src = fetchurl { - url = "https://api.github.com/repos/aws/aws-sdk-php/zipball/731cd73062909594c5f7443413c4c4c40ed1c25c"; - sha256 = "1bs6l34j3r1nr7750ssrannbi8x5pdwknlzhmqx84xajm9imiqcp"; + url = "https://api.github.com/repos/aws/aws-sdk-php/zipball/702b9955160d2dacdf2cdf4d4476fcf95eae1aaf"; + sha256 = "0yhld9v2qbdrw3bz8dwjhv60mbjyr632rqnj593h3bsxf4w3l7vj"; }; }; }; @@ -55,20 +55,20 @@ let "dasprid/enum" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "dasprid-enum-6faf451159fb8ba4126b925ed2d78acfce0dc016"; + name = "dasprid-enum-8dfd07c6d2cf31c8da90c53b83c026c7696dda90"; src = fetchurl { - url = "https://api.github.com/repos/DASPRiD/Enum/zipball/6faf451159fb8ba4126b925ed2d78acfce0dc016"; - sha256 = "1c3c7zdmpd5j1pw9am0k3mj8n17vy6xjhsh2qa7c0azz0f21jk4j"; + url = "https://api.github.com/repos/DASPRiD/Enum/zipball/8dfd07c6d2cf31c8da90c53b83c026c7696dda90"; + sha256 = "1ainxbpfbh9fir2vihc4q614yq6rc3lvz6836nddl50wx2zpcby2"; }; }; }; "dflydev/dot-access-data" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "dflydev-dot-access-data-f41715465d65213d644d3141a6a93081be5d3549"; + name = "dflydev-dot-access-data-a23a2bf4f31d3518f3ecb38660c95715dfead60f"; src = fetchurl { - url = "https://api.github.com/repos/dflydev/dflydev-dot-access-data/zipball/f41715465d65213d644d3141a6a93081be5d3549"; - sha256 = "1vgbjrq8qh06r26y5nlxfin4989r3h7dib1jifb2l3cjdn1r5bmj"; + url = "https://api.github.com/repos/dflydev/dflydev-dot-access-data/zipball/a23a2bf4f31d3518f3ecb38660c95715dfead60f"; + sha256 = "0j0rywsfpna100ygdk5f2ngijc8cp785szz84274mq8gdzhan06l"; }; }; }; @@ -85,10 +85,10 @@ let "doctrine/dbal" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "doctrine-dbal-b05e48a745f722801f55408d0dbd8003b403dbbd"; + name = "doctrine-dbal-d8f68ea6cc00912e5313237130b8c8decf4d28c6"; src = fetchurl { - url = "https://api.github.com/repos/doctrine/dbal/zipball/b05e48a745f722801f55408d0dbd8003b403dbbd"; - sha256 = "0bca75y1wadpab0ns31s3wbvvxsq108i8jfyrh4xnifl56wb8pvh"; + url = "https://api.github.com/repos/doctrine/dbal/zipball/d8f68ea6cc00912e5313237130b8c8decf4d28c6"; + sha256 = "0ay8x80cyfnr83c3bpjkabh0hlzz7hibd8jpfr24gsrf592sz82m"; }; }; }; @@ -185,40 +185,40 @@ let "graham-campbell/result-type" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "graham-campbell-result-type-fbd48bce38f73f8a4ec8583362e732e4095e5862"; + name = "graham-campbell-result-type-3ba905c11371512af9d9bdd27d99b782216b6945"; src = fetchurl { - url = "https://api.github.com/repos/GrahamCampbell/Result-Type/zipball/fbd48bce38f73f8a4ec8583362e732e4095e5862"; - sha256 = "1mzahy4df8d45qm716crs45rp5j7k31r0jhkmbrrvqsvapnmj9ip"; + url = "https://api.github.com/repos/GrahamCampbell/Result-Type/zipball/3ba905c11371512af9d9bdd27d99b782216b6945"; + sha256 = "16bsycdsgcf4jz2sd277958rn9k9mzxjnby20xpmyhb7s8c2rac7"; }; }; }; "guzzlehttp/guzzle" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "guzzlehttp-guzzle-41042bc7ab002487b876a0683fc8dce04ddce104"; + name = "guzzlehttp-guzzle-d281ed313b989f213357e3be1a179f02196ac99b"; src = fetchurl { - url = "https://api.github.com/repos/guzzle/guzzle/zipball/41042bc7ab002487b876a0683fc8dce04ddce104"; - sha256 = "0awhhka285kk0apv92n0a0yfbihi2ddnx3qr1c7s97asgxfnwxsv"; + url = "https://api.github.com/repos/guzzle/guzzle/zipball/d281ed313b989f213357e3be1a179f02196ac99b"; + sha256 = "048hm3r04ldk2w9pqja6jmkc590h1kln3136128bn7zzdg1vmqi4"; }; }; }; "guzzlehttp/promises" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "guzzlehttp-promises-bbff78d96034045e58e13dedd6ad91b5d1253223"; + name = "guzzlehttp-promises-6ea8dd08867a2a42619d65c3deb2c0fcbf81c8f8"; src = fetchurl { - url = "https://api.github.com/repos/guzzle/promises/zipball/bbff78d96034045e58e13dedd6ad91b5d1253223"; - sha256 = "1p0bry118c3lichkz8lag37ndvvhbd2nf0k9kzwi8gz1bzf9d45f"; + url = "https://api.github.com/repos/guzzle/promises/zipball/6ea8dd08867a2a42619d65c3deb2c0fcbf81c8f8"; + sha256 = "03l91ksymgygdwa30ry0752564nrwkbgmrmlhmmhq89v06i70lln"; }; }; }; "guzzlehttp/psr7" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "guzzlehttp-psr7-45b30f99ac27b5ca93cb4831afe16285f57b8221"; + name = "guzzlehttp-psr7-a70f5c95fb43bc83f07c9c948baa0dc1829bf201"; src = fetchurl { - url = "https://api.github.com/repos/guzzle/psr7/zipball/45b30f99ac27b5ca93cb4831afe16285f57b8221"; - sha256 = "0k60pzfpxd6q1rhr9gbf53j0hm9wj5p5spkc0zfyia4b8f8pgmdm"; + url = "https://api.github.com/repos/guzzle/psr7/zipball/a70f5c95fb43bc83f07c9c948baa0dc1829bf201"; + sha256 = "1xp4c6v1qszbhzdgcgbd03dvxsk0s0vysr3q4rvhm134qlkbrdf2"; }; }; }; @@ -245,10 +245,10 @@ let "intervention/image" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "intervention-image-d428433aa74836ab75e8d4a5241628bebb7f4077"; + name = "intervention-image-1786ad5e1789050939d73cd195de4b8eaeeb34ed"; src = fetchurl { - url = "https://api.github.com/repos/Intervention/image/zipball/d428433aa74836ab75e8d4a5241628bebb7f4077"; - sha256 = "0qglsydy5672kl1f12pp185zw4vk30jh151bgjvyakggwiabds57"; + url = "https://api.github.com/repos/Intervention/image/zipball/1786ad5e1789050939d73cd195de4b8eaeeb34ed"; + sha256 = "1hx23frhjsisss19xzhjmrv7ymf0siqp1g50xvx27kisp7ifyv1k"; }; }; }; @@ -265,40 +265,40 @@ let "laravel/framework" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "laravel-framework-590afea38e708022662629fbf5184351fa82cf08"; + name = "laravel-framework-be2be342d4c74db6a8d2bd18469cd6d488ab9c98"; src = fetchurl { - url = "https://api.github.com/repos/laravel/framework/zipball/590afea38e708022662629fbf5184351fa82cf08"; - sha256 = "0gnp0khw8a1rydrv06pi4sssx6fyvdwvcqsgjh8rjcbcs39f1ii5"; + url = "https://api.github.com/repos/laravel/framework/zipball/be2be342d4c74db6a8d2bd18469cd6d488ab9c98"; + sha256 = "0r62pimjsqcgip725qh4zmb7icssf84larffjv2l0g4f31683h6x"; }; }; }; "laravel/prompts" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "laravel-prompts-9bc4df7c699b0452c6b815e64a2d84b6d7f99400"; + name = "laravel-prompts-7b4029a84c37cb2725fc7f011586e2997040bc95"; src = fetchurl { - url = "https://api.github.com/repos/laravel/prompts/zipball/9bc4df7c699b0452c6b815e64a2d84b6d7f99400"; - sha256 = "05hf1r10l8fbxy4wy4g4sjwqvd28liq5n4gjyhsc54kj2jp5bba0"; + url = "https://api.github.com/repos/laravel/prompts/zipball/7b4029a84c37cb2725fc7f011586e2997040bc95"; + sha256 = "0fzww2cdpm5l6smas1kw47wh9j0w72z00bb8ahxyzlz0gl4k7jz8"; }; }; }; "laravel/serializable-closure" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "laravel-serializable-closure-3dbf8a8e914634c48d389c1234552666b3d43754"; + name = "laravel-serializable-closure-61b87392d986dc49ad5ef64e75b1ff5fee24ef81"; src = fetchurl { - url = "https://api.github.com/repos/laravel/serializable-closure/zipball/3dbf8a8e914634c48d389c1234552666b3d43754"; - sha256 = "1vvayh1bzbw16xj8ash4flibkgn5afwn64nfwmjdi7lcr48cw65q"; + url = "https://api.github.com/repos/laravel/serializable-closure/zipball/61b87392d986dc49ad5ef64e75b1ff5fee24ef81"; + sha256 = "02mpbd5qv27p5637yyyx8jpx6x3sgjdj1j5immlgc73j7a0vj7xl"; }; }; }; "laravel/socialite" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "laravel-socialite-c7b0193a3753a29aff8ce80aa2f511917e6ed68a"; + name = "laravel-socialite-cc02625f0bd1f95dc3688eb041cce0f1e709d029"; src = fetchurl { - url = "https://api.github.com/repos/laravel/socialite/zipball/c7b0193a3753a29aff8ce80aa2f511917e6ed68a"; - sha256 = "0aym6n2ljqwfxrm5s3h7q98xggnblhk5q4whn46wyyvclqysj2bs"; + url = "https://api.github.com/repos/laravel/socialite/zipball/cc02625f0bd1f95dc3688eb041cce0f1e709d029"; + sha256 = "1fcrk4h4gwb06x842225yk1mbja0bbrzjd7dxkhqzvccfkd3q1km"; }; }; }; @@ -315,10 +315,10 @@ let "league/commonmark" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "league-commonmark-91c24291965bd6d7c46c46a12ba7492f83b1cadf"; + name = "league-commonmark-b650144166dfa7703e62a22e493b853b58d874b0"; src = fetchurl { - url = "https://api.github.com/repos/thephpleague/commonmark/zipball/91c24291965bd6d7c46c46a12ba7492f83b1cadf"; - sha256 = "1i7yqcp4hdzz1k6qga96jwp9qpw7dxlfr5miw48zyym60ndk9n02"; + url = "https://api.github.com/repos/thephpleague/commonmark/zipball/b650144166dfa7703e62a22e493b853b58d874b0"; + sha256 = "0ggjlpjdjvk9dxdav2264j7ycazsg6s5wlzmv8ihv375wi20dg5g"; }; }; }; @@ -415,10 +415,10 @@ let "monolog/monolog" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "monolog-monolog-4b18b21a5527a3d5ffdac2fd35d3ab25a9597654"; + name = "monolog-monolog-f4393b648b78a5408747de94fca38beb5f7e9ef8"; src = fetchurl { - url = "https://api.github.com/repos/Seldaek/monolog/zipball/4b18b21a5527a3d5ffdac2fd35d3ab25a9597654"; - sha256 = "1k7ggaygbcm3ls9pkwm5qmf3a1b5i1bd953jy839km0lh4gz637s"; + url = "https://api.github.com/repos/Seldaek/monolog/zipball/f4393b648b78a5408747de94fca38beb5f7e9ef8"; + sha256 = "0jz5b9rss98xa4bw0y4bp3by9vpbw97scwndkjimq7kwr9n6kpjy"; }; }; }; @@ -455,20 +455,20 @@ let "nette/utils" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "nette-utils-d3ad0aa3b9f934602cb3e3902ebccf10be34d218"; + name = "nette-utils-736c567e257dbe0fcf6ce81b4d6dbe05c6899f96"; src = fetchurl { - url = "https://api.github.com/repos/nette/utils/zipball/d3ad0aa3b9f934602cb3e3902ebccf10be34d218"; - sha256 = "11df93i9xkwkfq33hqf2x562a36sibzpc6rkbblz2r10mna6qw6q"; + url = "https://api.github.com/repos/nette/utils/zipball/736c567e257dbe0fcf6ce81b4d6dbe05c6899f96"; + sha256 = "1v81fswairscrnakbrfh8mlh5i873krlgvhv6ngsb9pi281x6r2b"; }; }; }; "nikic/php-parser" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "nikic-php-parser-139676794dc1e9231bf7bcd123cfc0c99182cb13"; + name = "nikic-php-parser-683130c2ff8c2739f4822ff7ac5c873ec529abd1"; src = fetchurl { - url = "https://api.github.com/repos/nikic/PHP-Parser/zipball/139676794dc1e9231bf7bcd123cfc0c99182cb13"; - sha256 = "1z4bvxvxs09099i3khiydmzy8lqjvk8kdani2qipmkq9vzf9pq56"; + url = "https://api.github.com/repos/nikic/PHP-Parser/zipball/683130c2ff8c2739f4822ff7ac5c873ec529abd1"; + sha256 = "1wwjddqsbq94grckdnplcg8c3423y2jw2mx97n2k7f8wlq4q1fhv"; }; }; }; @@ -535,20 +535,20 @@ let "phpoption/phpoption" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "phpoption-phpoption-80735db690fe4fc5c76dfa7f9b770634285fa820"; + name = "phpoption-phpoption-e3fac8b24f56113f7cb96af14958c0dd16330f54"; src = fetchurl { - url = "https://api.github.com/repos/schmittjoh/php-option/zipball/80735db690fe4fc5c76dfa7f9b770634285fa820"; - sha256 = "1f9hzyjnam157lb7iw9r8f5cnjjsiqam9mnkpqmba73g1668xn9s"; + url = "https://api.github.com/repos/schmittjoh/php-option/zipball/e3fac8b24f56113f7cb96af14958c0dd16330f54"; + sha256 = "0rbw9mljc00rx2drrqpmwfs47s77iprxvpbff2vqw082x4y989rq"; }; }; }; "phpseclib/phpseclib" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "phpseclib-phpseclib-cfa2013d0f68c062055180dd4328cc8b9d1f30b8"; + name = "phpseclib-phpseclib-621c73f7dcb310b61de34d1da4c4204e8ace6ceb"; src = fetchurl { - url = "https://api.github.com/repos/phpseclib/phpseclib/zipball/cfa2013d0f68c062055180dd4328cc8b9d1f30b8"; - sha256 = "1wgzy4fbj565czpn9xasr8lnd9ilh1x3bsalrpx5bskvqr4zspgj"; + url = "https://api.github.com/repos/phpseclib/phpseclib/zipball/621c73f7dcb310b61de34d1da4c4204e8ace6ceb"; + sha256 = "1p3asiv3cak3m6lla66bgxiwz00nwn1dd6lwnqgdpqyqh6gbln1n"; }; }; }; @@ -645,10 +645,10 @@ let "psr/log" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "psr-log-fe5ea303b0887d5caefd3d431c3e61ad47037001"; + name = "psr-log-79dff0b268932c640297f5208d6298f71855c03e"; src = fetchurl { - url = "https://api.github.com/repos/php-fig/log/zipball/fe5ea303b0887d5caefd3d431c3e61ad47037001"; - sha256 = "0a0rwg38vdkmal3nwsgx58z06qkfl85w2yvhbgwg45anr0b3bhmv"; + url = "https://api.github.com/repos/php-fig/log/zipball/79dff0b268932c640297f5208d6298f71855c03e"; + sha256 = "18vvdj61v85glmr26i1jl1x93cq2c1aq1ajpa6z4l749c62670f2"; }; }; }; @@ -665,10 +665,10 @@ let "psy/psysh" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "psy-psysh-b6b6cce7d3ee8fbf31843edce5e8f5a72eff4a73"; + name = "psy-psysh-2fd717afa05341b4f8152547f142cd2f130f6818"; src = fetchurl { - url = "https://api.github.com/repos/bobthecow/psysh/zipball/b6b6cce7d3ee8fbf31843edce5e8f5a72eff4a73"; - sha256 = "0k3fz94cafw7r8wrs5ybb15wmxiv65yqkyhj2l3m185659iym2p3"; + url = "https://api.github.com/repos/bobthecow/psysh/zipball/2fd717afa05341b4f8152547f142cd2f130f6818"; + sha256 = "009mhfsh6vsrygdmr5b64w8mppw6j2n8ajbx856dpcwjji8fx8q7"; }; }; }; @@ -715,10 +715,10 @@ let "sabberworm/php-css-parser" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "sabberworm-php-css-parser-4a3d572b0f8b28bb6fd016ae8bbfc445facef152"; + name = "sabberworm-php-css-parser-d2fb94a9641be84d79c7548c6d39bbebba6e9a70"; src = fetchurl { - url = "https://api.github.com/repos/MyIntervals/PHP-CSS-Parser/zipball/4a3d572b0f8b28bb6fd016ae8bbfc445facef152"; - sha256 = "1gs3q8j70ccwa2s3icf936xxik8h3qi5plkpvw4ygzkb9vkcicdv"; + url = "https://api.github.com/repos/MyIntervals/PHP-CSS-Parser/zipball/d2fb94a9641be84d79c7548c6d39bbebba6e9a70"; + sha256 = "0dvn86wx9h4vlw7wz7v1jq8ba654s060dg3186z2cr2q9f636dy2"; }; }; }; @@ -805,10 +805,10 @@ let "symfony/console" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "symfony-console-be5854cee0e8c7b110f00d695d11debdfa1a2a91"; + name = "symfony-console-504974cbe43d05f83b201d6498c206f16fc0cdbc"; src = fetchurl { - url = "https://api.github.com/repos/symfony/console/zipball/be5854cee0e8c7b110f00d695d11debdfa1a2a91"; - sha256 = "018il5dccpnk2988sgxp26440wrx25j064gns7plnidmx7byxjpw"; + url = "https://api.github.com/repos/symfony/console/zipball/504974cbe43d05f83b201d6498c206f16fc0cdbc"; + sha256 = "004hx7047y2cknj54kfifj28rchvx7k1635y28gmaq5k5caahfd8"; }; }; }; @@ -835,10 +835,10 @@ let "symfony/error-handler" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "symfony-error-handler-ef836152bf13472dc5fb5b08b0c0c4cfeddc0fcc"; + name = "symfony-error-handler-231f1b2ee80f72daa1972f7340297d67439224f0"; src = fetchurl { - url = "https://api.github.com/repos/symfony/error-handler/zipball/ef836152bf13472dc5fb5b08b0c0c4cfeddc0fcc"; - sha256 = "0r29dqwxs2xmv404rfcidf83rycfm9fqv7hsqaz3jwms00y770gg"; + url = "https://api.github.com/repos/symfony/error-handler/zipball/231f1b2ee80f72daa1972f7340297d67439224f0"; + sha256 = "0bdphr8xv4d9ln3yiaajzxfvybc6kvcpsybf69kg6f2v88p14pj7"; }; }; }; @@ -865,130 +865,130 @@ let "symfony/finder" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "symfony-finder-3ef977a43883215d560a2cecb82ec8e62131471c"; + name = "symfony-finder-af29198d87112bebdd397bd7735fbd115997824c"; src = fetchurl { - url = "https://api.github.com/repos/symfony/finder/zipball/3ef977a43883215d560a2cecb82ec8e62131471c"; - sha256 = "1ibv2sk2bfg6hymxhs6p6g62h7ycw1w2lg1w1q78pql1nxvrp7ks"; + url = "https://api.github.com/repos/symfony/finder/zipball/af29198d87112bebdd397bd7735fbd115997824c"; + sha256 = "0wgc1rr6fg9prsmjbkcaf530h1gf1v8wnab84sfzpcrwaa4abdmv"; }; }; }; "symfony/http-foundation" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "symfony-http-foundation-27de8cc95e11db7a50b027e71caaab9024545947"; + name = "symfony-http-foundation-117f1f20a7ade7bcea28b861fb79160a21a1e37b"; src = fetchurl { - url = "https://api.github.com/repos/symfony/http-foundation/zipball/27de8cc95e11db7a50b027e71caaab9024545947"; - sha256 = "11bf0fhb7pf5jp5kpd7nm8sil9mnnvhihj4l23gx514m81anzfi0"; + url = "https://api.github.com/repos/symfony/http-foundation/zipball/117f1f20a7ade7bcea28b861fb79160a21a1e37b"; + sha256 = "1rgzpb9v9502d5f0zlq7h0s15i1lg63clsx1j5cw51w2y079frgn"; }; }; }; "symfony/http-kernel" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "symfony-http-kernel-6c519aa3f32adcfd1d1f18d923f6b227d9acf3c1"; + name = "symfony-http-kernel-147e0daf618d7575b5007055340d09aece5cf068"; src = fetchurl { - url = "https://api.github.com/repos/symfony/http-kernel/zipball/6c519aa3f32adcfd1d1f18d923f6b227d9acf3c1"; - sha256 = "0y2qsnymkagnds6qwgfv2lbf9i3jf0f4frs1psa35mkb64c58hkg"; + url = "https://api.github.com/repos/symfony/http-kernel/zipball/147e0daf618d7575b5007055340d09aece5cf068"; + sha256 = "1bpv2zwsgz1ki9vzhcz5jj9c712zz6crncw2gw88n10gn2sir1cj"; }; }; }; "symfony/mime" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "symfony-mime-618597ab8b78ac86d1c75a9d0b35540cda074f33"; + name = "symfony-mime-7d048964877324debdcb4e0549becfa064a20d43"; src = fetchurl { - url = "https://api.github.com/repos/symfony/mime/zipball/618597ab8b78ac86d1c75a9d0b35540cda074f33"; - sha256 = "1rklzg8j8s6ls770l8rqz7mb10nrifr228zmqpxdqkpfrs8j0w3z"; + url = "https://api.github.com/repos/symfony/mime/zipball/7d048964877324debdcb4e0549becfa064a20d43"; + sha256 = "0i9falma5rwi59cjylibgzj70gqj0vrkpkf9g8mxzy62ij5l61rq"; }; }; }; "symfony/polyfill-ctype" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "symfony-polyfill-ctype-ef4d7e442ca910c4764bce785146269b30cb5fc4"; + name = "symfony-polyfill-ctype-0424dff1c58f028c451efff2045f5d92410bd540"; src = fetchurl { - url = "https://api.github.com/repos/symfony/polyfill-ctype/zipball/ef4d7e442ca910c4764bce785146269b30cb5fc4"; - sha256 = "16wr6dp9yr4wks11d1qjyzpc343ri2nr7q7fmrnp3jhmp949rppy"; + url = "https://api.github.com/repos/symfony/polyfill-ctype/zipball/0424dff1c58f028c451efff2045f5d92410bd540"; + sha256 = "1lcz3k1i3yndy1qkdh89n05m60hh3g1zi438l0qf92j5hy2pr32n"; }; }; }; "symfony/polyfill-intl-grapheme" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "symfony-polyfill-intl-grapheme-32a9da87d7b3245e09ac426c83d334ae9f06f80f"; + name = "symfony-polyfill-intl-grapheme-64647a7c30b2283f5d49b874d84a18fc22054b7a"; src = fetchurl { - url = "https://api.github.com/repos/symfony/polyfill-intl-grapheme/zipball/32a9da87d7b3245e09ac426c83d334ae9f06f80f"; - sha256 = "03wk7yxavld4jnvavy7m2d3xxn5h4938wypgwjkblgx8n7s93jiq"; + url = "https://api.github.com/repos/symfony/polyfill-intl-grapheme/zipball/64647a7c30b2283f5d49b874d84a18fc22054b7a"; + sha256 = "1flqdijnx2kz2i9jdaz23ambii3nx60j211hcjzdf5mzmbic4izr"; }; }; }; "symfony/polyfill-intl-idn" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "symfony-polyfill-intl-idn-a287ed7475f85bf6f61890146edbc932c0fff919"; + name = "symfony-polyfill-intl-idn-a6e83bdeb3c84391d1dfe16f42e40727ce524a5c"; src = fetchurl { - url = "https://api.github.com/repos/symfony/polyfill-intl-idn/zipball/a287ed7475f85bf6f61890146edbc932c0fff919"; - sha256 = "14x9hv01fn5dmpkm7480lgzhz4lqdi3w1hlkh3sjpb6ic87k0wc1"; + url = "https://api.github.com/repos/symfony/polyfill-intl-idn/zipball/a6e83bdeb3c84391d1dfe16f42e40727ce524a5c"; + sha256 = "1y81p5kkrclbgq1v3qgf32mpgn6q1hjkw0n6328n2n81wj32japg"; }; }; }; "symfony/polyfill-intl-normalizer" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "symfony-polyfill-intl-normalizer-bc45c394692b948b4d383a08d7753968bed9a83d"; + name = "symfony-polyfill-intl-normalizer-a95281b0be0d9ab48050ebd988b967875cdb9fdb"; src = fetchurl { - url = "https://api.github.com/repos/symfony/polyfill-intl-normalizer/zipball/bc45c394692b948b4d383a08d7753968bed9a83d"; - sha256 = "1zq1kklvjl4zj2v6yjzg7rv6ibvhxfymgi2xb0m5cw9r6i63rinw"; + url = "https://api.github.com/repos/symfony/polyfill-intl-normalizer/zipball/a95281b0be0d9ab48050ebd988b967875cdb9fdb"; + sha256 = "1bsynsi3gqcdi5asgip7srnwciwz7dflzqx1n0c9x3zmd128fs42"; }; }; }; "symfony/polyfill-mbstring" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "symfony-polyfill-mbstring-9773676c8a1bb1f8d4340a62efe641cf76eda7ec"; + name = "symfony-polyfill-mbstring-fd22ab50000ef01661e2a31d850ebaa297f8e03c"; src = fetchurl { - url = "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/9773676c8a1bb1f8d4340a62efe641cf76eda7ec"; - sha256 = "1jpa4wwjfdkkhdpisviy1p4fhik00cldj5msipwl0izkia1d2qgf"; + url = "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/fd22ab50000ef01661e2a31d850ebaa297f8e03c"; + sha256 = "145vqkfca4h0smyjnhcsvn85ij75bbp9a5s3m672nn48671a8sxk"; }; }; }; "symfony/polyfill-php72" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "symfony-polyfill-php72-861391a8da9a04cbad2d232ddd9e4893220d6e25"; + name = "symfony-polyfill-php72-10112722600777e02d2745716b70c5db4ca70442"; src = fetchurl { - url = "https://api.github.com/repos/symfony/polyfill-php72/zipball/861391a8da9a04cbad2d232ddd9e4893220d6e25"; - sha256 = "0b4nw7x6c7jjn9bvkpqjnpszx647lncyswpk2iz57c1xl5dqywvh"; + url = "https://api.github.com/repos/symfony/polyfill-php72/zipball/10112722600777e02d2745716b70c5db4ca70442"; + sha256 = "1l9qpprnqrjjhkwggcz0c6ll8wrfzwlqcwq13xa0j9w0q5bwafp2"; }; }; }; "symfony/polyfill-php80" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "symfony-polyfill-php80-87b68208d5c1188808dd7839ee1e6c8ec3b02f1b"; + name = "symfony-polyfill-php80-77fa7995ac1b21ab60769b7323d600a991a90433"; src = fetchurl { - url = "https://api.github.com/repos/symfony/polyfill-php80/zipball/87b68208d5c1188808dd7839ee1e6c8ec3b02f1b"; - sha256 = "1pn6dzj8b3h8851w3y6mj5qrwklwky5w71v4m455553qlga5cfr7"; + url = "https://api.github.com/repos/symfony/polyfill-php80/zipball/77fa7995ac1b21ab60769b7323d600a991a90433"; + sha256 = "03y0jzb5z1d2jdxcw1mhcbb9psp1iabmvaflwib68vzncvh6fscl"; }; }; }; "symfony/polyfill-php83" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "symfony-polyfill-php83-86fcae159633351e5fd145d1c47de6c528f8caff"; + name = "symfony-polyfill-php83-dbdcdf1a4dcc2743591f1079d0c35ab1e2dcbbc9"; src = fetchurl { - url = "https://api.github.com/repos/symfony/polyfill-php83/zipball/86fcae159633351e5fd145d1c47de6c528f8caff"; - sha256 = "0n81fmn058rn7hr70qdwpsnam57pp27avs3h8xcfnq8d3hci5gr4"; + url = "https://api.github.com/repos/symfony/polyfill-php83/zipball/dbdcdf1a4dcc2743591f1079d0c35ab1e2dcbbc9"; + sha256 = "1sxmb6f75iclbpqwlsgi3af1xfcrxm7vcyyh0khn14nvd654ivrl"; }; }; }; "symfony/polyfill-uuid" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "symfony-polyfill-uuid-3abdd21b0ceaa3000ee950097bc3cf9efc137853"; + name = "symfony-polyfill-uuid-2ba1f33797470debcda07fe9dce20a0003df18e9"; src = fetchurl { - url = "https://api.github.com/repos/symfony/polyfill-uuid/zipball/3abdd21b0ceaa3000ee950097bc3cf9efc137853"; - sha256 = "15g5ng1bcca4nqxjrcjabc1v679zl6xwm1wwfngvww1hvrbgd98d"; + url = "https://api.github.com/repos/symfony/polyfill-uuid/zipball/2ba1f33797470debcda07fe9dce20a0003df18e9"; + sha256 = "1hsfsap6qmlkzfi56z44wgds5igw9xj7rax2znr8y3ci4x9sbxd0"; }; }; }; @@ -1005,10 +1005,10 @@ let "symfony/routing" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "symfony-routing-8a40d0f9b01f0fbb80885d3ce0ad6714fb603a58"; + name = "symfony-routing-aad19fe10753ba842f0d653a8db819c4b3affa87"; src = fetchurl { - url = "https://api.github.com/repos/symfony/routing/zipball/8a40d0f9b01f0fbb80885d3ce0ad6714fb603a58"; - sha256 = "1ayhdyvc503xjjaaz6vclsxbm568l73zybcbxiz6g1625cg4g8gb"; + url = "https://api.github.com/repos/symfony/routing/zipball/aad19fe10753ba842f0d653a8db819c4b3affa87"; + sha256 = "1cm2x1bffnm0parfkw3xixz8igj52pc4vv6hydkj0l2i3qrv4y0g"; }; }; }; @@ -1025,20 +1025,20 @@ let "symfony/string" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "symfony-string-a147c0f826c4a1f3afb763ab8e009e37c877a44d"; + name = "symfony-string-ccf9b30251719567bfd46494138327522b9a9446"; src = fetchurl { - url = "https://api.github.com/repos/symfony/string/zipball/a147c0f826c4a1f3afb763ab8e009e37c877a44d"; - sha256 = "1fkpq4lw9rp3wccdjj8qhpl02asp1izvji53sd0gzq4z3djq0y7p"; + url = "https://api.github.com/repos/symfony/string/zipball/ccf9b30251719567bfd46494138327522b9a9446"; + sha256 = "1yfdvksfhpq74vb45d3p8rnkbr43djbcy15gyi0vsbgccr64gc1v"; }; }; }; "symfony/translation" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "symfony-translation-a002933b13989fc4bd0b58e04bf7eec5210e438a"; + name = "symfony-translation-94041203f8ac200ae9e7c6a18fa6137814ccecc9"; src = fetchurl { - url = "https://api.github.com/repos/symfony/translation/zipball/a002933b13989fc4bd0b58e04bf7eec5210e438a"; - sha256 = "0a6rw66b6yysafkyhgzpqq147cm38id3v1kksnzgna528d5cac87"; + url = "https://api.github.com/repos/symfony/translation/zipball/94041203f8ac200ae9e7c6a18fa6137814ccecc9"; + sha256 = "01kzjwvkq434d36c5ag9qfzi4fdb3klcbx1gsrwx6zc3wvxs50x1"; }; }; }; @@ -1065,10 +1065,10 @@ let "symfony/var-dumper" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "symfony-var-dumper-ad23ca4312395f0a8a8633c831ef4c4ee542ed25"; + name = "symfony-var-dumper-a71cc3374f5fb9759da1961d28c452373b343dd4"; src = fetchurl { - url = "https://api.github.com/repos/symfony/var-dumper/zipball/ad23ca4312395f0a8a8633c831ef4c4ee542ed25"; - sha256 = "077ppd7v37qh6rfrv76apa1hm4apaqj5iskbfwlm32cndv0bnxk1"; + url = "https://api.github.com/repos/symfony/var-dumper/zipball/a71cc3374f5fb9759da1961d28c452373b343dd4"; + sha256 = "19nwa0qydp0g0s5fvcm7h90973c1j1q5llrg80v43qgv3wgawp36"; }; }; }; @@ -1085,10 +1085,10 @@ let "vlucas/phpdotenv" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "vlucas-phpdotenv-2cf9fb6054c2bb1d59d1f3817706ecdb9d2934c4"; + name = "vlucas-phpdotenv-a59a13791077fe3d44f90e7133eb68e7d22eaff2"; src = fetchurl { - url = "https://api.github.com/repos/vlucas/phpdotenv/zipball/2cf9fb6054c2bb1d59d1f3817706ecdb9d2934c4"; - sha256 = "0zb5gm5i6rnmm9zc4mi3wkkhpgciaa76w8jyxnw914xwq1xqzivx"; + url = "https://api.github.com/repos/vlucas/phpdotenv/zipball/a59a13791077fe3d44f90e7133eb68e7d22eaff2"; + sha256 = "1w7nyghdx0vw0v3rqzx0x3lafhrkgfk2fi3xiy5vf4lkbv3rdl4h"; }; }; }; From 9271ee409c8ce5af2e25890ba8adea2af590c94b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 2 Sep 2024 12:37:02 +0000 Subject: [PATCH 105/235] clash-meta: 1.18.7 -> 1.18.8 --- pkgs/by-name/mi/mihomo/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/mi/mihomo/package.nix b/pkgs/by-name/mi/mihomo/package.nix index dc7c362bc5a3..09d4ed448ca8 100644 --- a/pkgs/by-name/mi/mihomo/package.nix +++ b/pkgs/by-name/mi/mihomo/package.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "mihomo"; - version = "1.18.7"; + version = "1.18.8"; src = fetchFromGitHub { owner = "MetaCubeX"; repo = "mihomo"; rev = "v${version}"; - hash = "sha256-+9tVkMOOGwdmOXhoXanOpp8/7TEGGLR2aTeOsw+FzKc="; + hash = "sha256-UImkDjfNbC59SkoR0SsmlxGO5UPjMA0IURj+2+zgsVQ="; }; - vendorHash = "sha256-wbJgJY1EH3ajmoWXWRCSpD2C0eknajkwD1DaQz2EsUU="; + vendorHash = "sha256-Lrd+og6bOopbV/JDwfWY4X+D/2iOCMgDA+JlHJlxwXE="; excludedPackages = [ "./test" ]; From c3b6ef74172e384102441180fe95e90d39eb9bdc Mon Sep 17 00:00:00 2001 From: Victor Hang Date: Sun, 1 Sep 2024 01:50:23 +0200 Subject: [PATCH 106/235] netfetch: init at 5.2.10 Signed-off-by: Victor Hang --- maintainers/maintainer-list.nix | 6 ++++ pkgs/by-name/ne/netfetch/package.nix | 48 ++++++++++++++++++++++++++++ 2 files changed, 54 insertions(+) create mode 100644 pkgs/by-name/ne/netfetch/package.nix diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 493e2848ddf0..efb9dea997ee 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -2255,6 +2255,12 @@ githubId = 80325; name = "Benjamin Andresen"; }; + banh-canh = { + email = "vhvictorhang@gmail.com"; + github = "Banh-Canh"; + githubId = 66330398; + name = "Victor Hang"; + }; barab-i = { email = "barab_i@outlook.com"; github = "barab-i"; diff --git a/pkgs/by-name/ne/netfetch/package.nix b/pkgs/by-name/ne/netfetch/package.nix new file mode 100644 index 000000000000..b262e03cca9c --- /dev/null +++ b/pkgs/by-name/ne/netfetch/package.nix @@ -0,0 +1,48 @@ +{ + lib, + buildGoModule, + fetchFromGitHub, + installShellFiles, + stdenv, +}: +buildGoModule rec { + pname = "netfetch"; + version = "5.2.10"; + + src = fetchFromGitHub { + owner = "deggja"; + repo = "netfetch"; + rev = "refs/tags/${version}"; + hash = "sha256-N3wKpWdG92cXH0TwAkcsld9TRrfPRkbw0uZY/X4d+xk="; + }; + + vendorHash = "sha256-/Em3hx5tiQjThLBPJDHGsqxUV3eXeymJ5pY9c601OW0="; + + proxyVendor = true; + + subPackages = [ "backend" ]; + + ldflags = [ + "-s" + "-w" + "-X github.com/deggja/netfetch/backend/cmd.Version=${version}" + ]; + + nativeBuildInputs = [ installShellFiles ]; + + postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' + mv $out/bin/backend $out/bin/$pname + installShellCompletion --cmd $pname \ + --bash <($out/bin/$pname completion bash) \ + --fish <($out/bin/$pname completion fish) \ + --zsh <($out/bin/$pname completion zsh) + ''; + + meta = { + homepage = "https://github.com/deggja/netfetch"; + description = "Kubernetes tool for scanning clusters for network policies and identifying unprotected workloads"; + license = lib.licenses.mit; + mainProgram = "netfetch"; + maintainers = with lib.maintainers; [ banh-canh ]; + }; +} From bc12ef1bf01942844a40de05b95778f57531fa15 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Mon, 2 Sep 2024 17:50:29 +0200 Subject: [PATCH 107/235] buildGoModule: be nicer when overrideAttrs clears passthru Before an overlay in the form of: package.overrideAttrs (old: { passthru = {}; }) would fail evaluation like: error: attribute 'overrideModAttrs' missing at /nix/store/afwc3m1sm49qq57xjv2hmd7iy4x0j33h-source/pkgs/build-support/go/module.nix:179:20: 178| outputHashAlgo = if finalAttrs.vendorHash == "" then "sha256" else null; 179| }).overrideAttrs finalAttrs.passthru.overrideModAttrs; | ^ 180| Now instead we take the fallback default. --- pkgs/build-support/go/module.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/build-support/go/module.nix b/pkgs/build-support/go/module.nix index 214b2603ff7f..7a701060ebc9 100644 --- a/pkgs/build-support/go/module.nix +++ b/pkgs/build-support/go/module.nix @@ -176,7 +176,8 @@ in # Handle empty vendorHash; avoid # error: empty hash requires explicit hash algorithm outputHashAlgo = if finalAttrs.vendorHash == "" then "sha256" else null; - }).overrideAttrs finalAttrs.passthru.overrideModAttrs; + # in case an overlay clears passthru by accident, don't fail evaluation + }).overrideAttrs (finalAttrs.passthru.overrideModAttrs or overrideModAttrs); nativeBuildInputs = [ go ] ++ nativeBuildInputs; From d572c865adfa6fd4bc948fd5e5abcc044db51efe Mon Sep 17 00:00:00 2001 From: linsui <36977733+linsui@users.noreply.github.com> Date: Tue, 3 Sep 2024 02:27:17 +0800 Subject: [PATCH 108/235] nixos/foot: fix bash script --- nixos/modules/programs/foot/bashrc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/nixos/modules/programs/foot/bashrc b/nixos/modules/programs/foot/bashrc index 126f54721259..e35bc29f117b 100644 --- a/nixos/modules/programs/foot/bashrc +++ b/nixos/modules/programs/foot/bashrc @@ -12,16 +12,16 @@ osc7_cwd() { done printf '\e]7;file://%s%s\e\\' "${HOSTNAME}" "${encoded}" } -PROMPT_COMMAND=${PROMPT_COMMAND:+$PROMPT_COMMAND; }osc7_cwd +PROMPT_COMMAND=${PROMPT_COMMAND:+${PROMPT_COMMAND%;}; }osc7_cwd prompt_marker() { printf '\e]133;A\e\\' } -PROMPT_COMMAND=${PROMPT_COMMAND:+$PROMPT_COMMAND; }prompt_marker +PROMPT_COMMAND=${PROMPT_COMMAND:+${PROMPT_COMMAND%;}; }prompt_marker PS0+='\e]133;C\e\\' command_done() { printf '\e]133;D\e\\' } -PROMPT_COMMAND=${PROMPT_COMMAND:+$PROMPT_COMMAND; }command_done +PROMPT_COMMAND=${PROMPT_COMMAND:+${PROMPT_COMMAND%;}; }command_done From b6c396e6750dc62f3efabdd3b9869ae3413218ce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Mon, 2 Sep 2024 11:32:11 -0700 Subject: [PATCH 109/235] libdeltachat: 1.142.7 -> 1.142.11 Diff: https://github.com/deltachat/deltachat-core-rust/compare/v1.142.7...v1.142.11 Changelog: https://github.com/deltachat/deltachat-core-rust/blob/v1.142.11/CHANGELOG.md --- pkgs/by-name/li/libdeltachat/Cargo.lock | 10 +++++----- pkgs/by-name/li/libdeltachat/package.nix | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/by-name/li/libdeltachat/Cargo.lock b/pkgs/by-name/li/libdeltachat/Cargo.lock index a10f1fc1c63b..f1165e58ffbb 100644 --- a/pkgs/by-name/li/libdeltachat/Cargo.lock +++ b/pkgs/by-name/li/libdeltachat/Cargo.lock @@ -1353,7 +1353,7 @@ dependencies = [ [[package]] name = "deltachat" -version = "1.142.7" +version = "1.142.11" dependencies = [ "ansi_term", "anyhow", @@ -1444,7 +1444,7 @@ dependencies = [ [[package]] name = "deltachat-jsonrpc" -version = "1.142.7" +version = "1.142.11" dependencies = [ "anyhow", "async-channel 2.3.1", @@ -1469,7 +1469,7 @@ dependencies = [ [[package]] name = "deltachat-repl" -version = "1.142.7" +version = "1.142.11" dependencies = [ "ansi_term", "anyhow", @@ -1484,7 +1484,7 @@ dependencies = [ [[package]] name = "deltachat-rpc-server" -version = "1.142.7" +version = "1.142.11" dependencies = [ "anyhow", "deltachat", @@ -1513,7 +1513,7 @@ dependencies = [ [[package]] name = "deltachat_ffi" -version = "1.142.7" +version = "1.142.11" dependencies = [ "anyhow", "deltachat", diff --git a/pkgs/by-name/li/libdeltachat/package.nix b/pkgs/by-name/li/libdeltachat/package.nix index be37573e2e73..2e2409079c24 100644 --- a/pkgs/by-name/li/libdeltachat/package.nix +++ b/pkgs/by-name/li/libdeltachat/package.nix @@ -29,13 +29,13 @@ let }; in stdenv.mkDerivation rec { pname = "libdeltachat"; - version = "1.142.7"; + version = "1.142.11"; src = fetchFromGitHub { owner = "deltachat"; repo = "deltachat-core-rust"; rev = "v${version}"; - hash = "sha256-Wj7fmhp67a3OtzxPbfqOpZCzM9WokzKiaWNQS9qYyCo="; + hash = "sha256-60RkdwfLl2oncRKdAP0GD50WkrCBcrJ5Pkkue+UUJ0g="; }; patches = [ From 2bc4d0a0f7ec0f075a4cebd9b98f87480e544dd0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Mon, 2 Sep 2024 11:32:35 -0700 Subject: [PATCH 110/235] deltachat-desktop: 1.46.5 -> 1.46.7 Diff: https://github.com/deltachat/deltachat-desktop/compare/v1.46.5...v1.46.7 Changelog: https://github.com/deltachat/deltachat-desktop/blob/v1.46.7/CHANGELOG.md --- pkgs/by-name/de/deltachat-desktop/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/de/deltachat-desktop/package.nix b/pkgs/by-name/de/deltachat-desktop/package.nix index bf70d4672a05..d962f9cefe77 100644 --- a/pkgs/by-name/de/deltachat-desktop/package.nix +++ b/pkgs/by-name/de/deltachat-desktop/package.nix @@ -37,16 +37,16 @@ let in buildNpmPackage rec { pname = "deltachat-desktop"; - version = "1.46.5"; + version = "1.46.7"; src = fetchFromGitHub { owner = "deltachat"; repo = "deltachat-desktop"; rev = "v${version}"; - hash = "sha256-u/2/lCQpUf5bxKPseHz6SFmiW0m9SywuA5Ng3BBnX88="; + hash = "sha256-gsgw075YitYgx5WkNdPnh96w58FJaa2r8wOJyUsSAu0="; }; - npmDepsHash = "sha256-jnuSL0yr6E8P0Tev9rMsfCLs59WStaH19DhZe0zthmw="; + npmDepsHash = "sha256-Va/Aber3uwTFTy/XnYILkU3s66/xQAvGDFh2p/ZYYUo="; nativeBuildInputs = [ jq From 039e7c6a0f1fe8cd9581a36ab5a10335c6ac5e05 Mon Sep 17 00:00:00 2001 From: Alvar Penning Date: Mon, 5 Aug 2024 22:24:13 +0200 Subject: [PATCH 111/235] openrct2: 0.4.12 -> 0.4.13 https://github.com/OpenRCT2/OpenRCT2/releases/tag/v0.4.13 --- pkgs/games/openrct2/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/games/openrct2/default.nix b/pkgs/games/openrct2/default.nix index ac33578ca351..0f97051e141d 100644 --- a/pkgs/games/openrct2/default.nix +++ b/pkgs/games/openrct2/default.nix @@ -29,12 +29,12 @@ }: let - openrct2-version = "0.4.12"; + openrct2-version = "0.4.13"; # Those versions MUST match the pinned versions within the CMakeLists.txt # file. The REPLAYS repository from the CMakeLists.txt is not necessary. - objects-version = "1.4.6"; - openmsx-version = "1.5"; + objects-version = "1.4.7"; + openmsx-version = "1.6"; opensfx-version = "1.0.5"; title-sequences-version = "0.4.6"; @@ -42,21 +42,21 @@ let owner = "OpenRCT2"; repo = "OpenRCT2"; rev = "v${openrct2-version}"; - hash = "sha256-AZFJt1ZsYO07hHN9Nt+N95wTGfYPob/kZ7EkVVkUezg="; + hash = "sha256-MwpxZdYib4uEP9T9ImczrHp/UHYhR/je5BvS5XwXnqQ="; }; objects-src = fetchFromGitHub { owner = "OpenRCT2"; repo = "objects"; rev = "v${objects-version}"; - hash = "sha256-XfVic6b5jB1P2I0w5C+f97vvWvCh2zlcWpaXGLOj3CA="; + hash = "sha256-XtKhgCahGzhuIdwvoz47rlRthZEhb0w+OuGhZnplHSc="; }; openmsx-src = fetchFromGitHub { owner = "OpenRCT2"; repo = "OpenMusic"; rev = "v${openmsx-version}"; - hash = "sha256-p/wlvQFfu3R+jIuCcRbTMvxt0VKGGwJw0NDIsf6URWI="; + hash = "sha256-KjWJSB2tdE0ExswVlz0dLXNPhLJ1kI6VZb3vqXQfx8w="; }; opensfx-src = fetchFromGitHub { From 32b79e940ef17ac877a629868b1d371cef2e515f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Christ?= Date: Mon, 2 Sep 2024 20:38:04 +0200 Subject: [PATCH 112/235] mautrix-signal: Reformat code --- pkgs/by-name/li/libsignal-ffi/package.nix | 17 +++++++++++++++-- pkgs/servers/mautrix-signal/default.nix | 6 +++++- 2 files changed, 20 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/li/libsignal-ffi/package.nix b/pkgs/by-name/li/libsignal-ffi/package.nix index 458ca16aad1d..ae921ac23691 100644 --- a/pkgs/by-name/li/libsignal-ffi/package.nix +++ b/pkgs/by-name/li/libsignal-ffi/package.nix @@ -1,4 +1,14 @@ -{ lib, stdenv, fetchFromGitHub, rustPlatform, runCommand, xcodebuild, protobuf, boringssl, darwin }: +{ + lib, + stdenv, + fetchFromGitHub, + rustPlatform, + runCommand, + xcodebuild, + protobuf, + boringssl, + darwin, +}: let # boring-sys expects the static libraries in build/ instead of lib/ boringssl-wrapper = runCommand "boringssl-wrapper" { } '' @@ -39,7 +49,10 @@ rustPlatform.buildRustPackage rec { }; }; - cargoBuildFlags = [ "-p" "libsignal-ffi" ]; + cargoBuildFlags = [ + "-p" + "libsignal-ffi" + ]; meta = with lib; { description = "C ABI library which exposes Signal protocol logic"; diff --git a/pkgs/servers/mautrix-signal/default.nix b/pkgs/servers/mautrix-signal/default.nix index 08894b5492f6..c5565f620078 100644 --- a/pkgs/servers/mautrix-signal/default.nix +++ b/pkgs/servers/mautrix-signal/default.nix @@ -38,7 +38,11 @@ buildGoModule rec { homepage = "https://github.com/mautrix/signal"; description = "Matrix-Signal puppeting bridge"; license = licenses.agpl3Plus; - maintainers = with maintainers; [ expipiplus1 niklaskorz ma27 ]; + maintainers = with maintainers; [ + expipiplus1 + niklaskorz + ma27 + ]; mainProgram = "mautrix-signal"; }; } From b59b54ba37a335987c22c58f5397d09789281e4b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Christ?= Date: Mon, 26 Aug 2024 20:58:08 +0200 Subject: [PATCH 113/235] mautrix-signal: 0.6.3 -> 0.7.0 --- pkgs/by-name/li/libsignal-ffi/Cargo.lock | 812 +++++++++++++--------- pkgs/by-name/li/libsignal-ffi/package.nix | 7 +- pkgs/servers/mautrix-signal/default.nix | 6 +- 3 files changed, 472 insertions(+), 353 deletions(-) diff --git a/pkgs/by-name/li/libsignal-ffi/Cargo.lock b/pkgs/by-name/li/libsignal-ffi/Cargo.lock index 20d21c2a25e5..a4b131eea28f 100644 --- a/pkgs/by-name/li/libsignal-ffi/Cargo.lock +++ b/pkgs/by-name/li/libsignal-ffi/Cargo.lock @@ -4,9 +4,9 @@ version = 3 [[package]] name = "addr2line" -version = "0.21.0" +version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a30b2e23b9e17a9f90641c7ab1549cd9b44f296d3ccbf309d2863cfe398a0cb" +checksum = "6e4503c46a5c0c7844e948c9a4d6acd9f50cccb4de1c48eb9e291ea17470c678" dependencies = [ "gimli", ] @@ -130,9 +130,9 @@ dependencies = [ [[package]] name = "anstyle-query" -version = "1.0.3" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a64c907d4e79225ac72e2a354c9ce84d50ebb4586dee56c82b3ee73004f537f5" +checksum = "ad186efb764318d35165f1758e7dcef3b10628e26d41a44bc5550652e6804391" dependencies = [ "windows-sys 0.52.0", ] @@ -168,15 +168,15 @@ dependencies = [ [[package]] name = "array-concat" -version = "0.5.2" +version = "0.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e9180feb72ccbc07cfe5ef7fa8bbf86ca71490d5dc9ef8ea02c7298ba94e7f7d" +checksum = "68b4d2c47ea522f4135657904891e533727daca3d2d852f29f5e4cc50960c77c" [[package]] name = "arrayref" -version = "0.3.7" +version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b4930d2cb77ce62f89ee5d5289b4ac049559b1c45539271f5ed4fdc7db34545" +checksum = "9d151e35f61089500b617991b791fc8bfd237ae50cd5950803758a179b41e67a" [[package]] name = "arrayvec" @@ -186,22 +186,22 @@ checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711" [[package]] name = "asn1" -version = "0.16.1" +version = "0.16.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "889adc8fd6c1344619926529e605cccad1f832b3a2a5a3fe6d7c8557c8f05368" +checksum = "532ceda058281b62096b2add4ab00ab3a453d30dee28b8890f62461a0109ebbd" dependencies = [ "asn1_derive", ] [[package]] name = "asn1_derive" -version = "0.16.1" +version = "0.16.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2271cec9b830009b9c3b9e21767083c553f51f996b690c476c27f541199aa99" +checksum = "56e6076d38cc17cc22b0f65f31170a2ee1975e6b07f0012893aefd86ce19c987" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.72", ] [[package]] @@ -227,9 +227,9 @@ checksum = "9b34d609dfbaf33d6889b2b7106d3ca345eacad44200913df5ba02bfd31d2ba9" [[package]] name = "async-compression" -version = "0.4.10" +version = "0.4.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c90a406b4495d129f00461241616194cb8a032c8d1c53c657f0961d5f8e0498" +checksum = "fec134f64e2bc57411226dfc4e52dec859ddfc7e711fc5e07b612584f000e4aa" dependencies = [ "flate2", "futures-core", @@ -240,13 +240,13 @@ dependencies = [ [[package]] name = "async-trait" -version = "0.1.80" +version = "0.1.81" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c6fa2087f2753a7da8cc1c0dbfcf89579dd57458e36769de5ac750b4671737ca" +checksum = "6e0c28dcc82d7c8ead5cb13beb15405b57b8546e93215673ff8ca0349a028107" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.72", ] [[package]] @@ -293,6 +293,7 @@ dependencies = [ "thiserror", "uuid", "x25519-dalek", + "zerocopy", ] [[package]] @@ -303,9 +304,9 @@ checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0" [[package]] name = "backtrace" -version = "0.3.71" +version = "0.3.73" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26b05800d2e817c8b3b4b54abd461726265fa9789ae34330622f2db9ee696f9d" +checksum = "5cc23269a4f8976d0a4d2e7109211a419fe30e8d88d677cd60b6bc79c5732e0a" dependencies = [ "addr2line", "cc", @@ -360,7 +361,7 @@ dependencies = [ "regex", "rustc-hash", "shlex", - "syn 2.0.66", + "syn 2.0.72", ] [[package]] @@ -380,9 +381,9 @@ checksum = "349f9b6a179ed607305526ca489b34ad0a41aed5f7980fa90eb03160b69598fb" [[package]] name = "bitflags" -version = "2.5.0" +version = "2.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1" +checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de" [[package]] name = "bitstream-io" @@ -419,8 +420,8 @@ dependencies = [ [[package]] name = "boring" -version = "4.6.0" -source = "git+https://github.com/signalapp/boring?tag=signal-v4.6.0#b9a75167dc08a3b16dd203e0af78c8962c5439bd" +version = "4.9.0" +source = "git+https://github.com/signalapp/boring?tag=signal-v4.9.0#59883d7e23599f6631f9e5087db4b797f2953feb" dependencies = [ "bitflags", "boring-sys", @@ -431,8 +432,8 @@ dependencies = [ [[package]] name = "boring-sys" -version = "4.6.0" -source = "git+https://github.com/signalapp/boring?tag=signal-v4.6.0#b9a75167dc08a3b16dd203e0af78c8962c5439bd" +version = "4.9.0" +source = "git+https://github.com/signalapp/boring?tag=signal-v4.9.0#59883d7e23599f6631f9e5087db4b797f2953feb" dependencies = [ "bindgen", "cmake", @@ -465,7 +466,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "05efc5cfd9110c8416e471df0e96702d58690178e206e61b7173706673c93706" dependencies = [ "memchr", - "regex-automata 0.4.6", + "regex-automata 0.4.7", "serde", ] @@ -475,12 +476,6 @@ version = "3.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c" -[[package]] -name = "bytemuck" -version = "1.16.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "78834c15cb5d5efe3452d58b1e8ba890dd62d21907f867f383358198e56ebca5" - [[package]] name = "byteorder" version = "1.5.0" @@ -489,9 +484,9 @@ checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" [[package]] name = "bytes" -version = "1.6.0" +version = "1.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "514de17de45fdb8dc022b1a7975556c53c86f9f0aa5f534b98977b171857c2c9" +checksum = "a12916984aab3fa6e39d655a33e09c0071eb36d6ab3aea5c2d78551f1df6d952" [[package]] name = "cachemap2" @@ -516,13 +511,12 @@ dependencies = [ [[package]] name = "cc" -version = "1.0.98" +version = "1.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41c270e7540d725e65ac7f1b212ac8ce349719624d7bcff99f8e2e488e8cf03f" +checksum = "2aba8f4e9906c7ce3c73463f62a7f0c65183ada1a2d47e397cc8810827f9694f" dependencies = [ "jobserver", "libc", - "once_cell", ] [[package]] @@ -582,7 +576,7 @@ dependencies = [ "num-traits 0.2.19", "serde", "wasm-bindgen", - "windows-targets 0.52.5", + "windows-targets 0.52.6", ] [[package]] @@ -631,9 +625,9 @@ checksum = "b0fc239e0f6cb375d2402d48afb92f76f5404fd1df208a41930ec81eda078bea" [[package]] name = "clang-sys" -version = "1.7.0" +version = "1.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67523a3b4be3ce1989d607a828d036249522dd9c1c8de7f4dd2dae43a37369d1" +checksum = "0b023947811758c97c59bf9d1c188fd619ad4718dcaa767947df1cadb14f39f4" dependencies = [ "glob", "libc", @@ -680,7 +674,7 @@ dependencies = [ "heck 0.4.1", "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.72", ] [[package]] @@ -724,6 +718,12 @@ dependencies = [ "memchr", ] +[[package]] +name = "const-oid" +version = "0.9.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c2459377285ad874054d797f3ccebf984978aa39129f6eafde5cdc8315b612f8" + [[package]] name = "const-str" version = "0.5.7" @@ -881,7 +881,7 @@ source = "git+https://github.com/signalapp/curve25519-dalek?tag=signal-curve2551 dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.72", ] [[package]] @@ -934,6 +934,16 @@ dependencies = [ "uuid", ] +[[package]] +name = "der" +version = "0.7.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f55bf8e7b65898637379c1b74eb1551107c8294ed26d855ceb9fd1a09cfc9bc0" +dependencies = [ + "const-oid", + "zeroize", +] + [[package]] name = "deranged" version = "0.3.11" @@ -951,7 +961,7 @@ checksum = "62d671cc41a825ebabc75757b62d3d168c577f9149b2d49ece1dad1f72119d25" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.72", ] [[package]] @@ -987,15 +997,15 @@ dependencies = [ [[package]] name = "derive_more" -version = "0.99.17" +version = "0.99.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fb810d30a7c1953f91334de7244731fc3f3c10d7fe163338a35b9f640960321" +checksum = "5f33878137e4dafd7fa914ad4e259e18a4e8e532b9617a2d0150262bf53abfce" dependencies = [ "convert_case", "proc-macro2", "quote", "rustc_version", - "syn 1.0.109", + "syn 2.0.72", ] [[package]] @@ -1007,6 +1017,12 @@ dependencies = [ "libc", ] +[[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" @@ -1053,7 +1069,7 @@ checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.72", ] [[package]] @@ -1102,10 +1118,34 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0d6ef0072f8a535281e4876be788938b528e9a1d43900b82c2569af7da799125" [[package]] -name = "either" -version = "1.12.0" +name = "ed25519" +version = "2.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3dca9240753cf90908d7e4aac30f630662b02aebaa1b58a3cadabdb23385b58b" +checksum = "115531babc129696a58c64a4fef0a8bf9e9698629fb97e9e40767d235cfbcd53" +dependencies = [ + "pkcs8", + "signature", +] + +[[package]] +name = "ed25519-dalek" +version = "2.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4a3daa8e81a3963a60642bcc1f90a670680bd4a77535faa384e9d1c79d620871" +dependencies = [ + "curve25519-dalek", + "ed25519", + "serde", + "sha2", + "subtle", + "zeroize", +] + +[[package]] +name = "either" +version = "1.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0" [[package]] name = "encoding_rs" @@ -1125,7 +1165,7 @@ dependencies = [ "heck 0.4.1", "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.72", ] [[package]] @@ -1139,35 +1179,24 @@ dependencies = [ [[package]] name = "env_filter" -version = "0.1.0" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a009aa4810eb158359dda09d0c87378e4bbb89b5a801f016885a4707ba24f7ea" +checksum = "c6dc8c8ff84895b051f07a0e65f975cf225131742531338752abfb324e4449ff" dependencies = [ "log", -] - -[[package]] -name = "env_logger" -version = "0.10.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4cd405aab171cb85d6735e5c8d9db038c17d3ca007a4d2c25f337935c3d90580" -dependencies = [ - "humantime", - "is-terminal", - "log", "regex", - "termcolor", ] [[package]] name = "env_logger" -version = "0.11.3" +version = "0.11.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38b35839ba51819680ba087cd351788c9a3c476841207e0b8cee0b04722343b9" +checksum = "06676b12debf7bba6903559720abca942d3a66b8acb88815fd2c7c6537e9ade1" dependencies = [ "anstream", "anstyle", "env_filter", + "humantime", "log", ] @@ -1239,7 +1268,7 @@ checksum = "1a5c6c585bc94aaf2c7b51dd4c2ba22680844aba4c687be581871a6f518c5742" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.72", ] [[package]] @@ -1329,7 +1358,7 @@ checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.72", ] [[package]] @@ -1396,9 +1425,9 @@ dependencies = [ [[package]] name = "gimli" -version = "0.28.1" +version = "0.29.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4271d37baee1b8c7e4b708028c57d816cf9d2434acb33a549475f78c181f6253" +checksum = "40ecd4077b5ae9fd2e9e169b102c6c330d0605168eb0e8bf79952b256dbefffd" [[package]] name = "glob" @@ -1490,15 +1519,6 @@ dependencies = [ "http 0.2.12", ] -[[package]] -name = "heck" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d621efb26863f0e9924c6ac577e8275e5e6b77455db64ffa6c65c904e9e132c" -dependencies = [ - "unicode-segmentation", -] - [[package]] name = "heck" version = "0.4.1" @@ -1618,9 +1638,9 @@ dependencies = [ [[package]] name = "http-body" -version = "1.0.0" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1cac85db508abc24a2e48553ba12a996e87244a0395ce011e62b37158745d643" +checksum = "1efedce1fb8e6913f23e0c92de8e62cd5b772a67e7b3946df930a62566c93184" dependencies = [ "bytes", "http 1.1.0", @@ -1628,22 +1648,22 @@ dependencies = [ [[package]] name = "http-body-util" -version = "0.1.1" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0475f8b2ac86659c21b64320d5d653f9efe42acd2a4e560073ec61a155a34f1d" +checksum = "793429d76616a256bcb62c2a2ec2bed781c8307e797e2598c50010f2bee2544f" dependencies = [ "bytes", - "futures-core", + "futures-util", "http 1.1.0", - "http-body 1.0.0", + "http-body 1.0.1", "pin-project-lite", ] [[package]] name = "httparse" -version = "1.8.0" +version = "1.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d897f394bad6a705d5f4104762e116a75639e470d80901eed05a860a95cb1904" +checksum = "0fcc0b4a115bf80b728eb8ea024ad5bd707b615bfed49e0665b6e0f86fd082d9" [[package]] name = "httpdate" @@ -1659,9 +1679,9 @@ checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" [[package]] name = "hyper" -version = "0.14.28" +version = "0.14.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf96e135eb83a2a8ddf766e426a841d8ddd7449d5f00d34ea02b41d2f19eef80" +checksum = "a152ddd61dfaec7273fe8419ab357f33aee0d914c5f4efbf0d96fa749eea5ec9" dependencies = [ "bytes", "futures-channel", @@ -1683,16 +1703,16 @@ dependencies = [ [[package]] name = "hyper" -version = "1.3.1" +version = "1.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe575dd17d0862a9a33781c8c4696a55c320909004a67a00fb286ba8b1bc496d" +checksum = "50dfd22e0e76d0f662d429a5f80fcaf3855009297eab6a0a9f8543834744ba05" dependencies = [ "bytes", "futures-channel", "futures-util", "h2 0.4.5", "http 1.1.0", - "http-body 1.0.0", + "http-body 1.0.1", "pin-project-lite", "smallvec", "tokio", @@ -1701,15 +1721,15 @@ dependencies = [ [[package]] name = "hyper-util" -version = "0.1.4" +version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d8d52be92d09acc2e01dddb7fde3ad983fc6489c7db4837e605bc3fca4cb63e" +checksum = "3ab92f4f49ee4fb4f997c784b7a2e0fa70050211e0b6a287f898c3c9785ca956" dependencies = [ "bytes", "futures-util", "http 1.1.0", - "http-body 1.0.0", - "hyper 1.3.1", + "http-body 1.0.1", + "hyper 1.4.1", "pin-project-lite", "tokio", ] @@ -1827,9 +1847,9 @@ dependencies = [ [[package]] name = "itertools" -version = "0.12.1" +version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba291022dbbd398a455acf126c1e341954079855bc60dfdda641363bd6922569" +checksum = "413ee7dfc52ee1a4949ceeb7dbc8a33f2d6c088194d9f922fb8318faf1f01186" dependencies = [ "either", ] @@ -1878,9 +1898,9 @@ checksum = "8eaf4bc02d17cbdd7ff4c7438cafcdf7fb9a4613313ad11b4f8fefe7d3fa0130" [[package]] name = "jobserver" -version = "0.1.31" +version = "0.1.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2b099aaa34a9751c5bf0878add70444e1ed2dd73f347be99003d4577277de6e" +checksum = "48d1dbcbbeb6a7fec7e059840aa538bd62aaccf972c7346c4d9d2059312853d0" dependencies = [ "libc", ] @@ -1907,9 +1927,9 @@ dependencies = [ [[package]] name = "lazy_static" -version = "1.4.0" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" +checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe" [[package]] name = "lazycell" @@ -1925,12 +1945,12 @@ checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c" [[package]] name = "libloading" -version = "0.8.3" +version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c2a198fb6b0eada2a8df47933734e6d35d350665a33a3593d7164fa52c75c19" +checksum = "4979f22fdb869068da03c9f7528f8297c6fd2606bc3a4affe42e6a823fdb8da4" dependencies = [ "cfg-if", - "windows-targets 0.52.5", + "windows-targets 0.52.6", ] [[package]] @@ -1945,15 +1965,10 @@ version = "0.1.0" dependencies = [ "aes-gcm-siv", "assert_matches", - "async-trait", - "atomic-take", "attest", "base64 0.21.7", "bincode", - "bytemuck", - "derive-where", "device-transfer", - "displaydoc", "futures-util", "hkdf", "hmac", @@ -1967,29 +1982,21 @@ dependencies = [ "libsignal-protocol", "linkme", "log", - "mediasan-common", "neon", "nonzero_ext", - "num_enum", - "once_cell", - "partial-default", "paste", "prost", "rand", - "rayon", "scopeguard", - "serde", "sha2", "signal-crypto", "signal-media", - "signal-neon-futures", "signal-pin", "static_assertions", "strum", "subtle", "test-case", "testing_logger", - "thiserror", "tokio", "usernames", "uuid", @@ -2000,13 +2007,29 @@ dependencies = [ name = "libsignal-bridge-macros" version = "0.1.0" dependencies = [ - "heck 0.3.3", + "heck 0.5.0", "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.72", "syn-mid", ] +[[package]] +name = "libsignal-bridge-testing" +version = "0.1.0" +dependencies = [ + "futures-util", + "jni 0.21.1", + "libsignal-bridge-macros", + "libsignal-bridge-types", + "libsignal-message-backup", + "linkme", + "neon", + "paste", + "scopeguard", + "tokio", +] + [[package]] name = "libsignal-bridge-types" version = "0.1.0" @@ -2016,20 +2039,13 @@ dependencies = [ "async-trait", "atomic-take", "attest", - "base64 0.21.7", - "bincode", - "bytemuck", - "cfg-if", "derive-where", "device-transfer", "displaydoc", "futures-util", - "hex", - "hkdf", "hmac", "http 1.1.0", "jni 0.21.1", - "libsignal-bridge-macros", "libsignal-core", "libsignal-message-backup", "libsignal-net", @@ -2039,17 +2055,12 @@ dependencies = [ "log", "mediasan-common", "neon", - "nonzero_ext", "num_enum", "once_cell", "partial-default", "paste", - "prost", - "rand", "rayon", - "scopeguard", "serde", - "serde_derive", "sha2", "signal-crypto", "signal-media", @@ -2061,9 +2072,9 @@ dependencies = [ "test-case", "thiserror", "tokio", - "tokio-boring", "usernames", "uuid", + "zerocopy", "zkgroup", ] @@ -2080,11 +2091,12 @@ dependencies = [ [[package]] name = "libsignal-ffi" -version = "0.52.0" +version = "0.55.1" dependencies = [ "cpufeatures", "futures-util", "libsignal-bridge", + "libsignal-bridge-testing", "libsignal-net", "libsignal-protocol", "log", @@ -2094,7 +2106,7 @@ dependencies = [ [[package]] name = "libsignal-jni" -version = "0.52.0" +version = "0.55.1" dependencies = [ "cfg-if", "cpufeatures", @@ -2108,6 +2120,34 @@ dependencies = [ "signal-crypto", ] +[[package]] +name = "libsignal-jni-testing" +version = "0.55.1" +dependencies = [ + "jni 0.21.1", + "libsignal-bridge-testing", + "log", + "log-panics", +] + +[[package]] +name = "libsignal-keytrans" +version = "0.0.1" +dependencies = [ + "assert_matches", + "async-trait", + "curve25519-dalek", + "displaydoc", + "ed25519-dalek", + "hex-literal", + "hmac", + "proptest", + "prost", + "prost-build", + "sha2", + "test-case", +] + [[package]] name = "libsignal-message-backup" version = "0.1.0" @@ -2125,13 +2165,13 @@ dependencies = [ "derive-where", "dir-test", "displaydoc", - "env_logger 0.10.2", + "env_logger", "futures", "hex", "hex-literal", "hkdf", "hmac", - "itertools 0.12.1", + "itertools 0.13.0", "json5", "libsignal-message-backup", "libsignal-message-backup-macros", @@ -2141,13 +2181,15 @@ dependencies = [ "mediasan-common", "nonzero_ext", "num_enum", + "once_cell", + "pretty_assertions", "protobuf", "protobuf-codegen", "protobuf-json-mapping", + "serde", "serde_json", "sha2", "signal-crypto", - "smallvec", "strum", "strum_macros", "subtle", @@ -2165,10 +2207,10 @@ dependencies = [ name = "libsignal-message-backup-macros" version = "0.1.0" dependencies = [ - "heck 0.3.3", + "heck 0.5.0", "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.72", "test-case", ] @@ -2190,7 +2232,7 @@ dependencies = [ "derive-where", "displaydoc", "either", - "env_logger 0.10.2", + "env_logger", "futures-util", "hex", "hex-literal", @@ -2198,9 +2240,10 @@ dependencies = [ "hmac", "http 1.1.0", "http-body-util", - "hyper 1.3.1", + "hyper 1.4.1", "hyper-util", - "itertools 0.12.1", + "indexmap 2.2.6", + "itertools 0.13.0", "lazy_static", "libsignal-core", "libsignal-protocol", @@ -2215,12 +2258,13 @@ dependencies = [ "rand", "rand_core", "rcgen", - "rustls 0.23.8", + "rustls 0.23.12", "rustls-platform-verifier", "serde", "serde_json", "sha2", "snow", + "static_assertions", "strum", "test-case", "thiserror", @@ -2228,9 +2272,9 @@ dependencies = [ "tokio", "tokio-boring", "tokio-stream", - "tokio-tungstenite", + "tokio-tungstenite 0.23.1", "tokio-util", - "tungstenite", + "tungstenite 0.23.0", "url", "uuid", "warp", @@ -2238,11 +2282,12 @@ dependencies = [ [[package]] name = "libsignal-node" -version = "0.52.0" +version = "0.55.1" dependencies = [ "cmake", "futures", "libsignal-bridge", + "libsignal-bridge-testing", "libsignal-protocol", "log", "log-panics", @@ -2266,14 +2311,14 @@ dependencies = [ "curve25519-dalek", "derive-where", "displaydoc", - "env_logger 0.10.2", + "env_logger", "futures-util", "hex", "hex-literal", "hkdf", "hmac", "indexmap 2.2.6", - "itertools 0.12.1", + "itertools 0.13.0", "libsignal-core", "log", "num_enum", @@ -2299,7 +2344,6 @@ name = "libsignal-svr3" version = "0.1.0" dependencies = [ "assert_matches", - "bytemuck", "criterion", "curve25519-dalek", "displaydoc", @@ -2314,26 +2358,27 @@ dependencies = [ "strum_macros", "subtle", "test-case", + "zerocopy", ] [[package]] name = "linkme" -version = "0.3.26" +version = "0.3.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "833222afbfe72868ac8f9770c91a33673f0d5fefc37c9dbe94aa3548b571623f" +checksum = "ccb76662d78edc9f9bf56360d6919bdacc8b7761227727e5082f128eeb90bbf5" dependencies = [ "linkme-impl", ] [[package]] name = "linkme-impl" -version = "0.3.26" +version = "0.3.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39f0dea92dbea3271557cc2e1848723967bba81f722f95026860974ec9283f08" +checksum = "f8dccda732e04fa3baf2e17cf835bfe2601c7c2edafd64417c627dabae3a8cda" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.72", ] [[package]] @@ -2344,9 +2389,9 @@ checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89" [[package]] name = "log" -version = "0.4.21" +version = "0.4.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90ed8c1e510134f979dbc4f070f87d4313098b704861a105fe34231c70a3901c" +checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24" [[package]] name = "log-panics" @@ -2397,9 +2442,9 @@ dependencies = [ [[package]] name = "memchr" -version = "2.7.2" +version = "2.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c8640c5d730cb13ebd907d8d04b52f55ac9a2eec55b440c8892f40d56c76c1d" +checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3" [[package]] name = "memmap2" @@ -2418,9 +2463,9 @@ checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a" [[package]] name = "mime_guess" -version = "2.0.4" +version = "2.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4192263c238a5f0d0c6bfd21f336a313a4ce1c450542449ca191bb657b4642ef" +checksum = "f7c44f8e672c00fe5308fa235f821cb4198414e1c77935c1ab6948d3fd78550e" dependencies = [ "mime", "unicase", @@ -2503,22 +2548,23 @@ checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" [[package]] name = "miniz_oxide" -version = "0.7.3" +version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87dfd01fe195c66b572b37921ad8803d010623c0aca821bea2302239d155cdae" +checksum = "b8a240ddb74feaf34a79a7add65a741f3167852fba007066dcac1ca548d89c08" dependencies = [ "adler", ] [[package]] name = "mio" -version = "0.8.11" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4a650543ca06a924e8b371db273b2756685faae30f8487da1b56505a8f78b0c" +checksum = "4569e456d394deccd22ce1c1913e6ea0e54519f577285001215d33557431afe4" dependencies = [ + "hermit-abi", "libc", "wasi", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] @@ -2598,7 +2644,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c6813fde79b646e47e7ad75f480aa80ef76a5d9599e2717407961531169ee38b" dependencies = [ "quote", - "syn 2.0.66", + "syn 2.0.72", "syn-mid", ] @@ -2652,9 +2698,9 @@ dependencies = [ [[package]] name = "num-bigint" -version = "0.4.5" +version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c165a9ab64cf766f73521c0dd2cfdff64f488b8f0b3e621face3462d3db536d7" +checksum = "a5e44f723f1133c9deac646763579fdb3ac745e418f2a7af9cd0c431da1f20b9" dependencies = [ "num-integer", "num-traits 0.2.19", @@ -2674,7 +2720,7 @@ checksum = "ed3955f1a9c7c0c15e092f9c887db08b1fc683305fdf6eb6684f22555355e202" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.72", ] [[package]] @@ -2705,42 +2751,32 @@ dependencies = [ "libm", ] -[[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 = "num_enum" -version = "0.6.1" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a015b430d3c108a207fd776d2e2196aaf8b1cf8cf93253e3a097ff3085076a1" +checksum = "02339744ee7253741199f897151b38e72257d13802d4ee837285cc2990a90845" dependencies = [ "num_enum_derive", ] [[package]] name = "num_enum_derive" -version = "0.6.1" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96667db765a921f7b295ffee8b60472b686a51d4f21c2ee4ffdb94c7013b65a6" +checksum = "681030a937600a36906c185595136d26abfebb4aa9c65701cefcaf8578bb982b" dependencies = [ "proc-macro-crate", "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.72", ] [[package]] name = "object" -version = "0.32.2" +version = "0.36.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a6a622008b6e321afc04970976f62ee297fdbaa6f95318ca343e3eebb9648441" +checksum = "3f203fa8daa7bb185f760ae12bd8e097f63d17041dcdcaf675ac54cdf863170e" dependencies = [ "memchr", ] @@ -2753,9 +2789,9 @@ checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" [[package]] name = "oorandom" -version = "11.1.3" +version = "11.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ab1bc2a289d34bd04a330323ac98a1b4bc82c9d9fcb1e66b63caa84da26b575" +checksum = "b410bbe7e14ab526a0e86877eb47c6996a2bd7746f027ba551028c925390e4e9" [[package]] name = "opaque-debug" @@ -2792,7 +2828,7 @@ checksum = "7459127d7a18cb202d418e4b7df1103ffd6d82a106e9b2091c250624c2ace70d" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.72", ] [[package]] @@ -2836,9 +2872,9 @@ checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" [[package]] name = "pest" -version = "2.7.10" +version = "2.7.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "560131c633294438da9f7c4b08189194b20946c8274c6b9e38881a7874dc8ee8" +checksum = "cd53dff83f26735fdc1ca837098ccf133605d794cdae66acfc2bfac3ec809d95" dependencies = [ "memchr", "thiserror", @@ -2847,9 +2883,9 @@ dependencies = [ [[package]] name = "pest_derive" -version = "2.7.10" +version = "2.7.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26293c9193fbca7b1a3bf9b79dc1e388e927e6cacaa78b4a3ab705a1d3d41459" +checksum = "2a548d2beca6773b1c244554d36fcf8548a8a58e74156968211567250e48e49a" dependencies = [ "pest", "pest_generator", @@ -2857,22 +2893,22 @@ dependencies = [ [[package]] name = "pest_generator" -version = "2.7.10" +version = "2.7.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3ec22af7d3fb470a85dd2ca96b7c577a1eb4ef6f1683a9fe9a8c16e136c04687" +checksum = "3c93a82e8d145725dcbaf44e5ea887c8a869efdcc28706df2d08c69e17077183" dependencies = [ "pest", "pest_meta", "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.72", ] [[package]] name = "pest_meta" -version = "2.7.10" +version = "2.7.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d7a240022f37c361ec1878d646fc5b7d7c4d28d5946e1a80ad5a7a4f4ca0bdcd" +checksum = "a941429fea7e08bedec25e4f6785b6ffaacc6b755da98df5ef3e7dcf4a124c4f" dependencies = [ "once_cell", "pest", @@ -2944,7 +2980,7 @@ checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.72", ] [[package]] @@ -2959,6 +2995,16 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" +[[package]] +name = "pkcs8" +version = "0.10.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f950b2377845cebe5cf8b5165cb3cc1a5e0fa5cfa3e1f7f55707d8fd82e0a7b7" +dependencies = [ + "der", + "spki", +] + [[package]] name = "plotters" version = "0.3.6" @@ -3105,6 +3151,16 @@ dependencies = [ "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 = "prettyplease" version = "0.2.20" @@ -3112,24 +3168,23 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5f12335488a2f3b0a83b14edad48dca9879ce89b2edd10e80237e4e852dd645e" dependencies = [ "proc-macro2", - "syn 2.0.66", + "syn 2.0.72", ] [[package]] name = "proc-macro-crate" -version = "1.3.1" +version = "3.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f4c021e1093a56626774e81216a4ce732a735e5bad4868a03f3ed65ca0c3919" +checksum = "6d37c51ca738a55da99dc0c4a34860fd675453b8b36209178c2249bb13651284" dependencies = [ - "once_cell", "toml_edit", ] [[package]] name = "proc-macro2" -version = "1.0.83" +version = "1.0.86" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b33eb56c327dec362a9e55b3ad14f9d2f0904fb5a5b03b513ab5465399e9f43" +checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77" dependencies = [ "unicode-ident", ] @@ -3147,9 +3202,9 @@ dependencies = [ [[package]] name = "proptest" -version = "1.4.0" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31b476131c3c86cb68032fdc5cb6d5a1045e3e42d96b69fa599fd77701e1f5bf" +checksum = "b4c2511913b88df1637da85cc8d96ec8e43a3f8bb8ccb71ee1ac240d6f3df58d" dependencies = [ "bit-set", "bit-vec", @@ -3159,7 +3214,7 @@ dependencies = [ "rand", "rand_chacha", "rand_xorshift", - "regex-syntax 0.8.3", + "regex-syntax 0.8.4", "rusty-fork", "tempfile", "unarray", @@ -3176,9 +3231,9 @@ dependencies = [ [[package]] name = "prost" -version = "0.12.6" +version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "deb1435c188b76130da55f17a466d252ff7b1418b2ad3e037d127b94e3411f29" +checksum = "e13db3d3fde688c61e2446b4d843bc27a7e8af269a69440c0308021dc92333cc" dependencies = [ "bytes", "prost-derive", @@ -3186,13 +3241,13 @@ dependencies = [ [[package]] name = "prost-build" -version = "0.12.6" +version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22505a5c94da8e3b7c2996394d1c933236c4d743e81a410bcca4e6989fc066a4" +checksum = "5bb182580f71dd070f88d01ce3de9f4da5021db7115d2e1c3605a754153b77c1" dependencies = [ "bytes", "heck 0.5.0", - "itertools 0.12.1", + "itertools 0.13.0", "log", "multimap", "once_cell", @@ -3201,28 +3256,28 @@ dependencies = [ "prost", "prost-types", "regex", - "syn 2.0.66", + "syn 2.0.72", "tempfile", ] [[package]] name = "prost-derive" -version = "0.12.6" +version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81bddcdb20abf9501610992b6759a4c888aef7d1a7247ef75e2404275ac24af1" +checksum = "18bec9b0adc4eba778b33684b7ba3e7137789434769ee3ce3930463ef904cfca" dependencies = [ "anyhow", - "itertools 0.12.1", + "itertools 0.13.0", "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.72", ] [[package]] name = "prost-types" -version = "0.12.6" +version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9091c90b0a32608e984ff2fa4091273cbdd755d54935c51d520887f4a1dbd5b0" +checksum = "cee5168b05f49d4b0ca581206eb14a7b22fafd963efe729ac48eb03266e25cc2" dependencies = [ "prost", ] @@ -3387,14 +3442,14 @@ dependencies = [ [[package]] name = "regex" -version = "1.10.4" +version = "1.10.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c117dbdfde9c8308975b6a18d71f3f385c89461f7b3fb054288ecf2a2058ba4c" +checksum = "b91213439dad192326a0d7c6ee3955910425f441d7038e0d6933b0aec5c4517f" dependencies = [ "aho-corasick", "memchr", - "regex-automata 0.4.6", - "regex-syntax 0.8.3", + "regex-automata 0.4.7", + "regex-syntax 0.8.4", ] [[package]] @@ -3408,13 +3463,13 @@ dependencies = [ [[package]] name = "regex-automata" -version = "0.4.6" +version = "0.4.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86b83b8b9847f9bf95ef68afb0b8e6cdb80f498442f5179a29fad448fcc1eaea" +checksum = "38caf58cc5ef2fed281f89292ef23f6365465ed9a41b7a7754eb4e26496c92df" dependencies = [ "aho-corasick", "memchr", - "regex-syntax 0.8.3", + "regex-syntax 0.8.4", ] [[package]] @@ -3425,9 +3480,9 @@ checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1" [[package]] name = "regex-syntax" -version = "0.8.3" +version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "adad44e29e4c806119491a7f06f03de4d1af22c3a680dd47f1e6e179439d1f56" +checksum = "7a66a03ae7c801facd77a29370b4faec201768915ac14a721ba36f20bc9c209b" [[package]] name = "ring" @@ -3503,9 +3558,9 @@ dependencies = [ [[package]] name = "rustls" -version = "0.23.8" +version = "0.23.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "79adb16721f56eb2d843e67676896a61ce7a0fa622dc18d3e372477a029d2740" +checksum = "c58f8c84392efc0a126acce10fa59ff7b3d2ac06ab451a33f2741989b806b044" dependencies = [ "once_cell", "ring", @@ -3517,9 +3572,9 @@ dependencies = [ [[package]] name = "rustls-native-certs" -version = "0.7.0" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f1fb85efa936c42c6d5fc28d2629bb51e4b2f4b8a5211e297d599cc5a093792" +checksum = "a88d6d420651b496bdd98684116959239430022a115c1240e6c3993be0b15fba" dependencies = [ "openssl-probe", "rustls-pemfile", @@ -3546,16 +3601,16 @@ checksum = "976295e77ce332211c0d24d92c0e83e50f5c5f046d11082cea19f3df13a3562d" [[package]] name = "rustls-platform-verifier" -version = "0.3.1" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5f0d26fa1ce3c790f9590868f0109289a044acb954525f933e2aa3b871c157d" +checksum = "3e3beb939bcd33c269f4bf946cc829fcd336370267c4a927ac0399c84a3151a1" dependencies = [ "core-foundation", "core-foundation-sys", "jni 0.19.0", "log", "once_cell", - "rustls 0.23.8", + "rustls 0.23.12", "rustls-native-certs", "rustls-platform-verifier-android", "rustls-webpki", @@ -3573,9 +3628,9 @@ checksum = "84e217e7fdc8466b5b35d30f8c0a30febd29173df4a3a0c2115d306b9c4117ad" [[package]] name = "rustls-webpki" -version = "0.102.4" +version = "0.102.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff448f7e92e913c4b7d4c6d8e4540a1724b319b4152b8aef6d4cf8339712b33e" +checksum = "8e6b52d4fda176fd835fdc55a835d4a89b8499cad995885a21149d5ad62f852e" dependencies = [ "ring", "rustls-pki-types", @@ -3653,14 +3708,14 @@ checksum = "7f81c2fde025af7e69b1d1420531c8a8811ca898919db177141a85313b1cb932" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.72", ] [[package]] name = "security-framework" -version = "2.11.0" +version = "2.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c627723fd09706bacdb5cf41499e95098555af3c3c29d014dc3c458ef6be11c0" +checksum = "897b2245f0b511c87893af39b033e5ca9cce68824c4d7e7630b5a1d339658d02" dependencies = [ "bitflags", "core-foundation", @@ -3672,9 +3727,9 @@ dependencies = [ [[package]] name = "security-framework-sys" -version = "2.11.0" +version = "2.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "317936bbbd05227752583946b9e66d7ce3b489f84e11a94a510b4437fef407d7" +checksum = "75da29fe9b9b08fe9d6b22b5b4bcbc75d8db3aa31e639aa56bb62e9d46bfceaf" dependencies = [ "core-foundation-sys", "libc", @@ -3694,30 +3749,31 @@ checksum = "cd0b0ec5f1c1ca621c432a25813d8d60c88abe6d3e08a3eb9cf37d97a0fe3d73" [[package]] name = "serde" -version = "1.0.202" +version = "1.0.204" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "226b61a0d411b2ba5ff6d7f73a476ac4f8bb900373459cd00fab8512828ba395" +checksum = "bc76f558e0cbb2a839d37354c575f1dc3fdc6546b5be373ba43d95f231bf7c12" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.202" +version = "1.0.204" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6048858004bcff69094cd972ed40a32500f153bd3be9f716b2eed2e8217c4838" +checksum = "e0cd7e117be63d3c3678776753929474f3b04a43a080c744d6b0ae2a8c28e222" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.72", ] [[package]] name = "serde_json" -version = "1.0.117" +version = "1.0.120" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "455182ea6142b14f93f4bc5320a2b31c1f266b66a4a5c858b013302a5d8cbfc3" +checksum = "4e0d21c9a8cae1235ad58a00c11cb40d4b1e5c784f1ef2c537876ed6ffd8b7c5" dependencies = [ + "indexmap 2.2.6", "itoa", "ryu", "serde", @@ -3748,9 +3804,9 @@ dependencies = [ [[package]] name = "sha1_smol" -version = "1.0.0" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae1a47186c03a32177042e55dbc5fd5aee900b8e0069a8d70fba96a9375cd012" +checksum = "bbfa15b3dddfee50a0fff136974b3e1bde555604ba463834a7eb7deb6417705d" [[package]] name = "sha2" @@ -3844,6 +3900,15 @@ dependencies = [ "thiserror", ] +[[package]] +name = "signature" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "77549399552de45a898a580c1b41d445bf730df867cc44e6c0233bbc4b8329de" +dependencies = [ + "rand_core", +] + [[package]] name = "siphasher" version = "0.3.11" @@ -3873,7 +3938,7 @@ checksum = "0eb01866308440fc64d6c44d9e86c5cc17adfe33c4d6eed55da9145044d0ffc1" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.72", ] [[package]] @@ -3908,6 +3973,16 @@ version = "0.9.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67" +[[package]] +name = "spki" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d91ed6c858b01f942cd56b37a94b3e0a1798290327d1236e4d9cf4eaca44d29d" +dependencies = [ + "base64ct", + "der", +] + [[package]] name = "static_assertions" version = "1.1.0" @@ -3922,9 +3997,9 @@ checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" [[package]] name = "strum" -version = "0.26.2" +version = "0.26.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d8cec3501a5194c432b2b7976db6b7d10ec95c253208b45f83f7136aa985e29" +checksum = "8fec0f0aef304996cf250b31b5a10dee7980c85da9d759361292b8bca5a18f06" dependencies = [ "strum_macros", ] @@ -3939,14 +4014,14 @@ dependencies = [ "proc-macro2", "quote", "rustversion", - "syn 2.0.66", + "syn 2.0.72", ] [[package]] name = "subtle" -version = "2.5.0" +version = "2.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81cdd64d312baedb58e21336b31bc043b77e01cc99033ce76ef539f78e965ebc" +checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292" [[package]] name = "syn" @@ -3961,9 +4036,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.66" +version = "2.0.72" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c42f3f41a2de00b01c0aaad383c5a45241efc8b2d1eda5661812fda5f3cdcff5" +checksum = "dc4b9b9bf2add8093d3f2c0204471e951b2285580335de42f9d2534f3ae7a8af" dependencies = [ "proc-macro2", "quote", @@ -3978,7 +4053,7 @@ checksum = "b5dc35bb08dd1ca3dfb09dce91fd2d13294d6711c88897d9a9d60acf39bce049" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.72", ] [[package]] @@ -3993,15 +4068,6 @@ dependencies = [ "windows-sys 0.52.0", ] -[[package]] -name = "termcolor" -version = "1.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06794f8f6c5c898b3275aebefa6b8a1cb24cd2c6c79397ab15774837a0bc5755" -dependencies = [ - "winapi-util", -] - [[package]] name = "termtree" version = "0.4.1" @@ -4026,7 +4092,7 @@ dependencies = [ "cfg-if", "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.72", ] [[package]] @@ -4037,7 +4103,7 @@ checksum = "5c89e72a01ed4c579669add59014b9a524d609c0c88c6a585ce37485879f6ffb" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.72", "test-case-core", ] @@ -4047,7 +4113,7 @@ version = "0.2.16" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3dffced63c2b5c7be278154d76b479f9f9920ed34e7574201407f0b14e2bbb93" dependencies = [ - "env_logger 0.11.3", + "env_logger", "test-log-macros", "tracing-subscriber", ] @@ -4060,7 +4126,7 @@ checksum = "5999e24eaa32083191ba4e425deb75cdf25efefabe5aaccb7446dd0d4122a3f5" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.72", ] [[package]] @@ -4074,22 +4140,22 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.61" +version = "1.0.63" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c546c80d6be4bc6a00c0f01730c08df82eaa7a7a61f11d656526506112cc1709" +checksum = "c0342370b38b6a11b6cc11d6a805569958d54cfa061a29969c3b5ce2ea405724" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.61" +version = "1.0.63" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46c3384250002a6d5af4d114f2845d37b57521033f30d5c3f46c4d70e1197533" +checksum = "a4558b58466b9ad7ca0f102865eccc95938dca1a74a856f2b57b6629050da261" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.72", ] [[package]] @@ -4145,9 +4211,9 @@ dependencies = [ [[package]] name = "tinyvec" -version = "1.6.0" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50" +checksum = "445e881f4f6d382d5f27c034e25eb92edd7c784ceab92a0937db7f2e9471b938" dependencies = [ "tinyvec_macros", ] @@ -4174,25 +4240,24 @@ dependencies = [ [[package]] name = "tokio" -version = "1.37.0" +version = "1.39.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1adbebffeca75fcfd058afa480fb6c0b81e165a0323f9c9d39c9697e37c46787" +checksum = "d040ac2b29ab03b09d4129c2f5bbd012a3ac2f79d38ff506a4bf8dd34b0eac8a" dependencies = [ "backtrace", "bytes", "libc", "mio", - "num_cpus", "pin-project-lite", "socket2", "tokio-macros", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] name = "tokio-boring" -version = "4.6.0" -source = "git+https://github.com/signalapp/boring?tag=signal-v4.6.0#b9a75167dc08a3b16dd203e0af78c8962c5439bd" +version = "4.9.0" +source = "git+https://github.com/signalapp/boring?tag=signal-v4.9.0#59883d7e23599f6631f9e5087db4b797f2953feb" dependencies = [ "boring", "boring-sys", @@ -4202,13 +4267,13 @@ dependencies = [ [[package]] name = "tokio-macros" -version = "2.2.0" +version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b" +checksum = "693d596312e88961bc67d7f1f97af8a70227d9f90c31bba5806eec004978d752" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.72", ] [[package]] @@ -4242,7 +4307,19 @@ dependencies = [ "futures-util", "log", "tokio", - "tungstenite", + "tungstenite 0.21.0", +] + +[[package]] +name = "tokio-tungstenite" +version = "0.23.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c6989540ced10490aaf14e6bad2e3d33728a2813310a0c71d1574304c49631cd" +dependencies = [ + "futures-util", + "log", + "tokio", + "tungstenite 0.23.0", ] [[package]] @@ -4266,9 +4343,9 @@ checksum = "4badfd56924ae69bcc9039335b2e017639ce3f9b001c393c1b2d1ef846ce2cbf" [[package]] name = "toml_edit" -version = "0.19.15" +version = "0.21.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421" +checksum = "6a8534fd7f78b5405e860340ad6575217ce99f38d4d5c8f2442cb5ecb50090e1" dependencies = [ "indexmap 2.2.6", "toml_datetime", @@ -4301,7 +4378,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.72", ] [[package]] @@ -4367,6 +4444,25 @@ dependencies = [ "utf-8", ] +[[package]] +name = "tungstenite" +version = "0.23.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6e2e2ce1e47ed2994fd43b04c8f618008d4cabdd5ee34027cf14f9d918edd9c8" +dependencies = [ + "byteorder", + "bytes", + "data-encoding", + "http 1.1.0", + "httparse", + "log", + "rand", + "sha1", + "thiserror", + "url", + "utf-8", +] + [[package]] name = "typenum" version = "1.17.0" @@ -4415,12 +4511,6 @@ dependencies = [ "tinyvec", ] -[[package]] -name = "unicode-segmentation" -version = "1.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4c87d22b6e3f4a18d4d40ef354e97c90fcb14dd91d7dc0aa9d8a1172ebf7202" - [[package]] name = "universal-hash" version = "0.5.1" @@ -4439,9 +4529,9 @@ checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1" [[package]] name = "url" -version = "2.5.0" +version = "2.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31e6302e3bb753d46e83516cae55ae196fc0c309407cf11ab35cc51a4c2a4633" +checksum = "22784dbdf76fdde8af1aeda5622b546b422b6fc585325248a2bf9f5e41e94d6c" dependencies = [ "form_urlencoded", "idna 0.5.0", @@ -4479,16 +4569,17 @@ checksum = "09cc8ee72d2a9becf2f2febe0205bbed8fc6615b7cb429ad062dc7b7ddd036a9" [[package]] name = "utf8parse" -version = "0.2.1" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a" +checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821" [[package]] name = "uuid" -version = "1.8.0" +version = "1.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a183cf7feeba97b4dd1c0d46788634f6221d87fa961b305bed08c851829efcc0" +checksum = "81dfa00651efa65069b0b6b651f4aaa31ba9e3c3ce0137aaad053604ee7e0314" dependencies = [ + "serde", "sha1_smol", ] @@ -4543,7 +4634,7 @@ dependencies = [ "futures-util", "headers", "http 0.2.12", - "hyper 0.14.28", + "hyper 0.14.30", "log", "mime", "mime_guess", @@ -4557,7 +4648,7 @@ dependencies = [ "serde_urlencoded", "tokio", "tokio-rustls", - "tokio-tungstenite", + "tokio-tungstenite 0.21.0", "tokio-util", "tower-service", "tracing", @@ -4590,7 +4681,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.72", "wasm-bindgen-shared", ] @@ -4612,7 +4703,7 @@ checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.72", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -4635,9 +4726,9 @@ dependencies = [ [[package]] name = "webpki-roots" -version = "0.26.1" +version = "0.26.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b3de34ae270483955a94f4b21bdaaeb83d508bb84a01435f393818edb0012009" +checksum = "bd7c23921eeb1713a4e851530e9b9756e4fb0e89978582942612524cf09f01cd" dependencies = [ "rustls-pki-types", ] @@ -4710,7 +4801,7 @@ version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9" dependencies = [ - "windows-targets 0.52.5", + "windows-targets 0.52.6", ] [[package]] @@ -4737,7 +4828,7 @@ version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" dependencies = [ - "windows-targets 0.52.5", + "windows-targets 0.52.6", ] [[package]] @@ -4772,18 +4863,18 @@ dependencies = [ [[package]] name = "windows-targets" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f0713a46559409d202e70e28227288446bf7841d3211583a4b53e3f6d96e7eb" +checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973" dependencies = [ - "windows_aarch64_gnullvm 0.52.5", - "windows_aarch64_msvc 0.52.5", - "windows_i686_gnu 0.52.5", + "windows_aarch64_gnullvm 0.52.6", + "windows_aarch64_msvc 0.52.6", + "windows_i686_gnu 0.52.6", "windows_i686_gnullvm", - "windows_i686_msvc 0.52.5", - "windows_x86_64_gnu 0.52.5", - "windows_x86_64_gnullvm 0.52.5", - "windows_x86_64_msvc 0.52.5", + "windows_i686_msvc 0.52.6", + "windows_x86_64_gnu 0.52.6", + "windows_x86_64_gnullvm 0.52.6", + "windows_x86_64_msvc 0.52.6", ] [[package]] @@ -4800,9 +4891,9 @@ checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" [[package]] name = "windows_aarch64_gnullvm" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7088eed71e8b8dda258ecc8bac5fb1153c5cffaf2578fc8ff5d61e23578d3263" +checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3" [[package]] name = "windows_aarch64_msvc" @@ -4818,9 +4909,9 @@ checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" [[package]] name = "windows_aarch64_msvc" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9985fd1504e250c615ca5f281c3f7a6da76213ebd5ccc9561496568a2752afb6" +checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469" [[package]] name = "windows_i686_gnu" @@ -4836,15 +4927,15 @@ checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" [[package]] name = "windows_i686_gnu" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "88ba073cf16d5372720ec942a8ccbf61626074c6d4dd2e745299726ce8b89670" +checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b" [[package]] name = "windows_i686_gnullvm" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87f4261229030a858f36b459e748ae97545d6f1ec60e5e0d6a3d32e0dc232ee9" +checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66" [[package]] name = "windows_i686_msvc" @@ -4860,9 +4951,9 @@ checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" [[package]] name = "windows_i686_msvc" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db3c2bf3d13d5b658be73463284eaf12830ac9a26a90c717b7f771dfe97487bf" +checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66" [[package]] name = "windows_x86_64_gnu" @@ -4878,9 +4969,9 @@ checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" [[package]] name = "windows_x86_64_gnu" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e4246f76bdeff09eb48875a0fd3e2af6aada79d409d33011886d3e1581517d9" +checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78" [[package]] name = "windows_x86_64_gnullvm" @@ -4896,9 +4987,9 @@ checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" [[package]] name = "windows_x86_64_gnullvm" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "852298e482cd67c356ddd9570386e2862b5673c85bd5f88df9ab6802b334c596" +checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d" [[package]] name = "windows_x86_64_msvc" @@ -4914,9 +5005,9 @@ checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" [[package]] name = "windows_x86_64_msvc" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bec47e5bfd1bff0eeaf6d8b485cc1074891a197ab4225d504cb7a1ab88b02bf0" +checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" [[package]] name = "winnow" @@ -4939,6 +5030,12 @@ dependencies = [ "zeroize", ] +[[package]] +name = "yansi" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "09041cd90cf85f7f8b2df60c646f853b7f535ce68f85244eb6731cf89fa498ec" + [[package]] name = "yasna" version = "0.5.2" @@ -4949,10 +5046,31 @@ dependencies = [ ] [[package]] -name = "zeroize" -version = "1.7.0" +name = "zerocopy" +version = "0.7.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "525b4ec142c6b68a2d10f01f7bbf6755599ca3f81ea53b8431b7dd348f5fdb2d" +checksum = "1b9b4fd18abc82b8136838da5d50bae7bdea537c574d8dc1a34ed098d6c166f0" +dependencies = [ + "byteorder", + "zerocopy-derive", +] + +[[package]] +name = "zerocopy-derive" +version = "0.7.35" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.72", +] + +[[package]] +name = "zeroize" +version = "1.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ced3678a2879b30306d323f4542626697a464a97c0a07c9aebf7ebca65cd4dde" dependencies = [ "zeroize_derive", ] @@ -4965,7 +5083,7 @@ checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.72", ] [[package]] diff --git a/pkgs/by-name/li/libsignal-ffi/package.nix b/pkgs/by-name/li/libsignal-ffi/package.nix index ae921ac23691..f2a8341a2097 100644 --- a/pkgs/by-name/li/libsignal-ffi/package.nix +++ b/pkgs/by-name/li/libsignal-ffi/package.nix @@ -22,13 +22,14 @@ rustPlatform.buildRustPackage rec { pname = "libsignal-ffi"; # must match the version used in mautrix-signal # see https://github.com/mautrix/signal/issues/401 - version = "0.52.0"; + version = "0.55.1"; src = fetchFromGitHub { + fetchSubmodules = true; owner = "signalapp"; repo = "libsignal"; rev = "v${version}"; - hash = "sha256-MFTTrIJ9+1NgaL9KD4t0KYR2feHow+HtyYXQWJgKilM="; + hash = "sha256-hQ3iWGLef1y3yyzjWH2MWcs32A7HxUSxGG8fCyMn/KE="; }; buildInputs = lib.optional stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security ]; @@ -44,7 +45,7 @@ rustPlatform.buildRustPackage rec { cargoLock = { lockFile = ./Cargo.lock; outputHashes = { - "boring-4.6.0" = "sha256-IjkpCKZ4Y1UTrFPg4g/bak+/mJFiyfUyxtTtT5uzcUY="; + "boring-4.9.0" = "sha256-RSpaMzMUXp+WuqqDwLErP5yLT0YhYGoOUWCuSt4jR3I="; "curve25519-dalek-4.1.3" = "sha256-bPh7eEgcZnq9C3wmSnnYv0C4aAP+7pnwk9Io29GrI4A="; }; }; diff --git a/pkgs/servers/mautrix-signal/default.nix b/pkgs/servers/mautrix-signal/default.nix index c5565f620078..85f591b61ec0 100644 --- a/pkgs/servers/mautrix-signal/default.nix +++ b/pkgs/servers/mautrix-signal/default.nix @@ -14,13 +14,13 @@ buildGoModule rec { pname = "mautrix-signal"; - version = "0.6.3"; + version = "0.7.0"; src = fetchFromGitHub { owner = "mautrix"; repo = "signal"; rev = "v${version}"; - hash = "sha256-KBb/rLYM2ne4VD/bPy/lcXD0avCx3J74e3zDcmg+Dzs="; + hash = "sha256-/JO2SFAG42cyY1JICT/BJQ8VrkNLsEfAoeWwu9Ofl68="; }; buildInputs = (lib.optional (!withGoolm) olm) ++ [ @@ -30,7 +30,7 @@ buildGoModule rec { ]; tags = lib.optional withGoolm "goolm"; - vendorHash = "sha256-DDcz4O3RhV6OVI+qC/LkDW/UsE5jOAn5t/gmILxHx1s="; + vendorHash = "sha256-MmbpY4VP6vrwGCI74GZ/QslThHDLQmIwI7G63Gru3UI="; doCheck = false; From e38c90b7c94c345e8715ea1c7cee589ae1a788e6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Christ?= Date: Mon, 2 Sep 2024 07:11:33 +0200 Subject: [PATCH 114/235] nixos/mautrix-signal: Reformat code --- .../services/matrix/mautrix-signal.nix | 35 +++++++++++-------- 1 file changed, 20 insertions(+), 15 deletions(-) diff --git a/nixos/modules/services/matrix/mautrix-signal.nix b/nixos/modules/services/matrix/mautrix-signal.nix index 0da95b9c8a7b..e04cd2ad33d0 100644 --- a/nixos/modules/services/matrix/mautrix-signal.nix +++ b/nixos/modules/services/matrix/mautrix-signal.nix @@ -1,7 +1,8 @@ -{ lib -, config -, pkgs -, ... +{ + lib, + config, + pkgs, + ... }: let cfg = config.services.mautrix-signal; @@ -111,7 +112,8 @@ in serviceDependencies = lib.mkOption { type = with lib.types; listOf str; - default = (lib.optional config.services.matrix-synapse.enable config.services.matrix-synapse.serviceUnit) + default = + (lib.optional config.services.matrix-synapse.enable config.services.matrix-synapse.serviceUnit) ++ (lib.optional config.services.matrix-conduit.enable "conduit.service"); defaultText = lib.literalExpression '' (optional config.services.matrix-synapse.enable config.services.matrix-synapse.serviceUnit) @@ -154,15 +156,18 @@ in }; # Note: this is defined here to avoid the docs depending on `config` - services.mautrix-signal.settings.homeserver = optOneOf (with config.services; [ - (lib.mkIf matrix-synapse.enable (mkDefaults { - domain = matrix-synapse.settings.server_name; - })) - (lib.mkIf matrix-conduit.enable (mkDefaults { - domain = matrix-conduit.settings.global.server_name; - address = "http://localhost:${toString matrix-conduit.settings.global.port}"; - })) - ]); + services.mautrix-signal.settings.homeserver = optOneOf ( + with config.services; + [ + (lib.mkIf matrix-synapse.enable (mkDefaults { + domain = matrix-synapse.settings.server_name; + })) + (lib.mkIf matrix-conduit.enable (mkDefaults { + domain = matrix-conduit.settings.global.server_name; + address = "http://localhost:${toString matrix-conduit.settings.global.port}"; + })) + ] + ); systemd.services.mautrix-signal = { description = "mautrix-signal, a Matrix-Signal puppeting bridge."; @@ -240,7 +245,7 @@ in SystemCallErrorNumber = "EPERM"; SystemCallFilter = [ "@system-service" ]; Type = "simple"; - UMask = 0027; + UMask = 27; }; restartTriggers = [ settingsFileUnsubstituted ]; }; From aab2bd233c16321b0af2242cb957f7c3f0af9c58 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Christ?= Date: Mon, 2 Sep 2024 07:12:50 +0200 Subject: [PATCH 115/235] nixos/mautrix-signal: Adapt to new configuration With mautrix-signal v0.7.0 the bridge is built upon the bridgev2 architecture. With this, the configuration file was slightly rearranged. Options like login_shared_secret_map and double_puppet_server_map were dropped. --- .../manual/release-notes/rl-2411.section.md | 3 + .../modules/services/matrix/mautrix-signal.md | 32 +++++++ .../services/matrix/mautrix-signal.nix | 96 ++++++++++++------- 3 files changed, 94 insertions(+), 37 deletions(-) create mode 100644 nixos/modules/services/matrix/mautrix-signal.md diff --git a/nixos/doc/manual/release-notes/rl-2411.section.md b/nixos/doc/manual/release-notes/rl-2411.section.md index 877f3411c8d7..1ee27dcaa599 100644 --- a/nixos/doc/manual/release-notes/rl-2411.section.md +++ b/nixos/doc/manual/release-notes/rl-2411.section.md @@ -171,6 +171,9 @@ Processes also now run as a dynamically allocated user by default instead of root. +- The `mautrix-signal` module was adapted to incorporate the configuration rearrangement that resulted from the update to the mautrix bridgev2 architecture. Pre-0.7.0 configurations should continue to work. + In case you want to update your configuration make sure to check the NixOS manual. + - The nvidia driver no longer defaults to the proprietary driver starting with version 560. You will need to manually set `hardware.nvidia.open` to select the proprietary or open driver. - `singularity-tools` have the `storeDir` argument removed from its override interface and use `builtins.storeDir` instead. diff --git a/nixos/modules/services/matrix/mautrix-signal.md b/nixos/modules/services/matrix/mautrix-signal.md new file mode 100644 index 000000000000..da65964e1504 --- /dev/null +++ b/nixos/modules/services/matrix/mautrix-signal.md @@ -0,0 +1,32 @@ +# Mautrix-Signal {#module-services-mautrix-signal} + +[Mautrix-Signal](https://github.com/mautrix/signal) is a Matrix-Signal puppeting bridge. + +## Configuration {#module-services-mautrix-signal-configuration} + +1. Set [](#opt-services.mautrix-signal.enable) to `true`. The service will use + SQLite by default. +2. To create your configuration check the default configuration for + [](#opt-services.mautrix-signal.settings). To obtain the complete default + configuration, run + `nix-shell -p mautrix-signal --run "mautrix-signal -c default.yaml -e"`. + +::: {.warning} +Mautrix-Signal allows for some options like `encryption.pickle_key`, +`provisioning.shared_secret`, allow the value `generate` to be set. +Since the configuration file is regenerated on every start of the +service, the generated values would be discarded and might break your +installation. Instead, set those values via +[](#opt-services.mautrix-signal.environmentFile). +::: + +## Migrating from an older configuration {#module-services-mautrix-signal-migrate-configuration} + +With Mautrix-Signal v0.7.0 the configuration has been rearranged. Mautrix-Signal +performs an automatic configuration migration so your pre-0.7.0 configuration +should just continue to work. + +In case you want to update your NixOS configuration, compare the migrated configuration +at `/var/lib/mautrix-signal/config.yaml` with the default configuration +(`nix-shell -p mautrix-signal --run "mautrix-signal -c example.yaml -e"`) and +update your module configuration accordingly. diff --git a/nixos/modules/services/matrix/mautrix-signal.nix b/nixos/modules/services/matrix/mautrix-signal.nix index e04cd2ad33d0..b4a838612633 100644 --- a/nixos/modules/services/matrix/mautrix-signal.nix +++ b/nixos/modules/services/matrix/mautrix-signal.nix @@ -17,12 +17,22 @@ let optOneOf = lib.lists.findFirst (value: value.condition) (lib.mkIf false null); mkDefaults = lib.mapAttrsRecursive (n: v: lib.mkDefault v); defaultConfig = { + network = { + displayname_template = "{{or .ProfileName .PhoneNumber \"Unknown user\"}}"; + }; + bridge = { + command_prefix = "!signal"; + relay.enabled = true; + permissions."*" = "relay"; + }; + database = { + type = "sqlite3"; + uri = "file:${dataDir}/mautrix-signal.db?_txlock=immediate"; + }; homeserver.address = "http://localhost:8448"; appservice = { hostname = "[::]"; port = appservicePort; - database.type = "sqlite3"; - database.uri = "file:${dataDir}/mautrix-signal.db?_txlock=immediate"; id = "signal"; bot = { username = "signalbot"; @@ -30,16 +40,19 @@ let }; as_token = ""; hs_token = ""; - }; - bridge = { username_template = "signal_{{.}}"; - displayname_template = "{{or .ProfileName .PhoneNumber \"Unknown user\"}}"; - double_puppet_server_map = { }; - login_shared_secret_map = { }; - command_prefix = "!signal"; - permissions."*" = "relay"; - relay.enabled = true; }; + double_puppet = { + servers = { }; + secrets = { }; + }; + # By default, the following keys/secrets are set to `generate`. This would break when the service + # is restarted, since the previously generated configuration will be overwritten everytime. + # If encryption is enabled, it's recommended to set those keys via `environmentFile`. + encryption.pickle_key = ""; + provisioning.shared_secret = ""; + public_media.signing_key = ""; + direct_media.server_key = ""; logging = { min_level = "info"; writers = lib.singleton { @@ -61,38 +74,42 @@ in default = defaultConfig; description = '' {file}`config.yaml` configuration as a Nix attribute set. - Configuration options should match those described in - [example-config.yaml](https://github.com/mautrix/signal/blob/master/example-config.yaml). + Configuration options should match those described in the example configuration. + Get an example configuration by executing `mautrix-signal -c example.yaml --generate-example-config` Secret tokens should be specified using {option}`environmentFile` instead of this world-readable attribute set. ''; example = { - appservice = { - database = { - type = "postgres"; - uri = "postgresql:///mautrix_signal?host=/run/postgresql"; - }; - id = "signal"; - ephemeral_events = false; - }; bridge = { - history_sync = { - request_full_sync = true; - }; private_chat_portal_meta = true; - mute_bridging = true; - encryption = { - allow = true; - default = true; - require = true; - }; - provisioning = { - shared_secret = "disable"; - }; + mute_only_on_create = false; permissions = { "example.com" = "user"; }; }; + database = { + type = "postgres"; + uri = "postgresql:///mautrix_signal?host=/run/postgresql"; + }; + homeserver = { + address = "http://[::1]:8008"; + domain = "my-domain.tld"; + }; + appservice = { + id = "signal"; + ephemeral_events = false; + }; + matrix.message_status_events = true; + provisioning = { + shared_secret = "disable"; + }; + backfill.enabled = true; + encryption = { + allow = true; + default = true; + require = true; + pickle_key = "$ENCRYPTION_PICKLE_KEY"; + }; }; }; @@ -103,10 +120,8 @@ in File containing environment variables to be passed to the mautrix-signal service. If an environment variable `MAUTRIX_SIGNAL_BRIDGE_LOGIN_SHARED_SECRET` is set, then its value will be used in the configuration file for the option - `login_shared_secret_map` without leaking it to the store, using the configured + `double_puppet.secrets` without leaking it to the store, using the configured `homeserver.domain` as key. - See [here](https://github.com/mautrix/signal/blob/main/example-config.yaml) - for the documentation of `login_shared_secret_map`. ''; }; @@ -206,7 +221,7 @@ in ${pkgs.yq}/bin/yq -s '.[0].appservice.as_token = .[1].as_token | .[0].appservice.hs_token = .[1].hs_token | .[0] - | if env.MAUTRIX_SIGNAL_BRIDGE_LOGIN_SHARED_SECRET then .bridge.login_shared_secret_map.[.homeserver.domain] = env.MAUTRIX_SIGNAL_BRIDGE_LOGIN_SHARED_SECRET else . end' \ + | if env.MAUTRIX_SIGNAL_BRIDGE_LOGIN_SHARED_SECRET then .double_puppet.secrets.[.homeserver.domain] = env.MAUTRIX_SIGNAL_BRIDGE_LOGIN_SHARED_SECRET else . end' \ '${settingsFile}' '${registrationFile}' > '${settingsFile}.tmp' mv '${settingsFile}.tmp' '${settingsFile}' umask $old_umask @@ -250,5 +265,12 @@ in restartTriggers = [ settingsFileUnsubstituted ]; }; }; - meta.maintainers = with lib.maintainers; [ niklaskorz ]; + meta = { + buildDocsInSandbox = false; + doc = ./mautrix-signal.md; + maintainers = with lib.maintainers; [ + niklaskorz + frederictobiasc + ]; + }; } From 08a7a9aaddbf6ab879ca7eefb2ee424758bb8290 Mon Sep 17 00:00:00 2001 From: Alvar Penning Date: Mon, 2 Sep 2024 20:58:01 +0200 Subject: [PATCH 116/235] openrct2: 0.4.13 -> 0.4.14 https://github.com/OpenRCT2/OpenRCT2/releases/tag/v0.4.14 --- pkgs/games/openrct2/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/games/openrct2/default.nix b/pkgs/games/openrct2/default.nix index 0f97051e141d..5ed0f6da3663 100644 --- a/pkgs/games/openrct2/default.nix +++ b/pkgs/games/openrct2/default.nix @@ -29,20 +29,20 @@ }: let - openrct2-version = "0.4.13"; + openrct2-version = "0.4.14"; # Those versions MUST match the pinned versions within the CMakeLists.txt # file. The REPLAYS repository from the CMakeLists.txt is not necessary. objects-version = "1.4.7"; openmsx-version = "1.6"; opensfx-version = "1.0.5"; - title-sequences-version = "0.4.6"; + title-sequences-version = "0.4.14"; openrct2-src = fetchFromGitHub { owner = "OpenRCT2"; repo = "OpenRCT2"; rev = "v${openrct2-version}"; - hash = "sha256-MwpxZdYib4uEP9T9ImczrHp/UHYhR/je5BvS5XwXnqQ="; + hash = "sha256-d02LXcqoB6lDGdd82IrHi0Br8rjAFpRgQ86344XUeCA="; }; objects-src = fetchFromGitHub { @@ -70,7 +70,7 @@ let owner = "OpenRCT2"; repo = "title-sequences"; rev = "v${title-sequences-version}"; - hash = "sha256-HWp2ecClNM/7O3oaydVipOnEsYNP/bZnZFS+SDidPi0="; + hash = "sha256-ier7sBYJjBIvKVxfaCelJPZ+oF9NEshvR2k/X9JpP+0="; }; in stdenv.mkDerivation { From b7c509164f11f23b544f086d23f03a0dcefd987d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 2 Sep 2024 20:37:53 +0000 Subject: [PATCH 117/235] infisical: 0.28.6 -> 0.30.0 --- pkgs/development/tools/infisical/default.nix | 2 +- pkgs/development/tools/infisical/hashes.json | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/tools/infisical/default.nix b/pkgs/development/tools/infisical/default.nix index fcc616f7642c..665dda06b2fc 100644 --- a/pkgs/development/tools/infisical/default.nix +++ b/pkgs/development/tools/infisical/default.nix @@ -15,7 +15,7 @@ let buildHashes = builtins.fromJSON (builtins.readFile ./hashes.json); # the version of infisical - version = "0.28.6"; + version = "0.30.0"; # the platform-specific, statically linked binary src = diff --git a/pkgs/development/tools/infisical/hashes.json b/pkgs/development/tools/infisical/hashes.json index 46faf5f344eb..9d9f1ecee3b2 100644 --- a/pkgs/development/tools/infisical/hashes.json +++ b/pkgs/development/tools/infisical/hashes.json @@ -1,6 +1,6 @@ { "_comment": "@generated by pkgs/development/tools/infisical/update.sh" -, "x86_64-linux": "sha256-izVUw/RcH+U6i5kCdPGojsBF+Ont40QBYk4sJW/BLOA=" -, "x86_64-darwin": "sha256-j0f4NhLivG+MmzitOSnAcc/EQAiFVEn44w3UMnLCkVY=" -, "aarch64-linux": "sha256-hunRA42xIMcu5JBtTnibWXKEECIeBIHyeBwVnOGR25U=" -, "aarch64-darwin": "sha256-s6bmANYuuAOq959R+lipThc39qyqww20ISZ965hWkWc=" +, "x86_64-linux": "sha256-ZOwPZTTM/UoezgBojXaR4/35JIw6DCplY09brTCgHP4=" +, "x86_64-darwin": "sha256-b4Xxbu+bYZSlRlKv7kE7jNrruRiOy16oidQEke6HGzE=" +, "aarch64-linux": "sha256-OMdHZKwpTWHbfG9jyWs3bZP6pUqIv5ErZonvzwPkfvM=" +, "aarch64-darwin": "sha256-hG1rDxcXn70j1AVpp07se5jPIQE+de2PoMlnhZYeIzk=" } From e1281c7a9d775ae620e1f934f2253a2913eb652c Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Mon, 2 Sep 2024 23:47:15 +0200 Subject: [PATCH 118/235] nixos/services.factorio: fix escapeShellArg --- nixos/modules/services/games/factorio.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/games/factorio.nix b/nixos/modules/services/games/factorio.nix index c1d9731b842d..a9a4f386e060 100644 --- a/nixos/modules/services/games/factorio.nix +++ b/nixos/modules/services/games/factorio.nix @@ -275,7 +275,7 @@ in "--create=${mkSavePath cfg.saveName}" (lib.optionalString (cfg.mods != []) "--mod-directory=${modDir}") ]) - + (lib.optionalString (cfg.extraSettingsFile != null) ("\necho ${lib.strings.lib.escapeShellArg serverSettingsString}" + + (lib.optionalString (cfg.extraSettingsFile != null) ("\necho ${lib.strings.escapeShellArg serverSettingsString}" + " \"$(cat ${cfg.extraSettingsFile})\" | ${lib.getExe pkgs.jq} -s add" + " > ${stateDir}/server-settings.json")); From 2de067fa3fe2f3745355cd499147eebb7d30aa53 Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Sun, 25 Aug 2024 14:25:43 -0400 Subject: [PATCH 119/235] libdmapsharing: fix cross compilation --- .../libraries/libdmapsharing/default.nix | 29 ++++++++++++++----- 1 file changed, 21 insertions(+), 8 deletions(-) diff --git a/pkgs/development/libraries/libdmapsharing/default.nix b/pkgs/development/libraries/libdmapsharing/default.nix index ba1b3c05f1a6..04a9def5c743 100644 --- a/pkgs/development/libraries/libdmapsharing/default.nix +++ b/pkgs/development/libraries/libdmapsharing/default.nix @@ -4,9 +4,7 @@ , autoconf , automake , libtool -, which , pkg-config -, python3 , vala , avahi , gdk-pixbuf @@ -17,13 +15,20 @@ , docbook_xml_dtd_43 , gobject-introspection , libsoup_3 +, withGtkDoc ? stdenv.buildPlatform.canExecute stdenv.hostPlatform }: stdenv.mkDerivation rec { pname = "libdmapsharing"; version = "3.9.13"; - outputs = [ "out" "dev" "devdoc" ]; + outputs = [ + "out" + "dev" + ] ++ lib.optionals withGtkDoc [ + "devdoc" + ]; + outputBin = "dev"; src = fetchFromGitLab { @@ -34,16 +39,17 @@ stdenv.mkDerivation rec { sha256 = "oR9lpOFxgGfrtzncFT6dbmhKQfcuH/NvhOR/USHAHQc="; }; + strictDeps = true; + nativeBuildInputs = [ autoconf automake libtool - which + gtk-doc # gtkdocize pkg-config - python3 gobject-introspection vala - gtk-doc + ] ++ lib.optionals withGtkDoc [ docbook-xsl-nons docbook_xml_dtd_43 ]; @@ -53,6 +59,8 @@ stdenv.mkDerivation rec { gdk-pixbuf gst_all_1.gstreamer gst_all_1.gst-plugins-base + ] ++ lib.optionals withGtkDoc [ + gtk-doc ]; propagatedBuildInputs = [ @@ -61,10 +69,15 @@ stdenv.mkDerivation rec { ]; configureFlags = [ - "--enable-gtk-doc" - "--disable-tests" # Tests require mDNS server. + (lib.enableFeature false "tests") # Tests require mDNS server + (lib.enableFeature withGtkDoc "gtk-doc") ]; + postPatch = '' + substituteInPlace configure.ac \ + --replace-fail pkg-config "$PKG_CONFIG" + ''; + preConfigure = '' NOCONFIGURE=1 ./autogen.sh ''; From a9eed7fb4990b4e61cc10136c31b74f0329d28dc Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Mon, 2 Sep 2024 19:50:47 -0400 Subject: [PATCH 120/235] libdmapsharing: format with nixfmt --- .../libraries/libdmapsharing/default.nix | 97 ++++++++++--------- 1 file changed, 52 insertions(+), 45 deletions(-) diff --git a/pkgs/development/libraries/libdmapsharing/default.nix b/pkgs/development/libraries/libdmapsharing/default.nix index 04a9def5c743..47b02a65e083 100644 --- a/pkgs/development/libraries/libdmapsharing/default.nix +++ b/pkgs/development/libraries/libdmapsharing/default.nix @@ -1,33 +1,36 @@ -{ stdenv -, lib -, fetchFromGitLab -, autoconf -, automake -, libtool -, pkg-config -, vala -, avahi -, gdk-pixbuf -, gst_all_1 -, glib -, gtk-doc -, docbook-xsl-nons -, docbook_xml_dtd_43 -, gobject-introspection -, libsoup_3 -, withGtkDoc ? stdenv.buildPlatform.canExecute stdenv.hostPlatform +{ + stdenv, + lib, + fetchFromGitLab, + autoconf, + automake, + libtool, + pkg-config, + vala, + avahi, + gdk-pixbuf, + gst_all_1, + glib, + gtk-doc, + docbook-xsl-nons, + docbook_xml_dtd_43, + gobject-introspection, + libsoup_3, + withGtkDoc ? stdenv.buildPlatform.canExecute stdenv.hostPlatform, }: stdenv.mkDerivation rec { pname = "libdmapsharing"; version = "3.9.13"; - outputs = [ - "out" - "dev" - ] ++ lib.optionals withGtkDoc [ - "devdoc" - ]; + outputs = + [ + "out" + "dev" + ] + ++ lib.optionals withGtkDoc [ + "devdoc" + ]; outputBin = "dev"; @@ -35,33 +38,37 @@ stdenv.mkDerivation rec { domain = "gitlab.gnome.org"; owner = "GNOME"; repo = pname; - rev = "${lib.toUpper pname}_${lib.replaceStrings ["."] ["_"] version}"; + rev = "${lib.toUpper pname}_${lib.replaceStrings [ "." ] [ "_" ] version}"; sha256 = "oR9lpOFxgGfrtzncFT6dbmhKQfcuH/NvhOR/USHAHQc="; }; strictDeps = true; - nativeBuildInputs = [ - autoconf - automake - libtool - gtk-doc # gtkdocize - pkg-config - gobject-introspection - vala - ] ++ lib.optionals withGtkDoc [ - docbook-xsl-nons - docbook_xml_dtd_43 - ]; + nativeBuildInputs = + [ + autoconf + automake + libtool + gtk-doc # gtkdocize + pkg-config + gobject-introspection + vala + ] + ++ lib.optionals withGtkDoc [ + docbook-xsl-nons + docbook_xml_dtd_43 + ]; - buildInputs = [ - avahi - gdk-pixbuf - gst_all_1.gstreamer - gst_all_1.gst-plugins-base - ] ++ lib.optionals withGtkDoc [ - gtk-doc - ]; + buildInputs = + [ + avahi + gdk-pixbuf + gst_all_1.gstreamer + gst_all_1.gst-plugins-base + ] + ++ lib.optionals withGtkDoc [ + gtk-doc + ]; propagatedBuildInputs = [ glib From a7ba7b8957799085e16e56f7fbf4407774df2af8 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 2 Sep 2024 23:59:44 +0000 Subject: [PATCH 121/235] httplib: 0.16.3 -> 0.17.0 --- pkgs/development/libraries/httplib/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/httplib/default.nix b/pkgs/development/libraries/httplib/default.nix index ed397d4a5a6c..69d19b7f9001 100644 --- a/pkgs/development/libraries/httplib/default.nix +++ b/pkgs/development/libraries/httplib/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "httplib"; - version = "0.16.3"; + version = "0.17.0"; src = fetchFromGitHub { owner = "yhirose"; repo = "cpp-httplib"; rev = "v${version}"; - hash = "sha256-wihYgQLPXElsLB6B3+VCP62CfuXZWS+1kw1gA3mdLv0="; + hash = "sha256-F/+w7viOWesdPZR8bBXEO9D/5sLQnKp2hyXCMSS6E/k="; }; nativeBuildInputs = [ cmake ]; From a6f58e6cde078086072093158f104e7633ead122 Mon Sep 17 00:00:00 2001 From: ajs124 Date: Mon, 2 Sep 2024 15:35:59 +0200 Subject: [PATCH 122/235] nss_latest: 3.103 -> 3.104 https://github.com/nss-dev/nss/blob/NSS_3_104_BRANCH/doc/rst/releases/nss_3_104.rst --- pkgs/development/libraries/nss/latest.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/nss/latest.nix b/pkgs/development/libraries/nss/latest.nix index 22eca6fec109..b2d040232374 100644 --- a/pkgs/development/libraries/nss/latest.nix +++ b/pkgs/development/libraries/nss/latest.nix @@ -5,6 +5,6 @@ # Example: nix-shell ./maintainers/scripts/update.nix --argstr package cacert import ./generic.nix { - version = "3.103"; - hash = "sha256-e57HN50lHT4+nkdZPyixpWFyTD0c+xZBk23BhmIumV8="; + version = "3.104"; + hash = "sha256-TEGEKocapU5OTqx69n8nrn/X3SZr49d1alHM73UnDJw="; } From 8c23073887d008daa38127b9e27169b3240b7a64 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 3 Sep 2024 00:40:39 +0000 Subject: [PATCH 123/235] astartectl: 23.5.1 -> 23.5.2 --- pkgs/by-name/as/astartectl/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/as/astartectl/package.nix b/pkgs/by-name/as/astartectl/package.nix index 4dcd046570e9..4e6f2af641ec 100644 --- a/pkgs/by-name/as/astartectl/package.nix +++ b/pkgs/by-name/as/astartectl/package.nix @@ -5,7 +5,7 @@ }: buildGoModule rec { pname = "astartectl"; - version = "23.5.1"; + version = "23.5.2"; # Workaround for go vendor failing # https://github.com/astarte-platform/astartectl/pull/244 @@ -15,10 +15,10 @@ buildGoModule rec { owner = "astarte-platform"; repo = "astartectl"; rev = "v${version}"; - hash = "sha256-ntlLk7soiZq6Ql6k/RG9PdHawguRV6Wha8C+5FM+2og="; + hash = "sha256-EIyta/10K6WQ1vzQZryz+c3K2AwMOUUQCw5f4Wkp6Yk="; }; - vendorHash = "sha256-3k/G7fLll19XG2RU8YsepWv8BtkCmiLg4/c7lSvx+9k="; + vendorHash = "sha256-NWPLHbUHrk/oJXCOJF8kKhQiZR8aqZChxuz73Acu1cM="; nativeBuildInputs = [ installShellFiles ]; From 84c4ecbe966efdff945ef5cfeb677f028c517491 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 3 Sep 2024 00:40:45 +0000 Subject: [PATCH 124/235] arkade: 0.11.21 -> 0.11.22 --- pkgs/applications/networking/cluster/arkade/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/arkade/default.nix b/pkgs/applications/networking/cluster/arkade/default.nix index 8e576a422d68..aeccc7e8d472 100644 --- a/pkgs/applications/networking/cluster/arkade/default.nix +++ b/pkgs/applications/networking/cluster/arkade/default.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "arkade"; - version = "0.11.21"; + version = "0.11.22"; src = fetchFromGitHub { owner = "alexellis"; repo = "arkade"; rev = version; - hash = "sha256-vNJQLrpPJJG5FjQ73203V/Ky93HawRWgMiPYHU+eXPM="; + hash = "sha256-Qc8cQLLRcCNYouWfs8NzF9nrKIPrM1+1VA0wbP2iupQ="; }; CGO_ENABLED = 0; From ca7d96be9eeb9b11973082f58a4d9f38fec200b9 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 3 Sep 2024 00:40:55 +0000 Subject: [PATCH 125/235] viddy: 1.0.2 -> 1.1.0 --- pkgs/tools/misc/viddy/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/misc/viddy/default.nix b/pkgs/tools/misc/viddy/default.nix index cb9f1d68e9c9..5c534a7b974f 100644 --- a/pkgs/tools/misc/viddy/default.nix +++ b/pkgs/tools/misc/viddy/default.nix @@ -6,21 +6,21 @@ rustPlatform.buildRustPackage rec { pname = "viddy"; - version = "1.0.2"; + version = "1.1.0"; src = fetchFromGitHub { owner = "sachaos"; repo = "viddy"; rev = "v${version}"; - hash = "sha256-Rb4IBguyRLiwUR9dDKOagWSUjov0OzxiiuSg7epjCv0="; + hash = "sha256-dsvPNMNT1CXB6Wgq438wRHt9og+4uFWgiWPore4mRE0="; }; - cargoHash = "sha256-Lr/sl0IcoVGb22y5BQrGIUVx8Ny+bQg1MqUBRPqF1nk="; + cargoHash = "sha256-18OEOV8kET+UcLd15YultkonbXBEY/AwBHFNw4YTAPk="; # requires nightly features env.RUSTC_BOOTSTRAP = 1; - env.VERGEN_BUILD_DATE = "2024-08-26"; # managed via the update script + env.VERGEN_BUILD_DATE = "2024-09-01"; # managed via the update script env.VERGEN_GIT_DESCRIBE = "Nixpkgs"; passthru.updateScript.command = [ ./update.sh ]; From d6eadf5e1137935f660eb0a48664a27ff6d5eb70 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 3 Sep 2024 01:07:14 +0000 Subject: [PATCH 126/235] cri-o-unwrapped: 1.30.4 -> 1.30.5 --- pkgs/applications/virtualization/cri-o/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/virtualization/cri-o/default.nix b/pkgs/applications/virtualization/cri-o/default.nix index 5f7103886ccc..5d38b21ec679 100644 --- a/pkgs/applications/virtualization/cri-o/default.nix +++ b/pkgs/applications/virtualization/cri-o/default.nix @@ -15,13 +15,13 @@ buildGoModule rec { pname = "cri-o"; - version = "1.30.4"; + version = "1.30.5"; src = fetchFromGitHub { owner = "cri-o"; repo = "cri-o"; rev = "v${version}"; - hash = "sha256-PfG5RlUmMGMduTApdlHoI+4kdRprvWXeXZDkd6brVkM="; + hash = "sha256-snhuV4hqbqMJK8Fg6vJGJoQ3heCFULK1iIQQB65kiR0="; }; vendorHash = null; From fd2c60815de5aacc02d9d34d4f96e747a37c4657 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 3 Sep 2024 01:39:53 +0000 Subject: [PATCH 127/235] oink: 1.2.0 -> 1.2.1 --- pkgs/by-name/oi/oink/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/oi/oink/package.nix b/pkgs/by-name/oi/oink/package.nix index cd7d271997a2..c3f4cf4be5bf 100644 --- a/pkgs/by-name/oi/oink/package.nix +++ b/pkgs/by-name/oi/oink/package.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "oink"; - version = "1.2.0"; + version = "1.2.1"; src = fetchFromGitHub { owner = "rlado"; repo = "oink"; rev = "v${version}"; - hash = "sha256-ojvuA5IlayPMNajl2+a4lx8NU06Da0vp9TJHCQVMtlo="; + hash = "sha256-XbS4DPNPYfIEnATIG0u+7HPQmtX5rvl77j/3mdVB//8="; }; vendorHash = null; From 9e19555eac2bbc87fa7b43ec3aae27517391342c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 3 Sep 2024 02:23:19 +0000 Subject: [PATCH 128/235] python312Packages.flask-socketio: 5.3.6 -> 5.3.7 --- pkgs/development/python-modules/flask-socketio/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/flask-socketio/default.nix b/pkgs/development/python-modules/flask-socketio/default.nix index 7bfda242546c..75a8044d85b0 100644 --- a/pkgs/development/python-modules/flask-socketio/default.nix +++ b/pkgs/development/python-modules/flask-socketio/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "flask-socketio"; - version = "5.3.6"; + version = "5.3.7"; format = "pyproject"; disabled = pythonOlder "3.6"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "miguelgrinberg"; repo = "Flask-SocketIO"; rev = "refs/tags/v${version}"; - hash = "sha256-YjCe34Mvt7tvp3w5yH52lrq4bWi7aIYAUssNqxlQ8CA="; + hash = "sha256-3vqhxz+NPrpjTxNt4scZtPxaFfnM3+gyE+jegwgan2E="; }; nativeBuildInputs = [ setuptools ]; From 2edb4472454479a641998c08cb05dec4e9946438 Mon Sep 17 00:00:00 2001 From: YvesStraten Date: Tue, 3 Sep 2024 10:42:38 +0800 Subject: [PATCH 129/235] picom-pijulius: 8.2-unstable-2024-07-01 -> 8.2-unstable-2024-08-30 --- pkgs/by-name/pi/picom-pijulius/package.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/pi/picom-pijulius/package.nix b/pkgs/by-name/pi/picom-pijulius/package.nix index 8337b0f694b4..03eef0f334a1 100644 --- a/pkgs/by-name/pi/picom-pijulius/package.nix +++ b/pkgs/by-name/pi/picom-pijulius/package.nix @@ -4,20 +4,22 @@ writeShellScript, fetchFromGitHub, pcre, + asciidoctor, unstableGitUpdater }: picom.overrideAttrs (previousAttrs: { pname = "picom-pijulius"; - version = "8.2-unstable-2024-07-01"; + version = "8.2-unstable-2024-08-30"; src = fetchFromGitHub { owner = "pijulius"; repo = "picom"; - rev = "b8fe9323e7606709d692976a7fe7d2455b328bc6"; - hash = "sha256-bXeoWg1ZukXv+6ZNeRc8gGNsbtBztyW5lpfK0lQK+DE="; + rev = "404652dfca5d6708e3a03e78b7e467550a4f7b62"; + hash = "sha256-VJLMnQpW24OXlCmLoAAkyNMtplzS+NKpUJzLHklkizU="; }; buildInputs = (previousAttrs.buildInputs or [ ]) ++ [ pcre ]; + nativeBuildInputs = (previousAttrs.nativeBuildInputs or [ ]) ++ [ asciidoctor ]; meta = { inherit (previousAttrs.meta) From 850d4975d69a97ea226db529ae6df71cd5a76253 Mon Sep 17 00:00:00 2001 From: Emily Date: Fri, 23 Aug 2024 18:09:25 +0100 Subject: [PATCH 130/235] element-call: 0.5.16 -> 0.6.3 Removes the bundled libolm. --- pkgs/by-name/el/element-call/name.patch | 10 ---------- pkgs/by-name/el/element-call/package.nix | 16 ++++++---------- 2 files changed, 6 insertions(+), 20 deletions(-) delete mode 100644 pkgs/by-name/el/element-call/name.patch diff --git a/pkgs/by-name/el/element-call/name.patch b/pkgs/by-name/el/element-call/name.patch deleted file mode 100644 index fa6ab068d18c..000000000000 --- a/pkgs/by-name/el/element-call/name.patch +++ /dev/null @@ -1,10 +0,0 @@ -diff --git a/package.json b/package.json -index e25221f2..5268d11a 100644 ---- a/package.json -+++ b/package.json -@@ -1,4 +1,5 @@ - { -+ "name": "element-call", - "version": "0.0.0", - "type": "module", - "scripts": { \ No newline at end of file diff --git a/pkgs/by-name/el/element-call/package.nix b/pkgs/by-name/el/element-call/package.nix index 8f9e27b3a9b3..452662c65783 100644 --- a/pkgs/by-name/el/element-call/package.nix +++ b/pkgs/by-name/el/element-call/package.nix @@ -6,32 +6,29 @@ , yarnBuildHook , nodejs , npmHooks -, olm }: let inherit (stdenv.hostPlatform) system; throwSystem = throw "Unsupported system: ${system}"; offlineCacheHash = { - x86_64-linux = "sha256-mZCnvX6hzkdi/zjPiefcmbyC2kGemjS4w7WTVkyq8W0="; - aarch64-linux = "sha256-mZCnvX6hzkdi/zjPiefcmbyC2kGemjS4w7WTVkyq8W0="; - x86_64-darwin = "sha256-G4doEnZORJqcl3bWaKZPuQmBeXNXud06nLO12Afr9kM="; - aarch64-darwin = "sha256-G4doEnZORJqcl3bWaKZPuQmBeXNXud06nLO12Afr9kM="; + x86_64-linux = "sha256-g4PWB1EstNB7gd/yZyrXf+U8Py8OLeea0gDlEXhInhU="; + aarch64-linux = "sha256-g4PWB1EstNB7gd/yZyrXf+U8Py8OLeea0gDlEXhInhU="; + x86_64-darwin = "sha256-g4PWB1EstNB7gd/yZyrXf+U8Py8OLeea0gDlEXhInhU="; + aarch64-darwin = "sha256-g4PWB1EstNB7gd/yZyrXf+U8Py8OLeea0gDlEXhInhU="; }.${system} or throwSystem; in stdenv.mkDerivation (finalAttrs: { pname = "element-call"; - version = "0.5.16"; + version = "0.6.3"; src = fetchFromGitHub { owner = "element-hq"; repo = "element-call"; rev = "v${finalAttrs.version}"; - hash = "sha256-GTHM27i716RZk+kDELMg/lYy355/SZoQLXGPQ90M4xg="; + hash = "sha256-PyxqUhnlWfcACsoFYrppO7g5e74jI4/xxXBi6oWyWsg="; }; - patches = [ ./name.patch ]; - offlineCache = fetchYarnDeps { yarnLock = "${finalAttrs.src}/yarn.lock"; hash = offlineCacheHash; @@ -53,6 +50,5 @@ stdenv.mkDerivation (finalAttrs: { license = licenses.asl20; maintainers = with maintainers; [ kilimnik ]; mainProgram = "element-call"; - inherit (olm.meta) knownVulnerabilities; }; }) From 6011e86df371cffb7dd97a6fa292558ed179dfea Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 3 Sep 2024 03:05:22 +0000 Subject: [PATCH 131/235] runc: 1.1.13 -> 1.1.14 --- pkgs/applications/virtualization/runc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/virtualization/runc/default.nix b/pkgs/applications/virtualization/runc/default.nix index 0a9a802f70f3..ff7fa9f8a3b9 100644 --- a/pkgs/applications/virtualization/runc/default.nix +++ b/pkgs/applications/virtualization/runc/default.nix @@ -14,13 +14,13 @@ buildGoModule rec { pname = "runc"; - version = "1.1.13"; + version = "1.1.14"; src = fetchFromGitHub { owner = "opencontainers"; repo = "runc"; rev = "v${version}"; - hash = "sha256-RQsM8Q7HogDVGbNpen3wxXNGR9lfqmNhkXTRoC+LBk8="; + hash = "sha256-7PYbSZqCQLTaeFppuNz5mxDlwEyLkA5zpdMhWy1tWmc="; }; vendorHash = null; From 8de140dfa654577b9c1b00820aab3caf2119e7c4 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 3 Sep 2024 03:16:48 +0000 Subject: [PATCH 132/235] python312Packages.python-socketio: 5.11.3 -> 5.11.4 --- pkgs/development/python-modules/python-socketio/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/python-socketio/default.nix b/pkgs/development/python-modules/python-socketio/default.nix index 2ed6d3aecaf8..9ecfd72e38de 100644 --- a/pkgs/development/python-modules/python-socketio/default.nix +++ b/pkgs/development/python-modules/python-socketio/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { pname = "python-socketio"; - version = "5.11.3"; + version = "5.11.4"; pyproject = true; disabled = pythonOlder "3.6"; @@ -35,7 +35,7 @@ buildPythonPackage rec { owner = "miguelgrinberg"; repo = "python-socketio"; rev = "refs/tags/v${version}"; - hash = "sha256-8LpTrDxugZS6skSRCcDK4+sbSYV9ZBRSma4QfIXFJT8="; + hash = "sha256-iWe9IwUR+nq9SAmHzFZYUJpVOOEbc1ZdiMAjaBjQrVs="; }; nativeBuildInputs = [ setuptools ]; From 1f791eaf2393b9a4e18ba39593d102a41bd4a6f9 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 3 Sep 2024 03:41:01 +0000 Subject: [PATCH 133/235] python312Packages.rapidfuzz: 3.9.6 -> 3.9.7 --- pkgs/development/python-modules/rapidfuzz/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/rapidfuzz/default.nix b/pkgs/development/python-modules/rapidfuzz/default.nix index 59c78777a6fe..02ef0d753fae 100644 --- a/pkgs/development/python-modules/rapidfuzz/default.nix +++ b/pkgs/development/python-modules/rapidfuzz/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "rapidfuzz"; - version = "3.9.6"; + version = "3.9.7"; pyproject = true; disabled = pythonOlder "3.8"; @@ -28,7 +28,7 @@ buildPythonPackage rec { owner = "maxbachmann"; repo = "RapidFuzz"; rev = "refs/tags/v${version}"; - hash = "sha256-vO63Zkc2ltgfpAq81qRP5MjQ08GTkJhnfqwLIxP5eEI="; + hash = "sha256-hyjzY9ogroUa4nGSG8HOyr5FxifX9d7Hf8ezKq6zxVk="; }; postPatch = '' From c56a93a3380c8de4f65d2e30f0801653044ab45d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 3 Sep 2024 03:59:34 +0000 Subject: [PATCH 134/235] python312Packages.rotary-embedding-torch: 0.6.5 -> 0.7.0 --- .../python-modules/rotary-embedding-torch/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/rotary-embedding-torch/default.nix b/pkgs/development/python-modules/rotary-embedding-torch/default.nix index a24a589e6ce4..67cf461168a2 100644 --- a/pkgs/development/python-modules/rotary-embedding-torch/default.nix +++ b/pkgs/development/python-modules/rotary-embedding-torch/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "rotary-embedding-torch"; - version = "0.6.5"; + version = "0.7.0"; pyproject = true; src = fetchFromGitHub { owner = "lucidrains"; repo = "rotary-embedding-torch"; rev = "refs/tags/${version}"; - hash = "sha256-w44nD3oaG3jPME66EIZnF0/QOiw/+P4XX4EYyar6niE="; + hash = "sha256-QxCSJNcyouK5FvCnKiyD1ZtIEQ5DaDB/n+lUCjwAk+4="; }; nativeBuildInputs = [ From 1385dbfbebd3f58be065e3cb89cdb2d746d10ae5 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 3 Sep 2024 04:07:00 +0000 Subject: [PATCH 135/235] sendme: 0.14.0 -> 0.15.0 --- pkgs/by-name/se/sendme/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/se/sendme/package.nix b/pkgs/by-name/se/sendme/package.nix index 23690ec360ab..204b3e1ca1c1 100644 --- a/pkgs/by-name/se/sendme/package.nix +++ b/pkgs/by-name/se/sendme/package.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage rec { pname = "sendme"; - version = "0.14.0"; + version = "0.15.0"; src = fetchFromGitHub { owner = "n0-computer"; repo = pname; rev = "v${version}"; - hash = "sha256-mAMoUBvZRMdRaMKo/vsOuel+Gp6vTxdkAfd2S0DUw50="; + hash = "sha256-wU9NnHqn/lTiPQB51o+CTNA1UWIOa21winiLW9ih7dM="; }; - cargoHash = "sha256-ggURSlBuL+EqMK8x/T/sGsWCLNALTAtvQqHRmu0QsH0="; + cargoHash = "sha256-y8VnunKmNRMO8VOL6u1FpF3Rec+BD4E1KW9Z2J8/2xs="; buildInputs = lib.optionals stdenv.isDarwin ( with darwin.apple_sdk.frameworks; [ From 98b24991f12384794f65d78e8d9c36b8b71fee0a Mon Sep 17 00:00:00 2001 From: t4ccer Date: Mon, 2 Sep 2024 22:18:23 -0600 Subject: [PATCH 136/235] measureme: 11.0.1 -> 12.0.0 --- .../tools/rust/measureme/Cargo.lock | 756 ++++++------------ .../tools/rust/measureme/default.nix | 12 +- 2 files changed, 250 insertions(+), 518 deletions(-) diff --git a/pkgs/development/tools/rust/measureme/Cargo.lock b/pkgs/development/tools/rust/measureme/Cargo.lock index 20f1f96a10b2..32fe7bd98e9b 100644 --- a/pkgs/development/tools/rust/measureme/Cargo.lock +++ b/pkgs/development/tools/rust/measureme/Cargo.lock @@ -3,16 +3,16 @@ version = 3 [[package]] -name = "adler" -version = "1.0.2" +name = "adler2" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" +checksum = "512761e0bb2578dd7380c6baaa0f4ce03e84f95e960231d1dec8bf4d7d6e2627" [[package]] name = "ahash" -version = "0.8.7" +version = "0.8.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77c3a9648d43b9cd48db467b3f87fdd6e146bcc88ab0180006cef2179fe11d01" +checksum = "e89da841a80418a9b391ebaea17f5c112ffaaa96f621d2c285b5174da76b9011" dependencies = [ "cfg-if", "getrandom", @@ -21,89 +21,92 @@ dependencies = [ "zerocopy", ] -[[package]] -name = "aho-corasick" -version = "1.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2969dcb958b36655471fc61f7e416fa76033bdd4bfed0678d8fee1e2d07a1f0" -dependencies = [ - "memchr", -] - [[package]] name = "analyzeme" -version = "9.2.0" -source = "git+https://github.com/rust-lang/measureme?tag=9.2.0#9f51cde2e5dd3ef0392f0f6a7201f4946502ef41" +version = "12.0.0" dependencies = [ - "byteorder", - "measureme 9.2.0", - "memchr", - "rustc-hash", - "serde", - "serde_json", -] - -[[package]] -name = "analyzeme" -version = "11.0.1" -dependencies = [ - "analyzeme 9.2.0", - "decodeme 10.1.2", - "decodeme 11.0.1", + "decodeme 10.1.3", + "decodeme 12.0.0", "flate2", - "measureme 10.1.2", - "measureme 11.0.1", + "measureme 10.1.3", + "measureme 12.0.0", "memchr", "rustc-hash", "serde", ] +[[package]] +name = "anstream" +version = "0.6.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "64e15c1ab1f89faffbf04a634d5e1962e9074f2741eef6d97f3c4e322426d526" +dependencies = [ + "anstyle", + "anstyle-parse", + "anstyle-query", + "anstyle-wincon", + "colorchoice", + "is_terminal_polyfill", + "utf8parse", +] + +[[package]] +name = "anstyle" +version = "1.0.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1bec1de6f59aedf83baf9ff929c98f2ad654b97c9510f4e70cf6f661d49fd5b1" + +[[package]] +name = "anstyle-parse" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eb47de1e80c2b463c735db5b217a0ddc39d612e7ac9e2e96a5aed1f57616c1cb" +dependencies = [ + "utf8parse", +] + +[[package]] +name = "anstyle-query" +version = "1.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d36fc52c7f6c869915e99412912f22093507da8d9e942ceaf66fe4b7c14422a" +dependencies = [ + "windows-sys", +] + +[[package]] +name = "anstyle-wincon" +version = "3.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5bf74e1b6e971609db8ca7a9ce79fd5768ab6ae46441c572e46cf596f59e57f8" +dependencies = [ + "anstyle", + "windows-sys", +] + [[package]] name = "arrayvec" -version = "0.7.4" +version = "0.7.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711" - -[[package]] -name = "atty" -version = "0.2.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8" -dependencies = [ - "hermit-abi 0.1.19", - "libc", - "winapi", -] +checksum = "7c02d123df017efcdfbd739ef81735b36c5ba83ec3c59c80a9d7ecc718f92e50" [[package]] name = "autocfg" -version = "1.1.0" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" +checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0" [[package]] name = "bitflags" -version = "1.3.2" +version = "2.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" - -[[package]] -name = "bitflags" -version = "2.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07" +checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de" [[package]] name = "bytemuck" -version = "1.14.0" +version = "1.17.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "374d28ec25809ee0e23827c2ab573d729e293f281dfe393500e7ad618baa61c6" - -[[package]] -name = "byteorder" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" +checksum = "773d90827bc3feecfb67fab12e24de0749aad83c74b9504ecde46237b5cd24e2" [[package]] name = "cfg-if" @@ -113,59 +116,66 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "clap" -version = "3.2.25" +version = "4.5.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ea181bf566f71cb9a5d17a59e1871af638180a18fb0035c92ae62b705207123" +checksum = "ed6719fffa43d0d87e5fd8caeab59be1554fb028cd30edc88fc4369b17971019" dependencies = [ - "atty", - "bitflags 1.3.2", + "clap_builder", "clap_derive", +] + +[[package]] +name = "clap_builder" +version = "4.5.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "216aec2b177652e3846684cbfe25c9964d18ec45234f0f5da5157b207ed1aab6" +dependencies = [ + "anstream", + "anstyle", "clap_lex", - "indexmap", - "once_cell", "strsim", - "termcolor", - "textwrap", ] [[package]] name = "clap_derive" -version = "3.2.25" +version = "4.5.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae6371b8bdc8b7d3959e9cf7b22d4435ef3e79e138688421ec654acf8c81b008" +checksum = "501d359d5f3dcaf6ecdeee48833ae73ec6e42723a1e52419c79abf9507eec0a0" dependencies = [ "heck", - "proc-macro-error", "proc-macro2", "quote", - "syn 1.0.109", + "syn", ] [[package]] name = "clap_lex" -version = "0.2.4" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2850f2f5a82cbf437dd5af4d49848fbdfc27c157c3d010345776f952765261c5" -dependencies = [ - "os_str_bytes", -] +checksum = "1462739cb27611015575c0c11df5df7601141071f07518d56fcc1be504cbec97" + +[[package]] +name = "colorchoice" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d3fd119d74b830634cea2a0f58bbd0d54540518a14397557951e79340abc28c0" [[package]] name = "crc32fast" -version = "1.3.2" +version = "1.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b540bd8bc810d3885c6ea91e2018302f68baba2129ab3e88f32389ee9370880d" +checksum = "a97769d94ddab943e4510d138150169a2758b5ef3eb191a9ee688de3e23ef7b3" dependencies = [ "cfg-if", ] [[package]] name = "crox" -version = "11.0.1" +version = "12.0.0" dependencies = [ - "analyzeme 11.0.1", + "analyzeme", "clap", - "measureme 11.0.1", + "measureme 12.0.0", "rustc-hash", "serde", "serde_json", @@ -194,10 +204,11 @@ dependencies = [ [[package]] name = "decodeme" -version = "10.1.2" -source = "git+https://github.com/rust-lang/measureme?tag=10.1.2#f9f84d1a79c46e9927926c177c33eb3ea3c72979" +version = "10.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8907b810935b1fc70e90f415d88e5e3fb1fc0d17058c7da49d5e294eab89decf" dependencies = [ - "measureme 10.1.2", + "measureme 10.1.3", "memchr", "rustc-hash", "serde", @@ -206,9 +217,9 @@ dependencies = [ [[package]] name = "decodeme" -version = "11.0.1" +version = "12.0.0" dependencies = [ - "measureme 11.0.1", + "measureme 12.0.0", "memchr", "rustc-hash", "serde", @@ -242,31 +253,21 @@ version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "34aa73646ffb006b8f5147f3dc182bd4bcb190227ce861fc4a4844bf8e3cb2c0" -[[package]] -name = "errno" -version = "0.3.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a258e46cdc063eb8519c00b9fc845fc47bcfca4130e2f08e88665ceda8474245" -dependencies = [ - "libc", - "windows-sys 0.52.0", -] - [[package]] name = "flamegraph" -version = "11.0.1" +version = "12.0.0" dependencies = [ - "analyzeme 11.0.1", + "analyzeme", "clap", "inferno", - "measureme 11.0.1", + "measureme 12.0.0", ] [[package]] name = "flate2" -version = "1.0.28" +version = "1.0.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46303f565772937ffe1d394a4fac6f411c6013172fadde9dcdb1e147a086940e" +checksum = "324a1be68054ef05ad64b861cc9eaf1d623d2d8cb25b4bf2cb9cdd902b4bf253" dependencies = [ "crc32fast", "miniz_oxide", @@ -274,63 +275,32 @@ dependencies = [ [[package]] name = "getrandom" -version = "0.2.11" +version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe9006bed769170c11f845cf00c7c1e9092aeb3f268e007c3e760ac68008070f" +checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7" dependencies = [ "cfg-if", "libc", "wasi", ] -[[package]] -name = "glob" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" - -[[package]] -name = "hashbrown" -version = "0.12.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" - [[package]] name = "heck" -version = "0.4.1" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" +checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea" [[package]] name = "hermit-abi" -version = "0.1.19" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33" -dependencies = [ - "libc", -] - -[[package]] -name = "hermit-abi" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d77f7ec81a6d05a3abb01ab6eb7590f6083d08449fe5a1c8b1e620283546ccb7" - -[[package]] -name = "indexmap" -version = "1.9.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99" -dependencies = [ - "autocfg", - "hashbrown", -] +checksum = "fbf6a919d6cf397374f7dfeeea91d974c7c0a7221d0d0f4f20d859d329e53fcc" [[package]] name = "inferno" -version = "0.11.19" +version = "0.11.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "321f0f839cd44a4686e9504b0a62b4d69a50b62072144c71c68f5873c167b8d9" +checksum = "232929e1d75fe899576a3d5c7416ad0d88dbfbb3c3d6aa00873a7408a50ddb88" dependencies = [ "ahash", "is-terminal", @@ -344,65 +314,55 @@ dependencies = [ ] [[package]] -name = "instant" -version = "0.1.12" +name = "is-terminal" +version = "0.4.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c" +checksum = "261f68e344040fbd0edea105bef17c66edf46f984ddb1115b775ce31be948f4b" dependencies = [ - "cfg-if", + "hermit-abi", + "libc", + "windows-sys", ] [[package]] -name = "is-terminal" -version = "0.4.9" +name = "is_terminal_polyfill" +version = "1.70.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb0889898416213fab133e1d33a0e5858a48177452750691bde3666d0fdbaf8b" -dependencies = [ - "hermit-abi 0.3.3", - "rustix", - "windows-sys 0.48.0", -] +checksum = "7943c866cc5cd64cbc25b2e01621d07fa8eb2a1a23160ee81ce38704e97b8ecf" [[package]] name = "itoa" -version = "1.0.10" +version = "1.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1a46d1a171d865aa5f83f92695765caa047a9b4cbae2cbf37dbd613a793fd4c" +checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b" [[package]] name = "lazy_static" -version = "1.4.0" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" +checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe" [[package]] name = "libc" -version = "0.2.151" +version = "0.2.158" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "302d7ab3130588088d277783b1e2d2e10c9e9e4a16dd9050e6ec93fb3e7048f4" +checksum = "d8adc4bb1803a324070e64a98ae98f38934d91957a99cfb3a43dcbc01bc56439" [[package]] name = "libredox" -version = "0.0.1" +version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85c833ca1e66078851dba29046874e38f08b2c883700aa29a03ddd3b23814ee8" +checksum = "c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d" dependencies = [ - "bitflags 2.4.1", + "bitflags", "libc", - "redox_syscall 0.4.1", ] [[package]] -name = "linux-raw-sys" +name = "lock_api" version = "0.4.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4cd1a83af159aa67994778be9070f0ae1bd732942279cabb14f86f986a21456" - -[[package]] -name = "lock_api" -version = "0.4.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c168f8615b12bc01f9c17e2eb0cc07dcae1940121185446edc3744920e8ef45" +checksum = "07af8b9cdd281b7915f413fa73f29ebd5d55d0d3f0155584dade1ff18cea1b17" dependencies = [ "autocfg", "scopeguard", @@ -410,53 +370,41 @@ dependencies = [ [[package]] name = "log" -version = "0.4.20" +version = "0.4.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f" +checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24" [[package]] name = "measureme" -version = "9.2.0" -source = "git+https://github.com/rust-lang/measureme?tag=9.2.0#9f51cde2e5dd3ef0392f0f6a7201f4946502ef41" +version = "10.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4f0c6afa424b30bee598dc5e8116cd01359bc57919cb10ac38cf9e0914f16c0b" dependencies = [ "log", "memmap2", - "parking_lot 0.11.2", - "perf-event-open-sys 1.0.1", + "parking_lot", + "perf-event-open-sys", "rustc-hash", "smallvec", ] [[package]] name = "measureme" -version = "10.1.2" -source = "git+https://github.com/rust-lang/measureme?tag=10.1.2#f9f84d1a79c46e9927926c177c33eb3ea3c72979" +version = "12.0.0" dependencies = [ "log", "memmap2", - "parking_lot 0.12.1", - "perf-event-open-sys 3.0.0", - "rustc-hash", - "smallvec", -] - -[[package]] -name = "measureme" -version = "11.0.1" -dependencies = [ - "log", - "memmap2", - "parking_lot 0.12.1", - "perf-event-open-sys 3.0.0", + "parking_lot", + "perf-event-open-sys", "rustc-hash", "smallvec", ] [[package]] name = "memchr" -version = "2.6.4" +version = "2.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f665ee40bc4a3c5590afb1e9677db74a508659dfd71e126420da8274909a0167" +checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3" [[package]] name = "memmap2" @@ -469,29 +417,29 @@ dependencies = [ [[package]] name = "miniz_oxide" -version = "0.7.1" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7810e0be55b428ada41041c41f32c9f1a42817901b4ccf45fa3d4b6561e74c7" +checksum = "e2d80299ef12ff69b16a84bb182e3b9df68b5a91574d3d4fa6e41b65deec4df1" dependencies = [ - "adler", + "adler2", ] [[package]] name = "mmedit" -version = "11.0.1" +version = "12.0.0" dependencies = [ "clap", - "decodeme 11.0.1", - "measureme 11.0.1", + "decodeme 12.0.0", + "measureme 12.0.0", ] [[package]] name = "mmview" -version = "11.0.1" +version = "12.0.0" dependencies = [ - "analyzeme 11.0.1", + "analyzeme", "clap", - "measureme 11.0.1", + "measureme 12.0.0", ] [[package]] @@ -510,67 +458,27 @@ version = "1.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" -[[package]] -name = "os_str_bytes" -version = "6.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2355d85b9a3786f481747ced0e0ff2ba35213a1f9bd406ed906554d7af805a1" - [[package]] name = "parking_lot" -version = "0.11.2" +version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d17b78036a60663b797adeaee46f5c9dfebb86948d1255007a1d6be0271ff99" -dependencies = [ - "instant", - "lock_api", - "parking_lot_core 0.8.6", -] - -[[package]] -name = "parking_lot" -version = "0.12.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f" +checksum = "f1bf18183cf54e8d6059647fc3063646a1801cf30896933ec2311622cc4b9a27" dependencies = [ "lock_api", - "parking_lot_core 0.9.9", + "parking_lot_core", ] [[package]] name = "parking_lot_core" -version = "0.8.6" +version = "0.9.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "60a2cfe6f0ad2bfc16aefa463b497d5c7a5ecd44a23efa72aa342d90177356dc" -dependencies = [ - "cfg-if", - "instant", - "libc", - "redox_syscall 0.2.16", - "smallvec", - "winapi", -] - -[[package]] -name = "parking_lot_core" -version = "0.9.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c42a9226546d68acdd9c0a280d17ce19bfe27a46bf68784e4066115788d008e" +checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8" dependencies = [ "cfg-if", "libc", - "redox_syscall 0.4.1", + "redox_syscall", "smallvec", - "windows-targets 0.48.5", -] - -[[package]] -name = "perf-event-open-sys" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce9bedf5da2c234fdf2391ede2b90fabf585355f33100689bc364a3ea558561a" -dependencies = [ - "libc", + "windows-targets", ] [[package]] @@ -596,35 +504,11 @@ dependencies = [ "unicode-width", ] -[[package]] -name = "proc-macro-error" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c" -dependencies = [ - "proc-macro-error-attr", - "proc-macro2", - "quote", - "syn 1.0.109", - "version_check", -] - -[[package]] -name = "proc-macro-error-attr" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869" -dependencies = [ - "proc-macro2", - "quote", - "version_check", -] - [[package]] name = "proc-macro2" -version = "1.0.71" +version = "1.0.86" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75cb1540fadbd5b8fbccc4dddad2734eba435053f725621c070711a14bb5f4b8" +checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77" dependencies = [ "unicode-ident", ] @@ -640,76 +524,38 @@ dependencies = [ [[package]] name = "quote" -version = "1.0.33" +version = "1.0.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae" +checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af" dependencies = [ "proc-macro2", ] [[package]] name = "redox_syscall" -version = "0.2.16" +version = "0.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a" +checksum = "2a908a6e00f1fdd0dfd9c0eb08ce85126f6d8bbda50017e74bc4a4b7d4a926a4" dependencies = [ - "bitflags 1.3.2", -] - -[[package]] -name = "redox_syscall" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa" -dependencies = [ - "bitflags 1.3.2", + "bitflags", ] [[package]] name = "redox_users" -version = "0.4.4" +version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a18479200779601e498ada4e8c1e1f50e3ee19deb0259c25825a98b5603b2cb4" +checksum = "ba009ff324d1fc1b900bd1fdb31564febe58a8ccc8a6fdbb93b543d33b13ca43" dependencies = [ "getrandom", "libredox", "thiserror", ] -[[package]] -name = "regex" -version = "1.10.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "380b951a9c5e80ddfd6136919eef32310721aa4aacd4889a8d39124b026ab343" -dependencies = [ - "aho-corasick", - "memchr", - "regex-automata", - "regex-syntax", -] - -[[package]] -name = "regex-automata" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f804c7828047e88b2d32e2d7fe5a105da8ee3264f01902f796c8e067dc2483f" -dependencies = [ - "aho-corasick", - "memchr", - "regex-syntax", -] - -[[package]] -name = "regex-syntax" -version = "0.8.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f" - [[package]] name = "rgb" -version = "0.8.37" +version = "0.8.50" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05aaa8004b64fd573fc9d002f4e632d51ad4f026c2b5ba95fcb6c2f32c2c47d8" +checksum = "57397d16646700483b67d2dd6511d79318f9d057fdbd21a4066aeac8b41d310a" dependencies = [ "bytemuck", ] @@ -720,30 +566,17 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" -[[package]] -name = "rustix" -version = "0.38.28" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72e572a5e8ca657d7366229cdde4bd14c4eb5499a9573d4d366fe1b599daa316" -dependencies = [ - "bitflags 2.4.1", - "errno", - "libc", - "linux-raw-sys", - "windows-sys 0.52.0", -] - [[package]] name = "rustversion" -version = "1.0.14" +version = "1.0.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ffc183a10b4478d04cbbbfc96d0873219d962dd5accaff2ffbd4ceb7df837f4" +checksum = "955d28af4278de8121b7ebeb796b6a45735dc01436d898801014aced2773a3d6" [[package]] name = "ryu" -version = "1.0.16" +version = "1.0.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f98d2aa92eebf49b69786be48e4477826b256916e84a57ff2a4f21923b48eb4c" +checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f" [[package]] name = "scopeguard" @@ -753,48 +586,49 @@ checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" [[package]] name = "serde" -version = "1.0.193" +version = "1.0.209" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25dd9975e68d0cb5aa1120c288333fc98731bd1dd12f561e468ea4728c042b89" +checksum = "99fce0ffe7310761ca6bf9faf5115afbc19688edd00171d81b1bb1b116c63e09" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.193" +version = "1.0.209" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43576ca501357b9b071ac53cdc7da8ef0cbd9493d8df094cd821777ea6e894d3" +checksum = "a5831b979fd7b5439637af1752d535ff49f4860c0f341d1baeb6faf0f4242170" dependencies = [ "proc-macro2", "quote", - "syn 2.0.43", + "syn", ] [[package]] name = "serde_json" -version = "1.0.108" +version = "1.0.127" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d1c7e3eac408d115102c4c24ad393e0821bb3a5df4d506a80f85f7a742a526b" +checksum = "8043c06d9f82bd7271361ed64f415fe5e12a77fdb52e573e7f06a516dea329ad" dependencies = [ "itoa", + "memchr", "ryu", "serde", ] [[package]] name = "smallvec" -version = "1.11.2" +version = "1.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970" +checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" [[package]] name = "stack_collapse" -version = "11.0.1" +version = "12.0.0" dependencies = [ - "analyzeme 11.0.1", + "analyzeme", "clap", - "measureme 11.0.1", + "measureme 12.0.0", ] [[package]] @@ -805,17 +639,17 @@ checksum = "9091b6114800a5f2141aee1d1b9d6ca3592ac062dc5decb3764ec5895a47b4eb" [[package]] name = "strsim" -version = "0.10.0" +version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" +checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f" [[package]] name = "summarize" -version = "11.0.1" +version = "12.0.0" dependencies = [ - "analyzeme 11.0.1", + "analyzeme", "clap", - "measureme 11.0.1", + "measureme 12.0.0", "prettytable-rs", "rustc-hash", "serde", @@ -824,20 +658,9 @@ dependencies = [ [[package]] name = "syn" -version = "1.0.109" +version = "2.0.77" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" -dependencies = [ - "proc-macro2", - "quote", - "unicode-ident", -] - -[[package]] -name = "syn" -version = "2.0.43" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee659fb5f3d355364e1f3e5bc10fb82068efbf824a1e9d1c9504244a6469ad53" +checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed" dependencies = [ "proc-macro2", "quote", @@ -855,39 +678,24 @@ dependencies = [ "winapi", ] -[[package]] -name = "termcolor" -version = "1.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff1bc3d3f05aff0403e8ac0d92ced918ec05b666a43f83297ccef5bea8a3d449" -dependencies = [ - "winapi-util", -] - -[[package]] -name = "textwrap" -version = "0.16.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "222a222a5bfe1bba4a77b45ec488a741b3cb8872e5e499451fd7d0129c9c7c3d" - [[package]] name = "thiserror" -version = "1.0.52" +version = "1.0.63" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "83a48fd946b02c0a526b2e9481c8e2a17755e47039164a86c4070446e3a4614d" +checksum = "c0342370b38b6a11b6cc11d6a805569958d54cfa061a29969c3b5ce2ea405724" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.52" +version = "1.0.63" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7fbe9b594d6568a6a1443250a7e67d80b74e1e96f6d1715e1e21cc1888291d3" +checksum = "a4558b58466b9ad7ca0f102865eccc95938dca1a74a856f2b57b6629050da261" dependencies = [ "proc-macro2", "quote", - "syn 2.0.43", + "syn", ] [[package]] @@ -898,23 +706,21 @@ checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" [[package]] name = "unicode-width" -version = "0.1.11" +version = "0.1.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e51733f11c9c4f72aa0c160008246859e340b00807569a0da0e7a1079b27ba85" +checksum = "0336d538f7abc86d282a4189614dfaa90810dfc2c6f6427eaf88e16311dd225d" + +[[package]] +name = "utf8parse" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821" [[package]] name = "version_check" -version = "0.9.4" +version = "0.9.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" - -[[package]] -name = "version_checker" -version = "11.0.1" -dependencies = [ - "glob", - "regex", -] +checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a" [[package]] name = "wasi" @@ -938,169 +744,101 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" -[[package]] -name = "winapi-util" -version = "0.1.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f29e6f9198ba0d26b4c9f07dbe6f9ed633e1f3d5b8b414090084349e46a52596" -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 0.48.5", -] - [[package]] name = "windows-sys" version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" dependencies = [ - "windows-targets 0.52.0", + "windows-targets", ] [[package]] name = "windows-targets" -version = "0.48.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c" +checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973" dependencies = [ - "windows_aarch64_gnullvm 0.48.5", - "windows_aarch64_msvc 0.48.5", - "windows_i686_gnu 0.48.5", - "windows_i686_msvc 0.48.5", - "windows_x86_64_gnu 0.48.5", - "windows_x86_64_gnullvm 0.48.5", - "windows_x86_64_msvc 0.48.5", -] - -[[package]] -name = "windows-targets" -version = "0.52.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a18201040b24831fbb9e4eb208f8892e1f50a37feb53cc7ff887feb8f50e7cd" -dependencies = [ - "windows_aarch64_gnullvm 0.52.0", - "windows_aarch64_msvc 0.52.0", - "windows_i686_gnu 0.52.0", - "windows_i686_msvc 0.52.0", - "windows_x86_64_gnu 0.52.0", - "windows_x86_64_gnullvm 0.52.0", - "windows_x86_64_msvc 0.52.0", + "windows_aarch64_gnullvm", + "windows_aarch64_msvc", + "windows_i686_gnu", + "windows_i686_gnullvm", + "windows_i686_msvc", + "windows_x86_64_gnu", + "windows_x86_64_gnullvm", + "windows_x86_64_msvc", ] [[package]] name = "windows_aarch64_gnullvm" -version = "0.48.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" - -[[package]] -name = "windows_aarch64_gnullvm" -version = "0.52.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb7764e35d4db8a7921e09562a0304bf2f93e0a51bfccee0bd0bb0b666b015ea" +checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3" [[package]] name = "windows_aarch64_msvc" -version = "0.48.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" - -[[package]] -name = "windows_aarch64_msvc" -version = "0.52.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbaa0368d4f1d2aaefc55b6fcfee13f41544ddf36801e793edbbfd7d7df075ef" +checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469" [[package]] name = "windows_i686_gnu" -version = "0.48.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" +checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b" [[package]] -name = "windows_i686_gnu" -version = "0.52.0" +name = "windows_i686_gnullvm" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a28637cb1fa3560a16915793afb20081aba2c92ee8af57b4d5f28e4b3e7df313" +checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66" [[package]] name = "windows_i686_msvc" -version = "0.48.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" - -[[package]] -name = "windows_i686_msvc" -version = "0.52.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffe5e8e31046ce6230cc7215707b816e339ff4d4d67c65dffa206fd0f7aa7b9a" +checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66" [[package]] name = "windows_x86_64_gnu" -version = "0.48.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" - -[[package]] -name = "windows_x86_64_gnu" -version = "0.52.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d6fa32db2bc4a2f5abeacf2b69f7992cd09dca97498da74a151a3132c26befd" +checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78" [[package]] name = "windows_x86_64_gnullvm" -version = "0.48.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" - -[[package]] -name = "windows_x86_64_gnullvm" -version = "0.52.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a657e1e9d3f514745a572a6846d3c7aa7dbe1658c056ed9c3344c4109a6949e" +checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d" [[package]] name = "windows_x86_64_msvc" -version = "0.48.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" - -[[package]] -name = "windows_x86_64_msvc" -version = "0.52.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dff9641d1cd4be8d1a070daf9e3773c5f67e78b4d9d42263020c057706765c04" +checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" [[package]] name = "zerocopy" -version = "0.7.32" +version = "0.7.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "74d4d3961e53fa4c9a25a8637fc2bfaf2595b3d3ae34875568a5cf64787716be" +checksum = "1b9b4fd18abc82b8136838da5d50bae7bdea537c574d8dc1a34ed098d6c166f0" dependencies = [ "zerocopy-derive", ] [[package]] name = "zerocopy-derive" -version = "0.7.32" +version = "0.7.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ce1b18ccd8e73a9321186f97e46f9f04b778851177567b1975109d26a08d2a6" +checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.43", -] + "syn", +] \ No newline at end of file diff --git a/pkgs/development/tools/rust/measureme/default.nix b/pkgs/development/tools/rust/measureme/default.nix index 0c97a189478d..235a848b49aa 100644 --- a/pkgs/development/tools/rust/measureme/default.nix +++ b/pkgs/development/tools/rust/measureme/default.nix @@ -2,22 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "measureme"; - version = "11.0.1"; + version = "12.0.0"; src = fetchFromGitHub { owner = "rust-lang"; repo = "measureme"; rev = version; - hash = "sha256-p8XSe/LyHrEHEuxe1uK0Iy1YoJFw/jWtFvTDMhJMmnM="; + hash = "sha256-Zgl8iyBDVwqZnbfqC06DMuo0S/hV6pl812hkiovmS+I="; }; - cargoLock = { - lockFile = ./Cargo.lock; - outputHashes = { - "analyzeme-9.2.0" = "sha256-YOZiux4ouWBToGFx0+fiqjcyrnSjwc+8Qfi2rLGT/18="; - "decodeme-10.1.2" = "sha256-20PJnBS6TCnltRuCiYkHKJcivKGDDQUrBc70hAX89bc="; - }; - }; + cargoLock.lockFile = ./Cargo.lock; postPatch = '' ln -s ${./Cargo.lock} Cargo.lock From e416cfd21c8682b45769d5e3eb362b191f4d1a48 Mon Sep 17 00:00:00 2001 From: t4ccer Date: Mon, 2 Sep 2024 22:20:22 -0600 Subject: [PATCH 137/235] measureme: move to by-name, format --- .../tools/rust => by-name/me}/measureme/Cargo.lock | 2 +- .../default.nix => by-name/me/measureme/package.nix} | 6 +++++- pkgs/top-level/all-packages.nix | 2 -- 3 files changed, 6 insertions(+), 4 deletions(-) rename pkgs/{development/tools/rust => by-name/me}/measureme/Cargo.lock (99%) rename pkgs/{development/tools/rust/measureme/default.nix => by-name/me/measureme/package.nix} (92%) diff --git a/pkgs/development/tools/rust/measureme/Cargo.lock b/pkgs/by-name/me/measureme/Cargo.lock similarity index 99% rename from pkgs/development/tools/rust/measureme/Cargo.lock rename to pkgs/by-name/me/measureme/Cargo.lock index 32fe7bd98e9b..4a0bc5493ceb 100644 --- a/pkgs/development/tools/rust/measureme/Cargo.lock +++ b/pkgs/by-name/me/measureme/Cargo.lock @@ -841,4 +841,4 @@ dependencies = [ "proc-macro2", "quote", "syn", -] \ No newline at end of file +] diff --git a/pkgs/development/tools/rust/measureme/default.nix b/pkgs/by-name/me/measureme/package.nix similarity index 92% rename from pkgs/development/tools/rust/measureme/default.nix rename to pkgs/by-name/me/measureme/package.nix index 235a848b49aa..4a0e426d3f6f 100644 --- a/pkgs/development/tools/rust/measureme/default.nix +++ b/pkgs/by-name/me/measureme/package.nix @@ -1,4 +1,8 @@ -{ lib, fetchFromGitHub, rustPlatform }: +{ + lib, + fetchFromGitHub, + rustPlatform, +}: rustPlatform.buildRustPackage rec { pname = "measureme"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1352af0af5c4..760df714b451 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5629,8 +5629,6 @@ with pkgs; maxcso = callPackage ../tools/archivers/maxcso { }; - measureme = callPackage ../development/tools/rust/measureme { }; - medusa = callPackage ../tools/security/medusa { }; megasync = libsForQt5.callPackage ../applications/misc/megasync { From 89b5b6fd0a7ac7d13ad7bf325a93e064a956e287 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 3 Sep 2024 07:22:35 +0200 Subject: [PATCH 138/235] checkov: 3.2.241 -> 3.2.242 Diff: https://github.com/bridgecrewio/checkov/compare/refs/tags/3.2.241...3.2.242 Changelog: https://github.com/bridgecrewio/checkov/releases/tag/3.2.242 --- pkgs/development/tools/analysis/checkov/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/analysis/checkov/default.nix b/pkgs/development/tools/analysis/checkov/default.nix index 0080b2c023c3..a5ab66b913af 100644 --- a/pkgs/development/tools/analysis/checkov/default.nix +++ b/pkgs/development/tools/analysis/checkov/default.nix @@ -6,14 +6,14 @@ python3.pkgs.buildPythonApplication rec { pname = "checkov"; - version = "3.2.241"; + version = "3.2.242"; pyproject = true; src = fetchFromGitHub { owner = "bridgecrewio"; repo = "checkov"; rev = "refs/tags/${version}"; - hash = "sha256-h6Qwpi5wH+kGms2aRgzpshevsY1ry4DPMRD+N56nZbU="; + hash = "sha256-nXbAox/yvj1HS9+/PzGZfCxvYr+h1aqvJZKH7+8Jm44="; }; patches = [ ./flake8-compat-5.x.patch ]; From 4aaa783d407cf464fb3f2d0c79ae54e5641d3303 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 3 Sep 2024 07:25:04 +0200 Subject: [PATCH 139/235] nuclei-templates: 9.9.3 -> 9.9.4 Diff: https://github.com/projectdiscovery/nuclei-templates/compare/refs/tags/v9.9.3...v9.9.4 Changelog: https://github.com/projectdiscovery/nuclei-templates/releases/tag/v9.9.4 --- pkgs/by-name/nu/nuclei-templates/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/nu/nuclei-templates/package.nix b/pkgs/by-name/nu/nuclei-templates/package.nix index a1d1ffbb412b..a10cdd46fe54 100644 --- a/pkgs/by-name/nu/nuclei-templates/package.nix +++ b/pkgs/by-name/nu/nuclei-templates/package.nix @@ -6,13 +6,13 @@ stdenvNoCC.mkDerivation rec { pname = "nuclei-templates"; - version = "9.9.3"; + version = "9.9.4"; src = fetchFromGitHub { owner = "projectdiscovery"; repo = "nuclei-templates"; rev = "refs/tags/v${version}"; - hash = "sha256-Iw2TbDQWRy3W7eaybtGG3C+RaciKfjWpYblrCPa8SCE="; + hash = "sha256-1o9FvE8wuvswTXbVncTr77p7oWg0c2bVQQZvOxsgxFw="; }; installPhase = '' From 65112738278e1c5f520ca39bc5d3875904d267eb Mon Sep 17 00:00:00 2001 From: Paul Meyer <49727155+katexochen@users.noreply.github.com> Date: Tue, 3 Sep 2024 08:07:48 +0200 Subject: [PATCH 140/235] python312Packages.azure-mgmt-compute: 31.0.0 -> 33.0.0 Signed-off-by: Paul Meyer <49727155+katexochen@users.noreply.github.com> --- .../development/python-modules/azure-mgmt-compute/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/azure-mgmt-compute/default.nix b/pkgs/development/python-modules/azure-mgmt-compute/default.nix index 27ec12780e71..d41e95e2e42e 100644 --- a/pkgs/development/python-modules/azure-mgmt-compute/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-compute/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "azure-mgmt-compute"; - version = "31.0.0"; + version = "33.0.0"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-WlscT8GhnssCKhLe0b6LGxVfaXnQP7nvwEZC9gZkS78="; + hash = "sha256-o8wP5PCcjh01I8G/uSYg3+JjoKiTsKwToz1wV+nd3dI="; }; build-system = [ setuptools ]; From 96658585973d33340bcc5a93f6b8c78ce5efd3e3 Mon Sep 17 00:00:00 2001 From: Paul Meyer <49727155+katexochen@users.noreply.github.com> Date: Tue, 3 Sep 2024 08:08:21 +0200 Subject: [PATCH 141/235] python312Packages.azure-multiapi-storage: 1.2.0 -> 1.3.0 Signed-off-by: Paul Meyer <49727155+katexochen@users.noreply.github.com> --- .../python-modules/azure-multiapi-storage/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/azure-multiapi-storage/default.nix b/pkgs/development/python-modules/azure-multiapi-storage/default.nix index 994394d3aec4..1a8a6b49031b 100644 --- a/pkgs/development/python-modules/azure-multiapi-storage/default.nix +++ b/pkgs/development/python-modules/azure-multiapi-storage/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "azure-multiapi-storage"; - version = "1.2.0"; + version = "1.3.0"; pyproject = true; disabled = pythonOlder "3.9"; src = fetchPypi { inherit pname version; - hash = "sha256-CQuoWHeh0EMitTRsvifotrTwpWd/Q9LWWD7jZ2w9r8I="; + hash = "sha256-tlKogIs39tIoMVl3p/YConfPdPrpX9oc9WqQ+FuhgQk="; }; build-system = [ setuptools ]; From 5617035557363d09b4bd4b4404560b788d989ede Mon Sep 17 00:00:00 2001 From: Paul Meyer <49727155+katexochen@users.noreply.github.com> Date: Tue, 3 Sep 2024 08:08:59 +0200 Subject: [PATCH 142/235] azure-cli: 2.63.0 -> 2.64.0 Signed-off-by: Paul Meyer <49727155+katexochen@users.noreply.github.com> --- pkgs/by-name/az/azure-cli/package.nix | 4 ++-- pkgs/by-name/az/azure-cli/python-packages.nix | 5 +++++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/az/azure-cli/package.nix b/pkgs/by-name/az/azure-cli/package.nix index 6af667f57673..2a73b3da9fac 100644 --- a/pkgs/by-name/az/azure-cli/package.nix +++ b/pkgs/by-name/az/azure-cli/package.nix @@ -21,14 +21,14 @@ }: let - version = "2.63.0"; + version = "2.64.0"; src = fetchFromGitHub { name = "azure-cli-${version}-src"; owner = "Azure"; repo = "azure-cli"; rev = "azure-cli-${version}"; - hash = "sha256-HpWdEZAMnAkB07fnE7IrA0FqpBYKChqojxwAo8RfuQs="; + hash = "sha256-1FnrUvRpAkZ0nAxen3seam2S49tBkK5N37ZD99OkvB0="; }; # put packages that needs to be overridden in the py package scope diff --git a/pkgs/by-name/az/azure-cli/python-packages.nix b/pkgs/by-name/az/azure-cli/python-packages.nix index 12281851ee53..97e2d0b1922a 100644 --- a/pkgs/by-name/az/azure-cli/python-packages.nix +++ b/pkgs/by-name/az/azure-cli/python-packages.nix @@ -139,6 +139,11 @@ let overrideAzureMgmtPackage super.azure-mgmt-eventgrid "10.2.0b2" "zip" "sha256-QcHY1wCwQyVOEdUi06/wEa4dqJH5Ccd33gJ1Sju0qZA="; + # ValueError: The operation 'azure.mgmt.hdinsight.operations#ExtensionsOperations.get_azure_monitor_agent_status' is invalid. + azure-mgmt-hdinsight = + overrideAzureMgmtPackage super.azure-mgmt-hdinsight "9.0.0b3" "tar.gz" + "sha256-clSeCP8+7T1uI4Nec+zhzDK980C9+JGeeJFsNSwgD2Q="; + # ValueError: The operation 'azure.mgmt.kusto.operations#ClustersOperations.delete' is invalid. azure-mgmt-kusto = (overrideAzureMgmtPackage super.azure-mgmt-kusto "0.3.0" "zip" From 68d645484e5f0db7d12fc541e01f3bd02b72f84e Mon Sep 17 00:00:00 2001 From: Paul Meyer <49727155+katexochen@users.noreply.github.com> Date: Tue, 3 Sep 2024 08:11:02 +0200 Subject: [PATCH 143/235] azure-cli-extensions.k8s-runtime: init at 1.0.3 Signed-off-by: Paul Meyer <49727155+katexochen@users.noreply.github.com> --- pkgs/by-name/az/azure-cli/extensions-generated.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/by-name/az/azure-cli/extensions-generated.nix b/pkgs/by-name/az/azure-cli/extensions-generated.nix index a4a37cb65ebc..4a19f1bcc837 100644 --- a/pkgs/by-name/az/azure-cli/extensions-generated.nix +++ b/pkgs/by-name/az/azure-cli/extensions-generated.nix @@ -596,6 +596,13 @@ sha256 = "41861d65b9d86e0b622986a4984ce7a611f87b92da578db8c0527ec74334f32c"; description = "Microsoft Azure Command-Line Tools K8s-extension Extension"; }; + k8s-runtime = mkAzExtension rec { + pname = "k8s-runtime"; + version = "1.0.3"; + url = "https://azcliprod.blob.core.windows.net/cli-extensions/k8s_runtime-${version}-py3-none-any.whl"; + sha256 = "133dd153979c74d37aa25956ed8a9aa741c334929848cd67c26f268332759d40"; + description = "Microsoft Azure Command-Line Tools K8sRuntime Extension"; + }; kusto = mkAzExtension rec { pname = "kusto"; version = "0.5.0"; From 77ce373baefa53cc0ff3188bd01680694896ac20 Mon Sep 17 00:00:00 2001 From: Paul Meyer <49727155+katexochen@users.noreply.github.com> Date: Tue, 3 Sep 2024 08:11:07 +0200 Subject: [PATCH 144/235] azure-cli-extensions.aks-preview: 7.0.0b6 -> 8.0.0b1 Signed-off-by: Paul Meyer <49727155+katexochen@users.noreply.github.com> --- pkgs/by-name/az/azure-cli/extensions-generated.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/az/azure-cli/extensions-generated.nix b/pkgs/by-name/az/azure-cli/extensions-generated.nix index 4a19f1bcc837..a1bb93b42ae2 100644 --- a/pkgs/by-name/az/azure-cli/extensions-generated.nix +++ b/pkgs/by-name/az/azure-cli/extensions-generated.nix @@ -59,9 +59,9 @@ }; aks-preview = mkAzExtension rec { pname = "aks-preview"; - version = "7.0.0b6"; + version = "8.0.0b1"; url = "https://azcliprod.blob.core.windows.net/cli-extensions/aks_preview-${version}-py2.py3-none-any.whl"; - sha256 = "268457ea6463d03775caa822b4b7a70749c503b47cb2aa9c898e1186cfb423f6"; + sha256 = "500a670e0f4cd8ef9399a0928fbcef6440a68cdc2978c62db911d1585f351b75"; description = "Provides a preview for upcoming AKS features"; }; akshybrid = mkAzExtension rec { From 3dad0ddf622b10c70e1cbf26521cfd66f7e807c2 Mon Sep 17 00:00:00 2001 From: Paul Meyer <49727155+katexochen@users.noreply.github.com> Date: Tue, 3 Sep 2024 08:11:07 +0200 Subject: [PATCH 145/235] azure-cli-extensions.amg: 2.1.0 -> 2.2.0 Signed-off-by: Paul Meyer <49727155+katexochen@users.noreply.github.com> --- pkgs/by-name/az/azure-cli/extensions-generated.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/az/azure-cli/extensions-generated.nix b/pkgs/by-name/az/azure-cli/extensions-generated.nix index a1bb93b42ae2..aed7a72d02ce 100644 --- a/pkgs/by-name/az/azure-cli/extensions-generated.nix +++ b/pkgs/by-name/az/azure-cli/extensions-generated.nix @@ -87,9 +87,9 @@ }; amg = mkAzExtension rec { pname = "amg"; - version = "2.1.0"; + version = "2.2.0"; url = "https://azcliprod.blob.core.windows.net/cli-extensions/amg-${version}-py3-none-any.whl"; - sha256 = "b28952d967b9a1e0d81dac280bdff23b44fdbb06dedd66cdf99477bdd7541d6c"; + sha256 = "8d832463a35329e61840bce5fe2c3ba214f8e800cc38140fe58dc2bf13ffeb90"; description = "Microsoft Azure Command-Line Tools Azure Managed Grafana Extension"; }; amlfs = mkAzExtension rec { From 3ad1a60a2e43eab16736335ec1242306cbd7798e Mon Sep 17 00:00:00 2001 From: Paul Meyer <49727155+katexochen@users.noreply.github.com> Date: Tue, 3 Sep 2024 08:11:07 +0200 Subject: [PATCH 146/235] azure-cli-extensions.azurelargeinstance: 1.0.0b2 -> 1.0.0b3 Signed-off-by: Paul Meyer <49727155+katexochen@users.noreply.github.com> --- pkgs/by-name/az/azure-cli/extensions-generated.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/az/azure-cli/extensions-generated.nix b/pkgs/by-name/az/azure-cli/extensions-generated.nix index aed7a72d02ce..e22e7c34a3b1 100644 --- a/pkgs/by-name/az/azure-cli/extensions-generated.nix +++ b/pkgs/by-name/az/azure-cli/extensions-generated.nix @@ -150,9 +150,9 @@ }; azurelargeinstance = mkAzExtension rec { pname = "azurelargeinstance"; - version = "1.0.0b2"; + version = "1.0.0b3"; url = "https://azcliprod.blob.core.windows.net/cli-extensions/azurelargeinstance-${version}-py3-none-any.whl"; - sha256 = "6948ac3306269ea6c8ff6d32d5673989dfd4dfa0a4e4c5d6d3991b364d5dc628"; + sha256 = "093a2fa900e3df53f8bf15b335156058333efe0eff9584a11db4bac0bccc7b1d"; description = "Microsoft Azure Command-Line Tools Azurelargeinstance Extension"; }; azurestackhci = mkAzExtension rec { From 1359ba23dfa1690009f436db853382cf830addb5 Mon Sep 17 00:00:00 2001 From: Paul Meyer <49727155+katexochen@users.noreply.github.com> Date: Tue, 3 Sep 2024 08:11:08 +0200 Subject: [PATCH 147/235] azure-cli-extensions.baremetal-infrastructure: 2.0.1 -> 3.0.0b1 Signed-off-by: Paul Meyer <49727155+katexochen@users.noreply.github.com> --- pkgs/by-name/az/azure-cli/extensions-generated.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/az/azure-cli/extensions-generated.nix b/pkgs/by-name/az/azure-cli/extensions-generated.nix index e22e7c34a3b1..9f80146842de 100644 --- a/pkgs/by-name/az/azure-cli/extensions-generated.nix +++ b/pkgs/by-name/az/azure-cli/extensions-generated.nix @@ -164,10 +164,10 @@ }; baremetal-infrastructure = mkAzExtension rec { pname = "baremetal-infrastructure"; - version = "2.0.1"; - url = "https://github.com/Azure/azure-baremetalinfrastructure-cli-extension/releases/download/${version}/baremetal_infrastructure-2.0.1-py2.py3-none-any.whl"; - sha256 = "ea127d64603c8a45774cdf9aa80c4c8b5839a42719971b296beb96105fe5ef2d"; - description = "Additional commands for working with BareMetal instances"; + version = "3.0.0b1"; + url = "https://azcliprod.blob.core.windows.net/cli-extensions/baremetal_infrastructure-${version}-py3-none-any.whl"; + sha256 = "83ff3e4540f522a5f3578a923155715160e90a15a8d919a2e5569c08f1295a2f"; + description = "Microsoft Azure Command-Line Tools BaremetalInfrastructure Extension"; }; bastion = mkAzExtension rec { pname = "bastion"; From 2b552aa797432bf5d3390780fe9e5c6522db4dd3 Mon Sep 17 00:00:00 2001 From: Paul Meyer <49727155+katexochen@users.noreply.github.com> Date: Tue, 3 Sep 2024 08:15:39 +0200 Subject: [PATCH 148/235] azure-cli-extensions.containerapp: 0.3.53 -> 1.0.0b1 Signed-off-by: Paul Meyer <49727155+katexochen@users.noreply.github.com> --- pkgs/by-name/az/azure-cli/extensions-manual.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/az/azure-cli/extensions-manual.nix b/pkgs/by-name/az/azure-cli/extensions-manual.nix index 1b6bd5effd66..849a9cdb0b64 100644 --- a/pkgs/by-name/az/azure-cli/extensions-manual.nix +++ b/pkgs/by-name/az/azure-cli/extensions-manual.nix @@ -32,9 +32,9 @@ containerapp = mkAzExtension rec { pname = "containerapp"; - version = "0.3.53"; + version = "1.0.0b1"; url = "https://azcliprod.blob.core.windows.net/cli-extensions/containerapp-${version}-py2.py3-none-any.whl"; - sha256 = "f9b4f3928469efcc1bfbc98cd906d9d92e72617e5c21cf3ade8b37651607c3e1"; + sha256 = "d80b83b0e22770925c24bca150c84182376b7b0aff9b6f28498d769dc8618b45"; description = "Microsoft Azure Command-Line Tools Containerapp Extension"; propagatedBuildInputs = with python3Packages; [ docker From d9560a2f52ed4266eeec15da560f3ed716298033 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Tue, 3 Sep 2024 09:04:36 +0200 Subject: [PATCH 149/235] python312Packages.orange-canvas-core: 0.2.1 -> 0.2.2 Diff: https://github.com/biolab/orange-canvas-core/compare/0.2.1...0.2.2 Changelog: https://github.com/biolab/orange-canvas-core/releases/tag/0.2.2 --- .../orange-canvas-core/default.nix | 50 +++++++++++++++---- 1 file changed, 40 insertions(+), 10 deletions(-) diff --git a/pkgs/development/python-modules/orange-canvas-core/default.nix b/pkgs/development/python-modules/orange-canvas-core/default.nix index 7aaef933a66c..260be1e38626 100644 --- a/pkgs/development/python-modules/orange-canvas-core/default.nix +++ b/pkgs/development/python-modules/orange-canvas-core/default.nix @@ -1,7 +1,12 @@ { lib, buildPythonPackage, - fetchPypi, + fetchFromGitHub, + + # build-system + setuptools, + + # dependencies anyqt, cachecontrol, commonmark, @@ -10,24 +15,32 @@ filelock, lockfile, numpy, + pip, + qasync, + requests-cache, + typing-extensions, + + # tests + qt5, pytest-qt, pytestCheckHook, - qasync, - qt5, - requests-cache, }: buildPythonPackage rec { pname = "orange-canvas-core"; - version = "0.2.1"; - format = "setuptools"; + version = "0.2.2"; + pyproject = true; - src = fetchPypi { - inherit pname version; - hash = "sha256-f0E/7jnzoIrV4V1KSbec0MZB/BLz0UVbBCsc3v4dp0o="; + src = fetchFromGitHub { + owner = "biolab"; + repo = "orange-canvas-core"; + rev = "refs/tags/${version}"; + hash = "sha256-Jp3vCQmRdkFADStVkbCFPiCBqpbI0a4JiJ8qs60rpqw="; }; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ anyqt cachecontrol commonmark @@ -36,8 +49,10 @@ buildPythonPackage rec { filelock lockfile numpy + pip qasync requests-cache + typing-extensions ]; pythonImportsCheck = [ "orangecanvas" ]; @@ -54,11 +69,26 @@ buildPythonPackage rec { pytestCheckHook ]; + disabledTests = [ + # Failed: CALL ERROR: Exceptions caught in Qt event loop + "test_create_new_window" + "test_dont_load_swp_on_new_window" + "test_editlinksnode" + "test_flattened" + "test_links_edit" + "test_links_edit_widget" + "test_new_window" + "test_toolbox" + "test_tooltree_registry" + "test_widgettoolgrid" + ]; + disabledTestPaths = [ "orangecanvas/canvas/items/tests/test_graphicstextitem.py" ]; meta = { description = "Orange framework for building graphical user interfaces for editing workflows"; homepage = "https://github.com/biolab/orange-canvas-core"; + changelog = "https://github.com/biolab/orange-canvas-core/releases/tag/${version}"; license = [ lib.licenses.gpl3 ]; maintainers = [ lib.maintainers.lucasew ]; }; From ba1010aa4575df01194172ddfe91e47f5c560b77 Mon Sep 17 00:00:00 2001 From: Paul Meyer <49727155+katexochen@users.noreply.github.com> Date: Tue, 3 Sep 2024 09:50:58 +0200 Subject: [PATCH 150/235] mkosi: drop katexochen as maintainer Signed-off-by: Paul Meyer <49727155+katexochen@users.noreply.github.com> --- pkgs/tools/virtualization/mkosi/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/virtualization/mkosi/default.nix b/pkgs/tools/virtualization/mkosi/default.nix index 4514280f7757..a9262ff056be 100644 --- a/pkgs/tools/virtualization/mkosi/default.nix +++ b/pkgs/tools/virtualization/mkosi/default.nix @@ -117,7 +117,7 @@ buildPythonApplication rec { changelog = "https://github.com/systemd/mkosi/releases/tag/v${version}"; license = licenses.lgpl21Only; mainProgram = "mkosi"; - maintainers = with maintainers; [ malt3 katexochen ]; + maintainers = with maintainers; [ malt3 ]; platforms = platforms.linux; # `mkosi qemu` boot fails in the uefi shell, image isn't found. broken = withQemu; From b8c7d88784d3fa48d8699dc6bc8af61208aae06b Mon Sep 17 00:00:00 2001 From: Benno Bielmeier Date: Mon, 2 Sep 2024 08:40:31 +0200 Subject: [PATCH 151/235] nixos/services.thinkfan: fix undefined variables In d9dc50dc1193ad14f8534611f7280fac4a3543d0 the usage of `with lib;` has been removed from thinkfan.nix. Unfortunately, adjusting the check line and its usage of the functions all,id,zipListsWith has not been updated resulting in evaluation errors complaining about "undefined variable". Update: partly covered in 0646a0771b031c3f54d1718e6e30cc6ed8f19430 of #339084 rel: #208242 --- nixos/modules/services/hardware/thinkfan.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/hardware/thinkfan.nix b/nixos/modules/services/hardware/thinkfan.nix index 1cc5ef390aab..9733fbe5aa15 100644 --- a/nixos/modules/services/hardware/thinkfan.nix +++ b/nixos/modules/services/hardware/thinkfan.nix @@ -12,7 +12,7 @@ let tuple = ts: lib.mkOptionType { name = "tuple"; merge = lib.mergeOneOption; - check = xs: lib.all lib.id (zipListsWith (t: x: t.check x) ts xs); + check = xs: lib.all lib.id (lib.zipListsWith (t: x: t.check x) ts xs); description = "tuple of" + lib.concatMapStrings (t: " (${t.description})") ts; }; level = ints.unsigned; From 9fcdfda3365e402077425075f425a63d15f159ec Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 3 Sep 2024 08:44:30 +0000 Subject: [PATCH 152/235] codeium: 1.14.11 -> 1.14.15 --- pkgs/by-name/co/codeium/package.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/co/codeium/package.nix b/pkgs/by-name/co/codeium/package.nix index 15b5c98bd085..19aeb59c7ad1 100644 --- a/pkgs/by-name/co/codeium/package.nix +++ b/pkgs/by-name/co/codeium/package.nix @@ -13,10 +13,10 @@ let }.${system} or throwSystem; hash = { - x86_64-linux = "sha256-MQYUSUbQ0YjJjURpX/fguUbXJdcs16z/eYHXUzzMQ14="; - aarch64-linux = "sha256-SQoxk70ZTBsK+KKaCF2M/5de7+L2Ycgryr4yZEfK6N8="; - x86_64-darwin = "sha256-Tl70grYgR/yF1giGOdzvsii2GQ2/pGdUT+TAMslixzw="; - aarch64-darwin = "sha256-VJwfskMUMpGk3n52KMvBa01EKUcZsvsd0yt7nGon6yw="; + x86_64-linux = "sha256-BPlegORfDeGBMexdkh+5clfxNqQ5FRawW8BJuzwowg0="; + aarch64-linux = "sha256-UPDA2wlf4K05JpeghHB+yeBFyMCXbZTDGrxFVyA1mlI="; + x86_64-darwin = "sha256-fVqHPfGJBMdEJn6EOh4eRVmPXhmoMskjdlmSls7sm/E="; + aarch64-darwin = "sha256-kIZYFgXj5vpZ1MwZqu1X4i/OZjfZMpvkceHzed8ZKP8="; }.${system} or throwSystem; bin = "$out/bin/codeium_language_server"; @@ -24,7 +24,7 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "codeium"; - version = "1.14.11"; + version = "1.14.15"; src = fetchurl { name = "${finalAttrs.pname}-${finalAttrs.version}.gz"; url = "https://github.com/Exafunction/codeium/releases/download/language-server-v${finalAttrs.version}/language_server_${plat}.gz"; From f5901c9e8b9884a5503d56d7845fad4370f044c4 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 3 Sep 2024 09:15:45 +0000 Subject: [PATCH 153/235] uxn: 1.0-unstable-2024-08-25 -> 1.0-unstable-2024-08-29 --- pkgs/by-name/ux/uxn/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ux/uxn/package.nix b/pkgs/by-name/ux/uxn/package.nix index a8fa5eb51aed..7cdb9de51d9e 100644 --- a/pkgs/by-name/ux/uxn/package.nix +++ b/pkgs/by-name/ux/uxn/package.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "uxn"; - version = "1.0-unstable-2024-08-25"; + version = "1.0-unstable-2024-08-29"; src = fetchFromSourcehut { owner = "~rabbits"; repo = "uxn"; - rev = "6d5e3848bdbd76420b93ca47de148cbf46baf9f6"; - hash = "sha256-YTDL3NZSjbVqu6aPJBmUmsT3bDX2VUeufXq/Q+jn4Og="; + rev = "ea4aaca2a6e5bc1623bbd2bd892a6eff31439fcc"; + hash = "sha256-1LA9IwnWcnr5fS1VP2wLWk6zNxNzJQ1VqAw5BsHz7tA="; }; outputs = [ "out" "projects" ]; From 52f210ec74e23f79e587f61c13ad7f23df7d9f6f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 3 Sep 2024 09:26:19 +0000 Subject: [PATCH 154/235] pyspread: 2.2.3 -> 2.3 --- pkgs/by-name/py/pyspread/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/py/pyspread/package.nix b/pkgs/by-name/py/pyspread/package.nix index fd1206a9fd05..cba36667a239 100644 --- a/pkgs/by-name/py/pyspread/package.nix +++ b/pkgs/by-name/py/pyspread/package.nix @@ -9,10 +9,10 @@ let # get rid of rec pname = "pyspread"; - version = "2.2.3"; + version = "2.3"; src = fetchPypi { inherit pname version; - hash = "sha256-oNMDDXpl6Y0N7j+qgboSTJA9SR5KzKxhoMh/44ngjdA="; + hash = "sha256-vbDZo/kYtnxmOd3JSEG9+0yD0nfM/BGcAySfBD2xogw="; }; inherit (libsForQt5) qtsvg From d37b21abc312a4375fd3941c5a0b176c37ece61f Mon Sep 17 00:00:00 2001 From: Michael Adler Date: Tue, 3 Sep 2024 11:29:14 +0200 Subject: [PATCH 155/235] citrix_workspace: remove myself from maintainer's list I have no way to test this anymore (and luckily, I don't have to use it anymore). --- .../applications/networking/remote/citrix-workspace/generic.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/networking/remote/citrix-workspace/generic.nix b/pkgs/applications/networking/remote/citrix-workspace/generic.nix index 231defdc34c5..18c3da84c3bf 100644 --- a/pkgs/applications/networking/remote/citrix-workspace/generic.nix +++ b/pkgs/applications/networking/remote/citrix-workspace/generic.nix @@ -238,7 +238,7 @@ stdenv.mkDerivation rec { description = "Citrix Workspace"; sourceProvenance = with sourceTypes; [ binaryNativeCode ]; platforms = [ "x86_64-linux" ] ++ optional (versionOlder version "24") "i686-linux"; - maintainers = with maintainers; [ michaeladler ]; + maintainers = [ ]; inherit homepage; }; } From f1bd8d4ac65edc76c2ace1fe5e330fa0a71b305f Mon Sep 17 00:00:00 2001 From: Mauricio Collares Date: Tue, 3 Sep 2024 00:16:51 +0200 Subject: [PATCH 156/235] sageWithDoc: 10.3 -> 10.4 --- .../science/math/sage/default.nix | 1 + .../sphinx-docbuild-subprocesses.patch | 10 +-- .../sage/python-modules/sage-docbuild.nix | 2 + .../science/math/sage/sage-src.nix | 66 +++---------------- .../science/math/sage/sage-tests.nix | 2 + 5 files changed, 19 insertions(+), 62 deletions(-) diff --git a/pkgs/applications/science/math/sage/default.nix b/pkgs/applications/science/math/sage/default.nix index 6df92fcc6beb..95ad7ab12013 100644 --- a/pkgs/applications/science/math/sage/default.nix +++ b/pkgs/applications/science/math/sage/default.nix @@ -97,6 +97,7 @@ let # Running the tests should take something in the order of 1h. sage-tests = callPackage ./sage-tests.nix { inherit sage-with-env; + pytest = python3.pkgs.pytest; }; sage-src = callPackage ./sage-src.nix {}; diff --git a/pkgs/applications/science/math/sage/patches/sphinx-docbuild-subprocesses.patch b/pkgs/applications/science/math/sage/patches/sphinx-docbuild-subprocesses.patch index 2bfac780dfca..fecf2088e504 100644 --- a/pkgs/applications/science/math/sage/patches/sphinx-docbuild-subprocesses.patch +++ b/pkgs/applications/science/math/sage/patches/sphinx-docbuild-subprocesses.patch @@ -1,15 +1,15 @@ diff --git a/src/sage_docbuild/builders.py b/src/sage_docbuild/builders.py -index c5be38600a..e1d15f62d3 100644 +index 871cc4705a2..4b718136b91 100644 --- a/src/sage_docbuild/builders.py +++ b/src/sage_docbuild/builders.py -@@ -105,31 +105,6 @@ def builder_helper(type): +@@ -106,31 +106,6 @@ def builder_helper(type): """ Return a function which builds the documentation for output type ``type``. - - TESTS: - -- Check that :trac:`25161` has been resolved:: +- Check that :issue:`25161` has been resolved:: - - sage: from sage_docbuild.builders import DocBuilder - sage: from sage_docbuild.__main__ import setup_parser @@ -48,10 +48,10 @@ index c5be38600a..e1d15f62d3 100644 if build_options.ABORT_ON_ERROR: raise diff --git a/src/sage_docbuild/sphinxbuild.py b/src/sage_docbuild/sphinxbuild.py -index 07c584de55..b83283a9ee 100644 +index 5621fe9e456..b1b91ce7b2c 100644 --- a/src/sage_docbuild/sphinxbuild.py +++ b/src/sage_docbuild/sphinxbuild.py -@@ -331,3 +331,8 @@ def runsphinx(): +@@ -323,3 +323,8 @@ def runsphinx(): sys.stderr = saved_stderr sys.stdout.flush() sys.stderr.flush() diff --git a/pkgs/applications/science/math/sage/python-modules/sage-docbuild.nix b/pkgs/applications/science/math/sage/python-modules/sage-docbuild.nix index b45998bbcb86..43f67b97a278 100644 --- a/pkgs/applications/science/math/sage/python-modules/sage-docbuild.nix +++ b/pkgs/applications/science/math/sage/python-modules/sage-docbuild.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , sage-src +, furo , jupyter-sphinx , sphinx , sphinx-copybutton @@ -13,6 +14,7 @@ buildPythonPackage rec { src = sage-src; propagatedBuildInputs = [ + furo jupyter-sphinx sphinx sphinx-copybutton diff --git a/pkgs/applications/science/math/sage/sage-src.nix b/pkgs/applications/science/math/sage/sage-src.nix index 26be24bb610f..b8d9e3e903a6 100644 --- a/pkgs/applications/science/math/sage/sage-src.nix +++ b/pkgs/applications/science/math/sage/sage-src.nix @@ -11,14 +11,14 @@ # all get the same sources with the same patches applied. stdenv.mkDerivation rec { - version = "10.3"; + version = "10.4"; pname = "sage-src"; src = fetchFromGitHub { owner = "sagemath"; repo = "sage"; rev = version; - hash = "sha256-OHtMv8t0RrP6R8XIREU+C1vpazeQLWa75wx9Mv6BN1U="; + hash = "sha256-BDO00ZSm5lnjEuA56VsY/FZyAhoG1hkFxdIlTtBZVBA="; }; # contains essential files (e.g., setup.cfg) generated by the bootstrap script. @@ -26,8 +26,8 @@ stdenv.mkDerivation rec { configure-src = fetchurl { # the hash below is the tagged commit's _parent_. it can also be found by looking for # the "configure" asset at https://github.com/sagemath/sage/releases/tag/${version} - url = "mirror://sageupstream/configure/configure-ab1a517b64b02bf15bbcb8d7c2d4d643bd5eff9b.tar.gz"; - hash = "sha256-pe9AxTM+gFSR4/eVfUzay+4bwjoubbYeDPc+avKjlaw="; + url = "mirror://sageupstream/configure/configure-3c279ec5712e0fa35c5733e03e010970727d7189.tar.gz"; + hash = "sha256-3bRlgIUSIq9tDzvI+ZfEd5LMy1qHXdItEwu1say4cx4="; }; # Patches needed because of particularities of nix or the way this is packaged. @@ -62,23 +62,9 @@ stdenv.mkDerivation rec { # https://github.com/sagemath/sage/issues/34575 ./patches/disable-slow-glpk-test.patch - # https://github.com/sagemath/sage/pull/37489, landed in 10.4.beta1 - (fetchpatch { - name = "quaternionalgebra-random-failure.patch"; - url = "https://github.com/sagemath/sage/commit/1c3f991b9d3c5778e409e5414c6cfcd456113f19.diff"; - hash = "sha256-uCXchYx26DdxTjR1k2748KCEHPnekKS2fAM7SpyhNvM="; - }) - # compile libs/gap/element.pyx with -O1 # a more conservative version of https://github.com/sagemath/sage/pull/37951 ./patches/gap-element-crash.patch - - # https://github.com/sagemath/sage/pull/37886, landed in 10.4.beta7 - (fetchpatch { - name = "remove-xcode.patch"; - url = "https://github.com/sagemath/sage/commit/8e72038b4ab24fb63c06b28f6eb43097b9ab24d6.patch"; - sha256 = "sha256-hufDJFUBa/Trn1xsVNvzb2c1wE9iyhqewj3RMjVtENA="; - }) ]; # Patches needed because of package updates. We could just pin the versions of @@ -88,45 +74,11 @@ stdenv.mkDerivation rec { # should come from or be proposed to upstream. This list will probably never # be empty since dependencies update all the time. packageUpgradePatches = [ - # https://github.com/sagemath/sage/pull/37646, landed in 10.4.beta1 + # https://github.com/sagemath/sage/pull/38500, positively reviewed, to land in 10.5.beta3 (fetchpatch { - name = "cpp-17.patch"; - url = "https://github.com/sagemath/sage/commit/9b0a40d6cd17706db31d5ff8cdd78910409ba1c8.patch"; - sha256 = "sha256-2pJ9eH+o9O76Tsmklc/frzDOFkvPjvs2JQWCSqA+tMs="; - }) - # https://github.com/sagemath/sage/pull/37763, landed in 10.4.beta2 - (fetchpatch { - name = "scipy-fault-tolerance.patch"; - url = "https://github.com/sagemath/sage/commit/551139c09f26a5da96b1187c3f0dd17b8d80ef84.diff"; - hash = "sha256-PR4przrZ3ieHaW2nSY7l7VhNfrUupu9yCIrXpeyoAgg="; - }) - - # https://github.com/sagemath/sage/pull/37492, landed in 10.4.beta5 - (fetchpatch { - name = "singular-4.3.2p14-upgrade.patch"; - url = "https://github.com/sagemath/sage/commit/a0c56816b051e97da44ac0a4e4d4f6915cf7fa0f.diff"; - sha256 = "sha256-WGMmPeBoj2LUC+2qxWuaJL89QUuGt6axGvxWkpM9LYg="; - }) - - # https://github.com/sagemath/sage/pull/37949, landed in 10.4.beta6 - (fetchpatch { - name = "conway-polynomials-new-len.patch"; - url = "https://github.com/sagemath/sage/commit/c9f5b45179e92ea0de1e0dbe0f47464010902851.diff"; - hash = "sha256-DwN2UIX8dxfxjIiqVvMdGbIxJ7CR/Ag2XUmS5vUKFTs="; - }) - - # https://github.com/sagemath/sage/pull/37967, landed in 10.4.beta6 - (fetchpatch { - name = "conway-polynomials-ell-point.patch"; - url = "https://github.com/sagemath/sage/commit/4e0bbaf90262a42f8ea14d5bcfed65f9d1787f54.diff"; - hash = "sha256-9gXydi1A+n7+K8YpH0PB8l/OMexhgO2F5NccU0cK+ls="; - }) - - # https://github.com/sagemath/sage/pull/38100, landed in 10.4.beta8 - (fetchpatch { - name = "sphinx-7.3-update.patch"; - url = "https://github.com/sagemath/sage/commit/e1b22690db42885423be5049246eb71ff52bdfef.diff"; - hash = "sha256-04KAyz8+0pJbRV8Ld0bNX1OoEx/35gIh3Nff+6n8QUU="; + name = "cython-3.0.11-upgrade.patch"; + url = "https://patch-diff.githubusercontent.com/raw/sagemath/sage/pull/38500.diff"; + hash = "sha256-ePfH3Gy1T0UfpoVd3EZowCfy88CbE+yE2MV2itWthsA="; }) ]; @@ -151,7 +103,7 @@ stdenv.mkDerivation rec { installPhase = '' cp -r . "$out" - tar xkzf ${configure-src} -C "$out" + tar xzf ${configure-src} -C "$out" rm "$out/configure" ''; } diff --git a/pkgs/applications/science/math/sage/sage-tests.nix b/pkgs/applications/science/math/sage/sage-tests.nix index 1a415ae65e96..e50754986709 100644 --- a/pkgs/applications/science/math/sage/sage-tests.nix +++ b/pkgs/applications/science/math/sage/sage-tests.nix @@ -1,5 +1,6 @@ { stdenv , lib +, pytest , sage-with-env , makeWrapper , files ? null # "null" means run all tests @@ -30,6 +31,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ makeWrapper ]; buildInputs = [ + pytest sage-with-env ]; From bc9dacde24956f300faaa7a7cecc57ff4ff0cb77 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Tue, 3 Sep 2024 12:25:41 +0200 Subject: [PATCH 157/235] php82Extensions.soap: fix tests Closes #339074 --- pkgs/top-level/php-packages.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix index c4c985ed6dc7..0983b8f078b0 100644 --- a/pkgs/top-level/php-packages.nix +++ b/pkgs/top-level/php-packages.nix @@ -705,6 +705,12 @@ in { url = "https://github.com/php/php-src/commit/4fe821311cafb18ca8bdf20b9d796c48a13ba552.diff?full_index=1"; hash = "sha256-YC3I0BQi3o3+VmRu/UqpqPpaSC+ekPqzbORTHftbPvY="; }) + ] ++ lib.optionals (lib.versions.majorMinor php.version == "8.2") [ + # Fix test 'bug55639.phpt' + (fetchpatch { + url = "https://github.com/php/php-src/commit/1b52ecd78ad1a211a4a9db65975df34d2539125b.patch"; + hash = "sha256-LVk9sfwl5D+rHzyYjfV4pAuhBjSPXj1WjTfnrzBJXhY"; + }) ] ++ lib.optionals (lib.versions.majorMinor php.version == "8.3" && lib.versionOlder php.version "8.3.10") [ (fetchpatch { url = "https://github.com/php/php-src/commit/ecf0bb0fd12132d853969c5e9a212e5f627f2da2.diff?full_index=1"; From 42d4d73b7e6f9112fa709dc3d499e3eff6cf8cab Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Tue, 3 Sep 2024 13:17:21 +0200 Subject: [PATCH 158/235] python312Packages.orange-canvas-core: mark as broken on darwin --- .../development/python-modules/orange-canvas-core/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/python-modules/orange-canvas-core/default.nix b/pkgs/development/python-modules/orange-canvas-core/default.nix index 260be1e38626..523e4f857af2 100644 --- a/pkgs/development/python-modules/orange-canvas-core/default.nix +++ b/pkgs/development/python-modules/orange-canvas-core/default.nix @@ -24,6 +24,8 @@ qt5, pytest-qt, pytestCheckHook, + + stdenv, }: buildPythonPackage rec { @@ -91,5 +93,7 @@ buildPythonPackage rec { changelog = "https://github.com/biolab/orange-canvas-core/releases/tag/${version}"; license = [ lib.licenses.gpl3 ]; maintainers = [ lib.maintainers.lucasew ]; + # Segmentation fault during tests + broken = stdenv.isDarwin; }; } From 837414b563001b3f9c3a5adbfa9d77bb0be895df Mon Sep 17 00:00:00 2001 From: Bruno BELANYI Date: Tue, 3 Sep 2024 11:13:04 +0000 Subject: [PATCH 159/235] python312Packages.ocrmypdf: 16.4.3 -> 16.5.0 Diff: https://github.com/ocrmypdf/OCRmyPDF/compare/v16.4.3...v16.5.0 Changelog: https://github.com/ocrmypdf/OCRmyPDF/blob/v16.5.0/docs/release_notes.rst --- pkgs/development/python-modules/ocrmypdf/default.nix | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/ocrmypdf/default.nix b/pkgs/development/python-modules/ocrmypdf/default.nix index 4c093aa74406..4f9149cc72b6 100644 --- a/pkgs/development/python-modules/ocrmypdf/default.nix +++ b/pkgs/development/python-modules/ocrmypdf/default.nix @@ -4,6 +4,8 @@ deprecation, fetchFromGitHub, ghostscript, + hatch-vcs, + hatchling, hypothesis, img2pdf, jbig2enc, @@ -19,7 +21,6 @@ pythonOlder, rich, reportlab, - setuptools-scm, substituteAll, tesseract, unpaper, @@ -28,7 +29,7 @@ buildPythonPackage rec { pname = "ocrmypdf"; - version = "16.4.3"; + version = "16.5.0"; disabled = pythonOlder "3.10"; @@ -44,7 +45,7 @@ buildPythonPackage rec { postFetch = '' rm "$out/.git_archival.txt" ''; - hash = "sha256-SHinfAWUqrPnHdDDXa1meVfxsyct17b1ak5U91GEc1w="; + hash = "sha256-jqe4BRW0U7gqcf+FtDWjDDvRStAqaEPTuU+B+BrFR5Y="; }; patches = [ @@ -59,7 +60,10 @@ buildPythonPackage rec { }) ]; - build-system = [ setuptools-scm ]; + build-system = [ + hatch-vcs + hatchling + ]; nativeBuildInputs = [ installShellFiles ]; From d2447c306eddb78a3d1bda91355fe365a9a11a55 Mon Sep 17 00:00:00 2001 From: Stig Palmquist Date: Tue, 3 Sep 2024 13:21:39 +0200 Subject: [PATCH 160/235] rakudo: no auto update --- pkgs/development/interpreters/rakudo/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/interpreters/rakudo/default.nix b/pkgs/development/interpreters/rakudo/default.nix index 9381e8a15860..0a1ee9065a0a 100644 --- a/pkgs/development/interpreters/rakudo/default.nix +++ b/pkgs/development/interpreters/rakudo/default.nix @@ -4,6 +4,7 @@ stdenv.mkDerivation rec { pname = "rakudo"; version = "2024.06"; + # nixpkgs-update: no auto update src = fetchFromGitHub { owner = "rakudo"; repo = "rakudo"; From 2cb1c91f1049f698d49a04f330e50ec4ca22e14b Mon Sep 17 00:00:00 2001 From: Stig Palmquist Date: Tue, 3 Sep 2024 13:22:25 +0200 Subject: [PATCH 161/235] moarvm: no auto update --- pkgs/development/interpreters/rakudo/moarvm.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/interpreters/rakudo/moarvm.nix b/pkgs/development/interpreters/rakudo/moarvm.nix index a42c4a49705a..e4b0da036233 100644 --- a/pkgs/development/interpreters/rakudo/moarvm.nix +++ b/pkgs/development/interpreters/rakudo/moarvm.nix @@ -10,6 +10,7 @@ stdenv.mkDerivation rec { pname = "moarvm"; version = "2024.06"; + # nixpkgs-update: no auto update src = fetchFromGitHub { owner = "moarvm"; repo = "moarvm"; From 0cdec497e1ed9a54e3042105e2d41cc8865f56d9 Mon Sep 17 00:00:00 2001 From: Stig Palmquist Date: Tue, 3 Sep 2024 13:22:49 +0200 Subject: [PATCH 162/235] nqp: no auto update --- pkgs/development/interpreters/rakudo/nqp.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/interpreters/rakudo/nqp.nix b/pkgs/development/interpreters/rakudo/nqp.nix index 9ceaba4446ad..499e7cda3e28 100644 --- a/pkgs/development/interpreters/rakudo/nqp.nix +++ b/pkgs/development/interpreters/rakudo/nqp.nix @@ -4,6 +4,7 @@ stdenv.mkDerivation rec { pname = "nqp"; version = "2024.06"; + # nixpkgs-update: no auto update src = fetchFromGitHub { owner = "raku"; repo = "nqp"; From 34e1748391b028788b14a30740309e1739293c77 Mon Sep 17 00:00:00 2001 From: Andrew Marshall Date: Tue, 3 Sep 2024 08:18:28 -0400 Subject: [PATCH 163/235] zfs: fix maybe getting wrong kernel in latestCompatibleLinuxPackages E.g. might have gotten -rt, -xanmod, etc. --- pkgs/os-specific/linux/zfs/generic.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/zfs/generic.nix b/pkgs/os-specific/linux/zfs/generic.nix index b6e0a6d9882e..6710da6d82bf 100644 --- a/pkgs/os-specific/linux/zfs/generic.nix +++ b/pkgs/os-specific/linux/zfs/generic.nix @@ -201,7 +201,7 @@ let inherit enableMail kernelModuleAttribute; latestCompatibleLinuxPackages = lib.pipe linuxKernel.packages [ builtins.attrValues - (builtins.filter (kPkgs: (builtins.tryEval kPkgs).success && kPkgs ? kernel && kPkgs.kernel.passthru.isVanilla && kernelCompatible kPkgs.kernel)) + (builtins.filter (kPkgs: (builtins.tryEval kPkgs).success && kPkgs ? kernel && kPkgs.kernel.passthru.isVanilla && kPkgs.kernel.pname == "linux" && kernelCompatible kPkgs.kernel)) (builtins.sort (a: b: (lib.versionOlder a.kernel.version b.kernel.version))) lib.last ]; From f2e14433d7f07ef9b6e027f5339490bcca6d565d Mon Sep 17 00:00:00 2001 From: aleksana Date: Tue, 3 Sep 2024 20:22:14 +0800 Subject: [PATCH 164/235] mdt: remove (duplicate of md-tui) --- pkgs/by-name/md/mdt/package.nix | 32 -------------------------------- pkgs/top-level/aliases.nix | 1 + 2 files changed, 1 insertion(+), 32 deletions(-) delete mode 100644 pkgs/by-name/md/mdt/package.nix diff --git a/pkgs/by-name/md/mdt/package.nix b/pkgs/by-name/md/mdt/package.nix deleted file mode 100644 index e52abfe6542e..000000000000 --- a/pkgs/by-name/md/mdt/package.nix +++ /dev/null @@ -1,32 +0,0 @@ -{ lib -, fetchFromGitHub -, rustPlatform -, darwin -, stdenv -}: - -rustPlatform.buildRustPackage rec { - pname = "mdt"; - version = "0.8.6"; - - src = fetchFromGitHub { - owner = "henriklovhaug"; - repo = "md-tui"; - rev = "v${version}"; - hash = "sha256-3lNipCYhzqeAAUQZ2ajcOakNDlwSwbUUvP8Dtu6gBsI="; - }; - - cargoHash = "sha256-wY/FV0evsz+SZYTL63gReqsy/jfPE39eISs5N7vc3ZU="; - - buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.CoreServices ]; - - meta = { - description = "Markdown renderer in the terminal"; - homepage = "https://github.com/henriklovhaug/md-tui"; - changelog = "https://github.com/henriklovhaug/md-tui/releases/tag/v${version}"; - license = lib.licenses.agpl3Only; - mainProgram = "mdt"; - maintainers = with lib.maintainers; [ anas ]; - platforms = with lib.platforms; unix ++ windows; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 3ac7e7fcd4f4..d89be65d4e3c 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -963,6 +963,7 @@ mapAliases ({ maui-shell = throw "maui-shell has been removed from nixpkgs, it was broken"; # Added 2024-07-15 mbox = throw "'mbox' has been removed, as it was broken and unmaintained"; # Added 2023-12-21 mcomix3 = mcomix; # Added 2022-06-05 + mdt = md-tui; # Added 2024-09-03 meme = meme-image-generator; # Added 2021-04-21 mess = throw "'mess' has been renamed to/replaced by 'mame'"; # Converted to throw 2023-09-10 microsoft_gsl = microsoft-gsl; # Added 2023-05-26 From 69fdcd4af5efcb10c76be98bb7c9b21583cfd02a Mon Sep 17 00:00:00 2001 From: aleksana Date: Tue, 3 Sep 2024 20:15:30 +0800 Subject: [PATCH 165/235] md-tui: add anas to maintainers --- pkgs/by-name/md/md-tui/package.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/md/md-tui/package.nix b/pkgs/by-name/md/md-tui/package.nix index 743616e8dc61..8c74b4b29580 100644 --- a/pkgs/by-name/md/md-tui/package.nix +++ b/pkgs/by-name/md/md-tui/package.nix @@ -38,7 +38,10 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/henriklovhaug/md-tui"; changelog = "https://github.com/henriklovhaug/md-tui/blob/${src.rev}/CHANGELOG.md"; license = lib.licenses.agpl3Only; - maintainers = with lib.maintainers; [ GaetanLepage ]; + maintainers = with lib.maintainers; [ + GaetanLepage + anas + ]; platforms = lib.platforms.all; mainProgram = "mdt"; }; From edd502ffd9b3593865cb613e65f41859c308ca06 Mon Sep 17 00:00:00 2001 From: Moritz Sanft <58110325+msanft@users.noreply.github.com> Date: Fri, 30 Aug 2024 10:35:53 +0200 Subject: [PATCH 166/235] mkosi: 22 -> 24.3-unstable-2024-08-28 --- ...naries-instead-of-Python-interpreter.patch | 116 ++++++++++++++++++ .../mkosi/0002-Fix-library-resolving.patch | 36 ++++++ .../mkosi/0003-Fix-QEMU-firmware-path.patch | 25 ++++ pkgs/tools/virtualization/mkosi/default.nix | 50 ++++---- 4 files changed, 202 insertions(+), 25 deletions(-) create mode 100644 pkgs/tools/virtualization/mkosi/0001-Use-wrapped-binaries-instead-of-Python-interpreter.patch create mode 100644 pkgs/tools/virtualization/mkosi/0002-Fix-library-resolving.patch create mode 100644 pkgs/tools/virtualization/mkosi/0003-Fix-QEMU-firmware-path.patch diff --git a/pkgs/tools/virtualization/mkosi/0001-Use-wrapped-binaries-instead-of-Python-interpreter.patch b/pkgs/tools/virtualization/mkosi/0001-Use-wrapped-binaries-instead-of-Python-interpreter.patch new file mode 100644 index 000000000000..30a107be5dd0 --- /dev/null +++ b/pkgs/tools/virtualization/mkosi/0001-Use-wrapped-binaries-instead-of-Python-interpreter.patch @@ -0,0 +1,116 @@ +From eb36791f873dd645b1cbfa693b9c246943647190 Mon Sep 17 00:00:00 2001 +From: Moritz Sanft <58110325+msanft@users.noreply.github.com> +Date: Tue, 3 Sep 2024 08:57:26 +0200 +Subject: [PATCH 1/3] Use wrapped binaries instead of Python interpreter + +Rather than calling ukify and mkosi with sys.executable, which doesn't use the Python wrappers for PATH and PYTHONPATH, we call the wrapped binaries directly. + +Signed-off-by: Moritz Sanft <58110325+msanft@users.noreply.github.com> +--- + mkosi/__init__.py | 19 ++++--------------- + mkosi/run.py | 8 ++++---- + 2 files changed, 8 insertions(+), 19 deletions(-) + +diff --git a/mkosi/__init__.py b/mkosi/__init__.py +index cc8482c4..ba44ad31 100644 +--- a/mkosi/__init__.py ++++ b/mkosi/__init__.py +@@ -2059,16 +2059,7 @@ def join_initrds(initrds: Sequence[Path], output: Path) -> Path: + + + def python_binary(config: Config, *, binary: Optional[PathString]) -> PathString: +- tools = ( +- not binary or +- not (path := config.find_binary(binary)) or +- not any(path.is_relative_to(d) for d in config.extra_search_paths) +- ) +- +- # If there's no tools tree, prefer the interpreter from MKOSI_INTERPRETER. If there is a tools +- # tree, just use the default python3 interpreter. +- exe = Path(sys.executable) +- return "python3" if (tools and config.tools_tree) or not exe.is_relative_to("/usr") else exe ++ return "@PYTHON_PEFILE@" + + + def extract_pe_section(context: Context, binary: Path, section: str, output: Path) -> Path: +@@ -2135,11 +2126,10 @@ def build_uki( + if not (arch := context.config.architecture.to_efi()): + die(f"Architecture {context.config.architecture} does not support UEFI") + +- if not (ukify := context.config.find_binary("ukify", "/usr/lib/systemd/ukify")): ++ if not (ukify := context.config.find_binary("ukify", "@UKIFY@")): + die("Could not find ukify") + + cmd: list[PathString] = [ +- python_binary(context.config, binary=ukify), + ukify, + *(["--cmdline", f"@{context.workspace / 'cmdline'}"] if cmdline else []), + "--os-release", f"@{context.root / 'usr/lib/os-release'}", +@@ -2213,7 +2203,6 @@ def build_uki( + # new .ucode section support? + if ( + systemd_tool_version( +- python_binary(context.config, binary=ukify), + ukify, + sandbox=context.sandbox, + ) >= "256" and +@@ -2303,7 +2292,7 @@ def want_uki(context: Context) -> bool: + context.config.unified_kernel_images == ConfigFeature.enabled or ( + context.config.unified_kernel_images == ConfigFeature.auto and + systemd_stub_binary(context).exists() and +- context.config.find_binary("ukify", "/usr/lib/systemd/ukify") is not None ++ context.config.find_binary("ukify", "@UKIFY@") is not None + ) + ) + +@@ -2914,7 +2903,7 @@ def check_ukify( + reason: str, + hint: Optional[str] = None, + ) -> None: +- ukify = check_tool(config, "ukify", "/usr/lib/systemd/ukify", reason=reason, hint=hint) ++ ukify = check_tool(config, "ukify", "@UKIFY@", reason=reason, hint=hint) + + v = systemd_tool_version(python_binary(config, binary=ukify), ukify, sandbox=config.sandbox) + if v < version: +diff --git a/mkosi/run.py b/mkosi/run.py +index fd3bc98e..de47349a 100644 +--- a/mkosi/run.py ++++ b/mkosi/run.py +@@ -450,7 +450,7 @@ def sandbox_cmd( + ) -> Iterator[list[PathString]]: + cmdline: list[PathString] = [ + *setup, +- sys.executable, "-SI", mkosi.sandbox.__file__, ++ @MKOSI_SANDBOX@, + "--proc", "/proc", + # We mounted a subdirectory of TMPDIR to /var/tmp so we unset TMPDIR so that /tmp or /var/tmp are used instead. + "--unsetenv", "TMPDIR", +@@ -563,7 +563,7 @@ def apivfs_options(*, root: Path = Path("/buildroot")) -> list[PathString]: + def apivfs_script_cmd(*, tools: bool, options: Sequence[PathString] = ()) -> list[PathString]: + exe = Path(sys.executable) + return [ +- "python3" if tools or not exe.is_relative_to("/usr") else exe, "-SI", "/sandbox.py", ++ @MKOSI_SANDBOX@, + "--bind", "/", "/", + "--same-dir", + "--bind", "/var/tmp", "/buildroot/var/tmp", +@@ -597,7 +597,7 @@ def chroot_cmd( + options: Sequence[PathString] = (), + ) -> Iterator[list[PathString]]: + cmdline: list[PathString] = [ +- sys.executable, "-SI", mkosi.sandbox.__file__, ++ @MKOSI_SANDBOX@, + "--bind", root, "/", + # We mounted a subdirectory of TMPDIR to /var/tmp so we unset TMPDIR so that /tmp or /var/tmp are used instead. + "--unsetenv", "TMPDIR", +@@ -619,7 +619,7 @@ def chroot_cmd( + def chroot_script_cmd(*, tools: bool, network: bool = False, work: bool = False) -> list[PathString]: + exe = Path(sys.executable) + return [ +- "python3" if tools or not exe.is_relative_to("/usr") else exe, "-SI", "/sandbox.py", ++ @MKOSI_SANDBOX@, + "--bind", "/buildroot", "/", + "--bind", "/var/tmp", "/var/tmp", + *apivfs_options(root=Path("/")), +-- +2.45.2 diff --git a/pkgs/tools/virtualization/mkosi/0002-Fix-library-resolving.patch b/pkgs/tools/virtualization/mkosi/0002-Fix-library-resolving.patch new file mode 100644 index 000000000000..8f4f3110d7ea --- /dev/null +++ b/pkgs/tools/virtualization/mkosi/0002-Fix-library-resolving.patch @@ -0,0 +1,36 @@ +From a1e6ccfeaf8ef10361280b9ecad958e9d556005b Mon Sep 17 00:00:00 2001 +From: Moritz Sanft <58110325+msanft@users.noreply.github.com> +Date: Tue, 3 Sep 2024 09:00:34 +0200 +Subject: [PATCH 2/3] Fix library resolving + +As ctypes doesn't do lookups in the Nix store for libraries, we supply the exact paths. + +Signed-off-by: Moritz Sanft <58110325+msanft@users.noreply.github.com> +--- + mkosi/sandbox/__init__.py | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/mkosi/sandbox/__init__.py b/mkosi/sandbox/__init__.py +index 7db340c5..3d0a0e56 100644 +--- a/mkosi/sandbox/__init__.py ++++ b/mkosi/sandbox/__init__.py +@@ -78,7 +78,7 @@ class cap_user_data_t(ctypes.Structure): + ] + + +-libc = ctypes.CDLL(None, use_errno=True) ++libc = ctypes.CDLL("@LIBC@", use_errno=True) + + libc.syscall.restype = ctypes.c_long + libc.unshare.argtypes = (ctypes.c_int,) +@@ -175,7 +175,7 @@ def seccomp_suppress_chown() -> None: + Unfortunately, non-root users can only create files owned by their own uid. To still allow non-root users to build + images, if requested we install a seccomp filter that makes calls to chown() and friends a noop. + """ +- libseccomp = ctypes.CDLL("libseccomp.so.2") ++ libseccomp = ctypes.CDLL("@LIBSECCOMP@") + if libseccomp is None: + raise FileNotFoundError("libseccomp.so.2") + +-- +2.45.2 diff --git a/pkgs/tools/virtualization/mkosi/0003-Fix-QEMU-firmware-path.patch b/pkgs/tools/virtualization/mkosi/0003-Fix-QEMU-firmware-path.patch new file mode 100644 index 000000000000..028a581a9b7d --- /dev/null +++ b/pkgs/tools/virtualization/mkosi/0003-Fix-QEMU-firmware-path.patch @@ -0,0 +1,25 @@ +From e834d51aa2542b141ceafdd42285ded6a9997c90 Mon Sep 17 00:00:00 2001 +From: Moritz Sanft <58110325+msanft@users.noreply.github.com> +Date: Tue, 3 Sep 2024 09:09:19 +0200 +Subject: [PATCH 3/3] Fix QEMU firmware path + +Signed-off-by: Moritz Sanft <58110325+msanft@users.noreply.github.com> +--- + mkosi/qemu.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/mkosi/qemu.py b/mkosi/qemu.py +index b98bec65..886598aa 100644 +--- a/mkosi/qemu.py ++++ b/mkosi/qemu.py +@@ -182,7 +182,7 @@ def find_ovmf_firmware(config: Config, qemu: Path, firmware: QemuFirmware) -> Op + + tools = Path("/") if any(qemu.is_relative_to(d) for d in config.extra_search_paths) else config.tools() + +- desc = list((tools / "usr/share/qemu/firmware").glob("*")) ++ desc = list((tools / "@QEMU_FIRMWARE@").glob("*")) + if tools == Path("/"): + desc += list((tools / "etc/qemu/firmware").glob("*")) + +-- +2.45.2 diff --git a/pkgs/tools/virtualization/mkosi/default.nix b/pkgs/tools/virtualization/mkosi/default.nix index a9262ff056be..be3367930093 100644 --- a/pkgs/tools/virtualization/mkosi/default.nix +++ b/pkgs/tools/virtualization/mkosi/default.nix @@ -2,7 +2,6 @@ , fetchFromGitHub , stdenv , python3 -, bubblewrap , systemd , pandoc , kmod @@ -12,6 +11,8 @@ , bash , coreutils , btrfs-progs +, libseccomp +, replaceVars # Python packages , setuptools @@ -44,7 +45,7 @@ let in buildPythonApplication rec { pname = "mkosi"; - version = "22"; + version = "24.3-unstable-2024-08-28"; format = "pyproject"; outputs = [ "out" "man" ]; @@ -52,21 +53,30 @@ buildPythonApplication rec { src = fetchFromGitHub { owner = "systemd"; repo = "mkosi"; - rev = "v${version}"; - hash = "sha256-Zom1GlyhqgpTKfjcBOUEJMlubSn+TQsk97js1/UfDHY="; + rev = "8c2f828701a1bdb3dc9b80d6f2ab979f0430a6b8"; + hash = "sha256-rO/4ki2nAJQN2slmYuHKESGBBDMXC/ikGf6dMDcKFr4="; }; - # Fix ctypes finding library - # https://github.com/NixOS/nixpkgs/issues/7307 - postPatch = lib.optionalString stdenv.isLinux '' - substituteInPlace mkosi/user.py \ - --replace-fail 'ctypes.util.find_library("c")' "'${stdenv.cc.libc}/lib/libc.so.6'" - substituteInPlace mkosi/__init__.py \ - --replace-fail '/usr/lib/systemd/ukify' "${systemdForMkosi}/lib/systemd/ukify" - '' + lib.optionalString withQemu '' - substituteInPlace mkosi/qemu.py \ - --replace-fail "usr/share/qemu/firmware" "${qemu}/share/qemu/firmware" - ''; + patches = [ + (replaceVars ./0001-Use-wrapped-binaries-instead-of-Python-interpreter.patch { + UKIFY = "${systemdForMkosi}/lib/systemd/ukify"; + PYTHON_PEFILE = "${python3pefile}/bin/python3.12"; + MKOSI_SANDBOX = "~MKOSI_SANDBOX~"; # to satisfy replaceVars, will be replaced in postPatch + }) + (replaceVars ./0002-Fix-library-resolving.patch { + LIBC = "${stdenv.cc.libc}/lib/libc.so.6"; + LIBSECCOMP = "${libseccomp.lib}/lib/libseccomp.so.2"; + }) + ] ++ lib.optional withQemu (replaceVars ./0003-Fix-QEMU-firmware-path.patch { + QEMU_FIRMWARE = "${qemu}/share/qemu/firmware"; + }); + + postPatch = + '' + # As we need the $out reference, we can't use `replaceVars` here. + substituteInPlace mkosi/run.py \ + --replace-fail '~MKOSI_SANDBOX~' "\"$out/bin/mkosi-sandbox\"" + ''; nativeBuildInputs = [ pandoc @@ -78,7 +88,6 @@ buildPythonApplication rec { propagatedBuildInputs = [ bash btrfs-progs - bubblewrap coreutils cpio gnutar @@ -97,20 +106,11 @@ buildPythonApplication rec { pytestCheckHook ]; - pythonImportsCheck = [ - "mkosi" - ]; - postInstall = '' mkdir -p $out/share/man/man1 mv mkosi/resources/mkosi.1 $out/share/man/man1/ ''; - makeWrapperArgs = [ - "--set MKOSI_INTERPRETER ${python3pefile}/bin/python3" - "--prefix PYTHONPATH : \"$PYTHONPATH\"" - ]; - meta = with lib; { description = "Build legacy-free OS images"; homepage = "https://github.com/systemd/mkosi"; From 12f6399c1e6dc2159b5df63d80183908190e7629 Mon Sep 17 00:00:00 2001 From: Moritz Sanft <58110325+msanft@users.noreply.github.com> Date: Mon, 2 Sep 2024 11:48:15 +0200 Subject: [PATCH 167/235] mkosi: format --- pkgs/tools/virtualization/mkosi/default.nix | 127 +++++++++++--------- 1 file changed, 69 insertions(+), 58 deletions(-) diff --git a/pkgs/tools/virtualization/mkosi/default.nix b/pkgs/tools/virtualization/mkosi/default.nix index be3367930093..cd1a368edbe0 100644 --- a/pkgs/tools/virtualization/mkosi/default.nix +++ b/pkgs/tools/virtualization/mkosi/default.nix @@ -1,30 +1,31 @@ -{ lib -, fetchFromGitHub -, stdenv -, python3 -, systemd -, pandoc -, kmod -, gnutar -, util-linux -, cpio -, bash -, coreutils -, btrfs-progs -, libseccomp -, replaceVars +{ + lib, + fetchFromGitHub, + stdenv, + python3, + systemd, + pandoc, + kmod, + gnutar, + util-linux, + cpio, + bash, + coreutils, + btrfs-progs, + libseccomp, + replaceVars, # Python packages -, setuptools -, setuptools-scm -, wheel -, buildPythonApplication -, pytestCheckHook -, pefile + setuptools, + setuptools-scm, + wheel, + buildPythonApplication, + pytestCheckHook, + pefile, # Optional dependencies -, withQemu ? false -, qemu + withQemu ? false, + qemu, }: let # For systemd features used by mkosi, see @@ -39,16 +40,21 @@ let withKernelInstall = true; }; - python3pefile = python3.withPackages (ps: with ps; [ - pefile - ]); + python3pefile = python3.withPackages ( + ps: with ps; [ + pefile + ] + ); in buildPythonApplication rec { pname = "mkosi"; version = "24.3-unstable-2024-08-28"; format = "pyproject"; - outputs = [ "out" "man" ]; + outputs = [ + "out" + "man" + ]; src = fetchFromGitHub { owner = "systemd"; @@ -57,26 +63,29 @@ buildPythonApplication rec { hash = "sha256-rO/4ki2nAJQN2slmYuHKESGBBDMXC/ikGf6dMDcKFr4="; }; - patches = [ - (replaceVars ./0001-Use-wrapped-binaries-instead-of-Python-interpreter.patch { - UKIFY = "${systemdForMkosi}/lib/systemd/ukify"; - PYTHON_PEFILE = "${python3pefile}/bin/python3.12"; - MKOSI_SANDBOX = "~MKOSI_SANDBOX~"; # to satisfy replaceVars, will be replaced in postPatch - }) - (replaceVars ./0002-Fix-library-resolving.patch { - LIBC = "${stdenv.cc.libc}/lib/libc.so.6"; - LIBSECCOMP = "${libseccomp.lib}/lib/libseccomp.so.2"; - }) - ] ++ lib.optional withQemu (replaceVars ./0003-Fix-QEMU-firmware-path.patch { - QEMU_FIRMWARE = "${qemu}/share/qemu/firmware"; - }); + patches = + [ + (replaceVars ./0001-Use-wrapped-binaries-instead-of-Python-interpreter.patch { + UKIFY = "${systemdForMkosi}/lib/systemd/ukify"; + PYTHON_PEFILE = "${python3pefile}/bin/python3.12"; + MKOSI_SANDBOX = "~MKOSI_SANDBOX~"; # to satisfy replaceVars, will be replaced in postPatch + }) + (replaceVars ./0002-Fix-library-resolving.patch { + LIBC = "${stdenv.cc.libc}/lib/libc.so.6"; + LIBSECCOMP = "${libseccomp.lib}/lib/libseccomp.so.2"; + }) + ] + ++ lib.optional withQemu ( + replaceVars ./0003-Fix-QEMU-firmware-path.patch { + QEMU_FIRMWARE = "${qemu}/share/qemu/firmware"; + } + ); - postPatch = - '' - # As we need the $out reference, we can't use `replaceVars` here. - substituteInPlace mkosi/run.py \ - --replace-fail '~MKOSI_SANDBOX~' "\"$out/bin/mkosi-sandbox\"" - ''; + postPatch = '' + # As we need the $out reference, we can't use `replaceVars` here. + substituteInPlace mkosi/run.py \ + --replace-fail '~MKOSI_SANDBOX~' "\"$out/bin/mkosi-sandbox\"" + ''; nativeBuildInputs = [ pandoc @@ -85,18 +94,20 @@ buildPythonApplication rec { wheel ]; - propagatedBuildInputs = [ - bash - btrfs-progs - coreutils - cpio - gnutar - kmod - systemdForMkosi - util-linux - ] ++ lib.optional withQemu [ - qemu - ]; + propagatedBuildInputs = + [ + bash + btrfs-progs + coreutils + cpio + gnutar + kmod + systemdForMkosi + util-linux + ] + ++ lib.optional withQemu [ + qemu + ]; postBuild = '' ./tools/make-man-page.sh From 67e42aa053985b4cd19953e81aae975751c7f01d Mon Sep 17 00:00:00 2001 From: Moritz Sanft <58110325+msanft@users.noreply.github.com> Date: Tue, 3 Sep 2024 14:24:23 +0200 Subject: [PATCH 168/235] mkosi: add msanft as maintainer --- pkgs/tools/virtualization/mkosi/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/virtualization/mkosi/default.nix b/pkgs/tools/virtualization/mkosi/default.nix index cd1a368edbe0..2f5dea5481fb 100644 --- a/pkgs/tools/virtualization/mkosi/default.nix +++ b/pkgs/tools/virtualization/mkosi/default.nix @@ -128,7 +128,10 @@ buildPythonApplication rec { changelog = "https://github.com/systemd/mkosi/releases/tag/v${version}"; license = licenses.lgpl21Only; mainProgram = "mkosi"; - maintainers = with maintainers; [ malt3 ]; + maintainers = with maintainers; [ + malt3 + msanft + ]; platforms = platforms.linux; # `mkosi qemu` boot fails in the uefi shell, image isn't found. broken = withQemu; From 677e5fc90bf5ee0984e3da2908bb80e0f3413f61 Mon Sep 17 00:00:00 2001 From: Benjamin Hajdukiewicz <70604257+katanallama@users.noreply.github.com> Date: Sun, 1 Sep 2024 06:34:24 -0600 Subject: [PATCH 169/235] vscode-extensions.ms-toolsai.datawrangler: 0.29.6 -> 1.7.2 --- pkgs/applications/editors/vscode/extensions/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index b1ccc6c098c8..235874b825a4 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -3351,8 +3351,8 @@ let mktplcRef = { name = "datawrangler"; publisher = "ms-toolsai"; - version = "0.29.6"; - hash = "sha256-9MR2+hb9YdjIGDfUkdLW41HOxhjeS/San49C8QRZ/YY="; + version = "1.7.2"; + hash = "sha256-3UK87MhDBCT4La8jRgmkRJJQPZbgvOu0+VBea7ho9hs="; }; meta = { From 0e905f6bc12528d7e3ead3d4263530d7f13597cb Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 3 Sep 2024 12:59:34 +0000 Subject: [PATCH 170/235] aider-chat: 0.53.0 -> 0.54.0 --- pkgs/by-name/ai/aider-chat/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ai/aider-chat/package.nix b/pkgs/by-name/ai/aider-chat/package.nix index 4cf03feea296..c7f58b27a1bb 100644 --- a/pkgs/by-name/ai/aider-chat/package.nix +++ b/pkgs/by-name/ai/aider-chat/package.nix @@ -12,7 +12,7 @@ let self = python3; packageOverrides = _: super: { tree-sitter = super.tree-sitter_0_21; }; }; - version = "0.53.0"; + version = "0.54.0"; in python3.pkgs.buildPythonApplication { pname = "aider-chat"; @@ -23,7 +23,7 @@ python3.pkgs.buildPythonApplication { owner = "paul-gauthier"; repo = "aider"; rev = "refs/tags/v${version}"; - hash = "sha256-KQp4qqQKm++oB9RVQZhAWQJs7Nbyssc9eKKRH1VZbRU="; + hash = "sha256-ysNhfhFGSDhEQLQLP26Lv6qmZehmwtQTSlAqJVPD5O8="; }; build-system = with python3.pkgs; [ setuptools ]; From 7d2350b795e7a9e2fe45a8c290be3f0d329799be Mon Sep 17 00:00:00 2001 From: r-vdp Date: Tue, 3 Sep 2024 14:54:33 +0200 Subject: [PATCH 171/235] power-profiles-daemon: reformat with nixfmt --- .../linux/power-profiles-daemon/default.nix | 112 ++++++++++-------- 1 file changed, 62 insertions(+), 50 deletions(-) diff --git a/pkgs/os-specific/linux/power-profiles-daemon/default.nix b/pkgs/os-specific/linux/power-profiles-daemon/default.nix index 1c3dc9acab4d..0a4c7f67560c 100644 --- a/pkgs/os-specific/linux/power-profiles-daemon/default.nix +++ b/pkgs/os-specific/linux/power-profiles-daemon/default.nix @@ -1,35 +1,39 @@ -{ stdenv -, lib -, bash-completion -, pkg-config -, meson -, mesonEmulatorHook -, ninja -, fetchFromGitLab -, libgudev -, glib -, polkit -, dbus -, gobject-introspection -, wrapGAppsNoGuiHook -, gettext -, gtk-doc -, docbook-xsl-nons -, docbook_xml_dtd_412 -, libxml2 -, libxslt -, upower -, umockdev -, systemd -, python3 -, nixosTests +{ + stdenv, + lib, + bash-completion, + pkg-config, + meson, + mesonEmulatorHook, + ninja, + fetchFromGitLab, + libgudev, + glib, + polkit, + dbus, + gobject-introspection, + wrapGAppsNoGuiHook, + gettext, + gtk-doc, + docbook-xsl-nons, + docbook_xml_dtd_412, + libxml2, + libxslt, + upower, + umockdev, + systemd, + python3, + nixosTests, }: stdenv.mkDerivation rec { pname = "power-profiles-daemon"; version = "0.22"; - outputs = [ "out" "devdoc" ]; + outputs = [ + "out" + "devdoc" + ]; src = fetchFromGitLab { domain = "gitlab.freedesktop.org"; @@ -39,29 +43,33 @@ stdenv.mkDerivation rec { sha256 = "sha256-NzaneS/Za73HSK2abBZNmP+ZPbhIG+JXfBTPHm2vBeU="; }; - nativeBuildInputs = [ - pkg-config - meson - ninja - gettext - gtk-doc - docbook-xsl-nons - docbook_xml_dtd_412 - libxml2 # for xmllint for stripping GResources - libxslt # for xsltproc for building docs - gobject-introspection - wrapGAppsNoGuiHook - # checkInput but cheked for during the configuring - (python3.pythonOnBuildForHost.withPackages (ps: with ps; [ - pygobject3 - dbus-python - python-dbusmock - argparse-manpage - shtab - ])) - ] ++ lib.optionals (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) [ - mesonEmulatorHook - ]; + nativeBuildInputs = + [ + pkg-config + meson + ninja + gettext + gtk-doc + docbook-xsl-nons + docbook_xml_dtd_412 + libxml2 # for xmllint for stripping GResources + libxslt # for xsltproc for building docs + gobject-introspection + wrapGAppsNoGuiHook + # checkInput but checked for during the configuring + (python3.pythonOnBuildForHost.withPackages ( + ps: with ps; [ + pygobject3 + dbus-python + python-dbusmock + argparse-manpage + shtab + ] + )) + ] + ++ lib.optionals (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) [ + mesonEmulatorHook + ]; buildInputs = [ bash-completion @@ -127,6 +135,10 @@ stdenv.mkDerivation rec { mainProgram = "powerprofilesctl"; platforms = platforms.linux; license = licenses.gpl3Plus; - maintainers = with maintainers; [ mvnetbiz picnoir lyndeno ]; + maintainers = with maintainers; [ + mvnetbiz + picnoir + lyndeno + ]; }; } From 916f08fab3ca9fb8dd99aa0a96a7c6edd2c011ef Mon Sep 17 00:00:00 2001 From: r-vdp Date: Tue, 3 Sep 2024 14:56:14 +0200 Subject: [PATCH 172/235] power-profiles-daemon: move to pkgs/by-name --- .../po/power-profiles-daemon/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 2 deletions(-) rename pkgs/{os-specific/linux/power-profiles-daemon/default.nix => by-name/po/power-profiles-daemon/package.nix} (100%) diff --git a/pkgs/os-specific/linux/power-profiles-daemon/default.nix b/pkgs/by-name/po/power-profiles-daemon/package.nix similarity index 100% rename from pkgs/os-specific/linux/power-profiles-daemon/default.nix rename to pkgs/by-name/po/power-profiles-daemon/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 69e98c04372a..a2fcab62e4a8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11613,8 +11613,6 @@ with pkgs; stdenv = gcc12Stdenv; }; - power-profiles-daemon = callPackage ../os-specific/linux/power-profiles-daemon { }; - ppl = callPackage ../development/libraries/ppl { }; pplite = callPackage ../development/libraries/pplite { }; From 122e267f17bed0da20ecbd9767cad29521987ae9 Mon Sep 17 00:00:00 2001 From: r-vdp Date: Tue, 3 Sep 2024 14:58:25 +0200 Subject: [PATCH 173/235] power-profiles-daemon: use finalAttrs --- pkgs/by-name/po/power-profiles-daemon/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/po/power-profiles-daemon/package.nix b/pkgs/by-name/po/power-profiles-daemon/package.nix index 0a4c7f67560c..cee6fa727890 100644 --- a/pkgs/by-name/po/power-profiles-daemon/package.nix +++ b/pkgs/by-name/po/power-profiles-daemon/package.nix @@ -26,7 +26,7 @@ nixosTests, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "power-profiles-daemon"; version = "0.22"; @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { domain = "gitlab.freedesktop.org"; owner = "upower"; repo = "power-profiles-daemon"; - rev = version; + rev = finalAttrs.version; sha256 = "sha256-NzaneS/Za73HSK2abBZNmP+ZPbhIG+JXfBTPHm2vBeU="; }; @@ -141,4 +141,4 @@ stdenv.mkDerivation rec { lyndeno ]; }; -} +}) From 0436990db5df100bdd2a845af04fe78532a7eb55 Mon Sep 17 00:00:00 2001 From: r-vdp Date: Tue, 3 Sep 2024 14:59:17 +0200 Subject: [PATCH 174/235] power-profiles-daemon: add updateScript --- pkgs/by-name/po/power-profiles-daemon/package.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/by-name/po/power-profiles-daemon/package.nix b/pkgs/by-name/po/power-profiles-daemon/package.nix index cee6fa727890..c1fb546461e4 100644 --- a/pkgs/by-name/po/power-profiles-daemon/package.nix +++ b/pkgs/by-name/po/power-profiles-daemon/package.nix @@ -24,6 +24,7 @@ systemd, python3, nixosTests, + nix-update-script, }: stdenv.mkDerivation (finalAttrs: { @@ -124,6 +125,7 @@ stdenv.mkDerivation (finalAttrs: { ''; passthru = { + updateScript = nix-update-script { }; tests = { nixos = nixosTests.power-profiles-daemon; }; From 8b4061fd60ccc3b3f44b73faa7c983eacf7a6f7b Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Sat, 31 Aug 2024 17:44:38 +0200 Subject: [PATCH 175/235] skia: make use of gnFlags --- pkgs/by-name/sk/skia/package.nix | 53 +++++++++++++++----------------- 1 file changed, 24 insertions(+), 29 deletions(-) diff --git a/pkgs/by-name/sk/skia/package.nix b/pkgs/by-name/sk/skia/package.nix index f40279875d02..6c70e99bb2fb 100644 --- a/pkgs/by-name/sk/skia/package.nix +++ b/pkgs/by-name/sk/skia/package.nix @@ -70,39 +70,34 @@ stdenv.mkDerivation (finalAttrs: { vulkan-memory-allocator ]; - configurePhase = let + gnFlags = let cpu = { "x86_64" = "x64"; "i686" = "x86"; "arm" = "arm"; "aarch64" = "arm64"; }.${stdenv.hostPlatform.parsed.cpu.name}; - in '' - runHook preConfigure - gn gen build --args='${toString ([ - # Build in release mode - "is_official_build=true" - "is_component_build=true" - # Don't use missing tools - "skia_use_dng_sdk=false" - "skia_use_wuffs=false" - # Use system dependencies - "extra_cflags=[\"-I${harfbuzzFull.dev}/include/harfbuzz\"]" - "cc=\"${stdenv.cc.targetPrefix}cc\"" - "cxx=\"${stdenv.cc.targetPrefix}c++\"" - "ar=\"${stdenv.cc.targetPrefix}ar\"" - "target_cpu=\"${cpu}\"" - ] ++ map (lib: "skia_use_system_${lib}=true") [ - "zlib" - "harfbuzz" - "libpng" - "libwebp" - ] ++ lib.optionals enableVulkan [ - "skia_use_vulkan=true" - ])}' - cd build - runHook postConfigure - ''; + in [ + # Build in release mode + "is_official_build=true" + "is_component_build=true" + # Don't use missing tools + "skia_use_dng_sdk=false" + "skia_use_wuffs=false" + # Use system dependencies + "extra_cflags=[\"-I${harfbuzzFull.dev}/include/harfbuzz\"]" + "cc=\"${stdenv.cc.targetPrefix}cc\"" + "cxx=\"${stdenv.cc.targetPrefix}c++\"" + "ar=\"${stdenv.cc.targetPrefix}ar\"" + "target_cpu=\"${cpu}\"" + ] ++ map (lib: "skia_use_system_${lib}=true") [ + "zlib" + "harfbuzz" + "libpng" + "libwebp" + ] ++ lib.optionals enableVulkan [ + "skia_use_vulkan=true" + ]; # Somewhat arbitrary, but similar to what other distros are doing installPhase = '' @@ -113,10 +108,10 @@ stdenv.mkDerivation (finalAttrs: { cp *.so *.a $out/lib # Includes - pushd ../include + pushd ../../include find . -name '*.h' -exec install -Dm644 {} $out/include/skia/{} \; popd - pushd ../modules + pushd ../../modules find . -name '*.h' -exec install -Dm644 {} $out/include/skia/modules/{} \; popd From 2f937eebfe087314dc1081d7015fe5d7a8aca56e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 3 Sep 2024 13:39:13 +0000 Subject: [PATCH 176/235] geesefs: 0.41.1 -> 0.41.2 --- pkgs/by-name/ge/geesefs/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ge/geesefs/package.nix b/pkgs/by-name/ge/geesefs/package.nix index c6ab0bec46af..264ca14c408c 100644 --- a/pkgs/by-name/ge/geesefs/package.nix +++ b/pkgs/by-name/ge/geesefs/package.nix @@ -3,7 +3,7 @@ , fetchFromGitHub }: -let version = "0.41.1"; +let version = "0.41.2"; in buildGoModule { pname = "geesefs"; inherit version; @@ -12,7 +12,7 @@ in buildGoModule { owner = "yandex-cloud"; repo = "geesefs"; rev = "v${version}"; - hash = "sha256-4uPq4NUd6upsOxuKAVqay7UTMfiHlCKwVvJed0jdeyc="; + hash = "sha256-W7f3vYjU1f6lxwkz24WjS3UzYy95bxk7nKoLpLsvUwM="; }; # hashes differ per architecture otherwise. From 5d313d9a5d7c7e6acfd9b6d67893bb0c9f48b8ab Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 3 Sep 2024 13:39:38 +0000 Subject: [PATCH 177/235] libspiro: 20221101 -> 20240902 --- pkgs/development/libraries/libspiro/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libspiro/default.nix b/pkgs/development/libraries/libspiro/default.nix index f583900e35d9..edbbd6cdf1f2 100644 --- a/pkgs/development/libraries/libspiro/default.nix +++ b/pkgs/development/libraries/libspiro/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "libspiro"; - version = "20221101"; + version = "20240902"; src = fetchFromGitHub { owner = "fontforge"; repo = pname; rev = version; - sha256 = "sha256-/9UCrdq69RO22593qiA8pZ4qfY9UVGqlGYB9zatsOgw="; + sha256 = "sha256-GaLfNxL/Y0JsRXIldxliBFaB2ZLFVPR7Du8GTZ77HFo="; }; nativeBuildInputs = [ pkg-config autoreconfHook ]; From bf595360e47746d65ed240f40b8e23d9f2eb485c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 3 Sep 2024 13:39:52 +0000 Subject: [PATCH 178/235] goose: 3.21.1 -> 3.22.0 --- pkgs/tools/misc/goose/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/goose/default.nix b/pkgs/tools/misc/goose/default.nix index c2c91f0574ac..6b59a49a3141 100644 --- a/pkgs/tools/misc/goose/default.nix +++ b/pkgs/tools/misc/goose/default.nix @@ -6,17 +6,17 @@ buildGoModule rec { pname = "goose"; - version = "3.21.1"; + version = "3.22.0"; src = fetchFromGitHub { owner = "pressly"; repo = pname; rev = "v${version}"; - hash = "sha256-Klmgw5dYt2/JYc0nuqIZwos3/onlRwsfzTOJ/Yi2pMw="; + hash = "sha256-QY6K/c3VPpHlsm943mcqOBVPk4EDKhu6V+OZxNmjG9Y="; }; proxyVendor = true; - vendorHash = "sha256-V875bGtp6Aki64TM3x0n1aERc5sVPIDZ3rNPF9D/osk="; + vendorHash = "sha256-JFQFzzeeYNAC6b/VKTvn+O1S3zMJO5aAjj3JO96Db8Y="; # skipping: end-to-end tests require a docker daemon postPatch = '' From 3287db25962155bc39dfcccb09dce65298b43bb1 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Tue, 3 Sep 2024 15:45:34 +0200 Subject: [PATCH 179/235] faiss: mark as broken on Darwin --- .../libraries/science/math/faiss/default.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/science/math/faiss/default.nix b/pkgs/development/libraries/science/math/faiss/default.nix index 11096a193958..5804c7d627e9 100644 --- a/pkgs/development/libraries/science/math/faiss/default.nix +++ b/pkgs/development/libraries/science/math/faiss/default.nix @@ -141,12 +141,14 @@ stdenv.mkDerivation { }; }; - meta = with lib; { + meta = { description = "Library for efficient similarity search and clustering of dense vectors by Facebook Research"; mainProgram = "demo_ivfpq_indexing"; homepage = "https://github.com/facebookresearch/faiss"; - license = licenses.mit; - platforms = platforms.unix; - maintainers = with maintainers; [ SomeoneSerge ]; + license = lib.licenses.mit; + platforms = lib.platforms.unix; + maintainers = with lib.maintainers; [ SomeoneSerge ]; + # error: use of undeclared identifier 'SWIGTYPE_p_long' + broken = stdenv.isDarwin; }; } From d62489026da072b7732c47daa711c2e1f27471b7 Mon Sep 17 00:00:00 2001 From: nikstur Date: Tue, 3 Sep 2024 16:01:45 +0200 Subject: [PATCH 180/235] botan: move to finalAttrs --- pkgs/development/libraries/botan/generic.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/botan/generic.nix b/pkgs/development/libraries/botan/generic.nix index a2acb8183283..47fe74547ebf 100644 --- a/pkgs/development/libraries/botan/generic.nix +++ b/pkgs/development/libraries/botan/generic.nix @@ -12,17 +12,17 @@ , ... }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "botan"; version = "${baseVersion}.${revision}"; outputs = [ "out" "dev" ]; src = fetchurl { - name = "Botan-${version}.${sourceExtension}"; + name = "Botan-${finalAttrs.version}.${sourceExtension}"; urls = [ - "http://files.randombit.net/botan/v${baseVersion}/Botan-${version}.${sourceExtension}" - "http://botan.randombit.net/releases/Botan-${version}.${sourceExtension}" + "http://files.randombit.net/botan/v${baseVersion}/Botan-${finalAttrs.version}.${sourceExtension}" + "http://botan.randombit.net/releases/Botan-${finalAttrs.version}.${sourceExtension}" ]; inherit hash; }; @@ -64,4 +64,4 @@ stdenv.mkDerivation rec { inherit knownVulnerabilities; }; passthru.updateInfo.downloadPage = "http://files.randombit.net/botan/"; -} +}) From 170e33364456a79bbcb460ca7ee0d54c790be010 Mon Sep 17 00:00:00 2001 From: nikstur Date: Tue, 3 Sep 2024 15:50:19 +0200 Subject: [PATCH 181/235] botan: refactor configureFlags into botanConfigureFlags --- pkgs/development/libraries/botan/generic.nix | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/botan/generic.nix b/pkgs/development/libraries/botan/generic.nix index 47fe74547ebf..5b3b4f04b0f3 100644 --- a/pkgs/development/libraries/botan/generic.nix +++ b/pkgs/development/libraries/botan/generic.nix @@ -16,6 +16,8 @@ stdenv.mkDerivation (finalAttrs: { pname = "botan"; version = "${baseVersion}.${revision}"; + __structuredAttrs = true; + outputs = [ "out" "dev" ]; src = fetchurl { @@ -33,9 +35,19 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ bzip2 zlib gmp boost ] ++ lib.optionals stdenv.isDarwin [ CoreServices Security ]; + botanConfigureFlags = [ + "--prefix=${placeholder "out"}" + "--with-bzip2" + "--with-zlib" + ] ++ lib.optionals stdenv.cc.isClang [ + "--cc=clang" + ] ++ lib.optionals stdenv.hostPlatform.isAarch64 [ + "--cpu=aarch64" + ]; + configurePhase = '' runHook preConfigure - python configure.py --prefix=$out --with-bzip2 --with-zlib ${extraConfigureFlags}${lib.optionalString stdenv.cc.isClang " --cc=clang"} ${lib.optionalString stdenv.hostPlatform.isAarch64 " --cpu=aarch64"} + python configure.py ''${botanConfigureFlags[@]} ${extraConfigureFlags} runHook postConfigure ''; From 561eb736d06a38aae04a884c354bf272873bbc44 Mon Sep 17 00:00:00 2001 From: nikstur Date: Tue, 3 Sep 2024 15:50:33 +0200 Subject: [PATCH 182/235] botan: enable building statically --- pkgs/development/libraries/botan/generic.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/libraries/botan/generic.nix b/pkgs/development/libraries/botan/generic.nix index 5b3b4f04b0f3..82082878df63 100644 --- a/pkgs/development/libraries/botan/generic.nix +++ b/pkgs/development/libraries/botan/generic.nix @@ -9,6 +9,7 @@ , knownVulnerabilities ? [ ] , CoreServices ? null , Security ? null +, static ? stdenv.hostPlatform.isStatic # generates static libraries *only* , ... }: @@ -43,6 +44,9 @@ stdenv.mkDerivation (finalAttrs: { "--cc=clang" ] ++ lib.optionals stdenv.hostPlatform.isAarch64 [ "--cpu=aarch64" + ] ++ lib.optionals static [ + "--enable-static-library" + "--disable-shared-library" ]; configurePhase = '' From 105933cf4f0f0ebeb49a3e047de843de7570e9e3 Mon Sep 17 00:00:00 2001 From: K900 Date: Tue, 3 Sep 2024 17:04:55 +0300 Subject: [PATCH 183/235] pkgs/build-support/rust: fix warning-related eval issue --- pkgs/build-support/rust/lib/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/build-support/rust/lib/default.nix b/pkgs/build-support/rust/lib/default.nix index 115b64547005..446760840732 100644 --- a/pkgs/build-support/rust/lib/default.nix +++ b/pkgs/build-support/rust/lib/default.nix @@ -80,7 +80,7 @@ rec { ''; }; } // lib.mapAttrs (old: new: platform: - lib.warn "`rust.${old} platform` is deprecated. Use `platform.rust.${new}` instead." + lib.warn "`rust.${old} platform` is deprecated. Use `platform.rust.${lib.showAttrPath new}` instead." lib.getAttrFromPath new platform.rust) { toTargetArch = [ "platform" "arch" ]; From 494549b8aeeb60694e620ba934f8afc80a90bfc2 Mon Sep 17 00:00:00 2001 From: Cameron Nemo Date: Tue, 3 Sep 2024 07:07:08 -0700 Subject: [PATCH 184/235] pulumi: fix withPackages invocation (#331660) Re-add PATH handling, which was removed without explanation. Also add an end quote to the LD_LIBRARY_PATH line. Co-authored-by: Cameron Nemo --- pkgs/tools/admin/pulumi/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/admin/pulumi/default.nix b/pkgs/tools/admin/pulumi/default.nix index 4aacc6d86901..9d715ea7edf9 100644 --- a/pkgs/tools/admin/pulumi/default.nix +++ b/pkgs/tools/admin/pulumi/default.nix @@ -131,7 +131,8 @@ buildGoModule rec { '' mkdir -p $out/bin makeWrapper ${pulumi}/bin/pulumi $out/bin/pulumi \ - --set LD_LIBRARY_PATH "${stdenv.cc.cc.lib}/lib + --suffix PATH : ${lib.makeBinPath (f pulumiPackages)} \ + --set LD_LIBRARY_PATH "${stdenv.cc.cc.lib}/lib" ''; }; From c4bc8a9af631e15f91ed1f7360df93a25d8fc121 Mon Sep 17 00:00:00 2001 From: nikstur Date: Tue, 3 Sep 2024 16:10:38 +0200 Subject: [PATCH 185/235] cargo-cyclonedx: 0.5.4 -> 0.5.5 --- pkgs/development/tools/rust/cargo-cyclonedx/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/rust/cargo-cyclonedx/default.nix b/pkgs/development/tools/rust/cargo-cyclonedx/default.nix index 14ca5cd027df..841a502a31f7 100644 --- a/pkgs/development/tools/rust/cargo-cyclonedx/default.nix +++ b/pkgs/development/tools/rust/cargo-cyclonedx/default.nix @@ -12,16 +12,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-cyclonedx"; - version = "0.5.4"; + version = "0.5.5"; src = fetchFromGitHub { owner = "CycloneDX"; repo = "cyclonedx-rust-cargo"; rev = "${pname}-${version}"; - hash = "sha256-H/CFEz1+rFHiTEP8JBFH9W9OTHjRdIBOov9c0JO69xE="; + hash = "sha256-DOnf2O0ezQ6rR83lSG9mtvxXFz2hpxb8qi7xLvVKkYw="; }; - cargoHash = "sha256-OhkC8R/+mdjFI6WRisFYZk5PKxje3W9X5p9tGCgKQOw="; + cargoHash = "sha256-UHdugnKZ43qYpbaM+orPy7g09ZIcpCvhSMkptmmAf7s="; nativeBuildInputs = [ pkg-config From df119bf05be0152ab0a88cc17f42a8017e5c47de Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Tue, 3 Sep 2024 10:11:16 -0400 Subject: [PATCH 186/235] ada: 2.9.1 -> 2.9.2 Diff: https://github.com/ada-url/ada/compare/v2.9.1...v2.9.2 --- pkgs/by-name/ad/ada/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ad/ada/package.nix b/pkgs/by-name/ad/ada/package.nix index aaf2d31986ff..33ab8e65463d 100644 --- a/pkgs/by-name/ad/ada/package.nix +++ b/pkgs/by-name/ad/ada/package.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "ada"; - version = "2.9.1"; + version = "2.9.2"; src = fetchFromGitHub { owner = "ada-url"; repo = "ada"; rev = "v${version}"; - hash = "sha256-bDkhSAd+MlOm8pd5MPvzVHkWMY9aNcvNfLuH7qoyUuk="; + hash = "sha256-VWFxupmgc+fq9aj/02uMEsiwhP+9PWMSleoIoyKVe3c="; }; nativeBuildInputs = [ cmake ]; From 473bba08fe1445b7f7faa4f39be63563fc13159a Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Tue, 3 Sep 2024 10:14:36 -0400 Subject: [PATCH 187/235] dbip-country-lite: 2024-08 -> 2024-09 --- pkgs/data/misc/dbip-country-lite/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/misc/dbip-country-lite/default.nix b/pkgs/data/misc/dbip-country-lite/default.nix index 3f024e0bcafc..79a4d9065cfe 100644 --- a/pkgs/data/misc/dbip-country-lite/default.nix +++ b/pkgs/data/misc/dbip-country-lite/default.nix @@ -5,11 +5,11 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "dbip-country-lite"; - version = "2024-08"; + version = "2024-09"; src = fetchurl { url = "https://download.db-ip.com/free/dbip-country-lite-${finalAttrs.version}.mmdb.gz"; - hash = "sha256-NdAXeo9anEGJUezxXEpABzNQyefONkh8wtFAnmAwXtw="; + hash = "sha256-Y3uLIETUMfR/IEXfhqz3srAJxe8yM7oRi+DrA2tL15Y="; }; dontUnpack = true; From 387fbb7a4bdff0cf99e0a2fd9d5e761d10655dd9 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Mon, 2 Sep 2024 15:29:14 +0200 Subject: [PATCH 188/235] libunwind: use default LLVM on riscv32-linux This was set because the default LLVM was too old. Now it's ahead, and llvmPackages_14.libunwind no longer builds for riscv32-linux. --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index fadf45056b6a..55e846d0af4d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -22232,7 +22232,7 @@ with pkgs; libunwind = if stdenv.isDarwin then darwin.libunwind - else if stdenv.hostPlatform.system == "riscv32-linux" then llvmPackages_14.libunwind + else if stdenv.hostPlatform.system == "riscv32-linux" then llvmPackages.libunwind else callPackage ../development/libraries/libunwind { }; libuv = darwin.apple_sdk_11_0.callPackage ../development/libraries/libuv { }; From 015c3f56b33111dd7dcc49fc7e4e62367064671b Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 3 Sep 2024 17:01:01 +0200 Subject: [PATCH 189/235] python312Packages.lxmf: 0.4.4 -> 0.4.5 Diff: https://github.com/markqvist/lxmf/compare/refs/tags/0.4.4...0.4.5 Changelog: https://github.com/markqvist/LXMF/releases/tag/0.4.5 --- pkgs/development/python-modules/lxmf/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/lxmf/default.nix b/pkgs/development/python-modules/lxmf/default.nix index d8538f1ccbc6..3e284afb3421 100644 --- a/pkgs/development/python-modules/lxmf/default.nix +++ b/pkgs/development/python-modules/lxmf/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "lxmf"; - version = "0.4.4"; + version = "0.4.5"; pyproject = true; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "markqvist"; repo = "lxmf"; rev = "refs/tags/${version}"; - hash = "sha256-O8uqGo4pgN1xb6/hwEb0B/ymeA9as9/mFj9t9dI4pNg="; + hash = "sha256-/qxAunSHNWCm3O9tBaEXZMkN2m8mZekSDFwQJHh++bM="; }; build-system = [ setuptools ]; From 45ba4560cfb8100f6549527a8a22185aa62b1aa8 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 3 Sep 2024 17:09:31 +0200 Subject: [PATCH 190/235] python312Packages.mkdocstrings: 0.25.2 -> 0.26.0 Diff: https://github.com/mkdocstrings/mkdocstrings/compare/refs/tags/0.25.2...0.26.0 Changelog: https://github.com/mkdocstrings/mkdocstrings/blob/0.26.0/CHANGELOG.md --- pkgs/development/python-modules/mkdocstrings/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mkdocstrings/default.nix b/pkgs/development/python-modules/mkdocstrings/default.nix index b15b9a728d1f..51c8c21ba771 100644 --- a/pkgs/development/python-modules/mkdocstrings/default.nix +++ b/pkgs/development/python-modules/mkdocstrings/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "mkdocstrings"; - version = "0.25.2"; + version = "0.26.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "mkdocstrings"; repo = "mkdocstrings"; rev = "refs/tags/${version}"; - hash = "sha256-720qF1t/xl2voOMtkOR7U3lFXia4nI0VirgEFHpb39k="; + hash = "sha256-266Kd3jp35RBvN1t11OiWszV5ehsZUXZxXpU+dA9XSg="; }; postPatch = '' From bf19852090b1f9d86a91ebe8f864a1a467f44ff5 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 3 Sep 2024 17:16:47 +0200 Subject: [PATCH 191/235] python312Packages.ms-active-directory: 1.13.0 -> 1.14.0 Diff: https://github.com/zorn96/ms_active_directory/compare/refs/tags/v1.13.0...v1.14.0 Changelog: https://github.com/zorn96/ms_active_directory/releases/tag/v1.14.0 --- .../ms-active-directory/default.nix | 25 ++++++++++++++----- 1 file changed, 19 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/ms-active-directory/default.nix b/pkgs/development/python-modules/ms-active-directory/default.nix index 9f0b1315a826..074b4bf380eb 100644 --- a/pkgs/development/python-modules/ms-active-directory/default.nix +++ b/pkgs/development/python-modules/ms-active-directory/default.nix @@ -3,29 +3,42 @@ buildPythonPackage, dnspython, fetchFromGitHub, + fetchpatch, ldap3, pyasn1, pycryptodome, pythonOlder, pytz, + setuptools, six, }: buildPythonPackage rec { pname = "ms-active-directory"; - version = "1.13.0"; - format = "setuptools"; + version = "1.14.0"; + pyproject = true; - disabled = pythonOlder "3.8"; + disabled = pythonOlder "3.10"; src = fetchFromGitHub { owner = "zorn96"; repo = "ms_active_directory"; rev = "refs/tags/v${version}"; - hash = "sha256-+wfhtEGuC1R5jbEnWm4mDHIR096KKEcG/K8SuItwjGk="; + hash = "sha256-E0GzKkpQU9pJ1a1N0NZjB2Q99yMlJkzNR0QzyiUzOpg="; }; - propagatedBuildInputs = [ + patches = [ + # Fix introduced syntax errors, https://github.com/zorn96/ms_active_directory/pull/88 + (fetchpatch { + name = "fix-syntax.patch"; + url = "https://github.com/zorn96/ms_active_directory/pull/88/commits/35da06a224b9bff6d36ddbd2dee8fdedab7e17bc.patch"; + hash = "sha256-0WGyr3Q4vcfFU72fox3/3AdHCmjzf6jGCGPx5vhhUvM="; + }) + ]; + + build-system = [ setuptools ]; + + dependencies = [ dnspython ldap3 pyasn1 @@ -43,7 +56,7 @@ buildPythonPackage rec { description = "Python module for integrating with Microsoft Active Directory domains"; homepage = "https://github.com/zorn96/ms_active_directory/"; changelog = "https://github.com/zorn96/ms_active_directory/releases/tag/v${version}"; - license = with licenses; [ mit ]; + license = licenses.mit; maintainers = with maintainers; [ fab ]; }; } From 9cdf2347ee0817ac01dfd44b5dfb55f3916a9667 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 3 Sep 2024 15:18:24 +0000 Subject: [PATCH 192/235] python312Packages.msgraph-core: 1.1.2 -> 1.1.3 --- pkgs/development/python-modules/msgraph-core/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/msgraph-core/default.nix b/pkgs/development/python-modules/msgraph-core/default.nix index a22a45e5714c..411b434bbac7 100644 --- a/pkgs/development/python-modules/msgraph-core/default.nix +++ b/pkgs/development/python-modules/msgraph-core/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "msgraph-core"; - version = "1.1.2"; + version = "1.1.3"; pyproject = true; disabled = pythonOlder "3.8"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "microsoftgraph"; repo = "msgraph-sdk-python-core"; rev = "refs/tags/v${version}"; - hash = "sha256-Wc/FWwBZ6IkGoZKKhyybcfKqPpDCJx3YcxOAUcUy2JM="; + hash = "sha256-n0mAMuTRNEN+bCOvKoDFwL7nlv2mboO65nn6fDCITk4="; }; build-system = [ setuptools ]; From 12b2f7e6dae28cf48f4f29178282d1e98e6ab0f5 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 3 Sep 2024 17:26:02 +0200 Subject: [PATCH 193/235] python312Packages.nats-py: 2.8.0 -> 2.9.0 Diff: https://github.com/nats-io/nats.py/compare/refs/tags/v2.8.0...v2.9.0 Changelog: https://github.com/nats-io/nats.py/releases/tag/v2.9.0 --- pkgs/development/python-modules/nats-py/default.nix | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/nats-py/default.nix b/pkgs/development/python-modules/nats-py/default.nix index a79a068f86dd..e96ba513b131 100644 --- a/pkgs/development/python-modules/nats-py/default.nix +++ b/pkgs/development/python-modules/nats-py/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "nats-py"; - version = "2.8.0"; + version = "2.9.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "nats-io"; repo = "nats.py"; rev = "refs/tags/v${version}"; - hash = "sha256-xPjyi5dFR9xVp1Fl6mM2JNKTRlLBQ6J9aB0dpjnZ+eQ="; + hash = "sha256-r94dDXPpkLS1PsB9L4qlDw15tPa2vpxOS52eqJk2dNU="; }; build-system = [ setuptools ]; @@ -47,11 +47,12 @@ buildPythonPackage rec { disabledTests = [ - # AssertionError: assert 5 == 0 - "test_pull_subscribe_limits" + # AssertionError "test_fetch_n" - "test_subscribe_no_echo" + "test_kv_simple" + "test_pull_subscribe_limits" "test_stream_management" + "test_subscribe_no_echo" # Tests fail on hydra, often Time-out "test_subscribe_iterate_next_msg" "test_ordered_consumer_larger_streams" From 4be51023c545b2cb2a0dbaaa697fb88e6bce818a Mon Sep 17 00:00:00 2001 From: Enock Seth Nyamador Date: Tue, 3 Sep 2024 17:31:45 +0200 Subject: [PATCH 194/235] =?UTF-8?q?josm:=2019160=20=E2=86=92=2019207?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/by-name/jo/josm/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/jo/josm/package.nix b/pkgs/by-name/jo/josm/package.nix index 48b92f55bec3..16dbb8426aeb 100644 --- a/pkgs/by-name/jo/josm/package.nix +++ b/pkgs/by-name/jo/josm/package.nix @@ -3,15 +3,15 @@ }: let pname = "josm"; - version = "19160"; + version = "19207"; srcs = { jar = fetchurl { url = "https://josm.openstreetmap.de/download/josm-snapshot-${version}.jar"; - hash = "sha256-a0Tu0GkXH/MYR5llmVaVcEBvmr50sX4oSsCZSzo5dkE="; + hash = "sha256-dYDJmGXIKd2GhjyKBpQjoIfz9giBsgFdC0TaKplxiPY="; }; macosx = fetchurl { url = "https://josm.openstreetmap.de/download/macosx/josm-macos-${version}-java21.zip"; - hash = "sha256-5sn4Wo4VMIZ79v/FegKrFQ62cngAQLc1luTnvhCO7y8="; + hash = "sha256-A34nd+RBipON5zOKBD57L1l2KACYEUHNjxs0N6xqoXc="; }; pkg = fetchsvn { url = "https://josm.openstreetmap.de/svn/trunk/native/linux/tested"; From 4e0ca3fbfeffa67ffc28ce71454c2447fc362b21 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 3 Sep 2024 17:42:19 +0200 Subject: [PATCH 195/235] python312Packages.nocaselist: 2.0.2 -> 2.0.3 Changelog: https://github.com/pywbem/nocaselist/blob/2.0.3/docs/changes.rst --- .../python-modules/nocaselist/default.nix | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/nocaselist/default.nix b/pkgs/development/python-modules/nocaselist/default.nix index c8129568a5ce..ddb10ecf6fdc 100644 --- a/pkgs/development/python-modules/nocaselist/default.nix +++ b/pkgs/development/python-modules/nocaselist/default.nix @@ -2,26 +2,29 @@ lib, buildPythonPackage, fetchPypi, - pytest7CheckHook, + pytestCheckHook, pythonOlder, + setuptools, six, }: buildPythonPackage rec { pname = "nocaselist"; - version = "2.0.2"; - format = "setuptools"; + version = "2.0.3"; + pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.10"; src = fetchPypi { inherit pname version; - hash = "sha256-MnCLcAoaUxM+a7XMUzMsl3Wwx8lZpflyV5MXH9L0yKU="; + hash = "sha256-VXFNqEM/tIQ855dASXfkOF1ePfnkqgD33emD/YdBD+8="; }; - propagatedBuildInputs = [ six ]; + build-system = [ setuptools ]; - nativeCheckInputs = [ pytest7CheckHook ]; + dependencies = [ six ]; + + nativeCheckInputs = [ pytestCheckHook ]; pythonImportsCheck = [ "nocaselist" ]; From f258df8d6fd55b6d3f67f2268199d17ec968f1bb Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 3 Sep 2024 17:49:32 +0200 Subject: [PATCH 196/235] firefox-unwrapped: 129.0.2 -> 130.0 https://www.mozilla.org/en-US/firefox/130.0/releasenotes/ Fixes: - CVE-2024-8381 - CVE-2024-8382 - CVE-2024-8383 - CVE-2024-8384 - CVE-2024-8385 - CVE-2024-8386 - CVE-2024-8387 - CVE-2024-8388 - CVE-2024-8389 --- pkgs/applications/networking/browsers/firefox/packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/browsers/firefox/packages.nix b/pkgs/applications/networking/browsers/firefox/packages.nix index 3e620b946b7b..6488b091ce51 100644 --- a/pkgs/applications/networking/browsers/firefox/packages.nix +++ b/pkgs/applications/networking/browsers/firefox/packages.nix @@ -5,10 +5,10 @@ { firefox = buildMozillaMach rec { pname = "firefox"; - version = "129.0.2"; + version = "130.0"; src = fetchurl { url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz"; - sha512 = "f6805a87e5cb4e437583916e3ec1b312dc73eec5fc06ce7a038b13bd7c6827b18cf383c30645d96623ce41675351f3023ec6b9f89d676f1c889994eae79f2c13"; + sha512 = "d0d11b38d9e02fa15298ec13336bb086668b4f36b3ce9ced218a265327fd4822b9fea4303402631947ea3c20490c414de87f8df3e7c23d2e02b70f0456b9af40"; }; extraPatches = [ From 1513714dd6ebb66ce8342f37701f9eb95445bd86 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 3 Sep 2024 17:50:14 +0200 Subject: [PATCH 197/235] firefox-bin-unwrapped: 129.0.2 -> 130.0 https://www.mozilla.org/en-US/firefox/130.0/releasenotes/ Fixes: - CVE-2024-8381 - CVE-2024-8382 - CVE-2024-8383 - CVE-2024-8384 - CVE-2024-8385 - CVE-2024-8386 - CVE-2024-8387 - CVE-2024-8388 - CVE-2024-8389 --- .../browsers/firefox-bin/release_sources.nix | 826 +++++++++--------- 1 file changed, 413 insertions(+), 413 deletions(-) diff --git a/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix index 53b396126066..91c62ae3c246 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix @@ -1,1035 +1,1035 @@ { - version = "129.0.2"; + version = "130.0"; sources = [ - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-x86_64/ach/firefox-129.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/130.0/linux-x86_64/ach/firefox-130.0.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; - sha256 = "7aaaef8961f1a15cedf6b5628f8d9b39e4df21949f3de29c9cff701b8a5396b2"; + sha256 = "1eaadbd00104e0dc0fb29ef362fdf4a4b440ef5595d9eed7095768505f316701"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-x86_64/af/firefox-129.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/130.0/linux-x86_64/af/firefox-130.0.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha256 = "183a0bd2d72aa5d37a75c48ec88669d9596daf26bc201c2ae677b817b470de2a"; + sha256 = "19f139b7ff3ae081fce8daaa191ea1ffc50d881c69430950ab79bba7203a1309"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-x86_64/an/firefox-129.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/130.0/linux-x86_64/an/firefox-130.0.tar.bz2"; locale = "an"; arch = "linux-x86_64"; - sha256 = "de0e5ff3726ffb24a3c395364a81872f2c92d8fe5792977671bdbc947437a68e"; + sha256 = "f4e5d7782928c2e0cc0b00597399420eaba9141cbe4837c692fb0f5bdeeb34d7"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-x86_64/ar/firefox-129.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/130.0/linux-x86_64/ar/firefox-130.0.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha256 = "f9ec116e68473c3b9758690c93d6a01b75f147ffa388123f8588f9f1c21af6e8"; + sha256 = "02e1e491e89f3eadb15f2b1d29220f22ed1249371374766964103efbf888ce6b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-x86_64/ast/firefox-129.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/130.0/linux-x86_64/ast/firefox-130.0.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha256 = "494f0f5c2a87d72d39d0056bd6ed190d874a89980090b20ce0a35b262b9e2c15"; + sha256 = "f630bd0e24d7cefa17af48f76744bb3f7953d59fe90fb22249c7d4c10d0b3c6a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-x86_64/az/firefox-129.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/130.0/linux-x86_64/az/firefox-130.0.tar.bz2"; locale = "az"; arch = "linux-x86_64"; - sha256 = "fcd4a02e5615fb249ecb03d494c5360f563ae87bd44fb2bda7f0767083f1fbf7"; + sha256 = "78f5339a348fd974953e3968f9954fbff33a1c8fb17910b2937bf1d7c9448264"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-x86_64/be/firefox-129.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/130.0/linux-x86_64/be/firefox-130.0.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha256 = "8053d43134e823e974786f0ccd3182bab8a13b6eb07e40787890474e4990087d"; + sha256 = "954eae8f384cac8a3ed9dab35a3867f6c1421f2c1683517f20abc166aa793d96"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-x86_64/bg/firefox-129.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/130.0/linux-x86_64/bg/firefox-130.0.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha256 = "69c48d88c051f56c222ebf9828ca7b66f8713e2649b4fcf1224f551765cf584d"; + sha256 = "e5efbd189dbda6f40b7f1f3e931ac767b418ffc45ded2545f5188ae59610581e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-x86_64/bn/firefox-129.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/130.0/linux-x86_64/bn/firefox-130.0.tar.bz2"; locale = "bn"; arch = "linux-x86_64"; - sha256 = "e246019f72f0636bb42132b0c008151adf9d3e86578833a9259c640529f31dce"; + sha256 = "ea5cdbac99328ba740b340c1f857084ce05e39bb7e6d6733ccd607df8fb131bf"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-x86_64/br/firefox-129.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/130.0/linux-x86_64/br/firefox-130.0.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha256 = "bda1bf4cab048cb35595213ecdc2a628d6bca359cb39b946718860a5a6ca224b"; + sha256 = "30dbe29c61d7ec15c061f9d373a749258a507eb955a4b9e7f8ffaf0d54819d87"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-x86_64/bs/firefox-129.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/130.0/linux-x86_64/bs/firefox-130.0.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; - sha256 = "3b5a1a9555d8750a7885df9d6faebd4061cb0392a6c0b64993d808caeac0da6d"; + sha256 = "3dcae1a08bdefa21715948a4a09c4f239192bc31e822fc3144e3cdf2f05d102d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-x86_64/ca-valencia/firefox-129.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/130.0/linux-x86_64/ca-valencia/firefox-130.0.tar.bz2"; locale = "ca-valencia"; arch = "linux-x86_64"; - sha256 = "22b7088c272d84a1d092d439603d3845ea485432551bffe96beda477b116b8a1"; + sha256 = "fb96ec8f33ab2093eeb3c2ec7995b99b2886fc84c030bec858e59fd6ded4a896"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-x86_64/ca/firefox-129.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/130.0/linux-x86_64/ca/firefox-130.0.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha256 = "71e732f53f0c95a29011fc80f12e3c65d20ba00843aa2a237c97352912bd0ff5"; + sha256 = "769f8b17187f9f0314a08c34fd11ed0b8361d1fe3bbacf4f7a29510b19dc90d1"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-x86_64/cak/firefox-129.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/130.0/linux-x86_64/cak/firefox-130.0.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha256 = "e97b8371b38fb152e1ffa0915a011e1a134eb12b472be657ae2946237ec36f09"; + sha256 = "1264ec6f4ba3d640e4fe7599b9d123711f77d44d8f954d66405dfe81b0144fd8"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-x86_64/cs/firefox-129.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/130.0/linux-x86_64/cs/firefox-130.0.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha256 = "097bda337bc34a899857b948cb05a7394e60d45fcac08649a0b3e05e86cf5518"; + sha256 = "e35491e61c1a7c95593a97420f4551624845cb3126743b56f3258cd316fa747c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-x86_64/cy/firefox-129.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/130.0/linux-x86_64/cy/firefox-130.0.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha256 = "ee6e799d8d1722ce7ae7965f9322e32482913905737ba0be43fe5fff89f73a12"; + sha256 = "3ccbc62875713e1c8b939de0f832fc428517d0ff21dc46172dfc9125b2db8cb4"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-x86_64/da/firefox-129.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/130.0/linux-x86_64/da/firefox-130.0.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha256 = "4edbe9fb78034bb68085cb4a28f5b21ba0b136ca6aa61e527c5aa938f14cad33"; + sha256 = "5557459e2a25b0a773c74eff94bda536fae2c43b7d6db3ca8e8526a640efd547"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-x86_64/de/firefox-129.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/130.0/linux-x86_64/de/firefox-130.0.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha256 = "566a6a89998d039755b0a1fe52967df84851693ec4ac980dd96775abf6f48383"; + sha256 = "f4b2685a642ec9f279839a9cde7b470b67bc99fae604a304f285dbb06df9625b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-x86_64/dsb/firefox-129.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/130.0/linux-x86_64/dsb/firefox-130.0.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha256 = "25fd4db8471f79631ac37cd6f1624344b3b1c6074b797ed2495bd07298666bd3"; + sha256 = "b0b53cc85d879ac47951437a23fe6d8990c50c9b92c71579cf6a09fc1ca4ebc8"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-x86_64/el/firefox-129.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/130.0/linux-x86_64/el/firefox-130.0.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha256 = "f89c3d396e4f9c4aa7262ed3148d0823bd627985cb1b1b5b9a621ad652197b15"; + sha256 = "d2376da49ea868149cc2dea4876fdd17f6147935bc19f73a9c11d12ffab0d1ae"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-x86_64/en-CA/firefox-129.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/130.0/linux-x86_64/en-CA/firefox-130.0.tar.bz2"; locale = "en-CA"; arch = "linux-x86_64"; - sha256 = "2f9891b64a32f4ace5cfaf8da2bf8020c06cda82f54815888ec8d322a43186fd"; + sha256 = "59bcfc8395db122304a81dd1fe00e4b93b4aa0f1c32c86933d9abd453043371f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-x86_64/en-GB/firefox-129.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/130.0/linux-x86_64/en-GB/firefox-130.0.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha256 = "4f79574372874afa16f3e15663bb241c2d4487228525813b02b52beafa7ab696"; + sha256 = "c253b01c60c74fa6f4ca29124c0919b5223990fc222fd338e8fb334282645706"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-x86_64/en-US/firefox-129.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/130.0/linux-x86_64/en-US/firefox-130.0.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha256 = "abc39c9deb686084933371bbe0546001f7bfab46c9d7a0cf4b1a4a025886cd5e"; + sha256 = "d5246cea96094146cb4403df7797df3000e94d9c9b7e6101700283a347d03ef9"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-x86_64/eo/firefox-129.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/130.0/linux-x86_64/eo/firefox-130.0.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; - sha256 = "ea987042822c4525fbf9bc9aafb52d8bac31f660350d4b716805a56578b1a180"; + sha256 = "8013bc9d346b83fa76222d65346e6cabac25678ce50ffa35e7180f91d89c46e8"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-x86_64/es-AR/firefox-129.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/130.0/linux-x86_64/es-AR/firefox-130.0.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha256 = "08300765d0b45acc05a5a1570c440d937f9f0b86e7901cef3961d3ea4b6bd65d"; + sha256 = "25a7f8dc43b5823a70dc8a918952af9b098d5c87ad6c3371eb35bbe3bc0fb984"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-x86_64/es-CL/firefox-129.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/130.0/linux-x86_64/es-CL/firefox-130.0.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; - sha256 = "f00f2cf4e4d99441c6e412696ba99062253297384b7c1fff4302f26abcebf448"; + sha256 = "337f250823e59a4687fb87bc0de5b4f899920d70c110ae898682c1d60b5cac77"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-x86_64/es-ES/firefox-129.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/130.0/linux-x86_64/es-ES/firefox-130.0.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha256 = "a0995bb508d84572aa1fbec2b03d822bad6ad0204cae640d55bda1f94bf31d2d"; + sha256 = "b024a13dfc82f9e633b3fe752f5ae30f05e91f1dc6714eafcf949d5603a02924"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-x86_64/es-MX/firefox-129.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/130.0/linux-x86_64/es-MX/firefox-130.0.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha256 = "0cebcbeae39cb6c22a8f7187ad743185c7a5608a052a8e89c9375540c1864cfc"; + sha256 = "1a04281437677e14e29c08ac06310c3809f76ddb81405c0693eeb1133381986c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-x86_64/et/firefox-129.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/130.0/linux-x86_64/et/firefox-130.0.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha256 = "311ad4f3f82ad0b6ddcbb04eba56cfa677b4e647a7edd6ab93b839e445ca37fe"; + sha256 = "709b520fc8829f4a9c79e3387de809bd466db679250a29c6cb282ce03bef23e0"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-x86_64/eu/firefox-129.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/130.0/linux-x86_64/eu/firefox-130.0.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha256 = "f29874ec11d9b379253c3f1cb0af6dce9bc234f62095f6a5384e7fc71c8790b4"; + sha256 = "75fa339c21da917e158b26a2a0806e24a4e784fa82f19d24af360ae85c8158fa"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-x86_64/fa/firefox-129.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/130.0/linux-x86_64/fa/firefox-130.0.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha256 = "bf533e90cc97ffc202031ad6e031f927cac8ed68a36ed085362fe5b2c71b75b9"; + sha256 = "91c835b7cc9ad2b4537d0bd01bf93e5f4f23682b111a45ff288a04ff5e8ad8c5"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-x86_64/ff/firefox-129.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/130.0/linux-x86_64/ff/firefox-130.0.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; - sha256 = "0b49ab0e7fe4b54b31b459d6589f9d305a30e51b288f5801caa308879c6e9314"; + sha256 = "dce24848569ec9d393284f1a464b4c003bc391e03d31b88b9896c179fe40e5f1"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-x86_64/fi/firefox-129.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/130.0/linux-x86_64/fi/firefox-130.0.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha256 = "6504da2de952fe15f7ab2384a24f13583a312ace4dcd5a3b047fd56bfd0c637b"; + sha256 = "828c5b47dc57a963c4a40161f1db6eaa15905a569bdf58d3ec46df011f35a5be"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-x86_64/fr/firefox-129.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/130.0/linux-x86_64/fr/firefox-130.0.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha256 = "6306db7115a74440e6334ac4f388201ab891944aab03751a211fe0d6a963476f"; + sha256 = "f1970d473dbc781636ddd10d92ae44a9d13767eb7a1f6dbd51ab14075cc0bf81"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-x86_64/fur/firefox-129.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/130.0/linux-x86_64/fur/firefox-130.0.tar.bz2"; locale = "fur"; arch = "linux-x86_64"; - sha256 = "18faff8dcff0bdf8a5bd0e9bfabcc6a341fe422a3c95437e5253f672b6a60afb"; + sha256 = "a92064ba019f38f490e524778902a8a3432f81cb3ae9e1225f3cddb6bc0fcbe3"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-x86_64/fy-NL/firefox-129.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/130.0/linux-x86_64/fy-NL/firefox-130.0.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha256 = "cb96cb4d0c6658a6e564e9ae379a8b6b90e964411aff0f30ccf213ae93d64351"; + sha256 = "e2ce677721495b35b534f6cdd451ebc38f5c30c1275332a7b205d4554ceeb9d8"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-x86_64/ga-IE/firefox-129.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/130.0/linux-x86_64/ga-IE/firefox-130.0.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha256 = "7d45b7ba424003ecf8ff9f2e22c8881445ed328a7c3d28c7194e856278b59daa"; + sha256 = "7d6374a1a42cb3a9a0e95f6bcd492c4fbe226d0025ea69d9abda63e8f95b53b3"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-x86_64/gd/firefox-129.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/130.0/linux-x86_64/gd/firefox-130.0.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha256 = "83a3cb11b7595b630091a8c65cc78ac0585c5a582513e2a376144a011316e2ba"; + sha256 = "c7fde87c85e8c1709e29b5d8ddb06afe5398c4297c9cbf5c9fbaab8e038f72f0"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-x86_64/gl/firefox-129.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/130.0/linux-x86_64/gl/firefox-130.0.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha256 = "b57957ddf205a69e326d4f018d0c359ef5613f46fc29251fe011e8e7779283c6"; + sha256 = "cb022e389b67e2999424314a557d5d726032062979539a69bd35b1df9cd02d17"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-x86_64/gn/firefox-129.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/130.0/linux-x86_64/gn/firefox-130.0.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; - sha256 = "884eb5acafa07240a992efdd9653ccef3002a4112854e767cbe00856aa1d7da6"; + sha256 = "c827b324b327c948ea169802809a9b09f4b3ee8fc9d0b7afeaf75565a8171361"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-x86_64/gu-IN/firefox-129.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/130.0/linux-x86_64/gu-IN/firefox-130.0.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; - sha256 = "e6c7181087c49b702288c43c033451344b4029f6088ed5d6f8c7d870d3de29e7"; + sha256 = "45d3031bb4cf32834365a753e396671363981b1ddfb7135f1b996b551c435386"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-x86_64/he/firefox-129.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/130.0/linux-x86_64/he/firefox-130.0.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha256 = "943b6ce9d9831bd3321b71cc9796ee3b311168aa14536bfa27a857f4e9f285e7"; + sha256 = "fe5592a0e45a25446f6c5b9a151ccdc84de6c2dec7d743817fb205ea803d52d7"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-x86_64/hi-IN/firefox-129.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/130.0/linux-x86_64/hi-IN/firefox-130.0.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; - sha256 = "04d511d86ff2d7ca868358e3713e8354c6953f52c12553faac13bc538782a634"; + sha256 = "444b72f75c56ac24b86ce28312d1674ee471085537801728651bb9c29ba3536f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-x86_64/hr/firefox-129.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/130.0/linux-x86_64/hr/firefox-130.0.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha256 = "97182b477be51715d2d241e87954a5b722d1b5555047487774e069fcb73802c9"; + sha256 = "c3485fa6c9cd847fa530fe9e0c219216636c5f3979a334e1217a35dfd6169af6"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-x86_64/hsb/firefox-129.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/130.0/linux-x86_64/hsb/firefox-130.0.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha256 = "68495a5bcd85e28a125673cf2801b41f039d169dd5d10a375e298be65278474f"; + sha256 = "797c00b1023d4f0d906c657c8200f3f15435b163bfadaad60f20e699612938a3"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-x86_64/hu/firefox-129.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/130.0/linux-x86_64/hu/firefox-130.0.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha256 = "b46db68cc2488c7632cf2ba9b685526c8ae8f4e528ecd37c885e034a1bb548d9"; + sha256 = "11a769e4794cca545faa04f8dcc82dbb5104412609ef0dc3405b85494abf0e5a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-x86_64/hy-AM/firefox-129.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/130.0/linux-x86_64/hy-AM/firefox-130.0.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha256 = "ee6de2465b22e138dbfae37bbac83f0d6ce4367bb6de3bd0baf7753d5e0fa76e"; + sha256 = "c37f44cea3e6e12d8ba6c10f1b5dc705fcd8064583501a63ef82d1d6b5d4e97d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-x86_64/ia/firefox-129.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/130.0/linux-x86_64/ia/firefox-130.0.tar.bz2"; locale = "ia"; arch = "linux-x86_64"; - sha256 = "f7ab6e0c7acd4480fa6f3e1aeb6ea27df9f105a4b62ddb4f9830df0fc70c2a35"; + sha256 = "efa1db0bee0a27a11da384f7cb7c678772f4f141042f3f46f7d16274cb7dde1e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-x86_64/id/firefox-129.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/130.0/linux-x86_64/id/firefox-130.0.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha256 = "cee0868a891b37c669127a6a8c4235ba1aa6b32d3e6b35cc0c63377409d3cf14"; + sha256 = "754e86f1060beaab3c08e4c7a1e6e83e3740af8ef7bfa21d5b22cf1a6c03b5d3"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-x86_64/is/firefox-129.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/130.0/linux-x86_64/is/firefox-130.0.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha256 = "5acc79cab57f7fe96f4b9c620734c8085b845adb07e1173fc01e23ddd8296f01"; + sha256 = "af32a3b1b907b03924534c380321ae74d77d2b01b68ee19b4d3d50047131fa3a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-x86_64/it/firefox-129.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/130.0/linux-x86_64/it/firefox-130.0.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha256 = "626304726111b560469f8e091214f7b0eff5a0976966f3c95f10ba39f854991b"; + sha256 = "8ec7df398ee4b098d95de5926d0f143146eaae890851301012538a06fd69609d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-x86_64/ja/firefox-129.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/130.0/linux-x86_64/ja/firefox-130.0.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha256 = "86d8254bd6f1dbbcc83a482d4c3fd95e1141bde2f12270cb00f5c775dd7a0414"; + sha256 = "b1947d19aa63873f1686b3b8d00311b75341aa08dbcf779f64219276d8ea1045"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-x86_64/ka/firefox-129.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/130.0/linux-x86_64/ka/firefox-130.0.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha256 = "25afab664c50acb86a7cda73089a9245543656ff6b5a2657e952bd91efcf0986"; + sha256 = "2c3228230ff17d8250cc1599c67c90cdc0849c3df0f4388ded4686fb469439a4"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-x86_64/kab/firefox-129.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/130.0/linux-x86_64/kab/firefox-130.0.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha256 = "4bbf14ea29b4a23812770013b99c8efc7f097332d6a4b154eb1727c7b5c5d077"; + sha256 = "08b9d800e8382736a59b1565b32c6d03c8a2a4ade7e51e7869a1722e25f3feb7"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-x86_64/kk/firefox-129.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/130.0/linux-x86_64/kk/firefox-130.0.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha256 = "f60d696894b0d400b5e7f144d133edbd52920d072abd02513f18ac247dd719dd"; + sha256 = "196f08f8ae82f809dbed03fa43ca138515ee8860c30f73b35f0b35fa4f969d2b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-x86_64/km/firefox-129.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/130.0/linux-x86_64/km/firefox-130.0.tar.bz2"; locale = "km"; arch = "linux-x86_64"; - sha256 = "f65e2c6b23754b54175e3b403ef1aaa0d86e7fe91807614caf10b24a5a7f2f0d"; + sha256 = "7cd4072c8c592ad4b024c937c01d20d05ec1fde4f063d14a2879f34cfb518317"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-x86_64/kn/firefox-129.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/130.0/linux-x86_64/kn/firefox-130.0.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; - sha256 = "1e726b29828081df75bdfe48e1f882460387e4ca34e5075e2e5de311ce4225f6"; + sha256 = "1c6e433ad246d06199ef3fd8074a55bad8de0520dad3c2d147ae8580c0fb8a03"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-x86_64/ko/firefox-129.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/130.0/linux-x86_64/ko/firefox-130.0.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha256 = "e380cbebd8032d489257509ae3ead668bb622ba79964fe2e115774ab723c61d0"; + sha256 = "ce613895915a2a219eed9672ae70364559e7061e5dfd01edab97bf3abf00e460"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-x86_64/lij/firefox-129.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/130.0/linux-x86_64/lij/firefox-130.0.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; - sha256 = "2ff47a150def39612f0c17199ef4ee71b6e75072fd24da896099a83b5342d161"; + sha256 = "03580f8dfffacf9d1147791c810154295b6ccff44562acc0d2744ff1f1acce9a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-x86_64/lt/firefox-129.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/130.0/linux-x86_64/lt/firefox-130.0.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha256 = "f4f9ef24a048a8d7d503080e007e7cae60b50cd3eafe10414e4915f9b50590a5"; + sha256 = "e1bc52dbef22e87b5d1323bffd19b04cdd235045bdae795a3d0f479776581f3f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-x86_64/lv/firefox-129.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/130.0/linux-x86_64/lv/firefox-130.0.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha256 = "1086b7a4d4aa0d85a11e83fda3250c21b0418f6760d6aff9091a853e36b14d1e"; + sha256 = "ffeec1f7e7e56d05c118c9abd7687c4c166e26d2f118788f5cd722c3448265cc"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-x86_64/mk/firefox-129.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/130.0/linux-x86_64/mk/firefox-130.0.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; - sha256 = "9da40a63e3d0839a5475e5d4b9471fe368850c782b5916ffa662c4503a5ab8c4"; + sha256 = "d8c6556e1b814cf8a5eba61b27d4ee574a2185f346738eebcc30ebeac7e9945e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-x86_64/mr/firefox-129.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/130.0/linux-x86_64/mr/firefox-130.0.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; - sha256 = "af6050c29664da52fcc95202aaf440706a0fd6607d8a51241310f2b06453670b"; + sha256 = "9ab01195f8a18cff688c2dc033959541cb27250b250942590497d7ccad22a648"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-x86_64/ms/firefox-129.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/130.0/linux-x86_64/ms/firefox-130.0.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha256 = "225ad7c0161f93fed2a5ca86c7cacdc77175676f314280a2ce80a270cdb10364"; + sha256 = "aea52d56866b6e1aa08685ae333999169f2d94d05c967c92bd57be357dd45175"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-x86_64/my/firefox-129.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/130.0/linux-x86_64/my/firefox-130.0.tar.bz2"; locale = "my"; arch = "linux-x86_64"; - sha256 = "8a124bda79de71bb3128c1614defb950a744d40271f01e7efdce96a248f3f3ed"; + sha256 = "42215d3cf8fa2a11f6b85146d27ff41be137a6872c79933cf32175c2269d7b04"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-x86_64/nb-NO/firefox-129.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/130.0/linux-x86_64/nb-NO/firefox-130.0.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha256 = "b8498c9fee3549d74a0de4145491aa722a25ce83e3f5c99f6964d545e59650d4"; + sha256 = "2e4e702d5a543815d23b1ca6d713eb22589783cc155f284a2169d4cc9d9d3efb"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-x86_64/ne-NP/firefox-129.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/130.0/linux-x86_64/ne-NP/firefox-130.0.tar.bz2"; locale = "ne-NP"; arch = "linux-x86_64"; - sha256 = "393ddf518ac361e21a9f74b3f18f2521e113b628e60adaad02cd7c9534f706a1"; + sha256 = "c354a4020a5651807661a3ea99edd43e3a3f3be8c33390cbe15877e00168193c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-x86_64/nl/firefox-129.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/130.0/linux-x86_64/nl/firefox-130.0.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha256 = "8ee2329b09f50f7359954ac3dbf9cb6a98a038b0f23ac12f7bd57a65cb0e1671"; + sha256 = "9c7c360f73a67d1e5560ed1963a2cd49d8c15999d171bf66ce80e5f3d9c53313"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-x86_64/nn-NO/firefox-129.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/130.0/linux-x86_64/nn-NO/firefox-130.0.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha256 = "744fee46ca52133338e2a2c91c40dde6b0f40aec7cc1a262f3865875d0f05395"; + sha256 = "955f79942b635cc747a38409202e6d6bc9c2ab04aebfad8eff845ef5f0b301fd"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-x86_64/oc/firefox-129.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/130.0/linux-x86_64/oc/firefox-130.0.tar.bz2"; locale = "oc"; arch = "linux-x86_64"; - sha256 = "d3225783ccc2aeeb037435b7340706bb423ccd6b46fc64f5dc2fe9c2b6c5475e"; + sha256 = "33ca7d5fb0aa43d866db02b32bf6b1eb3b90a3c6855b09986446e0765ce50b38"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-x86_64/pa-IN/firefox-129.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/130.0/linux-x86_64/pa-IN/firefox-130.0.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha256 = "a99e70e0abfc8b059a9d395110d52a42150d82fe34c99c8aa0883aad8894d608"; + sha256 = "d8350ebf24d6c232a9e67704a00ef358e5aa064a84debd60c89920ce7ef34ba8"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-x86_64/pl/firefox-129.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/130.0/linux-x86_64/pl/firefox-130.0.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha256 = "d7736cd892696aff5ddbf288d2ad6497e717d6239075b6e1ef97e08abff79c5b"; + sha256 = "ff192e3bf92c16a0fe56757a002480650474e5d9423e503e6a473f64328e352c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-x86_64/pt-BR/firefox-129.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/130.0/linux-x86_64/pt-BR/firefox-130.0.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha256 = "000690be0f8f09ab3a7f0416abf0526089592e1f7b7f405f0aa850836c0a5a29"; + sha256 = "2256b85a6ef45bd82d1d05fa5c2fc2c3999bf2e40279e977d956cc1d8021304b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-x86_64/pt-PT/firefox-129.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/130.0/linux-x86_64/pt-PT/firefox-130.0.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha256 = "eca4a2abe96623be899cf0c053c6f4f9fdb2c7bd2bf88b664eab9a515c6f7a25"; + sha256 = "eedd9081281d08a7ae5f12f3e93a1307fb4a188067e302fd06c05cdd0ff90ec3"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-x86_64/rm/firefox-129.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/130.0/linux-x86_64/rm/firefox-130.0.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha256 = "0dc4c7990dbcf497e0b08992d4d7cd835bfbed0c8a780b8800c2e37be6f1a822"; + sha256 = "9693b74ef657761a3e1dc59c68ff8a2ffbe84799ac595f69a58d29f218b1ce76"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-x86_64/ro/firefox-129.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/130.0/linux-x86_64/ro/firefox-130.0.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha256 = "817b740000d2e63e559743e1beb1cdabda304c171a2a9fd4e189d5ae8a0a1ae4"; + sha256 = "9c43a8168623e76a1c8d203a8a86e363bbb87e62c06e47785aead012739c193d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-x86_64/ru/firefox-129.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/130.0/linux-x86_64/ru/firefox-130.0.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha256 = "f72f1d5c3941136825e0a396ba649101403ca6663f0222cd3e4f8cf73311b4ca"; + sha256 = "3e45511d18f6aa7b5d6e439f5135cb7d6e021d1e76bccb52090698292049da14"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-x86_64/sat/firefox-129.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/130.0/linux-x86_64/sat/firefox-130.0.tar.bz2"; locale = "sat"; arch = "linux-x86_64"; - sha256 = "f0b5ec8b2661d431c31ae7e365bdb058b6a2b461110ee1762570050a30efde06"; + sha256 = "200a26993fb9d1c15ee6adc8a92e9d2aaded09f184fdd30ecf737e87e32d52f4"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-x86_64/sc/firefox-129.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/130.0/linux-x86_64/sc/firefox-130.0.tar.bz2"; locale = "sc"; arch = "linux-x86_64"; - sha256 = "af1698573ea3376f307f65d7f1f2209635c5cfb664bfda02f551cd32133b4469"; + sha256 = "7025d2c0223dc81963848220de63b9cc0abe21e763e621a74583371b8b9bca25"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-x86_64/sco/firefox-129.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/130.0/linux-x86_64/sco/firefox-130.0.tar.bz2"; locale = "sco"; arch = "linux-x86_64"; - sha256 = "fe91ca8ee0c532f8d385e7242d7ccfe9289ceb76076aaf250ab4134b112a3390"; + sha256 = "2d7543d911025578df15d722bdc819b6d8dbcde6bb21c064ed275f4747399749"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-x86_64/si/firefox-129.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/130.0/linux-x86_64/si/firefox-130.0.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha256 = "e878f39ec1636dc875ef010dd78d1ec4fe42cdeb4c529a71e54122b5ecbb6f90"; + sha256 = "81f88fa3fb430a9f4931eef8e7205859b345898f5fd59ff8ce367b14665efb0e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-x86_64/sk/firefox-129.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/130.0/linux-x86_64/sk/firefox-130.0.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha256 = "0ee3cc503f07879b443922a364f2a54ae4a5ea645e75d498dd86d50689ea3c76"; + sha256 = "3cf17666eb44a5669845b39e18e6174605443eb0ab81de54e27500549295b6fe"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-x86_64/skr/firefox-129.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/130.0/linux-x86_64/skr/firefox-130.0.tar.bz2"; locale = "skr"; arch = "linux-x86_64"; - sha256 = "f54927b3bf8e70326fbfb6279dee5e49c71c30b864398f18cbda9656af2ad14c"; + sha256 = "441ffac8d9adcc5e424cf22f7ce7d85c76f2003d438284efe024a8840aa43076"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-x86_64/sl/firefox-129.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/130.0/linux-x86_64/sl/firefox-130.0.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha256 = "d6b2fbe32b3828abd3d500f1cf2bba7cc6b5a43e84ea10e51fd80689a1a1b82a"; + sha256 = "db45907f84504965341e8dec90f903263c658f28716f898a5fa746ecb2ef4513"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-x86_64/son/firefox-129.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/130.0/linux-x86_64/son/firefox-130.0.tar.bz2"; locale = "son"; arch = "linux-x86_64"; - sha256 = "f165f02a2e6b3ad5dc0cee6423b99f3e39b9be404b8ab372ad7afe8fd0772154"; + sha256 = "1fabfdd5f406eabf6a3d3e172669e3b41e9a6d6f0f45b13d6debbd71522a0a53"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-x86_64/sq/firefox-129.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/130.0/linux-x86_64/sq/firefox-130.0.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha256 = "40cfd87b696bb431bf76345a15be0b91378e566a16d908bcd557e0411d6c583d"; + sha256 = "bf4d1c32abb4840aba03658b6aef50b06f101acbc3cdc64cf14675eba17bf29e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-x86_64/sr/firefox-129.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/130.0/linux-x86_64/sr/firefox-130.0.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha256 = "595a89f6981f9a6cf9f84bc1f22da72dd0aa1d475c9f2c4cd81b07c74abab2c8"; + sha256 = "ae5f3ea4be0fd90b1517d45cbae394fd107907b8c515377e7029d4f75dfb8ec4"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-x86_64/sv-SE/firefox-129.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/130.0/linux-x86_64/sv-SE/firefox-130.0.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha256 = "eeee44cf5a18f2b9eb40a06da9d9aece626652d54a0e238549a8312b8abde4be"; + sha256 = "3ef1dd5dfc693cc35caa161297e853ce3d15665792a867de3e0dc6d9f86a9a36"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-x86_64/szl/firefox-129.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/130.0/linux-x86_64/szl/firefox-130.0.tar.bz2"; locale = "szl"; arch = "linux-x86_64"; - sha256 = "9cd0e7ddb3a660a1807189a43d9dc8ed6752c24b983ffdf15455ebcc60e8c21b"; + sha256 = "cc62e4ab33b0b13d214af635df06c319fa9113e9957a04cb3f4578210e751ebc"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-x86_64/ta/firefox-129.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/130.0/linux-x86_64/ta/firefox-130.0.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; - sha256 = "6863e65e9428c0ff35ea602939732f858097502144f873ebb68ecd39cf129f49"; + sha256 = "5eb712fc1b8ed584bf651b26a3cda7742ba6de01c0db81a38459b88548315d8b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-x86_64/te/firefox-129.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/130.0/linux-x86_64/te/firefox-130.0.tar.bz2"; locale = "te"; arch = "linux-x86_64"; - sha256 = "1d3dc43fd6e0e728398941a8a0cdf568c43def57cd8ac33fefab7ecaf7838798"; + sha256 = "35c57b8cc5b1d1f06c0f1220acd5c79fb1c140f985d060bc79eb20e9bb9decc3"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-x86_64/tg/firefox-129.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/130.0/linux-x86_64/tg/firefox-130.0.tar.bz2"; locale = "tg"; arch = "linux-x86_64"; - sha256 = "93b1f1910585754378e8bc6b2e83db551ac9c3d4d58ebe35071409c16cdc6c83"; + sha256 = "de8348b0caebdfbe4d5d6772a46674bbda1155b110abd5eb27dcc34534db2f62"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-x86_64/th/firefox-129.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/130.0/linux-x86_64/th/firefox-130.0.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha256 = "c03cb0a9222d4f3eb307598bddfb87c99b702b65657a2d4e3fd8fd858fe75ae2"; + sha256 = "d3b0846c61711b38ee969c93a7d9dd23754bd4763166c931242d2924014cce6a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-x86_64/tl/firefox-129.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/130.0/linux-x86_64/tl/firefox-130.0.tar.bz2"; locale = "tl"; arch = "linux-x86_64"; - sha256 = "e303cf1df617025f2afee55e75e3416edffc6bf01434dd877ffb73f22571c57d"; + sha256 = "4101f1fc5140f0f4a9bc583092045dcd7fd6651ca39e6410cc79b605d288fbf4"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-x86_64/tr/firefox-129.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/130.0/linux-x86_64/tr/firefox-130.0.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha256 = "5fe53f7ad3b4555364d9ecd5a794bc5e6de01ec748e8551d9fcfa7d4a9eb7cb2"; + sha256 = "8c39bf726f0428926d045133a3488826ddf868a785808ca42539924d917a4fdf"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-x86_64/trs/firefox-129.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/130.0/linux-x86_64/trs/firefox-130.0.tar.bz2"; locale = "trs"; arch = "linux-x86_64"; - sha256 = "a1383fbcb469c613c4db07598977aed4d2e72ef52d8a1cb332ce868d741c4e36"; + sha256 = "f353730fe72dca60611261e41f406d28c5824d517a454a15b597c9298a11d99b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-x86_64/uk/firefox-129.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/130.0/linux-x86_64/uk/firefox-130.0.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha256 = "5849331f7b9a4463e637c5724e065e66adb40f8da2e06d6c68301c3b841a02d3"; + sha256 = "c692aa9686651288e27bf004406ff5dca87d0043f0cfd2a67bb4e8290505eeb4"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-x86_64/ur/firefox-129.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/130.0/linux-x86_64/ur/firefox-130.0.tar.bz2"; locale = "ur"; arch = "linux-x86_64"; - sha256 = "072e47775da45609663e64c424ecbb6da7237ce5137c31b3eb4839d3764d6f98"; + sha256 = "763e8033b610d9d3ea2c450bc3595a31c444c3cbb4cddc96c14806825ad443df"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-x86_64/uz/firefox-129.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/130.0/linux-x86_64/uz/firefox-130.0.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha256 = "0c9087fcb14f3bf64aaa3c5fc1a6f743362a689425b00fe017d50820b2e89be1"; + sha256 = "97bec7204d5b3f3449a400f0a351b542dc5330a27f0a3bf69d622242a22e2f81"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-x86_64/vi/firefox-129.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/130.0/linux-x86_64/vi/firefox-130.0.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha256 = "cda8eb64f5ecd7176bb6e4fc9b275504da6c0e56b3f4ddb24111df39867abdd7"; + sha256 = "710a5730f2c7590ce56554f60303f7e1d396bc9cccd84aad48cbf7edba9f2dde"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-x86_64/xh/firefox-129.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/130.0/linux-x86_64/xh/firefox-130.0.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; - sha256 = "49ba4199a22d86e654fa5e5a47474198d874ca17eb59a36bec6b732609aca223"; + sha256 = "30d59622a5b03b68b74ee4316deebd9602fa8d2ceba167e7bac37babbba2d388"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-x86_64/zh-CN/firefox-129.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/130.0/linux-x86_64/zh-CN/firefox-130.0.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha256 = "c21b6e85a22370f5d6a9b15597c90706e2d3b2efeb181077d7e2ce8ee3d4180e"; + sha256 = "95da22babf875ece55037e2ff83630598269302b7aeec8a18762bc928002e466"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-x86_64/zh-TW/firefox-129.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/130.0/linux-x86_64/zh-TW/firefox-130.0.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha256 = "4eefbada519857eef6a692fd4497b45bdd901daa66a308caf35a37367734a259"; + sha256 = "a39b9208dbdb105c694db0b00ee2cb44437a5212e0d1ec5b94f437df7cc1672f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-i686/ach/firefox-129.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/130.0/linux-i686/ach/firefox-130.0.tar.bz2"; locale = "ach"; arch = "linux-i686"; - sha256 = "dc6a9df80df27e8aa7ea4eedf5136e302a4189b98bf135942a4b6aa92b2008fe"; + sha256 = "564dca722ab444a1912d0802e99d3977a361e26031b94401671028545e3ef675"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-i686/af/firefox-129.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/130.0/linux-i686/af/firefox-130.0.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha256 = "e7537da17e34b3cfc95ced5c0b12982d1049403fab440f767768882f844064c5"; + sha256 = "4ed4e6cf74a6e7d6f76f51e05c99bef42c9d80084cf6100e6c4554e843ad857d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-i686/an/firefox-129.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/130.0/linux-i686/an/firefox-130.0.tar.bz2"; locale = "an"; arch = "linux-i686"; - sha256 = "909adef9469aaeb8978a2b2232aabd4fbae789a97c00088f1629bb191d0d9e5d"; + sha256 = "0a46890f861a52441b105984510bb7cc7e37cdbb5c78a2708ef126c42daf24ac"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-i686/ar/firefox-129.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/130.0/linux-i686/ar/firefox-130.0.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha256 = "3c4b8d7c26074573efce4952d3494c40d5f7632759008ca0623951934024e031"; + sha256 = "d35972a50d304d0558ca8724a126fee8a8048abd139a3777f8cf3686c8308ba6"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-i686/ast/firefox-129.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/130.0/linux-i686/ast/firefox-130.0.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha256 = "029ce1a8dec7b14ca671b9267bef8f7300dcffe80472cd8856baa8af23f748f2"; + sha256 = "06226e65d68dd71bb91047e6dafa627a6cca235bf3a225cef95dbf4934ed5742"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-i686/az/firefox-129.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/130.0/linux-i686/az/firefox-130.0.tar.bz2"; locale = "az"; arch = "linux-i686"; - sha256 = "ebf23eb5e9d0fd2a22d0a2c863f387a810a1e55355bbe9b0cbfcbd4183d6c848"; + sha256 = "667980fabd748a2a8c8eea4ffca9a596dc0d70e927cba87ef86f3311682f9549"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-i686/be/firefox-129.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/130.0/linux-i686/be/firefox-130.0.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha256 = "1b7d5803e425cacfb185f78fca810b511150c7c8251216be9da86bb8bddeb4bf"; + sha256 = "3a7019dfd0f3d5aac5c7b29b986a026c84b49c71338706f1b6524746642906c4"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-i686/bg/firefox-129.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/130.0/linux-i686/bg/firefox-130.0.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha256 = "27257813875b0684096f893360c5ac4efca419e41179537548c45c64ee93b50d"; + sha256 = "6f4a692a713111367d056d3523cc09dac82b5a52e4268c5a5cd549d725d59deb"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-i686/bn/firefox-129.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/130.0/linux-i686/bn/firefox-130.0.tar.bz2"; locale = "bn"; arch = "linux-i686"; - sha256 = "432f4822ed86bc232200bf8feb44e76cf4ce0625424f06bbf4b5836890290c2c"; + sha256 = "dac3c0184a40e4aa7222c0f4aae32bd38aed805e4f8ffeeb19d76b65d4df37f6"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-i686/br/firefox-129.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/130.0/linux-i686/br/firefox-130.0.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha256 = "72518fd9b89a9d362d6106d01e4cb9f65e94b29ad5d4935fe272c0d5fac7a697"; + sha256 = "b9a92320b7f0b17a33b5f76ccb39133ce6a3e822365381e8384df0d407223ffd"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-i686/bs/firefox-129.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/130.0/linux-i686/bs/firefox-130.0.tar.bz2"; locale = "bs"; arch = "linux-i686"; - sha256 = "9dabbbda2331c8b264bc8fa1a4f87086ea507905a51bb13a196f255faad17d99"; + sha256 = "ab790f5f48a9e12bd3a99e03687949c37d558f6808b8d1042878e59ab50f5b92"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-i686/ca-valencia/firefox-129.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/130.0/linux-i686/ca-valencia/firefox-130.0.tar.bz2"; locale = "ca-valencia"; arch = "linux-i686"; - sha256 = "ea89121b4e5192712e9a67186666b564ab8ddd3f9cac1d7797692c6cea33823f"; + sha256 = "818f53e4d6790d4d3e61d7e9cd8d4e803096f7b89c138f41f240ca29f32f905f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-i686/ca/firefox-129.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/130.0/linux-i686/ca/firefox-130.0.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha256 = "1a62a13309cf8c9fb3acf9c30e6ffb21af0e7942a52b9e90bc13b135ff89196f"; + sha256 = "53ce0a5ce7a99d2e485790bf9e406f1b3b17c40a8bc4318609f410492714ab54"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-i686/cak/firefox-129.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/130.0/linux-i686/cak/firefox-130.0.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha256 = "b452a278dad279ba9075e955718194e58b90eec80edf98e9f9f3ad12ecc15472"; + sha256 = "47ec72fb4474ec5bdcad20f12b5680a5c06bf799feed95b237df16ff2c10ad9b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-i686/cs/firefox-129.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/130.0/linux-i686/cs/firefox-130.0.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha256 = "5796ed1a488413e00b7895ffbf13e9882a245c883c4adc1bf0cc97e3619aec66"; + sha256 = "b690391cecf1de3c0f0af9501cae050dbfef4ff732e33feaf0f7d6435db6a379"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-i686/cy/firefox-129.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/130.0/linux-i686/cy/firefox-130.0.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha256 = "533cfc7830ef37ca6540f7ab2fdf7909d871a3155c348fc5e051330ffb0a6dc9"; + sha256 = "186056bad0eebace8769c41f1fcf9224ce2634da55a184611fdadff8ba8d8dad"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-i686/da/firefox-129.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/130.0/linux-i686/da/firefox-130.0.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha256 = "8bccc19dd59cc059ccb19d94b302fa8230443cb1930919a984919870b7f99398"; + sha256 = "f5de611dc10ffea99475be24ce3240186a671314d109ee982a04418710b34b94"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-i686/de/firefox-129.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/130.0/linux-i686/de/firefox-130.0.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha256 = "d964fe752283018bab7e8cfdb9c8d4adc2b38688ba5a194d75c6e353ae4d4d39"; + sha256 = "7a1e861d3fb6b03be8e91ce55c1c92fecda5a017e67694ebea56eaebb2ccade8"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-i686/dsb/firefox-129.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/130.0/linux-i686/dsb/firefox-130.0.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha256 = "725ae61a6743e82b835f2a0b103d2d345aa2d3f72b3fd7ee45424ef14e8e4190"; + sha256 = "c83e91309b4f7813129b39472f22ff2ee8bc391ca6c33141374a6249cc27b63b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-i686/el/firefox-129.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/130.0/linux-i686/el/firefox-130.0.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha256 = "52762372928f56005624e9f2042469e83032632dd151f831478c773deaf48111"; + sha256 = "ef3b34b1ad730ef590437f2adad07048bd8dd5769bcfd55f45974ab12bd62d5d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-i686/en-CA/firefox-129.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/130.0/linux-i686/en-CA/firefox-130.0.tar.bz2"; locale = "en-CA"; arch = "linux-i686"; - sha256 = "50621060f246bcd1e3f2e7de5e941bae17dfafdd4be01bb431245e40fcd4701a"; + sha256 = "583013c0f1b82f2929e1a51df5763b07a358e9af776584114fdb2025fbc198af"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-i686/en-GB/firefox-129.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/130.0/linux-i686/en-GB/firefox-130.0.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha256 = "207693709a20933c38aecbbb2721a52bda39213b656f12e614368d22cf8f1bd1"; + sha256 = "fac27a8e2ae3b65eb8a054c68271c037926baa519ec4381322abe33afa9d084f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-i686/en-US/firefox-129.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/130.0/linux-i686/en-US/firefox-130.0.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha256 = "10b24f1717a0ec5d8fd450740d948a157f6075bd07909b1d8a43aff7753c0bed"; + sha256 = "fca72dcd3748bea7bbeff81d9241c7d566159c91e36b1789c6b465670a1151ed"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-i686/eo/firefox-129.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/130.0/linux-i686/eo/firefox-130.0.tar.bz2"; locale = "eo"; arch = "linux-i686"; - sha256 = "1a2c610a8d327840af2c8363832b691067b15568ffb9f0907331f22dd17b807b"; + sha256 = "3ea81875cb5fd9b92968d4b834d1ce35fcc388c8d7a4b91c11eb3640d7d75104"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-i686/es-AR/firefox-129.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/130.0/linux-i686/es-AR/firefox-130.0.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha256 = "81de656e08edaf8527c00d925e7dcd9ad916938fc20e32e007763763b6e67b5a"; + sha256 = "ce4437bbcac1945dbd43a6300d7ea1730e5f87c2419946a6685501e83c2e4d3d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-i686/es-CL/firefox-129.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/130.0/linux-i686/es-CL/firefox-130.0.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; - sha256 = "6f262b62d9cfbb5d451d3cb40589c3ed069953e710e098d5fe2566e3c594a393"; + sha256 = "3e9ea0c9adf6f7c61a7bc9b8fa322b79c20ff5991a05c78ad764f59f58a847bc"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-i686/es-ES/firefox-129.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/130.0/linux-i686/es-ES/firefox-130.0.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha256 = "6fbe8832a1475407c37c44d097e530d03e0572c177366d79b9336f199445e679"; + sha256 = "4723e88bafbf57a84fb5c1564b27f81ea9a9f8583c869fd8152e4e2cbcd0e5f2"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-i686/es-MX/firefox-129.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/130.0/linux-i686/es-MX/firefox-130.0.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha256 = "e559bcb6185d89502ac9e71a91f2e770be61cb67fa9957a097891ca6fe44a2f8"; + sha256 = "0dff182954017cbace9e81c73d14bb2c81e6758eef0fd365e04844e41b45719d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-i686/et/firefox-129.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/130.0/linux-i686/et/firefox-130.0.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha256 = "472fa478b66f587f80d7dd51d40fd1ee54ef537cdf23fc92427c1c79a6452883"; + sha256 = "0c42654132ee50231ec9256d1f0c2d705db926a906fb2d49c7397e95971c6ff5"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-i686/eu/firefox-129.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/130.0/linux-i686/eu/firefox-130.0.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha256 = "fd8579deb8e1da9ecf3f812b2d5f00e507090e60c802bf77257f2281802ebf6a"; + sha256 = "b3384af9cab100057bab61db944e99e26ae56e60bb27421fdc02c27be79b0f84"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-i686/fa/firefox-129.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/130.0/linux-i686/fa/firefox-130.0.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha256 = "bd65e4309b0db9bf919bea27487033573c5dda66fb62f2520688f449fb57e9d1"; + sha256 = "aba8b14652908f9a3b77d59faf8f9b4300667ce60a6ee65aae4df54d4cede51a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-i686/ff/firefox-129.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/130.0/linux-i686/ff/firefox-130.0.tar.bz2"; locale = "ff"; arch = "linux-i686"; - sha256 = "83c3edd356c40dc3cd52338a4ee32ea6e729758bff03ca2e4e2bd2d4aba3467f"; + sha256 = "2c67474f17bf153aa80e437a503d67cc20a9d729f1468d60f806d321253ff094"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-i686/fi/firefox-129.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/130.0/linux-i686/fi/firefox-130.0.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha256 = "a179eadac35870ca98fe9bf16fff611efb8c62c0eb7091e1d55e5b8b9fdf4337"; + sha256 = "38cc478163ce4a6b3e70802abfdcc8b59d0ed302f379124165bda7f9c9ef33b6"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-i686/fr/firefox-129.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/130.0/linux-i686/fr/firefox-130.0.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha256 = "bc01513651247d50e3ae065e9ac3693d0e25ea10b00dbaaef09424b46ca843b1"; + sha256 = "b96e59897243686c683be02f9b9b68c241ad00903e977e0a92d2767a7657b16a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-i686/fur/firefox-129.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/130.0/linux-i686/fur/firefox-130.0.tar.bz2"; locale = "fur"; arch = "linux-i686"; - sha256 = "b7dc66967c52c1cf817859110c1d15958787ddd8e0aef1ea46ae70c87167b7fb"; + sha256 = "98c4483deb4f8a120c0e74934608a1994163f0413966aaacb526fb20959275f0"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-i686/fy-NL/firefox-129.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/130.0/linux-i686/fy-NL/firefox-130.0.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha256 = "cc942b523199e81b5574b1a972fdc9cce2ec73bbf1efd88366aa6ace3c9e409c"; + sha256 = "498a1ccaeacd1185e0ac27807b4e65b91c8ab8402a160715a7b129c703f28a6a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-i686/ga-IE/firefox-129.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/130.0/linux-i686/ga-IE/firefox-130.0.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha256 = "0efb2225b65df3640a690c6ca9e8d1c817b248b1ef0af8afe9175b4716b60215"; + sha256 = "0b14825d1612540585269e0bb74d2d74005d0aad8d9c0aaa81d73be14ff6c5f9"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-i686/gd/firefox-129.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/130.0/linux-i686/gd/firefox-130.0.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha256 = "15c9fea41632fd61e083d75538a76afe98ba09202ccbef44a9c1951fb99b1bb3"; + sha256 = "7bf897289348b72b72bd8ec72e95b7ec9a61017be93ce054a5cddce30769d694"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-i686/gl/firefox-129.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/130.0/linux-i686/gl/firefox-130.0.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha256 = "3e4f7dc67a9981c80859286c7f94da6b56e882d1706e1e6e56b97fc855b60891"; + sha256 = "c3e7bd95ddf3d6d9f36f5d7c59b8201cb8bba785d7f6f19118170b6c6edb2148"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-i686/gn/firefox-129.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/130.0/linux-i686/gn/firefox-130.0.tar.bz2"; locale = "gn"; arch = "linux-i686"; - sha256 = "99ba85209d17c203fd51107249603e4a79a547da06fda6eb19a387e0ef41e93e"; + sha256 = "47b1785b67b979a128a833a3625873fcf3ed1da01e3f01f2191ad28ff3a898a5"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-i686/gu-IN/firefox-129.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/130.0/linux-i686/gu-IN/firefox-130.0.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; - sha256 = "912873aa4a734f25ca1f0aca946713a53c1c01b093b12d722fde673cc53c66b5"; + sha256 = "da41f06490e1d7724617d5521453d13b65140f1b524f4e19f1c84b0379da2045"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-i686/he/firefox-129.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/130.0/linux-i686/he/firefox-130.0.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha256 = "21ce37a70f0ace5d15334e64633282f664161d58deb315ac48749cebab58a064"; + sha256 = "84c0ea6fe86def639cdc57b138771fa4bb017c341c327914109b0d5d7ca6e2a2"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-i686/hi-IN/firefox-129.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/130.0/linux-i686/hi-IN/firefox-130.0.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; - sha256 = "dc700ef62e264d0c493fe1ed6ff8d77672baca2bac5314e85dfb4ead137f09d6"; + sha256 = "33721db288705df409ee212c4f087a54e8e5a479b2ef37c52151d0c5f01f61af"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-i686/hr/firefox-129.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/130.0/linux-i686/hr/firefox-130.0.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha256 = "2f23713521bf0e9ae4eea5e38ef653d6c16400d70979b648b23c7e913847380a"; + sha256 = "d8ee55f4c0728aecb2a3b167dd8c568a61eb519a90cce452afb3e62d6a57fac2"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-i686/hsb/firefox-129.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/130.0/linux-i686/hsb/firefox-130.0.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha256 = "51436bdc094c6fa921e0f778cb5f4bfc866e7b6d25e76e096bd08d469e6d79cb"; + sha256 = "71638ba15aae3ad70347681f3ac68138fe5473108b4424f55d8cb2838ba73a61"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-i686/hu/firefox-129.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/130.0/linux-i686/hu/firefox-130.0.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha256 = "3ad2f8847414dc2ed8b6c1016ffbbf50ade5d45a19a7a6e2b4d9e39a63f65610"; + sha256 = "c97a8168c05d3af087dff1b1ec0df185cceff9144d3bfc1bcecb5fb0986d5a2d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-i686/hy-AM/firefox-129.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/130.0/linux-i686/hy-AM/firefox-130.0.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha256 = "ee64c6125a882e8f302162a2e08694b2ca95de1290b5b55e534887e6f50715d2"; + sha256 = "41de887a0a9008ffeb6389235dd3032842ce0776cc3947dcb27c79f85a5c147f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-i686/ia/firefox-129.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/130.0/linux-i686/ia/firefox-130.0.tar.bz2"; locale = "ia"; arch = "linux-i686"; - sha256 = "f9f2581bb3ec84ca3b0d8b1881fff420fece9fb9030afe4903e5984901223197"; + sha256 = "edb6daf20b93abbb40eda9faf86063fccbf4ba01b53f12e54603d287e201fb80"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-i686/id/firefox-129.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/130.0/linux-i686/id/firefox-130.0.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha256 = "b01e61576471d473b052ae2f20c29b4966169735b0096d9703fc905768ea2531"; + sha256 = "54cd80f040c75ba290c728e05a542b8a98190ebff5aeaa6943128790b6d7ce9c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-i686/is/firefox-129.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/130.0/linux-i686/is/firefox-130.0.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha256 = "7623c5cfececf30dc458b9255dcd5da7542c88a0e8a326958d9d61c107af41c9"; + sha256 = "46dcbbe30762ff44d689695e17c6c90736dc27895885086a2bb3665689011385"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-i686/it/firefox-129.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/130.0/linux-i686/it/firefox-130.0.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha256 = "0003e065feab434db52441bb82c6f0e6d626e1040db41a289668866b58702a46"; + sha256 = "144e3c6d75393fac5ccec369c7fe24c401e7feb14ca5df68896c1a7721289a36"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-i686/ja/firefox-129.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/130.0/linux-i686/ja/firefox-130.0.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha256 = "8fa4cad993cb27a46c79359cc1670217ad8400731cc27ce7f537ec90b4ffe463"; + sha256 = "ff67a3a6d806593f855abe6447d2fdd567c3ef7ff83fbad3357da686cd51f920"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-i686/ka/firefox-129.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/130.0/linux-i686/ka/firefox-130.0.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha256 = "7a939879bad4101419e50ae9611ed0efe5797917815324fc1593f94a5b714f1d"; + sha256 = "cfa3e5cc4abad4a233546f2afb6b99f4454225a25431a2e4b9644d55a9a5b340"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-i686/kab/firefox-129.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/130.0/linux-i686/kab/firefox-130.0.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha256 = "a4a5f2844042d923840b8b1b8602aef4473aa3a1e428ae59724d8fd66a68506d"; + sha256 = "1dd091984cbb1681abf62383843f8800af3fd15ea5155b791b229572d82b654a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-i686/kk/firefox-129.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/130.0/linux-i686/kk/firefox-130.0.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha256 = "a543bb171815a378a494f0fb073506c11eeaed9d146be4a4893c908d75a233f4"; + sha256 = "a2cceb14b08cf7a795f23fbf55eb599e6fb0509211c81766723411339e2bd286"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-i686/km/firefox-129.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/130.0/linux-i686/km/firefox-130.0.tar.bz2"; locale = "km"; arch = "linux-i686"; - sha256 = "9ff3c92904daa9ffac0b482ff1d3e06fa338fa50bdb0300cdae5ca3df00f0fd1"; + sha256 = "693e4377953d469622d51d7eacf95296f94984e8212b17d3b83f28e2f7f22367"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-i686/kn/firefox-129.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/130.0/linux-i686/kn/firefox-130.0.tar.bz2"; locale = "kn"; arch = "linux-i686"; - sha256 = "a584cf1df366a71f91ff04d8d4fd32f66b185387484b351b700017df8e07d5f5"; + sha256 = "b3176d6c4d8543edd458adbf76f0a95a385eb76a9835be26201976608b3447a9"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-i686/ko/firefox-129.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/130.0/linux-i686/ko/firefox-130.0.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha256 = "0bfd51544f5a9270d2538aff828d597f5a7ed94ce68daa11a0a008aea48f000e"; + sha256 = "31e7011287cb130b980dcb581535a1d0d815f9d697b7b1c63f52d46d261ed299"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-i686/lij/firefox-129.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/130.0/linux-i686/lij/firefox-130.0.tar.bz2"; locale = "lij"; arch = "linux-i686"; - sha256 = "97e9897b42d43d583066c3874547337c812af1d1174fe138e3690b9fc9fe9dfe"; + sha256 = "9676d60a0bd7734d1a0e89ba11fc75c25f999e222451363ceef621f7517f55a7"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-i686/lt/firefox-129.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/130.0/linux-i686/lt/firefox-130.0.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha256 = "a32276d1a6a65974ec7119e9a0e27904f2d6faec540444d85b7cd1961635ac0d"; + sha256 = "06ef7b9669e999b703cdbaba63215f4bf3bafc9bad82a0b4fe8a665c9ce8fa4b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-i686/lv/firefox-129.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/130.0/linux-i686/lv/firefox-130.0.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha256 = "26b6e1a90c153e72485555ba26732c01a4a5370f189dc76408f4bd782630b611"; + sha256 = "6363bab4881200213925eb7ffa68caa2ebd0c92ab38e9192572d38ac36d8b61c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-i686/mk/firefox-129.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/130.0/linux-i686/mk/firefox-130.0.tar.bz2"; locale = "mk"; arch = "linux-i686"; - sha256 = "9cd76a0b51d553f5363d368c4a8bd569c3f31e9fe53ea581fe5d477a3e2bb5a1"; + sha256 = "0365795f546d2fd29d1eb7abff6eb3aeb15af26f5dfb1fc70f3a17e167d8192f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-i686/mr/firefox-129.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/130.0/linux-i686/mr/firefox-130.0.tar.bz2"; locale = "mr"; arch = "linux-i686"; - sha256 = "dbf225cea7dd46225862dafea1528ebf9af4a0c1c4376fd0286c388f93a9bb30"; + sha256 = "2e5d7ea002fc5012ec1d0c612a889f51d1309a59d68425c3237b8e982ed4ccd3"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-i686/ms/firefox-129.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/130.0/linux-i686/ms/firefox-130.0.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha256 = "beb734692ef042eaae17eb7c64a44c661a903874056d2a755caa048f3e46582f"; + sha256 = "8af836013462cfbd9a22208d2e2a20bd0227c0e71d5f1d5c4fc8d644a9b440d2"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-i686/my/firefox-129.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/130.0/linux-i686/my/firefox-130.0.tar.bz2"; locale = "my"; arch = "linux-i686"; - sha256 = "55381b086e360f443db378432c93a48da06c969d78fbffe3a22b561b65a5697b"; + sha256 = "1f2aaa46d3dc7629349fda147043e2be8e8c10b9db30dc7e03b197d08cf2951e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-i686/nb-NO/firefox-129.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/130.0/linux-i686/nb-NO/firefox-130.0.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha256 = "652a27817bcf35537e30e642517c6b9f279fbb182bbfe0e1f3f2e7abce51dc80"; + sha256 = "d72d07ad84d99465e535829f4f3ab1922c09f175d4bb9d62643b287b075fb5f5"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-i686/ne-NP/firefox-129.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/130.0/linux-i686/ne-NP/firefox-130.0.tar.bz2"; locale = "ne-NP"; arch = "linux-i686"; - sha256 = "cfde01a7c01ec8db923145faa1e84b521bdfd9edf9434602152aa6bc92e6b775"; + sha256 = "9b0933f3ec0f68d16106ff45f6d72e0f1cca61fc77a41709453b5e612db8324b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-i686/nl/firefox-129.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/130.0/linux-i686/nl/firefox-130.0.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha256 = "c58291b410032f9dcece60a26740cec4189c807c6239d91eb01eccd0a769be65"; + sha256 = "da26294a1cf6ac337522d50f198eedb08f532f99d1ef0663112a34634f8adc5c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-i686/nn-NO/firefox-129.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/130.0/linux-i686/nn-NO/firefox-130.0.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha256 = "0e49abf506436444071eb4d9af919f36e93a2313e94409e505f2e2c102162e50"; + sha256 = "5a520ac86905a109372fd481325aaaa302d31edf4c1d60e85a1ad3ea688c55e7"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-i686/oc/firefox-129.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/130.0/linux-i686/oc/firefox-130.0.tar.bz2"; locale = "oc"; arch = "linux-i686"; - sha256 = "2e2eb99dff764537ebe36e47a0f161d343011f95075fef31e09d179ab821dfba"; + sha256 = "112641eead29f19547aea043b3e9b96889c8865f22e80e01e3e3aa5faa853cdb"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-i686/pa-IN/firefox-129.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/130.0/linux-i686/pa-IN/firefox-130.0.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha256 = "d4480f5c7db7bf91ee783f5e5d35cf39168171549178e84b132c7d620027350c"; + sha256 = "615c4af99bf66c25ea21389a229ff30d491974888843db2f326dd5a6a8d06de8"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-i686/pl/firefox-129.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/130.0/linux-i686/pl/firefox-130.0.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha256 = "5ad811e583c96a994813635cd24ff3dd9255509a313c4d12655038f913ff1542"; + sha256 = "8998b0c45de20d3e5144f21c334aafe666ca7249d9fd325f9eebf78d3458211b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-i686/pt-BR/firefox-129.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/130.0/linux-i686/pt-BR/firefox-130.0.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha256 = "9ffa73a862da1ea7c9ff6f92311db599f3fa3cddbbb80f6170e9921e203f0019"; + sha256 = "991bb5f11b3a45edfb1cab642e6df8cb2c8c60712f705cc396012374d21ac0be"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-i686/pt-PT/firefox-129.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/130.0/linux-i686/pt-PT/firefox-130.0.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha256 = "a0a91a30752179b0a47589e15542559b3e7aadd4d80c7ac235772b7a2b475c11"; + sha256 = "a2c4f9745e9186ff27d76a309ca09d0e14d58521bc9dadaa71b3ad3ffea7b558"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-i686/rm/firefox-129.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/130.0/linux-i686/rm/firefox-130.0.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha256 = "dce6ad38b33d3d09627b940695fe09990dafed4014609d72ccccbb5ebf933f46"; + sha256 = "3d1f1b9b57ed0ff3ab9ea16667555ea5a7c76e70494347e469b67f23c2954f2f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-i686/ro/firefox-129.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/130.0/linux-i686/ro/firefox-130.0.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha256 = "17a41544e81ca30f8343767de18289ffa2d8a5ba0f5baf56c1604db51d890420"; + sha256 = "9f956644d4b064f824affe492128b5c1413fe4adae6d7609201f3f742c967e70"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-i686/ru/firefox-129.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/130.0/linux-i686/ru/firefox-130.0.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha256 = "62cc7f609a793f44de5ef69c4128f85fc8529a202dff06d2e13de7dba78792eb"; + sha256 = "772ed70cbee734e4cffc6343cbc320958fe12ccb33693b4800d12071ebbd1a07"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-i686/sat/firefox-129.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/130.0/linux-i686/sat/firefox-130.0.tar.bz2"; locale = "sat"; arch = "linux-i686"; - sha256 = "40d4987233506205ba542f34f548db58277811538d11cb5a9abe1ce190fcc56e"; + sha256 = "3cc5b5bfa5fa4e71fd80e52a98fbefb3035c3d39fe6e0745f3cb74e9df3cdb36"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-i686/sc/firefox-129.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/130.0/linux-i686/sc/firefox-130.0.tar.bz2"; locale = "sc"; arch = "linux-i686"; - sha256 = "d866b09ab322517304ebd2dc3d3d3a74d0747577ed358dfdb63629c783248192"; + sha256 = "0f94124621cbd893760200bf758c840dc42454a57dd9135860c88c5766172a1d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-i686/sco/firefox-129.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/130.0/linux-i686/sco/firefox-130.0.tar.bz2"; locale = "sco"; arch = "linux-i686"; - sha256 = "6e4492fd8138e436d6f7fefd9718a0a3cfd9eb6e6d82420b00567d133273c1ae"; + sha256 = "54ca19417b73778350886438bd273e832683ad24b0ef22df8d94ac9a5ea24d76"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-i686/si/firefox-129.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/130.0/linux-i686/si/firefox-130.0.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha256 = "7ee7f72dcabe2ca171fa940b236fe3000d989a506eb04c780137c403bed53f21"; + sha256 = "5a0b94c9bfcb4b8a541c5322b3acee38a3499e618fe668f11acde478d2044075"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-i686/sk/firefox-129.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/130.0/linux-i686/sk/firefox-130.0.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha256 = "4d4c2c45efa3aa54b5ec6e137f0fb8b92059f5c7eae3ee5b56a857e093ed816d"; + sha256 = "e6d5417bfde626d998d8a6831aace8fa76c00b69eb0b66cc6f95f78850ee08ba"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-i686/skr/firefox-129.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/130.0/linux-i686/skr/firefox-130.0.tar.bz2"; locale = "skr"; arch = "linux-i686"; - sha256 = "cfe7864e3d2b2a621f42784ca5d8be3414e757c56e401a687fb32a6be6180c09"; + sha256 = "3a3d19dee825d029de573e53bbc91c7d51fb270f664424360d842765dff3096c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-i686/sl/firefox-129.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/130.0/linux-i686/sl/firefox-130.0.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha256 = "73af554b3cd3e2782c56df579b5254c0658895cf5c3e6e5c18f9911047cc45d7"; + sha256 = "783d8b5718a5801b3a0ce13cb8e33e28a78fea490cb411eed3a9b76811c426eb"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-i686/son/firefox-129.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/130.0/linux-i686/son/firefox-130.0.tar.bz2"; locale = "son"; arch = "linux-i686"; - sha256 = "1e67654241341f4fa4092737183ed0c16affdcf9612a068a89f55497d05c17fd"; + sha256 = "aa0aff78c771c312c1a4527e4afa06d1564daf986bfc388e1e95365b78d002cf"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-i686/sq/firefox-129.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/130.0/linux-i686/sq/firefox-130.0.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha256 = "b9325457af48f36bb3cc1521e64add9524c95010e6fc44a7976170b5efd5fa71"; + sha256 = "accdf7b0fd7cc42598b212139c3e885d27ace6d697cab9179ac72c43a594d947"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-i686/sr/firefox-129.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/130.0/linux-i686/sr/firefox-130.0.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha256 = "2e107a9e262256947ec2864bcd02b9a479de4b5fbb29ca4e978feb54fb515470"; + sha256 = "81ae434277d95d20882a779de3cb4cafa243040be119898ca2eb9b38b3ee745d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-i686/sv-SE/firefox-129.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/130.0/linux-i686/sv-SE/firefox-130.0.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha256 = "91d8e8092ee35a790778a8ff8f89c12fda000ada0b27476de2ec5b9f7dc6ebe1"; + sha256 = "bfdb54d89050728dab2536b3a0610645be4065d890f79f1ab658b86543cac8c0"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-i686/szl/firefox-129.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/130.0/linux-i686/szl/firefox-130.0.tar.bz2"; locale = "szl"; arch = "linux-i686"; - sha256 = "a929fa6e7742ed2e37dc86162f6982c32e99487fd7763e56a17736ea3e390256"; + sha256 = "f642262defe11b002680ec1aed487aa9d7d958b499f0d3407b51cb206b8bc998"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-i686/ta/firefox-129.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/130.0/linux-i686/ta/firefox-130.0.tar.bz2"; locale = "ta"; arch = "linux-i686"; - sha256 = "b7af5e9cf3240b6a30da249c2d0209907cce342c0f48d433ec8ff9cf72c3d468"; + sha256 = "158232b1da18f43b336c4ec04be823ee14fdf1275a6fb0e8c1d0e9a5f8e9a943"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-i686/te/firefox-129.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/130.0/linux-i686/te/firefox-130.0.tar.bz2"; locale = "te"; arch = "linux-i686"; - sha256 = "d9ced92020305d6a641ca6190bfc808bd83e8cd43decfa49f22c1fb03f4a7861"; + sha256 = "aa7ba85b976f722789f2a629e261d0bb9beeffa47b0ba3ce6f67b26a5db2bb90"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-i686/tg/firefox-129.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/130.0/linux-i686/tg/firefox-130.0.tar.bz2"; locale = "tg"; arch = "linux-i686"; - sha256 = "7ea19763f02ce91015f3701d3ea7fcc4e1a1f22743c035a8bc6beae2f9b5bbaf"; + sha256 = "1d42860824c54a3763efcda16c0f03e0b1c7070e673c733c8d24944cd36ad5f8"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-i686/th/firefox-129.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/130.0/linux-i686/th/firefox-130.0.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha256 = "b8e82d0d1e810e3c6dce35cdde6b38e2b8187bbe2d8edb4281088bfa74b197f8"; + sha256 = "e701c4d151ca5ab21290837ab1f66236e3e7c93a781aab7c104f426604c5b58f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-i686/tl/firefox-129.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/130.0/linux-i686/tl/firefox-130.0.tar.bz2"; locale = "tl"; arch = "linux-i686"; - sha256 = "a7d0fd082f86b21267f82ef068d2965f090d6c050243f94c28c812cf3052f3fd"; + sha256 = "939454b0c8fe7f847a2f203aea5183a9505bd003ebf48f856855522f2ad041a0"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-i686/tr/firefox-129.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/130.0/linux-i686/tr/firefox-130.0.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha256 = "cde9e1a2ab04e9bdc2d72ca6f69abeb3b5838d85e81aa58d1fc766c0b4de9f16"; + sha256 = "e9b0c72338ccf19bca84aea32d370b5416b5dc03978a4a8b13922b1ea716b43f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-i686/trs/firefox-129.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/130.0/linux-i686/trs/firefox-130.0.tar.bz2"; locale = "trs"; arch = "linux-i686"; - sha256 = "344c0f7dfe6fbc08cb7c9008b148c78f1fd04c35411b7a6530526a2b2285c683"; + sha256 = "fff8442ac54c2a0883c08ffbf70167b95d8e7efc8806a2704ab770fe992a05f1"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-i686/uk/firefox-129.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/130.0/linux-i686/uk/firefox-130.0.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha256 = "3bd0777c7028bb9bfd891afd60238777c073c27c60229183b8dc003bed50ed3f"; + sha256 = "12b8e3273db5c4f3dc974edc7ee456a021ec6ca238e210263d6e3564f1216efd"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-i686/ur/firefox-129.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/130.0/linux-i686/ur/firefox-130.0.tar.bz2"; locale = "ur"; arch = "linux-i686"; - sha256 = "afeba739025b7dd656ca6f68fce268efac3c6e0bd7cc47ab6f62d95dfbd7a3a4"; + sha256 = "5a0ab48546681a62b7f7718e4cb5b4d00102a08f9437c495d8a02949a03ac382"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-i686/uz/firefox-129.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/130.0/linux-i686/uz/firefox-130.0.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha256 = "4a068543bb839af64e3fccd5e299d5ae01033ac0b6617fad7749088b59fbd166"; + sha256 = "af66003305aec11524de3036bf32672fffa0790679febf13dc610c4d8a29deb9"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-i686/vi/firefox-129.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/130.0/linux-i686/vi/firefox-130.0.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha256 = "5f1b0a92d3504db44f5a9727b6e899bc0866cb96959e9d4a051016cf0b38249a"; + sha256 = "0a6ba375b6ef65bfe50ccd9d7cc71500dc8a720d546fef6d140a0a02dde30826"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-i686/xh/firefox-129.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/130.0/linux-i686/xh/firefox-130.0.tar.bz2"; locale = "xh"; arch = "linux-i686"; - sha256 = "98bb156006acb8953ef64da46b20ae7c599338900124ce8becc352f42a763cc5"; + sha256 = "a4f7ab329e1d7f2a588c907c6e891d70c1a63329f2dc0cf241d25b25e81973b9"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-i686/zh-CN/firefox-129.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/130.0/linux-i686/zh-CN/firefox-130.0.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha256 = "120ae812950335df8bbab9864d9938d83834fc81b38f9d49d12f66e173255969"; + sha256 = "30aad51444e23a1f9a0c36dd2f0432691bf7ef99f22d3ef1f773ac0feee370db"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-i686/zh-TW/firefox-129.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/130.0/linux-i686/zh-TW/firefox-130.0.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha256 = "e8b4fafa98e812b0f483a861ac175be2324773cb91c2abe9f724d78596ebb17e"; + sha256 = "93483e8121671cc1edbdc341b4bd4ab463b4d374afc410786c98039963b6ed54"; } ]; } From b553f338163999d5d656a7517bc9c08ce1564a6d Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 3 Sep 2024 17:50:43 +0200 Subject: [PATCH 198/235] firefox-esr-128-unwrapped: 128.1.0esr -> 128.2.0esr https://www.mozilla.org/en-US/firefox/128.2.0/releasenotes/ Fixes: - CVE-2024-8381 - CVE-2024-8382 - CVE-2024-8383 - CVE-2024-8384 - CVE-2024-8385 - CVE-2024-8386 - CVE-2024-8387 --- pkgs/applications/networking/browsers/firefox/packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/browsers/firefox/packages.nix b/pkgs/applications/networking/browsers/firefox/packages.nix index 6488b091ce51..a86b39fff728 100644 --- a/pkgs/applications/networking/browsers/firefox/packages.nix +++ b/pkgs/applications/networking/browsers/firefox/packages.nix @@ -96,10 +96,10 @@ firefox-esr-128 = buildMozillaMach rec { pname = "firefox"; - version = "128.1.0esr"; + version = "128.2.0esr"; src = fetchurl { url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz"; - sha512 = "8055a7f83acf0cab6124ba5809aff1c082e81a0d30ff318ec719f8fd3f4af9aa60e2094c1abd6c981193d751075a9569370176e20e50f3c1959fe27a15511388"; + sha512 = "9a689929f6f86d795ea2c0318bb78f77f72a552f40715a1108dbd6361b0dedc3aaf049f1883424012459899607067d5a8374d895564591ec6679a1ce80708d7d"; }; meta = { From b2a450bebb6bfba10b2e8f52f80fcecb865d5568 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 3 Sep 2024 17:52:14 +0200 Subject: [PATCH 199/235] firefox-esr-115-unwrapped: 115.14.0esr -> 115.15.0esr https://www.mozilla.org/en-US/firefox/115.15.0/releasenotes/ Fixes: - CVE-2024-8381 - CVE-2024-8382 - CVE-2024-8383 - CVE-2024-8384 --- pkgs/applications/networking/browsers/firefox/packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/browsers/firefox/packages.nix b/pkgs/applications/networking/browsers/firefox/packages.nix index a86b39fff728..b4e7c679de2b 100644 --- a/pkgs/applications/networking/browsers/firefox/packages.nix +++ b/pkgs/applications/networking/browsers/firefox/packages.nix @@ -125,11 +125,11 @@ firefox-esr-115 = (buildMozillaMach rec { pname = "firefox-esr-115"; - version = "115.14.0esr"; + version = "115.15.0esr"; applicationName = "Mozilla Firefox ESR"; src = fetchurl { url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz"; - sha512 = "dd40c1fd3cf454dbf33a85d38e47bb0e736ed89b829643653e239f43232441f4e9f3c7876f058ff2e6f19daf2b50a8f2d13274e9a107d8a258a6067d1fc43f54"; + sha512 = "0df4c498c99cce08903004d2e0f9e977a19f7de86240aa82dba179b60f1d67ca3021eb474f56bddc38035e773eeb5d99bb3e1b0756d9f7583dc8e1f747f477ba"; }; meta = { From df8e3b1546635ebd9f31ed3ac3b1f03aba2c4b2d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 3 Sep 2024 16:10:42 +0000 Subject: [PATCH 200/235] rust-script: 0.34.0 -> 0.35.0 --- pkgs/development/tools/rust/rust-script/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/rust/rust-script/default.nix b/pkgs/development/tools/rust/rust-script/default.nix index 95f60f19011a..d9df9404fbca 100644 --- a/pkgs/development/tools/rust/rust-script/default.nix +++ b/pkgs/development/tools/rust/rust-script/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "rust-script"; - version = "0.34.0"; + version = "0.35.0"; src = fetchFromGitHub { owner = "fornwall"; repo = pname; rev = version; - sha256 = "sha256-a9VWPN/mTz159xKgN2RNflrcuutWXVdEFzbTIZJKgdY="; + sha256 = "sha256-uKmQgrbsFIY0XwrO16Urz3L76Gm2SxHW/CpHeCIUinM="; }; - cargoHash = "sha256-dawNgQtF9zVhlwIZzP+c5fHzcLJbCLOZx3kgIRAktTk="; + cargoHash = "sha256-WekXZ1bn2bGZu80SsEHtTY8wLwBhJsnJLu/r5GPdGzM="; # tests require network access doCheck = false; From fbffac3af16e058aa804b0af89d45977851070c8 Mon Sep 17 00:00:00 2001 From: ghpzin Date: Thu, 22 Aug 2024 03:29:51 +0300 Subject: [PATCH 201/235] zet: fix build --- pkgs/tools/text/zet/default.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/pkgs/tools/text/zet/default.nix b/pkgs/tools/text/zet/default.nix index af04b5fdc203..c94380047d1a 100644 --- a/pkgs/tools/text/zet/default.nix +++ b/pkgs/tools/text/zet/default.nix @@ -1,6 +1,7 @@ { lib , rustPlatform , fetchFromGitHub +, fetchpatch2 }: rustPlatform.buildRustPackage rec { @@ -14,6 +15,15 @@ rustPlatform.buildRustPackage rec { hash = "sha256-IjM+jSb+kdML0zZGuz9+9wrFzQCujn/bg9/vaTzMtUs="; }; + patches = [ + # fix unused_qualifications lint with rust 1.78+ + # https://github.com/yarrow/zet/commit/b6a0c67f6ac76fb7bf8234951678b77fbac12d76 + (fetchpatch2 { + url = "https://github.com/yarrow/zet/commit/b6a0c67f6ac76fb7bf8234951678b77fbac12d76.patch?full_index=1"; + hash = "sha256-HojhKM7UJh5xpD9a18Wh0hiiUDOE+jK0BKGYozYjMBc="; + }) + ]; + cargoHash = "sha256-kHIOsSR7ZxBzp4dtm2hbi8ddtlQ86x5EASk5HFmnhFo="; # tests fail with `--release` From f01da3d33ba1f0a24d619ff89661c7f3b0670416 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 3 Sep 2024 18:33:38 +0200 Subject: [PATCH 202/235] python312Packages.nocasedict: 2.0.3 -> 2.0.4 --- .../python-modules/nocasedict/default.nix | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/nocasedict/default.nix b/pkgs/development/python-modules/nocasedict/default.nix index 22a923412562..f50c1df9902f 100644 --- a/pkgs/development/python-modules/nocasedict/default.nix +++ b/pkgs/development/python-modules/nocasedict/default.nix @@ -2,29 +2,33 @@ lib, buildPythonPackage, fetchPypi, - pytest7CheckHook, - six, + pytestCheckHook, + pythonOlder, + setuptools, }: buildPythonPackage rec { pname = "nocasedict"; - version = "2.0.3"; - format = "setuptools"; + version = "2.0.4"; + pyproject = true; + + disabled = pythonOlder "3.10"; src = fetchPypi { inherit pname version; - hash = "sha256-HJImx/WoqXrVHcsK4xV6cg4/fLnEVo0i6joF4/hWWKk="; + hash = "sha256-TKk09l31exDQ/KtfDDnp3MuTV3/58ivvmCZd2/EvivE="; }; - propagatedBuildInputs = [ six ]; + build-system = [ setuptools ]; - nativeCheckInputs = [ pytest7CheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; pythonImportsCheck = [ "nocasedict" ]; meta = with lib; { description = "Case-insensitive ordered dictionary for Python"; homepage = "https://github.com/pywbem/nocasedict"; + changelog = "https://github.com/pywbem/nocasedict/blob/${version}/docs/changes.rst"; license = licenses.lgpl21Plus; maintainers = with maintainers; [ freezeboy ]; }; From ed02e38086bbe8954d977c6ef3cfa628bc5755ed Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 3 Sep 2024 17:34:04 +0000 Subject: [PATCH 203/235] python312Packages.oelint-parser: 3.5.5 -> 4.0.0 --- pkgs/development/python-modules/oelint-parser/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/oelint-parser/default.nix b/pkgs/development/python-modules/oelint-parser/default.nix index 438078c56e73..9a53ab00f212 100644 --- a/pkgs/development/python-modules/oelint-parser/default.nix +++ b/pkgs/development/python-modules/oelint-parser/default.nix @@ -10,13 +10,13 @@ buildPythonPackage rec { pname = "oelint-parser"; - version = "3.5.5"; + version = "4.0.0"; format = "setuptools"; src = fetchPypi { inherit version; pname = "oelint_parser"; - hash = "sha256-4x7OgC5UKhAII2S1kDu+1RZyusr9F5cZDaRG9HFyhkA="; + hash = "sha256-YrOQUimRqW9wwPofkpihYwwIhZbi6yZJfsknY8xLQQk="; }; buildInputs = [ pip ]; From 96ea156926944fe009def871f11a5ad21e8c9fe9 Mon Sep 17 00:00:00 2001 From: networkException Date: Tue, 3 Sep 2024 19:55:57 +0200 Subject: [PATCH 204/235] chromium: match release blog entry titles case-insensitive in `get-commit-message.py` --- .../networking/browsers/chromium/get-commit-message.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/networking/browsers/chromium/get-commit-message.py b/pkgs/applications/networking/browsers/chromium/get-commit-message.py index 437b82d3a777..0a8ed0a60a49 100755 --- a/pkgs/applications/networking/browsers/chromium/get-commit-message.py +++ b/pkgs/applications/networking/browsers/chromium/get-commit-message.py @@ -20,7 +20,7 @@ target_version = sys.argv[1] if len(sys.argv) == 2 else None for entry in feed.entries: url = requests.get(entry.link).url.split('?')[0] - if entry.title != 'Stable Channel Update for Desktop': + if entry.title.lower() != 'Stable Channel Update for Desktop'.lower(): if target_version and entry.title == '': # Workaround for a special case (Chrome Releases bug?): if not 'the-stable-channel-has-been-updated-to' in url: From c0a3113afeb9b73ef43bbb114b5e1f41871fe6f8 Mon Sep 17 00:00:00 2001 From: networkException Date: Tue, 3 Sep 2024 19:56:12 +0200 Subject: [PATCH 205/235] chromium,chromedriver: 128.0.6613.113 -> 128.0.6613.119 https://chromereleases.googleblog.com/2024/09/stable-channel-update-for-desktop.html This update includes 4 security fixes. CVEs: CVE-2024-8362 CVE-2024-7970 --- .../networking/browsers/chromium/upstream-info.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.nix b/pkgs/applications/networking/browsers/chromium/upstream-info.nix index 786991c11c79..07a47c07abd1 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.nix +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.nix @@ -1,11 +1,11 @@ { stable = { chromedriver = { - hash_darwin = "sha256-tC2BZmjKeYjBfwJINtgVQEJjiqJidVtnXdxigFkR2/M="; + hash_darwin = "sha256-jqBrEpqHRjpxi7sp/dSzQFzROS21bPTfwvco/UzKMug="; hash_darwin_aarch64 = - "sha256-MRXiiQPY8EZ85zRCmJyxuI7SG5RbalBBg+vt0goeWus="; - hash_linux = "sha256-rQ/WYDghBXewFqMTGf7ZJGp2mMiPwjf8ImNyTvXulQU="; - version = "128.0.6613.86"; + "sha256-7T9uargLSXs4uqBmS00eUNvhYiA42UC7DPTkTI2sM8U="; + hash_linux = "sha256-Li4f3+zZl2HCbxwIyLpylRJ1PMRbV3LKW7dBEnKyIdo="; + version = "128.0.6613.119"; }; deps = { gn = { @@ -15,8 +15,8 @@ version = "2024-06-11"; }; }; - hash = "sha256-wqhaK1VuE1qPLt+f/x2KrtwZGxKFluTOWYMau+cSl2E="; - version = "128.0.6613.113"; + hash = "sha256-WCemrL5jPRn5P1olLwfrAM1xLc0hcaBYDj0CZPoPucU="; + version = "128.0.6613.119"; }; ungoogled-chromium = { deps = { From dca7537c8f958d58ec98b69cdfec3adfae0cca2e Mon Sep 17 00:00:00 2001 From: networkException Date: Tue, 3 Sep 2024 19:57:43 +0200 Subject: [PATCH 206/235] ungoogled-chromium: 128.0.6613.113-1 -> 128.0.6613.119-1 https://chromereleases.googleblog.com/2024/09/stable-channel-update-for-desktop.html This update includes 4 security fixes. CVEs: CVE-2024-8362 CVE-2024-7970 --- .../networking/browsers/chromium/upstream-info.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.nix b/pkgs/applications/networking/browsers/chromium/upstream-info.nix index 07a47c07abd1..c354b4e997cc 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.nix +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.nix @@ -27,11 +27,11 @@ version = "2024-06-11"; }; ungoogled-patches = { - hash = "sha256-2P9c+zS741H4/jTp92mno4egju9r0tGTLkXHAFhM9mA="; - rev = "128.0.6613.113-1"; + hash = "sha256-qHt7Rjx1VmKlX8ko7hpNv8SW/rNhXsGchWs6A/aXuu0="; + rev = "128.0.6613.119-1"; }; }; - hash = "sha256-wqhaK1VuE1qPLt+f/x2KrtwZGxKFluTOWYMau+cSl2E="; - version = "128.0.6613.113"; + hash = "sha256-WCemrL5jPRn5P1olLwfrAM1xLc0hcaBYDj0CZPoPucU="; + version = "128.0.6613.119"; }; } From 2c2d7a0f07e070e8fafd55e40ff9e05b9528a88f Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 3 Sep 2024 20:10:07 +0200 Subject: [PATCH 207/235] python312Packages.publicsuffixlist: 1.0.2.20240724 -> 1.0.2.20240903 Changelog: https://github.com/ko-zu/psl/blob/v1.0.2.20240903-gha/CHANGES.md --- pkgs/development/python-modules/publicsuffixlist/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/publicsuffixlist/default.nix b/pkgs/development/python-modules/publicsuffixlist/default.nix index 4edaaaed333f..2073b2dd233c 100644 --- a/pkgs/development/python-modules/publicsuffixlist/default.nix +++ b/pkgs/development/python-modules/publicsuffixlist/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "publicsuffixlist"; - version = "1.0.2.20240724"; + version = "1.0.2.20240903"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-7pxRDUkWC1Umu5Eq6JiUnRadbMmjC96uMJynYPhSfUI="; + hash = "sha256-mcfzWXTvMKXb5Xc5c2pweOFuME8KUgtyNPoRssxf7EA="; }; build-system = [ setuptools ]; From c67a2a4ec66ddb81eae12fdb0cc807d3e4dfc9eb Mon Sep 17 00:00:00 2001 From: Philip Taron Date: Mon, 2 Sep 2024 12:01:27 -0700 Subject: [PATCH 208/235] ssh-openpgp-auth: update comment to refer to nixpkgs-vet --- pkgs/by-name/ss/ssh-openpgp-auth/daemon.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/ss/ssh-openpgp-auth/daemon.nix b/pkgs/by-name/ss/ssh-openpgp-auth/daemon.nix index d25b12ef6a64..cd90df9cb774 100644 --- a/pkgs/by-name/ss/ssh-openpgp-auth/daemon.nix +++ b/pkgs/by-name/ss/ssh-openpgp-auth/daemon.nix @@ -1,6 +1,6 @@ # Ideally, this file would have been placed in # pkgs/by-name/ss/sshd-openpgp-auth/package.nix, but since `./generic.nix` is -# outside of the directory, the nixpkgs-check-by-name test will fail the CI. So +# outside of the directory, the `nixpkgs-vet` test will fail the CI. So # we call this file in all-packages.nix like in the old days. { callPackage }: From a76f741b31c62bd060d9b68856937eb5e35ae994 Mon Sep 17 00:00:00 2001 From: Malo Bourgon Date: Thu, 29 Aug 2024 12:32:41 -0700 Subject: [PATCH 209/235] signalbackup-tools: 20240816 -> 20240830 Diff: https://github.com/bepaald/signalbackup-tools/compare/20240816...20240830 --- .../signalbackup-tools/default.nix | 23 ++++++++----------- 1 file changed, 10 insertions(+), 13 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/signalbackup-tools/default.nix b/pkgs/applications/networking/instant-messengers/signalbackup-tools/default.nix index 0b226e78d40b..6cc2cc3d401c 100644 --- a/pkgs/applications/networking/instant-messengers/signalbackup-tools/default.nix +++ b/pkgs/applications/networking/instant-messengers/signalbackup-tools/default.nix @@ -1,27 +1,24 @@ -{ lib, stdenv, fetchFromGitHub, openssl, sqlite }: +{ lib, stdenv, fetchFromGitHub, cmake, darwin, openssl, sqlite }: stdenv.mkDerivation rec { pname = "signalbackup-tools"; - version = "20240816"; + version = "20240830"; src = fetchFromGitHub { owner = "bepaald"; repo = "signalbackup-tools"; rev = version; - hash = "sha256-8r3XpKqCR2ElfQnRuuBaDDIUwAASTTfGSihOounIVZQ="; + hash = "sha256-d93f/kKOd7D7FdtgrhrJhQS1DxiUKsdcf2JuUTmRDrw="; }; - postPatch = '' - patchShebangs BUILDSCRIPT_MULTIPROC.bash44 - ''; + nativeBuildInputs = [ cmake ]; - buildInputs = [ openssl sqlite ]; - - buildPhase = '' - runHook preBuild - ./BUILDSCRIPT_MULTIPROC.bash44${lib.optionalString stdenv.isDarwin " --config nixpkgs-darwin"} - runHook postBuild - ''; + buildInputs = [ + openssl + sqlite + ] ++ lib.optionals stdenv.isDarwin [ + darwin.apple_sdk_11_0.frameworks.Security + ]; installPhase = '' runHook preInstall From 78bf14b807bb77ff478df3c06f6847826c28a047 Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Wed, 28 Aug 2024 16:14:33 -0300 Subject: [PATCH 210/235] emacsPackages.cask: use melpaBuild - use a patch that parameterizes lispdir - so that we can get rid of SRCDIR and other dependencies - finalAttrs - remove failing doCheck - sei ignoreCompilationError to false - meta.mainProgram - meta.homepage points to GitHub - because the previous is outdated - nixfmt-rfc-style --- .../cask/0000-cask-lispdir.diff | 24 ++++++ .../manual-packages/cask/package.nix | 79 ++++++++++--------- 2 files changed, 67 insertions(+), 36 deletions(-) create mode 100644 pkgs/applications/editors/emacs/elisp-packages/manual-packages/cask/0000-cask-lispdir.diff diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/cask/0000-cask-lispdir.diff b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/cask/0000-cask-lispdir.diff new file mode 100644 index 000000000000..2819a462d64c --- /dev/null +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/cask/0000-cask-lispdir.diff @@ -0,0 +1,24 @@ +diff -Naur cask-source-0.8.8-old/bin/cask cask-source-0.8.8/bin/cask +--- cask-source-0.8.8-old/bin/cask 1969-12-31 21:00:01.000000000 -0300 ++++ cask-source-0.8.8/bin/cask 2024-08-30 18:34:48.986474121 -0300 +@@ -37,19 +37,6 @@ + EMACSLOADPATH="$($CASK load-path)" PATH="$($CASK path)" EMACS="$EMACS" "$@" + ;; + *) +- WHICH=${WHICH:-which} +- READLINK=$($WHICH readlink || true) +- if [ "$(uname || true)" == "Darwin" ] ; then +- READLINK= +- fi +- READLINK=${READLINK:-$($WHICH greadlink || true)} +- if [ ! -z "$READLINK" ] ; then +- SRCDIR__=$($READLINK -f "$CASK") +- else +- SRCDIR__=$(python -c "import os, sys; print(os.path.realpath(sys.argv[1]))" "$CASK") +- fi +- SRCDIR_=$(dirname "$SRCDIR__") +- SRCDIR=$(dirname "$SRCDIR_") +- "$EMACS" -Q --script "$SRCDIR/cask-cli.el" -- $subcommand "$@" ++ "$EMACS" -Q --script "@lispdir@/cask-cli.el" -- $subcommand "$@" + ;; + esac diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/cask/package.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/cask/package.nix index 3ab796bcbd19..5ede94094ff3 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/cask/package.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/cask/package.nix @@ -1,30 +1,42 @@ -{ lib -, stdenv -, fetchFromGitHub -, bash -, emacs -, python3 +{ + lib, + ansi, + coreutils, + dash, + ecukes, + el-mock, + ert-async, + ert-runner, + f, + fetchFromGitHub, + git, + gitUpdater, + melpaBuild, + noflet, + package-build, + s, + servant, + shell-split-string, }: -stdenv.mkDerivation (finalAttrs: { +melpaBuild (finalAttrs: { pname = "cask"; version = "0.8.8"; src = fetchFromGitHub { + name = "cask-source-${finalAttrs.version}"; owner = "cask"; repo = "cask"; rev = "v${finalAttrs.version}"; hash = "sha256-TlReq5sLVJj+pXmJSnepKQkNEWVhnh30iq4egM1HJMU="; }; - doCheck = true; + patches = [ + # Uses LISPDIR substitution var + ./0000-cask-lispdir.diff + ]; - nativeBuildInputs = [ emacs ]; - buildInputs = [ - bash - python3 - ] - ++ (with emacs.pkgs; [ + packageRequires = [ ansi dash ecukes @@ -38,40 +50,35 @@ stdenv.mkDerivation (finalAttrs: { s servant shell-split-string - ]); + ]; + + ignoreCompilationError = false; strictDeps = true; - buildPhase = '' - runHook preBuild - - emacs --batch -L . -f batch-byte-compile cask.el cask-cli.el - - runHook postBuild + postPatch = '' + lispdir=$out/share/emacs/site-lisp/elpa/cask-${finalAttrs.version} \ + substituteAllInPlace bin/cask ''; - installPhase = '' - runHook preInstall - - mkdir -p $out/bin - install -Dm444 -t $out/share/emacs/site-lisp/cask *.el *.elc - install -Dm555 -t $out/share/emacs/site-lisp/cask/bin bin/cask - ln -s $out/share/emacs/site-lisp/cask/bin/cask $out/bin/cask - - runHook postInstall + postInstall = '' + install -D -t $out/bin bin/cask ''; - meta = with lib; { + passthru.updateScript = gitUpdater { + rev-prefix = "v"; + }; + + meta = { + homepage = "https://github.com/cask/cask"; description = "Project management for Emacs"; - mainProgram = "cask"; longDescription = '' Cask is a project management tool for Emacs that helps automate the package development cycle; development, dependencies, testing, building, packaging and more. ''; - homepage = "https://cask.readthedocs.io/en/latest/index.html"; - license = licenses.gpl3Plus; - maintainers = with maintainers; [ AndersonTorres ]; - inherit (emacs.meta) platforms; + license = lib.licenses.gpl3Plus; + mainProgram = "cask"; + maintainers = with lib.maintainers; [ AndersonTorres ]; }; }) From ceda2ff16366bdb23b5da5bddb663f3980927e95 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 3 Sep 2024 03:40:04 +0000 Subject: [PATCH 211/235] python312Packages.prefixed: 0.8.0 -> 0.9.0 --- pkgs/development/python-modules/prefixed/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/prefixed/default.nix b/pkgs/development/python-modules/prefixed/default.nix index 8b0509006a6e..c869b7c2e04b 100644 --- a/pkgs/development/python-modules/prefixed/default.nix +++ b/pkgs/development/python-modules/prefixed/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "prefixed"; - version = "0.8.0"; + version = "0.9.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-E1uT1NGKLKSSQ8xbYvegKWl1nhcBNc0BIXWfSmZs02k="; + hash = "sha256-FkQD+p68gygLvEcF9LJDoog34WQxC05lw4zKseuv7rM="; }; nativeCheckInputs = [ pytestCheckHook ]; From eb93347a3b01fc9917f8445816adac8f984f2b6c Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Mon, 2 Sep 2024 13:30:31 -0300 Subject: [PATCH 212/235] emacsPackages.cask: 0.8.8 -> 0.9.0 --- .../cask/0000-cask-lispdir.diff | 53 +++++++++++++------ .../manual-packages/cask/package.nix | 36 ++++++------- 2 files changed, 52 insertions(+), 37 deletions(-) diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/cask/0000-cask-lispdir.diff b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/cask/0000-cask-lispdir.diff index 2819a462d64c..7737594179ec 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/cask/0000-cask-lispdir.diff +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/cask/0000-cask-lispdir.diff @@ -1,23 +1,42 @@ -diff -Naur cask-source-0.8.8-old/bin/cask cask-source-0.8.8/bin/cask ---- cask-source-0.8.8-old/bin/cask 1969-12-31 21:00:01.000000000 -0300 -+++ cask-source-0.8.8/bin/cask 2024-08-30 18:34:48.986474121 -0300 -@@ -37,19 +37,6 @@ +diff -Naur cask-source-0.9.0-old/bin/cask cask-source-0.9.0-new/bin/cask +--- cask-source-0.9.0-old/bin/cask 1969-12-31 21:00:01.000000000 -0300 ++++ cask-source-0.9.0-new/bin/cask 2024-09-02 12:46:48.316364621 -0300 +@@ -21,8 +21,6 @@ + set -euo pipefail + CASK=$0 + EMACS=${CASK_EMACS:-${EMACS:-emacs}} +-READLINK=${READLINK:-readlink} +-GREADLINK=${GREADLINK:-greadlink} + + if [ "$#" -eq "0" ] ; then + subcommand=install +@@ -31,21 +29,10 @@ + shift + fi + +-set +eu +-SRCDIR__=$($READLINK -f "$CASK" 2>/dev/null) +-if [ -z "$SRCDIR__" ] ; then +- SRCDIR__=$($GREADLINK -f "$CASK" 2>/dev/null) +-fi +-set -eu +-if [ -z "$SRCDIR__" ]; then +- SRCDIR__=$(python -c "import os, sys; print(os.path.realpath(sys.argv[1]))" "$CASK") +-fi +-SRCDIR_=$(dirname "$SRCDIR__") +-SRCDIR=$(dirname "$SRCDIR_") + case $subcommand in + emacs) + EMACS="$EMACS" \ +- "$EMACS" -Q -L "$SRCDIR" -l "$SRCDIR/cask" \ ++ "$EMACS" -Q -L "@lispdir@" -l "@lispdir@/cask" \ + --eval "(cask--initialize (expand-file-name default-directory))" \ + "$@" + ;; +@@ -53,6 +40,6 @@ EMACSLOADPATH="$($CASK load-path)" PATH="$($CASK path)" EMACS="$EMACS" "$@" ;; *) -- WHICH=${WHICH:-which} -- READLINK=$($WHICH readlink || true) -- if [ "$(uname || true)" == "Darwin" ] ; then -- READLINK= -- fi -- READLINK=${READLINK:-$($WHICH greadlink || true)} -- if [ ! -z "$READLINK" ] ; then -- SRCDIR__=$($READLINK -f "$CASK") -- else -- SRCDIR__=$(python -c "import os, sys; print(os.path.realpath(sys.argv[1]))" "$CASK") -- fi -- SRCDIR_=$(dirname "$SRCDIR__") -- SRCDIR=$(dirname "$SRCDIR_") - "$EMACS" -Q --script "$SRCDIR/cask-cli.el" -- $subcommand "$@" + "$EMACS" -Q --script "@lispdir@/cask-cli.el" -- $subcommand "$@" ;; diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/cask/package.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/cask/package.nix index 5ede94094ff3..4334fce6ecbb 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/cask/package.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/cask/package.nix @@ -1,34 +1,31 @@ { lib, ansi, - coreutils, - dash, - ecukes, - el-mock, - ert-async, - ert-runner, + cl-generic, + cl-lib, + commander, + + epl, f, fetchFromGitHub, git, gitUpdater, melpaBuild, - noflet, package-build, s, - servant, - shell-split-string, + shut-up, }: melpaBuild (finalAttrs: { pname = "cask"; - version = "0.8.8"; + version = "0.9.0"; src = fetchFromGitHub { name = "cask-source-${finalAttrs.version}"; owner = "cask"; repo = "cask"; rev = "v${finalAttrs.version}"; - hash = "sha256-TlReq5sLVJj+pXmJSnepKQkNEWVhnh30iq4egM1HJMU="; + hash = "sha256-91rJFsp2SLk/JY+v6G5JmXH5bg9QnT+qhI8ccNJlI4A="; }; patches = [ @@ -38,29 +35,28 @@ melpaBuild (finalAttrs: { packageRequires = [ ansi - dash - ecukes - el-mock - ert-async - ert-runner + cl-generic + cl-lib + commander + epl f git - noflet package-build s - servant - shell-split-string + shut-up ]; ignoreCompilationError = false; strictDeps = true; + # use melpaVersion so that it works for unstable releases too postPatch = '' - lispdir=$out/share/emacs/site-lisp/elpa/cask-${finalAttrs.version} \ + lispdir=$out/share/emacs/site-lisp/elpa/cask-${finalAttrs.melpaVersion} \ substituteAllInPlace bin/cask ''; + # TODO: use installBin as soon as installBin arrives Master branch postInstall = '' install -D -t $out/bin bin/cask ''; From 37586a74824369de2d0f36c4062f1a63b410ec2e Mon Sep 17 00:00:00 2001 From: Justus Perlwitz Date: Tue, 20 Aug 2024 12:24:11 +0900 Subject: [PATCH 213/235] thc-hydra: add samba to enable smb2 support This allows using hydra with smb2. For example, to list all available smb2 module options in hydra, run: hydra -U smb2 --- pkgs/tools/security/thc-hydra/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/security/thc-hydra/default.nix b/pkgs/tools/security/thc-hydra/default.nix index 6d366fd3e80b..fc68205299fe 100644 --- a/pkgs/tools/security/thc-hydra/default.nix +++ b/pkgs/tools/security/thc-hydra/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, zlib, openssl, ncurses, libidn, pcre, libssh, libmysqlclient, postgresql +{ stdenv, lib, fetchFromGitHub, zlib, openssl, ncurses, libidn, pcre, libssh, libmysqlclient, postgresql, samba , withGUI ? false, makeWrapper, pkg-config, gtk2 }: stdenv.mkDerivation rec { @@ -29,6 +29,7 @@ stdenv.mkDerivation rec { buildInputs = [ zlib openssl ncurses libidn pcre libssh libmysqlclient postgresql + samba ] ++ lib.optional withGUI gtk2; enableParallelBuilding = true; From a5317c333836e433cb10547fe907c402ec77c77e Mon Sep 17 00:00:00 2001 From: Justus Perlwitz Date: Tue, 20 Aug 2024 12:35:49 +0900 Subject: [PATCH 214/235] thc-hydra: --replace -> --replace-fail --replace of substituteInPlace is deprecated --- pkgs/tools/security/thc-hydra/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/security/thc-hydra/default.nix b/pkgs/tools/security/thc-hydra/default.nix index fc68205299fe..aa0e9fd8fb43 100644 --- a/pkgs/tools/security/thc-hydra/default.nix +++ b/pkgs/tools/security/thc-hydra/default.nix @@ -16,11 +16,11 @@ stdenv.mkDerivation rec { makeDirs = output: subDir: lib.concatStringsSep " " (map (path: lib.getOutput output path + "/" + subDir) buildInputs); in '' substituteInPlace configure \ - --replace '$LIBDIRS' "${makeDirs "lib" "lib"}" \ - --replace '$INCDIRS' "${makeDirs "dev" "include"}" \ - --replace "/usr/include/math.h" "${lib.getDev stdenv.cc.libc}/include/math.h" \ - --replace "libcurses.so" "libncurses.so" \ - --replace "-lcurses" "-lncurses" + --replace-fail '$LIBDIRS' "${makeDirs "lib" "lib"}" \ + --replace-fail '$INCDIRS' "${makeDirs "dev" "include"}" \ + --replace-fail "/usr/include/math.h" "${lib.getDev stdenv.cc.libc}/include/math.h" \ + --replace-fail "libcurses.so" "libncurses.so" \ + --replace-fail "-lcurses" "-lncurses" ''; env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-Wno-undef-prefix"; From cda2242214c48d1facf258f6b5ee04830b444175 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Tue, 3 Sep 2024 12:41:26 +0200 Subject: [PATCH 215/235] nextcloud29: 29.0.5 -> 29.0.6 ChangeLog: https://github.com/nextcloud/server/releases/tag/v29.0.6 --- pkgs/servers/nextcloud/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/nextcloud/default.nix b/pkgs/servers/nextcloud/default.nix index 5db49397fdb7..ddd8e79b5e80 100644 --- a/pkgs/servers/nextcloud/default.nix +++ b/pkgs/servers/nextcloud/default.nix @@ -48,8 +48,8 @@ in { }; nextcloud29 = generic { - version = "29.0.5"; - hash = "sha256-x/6cYeXsMKXlmejxUqGCXfaE0w6JnbDKqIaMjWe1Oiw="; + version = "29.0.6"; + hash = "sha256-3GC+A/0X4wuv7ypNT+stCWqnekxrTyHJhXYOU3+EAeM="; packages = nextcloud29Packages; }; From ff8952add32eefab31c0361554396372dc667adf Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Tue, 3 Sep 2024 12:41:46 +0200 Subject: [PATCH 216/235] nextcloud*Packages: update apps --- pkgs/servers/nextcloud/packages/28.json | 40 +++++++++++++++---------- pkgs/servers/nextcloud/packages/29.json | 30 +++++++++---------- 2 files changed, 40 insertions(+), 30 deletions(-) diff --git a/pkgs/servers/nextcloud/packages/28.json b/pkgs/servers/nextcloud/packages/28.json index ba9a83d24210..a37e59e8d813 100644 --- a/pkgs/servers/nextcloud/packages/28.json +++ b/pkgs/servers/nextcloud/packages/28.json @@ -10,9 +10,9 @@ ] }, "calendar": { - "hash": "sha256-AcPONkfFTDRd7CQC5d0C7Fr3pKRsQXl8+GhaNlqpgiY=", - "url": "https://github.com/nextcloud-releases/calendar/releases/download/v4.7.15/calendar-v4.7.15.tar.gz", - "version": "4.7.15", + "hash": "sha256-NwXTuSHl278Q2Wko4DC3rzqvNHnDI513UJ+8/3Rp5/U=", + "url": "https://github.com/nextcloud-releases/calendar/releases/download/v4.7.16/calendar-v4.7.16.tar.gz", + "version": "4.7.16", "description": "The Calendar app is a user interface for Nextcloud's CalDAV server. Easily sync events from various devices with your Nextcloud and edit them online.\n\n* 🚀 **Integration with other Nextcloud apps!** Currently Contacts - more to come.\n* 🌐 **WebCal Support!** Want to see your favorite team’s matchdays in your calendar? No problem!\n* 🙋 **Attendees!** Invite people to your events\n* ⌚️ **Free/Busy!** See when your attendees are available to meet\n* ⏰ **Reminders!** Get alarms for events inside your browser and via email\n* 🔍 Search! Find your events at ease\n* ☑️ Tasks! See tasks with a due date directly in the calendar\n* 🙈 **We’re not reinventing the wheel!** Based on the great [c-dav library](https://github.com/nextcloud/cdav-library), [ical.js](https://github.com/mozilla-comm/ical.js) and [fullcalendar](https://github.com/fullcalendar/fullcalendar) libraries.", "homepage": "https://github.com/nextcloud/calendar/", "licenses": [ @@ -130,9 +130,9 @@ ] }, "mail": { - "hash": "sha256-oXdwApzy67tCsUNsPTdsE3HIs89g46I2W+cCVCPkRow=", - "url": "https://github.com/nextcloud-releases/mail/releases/download/v3.7.7/mail-v3.7.7.tar.gz", - "version": "3.7.7", + "hash": "sha256-8xQglDlOudopTsEqvnlsOTwOU6eAt6argVSXDxJdWUA=", + "url": "https://github.com/nextcloud-releases/mail/releases/download/v3.7.8/mail-v3.7.8.tar.gz", + "version": "3.7.8", "description": "**💌 A mail app for Nextcloud**\n\n- **🚀 Integration with other Nextcloud apps!** Currently Contacts, Calendar & Files – more to come.\n- **📥 Multiple mail accounts!** Personal and company account? No problem, and a nice unified inbox. Connect any IMAP account.\n- **🔒 Send & receive encrypted mails!** Using the great [Mailvelope](https://mailvelope.com) browser extension.\n- **🙈 We’re not reinventing the wheel!** Based on the great [Horde](https://horde.org) libraries.\n- **📬 Want to host your own mail server?** We do not have to reimplement this as you could set up [Mail-in-a-Box](https://mailinabox.email)!\n\n## Ethical AI Rating\n\n### Priority Inbox\n\nPositive:\n* The software for training and inferencing of this model is open source.\n* The model is created and trained on-premises based on the user's own data.\n* The training data is accessible to the user, making it possible to check or correct for bias or optimise the performance and CO2 usage.\n\n### Thread Summaries (opt-in)\n\n**Rating:** 🟢/🟡/🟠/🔴\n\nThe rating depends on the installed text processing backend. See [the rating overview](https://docs.nextcloud.com/server/latest/admin_manual/ai/index.html) for details.\n\nLearn more about the Nextcloud Ethical AI Rating [in our blog](https://nextcloud.com/blog/nextcloud-ethical-ai-rating/).", "homepage": "https://github.com/nextcloud/mail#readme", "licenses": [ @@ -210,9 +210,9 @@ ] }, "polls": { - "hash": "sha256-6vYcZvI0F+imCMRO1XwBcyLmNJR+1miOkR2mpPpYAJE=", - "url": "https://github.com/nextcloud/polls/releases/download/v7.2.0/polls.tar.gz", - "version": "7.2.0", + "hash": "sha256-tSnR5O+OCYjoPoh2/WX3ntCagw9xanmxCR+DaMnAhJA=", + "url": "https://github.com/nextcloud-releases/polls/releases/download/v7.2.1/polls-v7.2.1.tar.gz", + "version": "7.2.1", "description": "A polls app, similar to Doodle/Dudle with the possibility to restrict access (members, certain groups/users, hidden and public).", "homepage": "https://github.com/nextcloud/polls", "licenses": [ @@ -250,9 +250,9 @@ ] }, "richdocuments": { - "hash": "sha256-OrlbwMjoB8MGemB85xHa4otfB1PpriUxjYp+wbswR7s=", - "url": "https://github.com/nextcloud-releases/richdocuments/releases/download/v8.3.9/richdocuments-v8.3.9.tar.gz", - "version": "8.3.9", + "hash": "sha256-aEAcOQTNCdJBFZAf9LfukgsQZddx9Qa5IMOPKUXaVjQ=", + "url": "https://github.com/nextcloud-releases/richdocuments/releases/download/v8.3.10/richdocuments-v8.3.10.tar.gz", + "version": "8.3.10", "description": "This application can connect to a Collabora Online (or other) server (WOPI-like Client). Nextcloud is the WOPI Host. Please read the documentation to learn more about that.\n\nYou can also edit your documents off-line with the Collabora Office app from the **[Android](https://play.google.com/store/apps/details?id=com.collabora.libreoffice)** and **[iOS](https://apps.apple.com/us/app/collabora-office/id1440482071)** store.", "homepage": "https://collaboraoffice.com/", "licenses": [ @@ -260,9 +260,9 @@ ] }, "spreed": { - "hash": "sha256-kKdMx8KXQQ5RemdINtiZG+zJGpDSn7TYlTMYG7GHIhI=", - "url": "https://github.com/nextcloud-releases/spreed/releases/download/v18.0.10/spreed-v18.0.10.tar.gz", - "version": "18.0.10", + "hash": "sha256-eMdFS5yQWJNsTVuHBZX4v0PSocP/nT+JaS7RSTYF8p0=", + "url": "https://github.com/nextcloud-releases/spreed/releases/download/v18.0.11/spreed-v18.0.11.tar.gz", + "version": "18.0.11", "description": "Chat, video & audio-conferencing using WebRTC\n\n* 💬 **Chat** Nextcloud Talk comes with a simple text chat, allowing you to share or upload files from your Nextcloud Files app or local device and mention other participants.\n* 👥 **Private, group, public and password protected calls!** Invite someone, a whole group or send a public link to invite to a call.\n* 🌐 **Federated chats** Chat with other Nextcloud users on their servers\n* 💻 **Screen sharing!** Share your screen with the participants of your call.\n* 🚀 **Integration with other Nextcloud apps** like Files, Calendar, User status, Dashboard, Flow, Maps, Smart picker, Contacts, Deck, and many more.\n* 🌉 **Sync with other chat solutions** With [Matterbridge](https://github.com/42wim/matterbridge/) being integrated in Talk, you can easily sync a lot of other chat solutions to Nextcloud Talk and vice-versa.", "homepage": "https://github.com/nextcloud/spreed", "licenses": [ @@ -309,6 +309,16 @@ "agpl" ] }, + "unsplash": { + "hash": "sha256-xfu5m5VOZZ9ATnRg44sw/MTEXitrDFCuAcm+siNilsY=", + "url": "https://github.com/nextcloud/unsplash/releases/download/v3.0.0/unsplash.tar.gz", + "version": "3.0.0", + "description": "Show a new random featured nature photo in your nextcloud. Now with choosable motives!", + "homepage": "https://github.com/nextcloud/unsplash/", + "licenses": [ + "agpl" + ] + }, "user_oidc": { "hash": "sha256-8e4xQjOWSVAps6dg4jvN3MGVSOhaOgjPHPpTOgXKFJY=", "url": "https://github.com/nextcloud-releases/user_oidc/releases/download/v6.0.1/user_oidc-v6.0.1.tar.gz", diff --git a/pkgs/servers/nextcloud/packages/29.json b/pkgs/servers/nextcloud/packages/29.json index 2a0e2d1bbc75..e453178b33f4 100644 --- a/pkgs/servers/nextcloud/packages/29.json +++ b/pkgs/servers/nextcloud/packages/29.json @@ -10,9 +10,9 @@ ] }, "calendar": { - "hash": "sha256-AcPONkfFTDRd7CQC5d0C7Fr3pKRsQXl8+GhaNlqpgiY=", - "url": "https://github.com/nextcloud-releases/calendar/releases/download/v4.7.15/calendar-v4.7.15.tar.gz", - "version": "4.7.15", + "hash": "sha256-NwXTuSHl278Q2Wko4DC3rzqvNHnDI513UJ+8/3Rp5/U=", + "url": "https://github.com/nextcloud-releases/calendar/releases/download/v4.7.16/calendar-v4.7.16.tar.gz", + "version": "4.7.16", "description": "The Calendar app is a user interface for Nextcloud's CalDAV server. Easily sync events from various devices with your Nextcloud and edit them online.\n\n* 🚀 **Integration with other Nextcloud apps!** Currently Contacts - more to come.\n* 🌐 **WebCal Support!** Want to see your favorite team’s matchdays in your calendar? No problem!\n* 🙋 **Attendees!** Invite people to your events\n* ⌚️ **Free/Busy!** See when your attendees are available to meet\n* ⏰ **Reminders!** Get alarms for events inside your browser and via email\n* 🔍 Search! Find your events at ease\n* ☑️ Tasks! See tasks with a due date directly in the calendar\n* 🙈 **We’re not reinventing the wheel!** Based on the great [c-dav library](https://github.com/nextcloud/cdav-library), [ical.js](https://github.com/mozilla-comm/ical.js) and [fullcalendar](https://github.com/fullcalendar/fullcalendar) libraries.", "homepage": "https://github.com/nextcloud/calendar/", "licenses": [ @@ -130,9 +130,9 @@ ] }, "mail": { - "hash": "sha256-oXdwApzy67tCsUNsPTdsE3HIs89g46I2W+cCVCPkRow=", - "url": "https://github.com/nextcloud-releases/mail/releases/download/v3.7.7/mail-v3.7.7.tar.gz", - "version": "3.7.7", + "hash": "sha256-8xQglDlOudopTsEqvnlsOTwOU6eAt6argVSXDxJdWUA=", + "url": "https://github.com/nextcloud-releases/mail/releases/download/v3.7.8/mail-v3.7.8.tar.gz", + "version": "3.7.8", "description": "**💌 A mail app for Nextcloud**\n\n- **🚀 Integration with other Nextcloud apps!** Currently Contacts, Calendar & Files – more to come.\n- **📥 Multiple mail accounts!** Personal and company account? No problem, and a nice unified inbox. Connect any IMAP account.\n- **🔒 Send & receive encrypted mails!** Using the great [Mailvelope](https://mailvelope.com) browser extension.\n- **🙈 We’re not reinventing the wheel!** Based on the great [Horde](https://horde.org) libraries.\n- **📬 Want to host your own mail server?** We do not have to reimplement this as you could set up [Mail-in-a-Box](https://mailinabox.email)!\n\n## Ethical AI Rating\n\n### Priority Inbox\n\nPositive:\n* The software for training and inferencing of this model is open source.\n* The model is created and trained on-premises based on the user's own data.\n* The training data is accessible to the user, making it possible to check or correct for bias or optimise the performance and CO2 usage.\n\n### Thread Summaries (opt-in)\n\n**Rating:** 🟢/🟡/🟠/🔴\n\nThe rating depends on the installed text processing backend. See [the rating overview](https://docs.nextcloud.com/server/latest/admin_manual/ai/index.html) for details.\n\nLearn more about the Nextcloud Ethical AI Rating [in our blog](https://nextcloud.com/blog/nextcloud-ethical-ai-rating/).", "homepage": "https://github.com/nextcloud/mail#readme", "licenses": [ @@ -210,9 +210,9 @@ ] }, "polls": { - "hash": "sha256-6vYcZvI0F+imCMRO1XwBcyLmNJR+1miOkR2mpPpYAJE=", - "url": "https://github.com/nextcloud/polls/releases/download/v7.2.0/polls.tar.gz", - "version": "7.2.0", + "hash": "sha256-tSnR5O+OCYjoPoh2/WX3ntCagw9xanmxCR+DaMnAhJA=", + "url": "https://github.com/nextcloud-releases/polls/releases/download/v7.2.1/polls-v7.2.1.tar.gz", + "version": "7.2.1", "description": "A polls app, similar to Doodle/Dudle with the possibility to restrict access (members, certain groups/users, hidden and public).", "homepage": "https://github.com/nextcloud/polls", "licenses": [ @@ -250,9 +250,9 @@ ] }, "richdocuments": { - "hash": "sha256-uTY8li9cIBd/0/k9UAcoTboPNnvb66+6vB3nlplLY1E=", - "url": "https://github.com/nextcloud-releases/richdocuments/releases/download/v8.4.4/richdocuments-v8.4.4.tar.gz", - "version": "8.4.4", + "hash": "sha256-kAY1Y4PB7AIFWNx+Yi1ovZopGEER/r5RveIlS/y6Veo=", + "url": "https://github.com/nextcloud-releases/richdocuments/releases/download/v8.4.5/richdocuments-v8.4.5.tar.gz", + "version": "8.4.5", "description": "This application can connect to a Collabora Online (or other) server (WOPI-like Client). Nextcloud is the WOPI Host. Please read the documentation to learn more about that.\n\nYou can also edit your documents off-line with the Collabora Office app from the **[Android](https://play.google.com/store/apps/details?id=com.collabora.libreoffice)** and **[iOS](https://apps.apple.com/us/app/collabora-office/id1440482071)** store.", "homepage": "https://collaboraoffice.com/", "licenses": [ @@ -260,9 +260,9 @@ ] }, "spreed": { - "hash": "sha256-8PuYhxqP4594+Tt1lwGw93K2/dZwm97hSw13J0T3lhc=", - "url": "https://github.com/nextcloud-releases/spreed/releases/download/v19.0.7/spreed-v19.0.7.tar.gz", - "version": "19.0.7", + "hash": "sha256-/WD/UAtuLYdtZjBNIur2qRaPNXGTG1lfPTOlJpZfyCI=", + "url": "https://github.com/nextcloud-releases/spreed/releases/download/v19.0.8/spreed-v19.0.8.tar.gz", + "version": "19.0.8", "description": "Chat, video & audio-conferencing using WebRTC\n\n* 💬 **Chat** Nextcloud Talk comes with a simple text chat, allowing you to share or upload files from your Nextcloud Files app or local device and mention other participants.\n* 👥 **Private, group, public and password protected calls!** Invite someone, a whole group or send a public link to invite to a call.\n* 🌐 **Federated chats** Chat with other Nextcloud users on their servers\n* 💻 **Screen sharing!** Share your screen with the participants of your call.\n* 🚀 **Integration with other Nextcloud apps** like Files, Calendar, User status, Dashboard, Flow, Maps, Smart picker, Contacts, Deck, and many more.\n* 🌉 **Sync with other chat solutions** With [Matterbridge](https://github.com/42wim/matterbridge/) being integrated in Talk, you can easily sync a lot of other chat solutions to Nextcloud Talk and vice-versa.", "homepage": "https://github.com/nextcloud/spreed", "licenses": [ From 2d33d5c7783ee46320d7776ff33dac5b3887d523 Mon Sep 17 00:00:00 2001 From: Ivan Trubach Date: Tue, 3 Sep 2024 22:57:51 +0300 Subject: [PATCH 217/235] buildDotnetModule: inherit enableParallelBuilding MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit After this change, enableParallelBuilding defaults to true for packages using buildDotnetModule. The argument value already defaults to true, but we did not use it. Note that default values in Nix are not present in the arguments attribute set, e.g. `args` does not contain `def` for `{ def ? true }@args: …` function unless this argument is explicitly passed. --- pkgs/build-support/dotnet/build-dotnet-module/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/build-support/dotnet/build-dotnet-module/default.nix b/pkgs/build-support/dotnet/build-dotnet-module/default.nix index 418c90c64899..e36e339dfa7f 100644 --- a/pkgs/build-support/dotnet/build-dotnet-module/default.nix +++ b/pkgs/build-support/dotnet/build-dotnet-module/default.nix @@ -147,6 +147,8 @@ let dotnetUseAppHost = useAppHost; inherit useDotnetFromEnv; + inherit enableParallelBuilding; + nativeBuildInputs = args.nativeBuildInputs or [ ] ++ [ dotnetConfigureHook dotnetBuildHook From 458e48eb518f2d5a43a6214922c7a765a2d7936b Mon Sep 17 00:00:00 2001 From: Pascal Bach Date: Tue, 3 Sep 2024 22:01:46 +0200 Subject: [PATCH 218/235] openshift: remove bachp as maintainer --- pkgs/applications/networking/cluster/openshift/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/networking/cluster/openshift/default.nix b/pkgs/applications/networking/cluster/openshift/default.nix index 2ac931ba414b..ea67231bfcc8 100644 --- a/pkgs/applications/networking/cluster/openshift/default.nix +++ b/pkgs/applications/networking/cluster/openshift/default.nix @@ -60,7 +60,7 @@ buildGoModule rec { description = "Build, deploy, and manage your applications with Docker and Kubernetes"; homepage = "http://www.openshift.org"; license = licenses.asl20; - maintainers = with maintainers; [ offline bachp moretea stehessel ]; + maintainers = with maintainers; [ offline moretea stehessel ]; mainProgram = "oc"; }; } From 9656e3f8008102a5c7bda86503ed8037d0bda628 Mon Sep 17 00:00:00 2001 From: Pascal Bach Date: Tue, 3 Sep 2024 22:02:04 +0200 Subject: [PATCH 219/235] gitlab-runner: remove bachp as maintainer --- pkgs/by-name/gi/gitlab-runner/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/gi/gitlab-runner/package.nix b/pkgs/by-name/gi/gitlab-runner/package.nix index a4806b80c244..61d2af6ac7c8 100644 --- a/pkgs/by-name/gi/gitlab-runner/package.nix +++ b/pkgs/by-name/gi/gitlab-runner/package.nix @@ -70,6 +70,6 @@ buildGoModule rec { license = licenses.mit; homepage = "https://docs.gitlab.com/runner/"; platforms = platforms.unix ++ platforms.darwin; - maintainers = with maintainers; [ bachp zimbatm ] ++ teams.gitlab.members; + maintainers = with maintainers; [ zimbatm ] ++ teams.gitlab.members; }; } From 40c5077a7adef4b06cad27b6206ed87716343f2c Mon Sep 17 00:00:00 2001 From: Niklas Korz Date: Tue, 3 Sep 2024 22:24:57 +0200 Subject: [PATCH 220/235] conduwuit: init at 0.4.6 --- pkgs/by-name/co/conduwuit/Cargo.lock | 5043 +++++++++++++++++++++++++ pkgs/by-name/co/conduwuit/package.nix | 107 + 2 files changed, 5150 insertions(+) create mode 100644 pkgs/by-name/co/conduwuit/Cargo.lock create mode 100644 pkgs/by-name/co/conduwuit/package.nix diff --git a/pkgs/by-name/co/conduwuit/Cargo.lock b/pkgs/by-name/co/conduwuit/Cargo.lock new file mode 100644 index 000000000000..ca348f411711 --- /dev/null +++ b/pkgs/by-name/co/conduwuit/Cargo.lock @@ -0,0 +1,5043 @@ +# This file is automatically @generated by Cargo. +# It is not intended for manual editing. +version = 3 + +[[package]] +name = "addr2line" +version = "0.22.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6e4503c46a5c0c7844e948c9a4d6acd9f50cccb4de1c48eb9e291ea17470c678" +dependencies = [ + "gimli", +] + +[[package]] +name = "adler" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" + +[[package]] +name = "adler2" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "512761e0bb2578dd7380c6baaa0f4ce03e84f95e960231d1dec8bf4d7d6e2627" + +[[package]] +name = "aho-corasick" +version = "1.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916" +dependencies = [ + "memchr", +] + +[[package]] +name = "alloc-no-stdlib" +version = "2.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cc7bb162ec39d46ab1ca8c77bf72e890535becd1751bb45f64c597edb4c8c6b3" + +[[package]] +name = "alloc-stdlib" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "94fb8275041c72129eb51b7d0322c29b8387a0386127718b096429201a5d6ece" +dependencies = [ + "alloc-no-stdlib", +] + +[[package]] +name = "anstyle" +version = "1.0.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1bec1de6f59aedf83baf9ff929c98f2ad654b97c9510f4e70cf6f661d49fd5b1" + +[[package]] +name = "anyhow" +version = "1.0.86" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b3d1d046238990b9cf5bcde22a3fb3584ee5cf65fb2765f454ed428c7a0063da" + +[[package]] +name = "arc-swap" +version = "1.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "69f7f8c3906b62b754cd5326047894316021dcfe5a194c8ea52bdd94934a3457" + +[[package]] +name = "argon2" +version = "0.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3c3610892ee6e0cbce8ae2700349fcf8f98adb0dbfbee85aec3c9179d29cc072" +dependencies = [ + "base64ct", + "blake2", + "cpufeatures", + "password-hash", +] + +[[package]] +name = "arrayvec" +version = "0.7.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7c02d123df017efcdfbd739ef81735b36c5ba83ec3c59c80a9d7ecc718f92e50" + +[[package]] +name = "as_variant" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f38fa22307249f86fb7fad906fcae77f2564caeb56d7209103c551cd1cf4798f" + +[[package]] +name = "assign" +version = "1.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5f093eed78becd229346bf859eec0aa4dd7ddde0757287b2b4107a1f09c80002" + +[[package]] +name = "async-compression" +version = "0.4.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fec134f64e2bc57411226dfc4e52dec859ddfc7e711fc5e07b612584f000e4aa" +dependencies = [ + "brotli", + "flate2", + "futures-core", + "memchr", + "pin-project-lite", + "tokio", + "zstd", + "zstd-safe", +] + +[[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.76", +] + +[[package]] +name = "async-trait" +version = "0.1.81" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6e0c28dcc82d7c8ead5cb13beb15405b57b8546e93215673ff8ca0349a028107" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.76", +] + +[[package]] +name = "atomic" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8d818003e740b63afc82337e3160717f4f63078720a810b7b903e70a5d1d2994" +dependencies = [ + "bytemuck", +] + +[[package]] +name = "atomic-waker" +version = "1.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0" + +[[package]] +name = "autocfg" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0" + +[[package]] +name = "aws-lc-rs" +version = "1.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4ae74d9bd0a7530e8afd1770739ad34b36838829d6ad61818f9230f683f5ad77" +dependencies = [ + "aws-lc-sys", + "mirai-annotations", + "paste", + "zeroize", +] + +[[package]] +name = "aws-lc-sys" +version = "0.20.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0f0e249228c6ad2d240c2dc94b714d711629d52bad946075d8e9b2f5391f0703" +dependencies = [ + "bindgen", + "cc", + "cmake", + "dunce", + "fs_extra", + "libc", + "paste", +] + +[[package]] +name = "axum" +version = "0.7.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3a6c9af12842a67734c9a2e355436e5d03b22383ed60cf13cd0c18fbfe3dcbcf" +dependencies = [ + "async-trait", + "axum-core", + "bytes", + "futures-util", + "http", + "http-body", + "http-body-util", + "hyper", + "hyper-util", + "itoa", + "matchit", + "memchr", + "mime", + "percent-encoding", + "pin-project-lite", + "rustversion", + "serde", + "serde_json", + "serde_path_to_error", + "serde_urlencoded", + "sync_wrapper 1.0.1", + "tokio", + "tower 0.4.13", + "tower-layer", + "tower-service", + "tracing", +] + +[[package]] +name = "axum-client-ip" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "72188bed20deb981f3a4a9fe674e5980fd9e9c2bd880baa94715ad5d60d64c67" +dependencies = [ + "axum", + "forwarded-header-value", + "serde", +] + +[[package]] +name = "axum-core" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a15c63fd72d41492dc4f497196f5da1fb04fb7529e631d73630d1b491e47a2e3" +dependencies = [ + "async-trait", + "bytes", + "futures-util", + "http", + "http-body", + "http-body-util", + "mime", + "pin-project-lite", + "rustversion", + "sync_wrapper 0.1.2", + "tower-layer", + "tower-service", + "tracing", +] + +[[package]] +name = "axum-extra" +version = "0.9.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0be6ea09c9b96cb5076af0de2e383bd2bc0c18f827cf1967bdd353e0b910d733" +dependencies = [ + "axum", + "axum-core", + "bytes", + "futures-util", + "headers", + "http", + "http-body", + "http-body-util", + "mime", + "pin-project-lite", + "serde", + "tower 0.4.13", + "tower-layer", + "tower-service", + "tracing", +] + +[[package]] +name = "axum-server" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "56bac90848f6a9393ac03c63c640925c4b7c8ca21654de40d53f55964667c7d8" +dependencies = [ + "arc-swap", + "bytes", + "futures-util", + "http", + "http-body", + "http-body-util", + "hyper", + "hyper-util", + "pin-project-lite", + "rustls 0.23.12", + "rustls-pemfile", + "rustls-pki-types", + "tokio", + "tokio-rustls", + "tower 0.4.13", + "tower-service", +] + +[[package]] +name = "axum-server-dual-protocol" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2164551db024e87f20316d164eab9f5ad342d8188b08051ceb15ca92a60ea7b7" +dependencies = [ + "axum-server", + "bytes", + "http", + "http-body-util", + "pin-project", + "rustls 0.23.12", + "tokio", + "tokio-rustls", + "tokio-util", + "tower-layer", + "tower-service", +] + +[[package]] +name = "backtrace" +version = "0.3.73" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5cc23269a4f8976d0a4d2e7109211a419fe30e8d88d677cd60b6bc79c5732e0a" +dependencies = [ + "addr2line", + "cc", + "cfg-if", + "libc", + "miniz_oxide 0.7.4", + "object", + "rustc-demangle", +] + +[[package]] +name = "base64" +version = "0.21.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567" + +[[package]] +name = "base64" +version = "0.22.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6" + +[[package]] +name = "base64ct" +version = "1.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8c3c1a368f70d6cf7302d78f8f7093da241fb8e8807c05cc9e51a125895a6d5b" + +[[package]] +name = "bindgen" +version = "0.69.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a00dc851838a2120612785d195287475a3ac45514741da670b735818822129a0" +dependencies = [ + "bitflags 2.6.0", + "cexpr", + "clang-sys", + "itertools 0.12.1", + "lazy_static", + "lazycell", + "log", + "prettyplease", + "proc-macro2", + "quote", + "regex", + "rustc-hash 1.1.0", + "shlex", + "syn 2.0.76", + "which", +] + +[[package]] +name = "bitflags" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" + +[[package]] +name = "bitflags" +version = "2.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de" + +[[package]] +name = "blake2" +version = "0.10.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "46502ad458c9a52b69d4d4d32775c788b7a1b85e8bc9d482d92250fc0e3f8efe" +dependencies = [ + "digest", +] + +[[package]] +name = "block-buffer" +version = "0.10.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71" +dependencies = [ + "generic-array", +] + +[[package]] +name = "brotli" +version = "6.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "74f7971dbd9326d58187408ab83117d8ac1bb9c17b085fdacd1cf2f598719b6b" +dependencies = [ + "alloc-no-stdlib", + "alloc-stdlib", + "brotli-decompressor", +] + +[[package]] +name = "brotli-decompressor" +version = "4.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9a45bd2e4095a8b518033b128020dd4a55aab1c0a381ba4404a472630f4bc362" +dependencies = [ + "alloc-no-stdlib", + "alloc-stdlib", +] + +[[package]] +name = "bumpalo" +version = "3.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c" + +[[package]] +name = "bytemuck" +version = "1.17.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6fd4c6dcc3b0aea2f5c0b4b82c2b15fe39ddbc76041a310848f4706edf76bb31" + +[[package]] +name = "byteorder" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" + +[[package]] +name = "byteorder-lite" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f1fe948ff07f4bd06c30984e69f5b4899c516a3ef74f34df92a2df2ab535495" + +[[package]] +name = "bytes" +version = "1.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8318a53db07bb3f8dca91a600466bdb3f2eaadeedfdbcf02e1accbad9271ba50" + +[[package]] +name = "bzip2-sys" +version = "0.1.11+1.0.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "736a955f3fa7875102d57c82b8cac37ec45224a07fd32d58f9f7a186b6cd4cdc" +dependencies = [ + "cc", + "libc", + "pkg-config", +] + +[[package]] +name = "cargo_toml" +version = "0.20.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ad639525b1c67b6a298f378417b060fbc04618bea559482a8484381cce27d965" +dependencies = [ + "serde", + "toml", +] + +[[package]] +name = "cc" +version = "1.1.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "50d2eb3cd3d1bf4529e31c215ee6f93ec5a3d536d9f578f93d9d33ee19562932" +dependencies = [ + "jobserver", + "libc", + "shlex", +] + +[[package]] +name = "cexpr" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6fac387a98bb7c37292057cffc56d62ecb629900026402633ae9160df93a8766" +dependencies = [ + "nom", +] + +[[package]] +name = "cfg-if" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" + +[[package]] +name = "cfg_aliases" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724" + +[[package]] +name = "checked_ops" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b491d76efc1d99d74de3c8529bee64c62312c275c7eb124f9185291de45801d5" +dependencies = [ + "num-traits", +] + +[[package]] +name = "chrono" +version = "0.4.38" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a21f936df1771bf62b77f047b726c4625ff2e8aa607c01ec06e5a05bd8463401" +dependencies = [ + "num-traits", +] + +[[package]] +name = "clang-sys" +version = "1.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b023947811758c97c59bf9d1c188fd619ad4718dcaa767947df1cadb14f39f4" +dependencies = [ + "glob", + "libc", + "libloading", +] + +[[package]] +name = "clap" +version = "4.5.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ed6719fffa43d0d87e5fd8caeab59be1554fb028cd30edc88fc4369b17971019" +dependencies = [ + "clap_builder", + "clap_derive", +] + +[[package]] +name = "clap_builder" +version = "4.5.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "216aec2b177652e3846684cbfe25c9964d18ec45234f0f5da5157b207ed1aab6" +dependencies = [ + "anstyle", + "clap_lex", +] + +[[package]] +name = "clap_derive" +version = "4.5.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "501d359d5f3dcaf6ecdeee48833ae73ec6e42723a1e52419c79abf9507eec0a0" +dependencies = [ + "heck 0.5.0", + "proc-macro2", + "quote", + "syn 2.0.76", +] + +[[package]] +name = "clap_lex" +version = "0.7.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1462739cb27611015575c0c11df5df7601141071f07518d56fcc1be504cbec97" + +[[package]] +name = "cmake" +version = "0.1.51" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fb1e43aa7fd152b1f968787f7dbcdeb306d1867ff373c69955211876c053f91a" +dependencies = [ + "cc", +] + +[[package]] +name = "color_quant" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3d7b894f5411737b7867f4827955924d7c254fc9f4d91a6aad6b097804b1018b" + +[[package]] +name = "conduit" +version = "0.4.6" +dependencies = [ + "clap", + "conduit_admin", + "conduit_api", + "conduit_core", + "conduit_database", + "conduit_router", + "conduit_service", + "console-subscriber", + "const-str", + "hardened_malloc-rs", + "log", + "opentelemetry", + "opentelemetry-jaeger", + "opentelemetry_sdk", + "sentry", + "sentry-tower", + "sentry-tracing", + "tokio", + "tokio-metrics", + "tracing", + "tracing-flame", + "tracing-opentelemetry", + "tracing-subscriber", +] + +[[package]] +name = "conduit_admin" +version = "0.4.6" +dependencies = [ + "clap", + "conduit_api", + "conduit_core", + "conduit_macros", + "conduit_service", + "const-str", + "futures-util", + "log", + "ruma", + "serde_json", + "serde_yaml", + "tokio", + "tracing", + "tracing-subscriber", +] + +[[package]] +name = "conduit_api" +version = "0.4.6" +dependencies = [ + "axum", + "axum-client-ip", + "axum-extra", + "base64 0.22.1", + "bytes", + "conduit_core", + "conduit_database", + "conduit_service", + "const-str", + "futures-util", + "hmac", + "http", + "http-body-util", + "hyper", + "ipaddress", + "jsonwebtoken", + "log", + "rand", + "reqwest", + "ruma", + "serde", + "serde_html_form", + "serde_json", + "sha-1", + "tokio", + "tracing", +] + +[[package]] +name = "conduit_core" +version = "0.4.6" +dependencies = [ + "argon2", + "arrayvec", + "axum", + "bytes", + "cargo_toml", + "checked_ops", + "chrono", + "clap", + "conduit_macros", + "const-str", + "ctor", + "cyborgtime", + "either", + "figment", + "hardened_malloc-rs", + "http", + "http-body-util", + "image", + "ipaddress", + "itertools 0.13.0", + "libloading", + "log", + "nix", + "rand", + "regex", + "reqwest", + "ring", + "ruma", + "rustls 0.23.12", + "sanitize-filename", + "serde", + "serde_json", + "serde_regex", + "thiserror", + "tikv-jemalloc-ctl", + "tikv-jemalloc-sys", + "tikv-jemallocator", + "tokio", + "tokio-metrics", + "toml", + "tracing", + "tracing-core", + "tracing-subscriber", + "url", +] + +[[package]] +name = "conduit_database" +version = "0.4.6" +dependencies = [ + "conduit_core", + "const-str", + "log", + "rust-rocksdb-uwu", + "tokio", + "tracing", +] + +[[package]] +name = "conduit_macros" +version = "0.4.6" +dependencies = [ + "itertools 0.13.0", + "proc-macro2", + "quote", + "syn 2.0.76", +] + +[[package]] +name = "conduit_router" +version = "0.4.6" +dependencies = [ + "axum", + "axum-client-ip", + "axum-server", + "axum-server-dual-protocol", + "bytes", + "conduit_admin", + "conduit_api", + "conduit_core", + "conduit_service", + "const-str", + "http", + "http-body-util", + "hyper", + "hyper-util", + "log", + "ruma", + "rustls 0.23.12", + "sd-notify", + "sentry", + "sentry-tower", + "sentry-tracing", + "serde_json", + "tokio", + "tower 0.5.0", + "tower-http", + "tracing", +] + +[[package]] +name = "conduit_service" +version = "0.4.6" +dependencies = [ + "async-trait", + "base64 0.22.1", + "bytes", + "conduit_core", + "conduit_database", + "const-str", + "futures-util", + "hickory-resolver", + "http", + "image", + "ipaddress", + "itertools 0.13.0", + "jsonwebtoken", + "log", + "loole", + "lru-cache", + "rand", + "regex", + "reqwest", + "ruma", + "rustyline-async", + "serde", + "serde_json", + "serde_yaml", + "sha2", + "termimad", + "tokio", + "tracing", + "url", + "webpage", +] + +[[package]] +name = "console-api" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "86ed14aa9c9f927213c6e4f3ef75faaad3406134efe84ba2cb7983431d5f0931" +dependencies = [ + "futures-core", + "prost", + "prost-types", + "tonic", + "tracing-core", +] + +[[package]] +name = "console-subscriber" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e2e3a111a37f3333946ebf9da370ba5c5577b18eb342ec683eb488dd21980302" +dependencies = [ + "console-api", + "crossbeam-channel", + "crossbeam-utils", + "futures-task", + "hdrhistogram", + "humantime", + "hyper-util", + "prost", + "prost-types", + "serde", + "serde_json", + "thread_local", + "tokio", + "tokio-stream", + "tonic", + "tracing", + "tracing-core", + "tracing-subscriber", +] + +[[package]] +name = "const-oid" +version = "0.9.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c2459377285ad874054d797f3ccebf984978aa39129f6eafde5cdc8315b612f8" + +[[package]] +name = "const-str" +version = "0.5.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3618cccc083bb987a415d85c02ca6c9994ea5b44731ec28b9ecf09658655fba9" + +[[package]] +name = "const_panic" +version = "0.2.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6051f239ecec86fde3410901ab7860d458d160371533842974fc61f96d15879b" + +[[package]] +name = "coolor" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "691defa50318376447a73ced869862baecfab35f6aabaa91a4cd726b315bfe1a" +dependencies = [ + "crossterm", +] + +[[package]] +name = "core-foundation" +version = "0.9.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "91e195e091a93c46f7102ec7818a2aa394e1e1771c3ab4825963fa03e45afb8f" +dependencies = [ + "core-foundation-sys", + "libc", +] + +[[package]] +name = "core-foundation-sys" +version = "0.8.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b" + +[[package]] +name = "cpufeatures" +version = "0.2.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "51e852e6dc9a5bed1fae92dd2375037bf2b768725bf3be87811edee3249d09ad" +dependencies = [ + "libc", +] + +[[package]] +name = "crc32fast" +version = "1.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a97769d94ddab943e4510d138150169a2758b5ef3eb191a9ee688de3e23ef7b3" +dependencies = [ + "cfg-if", +] + +[[package]] +name = "crokey" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "520e83558f4c008ac06fa6a86e5c1d4357be6f994cce7434463ebcdaadf47bb1" +dependencies = [ + "crokey-proc_macros", + "crossterm", + "once_cell", + "serde", + "strict", +] + +[[package]] +name = "crokey-proc_macros" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "370956e708a1ce65fe4ac5bb7185791e0ece7485087f17736d54a23a0895049f" +dependencies = [ + "crossterm", + "proc-macro2", + "quote", + "strict", + "syn 1.0.109", +] + +[[package]] +name = "crossbeam" +version = "0.8.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1137cd7e7fc0fb5d3c5a8678be38ec56e819125d8d7907411fe24ccb943faca8" +dependencies = [ + "crossbeam-channel", + "crossbeam-deque", + "crossbeam-epoch", + "crossbeam-queue", + "crossbeam-utils", +] + +[[package]] +name = "crossbeam-channel" +version = "0.5.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "33480d6946193aa8033910124896ca395333cae7e2d1113d1fef6c3272217df2" +dependencies = [ + "crossbeam-utils", +] + +[[package]] +name = "crossbeam-deque" +version = "0.8.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "613f8cc01fe9cf1a3eb3d7f488fd2fa8388403e97039e2f73692932e291a770d" +dependencies = [ + "crossbeam-epoch", + "crossbeam-utils", +] + +[[package]] +name = "crossbeam-epoch" +version = "0.9.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5b82ac4a3c2ca9c3460964f020e1402edd5753411d7737aa39c3714ad1b5420e" +dependencies = [ + "crossbeam-utils", +] + +[[package]] +name = "crossbeam-queue" +version = "0.3.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "df0346b5d5e76ac2fe4e327c5fd1118d6be7c51dfb18f9b7922923f287471e35" +dependencies = [ + "crossbeam-utils", +] + +[[package]] +name = "crossbeam-utils" +version = "0.8.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "22ec99545bb0ed0ea7bb9b8e1e9122ea386ff8a48c0922e43f36d45ab09e0e80" + +[[package]] +name = "crossterm" +version = "0.28.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "829d955a0bb380ef178a640b91779e3987da38c9aea133b20614cfed8cdea9c6" +dependencies = [ + "bitflags 2.6.0", + "crossterm_winapi", + "futures-core", + "mio", + "parking_lot", + "rustix", + "signal-hook", + "signal-hook-mio", + "winapi", +] + +[[package]] +name = "crossterm_winapi" +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "acdd7c62a3665c7f6830a51635d9ac9b23ed385797f70a83bb8bafe9c572ab2b" +dependencies = [ + "winapi", +] + +[[package]] +name = "crypto-common" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3" +dependencies = [ + "generic-array", + "typenum", +] + +[[package]] +name = "ctor" +version = "0.2.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "edb49164822f3ee45b17acd4a208cfc1251410cf0cad9a833234c9890774dd9f" +dependencies = [ + "quote", + "syn 2.0.76", +] + +[[package]] +name = "curve25519-dalek" +version = "4.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "97fb8b7c4503de7d6ae7b42ab72a5a59857b4c937ec27a3d4539dba95b5ab2be" +dependencies = [ + "cfg-if", + "cpufeatures", + "curve25519-dalek-derive", + "digest", + "fiat-crypto", + "rustc_version", + "subtle", + "zeroize", +] + +[[package]] +name = "curve25519-dalek-derive" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f46882e17999c6cc590af592290432be3bce0428cb0d5f8b6715e4dc7b383eb3" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.76", +] + +[[package]] +name = "cyborgtime" +version = "2.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "817fa642fb0ee7fe42e95783e00e0969927b96091bdd4b9b1af082acd943913b" + +[[package]] +name = "data-encoding" +version = "2.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e8566979429cf69b49a5c740c60791108e86440e8be149bbea4fe54d2c32d6e2" + +[[package]] +name = "date_header" +version = "1.0.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0c03c416ed1a30fbb027ef484ba6ab6f80e1eada675e1a2b92fd673c045a1f1d" + +[[package]] +name = "debugid" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bef552e6f588e446098f6ba40d89ac146c8c7b64aade83c051ee00bb5d2bc18d" +dependencies = [ + "serde", + "uuid", +] + +[[package]] +name = "der" +version = "0.7.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f55bf8e7b65898637379c1b74eb1551107c8294ed26d855ceb9fd1a09cfc9bc0" +dependencies = [ + "const-oid", + "zeroize", +] + +[[package]] +name = "deranged" +version = "0.3.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b42b6fa04a440b495c8b04d0e71b707c585f83cb9cb28cf8cd0d976c315e31b4" +dependencies = [ + "powerfmt", +] + +[[package]] +name = "digest" +version = "0.10.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292" +dependencies = [ + "block-buffer", + "crypto-common", + "subtle", +] + +[[package]] +name = "dunce" +version = "1.0.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "92773504d58c093f6de2459af4af33faa518c13451eb8f2b5698ed3d36e7c813" + +[[package]] +name = "ed25519" +version = "2.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "115531babc129696a58c64a4fef0a8bf9e9698629fb97e9e40767d235cfbcd53" +dependencies = [ + "pkcs8", + "signature", +] + +[[package]] +name = "ed25519-dalek" +version = "2.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4a3daa8e81a3963a60642bcc1f90a670680bd4a77535faa384e9d1c79d620871" +dependencies = [ + "curve25519-dalek", + "ed25519", + "rand_core", + "serde", + "sha2", + "subtle", + "zeroize", +] + +[[package]] +name = "either" +version = "1.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0" +dependencies = [ + "serde", +] + +[[package]] +name = "enum-as-inner" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5ffccbb6966c05b32ef8fbac435df276c4ae4d3dc55a8cd0eb9745e6c12f546a" +dependencies = [ + "heck 0.4.1", + "proc-macro2", + "quote", + "syn 2.0.76", +] + +[[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.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "534c5cf6194dfab3db3242765c03bbe257cf92f22b38f6bc0c58d59108a820ba" +dependencies = [ + "libc", + "windows-sys 0.52.0", +] + +[[package]] +name = "fdeflate" +version = "0.3.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4f9bfee30e4dedf0ab8b422f03af778d9612b63f502710fc500a334ebe2de645" +dependencies = [ + "simd-adler32", +] + +[[package]] +name = "fiat-crypto" +version = "0.2.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "28dea519a9695b9977216879a3ebfddf92f1c08c05d984f8996aecd6ecdc811d" + +[[package]] +name = "figment" +version = "0.10.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8cb01cd46b0cf372153850f4c6c272d9cbea2da513e07538405148f95bd789f3" +dependencies = [ + "atomic", + "pear", + "serde", + "toml", + "uncased", + "version_check", +] + +[[package]] +name = "findshlibs" +version = "0.10.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "40b9e59cd0f7e0806cca4be089683ecb6434e602038df21fe6bf6711b2f07f64" +dependencies = [ + "cc", + "lazy_static", + "libc", + "winapi", +] + +[[package]] +name = "flate2" +version = "1.0.32" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c0596c1eac1f9e04ed902702e9878208b336edc9d6fddc8a48387349bab3666" +dependencies = [ + "crc32fast", + "miniz_oxide 0.8.0", +] + +[[package]] +name = "fnv" +version = "1.0.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" + +[[package]] +name = "form_urlencoded" +version = "1.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e13624c2627564efccf4934284bdd98cbaa14e79b0b5a141218e507b3a823456" +dependencies = [ + "percent-encoding", +] + +[[package]] +name = "forwarded-header-value" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8835f84f38484cc86f110a805655697908257fb9a7af005234060891557198e9" +dependencies = [ + "nonempty", + "thiserror", +] + +[[package]] +name = "fs_extra" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "42703706b716c37f96a77aea830392ad231f44c9e9a67872fa5548707e11b11c" + +[[package]] +name = "futf" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "df420e2e84819663797d1ec6544b13c5be84629e7bb00dc960d6917db2987843" +dependencies = [ + "mac", + "new_debug_unreachable", +] + +[[package]] +name = "futures-channel" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eac8f7d7865dcb88bd4373ab671c8cf4508703796caa2b1985a9ca867b3fcb78" +dependencies = [ + "futures-core", + "futures-sink", +] + +[[package]] +name = "futures-core" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dfc6580bb841c5a68e9ef15c77ccc837b40a7504914d52e47b8b0e9bbda25a1d" + +[[package]] +name = "futures-executor" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a576fc72ae164fca6b9db127eaa9a9dda0d61316034f33a0a0d4eda41f02b01d" +dependencies = [ + "futures-core", + "futures-task", + "futures-util", +] + +[[package]] +name = "futures-io" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a44623e20b9681a318efdd71c299b6b222ed6f231972bfe2f224ebad6311f0c1" + +[[package]] +name = "futures-macro" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.76", +] + +[[package]] +name = "futures-sink" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9fb8e00e87438d937621c1c6269e53f536c14d3fbd6a042bb24879e57d474fb5" + +[[package]] +name = "futures-task" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38d84fa142264698cdce1a9f9172cf383a0c82de1bddcf3092901442c4097004" + +[[package]] +name = "futures-util" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3d6401deb83407ab3da39eba7e33987a73c3df0c82b4bb5813ee871c19c41d48" +dependencies = [ + "futures-core", + "futures-io", + "futures-macro", + "futures-sink", + "futures-task", + "memchr", + "pin-project-lite", + "pin-utils", + "slab", +] + +[[package]] +name = "generic-array" +version = "0.14.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a" +dependencies = [ + "typenum", + "version_check", +] + +[[package]] +name = "getrandom" +version = "0.2.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7" +dependencies = [ + "cfg-if", + "js-sys", + "libc", + "wasi", + "wasm-bindgen", +] + +[[package]] +name = "gif" +version = "0.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3fb2d69b19215e18bb912fa30f7ce15846e301408695e44e0ef719f1da9e19f2" +dependencies = [ + "color_quant", + "weezl", +] + +[[package]] +name = "gimli" +version = "0.29.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "40ecd4077b5ae9fd2e9e169b102c6c330d0605168eb0e8bf79952b256dbefffd" + +[[package]] +name = "glob" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" + +[[package]] +name = "h2" +version = "0.4.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "524e8ac6999421f49a846c2d4411f337e53497d8ec55d67753beffa43c5d9205" +dependencies = [ + "atomic-waker", + "bytes", + "fnv", + "futures-core", + "futures-sink", + "http", + "indexmap 2.4.0", + "slab", + "tokio", + "tokio-util", + "tracing", +] + +[[package]] +name = "hardened_malloc-rs" +version = "0.1.2+12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "647deb1583b14d160f85f3ff626f20b6edd366e3852c9843b06077388f794cb6" + +[[package]] +name = "hashbrown" +version = "0.12.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" + +[[package]] +name = "hashbrown" +version = "0.14.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1" + +[[package]] +name = "hdrhistogram" +version = "7.5.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "765c9198f173dd59ce26ff9f95ef0aafd0a0fe01fb9d72841bc5066a4c06511d" +dependencies = [ + "base64 0.21.7", + "byteorder", + "flate2", + "nom", + "num-traits", +] + +[[package]] +name = "headers" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "322106e6bd0cba2d5ead589ddb8150a13d7c4217cf80d7c4f682ca994ccc6aa9" +dependencies = [ + "base64 0.21.7", + "bytes", + "headers-core", + "http", + "httpdate", + "mime", + "sha1", +] + +[[package]] +name = "headers-core" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "54b4a22553d4242c49fddb9ba998a99962b5cc6f22cb5a3482bec22522403ce4" +dependencies = [ + "http", +] + +[[package]] +name = "heck" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" + +[[package]] +name = "heck" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea" + +[[package]] +name = "hermit-abi" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024" + +[[package]] +name = "hex" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" + +[[package]] +name = "hickory-proto" +version = "0.24.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "07698b8420e2f0d6447a436ba999ec85d8fbf2a398bbd737b82cac4a2e96e512" +dependencies = [ + "async-trait", + "cfg-if", + "data-encoding", + "enum-as-inner", + "futures-channel", + "futures-io", + "futures-util", + "idna 0.4.0", + "ipnet", + "once_cell", + "rand", + "thiserror", + "tinyvec", + "tokio", + "tracing", + "url", +] + +[[package]] +name = "hickory-resolver" +version = "0.24.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "28757f23aa75c98f254cf0405e6d8c25b831b32921b050a66692427679b1f243" +dependencies = [ + "cfg-if", + "futures-util", + "hickory-proto", + "ipconfig", + "lru-cache", + "once_cell", + "parking_lot", + "rand", + "resolv-conf", + "smallvec", + "thiserror", + "tokio", + "tracing", +] + +[[package]] +name = "hmac" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c49c37c09c17a53d937dfbb742eb3a961d65a994e6bcdcf37e7399d0cc8ab5e" +dependencies = [ + "digest", +] + +[[package]] +name = "home" +version = "0.5.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e3d1354bf6b7235cb4a0576c2619fd4ed18183f689b12b006a0ee7329eeff9a5" +dependencies = [ + "windows-sys 0.52.0", +] + +[[package]] +name = "hostname" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3c731c3e10504cc8ed35cfe2f1db4c9274c3d35fa486e3b31df46f068ef3e867" +dependencies = [ + "libc", + "match_cfg", + "winapi", +] + +[[package]] +name = "hostname" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f9c7c7c8ac16c798734b8a24560c1362120597c40d5e1459f09498f8f6c8f2ba" +dependencies = [ + "cfg-if", + "libc", + "windows", +] + +[[package]] +name = "html5ever" +version = "0.27.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c13771afe0e6e846f1e67d038d4cb29998a6779f93c809212e4e9c32efd244d4" +dependencies = [ + "log", + "mac", + "markup5ever", + "proc-macro2", + "quote", + "syn 2.0.76", +] + +[[package]] +name = "http" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "21b9ddb458710bc376481b842f5da65cdf31522de232c1ca8146abce2a358258" +dependencies = [ + "bytes", + "fnv", + "itoa", +] + +[[package]] +name = "http-auth" +version = "0.1.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "643c9bbf6a4ea8a656d6b4cd53d34f79e3f841ad5203c1a55fb7d761923bc255" +dependencies = [ + "memchr", +] + +[[package]] +name = "http-body" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1efedce1fb8e6913f23e0c92de8e62cd5b772a67e7b3946df930a62566c93184" +dependencies = [ + "bytes", + "http", +] + +[[package]] +name = "http-body-util" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "793429d76616a256bcb62c2a2ec2bed781c8307e797e2598c50010f2bee2544f" +dependencies = [ + "bytes", + "futures-util", + "http", + "http-body", + "pin-project-lite", +] + +[[package]] +name = "httparse" +version = "1.9.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0fcc0b4a115bf80b728eb8ea024ad5bd707b615bfed49e0665b6e0f86fd082d9" + +[[package]] +name = "httpdate" +version = "1.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9" + +[[package]] +name = "humantime" +version = "2.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" + +[[package]] +name = "hyper" +version = "1.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "50dfd22e0e76d0f662d429a5f80fcaf3855009297eab6a0a9f8543834744ba05" +dependencies = [ + "bytes", + "futures-channel", + "futures-util", + "h2", + "http", + "http-body", + "httparse", + "httpdate", + "itoa", + "pin-project-lite", + "smallvec", + "tokio", + "want", +] + +[[package]] +name = "hyper-rustls" +version = "0.27.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5ee4be2c948921a1a5320b629c4193916ed787a7f7f293fd3f7f5a6c9de74155" +dependencies = [ + "futures-util", + "http", + "hyper", + "hyper-util", + "rustls 0.23.12", + "rustls-native-certs", + "rustls-pki-types", + "tokio", + "tokio-rustls", + "tower-service", + "webpki-roots", +] + +[[package]] +name = "hyper-timeout" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3203a961e5c83b6f5498933e78b6b263e208c197b63e9c6c53cc82ffd3f63793" +dependencies = [ + "hyper", + "hyper-util", + "pin-project-lite", + "tokio", + "tower-service", +] + +[[package]] +name = "hyper-util" +version = "0.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cde7055719c54e36e95e8719f95883f22072a48ede39db7fc17a4e1d5281e9b9" +dependencies = [ + "bytes", + "futures-channel", + "futures-util", + "http", + "http-body", + "hyper", + "pin-project-lite", + "socket2", + "tokio", + "tower 0.4.13", + "tower-service", + "tracing", +] + +[[package]] +name = "idna" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7d20d6b07bfbc108882d88ed8e37d39636dcc260e15e30c45e6ba089610b917c" +dependencies = [ + "unicode-bidi", + "unicode-normalization", +] + +[[package]] +name = "idna" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "634d9b1461af396cad843f47fdba5597a4f9e6ddd4bfb6ff5d85028c25cb12f6" +dependencies = [ + "unicode-bidi", + "unicode-normalization", +] + +[[package]] +name = "image" +version = "0.25.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "99314c8a2152b8ddb211f924cdae532d8c5e4c8bb54728e12fff1b0cd5963a10" +dependencies = [ + "bytemuck", + "byteorder-lite", + "color_quant", + "gif", + "image-webp", + "num-traits", + "png", + "zune-core", + "zune-jpeg", +] + +[[package]] +name = "image-webp" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f79afb8cbee2ef20f59ccd477a218c12a93943d075b492015ecb1bb81f8ee904" +dependencies = [ + "byteorder-lite", + "quick-error 2.0.1", +] + +[[package]] +name = "indexmap" +version = "1.9.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99" +dependencies = [ + "autocfg", + "hashbrown 0.12.3", +] + +[[package]] +name = "indexmap" +version = "2.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "93ead53efc7ea8ed3cfb0c79fc8023fbb782a5432b52830b6518941cebe6505c" +dependencies = [ + "equivalent", + "hashbrown 0.14.5", + "serde", +] + +[[package]] +name = "inlinable_string" +version = "0.1.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c8fae54786f62fb2918dcfae3d568594e50eb9b5c25bf04371af6fe7516452fb" + +[[package]] +name = "integer-encoding" +version = "3.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8bb03732005da905c88227371639bf1ad885cc712789c011c31c5fb3ab3ccf02" + +[[package]] +name = "ipaddress" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "957bb9f3645d6bb7f36df99d5105b4866aa79749819d7c176a170a27dc477cbf" +dependencies = [ + "lazy_static", + "libc", + "num", + "num-integer", + "num-traits", + "regex", +] + +[[package]] +name = "ipconfig" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b58db92f96b720de98181bbbe63c831e87005ab460c1bf306eb2622b4707997f" +dependencies = [ + "socket2", + "widestring", + "windows-sys 0.48.0", + "winreg", +] + +[[package]] +name = "ipnet" +version = "2.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f518f335dce6725a761382244631d86cf0ccb2863413590b31338feb467f9c3" + +[[package]] +name = "itertools" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ba291022dbbd398a455acf126c1e341954079855bc60dfdda641363bd6922569" +dependencies = [ + "either", +] + +[[package]] +name = "itertools" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "413ee7dfc52ee1a4949ceeb7dbc8a33f2d6c088194d9f922fb8318faf1f01186" +dependencies = [ + "either", +] + +[[package]] +name = "itoa" +version = "1.0.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b" + +[[package]] +name = "jobserver" +version = "0.1.32" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "48d1dbcbbeb6a7fec7e059840aa538bd62aaccf972c7346c4d9d2059312853d0" +dependencies = [ + "libc", +] + +[[package]] +name = "js-sys" +version = "0.3.70" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1868808506b929d7b0cfa8f75951347aa71bb21144b7791bae35d9bccfcfe37a" +dependencies = [ + "wasm-bindgen", +] + +[[package]] +name = "js_int" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d937f95470b270ce8b8950207715d71aa8e153c0d44c6684d59397ed4949160a" +dependencies = [ + "serde", +] + +[[package]] +name = "js_option" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "68421373957a1593a767013698dbf206e2b221eefe97a44d98d18672ff38423c" +dependencies = [ + "serde", +] + +[[package]] +name = "jsonwebtoken" +version = "9.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b9ae10193d25051e74945f1ea2d0b42e03cc3b890f7e4cc5faa44997d808193f" +dependencies = [ + "base64 0.21.7", + "js-sys", + "pem", + "ring", + "serde", + "serde_json", + "simple_asn1", +] + +[[package]] +name = "konst" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "50a0ba6de5f7af397afff922f22c149ff605c766cd3269cf6c1cd5e466dbe3b9" +dependencies = [ + "const_panic", + "konst_kernel", + "typewit", +] + +[[package]] +name = "konst_kernel" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "be0a455a1719220fd6adf756088e1c69a85bf14b6a9e24537a5cc04f503edb2b" +dependencies = [ + "typewit", +] + +[[package]] +name = "lazy-regex" +version = "3.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8d8e41c97e6bc7ecb552016274b99fbb5d035e8de288c582d9b933af6677bfda" +dependencies = [ + "lazy-regex-proc_macros", + "once_cell", + "regex", +] + +[[package]] +name = "lazy-regex-proc_macros" +version = "3.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "76e1d8b05d672c53cb9c7b920bbba8783845ae4f0b076e02a3db1d02c81b4163" +dependencies = [ + "proc-macro2", + "quote", + "regex", + "syn 2.0.76", +] + +[[package]] +name = "lazy_static" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe" + +[[package]] +name = "lazycell" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55" + +[[package]] +name = "libc" +version = "0.2.158" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d8adc4bb1803a324070e64a98ae98f38934d91957a99cfb3a43dcbc01bc56439" + +[[package]] +name = "libloading" +version = "0.8.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4979f22fdb869068da03c9f7528f8297c6fd2606bc3a4affe42e6a823fdb8da4" +dependencies = [ + "cfg-if", + "windows-targets 0.52.6", +] + +[[package]] +name = "libz-sys" +version = "1.1.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fdc53a7799a7496ebc9fd29f31f7df80e83c9bda5299768af5f9e59eeea74647" +dependencies = [ + "cc", + "pkg-config", + "vcpkg", +] + +[[package]] +name = "linked-hash-map" +version = "0.5.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f" + +[[package]] +name = "linux-raw-sys" +version = "0.4.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89" + +[[package]] +name = "lock_api" +version = "0.4.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "07af8b9cdd281b7915f413fa73f29ebd5d55d0d3f0155584dade1ff18cea1b17" +dependencies = [ + "autocfg", + "scopeguard", +] + +[[package]] +name = "log" +version = "0.4.22" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24" + +[[package]] +name = "loole" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ad95468e4700cb37d8d1f198050db18cebe55e4b4c8aa9180a715deedb2f8965" + +[[package]] +name = "lru-cache" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "31e24f1ad8321ca0e8a1e0ac13f23cb668e6f5466c2c57319f6a5cf1cc8e3b1c" +dependencies = [ + "linked-hash-map", +] + +[[package]] +name = "lz4-sys" +version = "1.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "109de74d5d2353660401699a4174a4ff23fcc649caf553df71933c7fb45ad868" +dependencies = [ + "cc", + "libc", +] + +[[package]] +name = "mac" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c41e0c4fef86961ac6d6f8a82609f55f31b05e4fce149ac5710e439df7619ba4" + +[[package]] +name = "maplit" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3e2e65a1a2e43cfcb47a895c4c8b10d1f4a61097f9f254f183aee60cad9c651d" + +[[package]] +name = "markup5ever" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "16ce3abbeba692c8b8441d036ef91aea6df8da2c6b6e21c7e14d3c18e526be45" +dependencies = [ + "log", + "phf", + "phf_codegen", + "string_cache", + "string_cache_codegen", + "tendril", +] + +[[package]] +name = "markup5ever_rcdom" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "edaa21ab3701bfee5099ade5f7e1f84553fd19228cf332f13cd6e964bf59be18" +dependencies = [ + "html5ever", + "markup5ever", + "tendril", + "xml5ever", +] + +[[package]] +name = "match_cfg" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ffbee8634e0d45d258acb448e7eaab3fce7a0a467395d4d9f228e3c1f01fb2e4" + +[[package]] +name = "matchers" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8263075bb86c5a1b1427b5ae862e8889656f126e9f77c484496e8b47cf5c5558" +dependencies = [ + "regex-automata 0.1.10", +] + +[[package]] +name = "matchit" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0e7465ac9959cc2b1404e8e2367b43684a6d13790fe23056cc8c6c5a6b7bcb94" + +[[package]] +name = "memchr" +version = "2.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3" + +[[package]] +name = "mime" +version = "0.3.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a" + +[[package]] +name = "minimad" +version = "0.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a9c5d708226d186590a7b6d4a9780e2bdda5f689e0d58cd17012a298efd745d2" +dependencies = [ + "once_cell", +] + +[[package]] +name = "minimal-lexical" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" + +[[package]] +name = "miniz_oxide" +version = "0.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b8a240ddb74feaf34a79a7add65a741f3167852fba007066dcac1ca548d89c08" +dependencies = [ + "adler", + "simd-adler32", +] + +[[package]] +name = "miniz_oxide" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e2d80299ef12ff69b16a84bb182e3b9df68b5a91574d3d4fa6e41b65deec4df1" +dependencies = [ + "adler2", +] + +[[package]] +name = "mio" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "80e04d1dcff3aae0704555fe5fee3bcfaf3d1fdf8a7e521d5b9d2b42acb52cec" +dependencies = [ + "hermit-abi", + "libc", + "log", + "wasi", + "windows-sys 0.52.0", +] + +[[package]] +name = "mirai-annotations" +version = "1.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c9be0862c1b3f26a88803c4a49de6889c10e608b3ee9344e6ef5b45fb37ad3d1" + +[[package]] +name = "new_debug_unreachable" +version = "1.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "650eef8c711430f1a879fdd01d4745a7deea475becfb90269c06775983bbf086" + +[[package]] +name = "nix" +version = "0.29.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "71e2746dc3a24dd78b3cfcb7be93368c6de9963d30f43a6a73998a9cf4b17b46" +dependencies = [ + "bitflags 2.6.0", + "cfg-if", + "cfg_aliases", + "libc", +] + +[[package]] +name = "nom" +version = "7.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d273983c5a657a70a3e8f2a01329822f3b8c8172b73826411a55751e404a0a4a" +dependencies = [ + "memchr", + "minimal-lexical", +] + +[[package]] +name = "nonempty" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e9e591e719385e6ebaeb5ce5d3887f7d5676fceca6411d1925ccc95745f3d6f7" + +[[package]] +name = "nu-ansi-term" +version = "0.46.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "77a8165726e8236064dbb45459242600304b42a5ea24ee2948e18e023bf7ba84" +dependencies = [ + "overload", + "winapi", +] + +[[package]] +name = "num" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "35bd024e8b2ff75562e5f34e7f4905839deb4b22955ef5e73d2fea1b9813cb23" +dependencies = [ + "num-bigint", + "num-complex", + "num-integer", + "num-iter", + "num-rational", + "num-traits", +] + +[[package]] +name = "num-bigint" +version = "0.4.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a5e44f723f1133c9deac646763579fdb3ac745e418f2a7af9cd0c431da1f20b9" +dependencies = [ + "num-integer", + "num-traits", +] + +[[package]] +name = "num-complex" +version = "0.4.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "73f88a1307638156682bada9d7604135552957b7818057dcef22705b4d509495" +dependencies = [ + "num-traits", +] + +[[package]] +name = "num-conv" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9" + +[[package]] +name = "num-integer" +version = "0.1.46" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7969661fd2958a5cb096e56c8e1ad0444ac2bbcd0061bd28660485a44879858f" +dependencies = [ + "num-traits", +] + +[[package]] +name = "num-iter" +version = "0.1.45" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1429034a0490724d0075ebb2bc9e875d6503c3cf69e235a8941aa757d83ef5bf" +dependencies = [ + "autocfg", + "num-integer", + "num-traits", +] + +[[package]] +name = "num-rational" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f83d14da390562dca69fc84082e73e548e1ad308d24accdedd2720017cb37824" +dependencies = [ + "num-bigint", + "num-integer", + "num-traits", +] + +[[package]] +name = "num-traits" +version = "0.2.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841" +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.36.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "27b64972346851a39438c60b341ebc01bba47464ae329e55cf343eb93964efd9" +dependencies = [ + "memchr", +] + +[[package]] +name = "once_cell" +version = "1.19.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" + +[[package]] +name = "openssl-probe" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" + +[[package]] +name = "opentelemetry" +version = "0.21.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e32339a5dc40459130b3bd269e9892439f55b33e772d2a9d402a789baaf4e8a" +dependencies = [ + "futures-core", + "futures-sink", + "indexmap 2.4.0", + "js-sys", + "once_cell", + "pin-project-lite", + "thiserror", + "urlencoding", +] + +[[package]] +name = "opentelemetry-jaeger" +version = "0.20.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e617c66fd588e40e0dbbd66932fdc87393095b125d4459b1a3a10feb1712f8a1" +dependencies = [ + "async-trait", + "futures-core", + "futures-util", + "opentelemetry", + "opentelemetry-semantic-conventions", + "opentelemetry_sdk", + "thrift", + "tokio", +] + +[[package]] +name = "opentelemetry-semantic-conventions" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f5774f1ef1f982ef2a447f6ee04ec383981a3ab99c8e77a1a7b30182e65bbc84" +dependencies = [ + "opentelemetry", +] + +[[package]] +name = "opentelemetry_sdk" +version = "0.21.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2f16aec8a98a457a52664d69e0091bac3a0abd18ead9b641cb00202ba4e0efe4" +dependencies = [ + "async-trait", + "crossbeam-channel", + "futures-channel", + "futures-executor", + "futures-util", + "glob", + "once_cell", + "opentelemetry", + "ordered-float 4.2.2", + "percent-encoding", + "rand", + "thiserror", + "tokio", + "tokio-stream", +] + +[[package]] +name = "ordered-float" +version = "2.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "68f19d67e5a2795c94e73e0bb1cc1a7edeb2e28efd39e2e1c9b7a40c1108b11c" +dependencies = [ + "num-traits", +] + +[[package]] +name = "ordered-float" +version = "4.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4a91171844676f8c7990ce64959210cd2eaef32c2612c50f9fae9f8aaa6065a6" +dependencies = [ + "num-traits", +] + +[[package]] +name = "os_info" +version = "3.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ae99c7fa6dd38c7cafe1ec085e804f8f555a2f8659b0dbe03f1f9963a9b51092" +dependencies = [ + "log", + "serde", + "windows-sys 0.52.0", +] + +[[package]] +name = "overload" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39" + +[[package]] +name = "parking_lot" +version = "0.12.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f1bf18183cf54e8d6059647fc3063646a1801cf30896933ec2311622cc4b9a27" +dependencies = [ + "lock_api", + "parking_lot_core", +] + +[[package]] +name = "parking_lot_core" +version = "0.9.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8" +dependencies = [ + "cfg-if", + "libc", + "redox_syscall", + "smallvec", + "windows-targets 0.52.6", +] + +[[package]] +name = "password-hash" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "346f04948ba92c43e8469c1ee6736c7563d71012b17d40745260fe106aac2166" +dependencies = [ + "base64ct", + "rand_core", + "subtle", +] + +[[package]] +name = "paste" +version = "1.0.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a" + +[[package]] +name = "pear" +version = "0.2.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bdeeaa00ce488657faba8ebf44ab9361f9365a97bd39ffb8a60663f57ff4b467" +dependencies = [ + "inlinable_string", + "pear_codegen", + "yansi", +] + +[[package]] +name = "pear_codegen" +version = "0.2.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4bab5b985dc082b345f812b7df84e1bef27e7207b39e448439ba8bd69c93f147" +dependencies = [ + "proc-macro2", + "proc-macro2-diagnostics", + "quote", + "syn 2.0.76", +] + +[[package]] +name = "pem" +version = "3.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e459365e590736a54c3fa561947c84837534b8e9af6fc5bf781307e82658fae" +dependencies = [ + "base64 0.22.1", + "serde", +] + +[[package]] +name = "percent-encoding" +version = "2.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" + +[[package]] +name = "phf" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ade2d8b8f33c7333b51bcf0428d37e217e9f32192ae4772156f65063b8ce03dc" +dependencies = [ + "phf_shared 0.11.2", +] + +[[package]] +name = "phf_codegen" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e8d39688d359e6b34654d328e262234662d16cc0f60ec8dcbe5e718709342a5a" +dependencies = [ + "phf_generator 0.11.2", + "phf_shared 0.11.2", +] + +[[package]] +name = "phf_generator" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5d5285893bb5eb82e6aaf5d59ee909a06a16737a8970984dd7746ba9283498d6" +dependencies = [ + "phf_shared 0.10.0", + "rand", +] + +[[package]] +name = "phf_generator" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "48e4cc64c2ad9ebe670cb8fd69dd50ae301650392e81c05f9bfcb2d5bdbc24b0" +dependencies = [ + "phf_shared 0.11.2", + "rand", +] + +[[package]] +name = "phf_shared" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6796ad771acdc0123d2a88dc428b5e38ef24456743ddb1744ed628f9815c096" +dependencies = [ + "siphasher", +] + +[[package]] +name = "phf_shared" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "90fcb95eef784c2ac79119d1dd819e162b5da872ce6f3c3abe1e8ca1c082f72b" +dependencies = [ + "siphasher", +] + +[[package]] +name = "pin-project" +version = "1.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6bf43b791c5b9e34c3d182969b4abb522f9343702850a2e57f460d00d09b4b3" +dependencies = [ + "pin-project-internal", +] + +[[package]] +name = "pin-project-internal" +version = "1.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.76", +] + +[[package]] +name = "pin-project-lite" +version = "0.2.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bda66fc9667c18cb2758a2ac84d1167245054bcf85d5d1aaa6923f45801bdd02" + +[[package]] +name = "pin-utils" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" + +[[package]] +name = "pkcs8" +version = "0.10.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f950b2377845cebe5cf8b5165cb3cc1a5e0fa5cfa3e1f7f55707d8fd82e0a7b7" +dependencies = [ + "der", + "spki", +] + +[[package]] +name = "pkg-config" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec" + +[[package]] +name = "png" +version = "0.17.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "06e4b0d3d1312775e782c86c91a111aa1f910cbb65e1337f9975b5f9a554b5e1" +dependencies = [ + "bitflags 1.3.2", + "crc32fast", + "fdeflate", + "flate2", + "miniz_oxide 0.7.4", +] + +[[package]] +name = "powerfmt" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391" + +[[package]] +name = "ppv-lite86" +version = "0.2.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "77957b295656769bb8ad2b6a6b09d897d94f05c41b069aede1fcdaa675eaea04" +dependencies = [ + "zerocopy", +] + +[[package]] +name = "precomputed-hash" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "925383efa346730478fb4838dbe9137d2a47675ad789c546d150a6e1dd4ab31c" + +[[package]] +name = "prettyplease" +version = "0.2.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5f12335488a2f3b0a83b14edad48dca9879ce89b2edd10e80237e4e852dd645e" +dependencies = [ + "proc-macro2", + "syn 2.0.76", +] + +[[package]] +name = "proc-macro-crate" +version = "3.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d37c51ca738a55da99dc0c4a34860fd675453b8b36209178c2249bb13651284" +dependencies = [ + "toml_edit 0.21.1", +] + +[[package]] +name = "proc-macro2" +version = "1.0.86" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77" +dependencies = [ + "unicode-ident", +] + +[[package]] +name = "proc-macro2-diagnostics" +version = "0.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "af066a9c399a26e020ada66a034357a868728e72cd426f3adcd35f80d88d88c8" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.76", + "version_check", + "yansi", +] + +[[package]] +name = "prost" +version = "0.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e13db3d3fde688c61e2446b4d843bc27a7e8af269a69440c0308021dc92333cc" +dependencies = [ + "bytes", + "prost-derive", +] + +[[package]] +name = "prost-derive" +version = "0.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "18bec9b0adc4eba778b33684b7ba3e7137789434769ee3ce3930463ef904cfca" +dependencies = [ + "anyhow", + "itertools 0.13.0", + "proc-macro2", + "quote", + "syn 2.0.76", +] + +[[package]] +name = "prost-types" +version = "0.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cee5168b05f49d4b0ca581206eb14a7b22fafd963efe729ac48eb03266e25cc2" +dependencies = [ + "prost", +] + +[[package]] +name = "pulldown-cmark" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cb4e75767fbc9d92b90e4d0c011f61358cde9513b31ef07ea3631b15ffc3b4fd" +dependencies = [ + "bitflags 2.6.0", + "memchr", + "pulldown-cmark-escape", + "unicase", +] + +[[package]] +name = "pulldown-cmark-escape" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "007d8adb5ddab6f8e3f491ac63566a7d5002cc7ed73901f72057943fa71ae1ae" + +[[package]] +name = "quick-error" +version = "1.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0" + +[[package]] +name = "quick-error" +version = "2.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a993555f31e5a609f617c12db6250dedcac1b0a85076912c436e6fc9b2c8e6a3" + +[[package]] +name = "quinn" +version = "0.11.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b22d8e7369034b9a7132bc2008cac12f2013c8132b45e0554e6e20e2617f2156" +dependencies = [ + "bytes", + "pin-project-lite", + "quinn-proto", + "quinn-udp", + "rustc-hash 2.0.0", + "rustls 0.23.12", + "socket2", + "thiserror", + "tokio", + "tracing", +] + +[[package]] +name = "quinn-proto" +version = "0.11.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ba92fb39ec7ad06ca2582c0ca834dfeadcaf06ddfc8e635c80aa7e1c05315fdd" +dependencies = [ + "bytes", + "rand", + "ring", + "rustc-hash 2.0.0", + "rustls 0.23.12", + "slab", + "thiserror", + "tinyvec", + "tracing", +] + +[[package]] +name = "quinn-udp" +version = "0.5.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8bffec3605b73c6f1754535084a85229fa8a30f86014e6c81aeec4abb68b0285" +dependencies = [ + "libc", + "once_cell", + "socket2", + "tracing", + "windows-sys 0.52.0", +] + +[[package]] +name = "quote" +version = "1.0.37" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af" +dependencies = [ + "proc-macro2", +] + +[[package]] +name = "rand" +version = "0.8.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" +dependencies = [ + "libc", + "rand_chacha", + "rand_core", +] + +[[package]] +name = "rand_chacha" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88" +dependencies = [ + "ppv-lite86", + "rand_core", +] + +[[package]] +name = "rand_core" +version = "0.6.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" +dependencies = [ + "getrandom", +] + +[[package]] +name = "redox_syscall" +version = "0.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2a908a6e00f1fdd0dfd9c0eb08ce85126f6d8bbda50017e74bc4a4b7d4a926a4" +dependencies = [ + "bitflags 2.6.0", +] + +[[package]] +name = "regex" +version = "1.10.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4219d74c6b67a3654a9fbebc4b419e22126d13d2f3c4a07ee0cb61ff79a79619" +dependencies = [ + "aho-corasick", + "memchr", + "regex-automata 0.4.7", + "regex-syntax 0.8.4", +] + +[[package]] +name = "regex-automata" +version = "0.1.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132" +dependencies = [ + "regex-syntax 0.6.29", +] + +[[package]] +name = "regex-automata" +version = "0.4.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38caf58cc5ef2fed281f89292ef23f6365465ed9a41b7a7754eb4e26496c92df" +dependencies = [ + "aho-corasick", + "memchr", + "regex-syntax 0.8.4", +] + +[[package]] +name = "regex-syntax" +version = "0.6.29" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1" + +[[package]] +name = "regex-syntax" +version = "0.8.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a66a03ae7c801facd77a29370b4faec201768915ac14a721ba36f20bc9c209b" + +[[package]] +name = "reqwest" +version = "0.12.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f8f4955649ef5c38cc7f9e8aa41761d48fb9677197daea9984dc54f56aad5e63" +dependencies = [ + "async-compression", + "base64 0.22.1", + "bytes", + "futures-channel", + "futures-core", + "futures-util", + "h2", + "hickory-resolver", + "http", + "http-body", + "http-body-util", + "hyper", + "hyper-rustls", + "hyper-util", + "ipnet", + "js-sys", + "log", + "mime", + "once_cell", + "percent-encoding", + "pin-project-lite", + "quinn", + "rustls 0.23.12", + "rustls-native-certs", + "rustls-pemfile", + "rustls-pki-types", + "serde", + "serde_json", + "serde_urlencoded", + "sync_wrapper 1.0.1", + "tokio", + "tokio-rustls", + "tokio-socks", + "tokio-util", + "tower-service", + "url", + "wasm-bindgen", + "wasm-bindgen-futures", + "web-sys", + "webpki-roots", + "windows-registry", +] + +[[package]] +name = "resolv-conf" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "52e44394d2086d010551b14b53b1f24e31647570cd1deb0379e2c21b329aba00" +dependencies = [ + "hostname 0.3.1", + "quick-error 1.2.3", +] + +[[package]] +name = "ring" +version = "0.17.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c17fa4cb658e3583423e915b9f3acc01cceaee1860e33d59ebae66adc3a2dc0d" +dependencies = [ + "cc", + "cfg-if", + "getrandom", + "libc", + "spin", + "untrusted", + "windows-sys 0.52.0", +] + +[[package]] +name = "ruma" +version = "0.10.1" +source = "git+https://github.com/girlbossceo/ruwuma?rev=d7ddcd036f81edb257ab9371f9cadd46444e8a90#d7ddcd036f81edb257ab9371f9cadd46444e8a90" +dependencies = [ + "assign", + "js_int", + "js_option", + "ruma-appservice-api", + "ruma-client-api", + "ruma-common", + "ruma-events", + "ruma-federation-api", + "ruma-identifiers-validation", + "ruma-identity-service-api", + "ruma-push-gateway-api", + "ruma-server-util", + "ruma-signatures", + "ruma-state-res", + "web-time 1.1.0", +] + +[[package]] +name = "ruma-appservice-api" +version = "0.10.0" +source = "git+https://github.com/girlbossceo/ruwuma?rev=d7ddcd036f81edb257ab9371f9cadd46444e8a90#d7ddcd036f81edb257ab9371f9cadd46444e8a90" +dependencies = [ + "js_int", + "ruma-common", + "ruma-events", + "serde", + "serde_json", +] + +[[package]] +name = "ruma-client-api" +version = "0.18.0" +source = "git+https://github.com/girlbossceo/ruwuma?rev=d7ddcd036f81edb257ab9371f9cadd46444e8a90#d7ddcd036f81edb257ab9371f9cadd46444e8a90" +dependencies = [ + "as_variant", + "assign", + "bytes", + "date_header", + "http", + "js_int", + "js_option", + "maplit", + "ruma-common", + "ruma-events", + "serde", + "serde_html_form", + "serde_json", + "thiserror", + "url", + "web-time 1.1.0", +] + +[[package]] +name = "ruma-common" +version = "0.13.0" +source = "git+https://github.com/girlbossceo/ruwuma?rev=d7ddcd036f81edb257ab9371f9cadd46444e8a90#d7ddcd036f81edb257ab9371f9cadd46444e8a90" +dependencies = [ + "as_variant", + "base64 0.22.1", + "bytes", + "form_urlencoded", + "http", + "indexmap 2.4.0", + "js_int", + "konst", + "percent-encoding", + "rand", + "regex", + "ruma-identifiers-validation", + "ruma-macros", + "serde", + "serde_html_form", + "serde_json", + "thiserror", + "time", + "tracing", + "url", + "uuid", + "web-time 1.1.0", + "wildmatch", +] + +[[package]] +name = "ruma-events" +version = "0.28.1" +source = "git+https://github.com/girlbossceo/ruwuma?rev=d7ddcd036f81edb257ab9371f9cadd46444e8a90#d7ddcd036f81edb257ab9371f9cadd46444e8a90" +dependencies = [ + "as_variant", + "indexmap 2.4.0", + "js_int", + "js_option", + "percent-encoding", + "pulldown-cmark", + "regex", + "ruma-common", + "ruma-identifiers-validation", + "ruma-macros", + "serde", + "serde_json", + "thiserror", + "tracing", + "url", + "web-time 1.1.0", + "wildmatch", +] + +[[package]] +name = "ruma-federation-api" +version = "0.9.0" +source = "git+https://github.com/girlbossceo/ruwuma?rev=d7ddcd036f81edb257ab9371f9cadd46444e8a90#d7ddcd036f81edb257ab9371f9cadd46444e8a90" +dependencies = [ + "bytes", + "http", + "httparse", + "js_int", + "memchr", + "mime", + "rand", + "ruma-common", + "ruma-events", + "serde", + "serde_json", +] + +[[package]] +name = "ruma-identifiers-validation" +version = "0.9.5" +source = "git+https://github.com/girlbossceo/ruwuma?rev=d7ddcd036f81edb257ab9371f9cadd46444e8a90#d7ddcd036f81edb257ab9371f9cadd46444e8a90" +dependencies = [ + "js_int", + "thiserror", +] + +[[package]] +name = "ruma-identity-service-api" +version = "0.9.0" +source = "git+https://github.com/girlbossceo/ruwuma?rev=d7ddcd036f81edb257ab9371f9cadd46444e8a90#d7ddcd036f81edb257ab9371f9cadd46444e8a90" +dependencies = [ + "js_int", + "ruma-common", + "serde", +] + +[[package]] +name = "ruma-macros" +version = "0.13.0" +source = "git+https://github.com/girlbossceo/ruwuma?rev=d7ddcd036f81edb257ab9371f9cadd46444e8a90#d7ddcd036f81edb257ab9371f9cadd46444e8a90" +dependencies = [ + "once_cell", + "proc-macro-crate", + "proc-macro2", + "quote", + "ruma-identifiers-validation", + "serde", + "syn 2.0.76", + "toml", +] + +[[package]] +name = "ruma-push-gateway-api" +version = "0.9.0" +source = "git+https://github.com/girlbossceo/ruwuma?rev=d7ddcd036f81edb257ab9371f9cadd46444e8a90#d7ddcd036f81edb257ab9371f9cadd46444e8a90" +dependencies = [ + "js_int", + "ruma-common", + "ruma-events", + "serde", + "serde_json", +] + +[[package]] +name = "ruma-server-util" +version = "0.3.0" +source = "git+https://github.com/girlbossceo/ruwuma?rev=d7ddcd036f81edb257ab9371f9cadd46444e8a90#d7ddcd036f81edb257ab9371f9cadd46444e8a90" +dependencies = [ + "headers", + "http", + "http-auth", + "ruma-common", + "thiserror", + "tracing", +] + +[[package]] +name = "ruma-signatures" +version = "0.15.0" +source = "git+https://github.com/girlbossceo/ruwuma?rev=d7ddcd036f81edb257ab9371f9cadd46444e8a90#d7ddcd036f81edb257ab9371f9cadd46444e8a90" +dependencies = [ + "base64 0.22.1", + "ed25519-dalek", + "pkcs8", + "rand", + "ruma-common", + "serde_json", + "sha2", + "subslice", + "thiserror", +] + +[[package]] +name = "ruma-state-res" +version = "0.11.0" +source = "git+https://github.com/girlbossceo/ruwuma?rev=d7ddcd036f81edb257ab9371f9cadd46444e8a90#d7ddcd036f81edb257ab9371f9cadd46444e8a90" +dependencies = [ + "itertools 0.12.1", + "js_int", + "ruma-common", + "ruma-events", + "serde", + "serde_json", + "thiserror", + "tracing", +] + +[[package]] +name = "rust-librocksdb-sys" +version = "0.25.0+9.5.2" +source = "git+https://github.com/girlbossceo/rust-rocksdb-zaidoon1?rev=5383ca8173299066b516406e3a2cf945ead891cb#5383ca8173299066b516406e3a2cf945ead891cb" +dependencies = [ + "bindgen", + "bzip2-sys", + "cc", + "glob", + "libc", + "libz-sys", + "lz4-sys", + "pkg-config", + "tikv-jemalloc-sys", + "zstd-sys", +] + +[[package]] +name = "rust-rocksdb" +version = "0.29.0" +source = "git+https://github.com/girlbossceo/rust-rocksdb-zaidoon1?rev=5383ca8173299066b516406e3a2cf945ead891cb#5383ca8173299066b516406e3a2cf945ead891cb" +dependencies = [ + "libc", + "rust-librocksdb-sys", + "serde", +] + +[[package]] +name = "rust-rocksdb-uwu" +version = "0.0.1" +dependencies = [ + "rust-rocksdb", +] + +[[package]] +name = "rustc-demangle" +version = "0.1.24" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f" + +[[package]] +name = "rustc-hash" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" + +[[package]] +name = "rustc-hash" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "583034fd73374156e66797ed8e5b0d5690409c9226b22d87cb7f19821c05d152" + +[[package]] +name = "rustc_version" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366" +dependencies = [ + "semver", +] + +[[package]] +name = "rustix" +version = "0.38.34" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "70dc5ec042f7a43c4a73241207cecc9873a06d45debb38b329f8541d85c2730f" +dependencies = [ + "bitflags 2.6.0", + "errno", + "libc", + "linux-raw-sys", + "windows-sys 0.52.0", +] + +[[package]] +name = "rustls" +version = "0.22.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bf4ef73721ac7bcd79b2b315da7779d8fc09718c6b3d2d1b2d94850eb8c18432" +dependencies = [ + "log", + "ring", + "rustls-pki-types", + "rustls-webpki", + "subtle", + "zeroize", +] + +[[package]] +name = "rustls" +version = "0.23.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c58f8c84392efc0a126acce10fa59ff7b3d2ac06ab451a33f2741989b806b044" +dependencies = [ + "aws-lc-rs", + "log", + "once_cell", + "ring", + "rustls-pki-types", + "rustls-webpki", + "subtle", + "zeroize", +] + +[[package]] +name = "rustls-native-certs" +version = "0.7.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "04182dffc9091a404e0fc069ea5cd60e5b866c3adf881eff99a32d048242dffa" +dependencies = [ + "openssl-probe", + "rustls-pemfile", + "rustls-pki-types", + "schannel", + "security-framework", +] + +[[package]] +name = "rustls-pemfile" +version = "2.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "196fe16b00e106300d3e45ecfcb764fa292a535d7326a29a5875c579c7417425" +dependencies = [ + "base64 0.22.1", + "rustls-pki-types", +] + +[[package]] +name = "rustls-pki-types" +version = "1.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fc0a2ce646f8655401bb81e7927b812614bd5d91dbc968696be50603510fcaf0" + +[[package]] +name = "rustls-webpki" +version = "0.102.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e6b52d4fda176fd835fdc55a835d4a89b8499cad995885a21149d5ad62f852e" +dependencies = [ + "aws-lc-rs", + "ring", + "rustls-pki-types", + "untrusted", +] + +[[package]] +name = "rustversion" +version = "1.0.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "955d28af4278de8121b7ebeb796b6a45735dc01436d898801014aced2773a3d6" + +[[package]] +name = "rustyline-async" +version = "0.4.3" +source = "git+https://github.com/girlbossceo/rustyline-async?rev=9654cc84e19241f6e19021eb8e677892656f5071#9654cc84e19241f6e19021eb8e677892656f5071" +dependencies = [ + "crossterm", + "futures-channel", + "futures-util", + "pin-project", + "thingbuf", + "thiserror", + "unicode-segmentation", + "unicode-width", +] + +[[package]] +name = "ryu" +version = "1.0.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f" + +[[package]] +name = "sanitize-filename" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2ed72fbaf78e6f2d41744923916966c4fbe3d7c74e3037a8ee482f1115572603" +dependencies = [ + "lazy_static", + "regex", +] + +[[package]] +name = "schannel" +version = "0.1.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fbc91545643bcf3a0bbb6569265615222618bdf33ce4ffbbd13c4bbd4c093534" +dependencies = [ + "windows-sys 0.52.0", +] + +[[package]] +name = "scopeguard" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" + +[[package]] +name = "sd-notify" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4646d6f919800cd25c50edb49438a1381e2cd4833c027e75e8897981c50b8b5e" + +[[package]] +name = "security-framework" +version = "2.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "897b2245f0b511c87893af39b033e5ca9cce68824c4d7e7630b5a1d339658d02" +dependencies = [ + "bitflags 2.6.0", + "core-foundation", + "core-foundation-sys", + "libc", + "security-framework-sys", +] + +[[package]] +name = "security-framework-sys" +version = "2.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "75da29fe9b9b08fe9d6b22b5b4bcbc75d8db3aa31e639aa56bb62e9d46bfceaf" +dependencies = [ + "core-foundation-sys", + "libc", +] + +[[package]] +name = "semver" +version = "1.0.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b" + +[[package]] +name = "sentry" +version = "0.34.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5484316556650182f03b43d4c746ce0e3e48074a21e2f51244b648b6542e1066" +dependencies = [ + "httpdate", + "reqwest", + "rustls 0.22.4", + "sentry-backtrace", + "sentry-contexts", + "sentry-core", + "sentry-debug-images", + "sentry-log", + "sentry-panic", + "sentry-tower", + "sentry-tracing", + "tokio", + "ureq", + "webpki-roots", +] + +[[package]] +name = "sentry-backtrace" +version = "0.34.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "40aa225bb41e2ec9d7c90886834367f560efc1af028f1c5478a6cce6a59c463a" +dependencies = [ + "backtrace", + "once_cell", + "regex", + "sentry-core", +] + +[[package]] +name = "sentry-contexts" +version = "0.34.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1a8dd746da3d16cb8c39751619cefd4fcdbd6df9610f3310fd646b55f6e39910" +dependencies = [ + "hostname 0.4.0", + "libc", + "os_info", + "rustc_version", + "sentry-core", + "uname", +] + +[[package]] +name = "sentry-core" +version = "0.34.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "161283cfe8e99c8f6f236a402b9ccf726b201f365988b5bb637ebca0abbd4a30" +dependencies = [ + "once_cell", + "rand", + "sentry-types", + "serde", + "serde_json", +] + +[[package]] +name = "sentry-debug-images" +version = "0.34.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8fc6b25e945fcaa5e97c43faee0267eebda9f18d4b09a251775d8fef1086238a" +dependencies = [ + "findshlibs", + "once_cell", + "sentry-core", +] + +[[package]] +name = "sentry-log" +version = "0.34.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "75bbcc61886955045a1dd4bdb173412a80bb2571be3c5bfcf7eb8f55a442bbf5" +dependencies = [ + "log", + "sentry-core", +] + +[[package]] +name = "sentry-panic" +version = "0.34.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bc74f229c7186dd971a9491ffcbe7883544aa064d1589bd30b83fb856cd22d63" +dependencies = [ + "sentry-backtrace", + "sentry-core", +] + +[[package]] +name = "sentry-tower" +version = "0.34.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c90802b38c899a2c9e557dff25ad186362eddf755d5f5244001b172dd03bead" +dependencies = [ + "http", + "pin-project", + "sentry-core", + "tower-layer", + "tower-service", + "url", +] + +[[package]] +name = "sentry-tracing" +version = "0.34.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cd3c5faf2103cd01eeda779ea439b68c4ee15adcdb16600836e97feafab362ec" +dependencies = [ + "sentry-backtrace", + "sentry-core", + "tracing-core", + "tracing-subscriber", +] + +[[package]] +name = "sentry-types" +version = "0.34.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5d68cdf6bc41b8ff3ae2a9c4671e97426dcdd154cc1d4b6b72813f285d6b163f" +dependencies = [ + "debugid", + "hex", + "rand", + "serde", + "serde_json", + "thiserror", + "time", + "url", + "uuid", +] + +[[package]] +name = "serde" +version = "1.0.209" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "99fce0ffe7310761ca6bf9faf5115afbc19688edd00171d81b1bb1b116c63e09" +dependencies = [ + "serde_derive", +] + +[[package]] +name = "serde_derive" +version = "1.0.209" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a5831b979fd7b5439637af1752d535ff49f4860c0f341d1baeb6faf0f4242170" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.76", +] + +[[package]] +name = "serde_html_form" +version = "0.2.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8de514ef58196f1fc96dcaef80fe6170a1ce6215df9687a93fe8300e773fefc5" +dependencies = [ + "form_urlencoded", + "indexmap 2.4.0", + "itoa", + "ryu", + "serde", +] + +[[package]] +name = "serde_json" +version = "1.0.127" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8043c06d9f82bd7271361ed64f415fe5e12a77fdb52e573e7f06a516dea329ad" +dependencies = [ + "itoa", + "memchr", + "ryu", + "serde", +] + +[[package]] +name = "serde_path_to_error" +version = "0.1.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "af99884400da37c88f5e9146b7f1fd0fbcae8f6eec4e9da38b67d05486f814a6" +dependencies = [ + "itoa", + "serde", +] + +[[package]] +name = "serde_regex" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a8136f1a4ea815d7eac4101cfd0b16dc0cb5e1fe1b8609dfd728058656b7badf" +dependencies = [ + "regex", + "serde", +] + +[[package]] +name = "serde_spanned" +version = "0.6.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eb5b1b31579f3811bf615c144393417496f152e12ac8b7663bf664f4a815306d" +dependencies = [ + "serde", +] + +[[package]] +name = "serde_urlencoded" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d3491c14715ca2294c4d6a88f15e84739788c1d030eed8c110436aafdaa2f3fd" +dependencies = [ + "form_urlencoded", + "itoa", + "ryu", + "serde", +] + +[[package]] +name = "serde_yaml" +version = "0.9.34+deprecated" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6a8b1a1a2ebf674015cc02edccce75287f1a0130d394307b36743c2f5d504b47" +dependencies = [ + "indexmap 2.4.0", + "itoa", + "ryu", + "serde", + "unsafe-libyaml", +] + +[[package]] +name = "sha-1" +version = "0.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f5058ada175748e33390e40e872bd0fe59a19f265d0158daa551c5a88a76009c" +dependencies = [ + "cfg-if", + "cpufeatures", + "digest", +] + +[[package]] +name = "sha1" +version = "0.10.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e3bf829a2d51ab4a5ddf1352d8470c140cadc8301b2ae1789db023f01cedd6ba" +dependencies = [ + "cfg-if", + "cpufeatures", + "digest", +] + +[[package]] +name = "sha2" +version = "0.10.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "793db75ad2bcafc3ffa7c68b215fee268f537982cd901d132f89c6343f3a3dc8" +dependencies = [ + "cfg-if", + "cpufeatures", + "digest", +] + +[[package]] +name = "sharded-slab" +version = "0.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f40ca3c46823713e0d4209592e8d6e826aa57e928f09752619fc696c499637f6" +dependencies = [ + "lazy_static", +] + +[[package]] +name = "shlex" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64" + +[[package]] +name = "signal-hook" +version = "0.3.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8621587d4798caf8eb44879d42e56b9a93ea5dcd315a6487c357130095b62801" +dependencies = [ + "libc", + "signal-hook-registry", +] + +[[package]] +name = "signal-hook-mio" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "34db1a06d485c9142248b7a054f034b349b212551f3dfd19c94d45a754a217cd" +dependencies = [ + "libc", + "mio", + "signal-hook", +] + +[[package]] +name = "signal-hook-registry" +version = "1.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a9e9e0b4211b72e7b8b6e85c807d36c212bdb33ea8587f7569562a84df5465b1" +dependencies = [ + "libc", +] + +[[package]] +name = "signature" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "77549399552de45a898a580c1b41d445bf730df867cc44e6c0233bbc4b8329de" +dependencies = [ + "rand_core", +] + +[[package]] +name = "simd-adler32" +version = "0.3.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d66dc143e6b11c1eddc06d5c423cfc97062865baf299914ab64caa38182078fe" + +[[package]] +name = "simple_asn1" +version = "0.6.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "adc4e5204eb1910f40f9cfa375f6f05b68c3abac4b6fd879c8ff5e7ae8a0a085" +dependencies = [ + "num-bigint", + "num-traits", + "thiserror", + "time", +] + +[[package]] +name = "siphasher" +version = "0.3.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38b58827f4464d87d377d175e90bf58eb00fd8716ff0a62f80356b5e61555d0d" + +[[package]] +name = "slab" +version = "0.4.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f92a496fb766b417c996b9c5e57daf2f7ad3b0bebe1ccfca4856390e3d3bb67" +dependencies = [ + "autocfg", +] + +[[package]] +name = "smallvec" +version = "1.13.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" + +[[package]] +name = "socket2" +version = "0.5.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ce305eb0b4296696835b71df73eb912e0f1ffd2556a501fcede6e0c50349191c" +dependencies = [ + "libc", + "windows-sys 0.52.0", +] + +[[package]] +name = "spin" +version = "0.9.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67" + +[[package]] +name = "spki" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d91ed6c858b01f942cd56b37a94b3e0a1798290327d1236e4d9cf4eaca44d29d" +dependencies = [ + "base64ct", + "der", +] + +[[package]] +name = "strict" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f42444fea5b87a39db4218d9422087e66a85d0e7a0963a439b07bcdf91804006" + +[[package]] +name = "string_cache" +version = "0.8.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f91138e76242f575eb1d3b38b4f1362f10d3a43f47d182a5b359af488a02293b" +dependencies = [ + "new_debug_unreachable", + "once_cell", + "parking_lot", + "phf_shared 0.10.0", + "precomputed-hash", + "serde", +] + +[[package]] +name = "string_cache_codegen" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6bb30289b722be4ff74a408c3cc27edeaad656e06cb1fe8fa9231fa59c728988" +dependencies = [ + "phf_generator 0.10.0", + "phf_shared 0.10.0", + "proc-macro2", + "quote", +] + +[[package]] +name = "subslice" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e0a8e4809a3bb02de01f1f7faf1ba01a83af9e8eabcd4d31dd6e413d14d56aae" +dependencies = [ + "memchr", +] + +[[package]] +name = "subtle" +version = "2.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292" + +[[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.76" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "578e081a14e0cefc3279b0472138c513f37b41a08d5a3cca9b6e4e8ceb6cd525" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + +[[package]] +name = "sync_wrapper" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2047c6ded9c721764247e62cd3b03c09ffc529b2ba5b10ec482ae507a4a70160" + +[[package]] +name = "sync_wrapper" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a7065abeca94b6a8a577f9bd45aa0867a2238b74e8eb67cf10d492bc39351394" +dependencies = [ + "futures-core", +] + +[[package]] +name = "tendril" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d24a120c5fc464a3458240ee02c299ebcb9d67b5249c8848b09d639dca8d7bb0" +dependencies = [ + "futf", + "mac", + "utf-8", +] + +[[package]] +name = "termimad" +version = "0.30.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "920e7c4671e79f3d9df269da9c8edf0dbc580044fd727d3594f7bfba5eb6107a" +dependencies = [ + "coolor", + "crokey", + "crossbeam", + "lazy-regex", + "minimad", + "serde", + "thiserror", + "unicode-width", +] + +[[package]] +name = "thingbuf" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "662b54ef6f7b4e71f683dadc787bbb2d8e8ef2f91b682ebed3164a5a7abca905" +dependencies = [ + "parking_lot", + "pin-project", +] + +[[package]] +name = "thiserror" +version = "1.0.63" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c0342370b38b6a11b6cc11d6a805569958d54cfa061a29969c3b5ce2ea405724" +dependencies = [ + "thiserror-impl", +] + +[[package]] +name = "thiserror-impl" +version = "1.0.63" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a4558b58466b9ad7ca0f102865eccc95938dca1a74a856f2b57b6629050da261" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.76", +] + +[[package]] +name = "thread_local" +version = "1.1.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b9ef9bad013ada3808854ceac7b46812a6465ba368859a37e2100283d2d719c" +dependencies = [ + "cfg-if", + "once_cell", +] + +[[package]] +name = "threadpool" +version = "1.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d050e60b33d41c19108b32cea32164033a9013fe3b46cbd4457559bfbf77afaa" +dependencies = [ + "num_cpus", +] + +[[package]] +name = "thrift" +version = "0.17.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7e54bc85fc7faa8bc175c4bab5b92ba8d9a3ce893d0e9f42cc455c8ab16a9e09" +dependencies = [ + "byteorder", + "integer-encoding", + "log", + "ordered-float 2.10.1", + "threadpool", +] + +[[package]] +name = "tikv-jemalloc-ctl" +version = "0.6.0" +source = "git+https://github.com/girlbossceo/jemallocator?rev=c32af15f3b440ae5e46c3404f78b19093bbd5294#c32af15f3b440ae5e46c3404f78b19093bbd5294" +dependencies = [ + "libc", + "paste", + "tikv-jemalloc-sys", +] + +[[package]] +name = "tikv-jemalloc-sys" +version = "0.6.0+5.3.0-1-ge13ca993e8ccb9ba9847cc330696e02839f328f7" +source = "git+https://github.com/girlbossceo/jemallocator?rev=c32af15f3b440ae5e46c3404f78b19093bbd5294#c32af15f3b440ae5e46c3404f78b19093bbd5294" +dependencies = [ + "cc", + "libc", +] + +[[package]] +name = "tikv-jemallocator" +version = "0.6.0" +source = "git+https://github.com/girlbossceo/jemallocator?rev=c32af15f3b440ae5e46c3404f78b19093bbd5294#c32af15f3b440ae5e46c3404f78b19093bbd5294" +dependencies = [ + "libc", + "tikv-jemalloc-sys", +] + +[[package]] +name = "time" +version = "0.3.36" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885" +dependencies = [ + "deranged", + "itoa", + "num-conv", + "powerfmt", + "serde", + "time-core", + "time-macros", +] + +[[package]] +name = "time-core" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" + +[[package]] +name = "time-macros" +version = "0.2.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf" +dependencies = [ + "num-conv", + "time-core", +] + +[[package]] +name = "tinyvec" +version = "1.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "445e881f4f6d382d5f27c034e25eb92edd7c784ceab92a0937db7f2e9471b938" +dependencies = [ + "tinyvec_macros", +] + +[[package]] +name = "tinyvec_macros" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" + +[[package]] +name = "tokio" +version = "1.40.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e2b070231665d27ad9ec9b8df639893f46727666c6767db40317fbe920a5d998" +dependencies = [ + "backtrace", + "bytes", + "libc", + "mio", + "pin-project-lite", + "signal-hook-registry", + "socket2", + "tokio-macros", + "tracing", + "windows-sys 0.52.0", +] + +[[package]] +name = "tokio-macros" +version = "2.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "693d596312e88961bc67d7f1f97af8a70227d9f90c31bba5806eec004978d752" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.76", +] + +[[package]] +name = "tokio-metrics" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eace09241d62c98b7eeb1107d4c5c64ca3bd7da92e8c218c153ab3a78f9be112" +dependencies = [ + "futures-util", + "pin-project-lite", + "tokio", + "tokio-stream", +] + +[[package]] +name = "tokio-rustls" +version = "0.26.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0c7bc40d0e5a97695bb96e27995cd3a08538541b0a846f65bba7a359f36700d4" +dependencies = [ + "rustls 0.23.12", + "rustls-pki-types", + "tokio", +] + +[[package]] +name = "tokio-socks" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0d4770b8024672c1101b3f6733eab95b18007dbe0847a8afe341fcf79e06043f" +dependencies = [ + "either", + "futures-util", + "thiserror", + "tokio", +] + +[[package]] +name = "tokio-stream" +version = "0.1.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "267ac89e0bec6e691e5813911606935d77c476ff49024f98abcea3e7b15e37af" +dependencies = [ + "futures-core", + "pin-project-lite", + "tokio", +] + +[[package]] +name = "tokio-util" +version = "0.7.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9cf6b47b3771c49ac75ad09a6162f53ad4b8088b76ac60e8ec1455b31a189fe1" +dependencies = [ + "bytes", + "futures-core", + "futures-sink", + "pin-project-lite", + "tokio", +] + +[[package]] +name = "toml" +version = "0.8.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a1ed1f98e3fdc28d6d910e6737ae6ab1a93bf1985935a1193e68f93eeb68d24e" +dependencies = [ + "serde", + "serde_spanned", + "toml_datetime", + "toml_edit 0.22.20", +] + +[[package]] +name = "toml_datetime" +version = "0.6.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0dd7358ecb8fc2f8d014bf86f6f638ce72ba252a2c3a2572f2a795f1d23efb41" +dependencies = [ + "serde", +] + +[[package]] +name = "toml_edit" +version = "0.21.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6a8534fd7f78b5405e860340ad6575217ce99f38d4d5c8f2442cb5ecb50090e1" +dependencies = [ + "indexmap 2.4.0", + "toml_datetime", + "winnow 0.5.40", +] + +[[package]] +name = "toml_edit" +version = "0.22.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "583c44c02ad26b0c3f3066fe629275e50627026c51ac2e595cca4c230ce1ce1d" +dependencies = [ + "indexmap 2.4.0", + "serde", + "serde_spanned", + "toml_datetime", + "winnow 0.6.18", +] + +[[package]] +name = "tonic" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38659f4a91aba8598d27821589f5db7dddd94601e7a01b1e485a50e5484c7401" +dependencies = [ + "async-stream", + "async-trait", + "axum", + "base64 0.22.1", + "bytes", + "h2", + "http", + "http-body", + "http-body-util", + "hyper", + "hyper-timeout", + "hyper-util", + "percent-encoding", + "pin-project", + "prost", + "socket2", + "tokio", + "tokio-stream", + "tower 0.4.13", + "tower-layer", + "tower-service", + "tracing", +] + +[[package]] +name = "tower" +version = "0.4.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b8fa9be0de6cf49e536ce1851f987bd21a43b771b09473c3549a6c853db37c1c" +dependencies = [ + "futures-core", + "futures-util", + "indexmap 1.9.3", + "pin-project", + "pin-project-lite", + "rand", + "slab", + "tokio", + "tokio-util", + "tower-layer", + "tower-service", + "tracing", +] + +[[package]] +name = "tower" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "36b837f86b25d7c0d7988f00a54e74739be6477f2aac6201b8f429a7569991b7" +dependencies = [ + "futures-core", + "futures-util", + "pin-project-lite", + "sync_wrapper 0.1.2", + "tower-layer", + "tower-service", +] + +[[package]] +name = "tower-http" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e9cd434a998747dd2c4276bc96ee2e0c7a2eadf3cae88e52be55a05fa9053f5" +dependencies = [ + "async-compression", + "bitflags 2.6.0", + "bytes", + "futures-core", + "futures-util", + "http", + "http-body", + "http-body-util", + "pin-project-lite", + "tokio", + "tokio-util", + "tower 0.4.13", + "tower-layer", + "tower-service", + "tracing", +] + +[[package]] +name = "tower-layer" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "121c2a6cda46980bb0fcd1647ffaf6cd3fc79a013de288782836f6df9c48780e" + +[[package]] +name = "tower-service" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8df9b6e13f2d32c91b9bd719c00d1958837bc7dec474d94952798cc8e69eeec3" + +[[package]] +name = "tracing" +version = "0.1.40" +source = "git+https://github.com/girlbossceo/tracing?rev=4d78a14a5e03f539b8c6b475aefa08bb14e4de91#4d78a14a5e03f539b8c6b475aefa08bb14e4de91" +dependencies = [ + "log", + "pin-project-lite", + "tracing-attributes", + "tracing-core", +] + +[[package]] +name = "tracing-attributes" +version = "0.1.27" +source = "git+https://github.com/girlbossceo/tracing?rev=4d78a14a5e03f539b8c6b475aefa08bb14e4de91#4d78a14a5e03f539b8c6b475aefa08bb14e4de91" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.76", +] + +[[package]] +name = "tracing-core" +version = "0.1.32" +source = "git+https://github.com/girlbossceo/tracing?rev=4d78a14a5e03f539b8c6b475aefa08bb14e4de91#4d78a14a5e03f539b8c6b475aefa08bb14e4de91" +dependencies = [ + "once_cell", + "valuable", +] + +[[package]] +name = "tracing-flame" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0bae117ee14789185e129aaee5d93750abe67fdc5a9a62650452bfe4e122a3a9" +dependencies = [ + "lazy_static", + "tracing", + "tracing-subscriber", +] + +[[package]] +name = "tracing-log" +version = "0.2.0" +source = "git+https://github.com/girlbossceo/tracing?rev=4d78a14a5e03f539b8c6b475aefa08bb14e4de91#4d78a14a5e03f539b8c6b475aefa08bb14e4de91" +dependencies = [ + "log", + "once_cell", + "tracing-core", +] + +[[package]] +name = "tracing-opentelemetry" +version = "0.22.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c67ac25c5407e7b961fafc6f7e9aa5958fd297aada2d20fa2ae1737357e55596" +dependencies = [ + "js-sys", + "once_cell", + "opentelemetry", + "opentelemetry_sdk", + "smallvec", + "tracing", + "tracing-core", + "tracing-log", + "tracing-subscriber", + "web-time 0.2.4", +] + +[[package]] +name = "tracing-subscriber" +version = "0.3.18" +source = "git+https://github.com/girlbossceo/tracing?rev=4d78a14a5e03f539b8c6b475aefa08bb14e4de91#4d78a14a5e03f539b8c6b475aefa08bb14e4de91" +dependencies = [ + "matchers", + "nu-ansi-term", + "once_cell", + "regex", + "sharded-slab", + "smallvec", + "thread_local", + "tracing", + "tracing-core", + "tracing-log", +] + +[[package]] +name = "try-lock" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b" + +[[package]] +name = "typenum" +version = "1.17.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825" + +[[package]] +name = "typewit" +version = "1.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c6fb9ae6a3cafaf0a5d14c2302ca525f9ae8e07a0f0e6949de88d882c37a6e24" +dependencies = [ + "typewit_proc_macros", +] + +[[package]] +name = "typewit_proc_macros" +version = "1.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e36a83ea2b3c704935a01b4642946aadd445cea40b10935e3f8bd8052b8193d6" + +[[package]] +name = "uname" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b72f89f0ca32e4db1c04e2a72f5345d59796d4866a1ee0609084569f73683dc8" +dependencies = [ + "libc", +] + +[[package]] +name = "uncased" +version = "0.9.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e1b88fcfe09e89d3866a5c11019378088af2d24c3fbd4f0543f96b479ec90697" +dependencies = [ + "version_check", +] + +[[package]] +name = "unicase" +version = "2.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f7d2d4dafb69621809a81864c9c1b864479e1235c0dd4e199924b9742439ed89" +dependencies = [ + "version_check", +] + +[[package]] +name = "unicode-bidi" +version = "0.3.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "08f95100a766bf4f8f28f90d77e0a5461bbdb219042e7679bebe79004fed8d75" + +[[package]] +name = "unicode-ident" +version = "1.0.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" + +[[package]] +name = "unicode-normalization" +version = "0.1.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a56d1686db2308d901306f92a263857ef59ea39678a5458e7cb17f01415101f5" +dependencies = [ + "tinyvec", +] + +[[package]] +name = "unicode-segmentation" +version = "1.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d4c87d22b6e3f4a18d4d40ef354e97c90fcb14dd91d7dc0aa9d8a1172ebf7202" + +[[package]] +name = "unicode-width" +version = "0.1.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0336d538f7abc86d282a4189614dfaa90810dfc2c6f6427eaf88e16311dd225d" + +[[package]] +name = "unsafe-libyaml" +version = "0.2.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "673aac59facbab8a9007c7f6108d11f63b603f7cabff99fabf650fea5c32b861" + +[[package]] +name = "untrusted" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1" + +[[package]] +name = "ureq" +version = "2.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b74fc6b57825be3373f7054754755f03ac3a8f5d70015ccad699ba2029956f4a" +dependencies = [ + "base64 0.22.1", + "log", + "once_cell", + "rustls 0.23.12", + "rustls-pki-types", + "url", + "webpki-roots", +] + +[[package]] +name = "url" +version = "2.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "22784dbdf76fdde8af1aeda5622b546b422b6fc585325248a2bf9f5e41e94d6c" +dependencies = [ + "form_urlencoded", + "idna 0.5.0", + "percent-encoding", + "serde", +] + +[[package]] +name = "urlencoding" +version = "2.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "daf8dba3b7eb870caf1ddeed7bc9d2a049f3cfdfae7cb521b087cc33ae4c49da" + +[[package]] +name = "utf-8" +version = "0.7.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "09cc8ee72d2a9becf2f2febe0205bbed8fc6615b7cb429ad062dc7b7ddd036a9" + +[[package]] +name = "uuid" +version = "1.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "81dfa00651efa65069b0b6b651f4aaa31ba9e3c3ce0137aaad053604ee7e0314" +dependencies = [ + "getrandom", + "serde", +] + +[[package]] +name = "valuable" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d" + +[[package]] +name = "vcpkg" +version = "0.2.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426" + +[[package]] +name = "version_check" +version = "0.9.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a" + +[[package]] +name = "want" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bfa7760aed19e106de2c7c0b581b509f2f25d3dacaf737cb82ac61bc6d760b0e" +dependencies = [ + "try-lock", +] + +[[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.93" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a82edfc16a6c469f5f44dc7b571814045d60404b55a0ee849f9bcfa2e63dd9b5" +dependencies = [ + "cfg-if", + "once_cell", + "wasm-bindgen-macro", +] + +[[package]] +name = "wasm-bindgen-backend" +version = "0.2.93" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9de396da306523044d3302746f1208fa71d7532227f15e347e2d93e4145dd77b" +dependencies = [ + "bumpalo", + "log", + "once_cell", + "proc-macro2", + "quote", + "syn 2.0.76", + "wasm-bindgen-shared", +] + +[[package]] +name = "wasm-bindgen-futures" +version = "0.4.43" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "61e9300f63a621e96ed275155c108eb6f843b6a26d053f122ab69724559dc8ed" +dependencies = [ + "cfg-if", + "js-sys", + "wasm-bindgen", + "web-sys", +] + +[[package]] +name = "wasm-bindgen-macro" +version = "0.2.93" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "585c4c91a46b072c92e908d99cb1dcdf95c5218eeb6f3bf1efa991ee7a68cccf" +dependencies = [ + "quote", + "wasm-bindgen-macro-support", +] + +[[package]] +name = "wasm-bindgen-macro-support" +version = "0.2.93" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "afc340c74d9005395cf9dd098506f7f44e38f2b4a21c6aaacf9a105ea5e1e836" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.76", + "wasm-bindgen-backend", + "wasm-bindgen-shared", +] + +[[package]] +name = "wasm-bindgen-shared" +version = "0.2.93" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c62a0a307cb4a311d3a07867860911ca130c3494e8c2719593806c08bc5d0484" + +[[package]] +name = "web-sys" +version = "0.3.70" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "26fdeaafd9bd129f65e7c031593c24d62186301e0c72c8978fa1678be7d532c0" +dependencies = [ + "js-sys", + "wasm-bindgen", +] + +[[package]] +name = "web-time" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aa30049b1c872b72c89866d458eae9f20380ab280ffd1b1e18df2d3e2d98cfe0" +dependencies = [ + "js-sys", + "wasm-bindgen", +] + +[[package]] +name = "web-time" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5a6580f308b1fad9207618087a65c04e7a10bc77e02c8e84e9b00dd4b12fa0bb" +dependencies = [ + "js-sys", + "wasm-bindgen", +] + +[[package]] +name = "webpage" +version = "2.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "70862efc041d46e6bbaa82bb9c34ae0596d090e86cbd14bd9e93b36ee6802eac" +dependencies = [ + "html5ever", + "markup5ever_rcdom", + "serde_json", + "url", +] + +[[package]] +name = "webpki-roots" +version = "0.26.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bd7c23921eeb1713a4e851530e9b9756e4fb0e89978582942612524cf09f01cd" +dependencies = [ + "rustls-pki-types", +] + +[[package]] +name = "weezl" +version = "0.1.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "53a85b86a771b1c87058196170769dd264f66c0782acf1ae6cc51bfd64b39082" + +[[package]] +name = "which" +version = "4.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "87ba24419a2078cd2b0f2ede2691b6c66d8e47836da3b6db8265ebad47afbfc7" +dependencies = [ + "either", + "home", + "once_cell", + "rustix", +] + +[[package]] +name = "widestring" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7219d36b6eac893fa81e84ebe06485e7dcbb616177469b142df14f1f4deb1311" + +[[package]] +name = "wildmatch" +version = "2.3.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3928939971918220fed093266b809d1ee4ec6c1a2d72692ff6876898f3b16c19" + +[[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-x86_64-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" + +[[package]] +name = "windows" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e48a53791691ab099e5e2ad123536d0fff50652600abaf43bbf952894110d0be" +dependencies = [ + "windows-core", + "windows-targets 0.52.6", +] + +[[package]] +name = "windows-core" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9" +dependencies = [ + "windows-targets 0.52.6", +] + +[[package]] +name = "windows-registry" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e400001bb720a623c1c69032f8e3e4cf09984deec740f007dd2b03ec864804b0" +dependencies = [ + "windows-result", + "windows-strings", + "windows-targets 0.52.6", +] + +[[package]] +name = "windows-result" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1d1043d8214f791817bab27572aaa8af63732e11bf84aa21a45a78d6c317ae0e" +dependencies = [ + "windows-targets 0.52.6", +] + +[[package]] +name = "windows-strings" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4cd9b125c486025df0eabcb585e62173c6c9eddcec5d117d3b6e8c30e2ee4d10" +dependencies = [ + "windows-result", + "windows-targets 0.52.6", +] + +[[package]] +name = "windows-sys" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" +dependencies = [ + "windows-targets 0.48.5", +] + +[[package]] +name = "windows-sys" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" +dependencies = [ + "windows-targets 0.52.6", +] + +[[package]] +name = "windows-targets" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c" +dependencies = [ + "windows_aarch64_gnullvm 0.48.5", + "windows_aarch64_msvc 0.48.5", + "windows_i686_gnu 0.48.5", + "windows_i686_msvc 0.48.5", + "windows_x86_64_gnu 0.48.5", + "windows_x86_64_gnullvm 0.48.5", + "windows_x86_64_msvc 0.48.5", +] + +[[package]] +name = "windows-targets" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973" +dependencies = [ + "windows_aarch64_gnullvm 0.52.6", + "windows_aarch64_msvc 0.52.6", + "windows_i686_gnu 0.52.6", + "windows_i686_gnullvm", + "windows_i686_msvc 0.52.6", + "windows_x86_64_gnu 0.52.6", + "windows_x86_64_gnullvm 0.52.6", + "windows_x86_64_msvc 0.52.6", +] + +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" + +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469" + +[[package]] +name = "windows_i686_gnu" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" + +[[package]] +name = "windows_i686_gnu" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b" + +[[package]] +name = "windows_i686_gnullvm" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66" + +[[package]] +name = "windows_i686_msvc" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" + +[[package]] +name = "windows_i686_msvc" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" + +[[package]] +name = "winnow" +version = "0.5.40" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f593a95398737aeed53e489c785df13f3618e41dbcd6718c6addbf1395aa6876" +dependencies = [ + "memchr", +] + +[[package]] +name = "winnow" +version = "0.6.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "68a9bda4691f099d435ad181000724da8e5899daa10713c2d432552b9ccd3a6f" +dependencies = [ + "memchr", +] + +[[package]] +name = "winreg" +version = "0.50.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "524e57b2c537c0f9b1e69f1965311ec12182b4122e45035b1508cd24d2adadb1" +dependencies = [ + "cfg-if", + "windows-sys 0.48.0", +] + +[[package]] +name = "xml5ever" +version = "0.18.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9bbb26405d8e919bc1547a5aa9abc95cbfa438f04844f5fdd9dc7596b748bf69" +dependencies = [ + "log", + "mac", + "markup5ever", +] + +[[package]] +name = "yansi" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cfe53a6657fd280eaa890a3bc59152892ffa3e30101319d168b781ed6529b049" + +[[package]] +name = "zerocopy" +version = "0.7.35" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1b9b4fd18abc82b8136838da5d50bae7bdea537c574d8dc1a34ed098d6c166f0" +dependencies = [ + "byteorder", + "zerocopy-derive", +] + +[[package]] +name = "zerocopy-derive" +version = "0.7.35" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.76", +] + +[[package]] +name = "zeroize" +version = "1.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ced3678a2879b30306d323f4542626697a464a97c0a07c9aebf7ebca65cd4dde" +dependencies = [ + "zeroize_derive", +] + +[[package]] +name = "zeroize_derive" +version = "1.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.76", +] + +[[package]] +name = "zstd" +version = "0.13.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fcf2b778a664581e31e389454a7072dab1647606d44f7feea22cd5abb9c9f3f9" +dependencies = [ + "zstd-safe", +] + +[[package]] +name = "zstd-safe" +version = "7.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "54a3ab4db68cea366acc5c897c7b4d4d1b8994a9cd6e6f841f8964566a419059" +dependencies = [ + "zstd-sys", +] + +[[package]] +name = "zstd-sys" +version = "2.0.13+zstd.1.5.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38ff0f21cfee8f97d94cef41359e0c89aa6113028ab0291aa8ca0038995a95aa" +dependencies = [ + "cc", + "pkg-config", +] + +[[package]] +name = "zune-core" +version = "0.4.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3f423a2c17029964870cfaabb1f13dfab7d092a62a29a89264f4d36990ca414a" + +[[package]] +name = "zune-jpeg" +version = "0.4.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "16099418600b4d8f028622f73ff6e3deaabdff330fb9a2a131dea781ee8b0768" +dependencies = [ + "zune-core", +] diff --git a/pkgs/by-name/co/conduwuit/package.nix b/pkgs/by-name/co/conduwuit/package.nix new file mode 100644 index 000000000000..1fd8e9b3e3d5 --- /dev/null +++ b/pkgs/by-name/co/conduwuit/package.nix @@ -0,0 +1,107 @@ +{ + lib, + rustPlatform, + fetchFromGitHub, + pkg-config, + bzip2, + zstd, + stdenv, + darwin, + rocksdb, + nix-update-script, + testers, + conduwuit, + # upstream conduwuit enables jemalloc by default, so we follow suit + enableJemalloc ? true, + rust-jemalloc-sys, + enableLiburing ? stdenv.isLinux, + liburing, +}: +let + rust-jemalloc-sys' = rust-jemalloc-sys.override { + unprefixed = !stdenv.isDarwin; + }; + rocksdb' = rocksdb.override { + inherit enableLiburing; + # rocksdb does not support prefixed jemalloc, which is required on darwin + enableJemalloc = enableJemalloc && !stdenv.isDarwin; + jemalloc = rust-jemalloc-sys'; + }; +in +rustPlatform.buildRustPackage rec { + pname = "conduwuit"; + version = "0.4.6"; + + src = fetchFromGitHub { + owner = "girlbossceo"; + repo = "conduwuit"; + rev = "v${version}"; + hash = "sha256-ut3IWEueNR/hT7NyGfuK5IYtppC6ArSoJdEfFuD/0vE="; + }; + + cargoLock = { + lockFile = ./Cargo.lock; + outputHashes = { + "ruma-0.10.1" = "sha256-u4C2VwRBmw8iVaPrkSmF/EKi5U3nWJWVktUDFmQcI1E="; + "rust-librocksdb-sys-0.25.0+9.5.2" = "sha256-wz6QDLoXtY8+EU2DlPf4MbWC67KJK0hZnRswCeomkLQ="; + "rustyline-async-0.4.3" = "sha256-7yYOGZ14SODD4+e9fTGgggUKqTi31479S0lEVKTKLPI="; + "tikv-jemalloc-ctl-0.6.0" = "sha256-guiH6Gw/Oeb6A8Ri1SFcB6CW6mt+9XeA6vfwdS72yDQ="; + "tracing-0.1.40" = "sha256-J6+8hBC/755SU8n1fTiJwBh17Unluv1SXfd5+dDAEhk="; + }; + }; + + nativeBuildInputs = [ + pkg-config + rustPlatform.bindgenHook + ]; + + buildInputs = + [ + bzip2 + zstd + ] + ++ lib.optional enableJemalloc rust-jemalloc-sys' + ++ lib.optional enableLiburing liburing + ++ lib.optionals stdenv.isDarwin [ + darwin.apple_sdk.frameworks.Security + ]; + + env = { + ZSTD_SYS_USE_PKG_CONFIG = true; + ROCKSDB_INCLUDE_DIR = "${rocksdb'}/include"; + ROCKSDB_LIB_DIR = "${rocksdb'}/lib"; + }; + + buildNoDefaultFeatures = true; + # See https://github.com/girlbossceo/conduwuit/blob/main/src/main/Cargo.toml + # for available features. + # We enable all default features except jemalloc and io_uring, which + # we guard behind our own (default-enabled) flags. + buildFeatures = [ + "brotli_compression" + "element_hacks" + "gzip_compression" + "release_max_log_level" + "sentry_telemetry" + "systemd" + "zstd_compression" + ] ++ lib.optional enableJemalloc "jemalloc" ++ lib.optional enableLiburing "io_uring"; + + passthru = { + updateScript = nix-update-script { }; + tests.version = testers.testVersion { + package = conduwuit; + version = "${version}"; + }; + }; + + meta = { + description = "Matrix homeserver written in Rust, forked from conduit"; + homepage = "https://conduwuit.puppyirl.gay/"; + changelog = "https://github.com/girlbossceo/conduwuit/releases/tag/v${version}"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ niklaskorz ]; + # Not a typo, conduwuit is a drop-in replacement for conduit. + mainProgram = "conduit"; + }; +} From 89cbfde96de175f6134b6605d9d52fd38e2b3f6d Mon Sep 17 00:00:00 2001 From: Philip Taron Date: Mon, 2 Sep 2024 12:33:28 -0700 Subject: [PATCH 221/235] nixpkgs-vet: update CI, docs, and release to 0.1.4 Everything gets moved into the `ci/` top-level directory. We keep behind `maintainers/scripts/check-by-name.sh` and `pkgs/test/check-by-name/pinned-version.txt` as they are going to cause CI errors and confusion until we get all the way through the various channels. They'll be removed in about a week or so. --- .github/CODEOWNERS | 13 ++-- .github/workflows/check-nix-format.yml | 2 +- .../{check-by-name.yml => nixpkgs-vet.yml} | 61 ++++++++----------- ci/README.md | 31 ++++++++++ .../run-local.sh => ci/nixpkgs-vet.sh | 12 ++-- ci/nixpkgs-vet/pinned-version.txt | 1 + .../nixpkgs-vet}/update-pinned-tool.sh | 2 +- maintainers/scripts/README.md | 4 -- maintainers/scripts/check-by-name.sh | 2 +- pkgs/by-name/README.md | 8 +-- pkgs/test/check-by-name/README.md | 31 ---------- 11 files changed, 74 insertions(+), 93 deletions(-) rename .github/workflows/{check-by-name.yml => nixpkgs-vet.yml} (66%) rename pkgs/test/check-by-name/run-local.sh => ci/nixpkgs-vet.sh (82%) create mode 100644 ci/nixpkgs-vet/pinned-version.txt rename {pkgs/test/check-by-name => ci/nixpkgs-vet}/update-pinned-tool.sh (94%) delete mode 100644 pkgs/test/check-by-name/README.md diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index 03dce8c124d3..17ab33c891ff 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -14,9 +14,10 @@ # CI /.github/workflows @NixOS/Security @Mic92 @zowoq /.github/workflows/check-nix-format.yml @infinisil -/ci @infinisil @NixOS/Security +/.github/workflows/nixpkgs-vet.yml @infinisil @philiptaron +/ci @infinisil @philiptaron @NixOS/Security -# Develompent support +# Development support /.editorconfig @Mic92 @zowoq /shell.nix @infinisil @NixOS/Security @@ -43,6 +44,7 @@ /pkgs/top-level/stage.nix @Ericson2314 /pkgs/top-level/splice.nix @Ericson2314 /pkgs/top-level/release-cross.nix @Ericson2314 +/pkgs/top-level/by-name-overlay.nix @infinisil @philiptaron /pkgs/stdenv @philiptaron /pkgs/stdenv/generic @Ericson2314 /pkgs/stdenv/generic/check-meta.nix @Ericson2314 @@ -58,12 +60,6 @@ /pkgs/pkgs-lib/formats/libconfig @h7x4 /pkgs/pkgs-lib/formats/hocon @h7x4 -# pkgs/by-name -/pkgs/test/check-by-name @infinisil -/pkgs/by-name/README.md @infinisil -/pkgs/top-level/by-name-overlay.nix @infinisil -/.github/workflows/check-by-name.yml @infinisil - # Nixpkgs build-support /pkgs/build-support/writers @lassulus @Profpatsch @@ -91,6 +87,7 @@ nixos/modules/installer/tools/nix-fallback-paths.nix @NixOS/nix-team @raitobeza /doc/README.md @infinisil /nixos/README.md @infinisil /pkgs/README.md @infinisil +/pkgs/by-name/README.md @infinisil /maintainers/README.md @infinisil # User-facing development documentation diff --git a/.github/workflows/check-nix-format.yml b/.github/workflows/check-nix-format.yml index 22ad83ba953b..bcf0627ee22c 100644 --- a/.github/workflows/check-nix-format.yml +++ b/.github/workflows/check-nix-format.yml @@ -7,7 +7,7 @@ name: Check that Nix files are formatted on: pull_request_target: - # See the comment at the same location in ./check-by-name.yml + # See the comment at the same location in ./nixpkgs-vet.yml types: [opened, synchronize, reopened, edited] permissions: contents: read diff --git a/.github/workflows/check-by-name.yml b/.github/workflows/nixpkgs-vet.yml similarity index 66% rename from .github/workflows/check-by-name.yml rename to .github/workflows/nixpkgs-vet.yml index 59eb6c857f64..31bca993187c 100644 --- a/.github/workflows/check-by-name.yml +++ b/.github/workflows/nixpkgs-vet.yml @@ -1,42 +1,30 @@ -# Checks pkgs/by-name (see pkgs/by-name/README.md) -# using the nixpkgs-check-by-name tool (see https://github.com/NixOS/nixpkgs-check-by-name) -# -# When you make changes to this workflow, also update pkgs/test/check-by-name/run-local.sh adequately +# Checks pkgs/by-name (see pkgs/by-name/README.md) using the `nixpkgs-vet` tool (see https://github.com/NixOS/nixpkgs-vet) +# When you make changes to this workflow, please also update `ci/nixpkgs-vet.sh` to reflect the impact of your work to the CI. name: Check pkgs/by-name on: - # Using pull_request_target instead of pull_request avoids having to approve first time contributors + # Using pull_request_target instead of pull_request avoids having to approve first time contributors. pull_request_target: - # This workflow depends on the base branch of the PR, - # but changing the base branch is not included in the default trigger events, - # which would be `opened`, `synchronize` or `reopened`. - # Instead it causes an `edited` event, so we need to add it explicitly here - # While `edited` is also triggered when the PR title/body is changed, - # this PR action is fairly quick, and PR's don't get edited that often, - # so it shouldn't be a problem - # There is a feature request for adding a `base_changed` event: - # https://github.com/orgs/community/discussions/35058 + # This workflow depends on the base branch of the PR, but changing the base branch is not included in the default trigger events, which would be `opened`, `synchronize` or `reopened`. + # Instead it causes an `edited` event, so we need to add it explicitly here. + # While `edited` is also triggered when the PR title/body is changed, this PR action is fairly quick, and PRs don't get edited **that** often, so it shouldn't be a problem. + # There is a feature request for adding a `base_changed` event: https://github.com/orgs/community/discussions/35058 types: [opened, synchronize, reopened, edited] permissions: {} -# We don't use a concurrency group here, because the action is triggered quite often (due to the PR edit -# trigger), and contributers would get notified on any canceled run. -# There is a feature request for supressing notifications on concurrency-canceled runs: -# https://github.com/orgs/community/discussions/13015 +# We don't use a concurrency group here, because the action is triggered quite often (due to the PR edit trigger), and contributors would get notified on any canceled run. +# There is a feature request for suppressing notifications on concurrency-canceled runs: https://github.com/orgs/community/discussions/13015 jobs: check: name: pkgs-by-name-check - # This needs to be x86_64-linux, because we depend on the tooling being pre-built in the GitHub releases + # This needs to be x86_64-linux, because we depend on the tooling being pre-built in the GitHub releases. runs-on: ubuntu-latest - # This should take 1 minute at most, but let's be generous. - # The default of 6 hours is definitely too long + # This should take 1 minute at most, but let's be generous. The default of 6 hours is definitely too long. timeout-minutes: 10 steps: - # This step has to be in this file, - # because it's needed to determine which revision of the repository to fetch, - # and we can only use other files from the repository once it's fetched. + # This step has to be in this file, because it's needed to determine which revision of the repository to fetch, and we can only use other files from the repository once it's fetched. - name: Resolving the merge commit env: GH_TOKEN: ${{ github.token }} @@ -99,27 +87,28 @@ jobs: if: env.mergedSha - name: Fetching the pinned tool if: env.mergedSha - # Update the pinned version using pkgs/test/check-by-name/update-pinned-tool.sh + # Update the pinned version using ci/nixpkgs-vet/update-pinned-tool.sh run: | - # The pinned version of the tooling to use - toolVersion=$(. + +## `ci/nixpkgs-vet` + +This directory contains scripts and files used and related to [`nixpkgs-vet`](https://github.com/NixOS/nixpkgs-vet/), which the CI uses to implement `pkgs/by-name` checks, along with many other Nixpkgs architecture rules. +See also the [CI GitHub Action](../.github/workflows/nixpkgs-vet.yml). + +## `ci/nixpkgs-vet/update-pinned-tool.sh` + +Updates the pinned [`nixpkgs-vet` tool](https://github.com/NixOS/nixpkgs-vet) in [`ci/nixpkgs-vet/pinned-version.txt`](./nixpkgs-vet/pinned-version.txt) to the latest [release](https://github.com/NixOS/nixpkgs-vet/releases). + +Each release contains a pre-built `x86_64-linux` version of the tool which is used by CI. + +This script currently needs to be called manually when the CI tooling needs to be updated. + +Why not just build the tooling right from the PRs Nixpkgs version? + +- Because it allows CI to check all PRs, even if they would break the CI tooling. +- Because it makes the CI check very fast, since no Nix builds need to be done, even for mass rebuilds. +- Because it improves security, since we don't have to build potentially untrusted code from PRs. + The tool only needs a very minimal Nix evaluation at runtime, which can work with [readonly-mode](https://nixos.org/manual/nix/stable/command-ref/opt-common.html#opt-readonly-mode) and [restrict-eval](https://nixos.org/manual/nix/stable/command-ref/conf-file.html#conf-restrict-eval). + diff --git a/pkgs/test/check-by-name/run-local.sh b/ci/nixpkgs-vet.sh similarity index 82% rename from pkgs/test/check-by-name/run-local.sh rename to ci/nixpkgs-vet.sh index b1b662046bf3..7aabdfb6b8c5 100755 --- a/pkgs/test/check-by-name/run-local.sh +++ b/ci/nixpkgs-vet.sh @@ -61,13 +61,11 @@ trace "Done" trace -n "Merging base branch into the HEAD commit in $tmp/merged.. " git -C "$tmp/merged" merge -q --no-edit "$baseSha" trace -e "\e[34m$(git -C "$tmp/merged" rev-parse HEAD)\e[0m" - -trace -n "Reading pinned nixpkgs-check-by-name version from pinned-version.txt.. " -toolVersion=$(<"$tmp/merged/pkgs/test/check-by-name/pinned-version.txt") +trace -n "Reading pinned nixpkgs-vet version from pinned-version.txt.. " +toolVersion=$(<"$tmp/merged/ci/nixpkgs-vet/pinned-version.txt") trace -e "\e[34m$toolVersion\e[0m" trace -n "Building tool.. " -nix-build https://github.com/NixOS/nixpkgs-check-by-name/tarball/"$toolVersion" -o "$tmp/tool" -A build - -trace "Running nixpkgs-check-by-name.." -"$tmp/tool/bin/nixpkgs-check-by-name" --base "$tmp/base" "$tmp/merged" +nix-build https://github.com/NixOS/nixpkgs-vet/tarball/"$toolVersion" -o "$tmp/tool" -A build +trace "Running nixpkgs-vet.." +"$tmp/tool/bin/nixpkgs-vet" --base "$tmp/base" "$tmp/merged" diff --git a/ci/nixpkgs-vet/pinned-version.txt b/ci/nixpkgs-vet/pinned-version.txt new file mode 100644 index 000000000000..845639eef26c --- /dev/null +++ b/ci/nixpkgs-vet/pinned-version.txt @@ -0,0 +1 @@ +0.1.4 diff --git a/pkgs/test/check-by-name/update-pinned-tool.sh b/ci/nixpkgs-vet/update-pinned-tool.sh similarity index 94% rename from pkgs/test/check-by-name/update-pinned-tool.sh rename to ci/nixpkgs-vet/update-pinned-tool.sh index 7240bd597f13..78a9ae2411b8 100755 --- a/pkgs/test/check-by-name/update-pinned-tool.sh +++ b/ci/nixpkgs-vet/update-pinned-tool.sh @@ -7,7 +7,7 @@ trace() { echo >&2 "$@"; } SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd ) -repository=NixOS/nixpkgs-check-by-name +repository=NixOS/nixpkgs-vet pin_file=$SCRIPT_DIR/pinned-version.txt trace -n "Fetching latest release of $repository.. " diff --git a/maintainers/scripts/README.md b/maintainers/scripts/README.md index 1af4715b05be..2b99a4e75114 100644 --- a/maintainers/scripts/README.md +++ b/maintainers/scripts/README.md @@ -9,10 +9,6 @@ What follows is a (very incomplete) overview of available scripts. ## Metadata -### `check-by-name.sh` - -An alias for `pkgs/test/check-by-name/run-local.sh`, see [documentation](../../pkgs/test/check-by-name/README.md). - ### `get-maintainer.sh` `get-maintainer.sh [selector] value` returns a JSON object describing diff --git a/maintainers/scripts/check-by-name.sh b/maintainers/scripts/check-by-name.sh index d267ed9352a0..bb24eb6878c0 120000 --- a/maintainers/scripts/check-by-name.sh +++ b/maintainers/scripts/check-by-name.sh @@ -1 +1 @@ -../../pkgs/test/check-by-name/run-local.sh \ No newline at end of file +../../ci/nixpkgs-vet.sh \ No newline at end of file diff --git a/pkgs/by-name/README.md b/pkgs/by-name/README.md index 17214ded02c4..de21371cbffd 100644 --- a/pkgs/by-name/README.md +++ b/pkgs/by-name/README.md @@ -110,16 +110,16 @@ There's some limitations as to which packages can be defined using this structur ## Validation -CI performs [certain checks](https://github.com/NixOS/nixpkgs-check-by-name?tab=readme-ov-file#validity-checks) on the `pkgs/by-name` structure. -This is done using the [`nixpkgs-check-by-name` tool](https://github.com/NixOS/nixpkgs-check-by-name). +CI performs [certain checks](https://github.com/NixOS/nixpkgs-vet?tab=readme-ov-file#validity-checks) on the `pkgs/by-name` structure. +This is done using the [`nixpkgs-vet` tool](https://github.com/NixOS/nixpkgs-vet). You can locally emulate the CI check using ``` -$ ./maintainers/scripts/check-by-name.sh master +$ ./ci/nixpkgs-vet.sh master ``` -See [here](../../.github/workflows/check-by-name.yml) for more info. +See [here](../../.github/workflows/nixpkgs-vet.yml) for more info. ## Recommendation for new packages with multiple versions diff --git a/pkgs/test/check-by-name/README.md b/pkgs/test/check-by-name/README.md deleted file mode 100644 index 140f5951ca33..000000000000 --- a/pkgs/test/check-by-name/README.md +++ /dev/null @@ -1,31 +0,0 @@ -# `pkgs/by-name` check CI scripts - -This directory contains scripts and files used and related to the CI running the `pkgs/by-name` checks in Nixpkgs. -See also the [CI GitHub Action](../../../.github/workflows/check-by-name.yml). - -## `./run-local.sh BASE_BRANCH [REPOSITORY]` - -Runs the `pkgs/by-name` check on the HEAD commit, closely matching what CI does. - -Note that this can't do exactly the same as CI, -because CI needs to rely on GitHub's server-side Git history to compute the mergeability of PRs before the check can be started. -In turn when running locally, we don't want to have to push commits to test them, -and we can also rely on the local Git history to do the mergeability check. - -Arguments: -- `BASE_BRANCH`: The base branch to use, e.g. master or release-24.05 -- `REPOSITORY`: The repository to fetch the base branch from, defaults to https://github.com/NixOS/nixpkgs.git - -## `./update-pinned-tool.sh` - -Updates the pinned [nixpkgs-check-by-name tool](https://github.com/NixOS/nixpkgs-check-by-name) in [`./pinned-version.txt`](./pinned-version.txt) to the latest [release](https://github.com/NixOS/nixpkgs-check-by-name/releases). -Each release contains a pre-built x86_64-linux version of the tool which is used by CI. - -This script currently needs to be called manually when the CI tooling needs to be updated. - -Why not just build the tooling right from the PRs Nixpkgs version? -- Because it allows CI to check all PRs, even if they would break the CI tooling. -- Because it makes the CI check very fast, since no Nix builds need to be done, even for mass rebuilds. -- Because it improves security, since we don't have to build potentially untrusted code from PRs. - The tool only needs a very minimal Nix evaluation at runtime, which can work with [readonly-mode](https://nixos.org/manual/nix/stable/command-ref/opt-common.html#opt-readonly-mode) and [restrict-eval](https://nixos.org/manual/nix/stable/command-ref/conf-file.html#conf-restrict-eval). - From cc45e69475dedd3e97192ceef4d744a2ecfd967d Mon Sep 17 00:00:00 2001 From: Philip Taron Date: Tue, 3 Sep 2024 14:13:13 -0700 Subject: [PATCH 222/235] .github: continue finessing the text and names for nixpkgs-vet --- .github/workflows/nixpkgs-vet.yml | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/.github/workflows/nixpkgs-vet.yml b/.github/workflows/nixpkgs-vet.yml index 31bca993187c..4f244b94feff 100644 --- a/.github/workflows/nixpkgs-vet.yml +++ b/.github/workflows/nixpkgs-vet.yml @@ -1,6 +1,8 @@ -# Checks pkgs/by-name (see pkgs/by-name/README.md) using the `nixpkgs-vet` tool (see https://github.com/NixOS/nixpkgs-vet) +# `nixpkgs-vet` is a tool to vet Nixpkgs: its architecture, package structure, and more. +# Among other checks, it makes sure that `pkgs/by-name` (see `../../pkgs/by-name/README.md`) follows the validity rules outlined in [RFC 140](https://github.com/NixOS/rfcs/pull/140). # When you make changes to this workflow, please also update `ci/nixpkgs-vet.sh` to reflect the impact of your work to the CI. -name: Check pkgs/by-name +# See https://github.com/NixOS/nixpkgs-vet for details on the tool and its checks. +name: Vet nixpkgs on: # Using pull_request_target instead of pull_request avoids having to approve first time contributors. @@ -18,7 +20,7 @@ permissions: {} jobs: check: - name: pkgs-by-name-check + name: nixpkgs-vet # This needs to be x86_64-linux, because we depend on the tooling being pre-built in the GitHub releases. runs-on: ubuntu-latest # This should take 1 minute at most, but let's be generous. The default of 6 hours is definitely too long. From 699b182349e62582ce230c5b75a14ee2782ce50a Mon Sep 17 00:00:00 2001 From: Ivan Trubach Date: Wed, 4 Sep 2024 00:15:31 +0300 Subject: [PATCH 223/235] recyclarr: disable parallel building --- pkgs/by-name/re/recyclarr/package.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/by-name/re/recyclarr/package.nix b/pkgs/by-name/re/recyclarr/package.nix index 1ec4192bdd9c..2890f988870c 100644 --- a/pkgs/by-name/re/recyclarr/package.nix +++ b/pkgs/by-name/re/recyclarr/package.nix @@ -40,6 +40,8 @@ buildDotnetModule (finalAttrs: { ''; patches = [ ./001-Git-Version.patch ]; + enableParallelBuilding = false; + dotnetRestoreFlags = [ "--configfile=${nuget-config}" ]; doCheck = false; From 4b61c573e2ba83babdc7e288458bc1fca51f1680 Mon Sep 17 00:00:00 2001 From: Ivan Trubach Date: Wed, 4 Sep 2024 00:15:45 +0300 Subject: [PATCH 224/235] nexusmods-app: disable parallel building --- pkgs/by-name/ne/nexusmods-app/package.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/by-name/ne/nexusmods-app/package.nix b/pkgs/by-name/ne/nexusmods-app/package.nix index 03784eeb34c3..68f5dadc393a 100644 --- a/pkgs/by-name/ne/nexusmods-app/package.nix +++ b/pkgs/by-name/ne/nexusmods-app/package.nix @@ -25,6 +25,8 @@ buildDotnetModule (finalAttrs: { hash = "sha256-FzQphMhiC1g+6qmk/R1v4rq2ldy35NcaWm0RR1UlwLA="; }; + enableParallelBuilding = false; + # If the whole solution is published, there seems to be a race condition where # it will sometimes publish the wrong version of a dependent assembly, for # example: Microsoft.Extensions.Hosting.dll 6.0.0 instead of 8.0.0. From 583270c8efbf87a8808a60d85ac2be625a6e66d7 Mon Sep 17 00:00:00 2001 From: Ivan Trubach Date: Wed, 4 Sep 2024 00:15:55 +0300 Subject: [PATCH 225/235] ryujinx: disable parallel building --- pkgs/by-name/ry/ryujinx/package.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/by-name/ry/ryujinx/package.nix b/pkgs/by-name/ry/ryujinx/package.nix index 526c44c3312b..590b7cfc7cce 100644 --- a/pkgs/by-name/ry/ryujinx/package.nix +++ b/pkgs/by-name/ry/ryujinx/package.nix @@ -35,6 +35,8 @@ buildDotnetModule rec { sha256 = "1v8j9l2r9sz9s3jhakr3rc50hf6fbdr5cqdrjidjwvziykfckizk"; }; + enableParallelBuilding = false; + dotnet-sdk = dotnetCorePackages.sdk_8_0; dotnet-runtime = dotnetCorePackages.runtime_8_0; From aec0d148347db6e2c5a8affa648c12253ed3e5ac Mon Sep 17 00:00:00 2001 From: Silvan Mosberger Date: Tue, 3 Sep 2024 23:37:05 +0200 Subject: [PATCH 226/235] treewide: Fix or remove some markdown links Found using https://github.com/serokell/xrefcheck, which unfortunately can't trivially be enforced in CI because we also have the manual markdown files that need post-processing to be valid --- ci/README.md | 2 +- doc/README.md | 2 +- pkgs/README.md | 2 +- pkgs/applications/science/math/sage/README.md | 2 +- pkgs/development/compilers/elm/packages/README.md | 6 +++--- pkgs/development/cuda-modules/modules/README.md | 6 +++--- 6 files changed, 10 insertions(+), 10 deletions(-) diff --git a/ci/README.md b/ci/README.md index 62fffbc6e050..40c3d0ed344b 100644 --- a/ci/README.md +++ b/ci/README.md @@ -1,7 +1,7 @@ # CI support files This directory contains files to support CI, such as [GitHub Actions](https://github.com/NixOS/nixpkgs/tree/master/.github/workflows) and [Ofborg](https://github.com/nixos/ofborg). -This is in contrast with [`maintainers/scripts`](`../maintainers/scripts`) which is for human use instead. +This is in contrast with [`maintainers/scripts`](../maintainers/scripts) which is for human use instead. ## Pinned Nixpkgs diff --git a/doc/README.md b/doc/README.md index d7a853d0ec35..211f986b851d 100644 --- a/doc/README.md +++ b/doc/README.md @@ -285,7 +285,7 @@ You, as the writer of documentation, are still in charge of its content. - _optional_ attributes have a _`Default:`_ if it's easily described as a value. - _optional_ attributes have a _`Default behavior:`_ if it's not easily described using a value. - Nix types aren't in code spans, because they are not code - - Nix types are capitalized, to distinguish them from the camelCase [Module System](#module-system) types, which _are_ code and behave like functions. + - Nix types are capitalized, to distinguish them from the camelCase Module System types, which _are_ code and behave like functions. #### Examples diff --git a/pkgs/README.md b/pkgs/README.md index ab7cfd897f13..11cd07d4a598 100644 --- a/pkgs/README.md +++ b/pkgs/README.md @@ -689,7 +689,7 @@ Here are examples of package tests: - [Lobster compile test](development/compilers/lobster/test-can-run-hello-world.nix) - [Spacy annotation test](development/python-modules/spacy/annotation-test/default.nix) - [Libtorch test](development/libraries/science/math/libtorch/test/default.nix) -- [Multiple tests for nanopb](development/libraries/nanopb/default.nix) +- [Multiple tests for nanopb](./by-name/na/nanopb/package.nix) ### Linking NixOS module tests to a package diff --git a/pkgs/applications/science/math/sage/README.md b/pkgs/applications/science/math/sage/README.md index 35e8d0deeffb..94a9b0b6bc29 100644 --- a/pkgs/applications/science/math/sage/README.md +++ b/pkgs/applications/science/math/sage/README.md @@ -12,7 +12,7 @@ If the build broke as a result of a package update, try those solutions in order - search the [sage GitHub repo](https://github.com/sagemath/sage) for keywords like "Upgrade ". Maybe somebody has already proposed a patch that fixes the issue. You can then add a `fetchpatch` to `sage-src.nix`. -- check if [gentoo](https://github.com/cschwan/sage-on-gentoo/tree/master/sci-mathematics/sage), [debian](https://salsa.debian.org/science-team/sagemath/tree/master/debian) or [arch linux](https://git.archlinux.org/svntogit/community.git/tree/trunk?h=packages/sagemath) already solved the problem. You can then again add a `fetchpatch` to `sage-src.nix`. If applicable you should also [propose the patch upstream](#proposing-a-sage-patch). +- check if [gentoo](https://github.com/cschwan/sage-on-gentoo/tree/master/sci-mathematics/sage), [debian](https://salsa.debian.org/science-team/sagemath/tree/master/debian) or [arch linux](https://git.archlinux.org/svntogit/community.git/tree/trunk?h=packages/sagemath) already solved the problem. You can then again add a `fetchpatch` to `sage-src.nix`. If applicable you should also propose the patch upstream. - fix the problem yourself. First clone the sagemath source and then check out the sage version you want to patch: diff --git a/pkgs/development/compilers/elm/packages/README.md b/pkgs/development/compilers/elm/packages/README.md index 5b21736afc00..6121e816ea88 100644 --- a/pkgs/development/compilers/elm/packages/README.md +++ b/pkgs/development/compilers/elm/packages/README.md @@ -9,15 +9,15 @@ Please refer to [nix documentation](https://nixos.org/nixpkgs/manual/#how-to-cre and [cabal2nix readme](https://github.com/NixOS/cabal2nix#readme) for more information. Elm-format [update scripts](https://github.com/avh4/elm-format/tree/master/package/nix) is part of its repository. -Node dependencies are defined in [node-packages.json](node-packages.json). +Node dependencies are defined in [node-packages.json](node/node-packages.json). [Node2nix](https://github.com/svanderburg/node2nix) is used for generating nix expression -from this file. Use [generate-node-packages.sh](generate-node-packages.sh) for updates of nix expressions. +from this file. Use [generate-node-packages.sh](node/generate-node-packages.sh) for updates of nix expressions. ## Binwrap Patch Some node packages might use [binwrap](https://github.com/avh4/binwrap) typically for installing [elmi-to-json](https://github.com/stoeffel/elmi-to-json). Binwrap is not compatible with nix. -To overcome issues with those packages apply [patch-binwrap.nix](patch-binwrap.nix) which essentially does 2 things. +To overcome issues with those packages apply [patch-binwrap.nix](../lib/default.nix) which essentially does 2 things. 1. It replaces binwrap scripts with noop shell scripts 2. It uses nix for installing the binaries to expected location in `node_modules` diff --git a/pkgs/development/cuda-modules/modules/README.md b/pkgs/development/cuda-modules/modules/README.md index 7db8435c9dc8..ab56463eea59 100644 --- a/pkgs/development/cuda-modules/modules/README.md +++ b/pkgs/development/cuda-modules/modules/README.md @@ -25,11 +25,11 @@ aliases the generic module for manifests. Alternatively, additional fields or values may need to be configured to account for the particulars of a package. For example, while the release expressions for -[CUDNN](./cudnn/releases.nix) and [TensorRT](./tensorrt/releases.nix) are very +[CUDNN](../cudnn/releases.nix) and [TensorRT](../tensorrt/releases.nix) are very close, they differ slightly in the fields they have. The [module for -CUDNN](./modules/cudnn/default.nix) is able to use the generic module for +CUDNN](./cudnn/default.nix) is able to use the generic module for release expressions, while the [module for -TensorRT](./modules/tensorrt/default.nix) must add additional fields to the +TensorRT](./tensorrt/default.nix) must add additional fields to the generic module. ### `manifests` From 26a7a872936ae87a9c59747a658c44d466772249 Mon Sep 17 00:00:00 2001 From: Philip Taron Date: Tue, 3 Sep 2024 13:04:14 -0700 Subject: [PATCH 227/235] avahi: remove config.avahi This was added in 6832a42b7fbc1ef33ef464b7876e3853a2247074, which replaced an attrset with `qt4Support = config.avahi.qt4Support or false;`. As qt4 support is now out of the tree, so should this be as well. --- pkgs/development/libraries/avahi/default.nix | 4 ++++ pkgs/top-level/all-packages.nix | 6 +++--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/avahi/default.nix b/pkgs/development/libraries/avahi/default.nix index ac3db3650e76..95f82d8def2b 100644 --- a/pkgs/development/libraries/avahi/default.nix +++ b/pkgs/development/libraries/avahi/default.nix @@ -1,6 +1,7 @@ { fetchurl , fetchpatch , lib +, config , stdenv , pkg-config , libdaemon @@ -21,6 +22,9 @@ , withPython ? false }: +# Added 2024-09-03. Drop this assertion after 24.11 is released. +assert lib.assertMsg (config.avahi or {} == {}) "config.avahi has been removed; please use an overlay or services.avahi.package to configure the avahi package."; + stdenv.mkDerivation rec { pname = "avahi${lib.optionalString withLibdnssdCompat "-compat"}"; version = "0.8"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 41fc3050b5b9..fa1a6a2616e8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4029,11 +4029,11 @@ with pkgs; autorandr = callPackage ../tools/misc/autorandr { }; - avahi = callPackage ../development/libraries/avahi (config.avahi or {}); + avahi = callPackage ../development/libraries/avahi { }; - avahi-compat = callPackage ../development/libraries/avahi ((config.avahi or {}) // { + avahi-compat = callPackage ../development/libraries/avahi { withLibdnssdCompat = true; - }); + }; avro-c = callPackage ../development/libraries/avro-c { }; From 57d72fb55410914df620f12b2ff6c164d034b6f2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Tue, 3 Sep 2024 16:23:48 -0700 Subject: [PATCH 228/235] python312Packages.aioshelly: 11.4.1 -> 11.4.2 Diff: https://github.com/home-assistant-libs/aioshelly/compare/refs/tags/11.4.1...11.4.2 Changelog: https://github.com/home-assistant-libs/aioshelly/releases/tag/11.4.2 --- pkgs/development/python-modules/aioshelly/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/aioshelly/default.nix b/pkgs/development/python-modules/aioshelly/default.nix index daaacb35c0e2..3fc93a90da08 100644 --- a/pkgs/development/python-modules/aioshelly/default.nix +++ b/pkgs/development/python-modules/aioshelly/default.nix @@ -13,16 +13,16 @@ buildPythonPackage rec { pname = "aioshelly"; - version = "11.4.1"; + version = "11.4.2"; pyproject = true; - disabled = pythonOlder "3.10"; + disabled = pythonOlder "3.11"; src = fetchFromGitHub { owner = "home-assistant-libs"; repo = "aioshelly"; rev = "refs/tags/${version}"; - hash = "sha256-qT5THlz1bd222NnY9EyJ9d0IX3CmXwUKvBntsl/yV90="; + hash = "sha256-aJA+iE8cyUPrL2n72N8/HI8//h0qR6k/hgD34vpwI+0="; }; build-system = [ setuptools ]; From d37c3e56ecebf57a8145d15677680d83eded81fe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Tue, 3 Sep 2024 16:27:49 -0700 Subject: [PATCH 229/235] python312Packages.aioshelly: run tests --- pkgs/development/python-modules/aioshelly/default.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aioshelly/default.nix b/pkgs/development/python-modules/aioshelly/default.nix index 3fc93a90da08..a7d2a5349852 100644 --- a/pkgs/development/python-modules/aioshelly/default.nix +++ b/pkgs/development/python-modules/aioshelly/default.nix @@ -6,6 +6,8 @@ fetchFromGitHub, habluetooth, orjson, + pytest-asyncio, + pytestCheckHook, pythonOlder, setuptools, yarl, @@ -35,8 +37,10 @@ buildPythonPackage rec { yarl ]; - # Project has no test - doCheck = false; + nativeCheckInputs = [ + pytest-asyncio + pytestCheckHook + ]; pythonImportsCheck = [ "aioshelly" ]; From 878a46e7a7bb637a5d616ea8a410e84ad54bae81 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Tue, 3 Sep 2024 16:29:31 -0700 Subject: [PATCH 230/235] python312Packages.renault-api: 0.2.6 -> 0.2.7 Diff: https://github.com/hacf-fr/renault-api/compare/refs/tags/v0.2.6...v0.2.7 Changelog: https://github.com/hacf-fr/renault-api/releases/tag/v0.2.7 --- pkgs/development/python-modules/renault-api/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/renault-api/default.nix b/pkgs/development/python-modules/renault-api/default.nix index ec46ea720f4d..5a932562f573 100644 --- a/pkgs/development/python-modules/renault-api/default.nix +++ b/pkgs/development/python-modules/renault-api/default.nix @@ -19,16 +19,16 @@ buildPythonPackage rec { pname = "renault-api"; - version = "0.2.6"; + version = "0.2.7"; pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "hacf-fr"; repo = "renault-api"; rev = "refs/tags/v${version}"; - hash = "sha256-opxEQIpZkaSWglPh4gwLJIi89B/ooHlwc9nKZRIS/j8="; + hash = "sha256-tke2bE+djV1N70meMOytYmbPmYDN8fU+Da81Mf6nNAI="; }; build-system = [ poetry-core ]; From 0523d7864b4cedf14656b46dcc5bfc2154d7d8b4 Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Wed, 4 Sep 2024 01:46:32 +0200 Subject: [PATCH 231/235] duckstation: Fix build on aarch64-linux /build/source/src/util/audio_stream.cpp: In function 'void S16ChunkToFloat(const s16*, float*, u32)': /build/source/src/util/audio_stream.cpp:575:47: note: use '-flax-vector-conversions' to permit conversions between vectors with differing element types or numbers of subparts /build/source/src/util/audio_stream.cpp:575:57: error: cannot convert 'int16x8_t' to '__Int32x4_t' --- pkgs/by-name/du/duckstation/package.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/by-name/du/duckstation/package.nix b/pkgs/by-name/du/duckstation/package.nix index 453d272458e2..4b96fc1707b2 100644 --- a/pkgs/by-name/du/duckstation/package.nix +++ b/pkgs/by-name/du/duckstation/package.nix @@ -76,6 +76,9 @@ stdenv.mkDerivation (finalAttrs: { substituteAllInPlace src/scmversion/gen_scmversion.sh ''; + # error: cannot convert 'int16x8_t' to '__Int32x4_t' + env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isAarch64 "-flax-vector-conversions"; + installCheckPhase = '' runHook preCheck From 1f7e8091666d506cec7a1384cbbc5f018f2174cb Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 3 Sep 2024 22:04:10 +0200 Subject: [PATCH 232/235] buildMozillaMach: update patches - Drop nvidia wayland patches - Retarget cbindgen patch for version 129 and versions before 128 --- .../networking/browsers/firefox/common.nix | 20 +------------------ 1 file changed, 1 insertion(+), 19 deletions(-) diff --git a/pkgs/applications/networking/browsers/firefox/common.nix b/pkgs/applications/networking/browsers/firefox/common.nix index 15d958a3607f..f5501f7d9de5 100644 --- a/pkgs/applications/networking/browsers/firefox/common.nix +++ b/pkgs/applications/networking/browsers/firefox/common.nix @@ -237,7 +237,7 @@ buildStdenv.mkDerivation { patches = lib.optionals (lib.versionAtLeast version "111") [ ./env_var_for_system_dir-ff111.patch ] ++ lib.optionals (lib.versionAtLeast version "96" && lib.versionOlder version "121") [ ./no-buildconfig-ffx96.patch ] ++ lib.optionals (lib.versionAtLeast version "121") [ ./no-buildconfig-ffx121.patch ] - ++ lib.optionals (lib.versionOlder version "131") [ + ++ lib.optionals (lib.versionOlder version "128" || (lib.versionAtLeast version "129" && lib.versionOlder version "130")) [ (fetchpatch { # https://bugzilla.mozilla.org/show_bug.cgi?id=1912663 name = "cbindgen-0.27.0-compat.patch"; @@ -245,24 +245,6 @@ buildStdenv.mkDerivation { hash = "sha256-MqgWHgbDedVzDOqY2/fvCCp+bGwFBHqmaJLi/mllZug="; }) ] - ++ lib.optionals (lib.versionOlder version "130" && lib.versionAtLeast version "128") [ - # https://bugzilla.mozilla.org/show_bug.cgi?id=1898476 - (fetchpatch { - name = "mozbz-1898476-1.patch"; - url = "https://hg.mozilla.org/mozilla-central/raw-rev/f9323daf7abe"; - hash = "sha256-fvIowXJLWnm16LeiSz6EasGypTi1ilG+s/T6+lNLbMQ="; - }) - (fetchpatch { - name = "mozbz-1898476-2.patch"; - url = "https://hg.mozilla.org/mozilla-central/raw-rev/a264ff9e9f6f"; - hash = "sha256-9vkI/Ho4BXvLnoRGdfTzUODcIlA6K3RjbdhZjb/LEz0="; - }) - (fetchpatch { - name = "mozbz-1898476-3.patch"; - url = "https://hg.mozilla.org/mozilla-central/raw-rev/eb230ecdf8eb"; - hash = "sha256-IaLltxf5W1WEzxvbi10wphqXVQPtBiLc2zlk38CIiz4="; - }) - ] ++ lib.optionals (lib.versionOlder version "122") [ ./bindgen-0.64-clang-18.patch ] ++ lib.optionals (lib.versionOlder version "123") [ (fetchpatch { From 82988f7ed5473fc38872837cbe8ff7f974c1a97e Mon Sep 17 00:00:00 2001 From: Fernando Rodrigues Date: Wed, 4 Sep 2024 00:36:45 +0000 Subject: [PATCH 233/235] simple-dlna-browser: remove loveisgrief from maintainers LoveIsGrief has requested to be removed from Nixpkgs in #339089. Signed-off-by: Fernando Rodrigues --- pkgs/tools/networking/simple-dlna-browser/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/networking/simple-dlna-browser/default.nix b/pkgs/tools/networking/simple-dlna-browser/default.nix index ae6ccc4a4aaa..1ae74f90761c 100644 --- a/pkgs/tools/networking/simple-dlna-browser/default.nix +++ b/pkgs/tools/networking/simple-dlna-browser/default.nix @@ -62,7 +62,7 @@ stdenv.mkDerivation { ''; homepage = "https://github.com/javier-lopez/learn/blob/master/sh/tools/simple-dlna-browser"; license = lib.licenses.fair; - maintainers = with lib.maintainers; [ loveisgrief ]; + maintainers = with lib.maintainers; [ ]; }; } From ecedb9315aa1fe6a3340f0264ed6a7b6fe689ebf Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 4 Sep 2024 02:50:53 +0200 Subject: [PATCH 234/235] buildMozillaMach: apply cbindgen patches for 128.1.x Unbreaks Thunderbird, which has not yet received an update. --- pkgs/applications/networking/browsers/firefox/common.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/networking/browsers/firefox/common.nix b/pkgs/applications/networking/browsers/firefox/common.nix index f5501f7d9de5..3787c618a6aa 100644 --- a/pkgs/applications/networking/browsers/firefox/common.nix +++ b/pkgs/applications/networking/browsers/firefox/common.nix @@ -237,7 +237,7 @@ buildStdenv.mkDerivation { patches = lib.optionals (lib.versionAtLeast version "111") [ ./env_var_for_system_dir-ff111.patch ] ++ lib.optionals (lib.versionAtLeast version "96" && lib.versionOlder version "121") [ ./no-buildconfig-ffx96.patch ] ++ lib.optionals (lib.versionAtLeast version "121") [ ./no-buildconfig-ffx121.patch ] - ++ lib.optionals (lib.versionOlder version "128" || (lib.versionAtLeast version "129" && lib.versionOlder version "130")) [ + ++ lib.optionals (lib.versionOlder version "128.2" || (lib.versionAtLeast version "129" && lib.versionOlder version "130")) [ (fetchpatch { # https://bugzilla.mozilla.org/show_bug.cgi?id=1912663 name = "cbindgen-0.27.0-compat.patch"; From 7e2831e2ba846afa719dfb4e1cce49169e4a5af0 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 4 Sep 2024 03:41:09 +0000 Subject: [PATCH 235/235] artalk: 2.8.7 -> 2.9.0 --- pkgs/by-name/ar/artalk/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ar/artalk/package.nix b/pkgs/by-name/ar/artalk/package.nix index a9918059d6ad..959bea5cd3b1 100644 --- a/pkgs/by-name/ar/artalk/package.nix +++ b/pkgs/by-name/ar/artalk/package.nix @@ -11,13 +11,13 @@ }: buildGoModule rec { pname = "artalk"; - version = "2.8.7"; + version = "2.9.0"; src = fetchFromGitHub { owner = "ArtalkJS"; repo = "artalk"; rev = "refs/tags/v${version}"; - hash = "sha256-fOuZiFomXGvRUXkpEM3BpJyMOtSm6/RHd0a7dPOsoT4="; + hash = "sha256-5tUUlkGeT4kY/81EQ29M6z+JnBT4YCa8gecbV9WMuDo="; }; web = fetchurl { url = "https://github.com/${src.owner}/${src.repo}/releases/download/v${version}/artalk_ui.tar.gz"; @@ -26,7 +26,7 @@ buildGoModule rec { CGO_ENABLED = 1; - vendorHash = "sha256-Hm388ub/ja3PuSRqPkr6A+pgKUQ+czMj1WKU8W8H5wI="; + vendorHash = "sha256-edqmv/Q99pgnScJqCmLwjHd7uKMNPGfCSujNTUQtpLc="; ldflags = [ "-s"