diff --git a/lib/generators.nix b/lib/generators.nix index 4ecbdac3c125..c46ecca58c68 100644 --- a/lib/generators.nix +++ b/lib/generators.nix @@ -434,6 +434,7 @@ ${expr "" v} Configuration: * multiline - by default is true which results in indented block-like view. * indent - initial indent. + * asBindings - by default generate single value, but with this use attrset to set global vars. Attention: Regardless of multiline parameter there is no trailing newline. @@ -464,18 +465,35 @@ ${expr "" v} /* If this option is true, the output is indented with newlines for attribute sets and lists */ multiline ? true, /* Initial indentation level */ - indent ? "" + indent ? "", + /* Interpret as variable bindings */ + asBindings ? false, }@args: v: with builtins; let innerIndent = "${indent} "; introSpace = if multiline then "\n${innerIndent}" else " "; outroSpace = if multiline then "\n${indent}" else " "; - innerArgs = args // { indent = innerIndent; }; + innerArgs = args // { + indent = if asBindings then indent else innerIndent; + asBindings = false; + }; concatItems = concatStringsSep ",${introSpace}"; isLuaInline = { _type ? null, ... }: _type == "lua-inline"; + + generatedBindings = + assert lib.assertMsg (badVarNames == []) "Bad Lua var names: ${toPretty {} badVarNames}"; + libStr.concatStrings ( + lib.attrsets.mapAttrsToList (key: value: "${indent}${key} = ${toLua innerArgs value}\n") v + ); + + # https://en.wikibooks.org/wiki/Lua_Programming/variable#Variable_names + matchVarName = match "[[:alpha:]_][[:alnum:]_]*(\\.[[:alpha:]_][[:alnum:]_]*)*"; + badVarNames = filter (name: matchVarName name == null) (attrNames v); in - if v == null then + if asBindings then + generatedBindings + else if v == null then "nil" else if isInt v || isFloat v || isString v || isBool v then builtins.toJSON v diff --git a/lib/tests/misc.nix b/lib/tests/misc.nix index 49336b8b9630..ea3548b9514e 100644 --- a/lib/tests/misc.nix +++ b/lib/tests/misc.nix @@ -4,6 +4,11 @@ with import ../default.nix; let + testingThrow = expr: { + expr = (builtins.tryEval (builtins.seq expr "didn't throw")); + expected = { success = false; value = false; }; + }; + testingDeepThrow = expr: testingThrow (builtins.deepSeq expr expr); testSanitizeDerivationName = { name, expected }: let @@ -962,6 +967,41 @@ runTests { expected = ''{ 41, 43 }''; }; + testToLuaEmptyBindings = { + expr = generators.toLua { asBindings = true; } {}; + expected = ""; + }; + + testToLuaBindings = { + expr = generators.toLua { asBindings = true; } { x1 = 41; _y = { a = 43; }; }; + expected = '' + _y = { + ["a"] = 43 + } + x1 = 41 + ''; + }; + + testToLuaPartialTableBindings = { + expr = generators.toLua { asBindings = true; } { "x.y" = 42; }; + expected = '' + x.y = 42 + ''; + }; + + testToLuaIndentedBindings = { + expr = generators.toLua { asBindings = true; indent = " "; } { x = { y = 42; }; }; + expected = " x = {\n [\"y\"] = 42\n }\n"; + }; + + testToLuaBindingsWithSpace = testingThrow ( + generators.toLua { asBindings = true; } { "with space" = 42; } + ); + + testToLuaBindingsWithLeadingDigit = testingThrow ( + generators.toLua { asBindings = true; } { "11eleven" = 42; } + ); + testToLuaBasicExample = { expr = generators.toLua {} { cmd = [ "typescript-language-server" "--stdio" ]; diff --git a/nixos/modules/services/monitoring/datadog-agent.nix b/nixos/modules/services/monitoring/datadog-agent.nix index 15deef18b60f..58a0faed962c 100644 --- a/nixos/modules/services/monitoring/datadog-agent.nix +++ b/nixos/modules/services/monitoring/datadog-agent.nix @@ -235,7 +235,7 @@ in { systemd.services = let makeService = attrs: recursiveUpdate { - path = [ datadogPkg pkgs.python pkgs.sysstat pkgs.procps pkgs.iproute2 ]; + path = [ datadogPkg pkgs.sysstat pkgs.procps pkgs.iproute2 ]; wantedBy = [ "multi-user.target" ]; serviceConfig = { User = "datadog"; diff --git a/pkgs/applications/editors/gnome-builder/default.nix b/pkgs/applications/editors/gnome-builder/default.nix index 2e43f8b66eea..09684c7359f1 100644 --- a/pkgs/applications/editors/gnome-builder/default.nix +++ b/pkgs/applications/editors/gnome-builder/default.nix @@ -41,13 +41,13 @@ stdenv.mkDerivation rec { pname = "gnome-builder"; - version = "44.1"; + version = "44.2"; outputs = [ "out" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "+Tmn+VtLbh0EvY20vpygtnsqp2W4bGP03yP9s6ftzz4="; + sha256 = "z6aJx40/AiMcp0cVV99MZIKASio08nHDXRqWLX8XKbA="; }; patches = [ diff --git a/pkgs/applications/graphics/veusz/default.nix b/pkgs/applications/graphics/veusz/default.nix index cb57f87fc662..1ef77cbe4f1b 100644 --- a/pkgs/applications/graphics/veusz/default.nix +++ b/pkgs/applications/graphics/veusz/default.nix @@ -6,14 +6,18 @@ python3Packages.buildPythonApplication rec { pname = "veusz"; - version = "3.3.1"; + version = "3.6.2"; src = python3Packages.fetchPypi { inherit pname version; - sha256 = "4ClgYwiU21wHDve2q9cItSAVb9hbR2F+fJc8znGI8OA="; + sha256 = "whcaxF5LMEJNj8NSYeLpnb5uJboRl+vCQ1WxBrJjldE="; }; - nativeBuildInputs = [ wrapQtAppsHook python3Packages.sip_4 ]; + nativeBuildInputs = [ + wrapQtAppsHook + python3Packages.sip + python3Packages.tomli + ]; buildInputs = [ qtbase ]; @@ -24,22 +28,17 @@ python3Packages.buildPythonApplication rec { wrapQtApp "$out/bin/veusz" ''; - # Since sip 6 (we use sip 4 here, but pyqt5 is built with sip 6), sip files are - # placed in a different directory layout and --sip-dir won't work anymore. - # --sip-dir expects a directory with a PyQt5 subdirectory (where sip files are located), - # but the new directory layout places sip files in a subdirectory named 'bindings'. - # To workaround this, we patch the full path into pyqtdistutils.py. + # pyqt_setuptools.py uses the platlib path from sysconfig, but NixOS doesn't + # really have a corresponding path, so patching the location of PyQt5 inplace postPatch = '' - substituteInPlace pyqtdistutils.py \ - --replace "'-I', pyqt5_include_dir," "'-I', '${python3Packages.pyqt5}/${python3Packages.python.sitePackages}/PyQt5/bindings'," + substituteInPlace pyqt_setuptools.py \ + --replace "get_path('platlib')" "'${python3Packages.pyqt5}/${python3Packages.python.sitePackages}'" patchShebangs tests/runselftest.py ''; # you can find these options at # https://github.com/veusz/veusz/blob/53b99dffa999f2bc41fdc5335d7797ae857c761f/pyqtdistutils.py#L71 - # --sip-dir cannot be used here for the reasons explained above setupPyBuildFlags = [ - "--qt-include-dir=${qtbase.dev}/include" # veusz tries to find a libinfix and fails without one # but we simply don't need a libinfix, so set it to empty here "--qt-libinfix=" diff --git a/pkgs/applications/misc/ausweisapp2/default.nix b/pkgs/applications/misc/ausweisapp2/default.nix index c7ee1885686b..525ab9788c51 100644 --- a/pkgs/applications/misc/ausweisapp2/default.nix +++ b/pkgs/applications/misc/ausweisapp2/default.nix @@ -3,13 +3,13 @@ mkDerivation rec { pname = "AusweisApp2"; - version = "1.26.3"; + version = "1.26.4"; src = fetchFromGitHub { owner = "Governikus"; repo = "AusweisApp2"; rev = version; - hash = "sha256-YI9/rMoe5Waw2e/tObvu+wi9dkmhEoG9v3ZQzkn4QH4="; + hash = "sha256-l/sPqXkr4rSMEbPi/ahl/74RYqNrjcb28v6/scDrh1w="; }; nativeBuildInputs = [ cmake pkg-config ]; diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix index e6dcf83e3f3e..d699b8c49d4b 100644 --- a/pkgs/applications/networking/browsers/chromium/common.nix +++ b/pkgs/applications/networking/browsers/chromium/common.nix @@ -55,7 +55,7 @@ buildFun: let - python3WithPackages = python3.withPackages(ps: with ps; [ + python3WithPackages = python3.pythonForBuild.withPackages(ps: with ps; [ ply jinja2 setuptools ]); clangFormatPython3 = fetchurl { @@ -129,6 +129,7 @@ let python3WithPackages perl which llvmPackages.bintools + bison gperf ]; buildInputs = [ @@ -142,7 +143,7 @@ let nasm nspr nss util-linux alsa-lib - bison gperf libkrb5 + libkrb5 glib gtk3 dbus-glib libXScrnSaver libXcursor libXtst libxshmfence libGLU libGL mesa # required for libgbm @@ -314,7 +315,7 @@ let # This is to ensure expansion of $out. libExecPath="${libExecPath}" - ${python3}/bin/python3 build/linux/unbundle/replace_gn_files.py --system-libraries ${toString gnSystemLibraries} + ${python3.pythonForBuild}/bin/python3 build/linux/unbundle/replace_gn_files.py --system-libraries ${toString gnSystemLibraries} ${gnChromium}/bin/gn gen --args=${lib.escapeShellArg gnFlags} out/Release | tee gn-gen-outputs.txt # Fail if `gn gen` contains a WARNING. diff --git a/pkgs/applications/version-management/git-cola/default.nix b/pkgs/applications/version-management/git-cola/default.nix index e9959cd42dee..d84e61735811 100644 --- a/pkgs/applications/version-management/git-cola/default.nix +++ b/pkgs/applications/version-management/git-cola/default.nix @@ -2,22 +2,16 @@ python3Packages.buildPythonApplication rec { pname = "git-cola"; - version = "4.1.0"; + version = "4.2.1"; src = fetchFromGitHub { owner = "git-cola"; repo = "git-cola"; rev = "refs/tags/v${version}"; - hash = "sha256-s+acQo9b+ZQ31qXBf0m8ajXYuYEQzNybmX9nw+c0DQY="; + hash = "sha256-VAn4zXypOugPIVyXQ/8Yt0rCDM7hVdIY+jpmoTHqssU="; }; - # TODO: remove in the next release since upstream removed pytest-flake8 - # https://github.com/git-cola/git-cola/commit/6c5c5c6c888ee1a095fc1ca5521af9a03b833205 - postPatch = '' - substituteInPlace pytest.ini \ - --replace "--flake8" "" - ''; - + buildInputs = [ qt5.qtwayland ]; propagatedBuildInputs = with python3Packages; [ git pyqt5 qtpy send2trash ]; nativeBuildInputs = [ gettext qt5.wrapQtAppsHook ]; nativeCheckInputs = with python3Packages; [ git pytestCheckHook ]; diff --git a/pkgs/applications/video/youtube-tui/default.nix b/pkgs/applications/video/youtube-tui/default.nix index 1ecea6c32183..89a0848ce108 100644 --- a/pkgs/applications/video/youtube-tui/default.nix +++ b/pkgs/applications/video/youtube-tui/default.nix @@ -15,16 +15,16 @@ rustPlatform.buildRustPackage rec { pname = "youtube-tui"; - version = "0.7.0"; + version = "0.7.1"; src = fetchFromGitHub { owner = "Siriusmart"; repo = pname; rev = "v${version}"; - hash = "sha256-YQj+hmNh8rqP7bKeFDQhZIf79WG7vqg31oReb0jrmg4="; + hash = "sha256-Dhdtdc8LmTeg9cxKPfdxRowTsAaJXKtvJXqJHK1t3P4="; }; - cargoHash = "sha256-qcWuh8qaOQBBebdX3D01k5yXZfifbFC+ZP0d6bJeOr0="; + cargoHash = "sha256-hT3Ygn0zcQdU1iU22e5SP5ZF6S6GiZzWieBsCqViN8Y="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/applications/window-managers/i3/cycle-focus.nix b/pkgs/applications/window-managers/i3/cycle-focus.nix new file mode 100644 index 000000000000..180b074118ca --- /dev/null +++ b/pkgs/applications/window-managers/i3/cycle-focus.nix @@ -0,0 +1,26 @@ +{ lib +, fetchFromGitHub +, rustPlatform +}: + +rustPlatform.buildRustPackage { + pname = "i3-cycle-focus"; + version = "unstable-2021-09-27"; + + src = fetchFromGitHub { + owner = "TheDoctor314"; + repo = "i3-cycle-focus"; + rev = "d94f22e4b8502de4ed846a211fa0c8418b3e3e89"; + hash = "sha256-caZKvxOqoYgPs+Zjltj8K0/ospjkLnA4kh0rsTjeU3Y="; + }; + + cargoHash = "sha256-9glaxThm/ovgvUWCyrycS/Oe5t8iN5P38fF5vO5awQE="; + + meta = with lib; { + description = "A simple tool to cyclically switch between the windows on the active workspace"; + homepage = "https://github.com/TheDoctor314/i3-cycle-focus"; + license = licenses.unlicense; + maintainers = with maintainers; [ GaetanLepage ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/data/fonts/iosevka/default.nix b/pkgs/data/fonts/iosevka/default.nix index 6f974d078b02..ac798c8609c5 100644 --- a/pkgs/data/fonts/iosevka/default.nix +++ b/pkgs/data/fonts/iosevka/default.nix @@ -55,16 +55,16 @@ assert (extraParameters != null) -> set != null; buildNpmPackage rec { pname = if set != null then "iosevka-${set}" else "iosevka"; - version = "22.0.2"; + version = "22.1.0"; src = fetchFromGitHub { owner = "be5invis"; repo = "iosevka"; rev = "v${version}"; - hash = "sha256-cBIcf6GEJnkOvKPMWTb9dWqN9uPs4ynr6tLc7+B6f3k="; + hash = "sha256-aq8IKWGOOYf83ed5Z10/B+42SsI7JY5ED3AwAlk/24k="; }; - npmDepsHash = "sha256-tLdJuDFVPdnEtHdGdU7G6N+LIiINVVB5/NNFaeveK/U="; + npmDepsHash = "sha256-6zt7q5aGb6jaa6YBr4HqawZjf2jqNnR9xQM/abKpT04="; nativeBuildInputs = [ remarshal diff --git a/pkgs/desktops/xfce/core/thunar/default.nix b/pkgs/desktops/xfce/core/thunar/default.nix index d5ff7b99f4d6..f9e8c86b6310 100644 --- a/pkgs/desktops/xfce/core/thunar/default.nix +++ b/pkgs/desktops/xfce/core/thunar/default.nix @@ -21,9 +21,9 @@ let unwrapped = mkXfceDerivation { category = "xfce"; pname = "thunar"; - version = "4.18.4"; + version = "4.18.6"; - sha256 = "sha256-tdk0sWUzTmYXk+dOPVOpjmODpqmhzQc9jAOCk2+yNKM="; + sha256 = "sha256-7SWpIBGm/YhnQSWYi5BgYjx8WCiEqxZRTagz/cY0p3E="; nativeBuildInputs = [ docbook_xsl diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-mpc-plugin/default.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-mpc-plugin/default.nix index fa681dba7bba..6a1a750096f9 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-mpc-plugin/default.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-mpc-plugin/default.nix @@ -1,17 +1,27 @@ -{ lib, stdenv, fetchurl, pkg-config, intltool, libxfce4util, xfce4-panel, - libxfce4ui, gtk3, exo, gitUpdater }: +{ lib +, stdenv +, fetchurl +, pkg-config +, intltool +, libxfce4util +, xfce4-panel +, libxfce4ui +, glib +, gtk3 +, gitUpdater +}: let category = "panel-plugins"; in stdenv.mkDerivation rec { - pname = "xfce4-mpc-plugin"; - version = "0.5.2"; + pname = "xfce4-mpc-plugin"; + version = "0.5.3"; src = fetchurl { url = "mirror://xfce/src/${category}/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.bz2"; - sha256 = "sha256-7v54t7a5UxKzpSgUt/Yy3JKXDBs+lTXeYWMVdJv2d2A="; + sha256 = "sha256-BGf7TRrNmC08PguJy0EBmUaFBST/Ge0PZYqNVse3Zk0="; }; nativeBuildInputs = [ @@ -23,8 +33,8 @@ stdenv.mkDerivation rec { libxfce4util libxfce4ui xfce4-panel + glib gtk3 - exo ]; passthru.updateScript = gitUpdater { diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-netload-plugin/default.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-netload-plugin/default.nix index 2720520a047b..e1baf7137e4b 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-netload-plugin/default.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-netload-plugin/default.nix @@ -1,14 +1,27 @@ -{ lib, mkXfceDerivation, gtk3, libxfce4ui, libxfce4util, xfce4-panel, xfconf }: +{ lib +, mkXfceDerivation +, glib +, gtk3 +, libxfce4ui +, libxfce4util +, xfce4-panel +}: mkXfceDerivation { category = "panel-plugins"; pname = "xfce4-netload-plugin"; - version = "1.4.0"; + version = "1.4.1"; rev-prefix = "xfce4-netload-plugin-"; odd-unstable = false; - sha256 = "sha256-HasaMymMCPidYkaAUK4gvD+Ka7NJdFOTeq43gJ1G3jo="; + sha256 = "sha256-PwbyYi9EeSTKilVXlbseY2zkabcL7o2CGnk2DFFVI94="; - buildInputs = [ gtk3 libxfce4ui libxfce4util xfce4-panel xfconf ]; + buildInputs = [ + glib + gtk3 + libxfce4ui + libxfce4util + xfce4-panel + ]; meta = with lib; { description = "Internet load speed plugin for Xfce4 panel"; diff --git a/pkgs/development/compilers/gcc/12/default.nix b/pkgs/development/compilers/gcc/12/default.nix index a3e8faaed460..483ac2024402 100644 --- a/pkgs/development/compilers/gcc/12/default.nix +++ b/pkgs/development/compilers/gcc/12/default.nix @@ -56,7 +56,7 @@ with builtins; let majorVersion = "12"; version = "${majorVersion}.2.0"; - disableBootstrap = !stdenv.hostPlatform.isDarwin; + disableBootstrap = !stdenv.hostPlatform.isDarwin && !profiledCompiler; inherit (stdenv) buildPlatform hostPlatform targetPlatform; @@ -288,6 +288,8 @@ lib.pipe (stdenv.mkDerivation ({ targetConfig = if targetPlatform != hostPlatform then targetPlatform.config else null; buildFlags = + # we do not yet have Nix-driven profiling + assert profiledCompiler -> !disableBootstrap; let target = lib.optionalString (profiledCompiler) "profiled" + lib.optionalString (targetPlatform == hostPlatform && hostPlatform == buildPlatform && !disableBootstrap) "bootstrap"; diff --git a/pkgs/development/libraries/gdcm/default.nix b/pkgs/development/libraries/gdcm/default.nix index c01910e3f39f..d844def1f9bc 100644 --- a/pkgs/development/libraries/gdcm/default.nix +++ b/pkgs/development/libraries/gdcm/default.nix @@ -26,6 +26,7 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DGDCM_BUILD_APPLICATIONS=ON" "-DGDCM_BUILD_SHARED_LIBS=ON" + "-DGDCM_BUILD_TESTING=ON" # hack around usual "`RUNTIME_DESTINATION` must not be an absolute path" issue: "-DCMAKE_INSTALL_LIBDIR=lib" "-DCMAKE_INSTALL_BINDIR=bin" @@ -47,6 +48,28 @@ stdenv.mkDerivation rec { libiconv ] ++ lib.optionals enablePython [ swig python ]; + disabledTests = [ + # require networking: + "TestEcho" + "TestFind" + "gdcmscu-echo-dicomserver" + "gdcmscu-find-dicomserver" + # seemingly ought to be be disabled when the test data submodule is not present: + "TestvtkGDCMImageReader2_3" + "TestSCUValidation" + # errors because 3 classes not wrapped: + "TestWrapPython" + ]; + + checkPhase = '' + runHook preCheck + ctest --exclude-regex '^(${lib.concatStringsSep "|" disabledTests})$' + runHook postCheck + ''; + doCheck = true; + # note that when the test data is available to the build via `fetchSubmodules = true`, + # a number of additional but much slower tests are enabled + meta = with lib; { description = "The grassroots cross-platform DICOM implementation"; longDescription = '' diff --git a/pkgs/development/libraries/vulkan-headers/update.sh b/pkgs/development/libraries/vulkan-headers/update.sh index 9857af699e2f..b61be25ca2e7 100755 --- a/pkgs/development/libraries/vulkan-headers/update.sh +++ b/pkgs/development/libraries/vulkan-headers/update.sh @@ -1,23 +1,29 @@ #!/usr/bin/env nix-shell -#!nix-shell -i bash -p curl jq nix-update +#!nix-shell -i bash -p nix-update set -euf -o pipefail -NEW_VERSION=$(curl https://vulkan.lunarg.com/sdk/latest/linux.json | jq -r '.linux') - -VULKAN_SDK_PACKAGES=( +V_PACKAGES=( "vulkan-headers" - "spirv-headers" - "glslang" "vulkan-loader" "spirv-tools" - "spirv-cross" "vulkan-validation-layers" "vulkan-tools" "vulkan-tools-lunarg" "vulkan-extension-layer" ) -for P in "${VULKAN_SDK_PACKAGES[@]}"; do - nix-update "$P" --version "$NEW_VERSION" --commit +SDK_PACKAGES=( + "spirv-headers" + "spirv-cross" +) + +nix-update glslang --version-regex '(\d+\.\d+\.\d+)' --commit + +for P in "${V_PACKAGES[@]}"; do + nix-update "$P" --version-regex "(?:v)(.*)" --commit +done + +for P in "${SDK_PACKAGES[@]}"; do + nix-update "$P" --version-regex "(?:sdk-)(.*)" --commit done diff --git a/pkgs/development/lua-modules/lib.nix b/pkgs/development/lua-modules/lib.nix index 92d483d7f085..bdf363fb4799 100644 --- a/pkgs/development/lua-modules/lib.nix +++ b/pkgs/development/lua-modules/lib.nix @@ -1,5 +1,6 @@ { pkgs, lib, lua }: let + inherit (lib.generators) toLua; requiredLuaModules = drvs: with lib; let modules = filter hasLuaModule drvs; in unique ([lua] ++ modules ++ concatLists (catAttrs "requiredLuaModules" modules)); @@ -88,58 +89,50 @@ rec { , rocksSubdir }: let rocksTrees = lib.imap0 - (i: dep: "{ name = [[dep-${toString i}]], root = '${dep}', rocks_dir = '${dep}/${dep.rocksSubdir}' }") + (i: dep: { name = "dep-${toString i}"; root = "${dep}"; rocks_dir = "${dep}/${dep.rocksSubdir}"; }) requiredLuaRocks; # Explicitly point luarocks to the relevant locations for multiple-output # derivations that are external dependencies, to work around an issue it has # (https://github.com/luarocks/luarocks/issues/766) - depVariables = lib.concatMap ({name, dep}: [ - "${name}_INCDIR='${lib.getDev dep}/include';" - "${name}_LIBDIR='${lib.getLib dep}/lib';" - "${name}_BINDIR='${lib.getBin dep}/bin';" - ]) externalDeps'; + depVariables = zipAttrsWithLast (lib.lists.map ({name, dep}: { + "${name}_INCDIR" = "${lib.getDev dep}/include"; + "${name}_LIBDIR" = "${lib.getLib dep}/lib"; + "${name}_BINDIR" = "${lib.getBin dep}/bin"; + }) externalDeps'); + zipAttrsWithLast = lib.attrsets.zipAttrsWith (name: lib.lists.last); # example externalDeps': [ { name = "CRYPTO"; dep = pkgs.openssl; } ] externalDeps' = lib.filter (dep: !lib.isDerivation dep) externalDeps; externalDepsDirs = map - (x: "'${builtins.toString x}'") + (x: builtins.toString x) (lib.filter (lib.isDerivation) externalDeps); - - extraVariablesStr = lib.concatStringsSep "\n " - (lib.mapAttrsToList (k: v: "${k}='${v}';") extraVariables); - in '' - local_cache = "" - -- To prevent collisions when creating environments, we install the rock - -- files into per-package subdirectories - rocks_subdir = '${rocksSubdir}' - -- first tree is the default target where new rocks are installed, - -- any other trees in the list are treated as additional sources of installed rocks for matching dependencies. - rocks_trees = { - {name = "current", root = '${placeholder "out"}', rocks_dir = "current" }, - ${lib.concatStringsSep "\n, " rocksTrees} - } - '' + lib.optionalString lua.pkgs.isLuaJIT '' - -- Luajit provides some additional functionality built-in; this exposes - -- that to luarock's dependency system + in toLua { asBindings = true; } ({ + local_cache = ""; + # To prevent collisions when creating environments, we install the rock + # files into per-package subdirectories + rocks_subdir = rocksSubdir; + # first tree is the default target where new rocks are installed, + # any other trees in the list are treated as additional sources of installed rocks for matching dependencies. + rocks_trees = ( + [{name = "current"; root = "${placeholder "out"}"; rocks_dir = "current"; }] ++ + rocksTrees + ); + } // lib.optionalAttrs lua.pkgs.isLuaJIT { + # Luajit provides some additional functionality built-in; this exposes + # that to luarock's dependency system rocks_provided = { - jit='${lua.luaversion}-1'; - ffi='${lua.luaversion}-1'; - luaffi='${lua.luaversion}-1'; - bit='${lua.luaversion}-1'; - } - '' + '' - -- For single-output external dependencies - external_deps_dirs = { - ${lib.concatStringsSep "\n, " externalDepsDirs} - } - variables = { - -- Some needed machinery to handle multiple-output external dependencies, - -- as per https://github.com/luarocks/luarocks/issues/766 - ${lib.optionalString (lib.length depVariables > 0) '' - ${lib.concatStringsSep "\n " depVariables}''} - ${extraVariablesStr} - } - ''; + jit = "${lua.luaversion}-1"; + ffi = "${lua.luaversion}-1"; + luaffi = "${lua.luaversion}-1"; + bit = "${lua.luaversion}-1"; + }; + } // { + # For single-output external dependencies + external_deps_dirs = externalDepsDirs; + # Some needed machinery to handle multiple-output external dependencies, + # as per https://github.com/luarocks/luarocks/issues/766 + variables = (depVariables // extraVariables); + }); } diff --git a/pkgs/development/ocaml-modules/postgresql/default.nix b/pkgs/development/ocaml-modules/postgresql/default.nix index d87f6b39efb8..4140baa675cb 100644 --- a/pkgs/development/ocaml-modules/postgresql/default.nix +++ b/pkgs/development/ocaml-modules/postgresql/default.nix @@ -17,6 +17,7 @@ buildDunePackage rec { nativeBuildInputs = [ postgresql ]; buildInputs = [ dune-configurator ]; + propagatedBuildInputs = [ postgresql ]; meta = { description = "Bindings to the PostgreSQL library"; diff --git a/pkgs/development/python-modules/bucketstore/default.nix b/pkgs/development/python-modules/bucketstore/default.nix index 2142140cb88b..c87345732981 100644 --- a/pkgs/development/python-modules/bucketstore/default.nix +++ b/pkgs/development/python-modules/bucketstore/default.nix @@ -10,20 +10,29 @@ buildPythonPackage rec { pname = "bucketstore"; version = "0.2.2"; + format = "setuptools"; + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "jpetrucciani"; repo = "bucketstore"; - rev = version; + rev = "refs/tags/${version}"; hash = "sha256-BtoyGqFbeBhGQeXnmeSfiuJLZtXFrK26WO0SDlAtKG4="; }; - propagatedBuildInputs = [ boto3 ]; + postPatch = '' + substituteInPlace setup.py \ + --replace "version=__version__," 'version="${version}",' + ''; + + propagatedBuildInputs = [ + boto3 + ]; nativeCheckInputs = [ - pytestCheckHook moto + pytestCheckHook ]; pythonImportsCheck = [ @@ -33,6 +42,7 @@ buildPythonPackage rec { meta = with lib; { description = "Library for interacting with Amazon S3"; homepage = "https://github.com/jpetrucciani/bucketstore"; + changelog = "https://github.com/jpetrucciani/bucketstore/releases/tag/${version}"; license = licenses.mit; maintainers = with maintainers; [ jpetrucciani ]; }; diff --git a/pkgs/development/python-modules/fst-pso/default.nix b/pkgs/development/python-modules/fst-pso/default.nix new file mode 100644 index 000000000000..00bcf551b5b1 --- /dev/null +++ b/pkgs/development/python-modules/fst-pso/default.nix @@ -0,0 +1,39 @@ +{ lib +, buildPythonPackage +, fetchPypi +, miniful +, numpy +, pythonOlder +}: + +buildPythonPackage rec { + pname = "fst-pso"; + version = "1.8.1"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-s9FuwnsLTTazWzBq9AwAzQs05eCp4wpx7QJJDolUomo="; + }; + + propagatedBuildInputs = [ + miniful + numpy + ]; + + # Module has no tests + doCheck = false; + + pythonImportsCheck = [ + "fstpso" + ]; + + meta = with lib; { + description = "Fuzzy Self-Tuning PSO global optimization library"; + homepage = "https://github.com/aresio/fst-pso"; + license = with licenses; [ lgpl3Only ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/miniful/default.nix b/pkgs/development/python-modules/miniful/default.nix new file mode 100644 index 000000000000..434e8bc403bb --- /dev/null +++ b/pkgs/development/python-modules/miniful/default.nix @@ -0,0 +1,39 @@ +{ lib +, buildPythonPackage +, fetchPypi +, numpy +, scipy +, pythonOlder +}: + +buildPythonPackage rec { + pname = "miniful"; + version = "0.0.6"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-ZCyfNrh8gbPvwplHN5tbmbjTMYXJBKe8Mg2JqOGHFCk="; + }; + + propagatedBuildInputs = [ + numpy + scipy + ]; + + # Module has no tests + doCheck = false; + + pythonImportsCheck = [ + "miniful" + ]; + + meta = with lib; { + description = "Minimal Fuzzy Library"; + homepage = "https://github.com/aresio/miniful"; + license = with licenses; [ lgpl3Only ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/nats-py/default.nix b/pkgs/development/python-modules/nats-py/default.nix index 9a3ed2848101..3f958d05cff9 100644 --- a/pkgs/development/python-modules/nats-py/default.nix +++ b/pkgs/development/python-modules/nats-py/default.nix @@ -45,6 +45,7 @@ buildPythonPackage rec { "test_pull_subscribe_limits" "test_fetch_n" "test_subscribe_no_echo" + "test_stream_management" ] ++ lib.optionals stdenv.isDarwin [ "test_subscribe_iterate_next_msg" "test_buf_size_force_flush_timeout" @@ -57,6 +58,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python client for NATS.io"; homepage = "https://github.com/nats-io/nats.py"; + changelog = "https://github.com/nats-io/nats.py/releases/tag/v${version}"; license = with licenses; [ asl20 ]; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/python-keycloak/default.nix b/pkgs/development/python-modules/python-keycloak/default.nix index f3d105c6bad8..62b8cd62024c 100644 --- a/pkgs/development/python-modules/python-keycloak/default.nix +++ b/pkgs/development/python-modules/python-keycloak/default.nix @@ -41,7 +41,7 @@ buildPythonPackage rec { ]; # Test fixtures require a running keycloak instance - doTest = false; + doCheck = false; pythonImportsCheck = [ "keycloak" diff --git a/pkgs/development/python-modules/simpful/default.nix b/pkgs/development/python-modules/simpful/default.nix new file mode 100644 index 000000000000..ae266bb165d2 --- /dev/null +++ b/pkgs/development/python-modules/simpful/default.nix @@ -0,0 +1,55 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, matplotlib +, numpy +, pytestCheckHook +, pythonOlder +, scipy +, seaborn +, requests +}: + +buildPythonPackage rec { + pname = "simpful"; + version = "2.10.0"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "aresio"; + repo = pname; + rev = "refs/tags/${version}"; + hash = "sha256-vT7Y/6bD+txEVEw/zelMogQ0V7BIHHRitrC1COByzhY="; + }; + + propagatedBuildInputs = [ + numpy + scipy + requests + ]; + + passthru.optional-dependencies = { + plotting = [ + matplotlib + seaborn + ]; + }; + + nativeCheckInputs = [ + pytestCheckHook + ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); + + pythonImportsCheck = [ + "simpful" + ]; + + meta = with lib; { + description = "Library for fuzzy logic"; + homepage = "https://github.com/aresio/simpful"; + changelog = "https://github.com/aresio/simpful/releases/tag/${version}"; + license = with licenses; [ lgpl3Only ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/tools/rust/cargo-info/default.nix b/pkgs/development/tools/rust/cargo-info/default.nix new file mode 100644 index 000000000000..6574646e93c8 --- /dev/null +++ b/pkgs/development/tools/rust/cargo-info/default.nix @@ -0,0 +1,40 @@ +{ lib +, rustPlatform +, fetchFromGitLab +, pkg-config +, openssl +, stdenv +, darwin +}: + +rustPlatform.buildRustPackage rec { + pname = "cargo-info"; + version = "0.7.3"; + + src = fetchFromGitLab { + owner = "imp"; + repo = "cargo-info"; + rev = version; + hash = "sha256-m8YytirD9JBwssZFO6oQ9TGqjqvu1GxHN3z8WKLiKd4="; + }; + + cargoHash = "sha256-gI/DGPCVEi4Mg9nYLaPpeqpV7LBbxoLP0ditU6hPS1w="; + + nativeBuildInputs = [ + pkg-config + ]; + + buildInputs = [ + openssl + ] ++ lib.optionals stdenv.isDarwin [ + darwin.apple_sdk.frameworks.Security + ]; + + meta = with lib; { + description = "Cargo subcommand to show crates info from crates.io"; + homepage = "https://gitlab.com/imp/cargo-info"; + changelog = "https://gitlab.com/imp/cargo-info/-/blob/${src.rev}/CHANGELOG.md"; + license = with licenses; [ mit asl20 ]; + maintainers = with maintainers; [ figsoda ]; + }; +} diff --git a/pkgs/development/tools/vulkan-validation-layers/default.nix b/pkgs/development/tools/vulkan-validation-layers/default.nix index 81be07fdcd0d..9927a3a4baed 100644 --- a/pkgs/development/tools/vulkan-validation-layers/default.nix +++ b/pkgs/development/tools/vulkan-validation-layers/default.nix @@ -23,7 +23,7 @@ let in stdenv.mkDerivation rec { pname = "vulkan-validation-layers"; - version = "1.3.243.0"; + version = "1.3.249"; # If we were to use "dev" here instead of headers, the setupHook would be # placed in that output instead of "out". @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "KhronosGroup"; repo = "Vulkan-ValidationLayers"; - rev = "sdk-${version}"; + rev = "v${version}"; hash = "sha256-viVceH8qFz6Cl/RlMMWZnMIdzULELlnIvtPZ87ySs2M="; }; diff --git a/pkgs/os-specific/linux/firmware/firmware-updater/default.nix b/pkgs/os-specific/linux/firmware/firmware-updater/default.nix index 13421c5cc8bd..8520d69908cf 100644 --- a/pkgs/os-specific/linux/firmware/firmware-updater/default.nix +++ b/pkgs/os-specific/linux/firmware/firmware-updater/default.nix @@ -1,21 +1,21 @@ { lib -, flutter2 +, flutter , fetchFromGitHub }: -flutter2.buildFlutterApplication { +flutter.buildFlutterApplication { pname = "firmware-updater"; - version = "unstable"; + version = "unstable-2023-04-30"; pubspecLockFile = ./pubspec.lock; depsListFile = ./deps.json; - vendorHash = "sha256-kKfe+7obb2fihrca+mjCM2+51wNkbPLEPFLpXzK5Wvc="; + vendorHash = "sha256-cdMO+tr6kYiN5xKXa+uTMAcFf2C75F3wVPrn21G4QPQ="; src = fetchFromGitHub { owner = "canonical"; repo = "firmware-updater"; - rev = "a51817a2551e29895352618a91df9cf93d944af1"; - sha256 = "6uhks6a9JcyIC5o0VssqfBlE4pqKiQ7d3KOb6feNTvU="; + rev = "6e7dbdb64e344633ea62874b54ff3990bd3b8440"; + sha256 = "sha256-s5mwtr5MSPqLMN+k851+pFIFFPa0N1hqz97ys050tFA="; fetchSubmodules = true; }; diff --git a/pkgs/os-specific/linux/firmware/firmware-updater/deps.json b/pkgs/os-specific/linux/firmware/firmware-updater/deps.json index 9264a9fb70ee..a4ab4fa8652f 100644 --- a/pkgs/os-specific/linux/firmware/firmware-updater/deps.json +++ b/pkgs/os-specific/linux/firmware/firmware-updater/deps.json @@ -6,20 +6,729 @@ "source": "root", "dependencies": [ "collection", + "dbus", "dio", + "file", "flutter", "flutter_html", "flutter_localizations", + "freezed_annotation", "fwupd", + "gtk", + "handy_window", + "meta", "path", "provider", + "safe_change_notifier", + "ubuntu_logger", + "ubuntu_service", + "ubuntu_session", + "upower", "yaru", + "yaru_colors", "yaru_icons", "yaru_widgets", + "build_runner", "flutter_lints", - "flutter_test" + "flutter_test", + "freezed", + "integration_test", + "melos", + "mockito" ] }, + { + "name": "mockito", + "version": "5.4.0", + "kind": "dev", + "source": "hosted", + "dependencies": [ + "analyzer", + "build", + "code_builder", + "collection", + "dart_style", + "matcher", + "meta", + "path", + "source_gen", + "test_api" + ] + }, + { + "name": "test_api", + "version": "0.4.16", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "async", + "boolean_selector", + "collection", + "meta", + "source_span", + "stack_trace", + "stream_channel", + "string_scanner", + "term_glyph", + "matcher" + ] + }, + { + "name": "matcher", + "version": "0.12.13", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "meta", + "stack_trace" + ] + }, + { + "name": "stack_trace", + "version": "1.11.0", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "path" + ] + }, + { + "name": "path", + "version": "1.8.2", + "kind": "direct", + "source": "hosted", + "dependencies": [] + }, + { + "name": "meta", + "version": "1.8.0", + "kind": "direct", + "source": "hosted", + "dependencies": [] + }, + { + "name": "term_glyph", + "version": "1.2.1", + "kind": "transitive", + "source": "hosted", + "dependencies": [] + }, + { + "name": "string_scanner", + "version": "1.2.0", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "source_span" + ] + }, + { + "name": "source_span", + "version": "1.9.1", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "collection", + "path", + "term_glyph" + ] + }, + { + "name": "collection", + "version": "1.17.0", + "kind": "direct", + "source": "hosted", + "dependencies": [] + }, + { + "name": "stream_channel", + "version": "2.1.1", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "async" + ] + }, + { + "name": "async", + "version": "2.10.0", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "collection", + "meta" + ] + }, + { + "name": "boolean_selector", + "version": "2.1.1", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "source_span", + "string_scanner" + ] + }, + { + "name": "source_gen", + "version": "1.2.7", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "analyzer", + "async", + "build", + "dart_style", + "glob", + "path", + "source_span", + "yaml" + ] + }, + { + "name": "yaml", + "version": "3.1.1", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "collection", + "source_span", + "string_scanner" + ] + }, + { + "name": "glob", + "version": "2.1.1", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "async", + "collection", + "file", + "path", + "string_scanner" + ] + }, + { + "name": "file", + "version": "6.1.4", + "kind": "direct", + "source": "hosted", + "dependencies": [ + "meta", + "path" + ] + }, + { + "name": "dart_style", + "version": "2.3.0", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "analyzer", + "args", + "path", + "pub_semver", + "source_span" + ] + }, + { + "name": "pub_semver", + "version": "2.1.3", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "collection", + "meta" + ] + }, + { + "name": "args", + "version": "2.4.0", + "kind": "transitive", + "source": "hosted", + "dependencies": [] + }, + { + "name": "analyzer", + "version": "5.11.1", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "_fe_analyzer_shared", + "collection", + "convert", + "crypto", + "glob", + "meta", + "package_config", + "path", + "pub_semver", + "source_span", + "watcher", + "yaml" + ] + }, + { + "name": "watcher", + "version": "1.0.2", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "async", + "path" + ] + }, + { + "name": "package_config", + "version": "2.1.0", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "path" + ] + }, + { + "name": "crypto", + "version": "3.0.2", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "typed_data" + ] + }, + { + "name": "typed_data", + "version": "1.3.1", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "collection" + ] + }, + { + "name": "convert", + "version": "3.1.1", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "typed_data" + ] + }, + { + "name": "_fe_analyzer_shared", + "version": "59.0.0", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "meta" + ] + }, + { + "name": "build", + "version": "2.3.1", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "analyzer", + "async", + "convert", + "crypto", + "glob", + "logging", + "meta", + "path" + ] + }, + { + "name": "logging", + "version": "1.1.1", + "kind": "transitive", + "source": "hosted", + "dependencies": [] + }, + { + "name": "code_builder", + "version": "4.4.0", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "built_collection", + "built_value", + "collection", + "matcher", + "meta" + ] + }, + { + "name": "built_value", + "version": "8.4.4", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "built_collection", + "collection", + "fixnum", + "meta" + ] + }, + { + "name": "fixnum", + "version": "1.1.0", + "kind": "transitive", + "source": "hosted", + "dependencies": [] + }, + { + "name": "built_collection", + "version": "5.1.1", + "kind": "transitive", + "source": "hosted", + "dependencies": [] + }, + { + "name": "melos", + "version": "3.0.1", + "kind": "dev", + "source": "hosted", + "dependencies": [ + "ansi_styles", + "args", + "cli_launcher", + "cli_util", + "collection", + "conventional_commit", + "file", + "glob", + "graphs", + "http", + "meta", + "mustache_template", + "path", + "platform", + "pool", + "prompts", + "pub_semver", + "pub_updater", + "pubspec", + "string_scanner", + "yaml", + "yaml_edit" + ] + }, + { + "name": "yaml_edit", + "version": "2.1.0", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "collection", + "meta", + "source_span", + "yaml" + ] + }, + { + "name": "pubspec", + "version": "2.3.0", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "path", + "pub_semver", + "yaml", + "uri" + ] + }, + { + "name": "uri", + "version": "1.0.0", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "matcher", + "quiver" + ] + }, + { + "name": "quiver", + "version": "3.2.1", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "matcher" + ] + }, + { + "name": "pub_updater", + "version": "0.2.4", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "http", + "json_annotation", + "process" + ] + }, + { + "name": "process", + "version": "4.2.4", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "file", + "path", + "platform" + ] + }, + { + "name": "platform", + "version": "3.1.0", + "kind": "transitive", + "source": "hosted", + "dependencies": [] + }, + { + "name": "json_annotation", + "version": "4.8.0", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "meta" + ] + }, + { + "name": "http", + "version": "0.13.5", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "async", + "http_parser", + "meta", + "path" + ] + }, + { + "name": "http_parser", + "version": "4.0.2", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "collection", + "source_span", + "string_scanner", + "typed_data" + ] + }, + { + "name": "prompts", + "version": "2.0.0", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "charcode", + "io" + ] + }, + { + "name": "io", + "version": "1.0.4", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "meta", + "path", + "string_scanner" + ] + }, + { + "name": "charcode", + "version": "1.3.1", + "kind": "transitive", + "source": "hosted", + "dependencies": [] + }, + { + "name": "pool", + "version": "1.5.1", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "async", + "stack_trace" + ] + }, + { + "name": "mustache_template", + "version": "2.0.0", + "kind": "transitive", + "source": "hosted", + "dependencies": [] + }, + { + "name": "graphs", + "version": "2.2.0", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "collection" + ] + }, + { + "name": "conventional_commit", + "version": "0.6.0+1", + "kind": "transitive", + "source": "hosted", + "dependencies": [] + }, + { + "name": "cli_util", + "version": "0.3.5", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "meta", + "path" + ] + }, + { + "name": "cli_launcher", + "version": "0.3.1", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "path", + "yaml" + ] + }, + { + "name": "ansi_styles", + "version": "0.3.2+1", + "kind": "transitive", + "source": "hosted", + "dependencies": [] + }, + { + "name": "integration_test", + "version": "0.0.0", + "kind": "dev", + "source": "sdk", + "dependencies": [ + "flutter", + "flutter_driver", + "flutter_test", + "path", + "vm_service", + "archive", + "async", + "boolean_selector", + "characters", + "clock", + "collection", + "crypto", + "fake_async", + "file", + "js", + "matcher", + "material_color_utilities", + "meta", + "source_span", + "stack_trace", + "stream_channel", + "string_scanner", + "sync_http", + "term_glyph", + "test_api", + "typed_data", + "vector_math", + "webdriver" + ] + }, + { + "name": "webdriver", + "version": "3.0.1", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "archive", + "matcher", + "path", + "stack_trace", + "sync_http" + ] + }, + { + "name": "sync_http", + "version": "0.3.1", + "kind": "transitive", + "source": "hosted", + "dependencies": [] + }, + { + "name": "archive", + "version": "3.3.2", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "crypto", + "path" + ] + }, + { + "name": "vector_math", + "version": "2.1.4", + "kind": "transitive", + "source": "hosted", + "dependencies": [] + }, + { + "name": "material_color_utilities", + "version": "0.2.0", + "kind": "transitive", + "source": "hosted", + "dependencies": [] + }, + { + "name": "js", + "version": "0.6.5", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "meta" + ] + }, + { + "name": "fake_async", + "version": "1.3.1", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "clock", + "collection" + ] + }, + { + "name": "clock", + "version": "1.1.1", + "kind": "transitive", + "source": "hosted", + "dependencies": [] + }, + { + "name": "characters", + "version": "1.2.1", + "kind": "transitive", + "source": "hosted", + "dependencies": [] + }, + { + "name": "vm_service", + "version": "9.4.0", + "kind": "transitive", + "source": "hosted", + "dependencies": [] + }, { "name": "flutter_test", "version": "0.0.0", @@ -36,186 +745,17 @@ "async", "boolean_selector", "characters", - "charcode", "collection", + "js", "matcher", "material_color_utilities", "meta", "source_span", "stream_channel", "string_scanner", - "term_glyph", - "typed_data" - ] - }, - { - "name": "typed_data", - "version": "1.3.0", - "kind": "transitive", - "source": "hosted", - "dependencies": [ - "collection" - ] - }, - { - "name": "collection", - "version": "1.15.0", - "kind": "direct", - "source": "hosted", - "dependencies": [] - }, - { - "name": "term_glyph", - "version": "1.2.0", - "kind": "transitive", - "source": "hosted", - "dependencies": [] - }, - { - "name": "string_scanner", - "version": "1.1.0", - "kind": "transitive", - "source": "hosted", - "dependencies": [ - "charcode", - "source_span" - ] - }, - { - "name": "source_span", - "version": "1.8.1", - "kind": "transitive", - "source": "hosted", - "dependencies": [ - "collection", - "path", "term_glyph" ] }, - { - "name": "path", - "version": "1.8.0", - "kind": "direct", - "source": "hosted", - "dependencies": [] - }, - { - "name": "charcode", - "version": "1.3.1", - "kind": "transitive", - "source": "hosted", - "dependencies": [] - }, - { - "name": "stream_channel", - "version": "2.1.0", - "kind": "transitive", - "source": "hosted", - "dependencies": [ - "async" - ] - }, - { - "name": "async", - "version": "2.8.2", - "kind": "transitive", - "source": "hosted", - "dependencies": [ - "collection", - "meta" - ] - }, - { - "name": "meta", - "version": "1.7.0", - "kind": "transitive", - "source": "hosted", - "dependencies": [] - }, - { - "name": "material_color_utilities", - "version": "0.1.3", - "kind": "transitive", - "source": "hosted", - "dependencies": [] - }, - { - "name": "matcher", - "version": "0.12.11", - "kind": "transitive", - "source": "hosted", - "dependencies": [ - "stack_trace" - ] - }, - { - "name": "stack_trace", - "version": "1.10.0", - "kind": "transitive", - "source": "hosted", - "dependencies": [ - "path" - ] - }, - { - "name": "characters", - "version": "1.2.0", - "kind": "transitive", - "source": "hosted", - "dependencies": [] - }, - { - "name": "boolean_selector", - "version": "2.1.0", - "kind": "transitive", - "source": "hosted", - "dependencies": [ - "source_span", - "string_scanner" - ] - }, - { - "name": "vector_math", - "version": "2.1.1", - "kind": "transitive", - "source": "hosted", - "dependencies": [] - }, - { - "name": "clock", - "version": "1.1.0", - "kind": "transitive", - "source": "hosted", - "dependencies": [] - }, - { - "name": "fake_async", - "version": "1.2.0", - "kind": "transitive", - "source": "hosted", - "dependencies": [ - "clock", - "collection" - ] - }, - { - "name": "test_api", - "version": "0.4.8", - "kind": "transitive", - "source": "hosted", - "dependencies": [ - "async", - "boolean_selector", - "collection", - "meta", - "source_span", - "stack_trace", - "stream_channel", - "string_scanner", - "term_glyph", - "matcher" - ] - }, { "name": "flutter", "version": "0.0.0", @@ -224,9 +764,9 @@ "dependencies": [ "characters", "collection", + "js", "material_color_utilities", "meta", - "typed_data", "vector_math", "sky_engine" ] @@ -238,9 +778,124 @@ "source": "sdk", "dependencies": [] }, + { + "name": "flutter_driver", + "version": "0.0.0", + "kind": "transitive", + "source": "sdk", + "dependencies": [ + "file", + "flutter", + "flutter_test", + "fuchsia_remote_debug_protocol", + "path", + "meta", + "vm_service", + "webdriver", + "archive", + "async", + "boolean_selector", + "characters", + "clock", + "collection", + "crypto", + "js", + "matcher", + "material_color_utilities", + "platform", + "process", + "source_span", + "stack_trace", + "stream_channel", + "string_scanner", + "sync_http", + "term_glyph", + "test_api", + "typed_data", + "vector_math" + ] + }, + { + "name": "fuchsia_remote_debug_protocol", + "version": "0.0.0", + "kind": "transitive", + "source": "sdk", + "dependencies": [ + "process", + "vm_service", + "file", + "meta", + "path", + "platform" + ] + }, + { + "name": "freezed", + "version": "2.3.2", + "kind": "dev", + "source": "hosted", + "dependencies": [ + "analyzer", + "build", + "build_config", + "collection", + "meta", + "source_gen", + "freezed_annotation", + "json_annotation" + ] + }, + { + "name": "freezed_annotation", + "version": "2.2.0", + "kind": "direct", + "source": "hosted", + "dependencies": [ + "collection", + "json_annotation", + "meta" + ] + }, + { + "name": "build_config", + "version": "1.1.1", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "checked_yaml", + "json_annotation", + "path", + "pubspec_parse", + "yaml" + ] + }, + { + "name": "pubspec_parse", + "version": "1.2.2", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "checked_yaml", + "collection", + "json_annotation", + "pub_semver", + "yaml" + ] + }, + { + "name": "checked_yaml", + "version": "2.0.2", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "json_annotation", + "source_span", + "yaml" + ] + }, { "name": "flutter_lints", - "version": "1.0.4", + "version": "2.0.1", "kind": "dev", "source": "hosted", "dependencies": [ @@ -249,32 +904,492 @@ }, { "name": "lints", - "version": "1.0.1", + "version": "2.0.1", "kind": "transitive", "source": "hosted", "dependencies": [] }, + { + "name": "build_runner", + "version": "2.3.3", + "kind": "dev", + "source": "hosted", + "dependencies": [ + "args", + "async", + "analyzer", + "build", + "build_config", + "build_daemon", + "build_resolvers", + "build_runner_core", + "code_builder", + "collection", + "crypto", + "dart_style", + "frontend_server_client", + "glob", + "graphs", + "http_multi_server", + "io", + "js", + "logging", + "meta", + "mime", + "package_config", + "path", + "pool", + "pub_semver", + "pubspec_parse", + "shelf", + "shelf_web_socket", + "stack_trace", + "stream_transform", + "timing", + "watcher", + "web_socket_channel", + "yaml" + ] + }, + { + "name": "web_socket_channel", + "version": "2.4.0", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "async", + "crypto", + "stream_channel" + ] + }, + { + "name": "timing", + "version": "1.0.1", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "json_annotation" + ] + }, + { + "name": "stream_transform", + "version": "2.1.0", + "kind": "transitive", + "source": "hosted", + "dependencies": [] + }, + { + "name": "shelf_web_socket", + "version": "1.0.3", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "shelf", + "stream_channel", + "web_socket_channel" + ] + }, + { + "name": "shelf", + "version": "1.4.0", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "async", + "collection", + "http_parser", + "path", + "stack_trace", + "stream_channel" + ] + }, + { + "name": "mime", + "version": "1.0.4", + "kind": "transitive", + "source": "hosted", + "dependencies": [] + }, + { + "name": "http_multi_server", + "version": "3.2.1", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "async" + ] + }, + { + "name": "frontend_server_client", + "version": "3.2.0", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "async", + "path" + ] + }, + { + "name": "build_runner_core", + "version": "7.2.7", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "async", + "build", + "build_config", + "build_resolvers", + "collection", + "convert", + "crypto", + "glob", + "graphs", + "json_annotation", + "logging", + "meta", + "path", + "package_config", + "pool", + "timing", + "watcher", + "yaml" + ] + }, + { + "name": "build_resolvers", + "version": "2.2.0", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "analyzer", + "async", + "build", + "collection", + "crypto", + "graphs", + "logging", + "path", + "package_config", + "pool", + "pub_semver", + "stream_transform", + "yaml" + ] + }, + { + "name": "build_daemon", + "version": "3.1.1", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "built_collection", + "built_value", + "http_multi_server", + "logging", + "path", + "pool", + "shelf", + "shelf_web_socket", + "stream_transform", + "watcher", + "web_socket_channel" + ] + }, { "name": "yaru_widgets", - "version": "1.0.8", + "version": "2.3.1", "kind": "direct", "source": "hosted", + "dependencies": [ + "flutter", + "yaru", + "yaru_colors", + "yaru_icons", + "yaru_window" + ] + }, + { + "name": "yaru_window", + "version": "0.1.1", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "flutter", + "yaru_window_linux", + "yaru_window_manager", + "yaru_window_platform_interface", + "yaru_window_web" + ] + }, + { + "name": "yaru_window_web", + "version": "0.0.2", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "flutter", + "flutter_web_plugins", + "yaru_window_platform_interface" + ] + }, + { + "name": "yaru_window_platform_interface", + "version": "0.1.0", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "flutter", + "meta", + "plugin_platform_interface" + ] + }, + { + "name": "plugin_platform_interface", + "version": "2.1.4", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "meta" + ] + }, + { + "name": "flutter_web_plugins", + "version": "0.0.0", + "kind": "transitive", + "source": "sdk", + "dependencies": [ + "flutter", + "js", + "characters", + "collection", + "material_color_utilities", + "meta", + "vector_math" + ] + }, + { + "name": "yaru_window_manager", + "version": "0.1.0", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "flutter", + "flutter_web_plugins", + "window_manager", + "yaru_window_platform_interface" + ] + }, + { + "name": "window_manager", + "version": "0.3.2", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "flutter", + "path", + "screen_retriever" + ] + }, + { + "name": "screen_retriever", + "version": "0.1.6", + "kind": "transitive", + "source": "hosted", "dependencies": [ "flutter" ] }, + { + "name": "yaru_window_linux", + "version": "0.1.1", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "flutter", + "plugin_platform_interface" + ] + }, { "name": "yaru_icons", - "version": "0.1.3", + "version": "1.0.4", "kind": "direct", "source": "hosted", "dependencies": [ "flutter" ] }, + { + "name": "yaru_colors", + "version": "0.1.7", + "kind": "direct", + "source": "hosted", + "dependencies": [ + "collection", + "flutter", + "meta", + "yaru_color_generator" + ] + }, + { + "name": "yaru_color_generator", + "version": "0.1.0", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "collection", + "meta" + ] + }, { "name": "yaru", - "version": "0.2.5", + "version": "0.6.2", + "kind": "direct", + "source": "hosted", + "dependencies": [ + "collection", + "flutter", + "gtk", + "platform", + "yaru_colors" + ] + }, + { + "name": "gtk", + "version": "2.0.0", + "kind": "direct", + "source": "hosted", + "dependencies": [ + "ffi", + "flutter", + "meta" + ] + }, + { + "name": "ffi", + "version": "2.0.1", + "kind": "transitive", + "source": "hosted", + "dependencies": [] + }, + { + "name": "upower", + "version": "0.7.0", + "kind": "direct", + "source": "hosted", + "dependencies": [ + "dbus" + ] + }, + { + "name": "dbus", + "version": "0.7.8", + "kind": "direct", + "source": "hosted", + "dependencies": [ + "args", + "ffi", + "meta", + "xml" + ] + }, + { + "name": "xml", + "version": "6.2.2", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "collection", + "meta", + "petitparser" + ] + }, + { + "name": "petitparser", + "version": "5.1.0", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "meta" + ] + }, + { + "name": "ubuntu_session", + "version": "0.0.4", + "kind": "direct", + "source": "hosted", + "dependencies": [ + "dbus", + "meta" + ] + }, + { + "name": "ubuntu_service", + "version": "0.2.2", + "kind": "direct", + "source": "hosted", + "dependencies": [ + "get_it", + "meta" + ] + }, + { + "name": "get_it", + "version": "7.3.0", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "async", + "collection" + ] + }, + { + "name": "ubuntu_logger", + "version": "0.0.1", + "kind": "direct", + "source": "git", + "dependencies": [ + "collection", + "logging", + "logging_appenders", + "path" + ] + }, + { + "name": "logging_appenders", + "version": "1.0.2", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "meta", + "logging", + "dio", + "intl", + "clock" + ] + }, + { + "name": "intl", + "version": "0.17.0", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "clock", + "path" + ] + }, + { + "name": "dio", + "version": "4.0.6", + "kind": "direct", + "source": "hosted", + "dependencies": [ + "http_parser", + "path" + ] + }, + { + "name": "safe_change_notifier", + "version": "0.2.0", "kind": "direct", "source": "hosted", "dependencies": [ @@ -301,63 +1416,26 @@ "flutter" ] }, + { + "name": "handy_window", + "version": "0.3.1", + "kind": "direct", + "source": "hosted", + "dependencies": [ + "flutter" + ] + }, { "name": "fwupd", "version": "0.2.2", "kind": "direct", - "source": "hosted", + "source": "git", "dependencies": [ "collection", "dbus", "meta" ] }, - { - "name": "dbus", - "version": "0.7.3", - "kind": "transitive", - "source": "hosted", - "dependencies": [ - "args", - "ffi", - "meta", - "xml" - ] - }, - { - "name": "xml", - "version": "5.3.1", - "kind": "transitive", - "source": "hosted", - "dependencies": [ - "collection", - "meta", - "petitparser" - ] - }, - { - "name": "petitparser", - "version": "4.4.0", - "kind": "transitive", - "source": "hosted", - "dependencies": [ - "meta" - ] - }, - { - "name": "ffi", - "version": "1.2.1", - "kind": "transitive", - "source": "hosted", - "dependencies": [] - }, - { - "name": "args", - "version": "2.3.1", - "kind": "transitive", - "source": "hosted", - "dependencies": [] - }, { "name": "flutter_localizations", "version": "0.0.0", @@ -369,38 +1447,21 @@ "characters", "clock", "collection", + "js", "material_color_utilities", "meta", "path", - "typed_data", "vector_math" ] }, - { - "name": "intl", - "version": "0.17.0", - "kind": "transitive", - "source": "hosted", - "dependencies": [ - "clock", - "path" - ] - }, { "name": "flutter_html", - "version": "2.2.1", + "version": "3.0.0-alpha.6", "kind": "direct", "source": "hosted", "dependencies": [ "html", "csslib", - "flutter_layout_grid", - "video_player", - "chewie", - "webview_flutter", - "chewie_audio", - "flutter_svg", - "flutter_math_fork", "collection", "numerus", "flutter" @@ -408,173 +1469,11 @@ }, { "name": "numerus", - "version": "1.1.1", - "kind": "transitive", - "source": "hosted", - "dependencies": [] - }, - { - "name": "flutter_math_fork", - "version": "0.5.0", + "version": "2.0.0", "kind": "transitive", "source": "hosted", "dependencies": [ - "flutter", - "flutter_svg", - "provider", - "meta", - "collection", - "tuple" - ] - }, - { - "name": "tuple", - "version": "2.0.1", - "kind": "transitive", - "source": "hosted", - "dependencies": [] - }, - { - "name": "flutter_svg", - "version": "0.23.0+1", - "kind": "transitive", - "source": "hosted", - "dependencies": [ - "flutter", - "meta", - "path_drawing", - "vector_math", - "xml" - ] - }, - { - "name": "path_drawing", - "version": "0.5.1+1", - "kind": "transitive", - "source": "hosted", - "dependencies": [ - "vector_math", - "meta", - "path_parsing", - "flutter" - ] - }, - { - "name": "path_parsing", - "version": "0.2.1", - "kind": "transitive", - "source": "hosted", - "dependencies": [ - "vector_math", - "meta" - ] - }, - { - "name": "chewie_audio", - "version": "1.3.0", - "kind": "transitive", - "source": "hosted", - "dependencies": [ - "cupertino_icons", - "flutter", - "video_player" - ] - }, - { - "name": "video_player", - "version": "2.5.1", - "kind": "transitive", - "source": "hosted", - "dependencies": [ - "flutter", - "html", - "video_player_android", - "video_player_avfoundation", - "video_player_platform_interface", - "video_player_web" - ] - }, - { - "name": "video_player_web", - "version": "2.0.13", - "kind": "transitive", - "source": "hosted", - "dependencies": [ - "flutter", - "flutter_web_plugins", - "video_player_platform_interface" - ] - }, - { - "name": "video_player_platform_interface", - "version": "6.0.1", - "kind": "transitive", - "source": "hosted", - "dependencies": [ - "flutter", - "plugin_platform_interface" - ] - }, - { - "name": "plugin_platform_interface", - "version": "2.1.3", - "kind": "transitive", - "source": "hosted", - "dependencies": [ - "meta" - ] - }, - { - "name": "flutter_web_plugins", - "version": "0.0.0", - "kind": "transitive", - "source": "sdk", - "dependencies": [ - "flutter", - "js", - "characters", - "collection", - "material_color_utilities", - "meta", - "typed_data", - "vector_math" - ] - }, - { - "name": "js", - "version": "0.6.3", - "kind": "transitive", - "source": "hosted", - "dependencies": [] - }, - { - "name": "video_player_avfoundation", - "version": "2.3.8", - "kind": "transitive", - "source": "hosted", - "dependencies": [ - "flutter", - "video_player_platform_interface" - ] - }, - { - "name": "video_player_android", - "version": "2.3.10", - "kind": "transitive", - "source": "hosted", - "dependencies": [ - "flutter", - "video_player_platform_interface" - ] - }, - { - "name": "html", - "version": "0.15.1", - "kind": "transitive", - "source": "hosted", - "dependencies": [ - "csslib", - "source_span" + "characters" ] }, { @@ -587,177 +1486,13 @@ ] }, { - "name": "cupertino_icons", - "version": "1.0.5", - "kind": "transitive", - "source": "hosted", - "dependencies": [] - }, - { - "name": "webview_flutter", - "version": "2.8.0", + "name": "html", + "version": "0.15.2", "kind": "transitive", "source": "hosted", "dependencies": [ - "flutter", - "webview_flutter_android", - "webview_flutter_platform_interface", - "webview_flutter_wkwebview" - ] - }, - { - "name": "webview_flutter_wkwebview", - "version": "2.7.5", - "kind": "transitive", - "source": "hosted", - "dependencies": [ - "flutter", - "path", - "webview_flutter_platform_interface" - ] - }, - { - "name": "webview_flutter_platform_interface", - "version": "1.9.5", - "kind": "transitive", - "source": "hosted", - "dependencies": [ - "flutter", - "meta", - "plugin_platform_interface" - ] - }, - { - "name": "webview_flutter_android", - "version": "2.8.14", - "kind": "transitive", - "source": "hosted", - "dependencies": [ - "flutter", - "webview_flutter_platform_interface" - ] - }, - { - "name": "chewie", - "version": "1.4.0", - "kind": "transitive", - "source": "hosted", - "dependencies": [ - "cupertino_icons", - "flutter", - "provider", - "video_player", - "wakelock" - ] - }, - { - "name": "wakelock", - "version": "0.6.2", - "kind": "transitive", - "source": "hosted", - "dependencies": [ - "flutter", - "meta", - "wakelock_macos", - "wakelock_platform_interface", - "wakelock_web", - "wakelock_windows" - ] - }, - { - "name": "wakelock_windows", - "version": "0.2.0", - "kind": "transitive", - "source": "hosted", - "dependencies": [ - "flutter", - "wakelock_platform_interface", - "win32" - ] - }, - { - "name": "win32", - "version": "2.5.2", - "kind": "transitive", - "source": "hosted", - "dependencies": [ - "ffi" - ] - }, - { - "name": "wakelock_platform_interface", - "version": "0.3.0", - "kind": "transitive", - "source": "hosted", - "dependencies": [ - "flutter", - "meta" - ] - }, - { - "name": "wakelock_web", - "version": "0.4.0", - "kind": "transitive", - "source": "hosted", - "dependencies": [ - "flutter", - "flutter_web_plugins", - "js", - "wakelock_platform_interface" - ] - }, - { - "name": "wakelock_macos", - "version": "0.4.0", - "kind": "transitive", - "source": "hosted", - "dependencies": [ - "flutter", - "flutter_web_plugins", - "wakelock_platform_interface" - ] - }, - { - "name": "flutter_layout_grid", - "version": "1.0.6", - "kind": "transitive", - "source": "hosted", - "dependencies": [ - "flutter", - "collection", - "meta", - "quiver" - ] - }, - { - "name": "quiver", - "version": "3.1.0", - "kind": "transitive", - "source": "hosted", - "dependencies": [ - "matcher" - ] - }, - { - "name": "dio", - "version": "4.0.6", - "kind": "direct", - "source": "hosted", - "dependencies": [ - "http_parser", - "path" - ] - }, - { - "name": "http_parser", - "version": "4.0.2", - "kind": "transitive", - "source": "hosted", - "dependencies": [ - "collection", - "source_span", - "string_scanner", - "typed_data" + "csslib", + "source_span" ] } ] diff --git a/pkgs/os-specific/linux/firmware/firmware-updater/pubspec.lock b/pkgs/os-specific/linux/firmware/firmware-updater/pubspec.lock index c9e9a2044477..641ab9fd9778 100644 --- a/pkgs/os-specific/linux/firmware/firmware-updater/pubspec.lock +++ b/pkgs/os-specific/linux/firmware/firmware-updater/pubspec.lock @@ -1,156 +1,309 @@ # Generated by pub # See https://dart.dev/tools/pub/glossary#lockfile packages: + _fe_analyzer_shared: + dependency: transitive + description: + name: _fe_analyzer_shared + sha256: "8880b4cfe7b5b17d57c052a5a3a8cc1d4f546261c7cc8fbd717bd53f48db0568" + url: "https://pub.dev" + source: hosted + version: "59.0.0" + analyzer: + dependency: transitive + description: + name: analyzer + sha256: a89627f49b0e70e068130a36571409726b04dab12da7e5625941d2c8ec278b96 + url: "https://pub.dev" + source: hosted + version: "5.11.1" + ansi_styles: + dependency: transitive + description: + name: ansi_styles + sha256: "9c656cc12b3c27b17dd982b2cc5c0cfdfbdabd7bc8f3ae5e8542d9867b47ce8a" + url: "https://pub.dev" + source: hosted + version: "0.3.2+1" + archive: + dependency: transitive + description: + name: archive + sha256: "80e5141fafcb3361653ce308776cfd7d45e6e9fbb429e14eec571382c0c5fecb" + url: "https://pub.dev" + source: hosted + version: "3.3.2" args: dependency: transitive description: name: args - url: "https://pub.dartlang.org" + sha256: "4cab82a83ffef80b262ddedf47a0a8e56ee6fbf7fe21e6e768b02792034dd440" + url: "https://pub.dev" source: hosted - version: "2.3.1" + version: "2.4.0" async: dependency: transitive description: name: async - url: "https://pub.dartlang.org" + sha256: bfe67ef28df125b7dddcea62755991f807aa39a2492a23e1550161692950bbe0 + url: "https://pub.dev" source: hosted - version: "2.8.2" + version: "2.10.0" boolean_selector: dependency: transitive description: name: boolean_selector - url: "https://pub.dartlang.org" + sha256: "6cfb5af12253eaf2b368f07bacc5a80d1301a071c73360d746b7f2e32d762c66" + url: "https://pub.dev" source: hosted - version: "2.1.0" + version: "2.1.1" + build: + dependency: transitive + description: + name: build + sha256: "3fbda25365741f8251b39f3917fb3c8e286a96fd068a5a242e11c2012d495777" + url: "https://pub.dev" + source: hosted + version: "2.3.1" + build_config: + dependency: transitive + description: + name: build_config + sha256: bf80fcfb46a29945b423bd9aad884590fb1dc69b330a4d4700cac476af1708d1 + url: "https://pub.dev" + source: hosted + version: "1.1.1" + build_daemon: + dependency: transitive + description: + name: build_daemon + sha256: "757153e5d9cd88253cb13f28c2fb55a537dc31fefd98137549895b5beb7c6169" + url: "https://pub.dev" + source: hosted + version: "3.1.1" + build_resolvers: + dependency: transitive + description: + name: build_resolvers + sha256: db49b8609ef8c81cca2b310618c3017c00f03a92af44c04d310b907b2d692d95 + url: "https://pub.dev" + source: hosted + version: "2.2.0" + build_runner: + dependency: "direct dev" + description: + name: build_runner + sha256: b0a8a7b8a76c493e85f1b84bffa0588859a06197863dba8c9036b15581fd9727 + url: "https://pub.dev" + source: hosted + version: "2.3.3" + build_runner_core: + dependency: transitive + description: + name: build_runner_core + sha256: "14febe0f5bac5ae474117a36099b4de6f1dbc52df6c5e55534b3da9591bf4292" + url: "https://pub.dev" + source: hosted + version: "7.2.7" + built_collection: + dependency: transitive + description: + name: built_collection + sha256: "376e3dd27b51ea877c28d525560790aee2e6fbb5f20e2f85d5081027d94e2100" + url: "https://pub.dev" + source: hosted + version: "5.1.1" + built_value: + dependency: transitive + description: + name: built_value + sha256: "31b7c748fd4b9adf8d25d72a4c4a59ef119f12876cf414f94f8af5131d5fa2b0" + url: "https://pub.dev" + source: hosted + version: "8.4.4" characters: dependency: transitive description: name: characters - url: "https://pub.dartlang.org" + sha256: e6a326c8af69605aec75ed6c187d06b349707a27fbff8222ca9cc2cff167975c + url: "https://pub.dev" source: hosted - version: "1.2.0" + version: "1.2.1" charcode: dependency: transitive description: name: charcode - url: "https://pub.dartlang.org" + sha256: fb98c0f6d12c920a02ee2d998da788bca066ca5f148492b7085ee23372b12306 + url: "https://pub.dev" source: hosted version: "1.3.1" - chewie: + checked_yaml: dependency: transitive description: - name: chewie - url: "https://pub.dartlang.org" + name: checked_yaml + sha256: "3d1505d91afa809d177efd4eed5bb0eb65805097a1463abdd2add076effae311" + url: "https://pub.dev" source: hosted - version: "1.4.0" - chewie_audio: + version: "2.0.2" + cli_launcher: dependency: transitive description: - name: chewie_audio - url: "https://pub.dartlang.org" + name: cli_launcher + sha256: "5e7e0282b79e8642edd6510ee468ae2976d847a0a29b3916e85f5fa1bfe24005" + url: "https://pub.dev" source: hosted - version: "1.3.0" + version: "0.3.1" + cli_util: + dependency: transitive + description: + name: cli_util + sha256: "66f86e916d285c1a93d3b79587d94bd71984a66aac4ff74e524cfa7877f1395c" + url: "https://pub.dev" + source: hosted + version: "0.3.5" clock: dependency: transitive description: name: clock - url: "https://pub.dartlang.org" + sha256: cb6d7f03e1de671e34607e909a7213e31d7752be4fb66a86d29fe1eb14bfb5cf + url: "https://pub.dev" source: hosted - version: "1.1.0" + version: "1.1.1" + code_builder: + dependency: transitive + description: + name: code_builder + sha256: "0d43dd1288fd145de1ecc9a3948ad4a6d5a82f0a14c4fdd0892260787d975cbe" + url: "https://pub.dev" + source: hosted + version: "4.4.0" collection: dependency: "direct main" description: name: collection - url: "https://pub.dartlang.org" + sha256: cfc915e6923fe5ce6e153b0723c753045de46de1b4d63771530504004a45fae0 + url: "https://pub.dev" source: hosted - version: "1.15.0" + version: "1.17.0" + conventional_commit: + dependency: transitive + description: + name: conventional_commit + sha256: dec15ad1118f029c618651a4359eb9135d8b88f761aa24e4016d061cd45948f2 + url: "https://pub.dev" + source: hosted + version: "0.6.0+1" + convert: + dependency: transitive + description: + name: convert + sha256: "0f08b14755d163f6e2134cb58222dd25ea2a2ee8a195e53983d57c075324d592" + url: "https://pub.dev" + source: hosted + version: "3.1.1" + crypto: + dependency: transitive + description: + name: crypto + sha256: aa274aa7774f8964e4f4f38cc994db7b6158dd36e9187aaceaddc994b35c6c67 + url: "https://pub.dev" + source: hosted + version: "3.0.2" csslib: dependency: transitive description: name: csslib - url: "https://pub.dartlang.org" + sha256: b36c7f7e24c0bdf1bf9a3da461c837d1de64b9f8beb190c9011d8c72a3dfd745 + url: "https://pub.dev" source: hosted version: "0.17.2" - cupertino_icons: + dart_style: dependency: transitive description: - name: cupertino_icons - url: "https://pub.dartlang.org" + name: dart_style + sha256: "6d691edde054969f0e0f26abb1b30834b5138b963793e56f69d3a9a4435e6352" + url: "https://pub.dev" source: hosted - version: "1.0.5" + version: "2.3.0" dbus: - dependency: transitive + dependency: "direct main" description: name: dbus - url: "https://pub.dartlang.org" + sha256: "6f07cba3f7b3448d42d015bfd3d53fe12e5b36da2423f23838efc1d5fb31a263" + url: "https://pub.dev" source: hosted - version: "0.7.3" + version: "0.7.8" dio: dependency: "direct main" description: name: dio - url: "https://pub.dartlang.org" + sha256: "7d328c4d898a61efc3cd93655a0955858e29a0aa647f0f9e02d59b3bb275e2e8" + url: "https://pub.dev" source: hosted version: "4.0.6" fake_async: dependency: transitive description: name: fake_async - url: "https://pub.dartlang.org" + sha256: "511392330127add0b769b75a987850d136345d9227c6b94c96a04cf4a391bf78" + url: "https://pub.dev" source: hosted - version: "1.2.0" + version: "1.3.1" ffi: dependency: transitive description: name: ffi - url: "https://pub.dartlang.org" + sha256: a38574032c5f1dd06c4aee541789906c12ccaab8ba01446e800d9c5b79c4a978 + url: "https://pub.dev" source: hosted - version: "1.2.1" + version: "2.0.1" + file: + dependency: "direct main" + description: + name: file + sha256: "1b92bec4fc2a72f59a8e15af5f52cd441e4a7860b49499d69dfa817af20e925d" + url: "https://pub.dev" + source: hosted + version: "6.1.4" + fixnum: + dependency: transitive + description: + name: fixnum + sha256: "25517a4deb0c03aa0f32fd12db525856438902d9c16536311e76cdc57b31d7d1" + url: "https://pub.dev" + source: hosted + version: "1.1.0" flutter: dependency: "direct main" description: flutter source: sdk version: "0.0.0" + flutter_driver: + dependency: transitive + description: flutter + source: sdk + version: "0.0.0" flutter_html: dependency: "direct main" description: name: flutter_html - url: "https://pub.dartlang.org" + sha256: "342c7908f0a67bcec62b6e0f7cf23e23bafe7f64693665dd35be98d5e783bdfd" + url: "https://pub.dev" source: hosted - version: "2.2.1" - flutter_layout_grid: - dependency: transitive - description: - name: flutter_layout_grid - url: "https://pub.dartlang.org" - source: hosted - version: "1.0.6" + version: "3.0.0-alpha.6" flutter_lints: dependency: "direct dev" description: name: flutter_lints - url: "https://pub.dartlang.org" + sha256: aeb0b80a8b3709709c9cc496cdc027c5b3216796bc0af0ce1007eaf24464fd4c + url: "https://pub.dev" source: hosted - version: "1.0.4" + version: "2.0.1" flutter_localizations: dependency: "direct main" description: flutter source: sdk version: "0.0.0" - flutter_math_fork: - dependency: transitive - description: - name: flutter_math_fork - url: "https://pub.dartlang.org" - source: hosted - version: "0.5.0" - flutter_svg: - dependency: transitive - description: - name: flutter_svg - url: "https://pub.dartlang.org" - source: hosted - version: "0.23.0+1" flutter_test: dependency: "direct dev" description: flutter @@ -161,333 +314,679 @@ packages: description: flutter source: sdk version: "0.0.0" + freezed: + dependency: "direct dev" + description: + name: freezed + sha256: e819441678f1679b719008ff2ff0ef045d66eed9f9ec81166ca0d9b02a187454 + url: "https://pub.dev" + source: hosted + version: "2.3.2" + freezed_annotation: + dependency: "direct main" + description: + name: freezed_annotation + sha256: aeac15850ef1b38ee368d4c53ba9a847e900bb2c53a4db3f6881cbb3cb684338 + url: "https://pub.dev" + source: hosted + version: "2.2.0" + frontend_server_client: + dependency: transitive + description: + name: frontend_server_client + sha256: "408e3ca148b31c20282ad6f37ebfa6f4bdc8fede5b74bc2f08d9d92b55db3612" + url: "https://pub.dev" + source: hosted + version: "3.2.0" + fuchsia_remote_debug_protocol: + dependency: transitive + description: flutter + source: sdk + version: "0.0.0" fwupd: dependency: "direct main" description: - name: fwupd - url: "https://pub.dartlang.org" - source: hosted + path: "." + ref: refresh-property-cache + resolved-ref: "22f96d558fb3b72b682758a7b55f39002cd217c2" + url: "https://github.com/d-loose/fwupd.dart" + source: git version: "0.2.2" + get_it: + dependency: transitive + description: + name: get_it + sha256: f9982979e3d2f286a957c04d2c3a98f55b0f0a06ffd6c5c4abbb96f06937f463 + url: "https://pub.dev" + source: hosted + version: "7.3.0" + glob: + dependency: transitive + description: + name: glob + sha256: "4515b5b6ddb505ebdd242a5f2cc5d22d3d6a80013789debfbda7777f47ea308c" + url: "https://pub.dev" + source: hosted + version: "2.1.1" + graphs: + dependency: transitive + description: + name: graphs + sha256: f9e130f3259f52d26f0cfc0e964513796dafed572fa52e45d2f8d6ca14db39b2 + url: "https://pub.dev" + source: hosted + version: "2.2.0" + gtk: + dependency: "direct main" + description: + name: gtk + sha256: "517560d6ec625c114cbdcde9223e5ee6418d30860377347ee1b0513399e7a3f5" + url: "https://pub.dev" + source: hosted + version: "2.0.0" + handy_window: + dependency: "direct main" + description: + name: handy_window + sha256: "458a9f7d4ae23816e8f33c76596f943a04e7eff13d864e0867f3b40f1647d63d" + url: "https://pub.dev" + source: hosted + version: "0.3.1" html: dependency: transitive description: name: html - url: "https://pub.dartlang.org" + sha256: "79d498e6d6761925a34ee5ea8fa6dfef38607781d2fa91e37523474282af55cb" + url: "https://pub.dev" source: hosted - version: "0.15.1" + version: "0.15.2" + http: + dependency: transitive + description: + name: http + sha256: "6aa2946395183537c8b880962d935877325d6a09a2867c3970c05c0fed6ac482" + url: "https://pub.dev" + source: hosted + version: "0.13.5" + http_multi_server: + dependency: transitive + description: + name: http_multi_server + sha256: "97486f20f9c2f7be8f514851703d0119c3596d14ea63227af6f7a481ef2b2f8b" + url: "https://pub.dev" + source: hosted + version: "3.2.1" http_parser: dependency: transitive description: name: http_parser - url: "https://pub.dartlang.org" + sha256: "2aa08ce0341cc9b354a498388e30986515406668dbcc4f7c950c3e715496693b" + url: "https://pub.dev" source: hosted version: "4.0.2" + integration_test: + dependency: "direct dev" + description: flutter + source: sdk + version: "0.0.0" intl: dependency: transitive description: name: intl - url: "https://pub.dartlang.org" + sha256: "910f85bce16fb5c6f614e117efa303e85a1731bb0081edf3604a2ae6e9a3cc91" + url: "https://pub.dev" source: hosted version: "0.17.0" + io: + dependency: transitive + description: + name: io + sha256: "2ec25704aba361659e10e3e5f5d672068d332fc8ac516421d483a11e5cbd061e" + url: "https://pub.dev" + source: hosted + version: "1.0.4" js: dependency: transitive description: name: js - url: "https://pub.dartlang.org" + sha256: "5528c2f391ededb7775ec1daa69e65a2d61276f7552de2b5f7b8d34ee9fd4ab7" + url: "https://pub.dev" source: hosted - version: "0.6.3" + version: "0.6.5" + json_annotation: + dependency: transitive + description: + name: json_annotation + sha256: c33da08e136c3df0190bd5bbe51ae1df4a7d96e7954d1d7249fea2968a72d317 + url: "https://pub.dev" + source: hosted + version: "4.8.0" lints: dependency: transitive description: name: lints - url: "https://pub.dartlang.org" + sha256: "5e4a9cd06d447758280a8ac2405101e0e2094d2a1dbdd3756aec3fe7775ba593" + url: "https://pub.dev" source: hosted - version: "1.0.1" + version: "2.0.1" + logging: + dependency: transitive + description: + name: logging + sha256: "04094f2eb032cbb06c6f6e8d3607edcfcb0455e2bb6cbc010cb01171dcb64e6d" + url: "https://pub.dev" + source: hosted + version: "1.1.1" + logging_appenders: + dependency: transitive + description: + name: logging_appenders + sha256: c2ea00fb779a81e995943f1e3e6e6969d463de3882d134d78ad58e76f2b6f1b1 + url: "https://pub.dev" + source: hosted + version: "1.0.2" matcher: dependency: transitive description: name: matcher - url: "https://pub.dartlang.org" + sha256: "16db949ceee371e9b99d22f88fa3a73c4e59fd0afed0bd25fc336eb76c198b72" + url: "https://pub.dev" source: hosted - version: "0.12.11" + version: "0.12.13" material_color_utilities: dependency: transitive description: name: material_color_utilities - url: "https://pub.dartlang.org" + sha256: d92141dc6fe1dad30722f9aa826c7fbc896d021d792f80678280601aff8cf724 + url: "https://pub.dev" source: hosted - version: "0.1.3" + version: "0.2.0" + melos: + dependency: "direct dev" + description: + name: melos + sha256: "993ac467e7a36bd832a6cdabbe18a0487c30bc52b5cca14e476a824679ebdce0" + url: "https://pub.dev" + source: hosted + version: "3.0.1" meta: - dependency: transitive + dependency: "direct main" description: name: meta - url: "https://pub.dartlang.org" + sha256: "6c268b42ed578a53088d834796959e4a1814b5e9e164f147f580a386e5decf42" + url: "https://pub.dev" source: hosted - version: "1.7.0" + version: "1.8.0" + mime: + dependency: transitive + description: + name: mime + sha256: e4ff8e8564c03f255408decd16e7899da1733852a9110a58fe6d1b817684a63e + url: "https://pub.dev" + source: hosted + version: "1.0.4" + mockito: + dependency: "direct dev" + description: + name: mockito + sha256: dd61809f04da1838a680926de50a9e87385c1de91c6579629c3d1723946e8059 + url: "https://pub.dev" + source: hosted + version: "5.4.0" + mustache_template: + dependency: transitive + description: + name: mustache_template + sha256: a46e26f91445bfb0b60519be280555b06792460b27b19e2b19ad5b9740df5d1c + url: "https://pub.dev" + source: hosted + version: "2.0.0" nested: dependency: transitive description: name: nested - url: "https://pub.dartlang.org" + sha256: "03bac4c528c64c95c722ec99280375a6f2fc708eec17c7b3f07253b626cd2a20" + url: "https://pub.dev" source: hosted version: "1.0.0" numerus: dependency: transitive description: name: numerus - url: "https://pub.dartlang.org" + sha256: "436759d84f233b40107d0cc31cfa92d24e0960afeb2e506be70926d4cddffd9e" + url: "https://pub.dev" source: hosted - version: "1.1.1" + version: "2.0.0" + package_config: + dependency: transitive + description: + name: package_config + sha256: "1c5b77ccc91e4823a5af61ee74e6b972db1ef98c2ff5a18d3161c982a55448bd" + url: "https://pub.dev" + source: hosted + version: "2.1.0" path: dependency: "direct main" description: name: path - url: "https://pub.dartlang.org" + sha256: db9d4f58c908a4ba5953fcee2ae317c94889433e5024c27ce74a37f94267945b + url: "https://pub.dev" source: hosted - version: "1.8.0" - path_drawing: - dependency: transitive - description: - name: path_drawing - url: "https://pub.dartlang.org" - source: hosted - version: "0.5.1+1" - path_parsing: - dependency: transitive - description: - name: path_parsing - url: "https://pub.dartlang.org" - source: hosted - version: "0.2.1" + version: "1.8.2" petitparser: dependency: transitive description: name: petitparser - url: "https://pub.dartlang.org" + sha256: "49392a45ced973e8d94a85fdb21293fbb40ba805fc49f2965101ae748a3683b4" + url: "https://pub.dev" source: hosted - version: "4.4.0" + version: "5.1.0" + platform: + dependency: transitive + description: + name: platform + sha256: "4a451831508d7d6ca779f7ac6e212b4023dd5a7d08a27a63da33756410e32b76" + url: "https://pub.dev" + source: hosted + version: "3.1.0" plugin_platform_interface: dependency: transitive description: name: plugin_platform_interface - url: "https://pub.dartlang.org" + sha256: "6a2128648c854906c53fa8e33986fc0247a1116122f9534dd20e3ab9e16a32bc" + url: "https://pub.dev" source: hosted - version: "2.1.3" + version: "2.1.4" + pool: + dependency: transitive + description: + name: pool + sha256: "20fe868b6314b322ea036ba325e6fc0711a22948856475e2c2b6306e8ab39c2a" + url: "https://pub.dev" + source: hosted + version: "1.5.1" + process: + dependency: transitive + description: + name: process + sha256: "53fd8db9cec1d37b0574e12f07520d582019cb6c44abf5479a01505099a34a09" + url: "https://pub.dev" + source: hosted + version: "4.2.4" + prompts: + dependency: transitive + description: + name: prompts + sha256: "3773b845e85a849f01e793c4fc18a45d52d7783b4cb6c0569fad19f9d0a774a1" + url: "https://pub.dev" + source: hosted + version: "2.0.0" provider: dependency: "direct main" description: name: provider - url: "https://pub.dartlang.org" + sha256: cdbe7530b12ecd9eb455bdaa2fcb8d4dad22e80b8afb4798b41479d5ce26847f + url: "https://pub.dev" source: hosted version: "6.0.5" + pub_semver: + dependency: transitive + description: + name: pub_semver + sha256: "307de764d305289ff24ad257ad5c5793ce56d04947599ad68b3baa124105fc17" + url: "https://pub.dev" + source: hosted + version: "2.1.3" + pub_updater: + dependency: transitive + description: + name: pub_updater + sha256: "42890302ab2672adf567dc2b20e55b4ecc29d7e19c63b6b98143ab68dd717d3a" + url: "https://pub.dev" + source: hosted + version: "0.2.4" + pubspec: + dependency: transitive + description: + name: pubspec + sha256: f534a50a2b4d48dc3bc0ec147c8bd7c304280fff23b153f3f11803c4d49d927e + url: "https://pub.dev" + source: hosted + version: "2.3.0" + pubspec_parse: + dependency: transitive + description: + name: pubspec_parse + sha256: ec85d7d55339d85f44ec2b682a82fea340071e8978257e5a43e69f79e98ef50c + url: "https://pub.dev" + source: hosted + version: "1.2.2" quiver: dependency: transitive description: name: quiver - url: "https://pub.dartlang.org" + sha256: b1c1ac5ce6688d77f65f3375a9abb9319b3cb32486bdc7a1e0fdf004d7ba4e47 + url: "https://pub.dev" source: hosted - version: "3.1.0" + version: "3.2.1" + safe_change_notifier: + dependency: "direct main" + description: + name: safe_change_notifier + sha256: e69034655ea33aa7dce3c5bb33cf12fc7c07a0ce7d59b7291fd030b70d059570 + url: "https://pub.dev" + source: hosted + version: "0.2.0" + screen_retriever: + dependency: transitive + description: + name: screen_retriever + sha256: "4931f226ca158123ccd765325e9fbf360bfed0af9b460a10f960f9bb13d58323" + url: "https://pub.dev" + source: hosted + version: "0.1.6" + shelf: + dependency: transitive + description: + name: shelf + sha256: c24a96135a2ccd62c64b69315a14adc5c3419df63b4d7c05832a346fdb73682c + url: "https://pub.dev" + source: hosted + version: "1.4.0" + shelf_web_socket: + dependency: transitive + description: + name: shelf_web_socket + sha256: a988c0e8d8ffbdb8a28aa7ec8e449c260f3deb808781fe1284d22c5bba7156e8 + url: "https://pub.dev" + source: hosted + version: "1.0.3" sky_engine: dependency: transitive description: flutter source: sdk version: "0.0.99" + source_gen: + dependency: transitive + description: + name: source_gen + sha256: c2bea18c95cfa0276a366270afaa2850b09b4a76db95d546f3d003dcc7011298 + url: "https://pub.dev" + source: hosted + version: "1.2.7" source_span: dependency: transitive description: name: source_span - url: "https://pub.dartlang.org" + sha256: dd904f795d4b4f3b870833847c461801f6750a9fa8e61ea5ac53f9422b31f250 + url: "https://pub.dev" source: hosted - version: "1.8.1" + version: "1.9.1" stack_trace: dependency: transitive description: name: stack_trace - url: "https://pub.dartlang.org" + sha256: c3c7d8edb15bee7f0f74debd4b9c5f3c2ea86766fe4178eb2a18eb30a0bdaed5 + url: "https://pub.dev" source: hosted - version: "1.10.0" + version: "1.11.0" stream_channel: dependency: transitive description: name: stream_channel - url: "https://pub.dartlang.org" + sha256: "83615bee9045c1d322bbbd1ba209b7a749c2cbcdcb3fdd1df8eb488b3279c1c8" + url: "https://pub.dev" + source: hosted + version: "2.1.1" + stream_transform: + dependency: transitive + description: + name: stream_transform + sha256: "14a00e794c7c11aa145a170587321aedce29769c08d7f58b1d141da75e3b1c6f" + url: "https://pub.dev" source: hosted version: "2.1.0" string_scanner: dependency: transitive description: name: string_scanner - url: "https://pub.dartlang.org" + sha256: "556692adab6cfa87322a115640c11f13cb77b3f076ddcc5d6ae3c20242bedcde" + url: "https://pub.dev" source: hosted - version: "1.1.0" + version: "1.2.0" + sync_http: + dependency: transitive + description: + name: sync_http + sha256: "7f0cd72eca000d2e026bcd6f990b81d0ca06022ef4e32fb257b30d3d1014a961" + url: "https://pub.dev" + source: hosted + version: "0.3.1" term_glyph: dependency: transitive description: name: term_glyph - url: "https://pub.dartlang.org" + sha256: a29248a84fbb7c79282b40b8c72a1209db169a2e0542bce341da992fe1bc7e84 + url: "https://pub.dev" source: hosted - version: "1.2.0" + version: "1.2.1" test_api: dependency: transitive description: name: test_api - url: "https://pub.dartlang.org" + sha256: ad540f65f92caa91bf21dfc8ffb8c589d6e4dc0c2267818b4cc2792857706206 + url: "https://pub.dev" source: hosted - version: "0.4.8" - tuple: + version: "0.4.16" + timing: dependency: transitive description: - name: tuple - url: "https://pub.dartlang.org" + name: timing + sha256: "70a3b636575d4163c477e6de42f247a23b315ae20e86442bebe32d3cabf61c32" + url: "https://pub.dev" source: hosted - version: "2.0.1" + version: "1.0.1" typed_data: dependency: transitive description: name: typed_data - url: "https://pub.dartlang.org" + sha256: "26f87ade979c47a150c9eaab93ccd2bebe70a27dc0b4b29517f2904f04eb11a5" + url: "https://pub.dev" source: hosted - version: "1.3.0" + version: "1.3.1" + ubuntu_logger: + dependency: "direct main" + description: + path: "packages/ubuntu_logger" + ref: HEAD + resolved-ref: f4ea41813779aff3b4dfb6a1b6c1382d2fb3ce81 + url: "https://github.com/canonical/ubuntu-flutter-plugins.git" + source: git + version: "0.0.1" + ubuntu_service: + dependency: "direct main" + description: + name: ubuntu_service + sha256: "79b81c146c9fb1aedefa4a6f63724405de3aba0f525afe39b72c513df04a8c13" + url: "https://pub.dev" + source: hosted + version: "0.2.2" + ubuntu_session: + dependency: "direct main" + description: + name: ubuntu_session + sha256: ce79fdd31faf7982b061b2e4a1cdd0815baf3b6b976e9c16c72609749511f3a1 + url: "https://pub.dev" + source: hosted + version: "0.0.4" + upower: + dependency: "direct main" + description: + name: upower + sha256: cf042403154751180affa1d15614db7fa50234bc2373cd21c3db666c38543ebf + url: "https://pub.dev" + source: hosted + version: "0.7.0" + uri: + dependency: transitive + description: + name: uri + sha256: "889eea21e953187c6099802b7b4cf5219ba8f3518f604a1033064d45b1b8268a" + url: "https://pub.dev" + source: hosted + version: "1.0.0" vector_math: dependency: transitive description: name: vector_math - url: "https://pub.dartlang.org" + sha256: "80b3257d1492ce4d091729e3a67a60407d227c27241d6927be0130c98e741803" + url: "https://pub.dev" source: hosted - version: "2.1.1" - video_player: + version: "2.1.4" + vm_service: dependency: transitive description: - name: video_player - url: "https://pub.dartlang.org" + name: vm_service + sha256: e7fb6c2282f7631712b69c19d1bff82f3767eea33a2321c14fa59ad67ea391c7 + url: "https://pub.dev" source: hosted - version: "2.5.1" - video_player_android: + version: "9.4.0" + watcher: dependency: transitive description: - name: video_player_android - url: "https://pub.dartlang.org" + name: watcher + sha256: "6a7f46926b01ce81bfc339da6a7f20afbe7733eff9846f6d6a5466aa4c6667c0" + url: "https://pub.dev" source: hosted - version: "2.3.10" - video_player_avfoundation: + version: "1.0.2" + web_socket_channel: dependency: transitive description: - name: video_player_avfoundation - url: "https://pub.dartlang.org" + name: web_socket_channel + sha256: d88238e5eac9a42bb43ca4e721edba3c08c6354d4a53063afaa568516217621b + url: "https://pub.dev" source: hosted - version: "2.3.8" - video_player_platform_interface: + version: "2.4.0" + webdriver: dependency: transitive description: - name: video_player_platform_interface - url: "https://pub.dartlang.org" + name: webdriver + sha256: ef67178f0cc7e32c1494645b11639dd1335f1d18814aa8435113a92e9ef9d841 + url: "https://pub.dev" source: hosted - version: "6.0.1" - video_player_web: + version: "3.0.1" + window_manager: dependency: transitive description: - name: video_player_web - url: "https://pub.dartlang.org" + name: window_manager + sha256: "2b2572442b2a5178642730442dc625ac088244f5827b1f0811371b1b7485eb62" + url: "https://pub.dev" source: hosted - version: "2.0.13" - wakelock: - dependency: transitive - description: - name: wakelock - url: "https://pub.dartlang.org" - source: hosted - version: "0.6.2" - wakelock_macos: - dependency: transitive - description: - name: wakelock_macos - url: "https://pub.dartlang.org" - source: hosted - version: "0.4.0" - wakelock_platform_interface: - dependency: transitive - description: - name: wakelock_platform_interface - url: "https://pub.dartlang.org" - source: hosted - version: "0.3.0" - wakelock_web: - dependency: transitive - description: - name: wakelock_web - url: "https://pub.dartlang.org" - source: hosted - version: "0.4.0" - wakelock_windows: - dependency: transitive - description: - name: wakelock_windows - url: "https://pub.dartlang.org" - source: hosted - version: "0.2.0" - webview_flutter: - dependency: transitive - description: - name: webview_flutter - url: "https://pub.dartlang.org" - source: hosted - version: "2.8.0" - webview_flutter_android: - dependency: transitive - description: - name: webview_flutter_android - url: "https://pub.dartlang.org" - source: hosted - version: "2.8.14" - webview_flutter_platform_interface: - dependency: transitive - description: - name: webview_flutter_platform_interface - url: "https://pub.dartlang.org" - source: hosted - version: "1.9.5" - webview_flutter_wkwebview: - dependency: transitive - description: - name: webview_flutter_wkwebview - url: "https://pub.dartlang.org" - source: hosted - version: "2.7.5" - win32: - dependency: transitive - description: - name: win32 - url: "https://pub.dartlang.org" - source: hosted - version: "2.5.2" + version: "0.3.2" xml: dependency: transitive description: name: xml - url: "https://pub.dartlang.org" + sha256: "979ee37d622dec6365e2efa4d906c37470995871fe9ae080d967e192d88286b5" + url: "https://pub.dev" source: hosted - version: "5.3.1" + version: "6.2.2" + yaml: + dependency: transitive + description: + name: yaml + sha256: "23812a9b125b48d4007117254bca50abb6c712352927eece9e155207b1db2370" + url: "https://pub.dev" + source: hosted + version: "3.1.1" + yaml_edit: + dependency: transitive + description: + name: yaml_edit + sha256: "0b968021754d8fbd3e9c83563b538ee417d88b2cc587606da5615546b7ee033b" + url: "https://pub.dev" + source: hosted + version: "2.1.0" yaru: dependency: "direct main" description: name: yaru - url: "https://pub.dartlang.org" + sha256: "1d1fb60359a92f91cc7e6a76fd3046474b9734d2fb97b7a7189bb1e2ca66929f" + url: "https://pub.dev" source: hosted - version: "0.2.5" + version: "0.6.2" + yaru_color_generator: + dependency: transitive + description: + name: yaru_color_generator + sha256: "78b96cefc4eef763e4786f891ce336cdd55ef8edc55494c4bea2bc9d10ef9c96" + url: "https://pub.dev" + source: hosted + version: "0.1.0" + yaru_colors: + dependency: "direct main" + description: + name: yaru_colors + sha256: "42814cafa3c4a6876962559ae9d8b9ff088a59635e649e4eae86d35905496063" + url: "https://pub.dev" + source: hosted + version: "0.1.7" yaru_icons: dependency: "direct main" description: name: yaru_icons - url: "https://pub.dartlang.org" + sha256: "8ddd40522c882de898a493094f2f41687f7a0faaf3434b9c854a7605a53a2477" + url: "https://pub.dev" source: hosted - version: "0.1.3" + version: "1.0.4" yaru_widgets: dependency: "direct main" description: name: yaru_widgets - url: "https://pub.dartlang.org" + sha256: "2fd284afe8c8c8104ea18b963d5db68f780ec65048be7ac0624d0dbb7176c55f" + url: "https://pub.dev" source: hosted - version: "1.0.8" + version: "2.3.1" + yaru_window: + dependency: transitive + description: + name: yaru_window + sha256: "18b3df2922a068e5480048335e2585c134e29ac77baec19b26fa32851910bf2f" + url: "https://pub.dev" + source: hosted + version: "0.1.1" + yaru_window_linux: + dependency: transitive + description: + name: yaru_window_linux + sha256: "356903ebcb70c34f732dbb66ac8b504adb8e92289cdd89da86bed8957f43de38" + url: "https://pub.dev" + source: hosted + version: "0.1.1" + yaru_window_manager: + dependency: transitive + description: + name: yaru_window_manager + sha256: a5ea9db86cbca6306fdf139245fcd84f0df1fed0aead3450d34a9fe7be4d3020 + url: "https://pub.dev" + source: hosted + version: "0.1.0" + yaru_window_platform_interface: + dependency: transitive + description: + name: yaru_window_platform_interface + sha256: "1a0256fc59cc46ad05de5840f01d548184ff900698c19dc24e6326c7911b0177" + url: "https://pub.dev" + source: hosted + version: "0.1.0" + yaru_window_web: + dependency: transitive + description: + name: yaru_window_web + sha256: "77dacaaade6c2b5f94cf45b80f60c69876d62db02490e50dd025ce297cfc09ed" + url: "https://pub.dev" + source: hosted + version: "0.0.2" sdks: - dart: ">=2.15.0 <3.0.0" - flutter: ">=2.10.0" + dart: ">=2.19.0 <3.0.0" + flutter: ">=3.7.0" diff --git a/pkgs/servers/clickhouse/default.nix b/pkgs/servers/clickhouse/default.nix index 6170cb6d6c9a..6c0d6064c98e 100644 --- a/pkgs/servers/clickhouse/default.nix +++ b/pkgs/servers/clickhouse/default.nix @@ -57,6 +57,8 @@ stdenv.mkDerivation rec { $out/etc/clickhouse-server/config.xml substituteInPlace $out/etc/clickhouse-server/config.xml \ --replace "/var/log/clickhouse-server/clickhouse-server.err.log" "1" + substituteInPlace $out/etc/clickhouse-server/config.xml \ + --replace "trace" "warning" ''; hardeningDisable = [ "format" ]; diff --git a/pkgs/tools/graphics/vulkan-extension-layer/default.nix b/pkgs/tools/graphics/vulkan-extension-layer/default.nix index 37de2d20aafc..81e2f329d1b5 100644 --- a/pkgs/tools/graphics/vulkan-extension-layer/default.nix +++ b/pkgs/tools/graphics/vulkan-extension-layer/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "vulkan-extension-layer"; - version = "1.3.243.0"; + version = "1.3.248"; src = fetchFromGitHub { owner = "KhronosGroup"; repo = "Vulkan-ExtensionLayer"; - rev = "sdk-${version}"; - hash = "sha256-hxlfSnH4M3ui5nW0Ll5rhto0DnJIHW0tJzS+p4KV0R4="; + rev = "v${version}"; + hash = "sha256-CuwYpB8HX8pnR+ElkQfckpKDLKyZIzqm4F9kluM1cKo="; }; nativeBuildInputs = [ cmake jq ]; @@ -40,6 +40,5 @@ stdenv.mkDerivation rec { platforms = platforms.linux; license = licenses.asl20; maintainers = with maintainers; [ expipiplus1 ]; - broken = (version != vulkan-headers.version); }; } diff --git a/pkgs/tools/graphics/vulkan-tools/default.nix b/pkgs/tools/graphics/vulkan-tools/default.nix index 47a17158653f..d3ffe35ff964 100644 --- a/pkgs/tools/graphics/vulkan-tools/default.nix +++ b/pkgs/tools/graphics/vulkan-tools/default.nix @@ -21,13 +21,13 @@ stdenv.mkDerivation rec { pname = "vulkan-tools"; - version = "1.3.243.0"; + version = "1.3.249"; src = fetchFromGitHub { owner = "KhronosGroup"; repo = "Vulkan-Tools"; - rev = "sdk-${version}"; - hash = "sha256-8XJON+iBEPRtuQWf1bPXyOJHRkuRLnLXgTIjk7gYQwE="; + rev = "v${version}"; + hash = "sha256-+d0Yp+e/wzlRmUIs4SffiphkqmM/7avJrt3JNOgO19I="; }; nativeBuildInputs = [ @@ -103,6 +103,5 @@ stdenv.mkDerivation rec { platforms = platforms.unix; license = licenses.asl20; maintainers = [ maintainers.ralith ]; - broken = (version != vulkan-headers.version); }; } diff --git a/pkgs/tools/misc/shell_gpt/default.nix b/pkgs/tools/misc/shell_gpt/default.nix index 9e3000a3cf72..e13137580324 100644 --- a/pkgs/tools/misc/shell_gpt/default.nix +++ b/pkgs/tools/misc/shell_gpt/default.nix @@ -5,11 +5,12 @@ python3.pkgs.buildPythonApplication rec { pname = "shell_gpt"; - version = "0.8.8"; + version = "0.9.0"; + format = "pyproject"; src = python3.pkgs.fetchPypi { inherit pname version; - sha256 = "sha256-KuaSAiXlqWRhFtX4C6vibbUiq43L83pZX+yM9L7Ej68="; + sha256 = "sha256-KzW9yI1TGG2hFKeXHFqqYCLw/PB9+lJoTgyWrXxCHpo="; }; nativeBuildInputs = with python3.pkgs; [ @@ -24,6 +25,7 @@ python3.pkgs.buildPythonApplication rec { distro typer requests + hatchling ]; pythonRelaxDeps = [ "requests" "rich" "distro" "typer" ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c9d0658ea775..5a46b6afe7f6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16213,6 +16213,7 @@ with pkgs; cargo-hf2 = callPackage ../development/tools/rust/cargo-hf2 { inherit (darwin.apple_sdk.frameworks) AppKit; }; + cargo-info = callPackage ../development/tools/rust/cargo-info { }; cargo-inspect = callPackage ../development/tools/rust/cargo-inspect { inherit (darwin.apple_sdk.frameworks) Security; }; @@ -31174,6 +31175,8 @@ with pkgs; i3-balance-workspace = python3Packages.callPackage ../applications/window-managers/i3/balance-workspace.nix { }; + i3-cycle-focus = callPackage ../applications/window-managers/i3/cycle-focus.nix { }; + i3-easyfocus = callPackage ../applications/window-managers/i3/easyfocus.nix { }; i3-layout-manager = callPackage ../applications/window-managers/i3/layout-manager.nix { }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 84e43292b3f8..3f1f14656478 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3768,6 +3768,8 @@ self: super: with self; { fsspec = callPackage ../development/python-modules/fsspec { }; + fst-pso = callPackage ../development/python-modules/fst-pso { }; + ftfy = callPackage ../development/python-modules/ftfy { }; ftputil = callPackage ../development/python-modules/ftputil { }; @@ -6112,6 +6114,8 @@ self: super: with self; { minidump = callPackage ../development/python-modules/minidump { }; + miniful = callPackage ../development/python-modules/miniful { }; + minikanren = callPackage ../development/python-modules/minikanren { }; minikerberos = callPackage ../development/python-modules/minikerberos { }; @@ -10931,6 +10935,8 @@ self: super: with self; { simplisafe-python = callPackage ../development/python-modules/simplisafe-python { }; + simpful = callPackage ../development/python-modules/simpful { }; + simpy = callPackage ../development/python-modules/simpy { }; single-version = callPackage ../development/python-modules/single-version { };