diff --git a/.envrc b/.envrc deleted file mode 100644 index 1d953f4bd735..000000000000 --- a/.envrc +++ /dev/null @@ -1 +0,0 @@ -use nix diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index fa4603806b2f..15074cd2e47e 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -19,7 +19,6 @@ # Develompent support /.editorconfig @Mic92 @zowoq /shell.nix @infinisil @NixOS/Security -/.envrc @infinisil @NixOS/Security # Libraries /lib @infinisil diff --git a/.gitignore b/.gitignore index d8d8847c5679..f6bc21ef41c9 100644 --- a/.gitignore +++ b/.gitignore @@ -21,6 +21,7 @@ tags /source/ .version-suffix .direnv +.envrc .DS_Store .mypy_cache diff --git a/doc/common.nix b/doc/common.nix deleted file mode 100644 index 56f723eb6bd7..000000000000 --- a/doc/common.nix +++ /dev/null @@ -1,4 +0,0 @@ -{ - outputPath = "share/doc/nixpkgs"; - indexPath = "manual.html"; -} diff --git a/doc/default.nix b/doc/default.nix index 6492d78601c8..2c9a0439feb5 100644 --- a/doc/default.nix +++ b/doc/default.nix @@ -1,196 +1,6 @@ -{ pkgs ? (import ./.. { }), nixpkgs ? { }}: -let - inherit (pkgs) lib; - inherit (lib) hasPrefix removePrefix; - fs = lib.fileset; +{ + pkgs ? (import ./.. { }), + nixpkgs ? { }, +}: - common = import ./common.nix; - - lib-docs = import ./doc-support/lib-function-docs.nix { - inherit pkgs nixpkgs; - libsets = [ - { name = "asserts"; description = "assertion functions"; } - { name = "attrsets"; description = "attribute set functions"; } - { name = "strings"; description = "string manipulation functions"; } - { name = "versions"; description = "version string functions"; } - { name = "trivial"; description = "miscellaneous functions"; } - { name = "fixedPoints"; baseName = "fixed-points"; description = "explicit recursion functions"; } - { name = "lists"; description = "list manipulation functions"; } - { name = "debug"; description = "debugging functions"; } - { name = "options"; description = "NixOS / nixpkgs option handling"; } - { name = "path"; description = "path functions"; } - { name = "filesystem"; description = "filesystem functions"; } - { name = "fileset"; description = "file set functions"; } - { name = "sources"; description = "source filtering functions"; } - { name = "cli"; description = "command-line serialization functions"; } - { name = "generators"; description = "functions that create file formats from nix data structures"; } - { name = "gvariant"; description = "GVariant formatted string serialization functions"; } - { name = "customisation"; description = "Functions to customise (derivation-related) functions, derivatons, or attribute sets"; } - { name = "meta"; description = "functions for derivation metadata"; } - { name = "derivations"; description = "miscellaneous derivation-specific functions"; } - ]; - }; - - epub = pkgs.runCommand "manual.epub" { - nativeBuildInputs = with pkgs; [ libxslt zip ]; - - epub = '' - - - Nixpkgs Manual - Version ${pkgs.lib.version} - - - Temporarily unavailable - - The Nixpkgs manual is currently not available in EPUB format, - please use the HTML manual - instead. - - - If you've used the EPUB manual in the past and it has been useful to you, please - let us know. - - - - ''; - - passAsFile = [ "epub" ]; - } '' - mkdir scratch - xsltproc \ - --param chapter.autolabel 0 \ - --nonet \ - --output scratch/ \ - ${pkgs.docbook_xsl_ns}/xml/xsl/docbook/epub/docbook.xsl \ - $epubPath - - echo "application/epub+zip" > mimetype - zip -0Xq -b "$TMPDIR" "$out" mimetype - cd scratch && zip -Xr9D -b "$TMPDIR" "$out" * - ''; - - # NB: This file describes the Nixpkgs manual, which happens to use module - # docs infra originally developed for NixOS. - optionsDoc = pkgs.nixosOptionsDoc { - inherit (pkgs.lib.evalModules { - modules = [ ../pkgs/top-level/config.nix ]; - class = "nixpkgsConfig"; - }) options; - documentType = "none"; - transformOptions = opt: - opt // { - declarations = - map - (decl: - if hasPrefix (toString ../..) (toString decl) - then - let subpath = removePrefix "/" (removePrefix (toString ../.) (toString decl)); - in { url = "https://github.com/NixOS/nixpkgs/blob/master/${subpath}"; name = subpath; } - else decl) - opt.declarations; - }; - }; -in pkgs.stdenv.mkDerivation { - name = "nixpkgs-manual"; - - nativeBuildInputs = with pkgs; [ - nixos-render-docs - ]; - - src = fs.toSource { - root = ./.; - fileset = fs.unions [ - (fs.fileFilter (file: - file.hasExt "md" - || file.hasExt "md.in" - ) ./.) - ./style.css - ./anchor-use.js - ./anchor.min.js - ./manpage-urls.json - ]; - }; - - postPatch = '' - ln -s ${optionsDoc.optionsJSON}/share/doc/nixos/options.json ./config-options.json - ''; - - pythonInterpreterTable = pkgs.callPackage ./doc-support/python-interpreter-table.nix {}; - - passAsFile = [ "pythonInterpreterTable" ]; - - buildPhase = '' - substituteInPlace ./languages-frameworks/python.section.md --subst-var-by python-interpreter-table "$(<"$pythonInterpreterTablePath")" - - cat \ - ./functions/library.md.in \ - ${lib-docs}/index.md \ - > ./functions/library.md - substitute ./manual.md.in ./manual.md \ - --replace-fail '@MANUAL_VERSION@' '${pkgs.lib.version}' - - mkdir -p out/media - - mkdir -p out/highlightjs - cp -t out/highlightjs \ - ${pkgs.documentation-highlighter}/highlight.pack.js \ - ${pkgs.documentation-highlighter}/LICENSE \ - ${pkgs.documentation-highlighter}/mono-blue.css \ - ${pkgs.documentation-highlighter}/loader.js - - cp -t out ./style.css ./anchor.min.js ./anchor-use.js - - nixos-render-docs manual html \ - --manpage-urls ./manpage-urls.json \ - --revision ${pkgs.lib.trivial.revisionWithDefault (pkgs.rev or "master")} \ - --stylesheet style.css \ - --stylesheet highlightjs/mono-blue.css \ - --script ./highlightjs/highlight.pack.js \ - --script ./highlightjs/loader.js \ - --script ./anchor.min.js \ - --script ./anchor-use.js \ - --toc-depth 1 \ - --section-toc-depth 1 \ - manual.md \ - out/index.html - ''; - - installPhase = '' - dest="$out/${common.outputPath}" - mkdir -p "$(dirname "$dest")" - mv out "$dest" - mv "$dest/index.html" "$dest/${common.indexPath}" - - cp ${epub} "$dest/nixpkgs-manual.epub" - - mkdir -p $out/nix-support/ - echo "doc manual $dest ${common.indexPath}" >> $out/nix-support/hydra-build-products - echo "doc manual $dest nixpkgs-manual.epub" >> $out/nix-support/hydra-build-products - ''; - - passthru.tests.manpage-urls = with pkgs; testers.invalidateFetcherByDrvHash - ({ name ? "manual_check-manpage-urls" - , script - , urlsFile - }: runCommand name { - nativeBuildInputs = [ - cacert - (python3.withPackages (p: with p; [ - aiohttp - rich - structlog - ])) - ]; - outputHash = "sha256-47DEQpj8HBSa+/TImW+5JCeuQeRkm5NMpJWZG3hSuFU="; # Empty output - } '' - python3 ${script} ${urlsFile} - touch $out - '') { - script = ./tests/manpage-urls.py; - urlsFile = ./manpage-urls.json; - }; -} +pkgs.nixpkgs-manual.override { inherit nixpkgs; } diff --git a/doc/doc-support/epub.nix b/doc/doc-support/epub.nix new file mode 100644 index 000000000000..2b8d6b5f2470 --- /dev/null +++ b/doc/doc-support/epub.nix @@ -0,0 +1,54 @@ +# To build this derivation, run `nix-build -A nixpkgs-manual.epub` +{ + lib, + runCommand, + docbook_xsl_ns, + libxslt, + zip, +}: +runCommand "manual.epub" + { + nativeBuildInputs = [ + libxslt + zip + ]; + + epub = '' + + + Nixpkgs Manual + Version ${lib.version} + + + Temporarily unavailable + + The Nixpkgs manual is currently not available in EPUB format, + please use the HTML manual + instead. + + + If you've used the EPUB manual in the past and it has been useful to you, please + let us know. + + + + ''; + + passAsFile = [ "epub" ]; + } + '' + mkdir scratch + xsltproc \ + --param chapter.autolabel 0 \ + --nonet \ + --output scratch/ \ + ${docbook_xsl_ns}/xml/xsl/docbook/epub/docbook.xsl \ + $epubPath + + echo "application/epub+zip" > mimetype + zip -0Xq -b "$TMPDIR" "$out" mimetype + cd scratch && zip -Xr9D -b "$TMPDIR" "$out" * + '' diff --git a/doc/doc-support/lib-function-docs.nix b/doc/doc-support/lib-function-docs.nix index 9e1fdedd2cb9..8c9673d887bf 100644 --- a/doc/doc-support/lib-function-docs.nix +++ b/doc/doc-support/lib-function-docs.nix @@ -1,23 +1,111 @@ # Generates the documentation for library functions via nixdoc. +# To build this derivation, run `nix-build -A nixpkgs-manual.lib-docs` +{ + lib, + stdenvNoCC, + nixdoc, + nix, + nixpkgs ? { }, + libsets ? [ + { + name = "asserts"; + description = "assertion functions"; + } + { + name = "attrsets"; + description = "attribute set functions"; + } + { + name = "strings"; + description = "string manipulation functions"; + } + { + name = "versions"; + description = "version string functions"; + } + { + name = "trivial"; + description = "miscellaneous functions"; + } + { + name = "fixedPoints"; + baseName = "fixed-points"; + description = "explicit recursion functions"; + } + { + name = "lists"; + description = "list manipulation functions"; + } + { + name = "debug"; + description = "debugging functions"; + } + { + name = "options"; + description = "NixOS / nixpkgs option handling"; + } + { + name = "path"; + description = "path functions"; + } + { + name = "filesystem"; + description = "filesystem functions"; + } + { + name = "fileset"; + description = "file set functions"; + } + { + name = "sources"; + description = "source filtering functions"; + } + { + name = "cli"; + description = "command-line serialization functions"; + } + { + name = "generators"; + description = "functions that create file formats from nix data structures"; + } + { + name = "gvariant"; + description = "GVariant formatted string serialization functions"; + } + { + name = "customisation"; + description = "Functions to customise (derivation-related) functions, derivatons, or attribute sets"; + } + { + name = "meta"; + description = "functions for derivation metadata"; + } + { + name = "derivations"; + description = "miscellaneous derivation-specific functions"; + } + ], +}: -{ pkgs, nixpkgs, libsets }: - -with pkgs; - -stdenv.mkDerivation { +stdenvNoCC.mkDerivation { name = "nixpkgs-lib-docs"; - src = pkgs.lib.fileset.toSource { + + src = lib.fileset.toSource { root = ../..; fileset = ../../lib; }; - buildInputs = [ nixdoc nix ]; + buildInputs = [ + nixdoc + nix + ]; + installPhase = '' export NIX_STATE_DIR=$(mktemp -d) nix-instantiate --eval --strict --json ${./lib-function-locations.nix} \ --arg nixpkgsPath "./." \ --argstr revision ${nixpkgs.rev or "master"} \ - --argstr libsetsJSON ${pkgs.lib.escapeShellArg (builtins.toJSON libsets)} \ + --argstr libsetsJSON ${lib.escapeShellArg (builtins.toJSON libsets)} \ > locations.json function docgen { @@ -39,9 +127,16 @@ stdenv.mkDerivation { ```{=include=} sections auto-id-prefix=auto-generated EOF - ${lib.concatMapStrings ({ name, baseName ? name, description }: '' - docgen ${name} ${baseName} ${lib.escapeShellArg description} - '') libsets} + ${lib.concatMapStrings ( + { + name, + baseName ? name, + description, + }: + '' + docgen ${name} ${baseName} ${lib.escapeShellArg description} + '' + ) libsets} echo '```' >> "$out/index.md" ''; diff --git a/doc/doc-support/options-doc.nix b/doc/doc-support/options-doc.nix new file mode 100644 index 000000000000..aa24f16901c5 --- /dev/null +++ b/doc/doc-support/options-doc.nix @@ -0,0 +1,28 @@ +# To build this derivation, run `nix-build -A nixpkgs-manual.optionsDoc` +{ lib, nixosOptionsDoc }: + +let + modules = lib.evalModules { + modules = [ ../../pkgs/top-level/config.nix ]; + class = "nixpkgsConfig"; + }; + + root = toString ../..; + + transformDeclaration = + decl: + let + declStr = toString decl; + subpath = lib.removePrefix "/" (lib.removePrefix root declStr); + in + assert lib.hasPrefix root declStr; + { + url = "https://github.com/NixOS/nixpkgs/blob/master/${subpath}"; + name = subpath; + }; +in +nixosOptionsDoc { + inherit (modules) options; + documentType = "none"; + transformOptions = opt: opt // { declarations = map transformDeclaration opt.declarations; }; +} diff --git a/doc/doc-support/package.nix b/doc/doc-support/package.nix new file mode 100644 index 000000000000..602cef59677e --- /dev/null +++ b/doc/doc-support/package.nix @@ -0,0 +1,106 @@ +# This file describes the Nixpkgs manual, which happens to use module docs infra originally +# developed for NixOS. To build this derivation, run `nix-build -A nixpkgs-manual`. +# +{ + lib, + stdenvNoCC, + callPackage, + documentation-highlighter, + nixos-render-docs, + nixpkgs ? { }, +}: + +stdenvNoCC.mkDerivation ( + finalAttrs: + let + inherit (finalAttrs.finalPackage.optionsDoc) optionsJSON; + inherit (finalAttrs.finalPackage) epub lib-docs pythonInterpreterTable; + in + { + name = "nixpkgs-manual"; + + nativeBuildInputs = [ nixos-render-docs ]; + + src = lib.fileset.toSource { + root = ../.; + fileset = lib.fileset.unions [ + (lib.fileset.fileFilter (file: file.hasExt "md" || file.hasExt "md.in") ../.) + ../style.css + ../anchor-use.js + ../anchor.min.js + ../manpage-urls.json + ]; + }; + + postPatch = '' + ln -s ${optionsJSON}/share/doc/nixos/options.json ./config-options.json + ''; + + buildPhase = '' + substituteInPlace ./languages-frameworks/python.section.md \ + --subst-var-by python-interpreter-table "$(<"${pythonInterpreterTable}")" + + cat \ + ./functions/library.md.in \ + ${lib-docs}/index.md \ + > ./functions/library.md + substitute ./manual.md.in ./manual.md \ + --replace-fail '@MANUAL_VERSION@' '${lib.version}' + + mkdir -p out/media + + mkdir -p out/highlightjs + cp -t out/highlightjs \ + ${documentation-highlighter}/highlight.pack.js \ + ${documentation-highlighter}/LICENSE \ + ${documentation-highlighter}/mono-blue.css \ + ${documentation-highlighter}/loader.js + + cp -t out ./style.css ./anchor.min.js ./anchor-use.js + + nixos-render-docs manual html \ + --manpage-urls ./manpage-urls.json \ + --revision ${lib.trivial.revisionWithDefault (nixpkgs.rev or "master")} \ + --stylesheet style.css \ + --stylesheet highlightjs/mono-blue.css \ + --script ./highlightjs/highlight.pack.js \ + --script ./highlightjs/loader.js \ + --script ./anchor.min.js \ + --script ./anchor-use.js \ + --toc-depth 1 \ + --section-toc-depth 1 \ + manual.md \ + out/index.html + ''; + + installPhase = '' + dest="$out/share/doc/nixpkgs" + mkdir -p "$(dirname "$dest")" + mv out "$dest" + mv "$dest/index.html" "$dest/manual.html" + + cp ${epub} "$dest/nixpkgs-manual.epub" + + mkdir -p $out/nix-support/ + echo "doc manual $dest manual.html" >> $out/nix-support/hydra-build-products + echo "doc manual $dest nixpkgs-manual.epub" >> $out/nix-support/hydra-build-products + ''; + + passthru = { + lib-docs = callPackage ./lib-function-docs.nix { inherit nixpkgs; }; + + epub = callPackage ./epub.nix { }; + + optionsDoc = callPackage ./options-doc.nix { }; + + pythonInterpreterTable = callPackage ./python-interpreter-table.nix { }; + + shell = callPackage ../../pkgs/tools/nix/web-devmode.nix { + buildArgs = "./."; + open = "/share/doc/nixpkgs/manual.html"; + }; + + tests.manpage-urls = callPackage ../tests/manpage-urls.nix { }; + }; + } +) diff --git a/doc/doc-support/python-interpreter-table.nix b/doc/doc-support/python-interpreter-table.nix index 6f2b3422f672..f06609e363f2 100644 --- a/doc/doc-support/python-interpreter-table.nix +++ b/doc/doc-support/python-interpreter-table.nix @@ -1,14 +1,15 @@ -# For debugging, run in this directory: -# nix eval --impure --raw --expr 'import ./python-interpreter-table.nix {}' -{ pkgs ? (import ../.. { config = { }; overlays = []; }) }: +# To build this derivation, run `nix-build -A nixpkgs-manual.pythonInterpreterTable` +{ + lib, + writeText, + pkgs, + pythonInterpreters, +}: let - lib = pkgs.lib; - inherit (lib.attrsets) attrNames filterAttrs; - inherit (lib.lists) elem filter map naturalSort reverseList; - inherit (lib.strings) concatStringsSep; - - isPythonInterpreter = name: - /* NB: Package names that don't follow the regular expression: + isPythonInterpreter = + name: + /* + NB: Package names that don't follow the regular expression: - `python-cosmopolitan` is not part of `pkgs.pythonInterpreters`. - `_prebuilt` interpreters are used for bootstrapping internally. - `python3Minimal` contains python packages, left behind conservatively. @@ -16,7 +17,8 @@ let */ (lib.strings.match "(pypy|python)([[:digit:]]*)" name) != null; - interpreterName = pname: + interpreterName = + pname: let cuteName = { cpython = "CPython"; @@ -26,16 +28,16 @@ let in "${cuteName.${interpreter.implementation}} ${interpreter.pythonVersion}"; - interpreters = reverseList (naturalSort ( - filter isPythonInterpreter (attrNames pkgs.pythonInterpreters) - )); + interpreters = lib.reverseList ( + lib.naturalSort (lib.filter isPythonInterpreter (lib.attrNames pythonInterpreters)) + ); - aliases = pname: - attrNames ( - filterAttrs (name: value: - isPythonInterpreter name - && name != pname - && interpreterName name == interpreterName pname + aliases = + pname: + lib.attrNames ( + lib.filterAttrs ( + name: value: + isPythonInterpreter name && name != pname && interpreterName name == interpreterName pname ) pkgs ); @@ -45,18 +47,17 @@ let interpreter = interpreterName pname; }) interpreters; - toMarkdown = data: + toMarkdown = + data: let line = package: '' - | ${package.pname} | ${join ", " package.aliases or [ ]} | ${package.interpreter} | + | ${package.pname} | ${lib.concatStringsSep ", " package.aliases or [ ]} | ${package.interpreter} | ''; in - join "" (map line data); - - join = lib.strings.concatStringsSep; + lib.concatStringsSep "" (map line data); in -'' +writeText "python-interpreter-table.md" '' | Package | Aliases | Interpeter | |---------|---------|------------| ${toMarkdown result} diff --git a/doc/shell.nix b/doc/shell.nix index d71e3f3a709a..3aad697742b2 100644 --- a/doc/shell.nix +++ b/doc/shell.nix @@ -1,20 +1,7 @@ let pkgs = import ../. { - config = {}; - overlays = []; - }; - - common = import ./common.nix; - inherit (common) outputPath indexPath; - - web-devmode = import ../pkgs/tools/nix/web-devmode.nix { - inherit pkgs; - buildArgs = "./."; - open = "/${outputPath}/${indexPath}"; + config = { }; + overlays = [ ]; }; in - pkgs.mkShell { - packages = [ - web-devmode - ]; - } +pkgs.nixpkgs-manual.shell diff --git a/doc/stdenv/meta.chapter.md b/doc/stdenv/meta.chapter.md index c8dd47533801..ddd5eb45441a 100644 --- a/doc/stdenv/meta.chapter.md +++ b/doc/stdenv/meta.chapter.md @@ -81,6 +81,12 @@ The license, or licenses, for the package. One from the attribute set defined in For details, see [Licenses](#sec-meta-license). +### `sourceProvenance` {#var-meta-sourceProvenance} + +A list containing the type or types of source inputs from which the package is built, e.g. original source code, pre-built binaries, etc. + +For details, see [Source provenance](#sec-meta-sourceProvenance). + ### `maintainers` {#var-meta-maintainers} A list of the maintainers of this Nix expression. Maintainers are defined in [`nixpkgs/maintainers/maintainer-list.nix`](https://github.com/NixOS/nixpkgs/blob/master/maintainers/maintainer-list.nix). There is no restriction to becoming a maintainer, just add yourself to that list in a separate commit titled “maintainers: add alice” in the same pull request, and reference maintainers with `maintainers = with lib.maintainers; [ alice bob ]`. diff --git a/doc/tests/manpage-urls.nix b/doc/tests/manpage-urls.nix new file mode 100644 index 000000000000..214c23616009 --- /dev/null +++ b/doc/tests/manpage-urls.nix @@ -0,0 +1,32 @@ +# To build this derivation, run `nix-build -A nixpkgs-manual.tests.manpage-urls` +{ + lib, + runCommand, + invalidateFetcherByDrvHash, + cacert, + python3, +}: + +invalidateFetcherByDrvHash ( + { + name ? "manual_check-manpage-urls", + script ? ./manpage-urls.py, + urlsFile ? ../manpage-urls.json, + }: + runCommand name + { + nativeBuildInputs = [ + cacert + (python3.withPackages (p: [ + p.aiohttp + p.rich + p.structlog + ])) + ]; + outputHash = "sha256-47DEQpj8HBSa+/TImW+5JCeuQeRkm5NMpJWZG3hSuFU="; # Empty output + } + '' + python3 ${script} ${urlsFile} + touch $out + '' +) { } diff --git a/lib/tests/modules/define-_module-args-custom.nix b/lib/tests/modules/define-_module-args-custom.nix index e565fd215a57..8e53e84c042b 100644 --- a/lib/tests/modules/define-_module-args-custom.nix +++ b/lib/tests/modules/define-_module-args-custom.nix @@ -1,4 +1,4 @@ -{ lib, ... }: +{ ... }: { config = { diff --git a/lib/tests/modules/define-enable-with-custom-arg.nix b/lib/tests/modules/define-enable-with-custom-arg.nix index 7da74671d148..9794bf8edf9e 100644 --- a/lib/tests/modules/define-enable-with-custom-arg.nix +++ b/lib/tests/modules/define-enable-with-custom-arg.nix @@ -1,4 +1,4 @@ -{ lib, custom, ... }: +{ custom, ... }: { config = { diff --git a/lib/tests/modules/disable-declare-enable.nix b/lib/tests/modules/disable-declare-enable.nix index a373ee7e550e..19d2e13c786a 100644 --- a/lib/tests/modules/disable-declare-enable.nix +++ b/lib/tests/modules/disable-declare-enable.nix @@ -1,4 +1,4 @@ -{ lib, ... }: +{ ... }: { disabledModules = [ ./declare-enable.nix ]; diff --git a/lib/tests/modules/disable-define-enable-string-path.nix b/lib/tests/modules/disable-define-enable-string-path.nix index 6429a6d6354a..5354a72bba41 100644 --- a/lib/tests/modules/disable-define-enable-string-path.nix +++ b/lib/tests/modules/disable-define-enable-string-path.nix @@ -1,4 +1,4 @@ -{ lib, ... }: +{ ... }: { disabledModules = [ (toString ./define-enable.nix) ]; diff --git a/lib/tests/modules/disable-define-enable.nix b/lib/tests/modules/disable-define-enable.nix index 0d84a7c3cb6c..67fefa733586 100644 --- a/lib/tests/modules/disable-define-enable.nix +++ b/lib/tests/modules/disable-define-enable.nix @@ -1,4 +1,4 @@ -{ lib, ... }: +{ ... }: { disabledModules = [ ./define-enable.nix ]; diff --git a/lib/tests/modules/disable-enable-modules.nix b/lib/tests/modules/disable-enable-modules.nix index c325f4e07431..af4d7e60b984 100644 --- a/lib/tests/modules/disable-enable-modules.nix +++ b/lib/tests/modules/disable-enable-modules.nix @@ -1,4 +1,4 @@ -{ lib, ... }: +{ ... }: { disabledModules = [ "define-enable.nix" "declare-enable.nix" ]; diff --git a/lib/tests/modules/doRename-condition-enable.nix b/lib/tests/modules/doRename-condition-enable.nix index e6eabfa6f89a..9e0db126b575 100644 --- a/lib/tests/modules/doRename-condition-enable.nix +++ b/lib/tests/modules/doRename-condition-enable.nix @@ -1,4 +1,4 @@ -{ config, lib, ... }: +{ config, ... }: { config = { services.foo.enable = true; diff --git a/lib/tests/modules/doRename-condition-migrated.nix b/lib/tests/modules/doRename-condition-migrated.nix index 8d21610e8ec6..fd20ee87f23a 100644 --- a/lib/tests/modules/doRename-condition-migrated.nix +++ b/lib/tests/modules/doRename-condition-migrated.nix @@ -1,4 +1,4 @@ -{ config, lib, ... }: +{ config, ... }: { config = { services.foos."".bar = "baz"; diff --git a/lib/tests/modules/doRename-condition-no-enable.nix b/lib/tests/modules/doRename-condition-no-enable.nix index 66ec004d3147..9b0427cff047 100644 --- a/lib/tests/modules/doRename-condition-no-enable.nix +++ b/lib/tests/modules/doRename-condition-no-enable.nix @@ -1,4 +1,4 @@ -{ config, lib, options, ... }: +{ config, options, ... }: { config = { result = diff --git a/lib/tests/modules/import-from-store.nix b/lib/tests/modules/import-from-store.nix index f5af22432ce1..c45ccbed76b6 100644 --- a/lib/tests/modules/import-from-store.nix +++ b/lib/tests/modules/import-from-store.nix @@ -1,4 +1,4 @@ -{ lib, ... }: +{ ... }: { imports = [ diff --git a/lib/tests/modules/merge-typeless-option.nix b/lib/tests/modules/merge-typeless-option.nix index 627d90b15db2..fcd72634c166 100644 --- a/lib/tests/modules/merge-typeless-option.nix +++ b/lib/tests/modules/merge-typeless-option.nix @@ -1,4 +1,4 @@ -{ lib, ... }: +{ ... }: let typeless = diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 1e680170bc8e..864367a22444 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -5447,6 +5447,13 @@ githubId = 1931963; name = "David Sferruzza"; }; + dstengele = { + name = "Dennis Stengele"; + email = "dennis@stengele.me"; + matrix = "@dstengele:pango.place"; + github = "dstengele"; + githubId = 1706418; + }; dsuetin = { name = "Danil Suetin"; email = "suetin085+nixpkgs@protonmail.com"; @@ -17414,6 +17421,12 @@ githubId = 1080963; name = "Roberto"; }; + robertrichter = { + email = "robert.richter@rrcomtech.com"; + github = "rrcomtech"; + githubId = 50635122; + name = "Robert Richter"; + }; robgssp = { email = "robgssp@gmail.com"; github = "robgssp"; diff --git a/nixos/doc/manual/release-notes/rl-2411.section.md b/nixos/doc/manual/release-notes/rl-2411.section.md index c4de4128b040..4aaec6406458 100644 --- a/nixos/doc/manual/release-notes/rl-2411.section.md +++ b/nixos/doc/manual/release-notes/rl-2411.section.md @@ -42,12 +42,16 @@ - [Music Assistant](https://music-assistant.io/), a music library manager for your offline and online music sources which can easily stream your favourite music to a wide range of supported players. Available as [services.music-assistant](#opt-services.music-assistant.enable). +- [zeronsd](https://github.com/zerotier/zeronsd), a DNS server for ZeroTier users. Available with [services.zeronsd.servedNetworks](#opt-services.zeronsd.servedNetworks). + - [wg-access-server](https://github.com/freifunkMUC/wg-access-server/), an all-in-one WireGuard VPN solution with a web ui for connecting devices. Available at [services.wg-access-server](#opt-services.wg-access-server.enable). - [Envision](https://gitlab.com/gabmus/envision), a UI for building, configuring and running Monado, the open source OpenXR runtime. Available as [programs.envision](#opt-programs.envision.enable). - [Localsend](https://localsend.org/), an open source cross-platform alternative to AirDrop. Available as [programs.localsend](#opt-programs.localsend.enable). +- [cryptpad](https://cryptpad.org/), a privacy-oriented collaborative platform (docs/drive/etc), has been added back. Available as [services.cryptpad](#opt-services.cryptpad.enable). + - [realm](https://github.com/zhboner/realm), a simple, high performance relay server written in rust. Available as [services.realm.enable](#opt-services.realm.enable). - [Gotenberg](https://gotenberg.dev), an API server for converting files to PDFs that can be used alongside Paperless-ngx. Available as [services.gotenberg](options.html#opt-services.gotenberg). @@ -150,6 +154,8 @@ before changing the package to `pkgs.stalwart-mail` in [`services.stalwart-mail.package`](#opt-services.stalwart-mail.package). +- The `nomad_1_5` package was dropped, as [it has reached end-of-life upstream](https://support.hashicorp.com/hc/en-us/articles/360021185113-Support-Period-and-End-of-Life-EOL-Policy). Evaluating it will throw an error. + - `androidndkPkgs` has been updated to `androidndkPkgs_26`. - Android NDK version 26 and SDK version 33 are now the default versions used for cross compilation to android. @@ -285,6 +291,9 @@ {option}`services.gitlab-runner.services..authenticationTokenConfigFile` instead of the former {option}`services.gitlab-runner.services..registrationConfigFile` option. +- `nix.channel.enable = false` no longer implies `nix.settings.nix-path = []`. + Since Nix 2.13, a `nix-path` set in `nix.conf` cannot be overriden by the `NIX_PATH` configuration variable. + ## Detailed migration information {#sec-release-24.11-migration} ### `sound` options removal {#sec-release-24.11-migration-sound} diff --git a/nixos/doc/manual/shell.nix b/nixos/doc/manual/shell.nix index 70500a12b037..7765358ddb32 100644 --- a/nixos/doc/manual/shell.nix +++ b/nixos/doc/manual/shell.nix @@ -1,20 +1,13 @@ let pkgs = import ../../.. { - config = {}; - overlays = []; + config = { }; + overlays = [ ]; }; common = import ./common.nix; inherit (common) outputPath indexPath; - - web-devmode = import ../../../pkgs/tools/nix/web-devmode.nix { - inherit pkgs; - buildArgs = "../../release.nix -A manualHTML.${builtins.currentSystem}"; - open = "/${outputPath}/${indexPath}"; - }; in - pkgs.mkShell { - packages = [ - web-devmode - ]; - } +pkgs.callPackage ../../../pkgs/tools/nix/web-devmode.nix { + buildArgs = "../../release.nix -A manualHTML.${builtins.currentSystem}"; + open = "/${outputPath}/${indexPath}"; +} diff --git a/nixos/maintainers/scripts/lxd/lxd-container-image-inner.nix b/nixos/maintainers/scripts/lxd/lxd-container-image-inner.nix index 4698971de8ff..5468488fafed 100644 --- a/nixos/maintainers/scripts/lxd/lxd-container-image-inner.nix +++ b/nixos/maintainers/scripts/lxd/lxd-container-image-inner.nix @@ -2,7 +2,7 @@ # your system. Help is available in the configuration.nix(5) man page # and in the NixOS manual (accessible by running ‘nixos-help’). -{ config, pkgs, lib, modulesPath, ... }: +{ modulesPath, ... }: { imports = diff --git a/nixos/maintainers/scripts/lxd/lxd-virtual-machine-image-inner.nix b/nixos/maintainers/scripts/lxd/lxd-virtual-machine-image-inner.nix index d1264fa04304..5931a561b31c 100644 --- a/nixos/maintainers/scripts/lxd/lxd-virtual-machine-image-inner.nix +++ b/nixos/maintainers/scripts/lxd/lxd-virtual-machine-image-inner.nix @@ -2,7 +2,7 @@ # your system. Help is available in the configuration.nix(5) man page # and in the NixOS manual (accessible by running ‘nixos-help’). -{ config, pkgs, lib, modulesPath, ... }: +{ modulesPath, ... }: { imports = diff --git a/nixos/modules/config/nix-channel.nix b/nixos/modules/config/nix-channel.nix index 6498ce6c469c..3cdd1d1b6366 100644 --- a/nixos/modules/config/nix-channel.nix +++ b/nixos/modules/config/nix-channel.nix @@ -94,8 +94,6 @@ in NIX_PATH = cfg.nixPath; }; - nix.settings.nix-path = mkIf (! cfg.channel.enable) (mkDefault ""); - systemd.tmpfiles.rules = lib.mkIf cfg.channel.enable [ ''f /root/.nix-channels - - - - ${config.system.defaultChannel} nixos\n'' ]; diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index e028704c5d0f..f97a6b47512c 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -1258,6 +1258,7 @@ ./services/networking/zerobin.nix ./services/networking/zeronet.nix ./services/networking/zerotierone.nix + ./services/networking/zeronsd.nix ./services/networking/znc/default.nix ./services/printing/cupsd.nix ./services/printing/ipp-usb.nix @@ -1378,6 +1379,7 @@ ./services/web-apps/convos.nix ./services/web-apps/crabfit.nix ./services/web-apps/davis.nix + ./services/web-apps/cryptpad.nix ./services/web-apps/dex.nix ./services/web-apps/discourse.nix ./services/web-apps/documize.nix diff --git a/nixos/modules/profiles/docker-container.nix b/nixos/modules/profiles/docker-container.nix index 5365e49711dc..199156edfdc6 100644 --- a/nixos/modules/profiles/docker-container.nix +++ b/nixos/modules/profiles/docker-container.nix @@ -1,4 +1,4 @@ -{ config, lib, pkgs, ... }: +{ config, pkgs, ... }: let inherit (pkgs) writeScript; diff --git a/nixos/modules/profiles/qemu-guest.nix b/nixos/modules/profiles/qemu-guest.nix index a7015c8bcc61..3dbbbbea182e 100644 --- a/nixos/modules/profiles/qemu-guest.nix +++ b/nixos/modules/profiles/qemu-guest.nix @@ -1,7 +1,7 @@ # Common configuration for virtual machines running under QEMU (using # virtio). -{ config, lib, ... }: +{ ... }: { boot.initrd.availableKernelModules = [ "virtio_net" "virtio_pci" "virtio_mmio" "virtio_blk" "virtio_scsi" "9p" "9pnet_virtio" ]; diff --git a/nixos/modules/programs/neovim.nix b/nixos/modules/programs/neovim.nix index 8fe6a664b675..142cca9f322a 100644 --- a/nixos/modules/programs/neovim.nix +++ b/nixos/modules/programs/neovim.nix @@ -150,6 +150,10 @@ in cfg.finalPackage ]; environment.variables.EDITOR = lib.mkIf cfg.defaultEditor (lib.mkOverride 900 "nvim"); + # On most NixOS configurations /share is already included, so it includes + # this directory as well. But This makes sure that /share/nvim/site paths + # from other packages will be used by neovim. + environment.pathsToLink = [ "/share/nvim" ]; environment.etc = builtins.listToAttrs (builtins.attrValues (builtins.mapAttrs (name: value: { diff --git a/nixos/modules/programs/regreet.nix b/nixos/modules/programs/regreet.nix index 0db1f59e5912..cec3e0bf5046 100644 --- a/nixos/modules/programs/regreet.nix +++ b/nixos/modules/programs/regreet.nix @@ -58,9 +58,96 @@ in modifiable properties. ''; }; + + theme = { + package = lib.mkPackageOption pkgs "gnome-themes-extra" { } // { + description = '' + The package that provides the theme given in the name option. + ''; + }; + + name = lib.mkOption { + type = lib.types.str; + default = "Adwaita"; + description = '' + Name of the theme to use for regreet. + ''; + }; + }; + + iconTheme = { + package = lib.mkPackageOption pkgs "adwaita-icon-theme" { } // { + description = '' + The package that provides the icon theme given in the name option. + ''; + }; + + name = lib.mkOption { + type = lib.types.str; + default = "Adwaita"; + description = '' + Name of the icon theme to use for regreet. + ''; + }; + }; + + font = { + package = lib.mkPackageOption pkgs "cantarell-fonts" { } // { + description = '' + The package that provides the font given in the name option. + ''; + }; + + name = lib.mkOption { + type = lib.types.str; + default = "Cantarell"; + description = '' + Name of the font to use for regreet. + ''; + }; + + size = lib.mkOption { + type = lib.types.ints.positive; + default = 16; + description = '' + Size of the font to use for regreet. + ''; + }; + }; + + cursorTheme = { + package = lib.mkPackageOption pkgs "adwaita-icon-theme" { } // { + description = '' + The package that provides the cursor theme given in the name option. + ''; + }; + + name = lib.mkOption { + type = lib.types.str; + default = "Adwaita"; + description = '' + Name of the cursor theme to use for regreet. + ''; + }; + }; }; config = lib.mkIf cfg.enable { + environment.systemPackages = [ + cfg.theme.package + cfg.iconTheme.package + cfg.cursorTheme.package + ]; + + fonts.packages = [ cfg.font.package ]; + + programs.regreet.settings = { + cursor_theme_name = cfg.cursorTheme.name; + font_name = "${cfg.font.name} ${toString cfg.font.size}"; + icon_theme_name = cfg.iconTheme.name; + theme_name = cfg.theme.name; + }; + services.greetd = { enable = lib.mkDefault true; settings.default_session.command = lib.mkDefault "${pkgs.dbus}/bin/dbus-run-session ${lib.getExe pkgs.cage} ${lib.escapeShellArgs cfg.cageArgs} -- ${lib.getExe cfg.package}"; diff --git a/nixos/modules/rename.nix b/nixos/modules/rename.nix index fca814512e08..2e37a984a34e 100644 --- a/nixos/modules/rename.nix +++ b/nixos/modules/rename.nix @@ -117,7 +117,6 @@ in (mkRemovedOptionModule [ "services" "virtuoso" ] "The corresponding package was removed from nixpkgs.") (mkRemovedOptionModule [ "services" "openfire" ] "The corresponding package was removed from nixpkgs.") (mkRemovedOptionModule [ "services" "riak" ] "The corresponding package was removed from nixpkgs.") - (mkRemovedOptionModule [ "services" "cryptpad" ] "The corresponding package was removed from nixpkgs.") (mkRemovedOptionModule [ "services" "rtsp-simple-server" ] "Package has been completely rebranded by upstream as mediamtx, and thus the service and the package were renamed in NixOS as well.") (mkRemovedOptionModule [ "services" "prayer" ] "The corresponding package was removed from nixpkgs.") (mkRemovedOptionModule [ "services" "restya-board" ] "The corresponding package was removed from nixpkgs.") diff --git a/nixos/modules/security/apparmor/profiles.nix b/nixos/modules/security/apparmor/profiles.nix index 0bf90a008655..46af0f15f761 100644 --- a/nixos/modules/security/apparmor/profiles.nix +++ b/nixos/modules/security/apparmor/profiles.nix @@ -1,4 +1,4 @@ -{ config, lib, pkgs, ... }: +{ config, pkgs, ... }: let apparmor = config.security.apparmor; in { config.security.apparmor.packages = [ pkgs.apparmor-profiles ]; diff --git a/nixos/modules/services/databases/surrealdb.nix b/nixos/modules/services/databases/surrealdb.nix index 08a6cca043ca..2118312d5a1b 100644 --- a/nixos/modules/services/databases/surrealdb.nix +++ b/nixos/modules/services/databases/surrealdb.nix @@ -58,7 +58,7 @@ in { environment.systemPackages = [ cfg.package ] ; systemd.services.surrealdb = { - description = "A scalable, distributed, collaborative, document-graph database, for the realtime web "; + description = "A scalable, distributed, collaborative, document-graph database, for the realtime web"; wantedBy = [ "multi-user.target" ]; after = [ "network.target" ]; diff --git a/nixos/modules/services/desktop-managers/plasma6.nix b/nixos/modules/services/desktop-managers/plasma6.nix index 8563723c7425..103e3347108a 100644 --- a/nixos/modules/services/desktop-managers/plasma6.nix +++ b/nixos/modules/services/desktop-managers/plasma6.nix @@ -254,6 +254,7 @@ in { extraPackages = with kdePackages; [ breeze-icons kirigami + libplasma plasma5support qtsvg qtvirtualkeyboard diff --git a/nixos/modules/services/home-automation/home-assistant.nix b/nixos/modules/services/home-automation/home-assistant.nix index c58a31539ed8..6ffe314d4574 100644 --- a/nixos/modules/services/home-automation/home-assistant.nix +++ b/nixos/modules/services/home-automation/home-assistant.nix @@ -192,7 +192,12 @@ in { }; customComponents = mkOption { - type = types.listOf types.package; + type = types.listOf ( + types.addCheck types.package (p: p.isHomeAssistantComponent or false) // { + name = "home-assistant-component"; + description = "package that is a Home Assistant component"; + } + ); default = []; example = literalExpression '' with pkgs.home-assistant-custom-components; [ diff --git a/nixos/modules/services/misc/jackett.nix b/nixos/modules/services/misc/jackett.nix index 8b5011ce0d81..a843f400b031 100644 --- a/nixos/modules/services/misc/jackett.nix +++ b/nixos/modules/services/misc/jackett.nix @@ -11,6 +11,14 @@ in services.jackett = { enable = mkEnableOption "Jackett, API support for your favorite torrent trackers"; + port = mkOption { + default = 9117; + type = types.port; + description = '' + Port serving the web interface + ''; + }; + dataDir = mkOption { type = types.str; default = "/var/lib/jackett/.config/Jackett"; @@ -53,13 +61,13 @@ in Type = "simple"; User = cfg.user; Group = cfg.group; - ExecStart = "${cfg.package}/bin/Jackett --NoUpdates --DataFolder '${cfg.dataDir}'"; + ExecStart = "${cfg.package}/bin/Jackett --NoUpdates --Port ${toString cfg.port} --DataFolder '${cfg.dataDir}'"; Restart = "on-failure"; }; }; networking.firewall = mkIf cfg.openFirewall { - allowedTCPPorts = [ 9117 ]; + allowedTCPPorts = [ cfg.port ]; }; users.users = mkIf (cfg.user == "jackett") { diff --git a/nixos/modules/services/misc/radicle.nix b/nixos/modules/services/misc/radicle.nix index 69cac81ee65f..7d7804c6eadd 100644 --- a/nixos/modules/services/misc/radicle.nix +++ b/nixos/modules/services/misc/radicle.nix @@ -45,7 +45,7 @@ let { BindReadOnlyPaths = [ "${cfg.configFile}:${env.RAD_HOME}/config.json" - "${if isPath cfg.publicKeyFile then cfg.publicKeyFile else pkgs.writeText "radicle.pub" cfg.publicKeyFile}:${env.RAD_HOME}/keys/radicle.pub" + "${if types.path.check cfg.publicKey then cfg.publicKey else pkgs.writeText "radicle.pub" cfg.publicKey}:${env.RAD_HOME}/keys/radicle.pub" ]; KillMode = "process"; StateDirectory = [ "radicle" ]; @@ -119,25 +119,27 @@ in enable = mkEnableOption "Radicle Seed Node"; package = mkPackageOption pkgs "radicle-node" { }; privateKeyFile = mkOption { - type = with types; either path str; + type = types.path; description = '' - SSH private key generated by `rad auth`. + Absolute file path to an SSH private key, + usually generated by `rad auth`. If it contains a colon (`:`) the string before the colon is taken as the credential name and the string after as a path encrypted with `systemd-creds`. ''; }; - publicKeyFile = mkOption { + publicKey = mkOption { type = with types; either path str; description = '' - SSH public key generated by `rad auth`. + An SSH public key (as an absolute file path or directly as a string), + usually generated by `rad auth`. ''; }; node = { listenAddress = mkOption { type = types.str; - default = "0.0.0.0"; + default = "[::]"; example = "127.0.0.1"; description = "The IP address on which `radicle-node` listens."; }; @@ -180,6 +182,14 @@ in See https://app.radicle.xyz/nodes/seed.radicle.garden/rad:z3gqcJUoA1n9HaHKufZs5FCSGazv5/tree/radicle/src/node/config.rs#L275 ''; default = { }; + example = literalExpression '' + { + web.pinned.repositories = [ + "rad:z3gqcJUoA1n9HaHKufZs5FCSGazv5" # heartwood + "rad:z3trNYnLWS11cJWC6BbxDs5niGo82" # rips + ]; + } + ''; type = types.submodule { freeformType = json.type; }; diff --git a/nixos/modules/services/monitoring/nagios.nix b/nixos/modules/services/monitoring/nagios.nix index 27fc0a1ff3b9..b6eced134bcc 100644 --- a/nixos/modules/services/monitoring/nagios.nix +++ b/nixos/modules/services/monitoring/nagios.nix @@ -175,7 +175,7 @@ in config = mkIf cfg.enable { users.users.nagios = { - description = "Nagios user "; + description = "Nagios user"; uid = config.ids.uids.nagios; home = nagiosState; group = "nagios"; diff --git a/nixos/modules/services/monitoring/prometheus/exporters/pve.nix b/nixos/modules/services/monitoring/prometheus/exporters/pve.nix index 8928577b6953..fa5852a4999d 100644 --- a/nixos/modules/services/monitoring/prometheus/exporters/pve.nix +++ b/nixos/modules/services/monitoring/prometheus/exporters/pve.nix @@ -114,6 +114,13 @@ in Collect PVE onboot status ''; }; + replication = mkOption { + type = types.bool; + default = true; + description = '' + Collect PVE replication info + ''; + }; }; }; serviceOpts = { @@ -128,6 +135,7 @@ in --${optionalString (!cfg.collectors.cluster) "no-"}collector.cluster \ --${optionalString (!cfg.collectors.resources) "no-"}collector.resources \ --${optionalString (!cfg.collectors.config) "no-"}collector.config \ + --${optionalString (!cfg.collectors.replication) "no-"}collector.replication \ ${optionalString (cfg.server.keyFile != null) "--server.keyfile ${cfg.server.keyFile}"} \ ${optionalString (cfg.server.certFile != null) "--server.certfile ${cfg.server.certFile}"} \ --config.file %d/configFile \ diff --git a/nixos/modules/services/networking/antennas.nix b/nixos/modules/services/networking/antennas.nix index a37df953fc92..e98b81588044 100644 --- a/nixos/modules/services/networking/antennas.nix +++ b/nixos/modules/services/networking/antennas.nix @@ -38,7 +38,7 @@ in config = mkIf cfg.enable { systemd.services.antennas = { - description = "Antennas HDHomeRun emulator for Tvheadend. "; + description = "Antennas HDHomeRun emulator for Tvheadend."; wantedBy = [ "multi-user.target" ]; # Config diff --git a/nixos/modules/services/networking/zeronsd.nix b/nixos/modules/services/networking/zeronsd.nix new file mode 100644 index 000000000000..23f1a5fa7e4f --- /dev/null +++ b/nixos/modules/services/networking/zeronsd.nix @@ -0,0 +1,117 @@ +{ + config, + lib, + pkgs, + ... +}: + +let + cfg = config.services.zeronsd; + settingsFormat = pkgs.formats.json { }; +in +{ + options.services.zeronsd.servedNetworks = lib.mkOption { + default = { }; + example = { + "a8a2c3c10c1a68de".settings.token = "/var/lib/zeronsd/apitoken"; + }; + description = "ZeroTier Networks to start zeronsd instances for."; + type = lib.types.attrsOf ( + lib.types.submodule { + options = { + package = lib.mkPackageOption pkgs "zeronsd" { }; + + settings = lib.mkOption { + description = "Settings for zeronsd"; + default = { }; + type = lib.types.submodule { + freeformType = settingsFormat.type; + + options = { + domain = lib.mkOption { + default = "home.arpa"; + type = lib.types.singleLineStr; + description = "Domain under which ZeroTier records will be available."; + }; + + token = lib.mkOption { + type = lib.types.path; + description = "Path to a file containing the API Token for ZeroTier Central."; + }; + + log_level = lib.mkOption { + default = "warn"; + type = lib.types.enum [ + "off" + "error" + "warn" + "info" + "debug" + "trace" + ]; + description = "Log Level."; + }; + + wildcard = lib.mkOption { + default = false; + type = lib.types.bool; + description = "Whether to serve a wildcard record for ZeroTier Nodes."; + }; + }; + }; + }; + }; + } + ); + }; + + config = lib.mkIf (cfg.servedNetworks != { }) { + assertions = [ + { + assertion = config.services.zerotierone.enable; + message = "zeronsd needs a configured zerotier-one"; + } + ]; + + systemd.services = lib.mapAttrs' (netname: netcfg: { + name = "zeronsd-${netname}"; + value = { + description = "ZeroTier DNS server for Network ${netname}"; + + wantedBy = [ "multi-user.target" ]; + after = [ + "network.target" + "zerotierone.service" + ]; + wants = [ "network-online.target" ]; + + serviceConfig = + let + configFile = pkgs.writeText "zeronsd.json" (builtins.toJSON netcfg.settings); + in + { + ExecStart = "${netcfg.package}/bin/zeronsd start --config ${configFile} --config-type json ${netname}"; + Restart = "on-failure"; + RestartSec = 2; + TimeoutStopSec = 5; + User = "zeronsd"; + Group = "zeronsd"; + AmbientCapabilities = "CAP_NET_BIND_SERVICE"; + }; + }; + }) cfg.servedNetworks; + + systemd.tmpfiles.rules = [ + "a+ /var/lib/zerotier-one - - - - u:zeronsd:x" + "a+ /var/lib/zerotier-one/authtoken.secret - - - - mask::r,u:zeronsd:r" + ]; + + users.users.zeronsd = { + group = "zeronsd"; + description = "Service user for running zeronsd"; + isSystemUser = true; + }; + + users.groups.zeronsd = { }; + }; +} diff --git a/nixos/modules/services/web-apps/cryptpad.nix b/nixos/modules/services/web-apps/cryptpad.nix new file mode 100644 index 000000000000..770eefc00739 --- /dev/null +++ b/nixos/modules/services/web-apps/cryptpad.nix @@ -0,0 +1,293 @@ +{ + config, + lib, + pkgs, + ... +}: + +let + cfg = config.services.cryptpad; + + inherit (lib) + mkIf + mkMerge + mkOption + strings + types + ; + + # The Cryptpad configuration file isn't JSON, but a JavaScript source file that assigns a JSON value + # to a variable. + cryptpadConfigFile = builtins.toFile "cryptpad_config.js" '' + module.exports = ${builtins.toJSON cfg.settings} + ''; + + # Derive domain names for Nginx configuration from Cryptpad configuration + mainDomain = strings.removePrefix "https://" cfg.settings.httpUnsafeOrigin; + sandboxDomain = + if cfg.settings.httpSafeOrigin == null then + mainDomain + else + strings.removePrefix "https://" cfg.settings.httpSafeOrigin; + +in +{ + options.services.cryptpad = { + enable = lib.mkEnableOption "cryptpad"; + + package = lib.mkPackageOption pkgs "cryptpad" { }; + + configureNginx = mkOption { + description = '' + Configure Nginx as a reverse proxy for Cryptpad. + Note that this makes some assumptions on your setup, and sets settings that will + affect other virtualHosts running on your Nginx instance, if any. + Alternatively you can configure a reverse-proxy of your choice. + ''; + type = types.bool; + default = false; + }; + + settings = mkOption { + description = '' + Cryptpad configuration settings. + See https://github.com/cryptpad/cryptpad/blob/main/config/config.example.js for a more extensive + reference documentation. + Test your deployed instance through `https:///checkup/`. + ''; + type = types.submodule { + freeformType = (pkgs.formats.json { }).type; + options = { + httpUnsafeOrigin = mkOption { + type = types.str; + example = "https://cryptpad.example.com"; + default = ""; + description = "This is the URL that users will enter to load your instance"; + }; + httpSafeOrigin = mkOption { + type = types.nullOr types.str; + example = "https://cryptpad-ui.example.com. Apparently optional but recommended."; + description = "Cryptpad sandbox URL"; + }; + httpAddress = mkOption { + type = types.str; + default = "127.0.0.1"; + description = "Address on which the Node.js server should listen"; + }; + httpPort = mkOption { + type = types.int; + default = 3000; + description = "Port on which the Node.js server should listen"; + }; + websocketPort = mkOption { + type = types.int; + default = 3003; + description = "Port for the websocket that needs to be separate"; + }; + maxWorkers = mkOption { + type = types.nullOr types.int; + default = null; + description = "Number of child processes, defaults to number of cores available"; + }; + adminKeys = mkOption { + type = types.listOf types.str; + default = [ ]; + description = "List of public signing keys of users that can access the admin panel"; + example = [ "[cryptpad-user1@my.awesome.website/YZgXQxKR0Rcb6r6CmxHPdAGLVludrAF2lEnkbx1vVOo=]" ]; + }; + logToStdout = mkOption { + type = types.bool; + default = true; + description = "Controls whether log output should go to stdout of the systemd service"; + }; + logLevel = mkOption { + type = types.str; + default = "info"; + description = "Controls log level"; + }; + blockDailyCheck = mkOption { + type = types.bool; + default = true; + description = '' + Disable telemetry. This setting is only effective if the 'Disable server telemetry' + setting in the admin menu has been untouched, and will be ignored by cryptpad once + that option is set either way. + Note that due to the service confinement, just enabling the option in the admin + menu will not be able to resolve DNS and fail; this setting must be set as well. + ''; + }; + installMethod = mkOption { + type = types.str; + default = "nixos"; + description = '' + Install method is listed in telemetry if you agree to it through the consentToContact + setting in the admin panel. + ''; + }; + }; + }; + }; + }; + + config = mkIf cfg.enable (mkMerge [ + { + systemd.services.cryptpad = { + description = "Cryptpad service"; + wantedBy = [ "multi-user.target" ]; + after = [ "networking.target" ]; + serviceConfig = { + BindReadOnlyPaths = [ + cryptpadConfigFile + # apparently needs proc for workers management + "/proc" + "/dev/urandom" + ]; + DynamicUser = true; + Environment = [ + "CRYPTPAD_CONFIG=${cryptpadConfigFile}" + "HOME=%S/cryptpad" + ]; + ExecStart = lib.getExe cfg.package; + Restart = "always"; + StateDirectory = "cryptpad"; + WorkingDirectory = "%S/cryptpad"; + # security way too many numerous options, from the systemd-analyze security output + # at end of test: block everything except + # - SystemCallFiters=@resources is required for node + # - MemoryDenyWriteExecute for node JIT + # - RestrictAddressFamilies=~AF_(INET|INET6) / PrivateNetwork to bind to sockets + # - IPAddressDeny likewise allow localhost if binding to localhost or any otherwise + # - PrivateUsers somehow service doesn't start with that + # - DeviceAllow (char-rtc r added by ProtectClock) + AmbientCapabilities = ""; + CapabilityBoundingSet = ""; + DeviceAllow = ""; + LockPersonality = true; + NoNewPrivileges = true; + PrivateDevices = true; + PrivateTmp = true; + ProcSubset = "pid"; + ProtectClock = true; + ProtectControlGroups = true; + ProtectHome = true; + ProtectHostname = true; + ProtectKernelLogs = true; + ProtectKernelModules = true; + ProtectKernelTunables = true; + ProtectProc = "invisible"; + ProtectSystem = "strict"; + RemoveIPC = true; + RestrictAddressFamilies = [ + "AF_INET" + "AF_INET6" + ]; + RestrictNamespaces = true; + RestrictRealtime = true; + RestrictSUIDSGID = true; + RuntimeDirectoryMode = "700"; + SocketBindAllow = [ + "tcp:${builtins.toString cfg.settings.httpPort}" + "tcp:${builtins.toString cfg.settings.websocketPort}" + ]; + SocketBindDeny = [ "any" ]; + StateDirectoryMode = "0700"; + SystemCallArchitectures = "native"; + SystemCallFilter = [ + "@pkey" + "@system-service" + "~@chown" + "~@keyring" + "~@memlock" + "~@privileged" + "~@resources" + "~@setuid" + "~@timer" + ]; + UMask = "0077"; + }; + confinement = { + enable = true; + binSh = null; + mode = "chroot-only"; + }; + }; + } + # block external network access if not phoning home and + # binding to localhost (default) + (mkIf + ( + cfg.settings.blockDailyCheck + && (builtins.elem cfg.settings.httpAddress [ + "127.0.0.1" + "::1" + ]) + ) + { + systemd.services.cryptpad = { + serviceConfig = { + IPAddressAllow = [ "localhost" ]; + IPAddressDeny = [ "any" ]; + }; + }; + } + ) + # .. conversely allow DNS & TLS if telemetry is explicitly enabled + (mkIf (!cfg.settings.blockDailyCheck) { + systemd.services.cryptpad = { + serviceConfig = { + BindReadOnlyPaths = [ + "-/etc/resolv.conf" + "-/run/systemd" + "/etc/hosts" + "/etc/ssl/certs/ca-certificates.crt" + ]; + }; + }; + }) + + (mkIf cfg.configureNginx { + assertions = [ + { + assertion = cfg.settings.httpUnsafeOrigin != ""; + message = "services.cryptpad.settings.httpUnsafeOrigin is required"; + } + { + assertion = strings.hasPrefix "https://" cfg.settings.httpUnsafeOrigin; + message = "services.cryptpad.settings.httpUnsafeOrigin must start with https://"; + } + { + assertion = + cfg.settings.httpSafeOrigin == null || strings.hasPrefix "https://" cfg.settings.httpSafeOrigin; + message = "services.cryptpad.settings.httpSafeOrigin must start with https:// (or be unset)"; + } + ]; + services.nginx = { + enable = true; + recommendedTlsSettings = true; + recommendedProxySettings = true; + recommendedOptimisation = true; + recommendedGzipSettings = true; + + virtualHosts = mkMerge [ + { + "${mainDomain}" = { + serverAliases = lib.optionals (cfg.settings.httpSafeOrigin != null) [ sandboxDomain ]; + enableACME = lib.mkDefault true; + forceSSL = true; + locations."/" = { + proxyPass = "http://${cfg.settings.httpAddress}:${builtins.toString cfg.settings.httpPort}"; + extraConfig = '' + client_max_body_size 150m; + ''; + }; + locations."/cryptpad_websocket" = { + proxyPass = "http://${cfg.settings.httpAddress}:${builtins.toString cfg.settings.websocketPort}"; + proxyWebsockets = true; + }; + }; + } + ]; + }; + }) + ]); +} diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index cc31fbade123..f485b6a77844 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -235,6 +235,7 @@ in { couchdb = handleTest ./couchdb.nix {}; crabfit = handleTest ./crabfit.nix {}; cri-o = handleTestOn ["aarch64-linux" "x86_64-linux"] ./cri-o.nix {}; + cryptpad = runTest ./cryptpad.nix; cups-pdf = handleTest ./cups-pdf.nix {}; curl-impersonate = handleTest ./curl-impersonate.nix {}; custom-ca = handleTest ./custom-ca.nix {}; diff --git a/nixos/tests/common/acme/client/default.nix b/nixos/tests/common/acme/client/default.nix index 503e610d1ac9..f9b08b519dbe 100644 --- a/nixos/tests/common/acme/client/default.nix +++ b/nixos/tests/common/acme/client/default.nix @@ -1,4 +1,4 @@ -{ lib, nodes, pkgs, ... }: +{ nodes, ... }: let caCert = nodes.acme.test-support.acme.caCert; caDomain = nodes.acme.test-support.acme.caDomain; diff --git a/nixos/tests/cryptpad.nix b/nixos/tests/cryptpad.nix new file mode 100644 index 000000000000..9d6af15f5f86 --- /dev/null +++ b/nixos/tests/cryptpad.nix @@ -0,0 +1,71 @@ +{ pkgs, ... }: +let + certs = pkgs.runCommand "cryptpadSelfSignedCerts" { buildInputs = [ pkgs.openssl ]; } '' + mkdir -p $out + cd $out + openssl req -x509 -newkey rsa:4096 \ + -keyout key.pem -out cert.pem -nodes -days 3650 \ + -subj '/CN=cryptpad.localhost' \ + -addext 'subjectAltName = DNS.1:cryptpad.localhost, DNS.2:cryptpad-sandbox.localhost' + ''; + # data sniffed from cryptpad's /checkup network trace, seems to be re-usable + test_write_data = pkgs.writeText "cryptpadTestData" '' + {"command":"WRITE_BLOCK","content":{"publicKey":"O2onvM62pC1io6jQKm8Nc2UyFXcd4kOmOsBIoYtZ2ik=","signature":"aXcM9SMO59lwA7q7HbYB+AnzymmxSyy/KhkG/cXIBVzl8v+kkPWXmFuWhcuKfRF8yt3Zc3ktIsHoFyuyDSAwAA==","ciphertext":"AFwCIfBHKdFzDKjMg4cu66qlJLpP+6Yxogbl3o9neiQou5P8h8yJB8qgnQ=="},"publicKey":"O2onvM62pC1io6jQKm8Nc2UyFXcd4kOmOsBIoYtZ2ik=","nonce":"bitSbJMNSzOsg98nEzN80a231PCkBQeH"} + ''; +in +{ + name = "cryptpad"; + meta = with pkgs.lib.maintainers; { + maintainers = [ martinetd ]; + }; + + nodes.machine = { + services.cryptpad = { + enable = true; + configureNginx = true; + settings = { + httpUnsafeOrigin = "https://cryptpad.localhost"; + httpSafeOrigin = "https://cryptpad-sandbox.localhost"; + }; + }; + services.nginx = { + virtualHosts."cryptpad.localhost" = { + enableACME = false; + sslCertificate = "${certs}/cert.pem"; + sslCertificateKey = "${certs}/key.pem"; + }; + }; + security = { + pki.certificateFiles = [ "${certs}/cert.pem" ]; + }; + }; + + testScript = '' + machine.wait_for_unit("cryptpad.service") + machine.wait_for_unit("nginx.service") + machine.wait_for_open_port(3000) + + # test home page + machine.succeed("curl --fail https://cryptpad.localhost -o /tmp/cryptpad_home.html") + machine.succeed("grep -F 'CryptPad: Collaboration suite' /tmp/cryptpad_home.html") + + # test scripts/build.js actually generated customize content from config + machine.succeed("grep -F 'meta property=\"og:url\" content=\"https://cryptpad.localhost/index.html' /tmp/cryptpad_home.html") + + # make sure child pages are accessible (e.g. check nginx try_files paths) + machine.succeed( + "grep -oE '/(customize|components)[^\"]*' /tmp/cryptpad_home.html" + " | while read -r page; do" + " curl -O --fail https://cryptpad.localhost$page || exit;" + " done") + + # test some API (e.g. check cryptpad main process) + machine.succeed("curl --fail -d @${test_write_data} -H 'Content-Type: application/json' https://cryptpad.localhost/api/auth") + + # test telemetry has been disabled + machine.fail("journalctl -u cryptpad | grep TELEMETRY"); + + # for future improvements + machine.log(machine.execute("systemd-analyze security cryptpad.service")[1]) + ''; +} diff --git a/nixos/tests/installed-tests/ostree.nix b/nixos/tests/installed-tests/ostree.nix index 90e09ad4ddf4..b90870204225 100644 --- a/nixos/tests/installed-tests/ostree.nix +++ b/nixos/tests/installed-tests/ostree.nix @@ -1,4 +1,4 @@ -{ pkgs, lib, makeInstalledTest, ... }: +{ pkgs, makeInstalledTest, ... }: makeInstalledTest { tested = pkgs.ostree; diff --git a/nixos/tests/jackett.nix b/nixos/tests/jackett.nix index bc8b724e8b4b..4e65cb61d17a 100644 --- a/nixos/tests/jackett.nix +++ b/nixos/tests/jackett.nix @@ -1,17 +1,21 @@ import ./make-test-python.nix ({ lib, ... }: -{ +let + jackettPort = 9117; +in { name = "jackett"; meta.maintainers = with lib.maintainers; [ etu ]; nodes.machine = - { pkgs, ... }: - { services.jackett.enable = true; }; + { pkgs, ... }: { + services.jackett.enable = true; + services.jackett.port = jackettPort; + }; testScript = '' machine.start() machine.wait_for_unit("jackett.service") - machine.wait_for_open_port(9117) - machine.succeed("curl --fail http://localhost:9117/") + machine.wait_for_open_port(${toString jackettPort}) + machine.succeed("curl --fail http://localhost:${toString jackettPort}/") ''; }) diff --git a/nixos/tests/keycloak.nix b/nixos/tests/keycloak.nix index 259f1340a22d..67b412c80961 100644 --- a/nixos/tests/keycloak.nix +++ b/nixos/tests/keycloak.nix @@ -44,6 +44,7 @@ let }; plugins = with config.services.keycloak.package.plugins; [ keycloak-discord + keycloak-metrics-spi ]; }; environment.systemPackages = with pkgs; [ @@ -121,6 +122,14 @@ let | jq -r '"Authorization: bearer " + .access_token' >admin_auth_header """) + # Register the metrics SPI + keycloak.succeed( + """${pkgs.jre}/bin/keytool -import -alias snakeoil -file ${certs.ca.cert} -storepass aaaaaa -keystore cacert.jks -noprompt""", + """KC_OPTS='-Djavax.net.ssl.trustStore=cacert.jks -Djavax.net.ssl.trustStorePassword=aaaaaa' kcadm.sh config credentials --server '${frontendUrl}' --realm master --user admin --password "$(<${adminPasswordFile})" """, + """KC_OPTS='-Djavax.net.ssl.trustStore=cacert.jks -Djavax.net.ssl.trustStorePassword=aaaaaa' kcadm.sh update events/config -s 'eventsEnabled=true' -s 'adminEventsEnabled=true' -s 'eventsListeners+=metrics-listener'""", + """curl -sSf '${frontendUrl}/realms/master/metrics' | grep '^keycloak_admin_event_UPDATE'""" + ) + # Publish the realm, including a test OIDC client and user keycloak.succeed( "curl -sSf -H @admin_auth_header -X POST -H 'Content-Type: application/json' -d @${realmDataJson} '${frontendUrl}/admin/realms/'" diff --git a/nixos/tests/radicle.nix b/nixos/tests/radicle.nix index 2deff7487d80..b68cb7d716c2 100644 --- a/nixos/tests/radicle.nix +++ b/nixos/tests/radicle.nix @@ -66,7 +66,7 @@ in services.radicle = { enable = true; privateKeyFile = seed-ssh-keys.snakeOilEd25519PrivateKey; - publicKeyFile = seed-ssh-keys.snakeOilEd25519PublicKey; + publicKey = seed-ssh-keys.snakeOilEd25519PublicKey; node = { openFirewall = true; }; diff --git a/pkgs/applications/accessibility/squeekboard/default.nix b/pkgs/applications/accessibility/squeekboard/default.nix index 37468e477597..05d8af554a05 100644 --- a/pkgs/applications/accessibility/squeekboard/default.nix +++ b/pkgs/applications/accessibility/squeekboard/default.nix @@ -5,7 +5,6 @@ , meson , ninja , pkg-config -, gnome , gnome-desktop , glib , gtk3 diff --git a/pkgs/applications/audio/famistudio/default.nix b/pkgs/applications/audio/famistudio/default.nix index b858edf29bca..4e13d1aa0a5f 100644 --- a/pkgs/applications/audio/famistudio/default.nix +++ b/pkgs/applications/audio/famistudio/default.nix @@ -9,7 +9,6 @@ , libglvnd , libogg , libvorbis -, makeWrapper , openal , portaudio , rtmidi diff --git a/pkgs/applications/audio/faust/faust2lv2.nix b/pkgs/applications/audio/faust/faust2lv2.nix index b7e9ffb488c4..b863ad25ebdb 100644 --- a/pkgs/applications/audio/faust/faust2lv2.nix +++ b/pkgs/applications/audio/faust/faust2lv2.nix @@ -2,7 +2,6 @@ , faust , lv2 , qtbase -, which }: faust.wrapWithBuildEnv { diff --git a/pkgs/applications/audio/in-formant/default.nix b/pkgs/applications/audio/in-formant/default.nix index 3dd4a3006b2b..357560b178bb 100644 --- a/pkgs/applications/audio/in-formant/default.nix +++ b/pkgs/applications/audio/in-formant/default.nix @@ -13,7 +13,6 @@ , pkg-config , autoPatchelfHook , soxr -, freetype , libsamplerate , armadillo , tomlplusplus diff --git a/pkgs/applications/audio/open-music-kontrollers/generic.nix b/pkgs/applications/audio/open-music-kontrollers/generic.nix index b76a52ca3d28..5c48f08dcd7c 100644 --- a/pkgs/applications/audio/open-music-kontrollers/generic.nix +++ b/pkgs/applications/audio/open-music-kontrollers/generic.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, pkg-config, meson, ninja, libGLU, lv2, serd, sord, libX11, libXext, glew, lv2lint +{ stdenv, lib, fetchurl, pkg-config, meson, ninja, lv2, sord, libX11, libXext, glew, lv2lint , pname, version, sha256, description , url ? "https://git.open-music-kontrollers.ch/lv2/${pname}.lv2/snapshot/${pname}.lv2-${version}.tar.xz" , additionalBuildInputs ? [] diff --git a/pkgs/applications/audio/pipecontrol/default.nix b/pkgs/applications/audio/pipecontrol/default.nix index 1586be58e3cf..4bed5cb25037 100644 --- a/pkgs/applications/audio/pipecontrol/default.nix +++ b/pkgs/applications/audio/pipecontrol/default.nix @@ -4,7 +4,6 @@ , pipewire , cmake , extra-cmake-modules -, gnumake , wrapQtAppsHook , qtbase , qttools diff --git a/pkgs/applications/audio/viper4linux/default.nix b/pkgs/applications/audio/viper4linux/default.nix index 289c6fbf233f..134e535a7834 100644 --- a/pkgs/applications/audio/viper4linux/default.nix +++ b/pkgs/applications/audio/viper4linux/default.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchFromGitHub -, pkg-config , gst_all_1 , libviperfx , makeWrapper diff --git a/pkgs/applications/backup/timeshift/default.nix b/pkgs/applications/backup/timeshift/default.nix index 0a6a9bf38865..85a3295fb064 100644 --- a/pkgs/applications/backup/timeshift/default.nix +++ b/pkgs/applications/backup/timeshift/default.nix @@ -1,6 +1,5 @@ { callPackage , timeshift-unwrapped -, lib , rsync , coreutils , mount diff --git a/pkgs/applications/blockchains/bitcoin-knots/default.nix b/pkgs/applications/blockchains/bitcoin-knots/default.nix index ef5eab342a36..c6838e0a0f65 100644 --- a/pkgs/applications/blockchains/bitcoin-knots/default.nix +++ b/pkgs/applications/blockchains/bitcoin-knots/default.nix @@ -19,7 +19,6 @@ , qtbase ? null , qttools ? null , python3 -, nixosTests , withGui , withWallet ? true }: diff --git a/pkgs/applications/blockchains/electrs/default.nix b/pkgs/applications/blockchains/electrs/default.nix index d77694b450f2..f89b34097794 100644 --- a/pkgs/applications/blockchains/electrs/default.nix +++ b/pkgs/applications/blockchains/electrs/default.nix @@ -2,7 +2,6 @@ , stdenv , rustPlatform , fetchFromGitHub -, llvmPackages , rocksdb_7_10 , Security }: diff --git a/pkgs/applications/blockchains/gridcoin-research/default.nix b/pkgs/applications/blockchains/gridcoin-research/default.nix index 473803ece6d3..d5e06622ae0d 100644 --- a/pkgs/applications/blockchains/gridcoin-research/default.nix +++ b/pkgs/applications/blockchains/gridcoin-research/default.nix @@ -1,6 +1,5 @@ { fetchFromGitHub , stdenv -, makeDesktopItem , lib , openssl , boost diff --git a/pkgs/applications/blockchains/lighthouse/default.nix b/pkgs/applications/blockchains/lighthouse/default.nix index b3f13ac48b8d..2fbccd581eda 100644 --- a/pkgs/applications/blockchains/lighthouse/default.nix +++ b/pkgs/applications/blockchains/lighthouse/default.nix @@ -1,5 +1,4 @@ -{ clang -, cmake +{ cmake , CoreFoundation , fetchFromGitHub , fetchurl @@ -18,7 +17,6 @@ , stdenv , SystemConfiguration , testers -, unzip }: rustPlatform.buildRustPackage rec { diff --git a/pkgs/applications/blockchains/lnd/default.nix b/pkgs/applications/blockchains/lnd/default.nix index 52bb90511c3a..87bc32bd1af5 100644 --- a/pkgs/applications/blockchains/lnd/default.nix +++ b/pkgs/applications/blockchains/lnd/default.nix @@ -1,7 +1,6 @@ { buildGoModule , fetchFromGitHub , lib -, go , tags ? [ "autopilotrpc" "signrpc" "walletrpc" "chainrpc" "invoicesrpc" "watchtowerrpc" "routerrpc" "monitoring" "kvdb_postgres" "kvdb_etcd" ] }: diff --git a/pkgs/applications/blockchains/nearcore/default.nix b/pkgs/applications/blockchains/nearcore/default.nix index ec8d4360a6ff..46fbc289bde3 100644 --- a/pkgs/applications/blockchains/nearcore/default.nix +++ b/pkgs/applications/blockchains/nearcore/default.nix @@ -1,6 +1,6 @@ { rustPlatform, lib, fetchFromGitHub , zlib, openssl -, pkg-config, protobuf, llvmPackages +, pkg-config, protobuf }: rustPlatform.buildRustPackage rec { pname = "nearcore"; diff --git a/pkgs/applications/blockchains/snarkos/default.nix b/pkgs/applications/blockchains/snarkos/default.nix index 8e6fb1b38893..e4dc85f3c4d5 100644 --- a/pkgs/applications/blockchains/snarkos/default.nix +++ b/pkgs/applications/blockchains/snarkos/default.nix @@ -6,7 +6,6 @@ , curl , pkg-config , openssl -, llvmPackages }: rustPlatform.buildRustPackage rec { pname = "snarkos"; diff --git a/pkgs/applications/blockchains/solana-validator/default.nix b/pkgs/applications/blockchains/solana-validator/default.nix index 35dc9b31e16e..0d664374efa0 100644 --- a/pkgs/applications/blockchains/solana-validator/default.nix +++ b/pkgs/applications/blockchains/solana-validator/default.nix @@ -96,7 +96,7 @@ rustPlatform.buildRustPackage rec { }; meta = with lib; { - description = "Web-Scale Blockchain for fast, secure, scalable, decentralized apps and marketplaces. "; + description = "Web-Scale Blockchain for fast, secure, scalable, decentralized apps and marketplaces."; homepage = "https://solana.com"; license = licenses.asl20; maintainers = with maintainers; [ adjacentresearch ]; diff --git a/pkgs/applications/blockchains/sparrow/fhsenv.nix b/pkgs/applications/blockchains/sparrow/fhsenv.nix index 26bf9da0b85d..671da04b6921 100644 --- a/pkgs/applications/blockchains/sparrow/fhsenv.nix +++ b/pkgs/applications/blockchains/sparrow/fhsenv.nix @@ -1,5 +1,4 @@ -{ lib -, buildFHSEnv +{ buildFHSEnv , sparrow-unwrapped }: diff --git a/pkgs/applications/blockchains/terra-station/default.nix b/pkgs/applications/blockchains/terra-station/default.nix index 2ae6ca12b605..fef54f6844fa 100644 --- a/pkgs/applications/blockchains/terra-station/default.nix +++ b/pkgs/applications/blockchains/terra-station/default.nix @@ -1,8 +1,6 @@ { lib, stdenv , fetchurl , dpkg -, util-linux -, bash , makeWrapper , electron , asar diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/consult-gh/default.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/consult-gh/default.nix index 9914285d70f2..52dfd2ea095c 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/consult-gh/default.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/consult-gh/default.nix @@ -8,7 +8,6 @@ markdown-mode, melpaBuild, unstableGitUpdater, - writeText, }: melpaBuild { diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/git-undo/default.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/git-undo/default.nix index 74574c98cb43..b1a490fb2c9b 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/git-undo/default.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/git-undo/default.nix @@ -7,13 +7,13 @@ melpaBuild { pname = "git-undo"; - version = "0-unstable-2019-12-21"; + version = "0-unstable-2022-08-07"; src = fetchFromGitHub { owner = "jwiegley"; repo = "git-undo-el"; - rev = "cf31e38e7889e6ade7d2d2b9f8719fd44f52feb5"; - hash = "sha256-cVkK9EF6qQyVV3uVqnBEjF8e9nEx/8ixnM8PvxqCyYE="; + rev = "3d9c95fc40a362eae4b88e20ee21212d234a9ee6"; + hash = "sha256-xwVCAdxnIRHrFNWvtlM3u6CShsUiGgl1CiBTsp2x7IM="; }; passthru.updateScript = unstableGitUpdater { hardcodeZeroVersion = true; }; diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/isearch-plus/default.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/isearch-plus/default.nix index c2764968bcb5..84dd7a194166 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/isearch-plus/default.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/isearch-plus/default.nix @@ -8,13 +8,13 @@ melpaBuild { pname = "isearch-plus"; ename = "isearch+"; - version = "3434-unstable-2021-08-23"; + version = "3434-unstable-2023-09-27"; src = fetchFromGitHub { owner = "emacsmirror"; repo = "isearch-plus"; - rev = "93088ea0ac4d51bdb76c4c32ea53172f6c435852"; - hash = "sha256-kD+Fyps3fc5YK6ATU1nrkKHazGMYJnU2gRcpQZf6A1E="; + rev = "b10a36fb6bb8b45ff9d924107384e3bf0cee201d"; + hash = "sha256-h/jkIWjkLFbtBp9F+lhA3CulYy2XaeloLmexR0CDm3E="; }; passthru.updateScript = unstableGitUpdater { }; diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/tree-sitter-langs/default.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/tree-sitter-langs/default.nix index d9e2b850588c..5f04332db117 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/tree-sitter-langs/default.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/tree-sitter-langs/default.nix @@ -1,6 +1,5 @@ { lib , stdenv -, writeText , melpaStablePackages , runCommand , tree-sitter-grammars diff --git a/pkgs/applications/editors/jupyter-kernels/xeus-cling/xeus-cling.nix b/pkgs/applications/editors/jupyter-kernels/xeus-cling/xeus-cling.nix index 48873326bfcf..ec1def846977 100644 --- a/pkgs/applications/editors/jupyter-kernels/xeus-cling/xeus-cling.nix +++ b/pkgs/applications/editors/jupyter-kernels/xeus-cling/xeus-cling.nix @@ -1,10 +1,7 @@ { lib -, callPackage , clangStdenv , cmake , fetchFromGitHub -, gcc -, git , llvmPackages_13 # Libraries , argparse diff --git a/pkgs/applications/editors/micro/test-with-expect.nix b/pkgs/applications/editors/micro/test-with-expect.nix index d3e1d60e0874..8192f88487eb 100644 --- a/pkgs/applications/editors/micro/test-with-expect.nix +++ b/pkgs/applications/editors/micro/test-with-expect.nix @@ -1,4 +1,4 @@ -{ micro, expect, runCommand, writeScript, runtimeShell }: +{ micro, expect, runCommand, writeScript }: let expect-script = writeScript "expect-script" '' #!${expect}/bin/expect -f diff --git a/pkgs/applications/editors/nano/test-with-expect.nix b/pkgs/applications/editors/nano/test-with-expect.nix index bd48eba4324b..60cd30204542 100644 --- a/pkgs/applications/editors/nano/test-with-expect.nix +++ b/pkgs/applications/editors/nano/test-with-expect.nix @@ -1,4 +1,4 @@ -{ nano, expect, runCommand, writeScriptBin, runtimeShell }: +{ nano, expect, runCommand, writeScriptBin }: let expect-script = writeScriptBin "expect-script" '' #!${expect}/bin/expect -f diff --git a/pkgs/applications/editors/neovim/tests/default.nix b/pkgs/applications/editors/neovim/tests/default.nix index c2e6b565de28..9152d93c1544 100644 --- a/pkgs/applications/editors/neovim/tests/default.nix +++ b/pkgs/applications/editors/neovim/tests/default.nix @@ -1,6 +1,6 @@ # run tests by building `neovim.tests` { vimUtils, writeText, neovim, vimPlugins -, lib, neovimUtils, wrapNeovimUnstable +, neovimUtils, wrapNeovimUnstable , neovim-unwrapped , fetchFromGitLab , runCommandLocal diff --git a/pkgs/applications/editors/quartus-prime/default.nix b/pkgs/applications/editors/quartus-prime/default.nix index dfe977876231..b50d505e2dbb 100644 --- a/pkgs/applications/editors/quartus-prime/default.nix +++ b/pkgs/applications/editors/quartus-prime/default.nix @@ -1,4 +1,4 @@ -{ lib, buildFHSEnv, callPackage, makeDesktopItem, writeScript, runtimeShell +{ lib, buildFHSEnv, callPackage, makeDesktopItem, runtimeShell , runCommand, unstick, quartus-prime-lite , withQuesta ? true , supportedDevices ? [ "Arria II" "Cyclone V" "Cyclone IV" "Cyclone 10 LP" "MAX II/V" "MAX 10 FPGA" ] diff --git a/pkgs/applications/editors/rstudio/default.nix b/pkgs/applications/editors/rstudio/default.nix index 983d661fef52..0521d3dce56a 100644 --- a/pkgs/applications/editors/rstudio/default.nix +++ b/pkgs/applications/editors/rstudio/default.nix @@ -2,7 +2,6 @@ , stdenv , mkDerivation , fetchurl -, fetchpatch , fetchFromGitHub , makeDesktopItem , copyDesktopItems diff --git a/pkgs/applications/editors/thonny/default.nix b/pkgs/applications/editors/thonny/default.nix index fa29fae66713..d2aabf5a92f8 100644 --- a/pkgs/applications/editors/thonny/default.nix +++ b/pkgs/applications/editors/thonny/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchFromGitHub, python3, tk, makeDesktopItem, copyDesktopItems }: +{ lib, fetchFromGitHub, python3, makeDesktopItem, copyDesktopItems }: with python3.pkgs; diff --git a/pkgs/applications/editors/typora/default.nix b/pkgs/applications/editors/typora/default.nix index 30600de859b5..43c655750db5 100644 --- a/pkgs/applications/editors/typora/default.nix +++ b/pkgs/applications/editors/typora/default.nix @@ -5,14 +5,12 @@ , glib , nss , nspr -, at-spi2-atk , cups , dbus , libdrm , gtk3 , pango , cairo -, xorg , libxkbcommon , mesa , expat diff --git a/pkgs/applications/editors/vim/full.nix b/pkgs/applications/editors/vim/full.nix index 0f3652a8a7de..663dc5b688c7 100644 --- a/pkgs/applications/editors/vim/full.nix +++ b/pkgs/applications/editors/vim/full.nix @@ -5,7 +5,6 @@ , vimPlugins , makeWrapper , wrapGAppsHook3 -, runtimeShell # apple frameworks , CoreServices, CoreData, Cocoa, Foundation, libobjc diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index aceef615fe90..114952110ef7 100644 --- a/pkgs/applications/editors/vim/plugins/generated.nix +++ b/pkgs/applications/editors/vim/plugins/generated.nix @@ -6168,6 +6168,18 @@ final: prev: meta.homepage = "https://github.com/savq/melange-nvim/"; }; + messenger-nvim = buildVimPlugin { + pname = "messenger.nvim"; + version = "2024-07-18"; + src = fetchFromGitHub { + owner = "lsig"; + repo = "messenger.nvim"; + rev = "309fec2ddd3de55eba2781b676931b37ce8190af"; + sha256 = "1ycvxxcp04hh134nazdrzd9g98mkdipc2p0amvcphpqr9p9s3pcm"; + }; + meta.homepage = "https://github.com/lsig/messenger.nvim/"; + }; + miasma-nvim = buildVimPlugin { pname = "miasma.nvim"; version = "2023-10-24"; @@ -9821,18 +9833,6 @@ final: prev: meta.homepage = "https://github.com/rust-lang/rust.vim/"; }; - rustaceanvim = buildNeovimPlugin { - pname = "rustaceanvim"; - version = "2024-07-10"; - src = fetchFromGitHub { - owner = "mrcjkb"; - repo = "rustaceanvim"; - rev = "047f9c9d8cd2861745eb9de6c1570ee0875aa795"; - sha256 = "0q06rkg8dfzxvlwp7svp8sjkk0f2x5vvjkv6grdmm302s43jj7rk"; - }; - meta.homepage = "https://github.com/mrcjkb/rustaceanvim/"; - }; - sad-vim = buildVimPlugin { pname = "sad.vim"; version = "2019-02-18"; diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix index 3355db3b54f2..b4826109a7dd 100644 --- a/pkgs/applications/editors/vim/plugins/overrides.nix +++ b/pkgs/applications/editors/vim/plugins/overrides.nix @@ -1380,6 +1380,8 @@ dependencies = with self; [ nvim-lspconfig ]; }; + rustaceanvim = neovimUtils.buildNeovimPlugin { luaAttr = "rustaceanvim"; }; + sg-nvim = super.sg-nvim.overrideAttrs (old: let sg-nvim-rust = rustPlatform.buildRustPackage { diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names index 2554d25ac74c..6e9e858c56d1 100644 --- a/pkgs/applications/editors/vim/plugins/vim-plugin-names +++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names @@ -517,6 +517,7 @@ https://github.com/kaicataldo/material.vim/,HEAD, https://github.com/vim-scripts/mayansmoke/,, https://github.com/chikamichi/mediawiki.vim/,HEAD, https://github.com/savq/melange-nvim/,, +https://github.com/lsig/messenger.nvim/,HEAD, https://github.com/xero/miasma.nvim/,, https://github.com/dasupradyumna/midnight.nvim/,, https://github.com/phaazon/mind.nvim/,HEAD, @@ -826,7 +827,6 @@ https://github.com/keith/rspec.vim/,, https://github.com/ccarpita/rtorrent-syntax-file/,, https://github.com/simrat39/rust-tools.nvim/,, https://github.com/rust-lang/rust.vim/,, -https://github.com/mrcjkb/rustaceanvim/,HEAD, https://github.com/hauleth/sad.vim/,, https://github.com/vmware-archive/salt-vim/,, https://github.com/lewis6991/satellite.nvim/,HEAD, diff --git a/pkgs/applications/editors/vscode/extensions/chenglou92.rescript-vscode/rescript-editor-analysis.nix b/pkgs/applications/editors/vscode/extensions/chenglou92.rescript-vscode/rescript-editor-analysis.nix index 9a00fb31cd41..7b2452a814bf 100644 --- a/pkgs/applications/editors/vscode/extensions/chenglou92.rescript-vscode/rescript-editor-analysis.nix +++ b/pkgs/applications/editors/vscode/extensions/chenglou92.rescript-vscode/rescript-editor-analysis.nix @@ -2,7 +2,6 @@ lib, stdenv, fetchFromGitHub, - bash, ocaml, ocamlPackages, dune_3, diff --git a/pkgs/applications/editors/vscode/extensions/ms-vscode.cpptools/default.nix b/pkgs/applications/editors/vscode/extensions/ms-vscode.cpptools/default.nix index 13684518a302..c1f5ad3615e1 100644 --- a/pkgs/applications/editors/vscode/extensions/ms-vscode.cpptools/default.nix +++ b/pkgs/applications/editors/vscode/extensions/ms-vscode.cpptools/default.nix @@ -1,8 +1,6 @@ { lib, vscode-utils, - writeScript, - runtimeShell, jq, clang-tools, gdbUseFixed ? true, diff --git a/pkgs/applications/editors/vscode/extensions/vadimcn.vscode-lldb/default.nix b/pkgs/applications/editors/vscode/extensions/vadimcn.vscode-lldb/default.nix index 6f14d1e91821..0d55381e6597 100644 --- a/pkgs/applications/editors/vscode/extensions/vadimcn.vscode-lldb/default.nix +++ b/pkgs/applications/editors/vscode/extensions/vadimcn.vscode-lldb/default.nix @@ -1,5 +1,4 @@ { - pkgs, lib, stdenv, fetchFromGitHub, diff --git a/pkgs/applications/file-managers/portfolio-filemanager/default.nix b/pkgs/applications/file-managers/portfolio-filemanager/default.nix index 8375e18634b0..6b19d9564f68 100644 --- a/pkgs/applications/file-managers/portfolio-filemanager/default.nix +++ b/pkgs/applications/file-managers/portfolio-filemanager/default.nix @@ -4,7 +4,6 @@ , appstream-glib , desktop-file-utils , gettext -, glib , gobject-introspection , gtk3 , gtk4 diff --git a/pkgs/applications/file-managers/ranger/default.nix b/pkgs/applications/file-managers/ranger/default.nix index ee2df2a60f69..48d161e22d5d 100644 --- a/pkgs/applications/file-managers/ranger/default.nix +++ b/pkgs/applications/file-managers/ranger/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchFromGitHub, python3Packages, file, less, highlight, w3m, ranger, imagemagick, testers +{ lib, fetchFromGitHub, python3Packages, file, less, highlight, w3m, imagemagick , imagePreviewSupport ? true , sixelPreviewSupport ? true , neoVimSupport ? true diff --git a/pkgs/applications/gis/qgis/default.nix b/pkgs/applications/gis/qgis/default.nix index 8b19c70c3b4d..e5e744b37467 100644 --- a/pkgs/applications/gis/qgis/default.nix +++ b/pkgs/applications/gis/qgis/default.nix @@ -1,5 +1,4 @@ -{ lib -, makeWrapper +{ makeWrapper , nixosTests , symlinkJoin diff --git a/pkgs/applications/gis/qgis/ltr.nix b/pkgs/applications/gis/qgis/ltr.nix index b551fe0a1e44..bcf99a5f4e4f 100644 --- a/pkgs/applications/gis/qgis/ltr.nix +++ b/pkgs/applications/gis/qgis/ltr.nix @@ -1,5 +1,4 @@ -{ lib -, makeWrapper +{ makeWrapper , nixosTests , symlinkJoin diff --git a/pkgs/applications/graphics/epick/default.nix b/pkgs/applications/graphics/epick/default.nix index dee31abdd29d..f33eee5c97c7 100644 --- a/pkgs/applications/graphics/epick/default.nix +++ b/pkgs/applications/graphics/epick/default.nix @@ -8,7 +8,6 @@ , freetype , libGL , xorg -, darwin , AppKit }: diff --git a/pkgs/applications/graphics/gimp/plugins/default.nix b/pkgs/applications/graphics/gimp/plugins/default.nix index fe4904ee254a..0a63d82b1b2d 100644 --- a/pkgs/applications/graphics/gimp/plugins/default.nix +++ b/pkgs/applications/graphics/gimp/plugins/default.nix @@ -2,7 +2,7 @@ # If you just want a subset of plug-ins, you can specify them explicitly: # `gimp-with-plugins.override { plugins = with gimpPlugins; [ gap ]; }`. -{ config, lib, pkgs }: +{ lib, pkgs }: let inherit (pkgs) stdenv fetchurl fetchpatch fetchpatch2 pkg-config intltool glib fetchFromGitHub fetchFromGitLab; diff --git a/pkgs/applications/graphics/lazpaint/default.nix b/pkgs/applications/graphics/lazpaint/default.nix index 1f6a9460a6a4..7fcfebe11d72 100644 --- a/pkgs/applications/graphics/lazpaint/default.nix +++ b/pkgs/applications/graphics/lazpaint/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, lazarus, fpc, pango, cairo, glib -, atk, gtk2, libX11, gdk-pixbuf, busybox, python3 +, atk, gtk2, libX11, gdk-pixbuf, python3 , makeWrapper }: diff --git a/pkgs/applications/graphics/ocrfeeder/default.nix b/pkgs/applications/graphics/ocrfeeder/default.nix index a3778f7053b4..05d157c2d9b4 100644 --- a/pkgs/applications/graphics/ocrfeeder/default.nix +++ b/pkgs/applications/graphics/ocrfeeder/default.nix @@ -10,7 +10,6 @@ , goocanvas2 , gtkspell3 , isocodes -, gnome , python3 , tesseract4 , extraOcrEngines ? [] # other supported engines are: ocrad gocr cuneiform diff --git a/pkgs/applications/graphics/pick-colour-picker/default.nix b/pkgs/applications/graphics/pick-colour-picker/default.nix index 98980ed7fd46..b255db336256 100644 --- a/pkgs/applications/graphics/pick-colour-picker/default.nix +++ b/pkgs/applications/graphics/pick-colour-picker/default.nix @@ -7,7 +7,6 @@ , gtk3 , gobject-introspection , wrapGAppsHook3 -, python }: buildPythonPackage rec { diff --git a/pkgs/applications/graphics/pixinsight/default.nix b/pkgs/applications/graphics/pixinsight/default.nix index 945b6acf27bd..c034e23d4a78 100644 --- a/pkgs/applications/graphics/pixinsight/default.nix +++ b/pkgs/applications/graphics/pixinsight/default.nix @@ -3,7 +3,6 @@ , requireFile , wrapQtAppsHook , autoPatchelfHook -, makeWrapper , unixtools , fakeroot , mailcap diff --git a/pkgs/applications/graphics/pizarra/default.nix b/pkgs/applications/graphics/pizarra/default.nix index 5d06423b9fa4..2167eb3a9caf 100644 --- a/pkgs/applications/graphics/pizarra/default.nix +++ b/pkgs/applications/graphics/pizarra/default.nix @@ -1,9 +1,7 @@ { lib , fetchFromGitLab , rustPlatform -, cargo , pkg-config -, binutils-unwrapped , gtk3-x11 , atk , glib diff --git a/pkgs/applications/graphics/qscreenshot/default.nix b/pkgs/applications/graphics/qscreenshot/default.nix index 761bd69d3520..d8ed2a14e925 100644 --- a/pkgs/applications/graphics/qscreenshot/default.nix +++ b/pkgs/applications/graphics/qscreenshot/default.nix @@ -1,7 +1,6 @@ { stdenv , lib , fetchgit -, dos2unix , qtbase , qttools , qtx11extras diff --git a/pkgs/applications/graphics/sane/backends/brscan5/default.nix b/pkgs/applications/graphics/sane/backends/brscan5/default.nix index c15599ec66bb..9749ae5b658f 100644 --- a/pkgs/applications/graphics/sane/backends/brscan5/default.nix +++ b/pkgs/applications/graphics/sane/backends/brscan5/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, callPackage, patchelf, makeWrapper, libusb1, avahi-compat, glib, libredirect, nixosTests }: +{ stdenv, lib, fetchurl, patchelf, makeWrapper, libusb1, avahi-compat, glib, libredirect, nixosTests }: let myPatchElf = file: with lib; '' patchelf --set-interpreter \ diff --git a/pkgs/applications/graphics/seamly2d/default.nix b/pkgs/applications/graphics/seamly2d/default.nix index bd8316b953f0..7c161d0345df 100644 --- a/pkgs/applications/graphics/seamly2d/default.nix +++ b/pkgs/applications/graphics/seamly2d/default.nix @@ -1,6 +1,6 @@ { stdenv, lib, qtbase, wrapQtAppsHook, fetchFromGitHub, - addOpenGLRunpath, poppler_utils, qtxmlpatterns, qtsvg, mesa, gcc, xvfb-run, - fontconfig, freetype, xorg, ccache, qmake, python3, qttools, git + addOpenGLRunpath, poppler_utils, qtxmlpatterns, qtsvg, mesa, xvfb-run, + fontconfig, freetype, xorg, qmake, python3, qttools, git }: let qtPython = python3.withPackages (pkgs: with pkgs; [ pyqt5 ]); diff --git a/pkgs/applications/graphics/trimage/default.nix b/pkgs/applications/graphics/trimage/default.nix index 4a0bf082c10a..6f38e22de14f 100644 --- a/pkgs/applications/graphics/trimage/default.nix +++ b/pkgs/applications/graphics/trimage/default.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchFromGitHub -, substituteAll , python3 , installShellFiles diff --git a/pkgs/applications/graphics/vengi-tools/default.nix b/pkgs/applications/graphics/vengi-tools/default.nix index 21a038994904..41c51787d7e4 100644 --- a/pkgs/applications/graphics/vengi-tools/default.nix +++ b/pkgs/applications/graphics/vengi-tools/default.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchFromGitHub -, writeText , cmake , pkg-config diff --git a/pkgs/applications/graphics/xournalpp/default.nix b/pkgs/applications/graphics/xournalpp/default.nix index 2c61584dae5a..3527f96bf5b9 100644 --- a/pkgs/applications/graphics/xournalpp/default.nix +++ b/pkgs/applications/graphics/xournalpp/default.nix @@ -6,6 +6,7 @@ , wrapGAppsHook3 , pkg-config +, adwaita-icon-theme , alsa-lib , binutils , glib @@ -63,6 +64,12 @@ stdenv.mkDerivation rec { buildFlags = [ "translations" ]; + preFixup = '' + gappsWrapperArgs+=( + --prefix XDG_DATA_DIRS : "${adwaita-icon-theme}/share" + ) + ''; + meta = with lib; { description = "Xournal++ is a handwriting Notetaking software with PDF annotation support"; homepage = "https://xournalpp.github.io/"; diff --git a/pkgs/applications/kde/kdevelop/kdevelop.nix b/pkgs/applications/kde/kdevelop/kdevelop.nix index c5e3fcf6b2f8..3c7be8d6172a 100644 --- a/pkgs/applications/kde/kdevelop/kdevelop.nix +++ b/pkgs/applications/kde/kdevelop/kdevelop.nix @@ -1,5 +1,5 @@ { mkDerivation, lib, cmake, gettext, pkg-config, extra-cmake-modules -, qtquickcontrols, qttools, kde-cli-tools, qtbase +, qtquickcontrols, qttools, kde-cli-tools , kconfig, kdeclarative, kdoctools, kiconthemes, ki18n, kitemmodels, kitemviews , kjobwidgets, kcmutils, kio, knewstuff, knotifyconfig, kparts, ktexteditor , threadweaver, kxmlgui, kwindowsystem, grantlee, kcrash, karchive, kguiaddons diff --git a/pkgs/applications/kde/palapeli.nix b/pkgs/applications/kde/palapeli.nix index 37a387af0a3d..1db865942fd2 100644 --- a/pkgs/applications/kde/palapeli.nix +++ b/pkgs/applications/kde/palapeli.nix @@ -2,7 +2,6 @@ , mkDerivation , extra-cmake-modules , shared-mime-info -, kconfig , kdoctools , kio , ktextwidgets diff --git a/pkgs/applications/maui/mauikit.nix b/pkgs/applications/maui/mauikit.nix index fcba0fbdf547..71d148685e7e 100644 --- a/pkgs/applications/maui/mauikit.nix +++ b/pkgs/applications/maui/mauikit.nix @@ -7,7 +7,6 @@ , ki18n , knotifications , mauiman -, qtbase , qtquickcontrols2 , qtx11extras }: diff --git a/pkgs/applications/misc/1password-gui/darwin.nix b/pkgs/applications/misc/1password-gui/darwin.nix index 6f3d86f51c34..66af74630c34 100644 --- a/pkgs/applications/misc/1password-gui/darwin.nix +++ b/pkgs/applications/misc/1password-gui/darwin.nix @@ -1,16 +1,25 @@ -{ stdenv -, pname -, version -, src -, meta -, unzip -, undmg +{ + stdenv, + pname, + version, + src, + meta, + unzip, + undmg, }: stdenv.mkDerivation { - inherit pname version src meta; + inherit + pname + version + src + meta + ; - nativeBuildInputs = [ unzip undmg ]; + nativeBuildInputs = [ + unzip + undmg + ]; sourceRoot = "."; diff --git a/pkgs/applications/misc/1password-gui/default.nix b/pkgs/applications/misc/1password-gui/default.nix index 07ed8dcd573f..9d9a9fd4eb60 100644 --- a/pkgs/applications/misc/1password-gui/default.nix +++ b/pkgs/applications/misc/1password-gui/default.nix @@ -1,13 +1,14 @@ -{ stdenv -, callPackage -, channel ? "stable" -, fetchurl -, lib -# This is only relevant for Linux, so we need to pass it through -, polkitPolicyOwners ? [ ] }: +{ + stdenv, + callPackage, + channel ? "stable", + fetchurl, + lib, + # This is only relevant for Linux, so we need to pass it through + polkitPolicyOwners ? [ ], +}: let - pname = "1password"; version = if channel == "stable" then "8.10.36" else "8.10.38-13.BETA"; @@ -51,19 +52,46 @@ let }; src = fetchurl { - inherit (sources.${channel}.${stdenv.system} or (throw "unsupported system ${stdenv.hostPlatform.system}")) url hash; + inherit + (sources.${channel}.${stdenv.system} or (throw "unsupported system ${stdenv.hostPlatform.system}")) + url + hash + ; }; - meta = with lib; { + meta = { + # Requires to be installed in "/Application" which is not possible for now (https://github.com/NixOS/nixpkgs/issues/254944) + broken = stdenv.isDarwin; description = "Multi-platform password manager"; homepage = "https://1password.com/"; - sourceProvenance = with sourceTypes; [ binaryNativeCode ]; - license = licenses.unfree; - maintainers = with maintainers; [ timstott savannidgerinel sebtm ]; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; + license = lib.licenses.unfree; + maintainers = with lib.maintainers; [ + timstott + savannidgerinel + sebtm + ]; platforms = builtins.attrNames sources.${channel}; mainProgram = "1password"; }; -in if stdenv.isDarwin -then callPackage ./darwin.nix { inherit pname version src meta; } -else callPackage ./linux.nix { inherit pname version src meta polkitPolicyOwners; } +in +if stdenv.isDarwin then + callPackage ./darwin.nix { + inherit + pname + version + src + meta + ; + } +else + callPackage ./linux.nix { + inherit + pname + version + src + meta + polkitPolicyOwners + ; + } diff --git a/pkgs/applications/misc/1password-gui/linux.nix b/pkgs/applications/misc/1password-gui/linux.nix index bfd9df01dbfa..3361d4e92d9c 100644 --- a/pkgs/applications/misc/1password-gui/linux.nix +++ b/pkgs/applications/misc/1password-gui/linux.nix @@ -1,55 +1,65 @@ -{ lib -, stdenv -, pname -, version -, src -, meta -, makeShellWrapper -, wrapGAppsHook3 -, alsa-lib -, at-spi2-atk -, at-spi2-core -, atk -, cairo -, cups -, dbus -, expat -, gdk-pixbuf -, glib -, gtk3 -, libX11 -, libXcomposite -, libXdamage -, libXext -, libXfixes -, libXrandr -, libdrm -, libxcb -, libxkbcommon -, libxshmfence -, libGL -, libappindicator-gtk3 -, mesa -, nspr -, nss -, pango -, systemd -, udev -, xdg-utils +{ + lib, + stdenv, + pname, + version, + src, + meta, + makeShellWrapper, + wrapGAppsHook3, + alsa-lib, + at-spi2-atk, + at-spi2-core, + atk, + cairo, + cups, + dbus, + expat, + gdk-pixbuf, + glib, + gtk3, + libX11, + libXcomposite, + libXdamage, + libXext, + libXfixes, + libXrandr, + libdrm, + libxcb, + libxkbcommon, + libxshmfence, + libGL, + libappindicator-gtk3, + mesa, + nspr, + nss, + pango, + systemd, + udev, + xdg-utils, # The 1Password polkit file requires a list of users for whom polkit # integrations should be enabled. This should be a list of strings that # correspond to usernames. -, polkitPolicyOwners ? [] + polkitPolicyOwners ? [ ], }: let # Convert the polkitPolicyOwners variable to a polkit-compatible string for the polkit file. policyOwners = lib.concatStringsSep " " (map (user: "unix-user:${user}") polkitPolicyOwners); -in stdenv.mkDerivation { - inherit pname version src meta; +in +stdenv.mkDerivation { + inherit + pname + version + src + meta + ; - nativeBuildInputs = [ makeShellWrapper wrapGAppsHook3 ]; + nativeBuildInputs = [ + makeShellWrapper + wrapGAppsHook3 + ]; buildInputs = [ glib ]; dontConfigure = true; @@ -58,37 +68,41 @@ in stdenv.mkDerivation { dontWrapGApps = true; installPhase = - let rpath = lib.makeLibraryPath [ - alsa-lib - at-spi2-atk - at-spi2-core - atk - cairo - cups - dbus - expat - gdk-pixbuf - glib - gtk3 - libX11 - libXcomposite - libXdamage - libXext - libXfixes - libXrandr - libdrm - libxcb - libxkbcommon - libxshmfence - libGL - libappindicator-gtk3 - mesa - nspr - nss - pango - systemd - ] + ":${stdenv.cc.cc.lib}/lib64"; - in '' + let + rpath = + lib.makeLibraryPath [ + alsa-lib + at-spi2-atk + at-spi2-core + atk + cairo + cups + dbus + expat + gdk-pixbuf + glib + gtk3 + libX11 + libXcomposite + libXdamage + libXext + libXfixes + libXrandr + libdrm + libxcb + libxkbcommon + libxshmfence + libGL + libappindicator-gtk3 + mesa + nspr + nss + pango + systemd + ] + + ":${stdenv.cc.cc.lib}/lib64"; + in + '' runHook preInstall mkdir -p $out/bin $out/share/1password @@ -99,12 +113,13 @@ in stdenv.mkDerivation { substituteInPlace $out/share/applications/${pname}.desktop \ --replace 'Exec=/opt/1Password/${pname}' 'Exec=${pname}' - '' + (lib.optionalString (polkitPolicyOwners != [ ]) - '' + '' + + (lib.optionalString (polkitPolicyOwners != [ ]) '' # Polkit file mkdir -p $out/share/polkit-1/actions substitute com.1password.1Password.policy.tpl $out/share/polkit-1/actions/com.1password.1Password.policy --replace "\''${POLICY_OWNERS}" "${policyOwners}" - '') + '' + '') + + '' # Icons cp -a resources/icons $out/share diff --git a/pkgs/applications/misc/auto-multiple-choice/default.nix b/pkgs/applications/misc/auto-multiple-choice/default.nix index 33a4edbdbe57..96fd8e8c5f49 100644 --- a/pkgs/applications/misc/auto-multiple-choice/default.nix +++ b/pkgs/applications/misc/auto-multiple-choice/default.nix @@ -21,7 +21,6 @@ , perl , pkg-config , poppler -, auto-multiple-choice }: stdenv.mkDerivation (finalAttrs: rec { pname = "auto-multiple-choice"; diff --git a/pkgs/applications/misc/bemenu/default.nix b/pkgs/applications/misc/bemenu/default.nix index 3e53137ab5e1..1ddf73deb98f 100644 --- a/pkgs/applications/misc/bemenu/default.nix +++ b/pkgs/applications/misc/bemenu/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchFromGitHub, cairo, libxkbcommon -, pango, fribidi, harfbuzz, pcre, pkg-config, scdoc +, pango, fribidi, harfbuzz, pkg-config, scdoc , ncursesSupport ? true, ncurses , waylandSupport ? true, wayland, wayland-protocols, wayland-scanner , x11Support ? true, xorg diff --git a/pkgs/applications/misc/blender/wrapper.nix b/pkgs/applications/misc/blender/wrapper.nix index 7450827a8fa9..8b5e8916a138 100644 --- a/pkgs/applications/misc/blender/wrapper.nix +++ b/pkgs/applications/misc/blender/wrapper.nix @@ -1,5 +1,4 @@ { stdenv -, lib , blender , makeWrapper , extraModules ? [] diff --git a/pkgs/applications/misc/cardpeek/default.nix b/pkgs/applications/misc/cardpeek/default.nix index 0b7630b53f09..833ad9202b9f 100644 --- a/pkgs/applications/misc/cardpeek/default.nix +++ b/pkgs/applications/misc/cardpeek/default.nix @@ -10,7 +10,6 @@ , curl , readline , PCSC -, xcbuild }: let version = "0.8.4"; diff --git a/pkgs/applications/misc/cask-server/default.nix b/pkgs/applications/misc/cask-server/default.nix index 462696348839..2cb52a2b2cc8 100644 --- a/pkgs/applications/misc/cask-server/default.nix +++ b/pkgs/applications/misc/cask-server/default.nix @@ -1,5 +1,4 @@ { lib -, pkgs , mkDerivation , fetchFromGitHub , cmake diff --git a/pkgs/applications/misc/clipmenu/default.nix b/pkgs/applications/misc/clipmenu/default.nix index c47dd972ccfd..b12dc7f04c36 100644 --- a/pkgs/applications/misc/clipmenu/default.nix +++ b/pkgs/applications/misc/clipmenu/default.nix @@ -4,7 +4,6 @@ , makeWrapper , clipnotify , coreutils -, dmenu , gawk , util-linux , xdotool diff --git a/pkgs/applications/misc/conduktor/default.nix b/pkgs/applications/misc/conduktor/default.nix index 6eb0e832bc95..574bd3bf922e 100644 --- a/pkgs/applications/misc/conduktor/default.nix +++ b/pkgs/applications/misc/conduktor/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, fetchzip, jdk11, unzip, makeWrapper, makeDesktopItem, copyDesktopItems }: +{ stdenv, lib, fetchurl, fetchzip, jdk11, makeWrapper, makeDesktopItem, copyDesktopItems }: stdenv.mkDerivation rec { pname = "conduktor"; diff --git a/pkgs/applications/misc/far2l/default.nix b/pkgs/applications/misc/far2l/default.nix index c356706151b1..f35df6a049f2 100644 --- a/pkgs/applications/misc/far2l/default.nix +++ b/pkgs/applications/misc/far2l/default.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation rec { pname = "far2l"; - version = "2.6.2"; + version = "2.6.3"; src = fetchFromGitHub { owner = "elfmz"; repo = "far2l"; rev = "v_${version}"; - sha256 = "sha256-rX+r5l6dOKZPeiOIdWVPlux5yu5TsuRNCfv3PmNvJWI="; + sha256 = "sha256-iWZQpLe+shdepCVOHZDp7QEQoqelbHGRJh09KWb6aD0="; }; nativeBuildInputs = [ cmake ninja pkg-config m4 perl makeWrapper ]; diff --git a/pkgs/applications/misc/fetchmail/default.nix b/pkgs/applications/misc/fetchmail/default.nix index fb2548f26a95..a949d492b29f 100644 --- a/pkgs/applications/misc/fetchmail/default.nix +++ b/pkgs/applications/misc/fetchmail/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "fetchmail"; - version = "6.4.38"; + version = "6.4.39"; src = fetchurl { url = "mirror://sourceforge/fetchmail/fetchmail-${version}.tar.xz"; - sha256 = "sha256-pstOqGOsYdJC/7LbVko5EjdhV40+QNcc57bykFvmCdk="; + sha256 = "sha256-dRCaHzB7U4FV+gX17ymOgpjLTerpWu0kwWs402/woYY="; }; buildInputs = [ openssl python3 ]; diff --git a/pkgs/applications/misc/gollum/default.nix b/pkgs/applications/misc/gollum/default.nix index cb39fbd3964e..962523619361 100644 --- a/pkgs/applications/misc/gollum/default.nix +++ b/pkgs/applications/misc/gollum/default.nix @@ -1,4 +1,4 @@ -{ lib, bundlerApp, bundlerUpdateScript, ruby, makeWrapper, git, docutils, nixosTests }: +{ lib, bundlerApp, bundlerUpdateScript, ruby, makeWrapper, nixosTests }: bundlerApp rec { pname = "gollum"; diff --git a/pkgs/applications/misc/hollywood/default.nix b/pkgs/applications/misc/hollywood/default.nix index 1b655e5afacc..96e88500ae20 100644 --- a/pkgs/applications/misc/hollywood/default.nix +++ b/pkgs/applications/misc/hollywood/default.nix @@ -19,13 +19,6 @@ , findutils , ccze , ncurses -, python3 -, wget -, libcaca -, newsboat -, rsstail -, w3m -, ticker , tmux }: diff --git a/pkgs/applications/misc/holochain-launcher/default.nix b/pkgs/applications/misc/holochain-launcher/default.nix index 23b12f032bd9..b438f6c6d5df 100644 --- a/pkgs/applications/misc/holochain-launcher/default.nix +++ b/pkgs/applications/misc/holochain-launcher/default.nix @@ -2,7 +2,6 @@ , lib , fetchurl , autoPatchelfHook -, pkg-config , dpkg , openssl , webkitgtk diff --git a/pkgs/applications/misc/huggle/default.nix b/pkgs/applications/misc/huggle/default.nix index 37d43a90d05d..381804c2b8de 100644 --- a/pkgs/applications/misc/huggle/default.nix +++ b/pkgs/applications/misc/huggle/default.nix @@ -5,7 +5,6 @@ , ncurses , which , cmake -, unzip , wrapQtAppsHook , qtwebengine , yaml-cpp diff --git a/pkgs/applications/misc/makehuman/default.nix b/pkgs/applications/misc/makehuman/default.nix index 70cb33643ee6..005a97c1e5c9 100644 --- a/pkgs/applications/misc/makehuman/default.nix +++ b/pkgs/applications/misc/makehuman/default.nix @@ -4,7 +4,6 @@ , fetchFromGitHub , python3 , qtbase -, qttools , git-lfs , wrapQtAppsHook }: diff --git a/pkgs/applications/misc/nix-tour/default.nix b/pkgs/applications/misc/nix-tour/default.nix index bff2a40e5370..bde9e099a727 100644 --- a/pkgs/applications/misc/nix-tour/default.nix +++ b/pkgs/applications/misc/nix-tour/default.nix @@ -2,7 +2,6 @@ , stdenv , fetchFromGitHub , electron -, runtimeShell , makeWrapper , copyDesktopItems , makeDesktopItem diff --git a/pkgs/applications/misc/opencpn/default.nix b/pkgs/applications/misc/opencpn/default.nix index 84aff125aac2..380a88e6f2e0 100644 --- a/pkgs/applications/misc/opencpn/default.nix +++ b/pkgs/applications/misc/opencpn/default.nix @@ -41,7 +41,6 @@ , rapidjson , sqlite , tinyxml -, udev , util-linux , wxGTK32 , xorg diff --git a/pkgs/applications/misc/pagefind/default.nix b/pkgs/applications/misc/pagefind/default.nix index 2da4e5eb7eb1..7ee28983d2f5 100644 --- a/pkgs/applications/misc/pagefind/default.nix +++ b/pkgs/applications/misc/pagefind/default.nix @@ -1,5 +1,4 @@ { lib -, callPackage , rustPlatform , fetchFromGitHub , fetchNpmDeps diff --git a/pkgs/applications/misc/process-compose/default.nix b/pkgs/applications/misc/process-compose/default.nix index dad288ef4759..a8889ae88115 100644 --- a/pkgs/applications/misc/process-compose/default.nix +++ b/pkgs/applications/misc/process-compose/default.nix @@ -8,13 +8,13 @@ let config-module = "github.com/f1bonacc1/process-compose/src/config"; in buildGoModule rec { pname = "process-compose"; - version = "1.6.1"; + version = "1.9.0"; src = fetchFromGitHub { owner = "F1bonacc1"; repo = pname; rev = "v${version}"; - hash = "sha256-yFKqdUlfiMQbx3yJLD5/BJ8pecg5NRr64+HbUwsEOE4="; + hash = "sha256-vZYPbvMt0z08KoN75w3v9Vu0NcpcSz8WpX1CJeO1YbU="; # populate values that require us to use git. By doing this in postFetch we # can delete .git afterwards and maintain better reproducibility of the src. leaveDotGit = true; @@ -43,7 +43,7 @@ buildGoModule rec { installShellFiles ]; - vendorHash = "sha256-c53Af0X/TUFsxpV4YE525uh+yLG/t2tSmQkr9ElziBM="; + vendorHash = "sha256-9tSNqdngkx2Tbb5m6UByu8Q+UYeWnwdGmm5De6ITw3k="; doCheck = false; diff --git a/pkgs/applications/misc/pw-viz/default.nix b/pkgs/applications/misc/pw-viz/default.nix index 0242164be79c..04dcf343e541 100644 --- a/pkgs/applications/misc/pw-viz/default.nix +++ b/pkgs/applications/misc/pw-viz/default.nix @@ -57,7 +57,7 @@ rustPlatform.buildRustPackage rec { env.NIX_CFLAGS_COMPILE = toString [ "-DPW_ENABLE_DEPRECATED" ]; meta = with lib; { - description = "Simple and elegant pipewire graph editor "; + description = "Simple and elegant pipewire graph editor"; homepage = "https://github.com/ax9d/pw-viz"; license = licenses.gpl3Only; maintainers = with maintainers; [ figsoda ]; diff --git a/pkgs/applications/misc/q4wine/default.nix b/pkgs/applications/misc/q4wine/default.nix index f56e4455becd..a06dbc8f47fc 100644 --- a/pkgs/applications/misc/q4wine/default.nix +++ b/pkgs/applications/misc/q4wine/default.nix @@ -1,7 +1,7 @@ { lib, fetchFromGitHub, mkDerivation, cmake, sqlite , qtbase, qtsvg, qttools, wrapQtAppsHook , icoutils # build and runtime deps. -, wget, fuseiso, wine, sudo, which # runtime deps. +, wget, fuseiso, wine, which # runtime deps. }: mkDerivation rec { diff --git a/pkgs/applications/misc/raider/default.nix b/pkgs/applications/misc/raider/default.nix index 78d85e774270..b205e1521c5a 100644 --- a/pkgs/applications/misc/raider/default.nix +++ b/pkgs/applications/misc/raider/default.nix @@ -2,8 +2,6 @@ , blueprint-compiler , desktop-file-utils , fetchFromGitHub -, gettext -, glib , gtk4 , lib , libadwaita diff --git a/pkgs/applications/misc/remarkable/restream/default.nix b/pkgs/applications/misc/remarkable/restream/default.nix index c9a60d4ce2e8..b5e808339f99 100644 --- a/pkgs/applications/misc/remarkable/restream/default.nix +++ b/pkgs/applications/misc/remarkable/restream/default.nix @@ -5,7 +5,6 @@ , fetchFromGitHub , openssh , netcat -, makeWrapper }: stdenv.mkDerivation rec { diff --git a/pkgs/applications/misc/remontoire/default.nix b/pkgs/applications/misc/remontoire/default.nix index 05eb16abaf21..95e3fecef272 100644 --- a/pkgs/applications/misc/remontoire/default.nix +++ b/pkgs/applications/misc/remontoire/default.nix @@ -7,7 +7,6 @@ , gtk3 , json-glib , libgee -, librsvg , meson , ninja , pkg-config diff --git a/pkgs/applications/misc/schemes/default.nix b/pkgs/applications/misc/schemes/default.nix index bead03c4c7c8..acf3cd8cf102 100644 --- a/pkgs/applications/misc/schemes/default.nix +++ b/pkgs/applications/misc/schemes/default.nix @@ -7,7 +7,6 @@ , gtk4 , gtksourceview5 , libadwaita -, libgee , libpanel , meson , ninja diff --git a/pkgs/applications/misc/snapmaker-luban/default.nix b/pkgs/applications/misc/snapmaker-luban/default.nix index dc5fe5993f4f..eaa2fe15a743 100644 --- a/pkgs/applications/misc/snapmaker-luban/default.nix +++ b/pkgs/applications/misc/snapmaker-luban/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, autoPatchelfHook, makeDesktopItem, copyDesktopItems, wrapGAppsHook3, fetchurl , alsa-lib, at-spi2-atk, at-spi2-core, atk, cairo, cups -, gtk3, nss, glib, dbus, nspr, gdk-pixbuf, libdrm, mesa +, gtk3, nss, glib, nspr, gdk-pixbuf, libdrm, mesa , libX11, libXScrnSaver, libXcomposite, libXcursor, libXdamage, libXext , libXfixes, libXi, libXrandr, libXrender, libXtst, libxcb, libxshmfence, pango , gcc-unwrapped, udev diff --git a/pkgs/applications/misc/sway-launcher-desktop/default.nix b/pkgs/applications/misc/sway-launcher-desktop/default.nix index 09dafdbac154..7dd660dddb16 100644 --- a/pkgs/applications/misc/sway-launcher-desktop/default.nix +++ b/pkgs/applications/misc/sway-launcher-desktop/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, pkgs, fzf, gawk, fetchFromGitHub, makeWrapper }: +{ stdenv, lib, fzf, gawk, fetchFromGitHub, makeWrapper }: stdenv.mkDerivation rec { pname = "sway-launcher-desktop"; diff --git a/pkgs/applications/misc/swaynag-battery/default.nix b/pkgs/applications/misc/swaynag-battery/default.nix index 8dc99ca012e9..ee39266d9958 100644 --- a/pkgs/applications/misc/swaynag-battery/default.nix +++ b/pkgs/applications/misc/swaynag-battery/default.nix @@ -15,7 +15,7 @@ buildGoModule rec { meta = with lib; { homepage = "https://github.com/m00qek/swaynag-battery"; - description = "Shows a message when your battery is discharging "; + description = "Shows a message when your battery is discharging"; maintainers = with maintainers; [ ]; license = licenses.mit; mainProgram = "swaynag-battery"; diff --git a/pkgs/applications/misc/taskwarrior-tui/default.nix b/pkgs/applications/misc/taskwarrior-tui/default.nix index 88a8e99f26a0..f313d3d1f0ff 100644 --- a/pkgs/applications/misc/taskwarrior-tui/default.nix +++ b/pkgs/applications/misc/taskwarrior-tui/default.nix @@ -28,7 +28,7 @@ rustPlatform.buildRustPackage rec { ''; meta = with lib; { - description = "Terminal user interface for taskwarrior "; + description = "Terminal user interface for taskwarrior"; homepage = "https://github.com/kdheepak/taskwarrior-tui"; license = with licenses; [ mit ]; maintainers = with maintainers; [ matthiasbeyer ]; diff --git a/pkgs/applications/misc/tipp10/default.nix b/pkgs/applications/misc/tipp10/default.nix index 9405542b45ab..09a38a501e5e 100644 --- a/pkgs/applications/misc/tipp10/default.nix +++ b/pkgs/applications/misc/tipp10/default.nix @@ -15,12 +15,12 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake qttools wrapQtAppsHook ]; buildInputs = [ qtmultimedia ]; - meta = with lib; { + meta = { description = "Learn and train typing with the ten-finger system"; mainProgram = "tipp10"; homepage = "https://gitlab.com/tipp10/tipp10"; - license = licenses.gpl2Only; - maintainers = with maintainers; [ sigmanificient ]; - platforms = platforms.all; + license = lib.licenses.gpl2Only; + maintainers = with lib.maintainers; [ sigmanificient ]; + platforms = lib.platforms.all; }; } diff --git a/pkgs/applications/misc/yambar/default.nix b/pkgs/applications/misc/yambar/default.nix index 378db968c9bb..776f5fdab249 100644 --- a/pkgs/applications/misc/yambar/default.nix +++ b/pkgs/applications/misc/yambar/default.nix @@ -7,7 +7,6 @@ , flex , json_c , libmpdclient -, libxcb , libyaml , meson , ninja diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix index fab1bbdff39e..8275a287450b 100644 --- a/pkgs/applications/networking/browsers/chromium/common.nix +++ b/pkgs/applications/networking/browsers/chromium/common.nix @@ -267,6 +267,31 @@ let commit = "a976cb05b4024b7a6452d1541378d718cdfe33e6"; hash = "sha256-K2PSeJAvhGH2/Yp63/4mJ85NyqXqDDkMWY+ptrpgmOI="; }) + ] ++ lib.optionals (versionRange "127" "128") [ + # Fix missing chrome/browser/ui/webui_name_variants.h dependency + # and ninja 1.12 compat in M127. + # https://issues.chromium.org/issues/345645751 + # https://issues.chromium.org/issues/40253918 + # https://chromium-review.googlesource.com/c/chromium/src/+/5641516 + (githubPatch { + commit = "2c101186b60ed50f2ba4feaa2e963bd841bcca47"; + hash = "sha256-luu3ggo6XoeeECld1cKZ6Eh8x/qQYmmKI/ThEhuutuY="; + }) + # https://chromium-review.googlesource.com/c/chromium/src/+/5644627 + (githubPatch { + commit = "f2b43c18b8ecfc3ddc49c42c062d796c8b563984"; + hash = "sha256-uxXxSsiS8R0827Oi3xsG2gtT0X+jJXziwZ1y8+7K+Qg="; + }) + # https://chromium-review.googlesource.com/c/chromium/src/+/5646245 + (githubPatch { + commit = "4ca70656fde83d2db6ed5a8ac9ec9e7443846924"; + hash = "sha256-iQuRRZjDDtJfr+B7MV+TvUDDX3bvpCnv8OpSLJ1WqCE="; + }) + # https://chromium-review.googlesource.com/c/chromium/src/+/5647662 + (githubPatch { + commit = "50d63ffee3f7f1b1b9303363742ad8ebbfec31fa"; + hash = "sha256-H+dv+lgXSdry3NkygpbCdTAWWdTVdKdVD3Aa62w091E="; + }) ] ++ [ # Required to fix the build with a more recent wayland-protocols version # (we currently package 1.26 in Nixpkgs while Chromium bundles 1.21): @@ -365,7 +390,7 @@ let patchShebangs . # Link to our own Node.js and Java (required during the build): mkdir -p third_party/node/linux/node-linux-x64/bin - ln -s "${pkgsBuildHost.nodejs}/bin/node" third_party/node/linux/node-linux-x64/bin/node + ln -s${lib.optionalString (chromiumVersionAtLeast "127") "f"} "${pkgsBuildHost.nodejs}/bin/node" third_party/node/linux/node-linux-x64/bin/node ln -s "${pkgsBuildHost.jdk17_headless}/bin/java" third_party/jdk/current/bin/ # Allow building against system libraries in official builds @@ -462,6 +487,9 @@ let use_system_libffi = true; # Use nixpkgs Rust compiler instead of the one shipped by Chromium. rust_sysroot_absolute = "${buildPackages.rustc}"; + } // lib.optionalAttrs (chromiumVersionAtLeast "127") { + rust_bindgen_root = "${buildPackages.rust-bindgen}"; + } // { enable_rust = true; # While we technically don't need the cache-invalidation rustc_version provides, rustc_version # is still used in some scripts (e.g. build/rust/std/find_std_rlibs.py). diff --git a/pkgs/applications/networking/browsers/chromium/default.nix b/pkgs/applications/networking/browsers/chromium/default.nix index 1998972cc217..09b575811b83 100644 --- a/pkgs/applications/networking/browsers/chromium/default.nix +++ b/pkgs/applications/networking/browsers/chromium/default.nix @@ -54,8 +54,12 @@ let src = fetchgit { inherit (upstream-info.deps.gn) url rev hash; }; + } // lib.optionalAttrs (chromiumVersionAtLeast "127") { + # Relax hardening as otherwise gn unstable 2024-06-06 and later fail with: + # cc1plus: error: '-Wformat-security' ignored without '-Wformat' [-Werror=format-security] + hardeningDisable = [ "format" ]; }); - recompressTarball = callPackage ./recompress-tarball.nix { }; + recompressTarball = callPackage ./recompress-tarball.nix { inherit chromiumVersionAtLeast; }; }); browser = callPackage ./browser.nix { diff --git a/pkgs/applications/networking/browsers/chromium/recompress-tarball.nix b/pkgs/applications/networking/browsers/chromium/recompress-tarball.nix index e663c393d8dc..ab1c81338f97 100644 --- a/pkgs/applications/networking/browsers/chromium/recompress-tarball.nix +++ b/pkgs/applications/networking/browsers/chromium/recompress-tarball.nix @@ -1,10 +1,11 @@ { zstd , fetchurl +, lib +, chromiumVersionAtLeast }: { version , hash ? "" -, ... } @ args: fetchurl ({ @@ -35,6 +36,13 @@ fetchurl ({ --exclude=third_party/llvm \ --exclude=third_party/rust-src \ --exclude='build/linux/debian_*-sysroot' \ + '' + lib.optionalString (chromiumVersionAtLeast "127") '' + --exclude='*.tar.[a-zA-Z0-9][a-zA-Z0-9]' \ + --exclude='*.tar.[a-zA-Z0-9][a-zA-Z0-9][a-zA-Z0-9]' \ + --exclude=third_party/llvm-build \ + --exclude=third_party/rust-toolchain \ + --exclude=third_party/instrumented_libs \ + '' + '' --strip-components=1 tar \ diff --git a/pkgs/applications/networking/browsers/chromium/update.py b/pkgs/applications/networking/browsers/chromium/update.py index d92a9dae8a8c..17bd20c1a794 100755 --- a/pkgs/applications/networking/browsers/chromium/update.py +++ b/pkgs/applications/networking/browsers/chromium/update.py @@ -1,5 +1,5 @@ #! /usr/bin/env nix-shell -#! nix-shell -i python -p python3 nix nixfmt-classic nix-prefetch-git +#! nix-shell -i python -p python3Packages.looseversion nix nixfmt-classic nix-prefetch-git """This script automatically updates chromium, google-chrome, chromedriver, and ungoogled-chromium via upstream-info.nix.""" @@ -15,7 +15,7 @@ import sys from codecs import iterdecode from collections import OrderedDict from datetime import datetime -from distutils.version import LooseVersion +from looseversion import LooseVersion from os.path import abspath, dirname from urllib.request import urlopen @@ -214,7 +214,7 @@ with urlopen(RELEASES_URL) as resp: releases.append(get_latest_ungoogled_chromium_build(linux_stable_versions)) for release in releases: - channel_name = re.findall("chrome\/platforms\/linux\/channels\/(.*)\/versions\/", release['name'])[0] + channel_name = re.findall("chrome/platforms/linux/channels/(.*)/versions/", release['name'])[0] # If we've already found a newer release for this channel, we're # no longer interested in it. diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.nix b/pkgs/applications/networking/browsers/chromium/upstream-info.nix index 5a133f0b5bf6..4d04fec278fa 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.nix +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.nix @@ -1,22 +1,22 @@ { stable = { chromedriver = { - hash_darwin = "sha256-YdQgrcTgyGtSfT6wBedSfBt40DaK3fG+uvB0yanvROU="; + hash_darwin = "sha256-c/lMkOdoW/tX57opl/weJGh/iyUeTTF5Xejs7IpA+Qg="; hash_darwin_aarch64 = - "sha256-ht7LoA4ibEcWuXOk+JimCN0sjjPomHBcO8IZFNnMauk="; - hash_linux = "sha256-VeCNeBKsKZ2bEM6Z9lJJaBVRjS1pW2gK2DMvmghfNEA="; - version = "126.0.6478.182"; + "sha256-sst73OxUsrs2yWA72qdonARGi/W0FYObNfolidCiXio="; + hash_linux = "sha256-p5cQmMdte7TfTPohg+rpIsyyYk1OKSNb0BwaMWmHuCo="; + version = "127.0.6533.72"; }; deps = { gn = { - hash = "sha256-mNoQeHSSM+rhR0UHrpbyzLJC9vFqfxK1SD0X8GiRsqw="; - rev = "df98b86690c83b81aedc909ded18857296406159"; + hash = "sha256-vzZu/Mo4/xATSD9KgKcRuBKVg9CoRZC9i0PEajYr4UM="; + rev = "b3a0bff47dd81073bfe67a402971bad92e4f2423"; url = "https://gn.googlesource.com/gn"; - version = "2024-05-13"; + version = "2024-06-06"; }; }; - hash = "sha256-vZ7P8+vHTMCo6lXkV84ENqRZVG3/fDEwl+BTNJTGMn4="; - version = "126.0.6478.182"; + hash = "sha256-m99HaGCuIihDdbVnmu6xatnC/QDxgLVby2TWY/L+RHk="; + version = "127.0.6533.72"; }; ungoogled-chromium = { deps = { diff --git a/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix index f48df8e75fc0..b1000b6baae8 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix @@ -1,1035 +1,1035 @@ { - version = "128.0.2"; + version = "128.0.3"; sources = [ - { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.2/linux-x86_64/ach/firefox-128.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.3/linux-x86_64/ach/firefox-128.0.3.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; - sha256 = "ccadd301eaac1e5026353a2682f9ce864a936e974d9bc4580ada26d6fd71d5cd"; + sha256 = "d0c12079ad3eb788f139839b6c18278cee7e1b515dcbdc3bda8371f8938d7331"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.2/linux-x86_64/af/firefox-128.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.3/linux-x86_64/af/firefox-128.0.3.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha256 = "0351eb9b0c6de5e64f4718f9e19e45738b98d9082d7c7cad9e79c760a76bcce3"; + sha256 = "4171f4d1f37935279fd627c759f4c0448eab548fdf451e49904d4bafa0fdd3ee"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.2/linux-x86_64/an/firefox-128.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.3/linux-x86_64/an/firefox-128.0.3.tar.bz2"; locale = "an"; arch = "linux-x86_64"; - sha256 = "e887feb26b8ed2251d3bb19998ec8a5b00465964a7db85434d8c748584248acc"; + sha256 = "1f18456253a3639afd6566cee8755cfae35dd84745a7688af4d3330f961b4f7a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.2/linux-x86_64/ar/firefox-128.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.3/linux-x86_64/ar/firefox-128.0.3.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha256 = "15a7c66368a40b79c726229e717d883ed97ecf0edb1f0ee54da7dddcdcaa227f"; + sha256 = "f5511e4820215817a648f523828acbda79a7a4811aaa3fd1ba514eec5c650636"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.2/linux-x86_64/ast/firefox-128.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.3/linux-x86_64/ast/firefox-128.0.3.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha256 = "744c4282ca08d16701a7c3c526587f80a9448889f2f73b291f7398c5a6a5880d"; + sha256 = "9469c55f7b32fd9aff1fb55a6b9a22ca7d629f36de985e938cd642b0af9205d1"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.2/linux-x86_64/az/firefox-128.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.3/linux-x86_64/az/firefox-128.0.3.tar.bz2"; locale = "az"; arch = "linux-x86_64"; - sha256 = "3ab3c19fe9203b1bdb24ad3e2961c94c6a13261c6d7df1c1fbbe99ed7cb7a6dd"; + sha256 = "b736410e9dcbf5bd3026caaf8f3147e9d242dc0e539331ec1d2b07195be16ba5"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.2/linux-x86_64/be/firefox-128.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.3/linux-x86_64/be/firefox-128.0.3.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha256 = "2e64c25553d7b8ccd7bd9551adafa01827dc5bbc932e8a804f26e1fff8d348fa"; + sha256 = "b2415f48a4a78649e6fe4b96af8509bdc275531d27f57b0fdbf3db1e2c94a216"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.2/linux-x86_64/bg/firefox-128.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.3/linux-x86_64/bg/firefox-128.0.3.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha256 = "74e679576798c81edf513edc8ab8de2843af6556bcbc64519b98d4255a9228a3"; + sha256 = "2ca70636fcb1fa69b78a3c9e9032663166ec1624dbe5ba5f51c21975c33e3111"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.2/linux-x86_64/bn/firefox-128.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.3/linux-x86_64/bn/firefox-128.0.3.tar.bz2"; locale = "bn"; arch = "linux-x86_64"; - sha256 = "c55236652ec23daff081f614ce3d829b029b496c3e5a2cc194e6002a6ccf3d68"; + sha256 = "f1ebed6c4ed5356e9fbd08bb691be6a227c75cdb925da5d3d02636d747d21fd1"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.2/linux-x86_64/br/firefox-128.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.3/linux-x86_64/br/firefox-128.0.3.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha256 = "7cd92e11d0a0d7f0ca70645b5ad3c26b155e63b181ac2adfe9e7ea7c6fa6d59a"; + sha256 = "d76522e28c57804f93cde93025f1d1ab267399e281948e6cfc4d9c1c2f97a2ea"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.2/linux-x86_64/bs/firefox-128.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.3/linux-x86_64/bs/firefox-128.0.3.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; - sha256 = "9d88ba2d7bac25588084632ddead70388f4a12e5ad90288ff4a7eec057eaa5df"; + sha256 = "1f3842fb883a03ebe67f39f57220e697fde9b74c5e88c314cc878fd46f680e53"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.2/linux-x86_64/ca-valencia/firefox-128.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.3/linux-x86_64/ca-valencia/firefox-128.0.3.tar.bz2"; locale = "ca-valencia"; arch = "linux-x86_64"; - sha256 = "42002f9a31d05e0c6540ed5ae40d1a88a9fa2067e9911575a539f7f862a608e9"; + sha256 = "c3186598aa55f93da331763523a48a08f630554638024fbc053f9ea2567aaf64"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.2/linux-x86_64/ca/firefox-128.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.3/linux-x86_64/ca/firefox-128.0.3.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha256 = "419cfb6d45da88b2bbb4613fe0e6ac01b24e0f53ff9a8ecc8e0b8fe7eb800d9a"; + sha256 = "140260f03537d1ea6edf2d65dc5d85e9779bb7de9026145bd6a62efcae6aff6c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.2/linux-x86_64/cak/firefox-128.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.3/linux-x86_64/cak/firefox-128.0.3.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha256 = "31e26e966281ab7f746ec531d4ef9d58f4a74ffc4b650c627c174b0ef8516708"; + sha256 = "3dcda1b557c390457d3c627c2c36f448f40568fe83fc19c0e5e9a088225b633f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.2/linux-x86_64/cs/firefox-128.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.3/linux-x86_64/cs/firefox-128.0.3.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha256 = "dc17ba8c98d6d51ceb1c6bf83acc671cf901dbd326942f2ddbf6dc728e88f33d"; + sha256 = "259e1a67b38189d25b6296889ea731460314c8bad8e14c10dce0db3f49c49fc0"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.2/linux-x86_64/cy/firefox-128.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.3/linux-x86_64/cy/firefox-128.0.3.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha256 = "4be1336a4690808fbe3050d3be0359b8d1dd529e51d119ac01ddc9a96c672fac"; + sha256 = "9c4df574aa24ce1b15640bcf61a5fa32f245cc4670c1513c1391fd1ef10df6d6"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.2/linux-x86_64/da/firefox-128.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.3/linux-x86_64/da/firefox-128.0.3.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha256 = "2c96482670295037edaa15179547114cd2aa08687661850030e195b72f889049"; + sha256 = "53078433eaa426d89aa7ae9e67794b67085892fa3a4c833b8fb3f37e1bb76e85"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.2/linux-x86_64/de/firefox-128.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.3/linux-x86_64/de/firefox-128.0.3.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha256 = "1eeb66fb29a2033fbbaadf803c03d0d263153bfdc6ed80e69af8aaa0a04d780f"; + sha256 = "70624fd8b5b56144631870084c58e7a5c0b7aa8cfa051e33a60f8fab2497bbb4"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.2/linux-x86_64/dsb/firefox-128.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.3/linux-x86_64/dsb/firefox-128.0.3.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha256 = "e96243d9757b947f76531fe0fd3da141ebaf504d1779af98afd507f25c6d12c3"; + sha256 = "823516369d99c7f80c018c6584cf5b3ee1d8ffa81306190aeac1b6c21db45daf"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.2/linux-x86_64/el/firefox-128.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.3/linux-x86_64/el/firefox-128.0.3.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha256 = "1a60bd62fbf14dc7415be4ddc65dc7898917bb98b7ed30c8029c3109fb8d8fbf"; + sha256 = "d76f0be0d24c436ca229f0087819fdff26893f412e8e98b0907e9462f8cdab5a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.2/linux-x86_64/en-CA/firefox-128.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.3/linux-x86_64/en-CA/firefox-128.0.3.tar.bz2"; locale = "en-CA"; arch = "linux-x86_64"; - sha256 = "4aa6bbf276ae53a7dbc22337609dbe783365e30d26916f98c35eee918e50e010"; + sha256 = "bd0cc9b881309d8e6da335e03609384f4e7e29b202717000f81a9afbfe143f08"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.2/linux-x86_64/en-GB/firefox-128.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.3/linux-x86_64/en-GB/firefox-128.0.3.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha256 = "7ccfbff0723c65d20ab65b309554a66b64842f0cc89b820b77d55820ef2c47d5"; + sha256 = "d5bc789ad14b0de41447791320f99fad72360649e91ddf9f1f7eede708c89fa1"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.2/linux-x86_64/en-US/firefox-128.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.3/linux-x86_64/en-US/firefox-128.0.3.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha256 = "e9347f23378469bcb3c3cd9a46c85c1324d1536b3ffdaa6c2730ea07908a6c46"; + sha256 = "b40db1ecf6536a3d08b9fac38b19023b5094baa11de5dd01bdeaf1d87b666d09"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.2/linux-x86_64/eo/firefox-128.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.3/linux-x86_64/eo/firefox-128.0.3.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; - sha256 = "2d06e6c12208d493ecafa6df42b6ab8aa01bf80c663d6cb7d8b1f17ddf7ee218"; + sha256 = "bd1b22a2f33c575de3137409f2e4760494f20d157e87d2ba60614635807faae7"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.2/linux-x86_64/es-AR/firefox-128.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.3/linux-x86_64/es-AR/firefox-128.0.3.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha256 = "6134362778ebd4eeafd5ac4b095896e874516c8411812e0ff707a704a68eba5b"; + sha256 = "0d9452ae081cff24b35bb113beb1f9ec8b63f5636beae7a8d9cfa47aa75d37af"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.2/linux-x86_64/es-CL/firefox-128.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.3/linux-x86_64/es-CL/firefox-128.0.3.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; - sha256 = "3aec33c45acad7bdfd6198dd6dee4528b86af1f43ea8f0fa143a27c10cec95ff"; + sha256 = "2fadfd2fa30612924b7aae39d71be609eb0a1588214eec03f38667e584eb1fdf"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.2/linux-x86_64/es-ES/firefox-128.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.3/linux-x86_64/es-ES/firefox-128.0.3.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha256 = "e13adfd13f570780f9948fdb341fb3d5071c8892b4a55a667173b68477ab2547"; + sha256 = "181726612bfcffff138d755ce4158763ab8af11c310380473c26d2a6f8ea9cbf"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.2/linux-x86_64/es-MX/firefox-128.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.3/linux-x86_64/es-MX/firefox-128.0.3.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha256 = "b22d14963b0ce92c95862f6678cb3c3e8d79710b3d1195556540cfc6941968a7"; + sha256 = "730db3d7a4ef9abb69e66ee0ba2f9d9f80941f778d3e30a7d4e0d33a0e1c51f3"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.2/linux-x86_64/et/firefox-128.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.3/linux-x86_64/et/firefox-128.0.3.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha256 = "cc21585ff7e2bcb8a1bcedd3356545a997adec9a7a7c81847d8ecd96f2827bfc"; + sha256 = "154d81d65023dafd83f00b133058f0f61077bec028a124bd053e690307a213b4"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.2/linux-x86_64/eu/firefox-128.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.3/linux-x86_64/eu/firefox-128.0.3.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha256 = "879902a321b11cfb2e3be83b747cda7534ed6244ce235b69123cada173b04b12"; + sha256 = "5c358901611143f455f7682ecbdd1a34ed24237a544134173ef5a06d9b432388"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.2/linux-x86_64/fa/firefox-128.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.3/linux-x86_64/fa/firefox-128.0.3.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha256 = "c762e51b4b98f7add86b3e5a06ccb7e09f3d0c4139ea332e7d3639208f9fdb0b"; + sha256 = "dd57526bc8f529bd7c9bef4939678d0fa0f34ee85cabae3993e60c1f5201f19b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.2/linux-x86_64/ff/firefox-128.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.3/linux-x86_64/ff/firefox-128.0.3.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; - sha256 = "55bde482ee63ebee517b4783f16cf6c53fa5176bdf9e879c80b3a1dcae64108f"; + sha256 = "15261dfe5eefc52e44c2c4e9d8e744ff9308c92561e8df48c8fcd01f68157788"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.2/linux-x86_64/fi/firefox-128.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.3/linux-x86_64/fi/firefox-128.0.3.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha256 = "822fc01d276a5957835ddf3d8c9d464f951f3804edeac3205a45a6affa0e1aeb"; + sha256 = "4df4213698384a5ed3292a0b2c2bedad84ec55b6bb57b67b2b309a6ef41f82b5"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.2/linux-x86_64/fr/firefox-128.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.3/linux-x86_64/fr/firefox-128.0.3.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha256 = "01a58d1a2d00b17f6805d8972a2eb177ffac1ac354a37d835048bfeafb94d2e4"; + sha256 = "f903c81d18a75b28ec5c2f4f0800c4f68ac8682fd114817700f6e2ad59c7bade"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.2/linux-x86_64/fur/firefox-128.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.3/linux-x86_64/fur/firefox-128.0.3.tar.bz2"; locale = "fur"; arch = "linux-x86_64"; - sha256 = "a1b879ce692bfc76318bf46ec52f5436ef7a50e45f94863105ea6db652b441e1"; + sha256 = "fa6d00ae732405696bb8ec1734e8cde650df106667c41510a926cb2cff8acfe1"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.2/linux-x86_64/fy-NL/firefox-128.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.3/linux-x86_64/fy-NL/firefox-128.0.3.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha256 = "abf1aefc73cc40a92e04fae7d1f38264230b5c3529beda0be324189113e64276"; + sha256 = "47dfa93976cfe44570ca0785e0a1ff00ecab3d7bfcb9010d2d738d9c9de36b5f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.2/linux-x86_64/ga-IE/firefox-128.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.3/linux-x86_64/ga-IE/firefox-128.0.3.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha256 = "c2dec70be2a8613271480eaa0afa571fbdc0b932d54b68fed65bc0919bf96710"; + sha256 = "e7a7a015176ae09c6c8e4de2990e1a9631127b5fcfe996ef12c8bb6692752a3a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.2/linux-x86_64/gd/firefox-128.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.3/linux-x86_64/gd/firefox-128.0.3.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha256 = "e67ebebbf511b6fa68a192489ed1f6bca25c57e18491e84f9e2a4c2b06e4cb21"; + sha256 = "d5eea7d80d2b7369979f2606f665fae35ebc17aca3475fb5d36af24b162d4e3c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.2/linux-x86_64/gl/firefox-128.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.3/linux-x86_64/gl/firefox-128.0.3.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha256 = "04a27be0fe2b1f6a35b76aa2db2546ff07e57d4a1198ae6cbd9365aa498200e6"; + sha256 = "6ace246a1b1dfbf790b546e8f6f849e6032132d355336099123e9019bd3c4b3d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.2/linux-x86_64/gn/firefox-128.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.3/linux-x86_64/gn/firefox-128.0.3.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; - sha256 = "d0006b5480b73e10ba079a331fdf070bed44684a6371a9dcc3271a9907623664"; + sha256 = "df96d6bee1d99ca516cef169b52d948d1323ceb4072117f0a14ee0044bfe6bcf"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.2/linux-x86_64/gu-IN/firefox-128.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.3/linux-x86_64/gu-IN/firefox-128.0.3.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; - sha256 = "94ad3fadc1426f5c160a54a6f64540cf897f21f11ee90ff87fbdb374e2de1729"; + sha256 = "49e2417cb2f56fe3d8c1903627faef0c6ef1e55c4c2c3bbe5fc4c63f0fcc1d14"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.2/linux-x86_64/he/firefox-128.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.3/linux-x86_64/he/firefox-128.0.3.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha256 = "0f3026494d35e50e7f69d5282487642d778244820b6bfb988cb9475d7419a755"; + sha256 = "2c121c55af2e618823a399b7512b4981c2201a8548e1101dc36bc783a8c0ce74"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.2/linux-x86_64/hi-IN/firefox-128.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.3/linux-x86_64/hi-IN/firefox-128.0.3.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; - sha256 = "92e5fc31e39d140161743b4bc297b101579e2a0b4588000c9931ea14c03a0e1c"; + sha256 = "3dbe535c29525fc7533742d20696885f3a762ed6a71c54554040ebf3200ced12"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.2/linux-x86_64/hr/firefox-128.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.3/linux-x86_64/hr/firefox-128.0.3.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha256 = "4d0c434a691794f34fc30ba13dd8d7f4e228b66a3ffce6e8d7006f380c0e94b0"; + sha256 = "3d3e3c0243a2d0e84a3f52e9ffaed9a7b19ee6783ead72cd092100441f04b286"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.2/linux-x86_64/hsb/firefox-128.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.3/linux-x86_64/hsb/firefox-128.0.3.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha256 = "ba825903c8605fba932a6fc905dffe1adb50e72cbfc79b82542f759ae14f8d1d"; + sha256 = "79813107fa224ca628c98c41af3c16ef643004fe03a512ce40510d1cee251550"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.2/linux-x86_64/hu/firefox-128.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.3/linux-x86_64/hu/firefox-128.0.3.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha256 = "f210dc9e13c0da1142917187d9b1661f0d7c40dcb8593422e0d7a3b3559c06ef"; + sha256 = "e396b585d4ba3c30d6ccc69647620ece35ede4829922a882146e1ecd7e928dbc"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.2/linux-x86_64/hy-AM/firefox-128.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.3/linux-x86_64/hy-AM/firefox-128.0.3.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha256 = "ac3fd522f69eca03d2f0cfe0d05d0542b61ba80e5f7fc8e55fee0a8f060af829"; + sha256 = "d8a1337d647aa3e11fd4d3710ed71baf6b7024b9724694a213aaa44a15d41f5e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.2/linux-x86_64/ia/firefox-128.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.3/linux-x86_64/ia/firefox-128.0.3.tar.bz2"; locale = "ia"; arch = "linux-x86_64"; - sha256 = "509f6aa48a66985f2163356d694d2382f5e802cfe3244a6c070dd21332a231ab"; + sha256 = "0263016b361130e5effbc2c4abdfd8605318d470e5f90d8a42a1a166402780bc"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.2/linux-x86_64/id/firefox-128.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.3/linux-x86_64/id/firefox-128.0.3.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha256 = "5116c7cdc73e62b09de5eab4c68e2bb00209c6da55876db2d984a4233a29778f"; + sha256 = "97d6ccd9ed8533e76ee7859a241da9db92f61d70a64f8cf8c0dce2e89dcf6168"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.2/linux-x86_64/is/firefox-128.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.3/linux-x86_64/is/firefox-128.0.3.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha256 = "7df10487f73c792afebeea9eed9b01d482705a240510d6c6d7bd30f5b0b39115"; + sha256 = "3ce64f50a8977aea631d69a736766af573a951fd7c98fa77dee8079f5c36f577"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.2/linux-x86_64/it/firefox-128.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.3/linux-x86_64/it/firefox-128.0.3.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha256 = "0203ee0a2d778491eb98e9ccfa986ad5d2a43fc21335584da5bc4bfdd57c403f"; + sha256 = "c1db8aecc37f73b6fae0a79b5849bc3a3892641c692b3cbcc0b40216346fc1be"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.2/linux-x86_64/ja/firefox-128.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.3/linux-x86_64/ja/firefox-128.0.3.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha256 = "0044fde7e92e12f72feebccb84ef5cb2926f2d9227e64807bb48d2c78fa0dd88"; + sha256 = "0d7adc7390b6b8daad3c965367f52c3064ab7e38bc79830689786198d8e10a4c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.2/linux-x86_64/ka/firefox-128.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.3/linux-x86_64/ka/firefox-128.0.3.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha256 = "6b2c6225a2b44a6677578b923334ec1b6fb07f781de585d07d081e71701491fc"; + sha256 = "bdd57dddb6dbff69d90f5dfc9f69a8a59576b25d8b1b660eb547d5b6733bf996"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.2/linux-x86_64/kab/firefox-128.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.3/linux-x86_64/kab/firefox-128.0.3.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha256 = "d2ebf010be4de66cc8e46db39333766c7e3ee4d4f4699d553a16f957278e2945"; + sha256 = "f3d21d4f796f7c489cc51dce1986ff6f0d25919181b9a251324b0e55bb2bef3a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.2/linux-x86_64/kk/firefox-128.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.3/linux-x86_64/kk/firefox-128.0.3.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha256 = "2fba1aadf1c914b0bab40a1b48d077b68313e0496d5bbfbeffa60d5b354a3fa5"; + sha256 = "481ba52c1029411a475e5cc084ff7bd17c8ffee715288fa4f52d669bd8a9630d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.2/linux-x86_64/km/firefox-128.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.3/linux-x86_64/km/firefox-128.0.3.tar.bz2"; locale = "km"; arch = "linux-x86_64"; - sha256 = "2e8e7da4b87623ff4d715c9cdf2c5afa9c689960eb0d9c781808e25768644e33"; + sha256 = "9bc4e58731f666f8a7dd321456603ba5281c7132457eca83ea65f09cbcb9f463"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.2/linux-x86_64/kn/firefox-128.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.3/linux-x86_64/kn/firefox-128.0.3.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; - sha256 = "79053848bf90159b9ee57a4294c1c72d696b99cb0b3c557c87fdea5e1293aa4d"; + sha256 = "77bb32f5706627a1c1d5efd86c8a6bea61a5145eb96910fc03393723dc028f31"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.2/linux-x86_64/ko/firefox-128.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.3/linux-x86_64/ko/firefox-128.0.3.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha256 = "09f52594961e09ff3d7f20c4717da90d41cf83c3cee9119d8c6307bfc41018d3"; + sha256 = "95168dbdbe84de7c996a775ea516a82414803d6c0dd4479718cfdf04dfc9d9b1"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.2/linux-x86_64/lij/firefox-128.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.3/linux-x86_64/lij/firefox-128.0.3.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; - sha256 = "2a4699fe17940cc46b2f22b474741d0fee109b765b4d8d2d19cb1a74c52cd06b"; + sha256 = "9ac25ef42b72490ecc7bb315584ab5c0a6f424b3423b8477348aec16fc4549ce"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.2/linux-x86_64/lt/firefox-128.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.3/linux-x86_64/lt/firefox-128.0.3.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha256 = "78a6aca7850d3a91559921fb2b03dbbd7898c164489d4b87f195e8ec7447f969"; + sha256 = "1c130321939c25348d3e19298672afa5da31fea2526932e084bfb8b4cc066db3"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.2/linux-x86_64/lv/firefox-128.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.3/linux-x86_64/lv/firefox-128.0.3.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha256 = "4868d15ca605a079a4c29a38520c5935005ea38427919d9d27c9c3e33d644844"; + sha256 = "c1ab42c227cbe6b42b08ed01c29cae39d91f778211410dc633ed00b93b20cdd1"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.2/linux-x86_64/mk/firefox-128.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.3/linux-x86_64/mk/firefox-128.0.3.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; - sha256 = "3f667382a6b4644d4456f4eae4844e61b733acbb22c12bb609fe9e87cb1302f9"; + sha256 = "dd29b0e17522daf43db51fb7b843357e84bbaf1050032a5ca5a0e0c865d75fbd"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.2/linux-x86_64/mr/firefox-128.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.3/linux-x86_64/mr/firefox-128.0.3.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; - sha256 = "05dfd8dd6fb856b93f67b3c9d2b33073fc2be201cc7f28c1477d590f1ea536ba"; + sha256 = "110a06869b37b7c00c5c9775cc4a97f7f14674120c61844507b19f964de8b8cd"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.2/linux-x86_64/ms/firefox-128.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.3/linux-x86_64/ms/firefox-128.0.3.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha256 = "b23b3187617ca6810a0b4acd07a4a78f8cff834b501aff8c9427b3f34ae50260"; + sha256 = "1539dc06245320b5ce666c3b0a010b4afa96bb04fb6f511992f9ba03604a264a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.2/linux-x86_64/my/firefox-128.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.3/linux-x86_64/my/firefox-128.0.3.tar.bz2"; locale = "my"; arch = "linux-x86_64"; - sha256 = "a0714272ffe640f2c29d429b18c65d828da0e9112c999ba06057798224753ce4"; + sha256 = "cb75e3f513d813b97154a0c77ffa7e5d9d70f308ddf4691c582693fb02f47780"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.2/linux-x86_64/nb-NO/firefox-128.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.3/linux-x86_64/nb-NO/firefox-128.0.3.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha256 = "a39c59829192e98b9b40c25b6aee5d73e1640422e846b65522694c9e6ecf35c0"; + sha256 = "647f63a15f3b116bd97dee6f13df271e724eb37feb865aa8e2925d36f1d20305"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.2/linux-x86_64/ne-NP/firefox-128.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.3/linux-x86_64/ne-NP/firefox-128.0.3.tar.bz2"; locale = "ne-NP"; arch = "linux-x86_64"; - sha256 = "16c0b0f19d025ea97178c4d3791e82a22b0d76251b2612dc5820608610538d93"; + sha256 = "85f3a6a0b8f1ba7f9b668116bf862fc391421e6a6e45208b204035ed705c3d46"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.2/linux-x86_64/nl/firefox-128.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.3/linux-x86_64/nl/firefox-128.0.3.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha256 = "f29014bc9de0bde36c1b814e00ef8ed52189b49e242a12b09c706b44965631cf"; + sha256 = "68216aad077cbc05a02a6dd60bd1154c41fc19d9ea268189ee097d5db009727e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.2/linux-x86_64/nn-NO/firefox-128.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.3/linux-x86_64/nn-NO/firefox-128.0.3.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha256 = "07329fd32e0853ebb9b8b3663704f3e3b48b4f6127b73ca0cc5e3f702648ee54"; + sha256 = "a5c99900389aa122b7e6cb2023fa963a451c71f1ac303ff1e7622c87a76f0ca3"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.2/linux-x86_64/oc/firefox-128.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.3/linux-x86_64/oc/firefox-128.0.3.tar.bz2"; locale = "oc"; arch = "linux-x86_64"; - sha256 = "e690295a31516c4d3522edf3b6ec6763912887bb3a5c38e13fc92ebc4eb0aeab"; + sha256 = "6faa5d5320c0a2ea9b7567dd4feae24ffc5646c6d5ee9e99caf67fd45ad1f2d2"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.2/linux-x86_64/pa-IN/firefox-128.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.3/linux-x86_64/pa-IN/firefox-128.0.3.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha256 = "ba53f5d4bcc8e53da145c9874231f43f5882801844aec432692a4add4cfa10a7"; + sha256 = "b9faf0c7d6ab58c2f1a4fed149a01c135b3e162c74cfb2c7c7cd465f3c2465b8"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.2/linux-x86_64/pl/firefox-128.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.3/linux-x86_64/pl/firefox-128.0.3.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha256 = "4195e14dc1d8d4ef4206e84e717d3320edbd95d5b544768921e6b00ec158ad60"; + sha256 = "8152ad96b1c8bc0e702035090756f0b7e32c8c0bb8000053b14cce8fff84f70f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.2/linux-x86_64/pt-BR/firefox-128.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.3/linux-x86_64/pt-BR/firefox-128.0.3.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha256 = "6c6d3f359c265db7e0435a6cbea65182e37bf5e92227e6dbc2c225acf2955347"; + sha256 = "2eebb7b09cabba2f15d35baa6a7c1ec79296c8f9c3a112757a0040ffc780681f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.2/linux-x86_64/pt-PT/firefox-128.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.3/linux-x86_64/pt-PT/firefox-128.0.3.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha256 = "5dd0d9e02e3446f14ecdf401e6a3bee50aef7b03562d6110aa130dcf60682989"; + sha256 = "b68a84517e686aa2c0e93b45b9b6fe2dfd1816c917b32e8fd662f686ab885d63"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.2/linux-x86_64/rm/firefox-128.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.3/linux-x86_64/rm/firefox-128.0.3.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha256 = "0b562c56e888ffcb510e78ecebceaf17f90ed6b125a01b988c0a83740c99ac5d"; + sha256 = "b8a19f0a74b31acc912694234cb76ddc312e09c60db4feea506d8829ed71a94a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.2/linux-x86_64/ro/firefox-128.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.3/linux-x86_64/ro/firefox-128.0.3.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha256 = "c624988518a561dbb3719b84526ffb1707b9d6a5acd2a1d8e837e387256298e2"; + sha256 = "7ad05c36566db384045cab2b0cafb0c6eca0a3c57dff76e724d4618a2a05de33"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.2/linux-x86_64/ru/firefox-128.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.3/linux-x86_64/ru/firefox-128.0.3.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha256 = "7afe5712edbab6d970a305d4cc4c66f062dfbe6b1df196d0c313321a22c4720a"; + sha256 = "db4152834dbf47c1720a0a0cc8f249bef6e27a6376097bcd5cb956b7aa2279da"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.2/linux-x86_64/sat/firefox-128.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.3/linux-x86_64/sat/firefox-128.0.3.tar.bz2"; locale = "sat"; arch = "linux-x86_64"; - sha256 = "fba1a5cae9758f8941fd6396f9b9ca3a9724b4a5d049836147ec85b35e52a729"; + sha256 = "52eca57a2578fd2953e098bf5f28753165d4156cd33617abf2b6a3eee1050749"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.2/linux-x86_64/sc/firefox-128.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.3/linux-x86_64/sc/firefox-128.0.3.tar.bz2"; locale = "sc"; arch = "linux-x86_64"; - sha256 = "9116613e362299bd45119a5e89324b84be5fee0accdb39a04f842adaac694631"; + sha256 = "2f934cec1669c934b768ce7b2ffbc3dee60edfea0b9655e6554cd42aa2e5551e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.2/linux-x86_64/sco/firefox-128.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.3/linux-x86_64/sco/firefox-128.0.3.tar.bz2"; locale = "sco"; arch = "linux-x86_64"; - sha256 = "0267001f96f27290ee896c17d2832c9cbe0a2fc0ae0b195b72cf6bc4a6b2ff4b"; + sha256 = "4dffc64de148c718b80499716bc01d46c3572a32d2fbd0630c32eb74948c10b8"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.2/linux-x86_64/si/firefox-128.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.3/linux-x86_64/si/firefox-128.0.3.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha256 = "8e48d7e01edf0f9c1fb10cf93e7c1512c041c2cee8245536e84db5560375c200"; + sha256 = "a3ec9587928ec39b7a07b09cfbcc8a4ba6e87aa0dc850830096b545f5945790c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.2/linux-x86_64/sk/firefox-128.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.3/linux-x86_64/sk/firefox-128.0.3.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha256 = "961e8b48b80ff52e4d2b26b968f03b26e89217a400b16f56213f07a172655159"; + sha256 = "e7822f0b388d03e3290a4f962e3038c4d74a84c42a0e52925da8ed64286571d7"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.2/linux-x86_64/skr/firefox-128.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.3/linux-x86_64/skr/firefox-128.0.3.tar.bz2"; locale = "skr"; arch = "linux-x86_64"; - sha256 = "b66953f1a040c55976f49fa062af2e8e2cca55a60ad8111ac45f3fd6e1c29cd0"; + sha256 = "f6b357e9a9cc8cc600d64f1027f6633c9855e2650c62548b683cdb2d88f41991"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.2/linux-x86_64/sl/firefox-128.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.3/linux-x86_64/sl/firefox-128.0.3.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha256 = "abc8c8a4df2a7fee90605df27d8768b745e359803b10a4c4b293bcb3e1e92be4"; + sha256 = "e5ab95681269e1f0e3903707026deb1d6d4f4142182617947e208241d154813e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.2/linux-x86_64/son/firefox-128.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.3/linux-x86_64/son/firefox-128.0.3.tar.bz2"; locale = "son"; arch = "linux-x86_64"; - sha256 = "656583346841431bffb978c77fc4280e7f7f14a36221d644bd1f3476866aaa2b"; + sha256 = "6344e310f03612b3cf3644373bc4584a777923742a00c4e4d00e9c68b37dd367"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.2/linux-x86_64/sq/firefox-128.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.3/linux-x86_64/sq/firefox-128.0.3.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha256 = "54eb29e48a7ff3a52ac8b094a2443d2b5bfc352e379b1563995997e9da8e975a"; + sha256 = "9eb8a3ffce1937ac104233245e23a898a42bfbfa5ff275aa79fdc82b0323fbb7"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.2/linux-x86_64/sr/firefox-128.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.3/linux-x86_64/sr/firefox-128.0.3.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha256 = "c90459fa1034fa39173f2abc17332189b41a7cf3784b1e0e668eb452e0d6b86a"; + sha256 = "9318026f5a406c6e23d86ff29df5bc24859fccafaea4cad7f4184f5659c093a4"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.2/linux-x86_64/sv-SE/firefox-128.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.3/linux-x86_64/sv-SE/firefox-128.0.3.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha256 = "2b6d618d0a3285b7e4f9ee8f75bd31507762b06e78515a9aef7e942b10bc2a65"; + sha256 = "ebc20180bdf988ab98225eaa9be0b5d93d6811a51afc7d63a3db8d1ad55bdd69"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.2/linux-x86_64/szl/firefox-128.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.3/linux-x86_64/szl/firefox-128.0.3.tar.bz2"; locale = "szl"; arch = "linux-x86_64"; - sha256 = "ae0d5184dcac959a893d204e302599c92892fbe5f04f418de4f246609d40a013"; + sha256 = "4b3f3759d62a82f030a1d4d8ca36803d7641e4b35f24ed1f975fcd058ca53c7e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.2/linux-x86_64/ta/firefox-128.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.3/linux-x86_64/ta/firefox-128.0.3.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; - sha256 = "ab3b8cae5d5280d9f39e4971c61e785e7d6197f05653f6d3e4c164bc0b5150f1"; + sha256 = "466f40a30a50f3f3f34ba175a2cac9ae9be76c1bb216d9bf0aaecf4668b27670"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.2/linux-x86_64/te/firefox-128.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.3/linux-x86_64/te/firefox-128.0.3.tar.bz2"; locale = "te"; arch = "linux-x86_64"; - sha256 = "ea2b173f49ac950827bca5376a84dca203a3669967970932ce5cac6692bb09c2"; + sha256 = "a2637ce91c85be45e97e550ee73b2057a94b906f2c6c237bee91078721beaf88"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.2/linux-x86_64/tg/firefox-128.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.3/linux-x86_64/tg/firefox-128.0.3.tar.bz2"; locale = "tg"; arch = "linux-x86_64"; - sha256 = "b4754870b994bc07c1af204e62ab068ba02950338613f3bf8755d71de5b2344f"; + sha256 = "bf7cf896ac43981804bd2d493a5be8a9a4ba357731b340fc7f75755d3c959254"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.2/linux-x86_64/th/firefox-128.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.3/linux-x86_64/th/firefox-128.0.3.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha256 = "144c4f69446caf8b62df692f595cd12e20cd64c655ccb19d32ab95e42626c639"; + sha256 = "adfd95a9d60874404699cfdb50b0c24b76c2a965d760125b4efc14fd8802f7e1"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.2/linux-x86_64/tl/firefox-128.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.3/linux-x86_64/tl/firefox-128.0.3.tar.bz2"; locale = "tl"; arch = "linux-x86_64"; - sha256 = "cb1695abd8b8ee098a03f4d998c984bc876613bc65de775c30e555bb6f5fb831"; + sha256 = "09312b020c5d5cc51187c9494ab1c6ce34aad39e582b71fd71e0b4b1e5cd3c85"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.2/linux-x86_64/tr/firefox-128.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.3/linux-x86_64/tr/firefox-128.0.3.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha256 = "25cd844b4b321f5e1ddae46fbc7e75bdbef8713572145a126768b405793087d1"; + sha256 = "de085202ebca5da84634c1d09a9cc280f579580a976596f7f4781e921180f58c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.2/linux-x86_64/trs/firefox-128.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.3/linux-x86_64/trs/firefox-128.0.3.tar.bz2"; locale = "trs"; arch = "linux-x86_64"; - sha256 = "d917906e4eee010b667a7b2bd3f580194c16313f0c6305ee041d89b8043b43a5"; + sha256 = "be77d339fc51c63b3d81a6258249ab15b9f5680bc3fc3b37880a48ed4121723e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.2/linux-x86_64/uk/firefox-128.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.3/linux-x86_64/uk/firefox-128.0.3.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha256 = "597bca22ce03df2497c062b2fceafc172d3ab6f3d0f3ce14e7ac818075588489"; + sha256 = "c3b4839536cb2cd879dd050c40d6e8af0110d8d241b2e51afbd733dba20d3066"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.2/linux-x86_64/ur/firefox-128.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.3/linux-x86_64/ur/firefox-128.0.3.tar.bz2"; locale = "ur"; arch = "linux-x86_64"; - sha256 = "eebb053bf4955731aed344681e79a4b96ad3cde1410b4b6dd73d328273f3b358"; + sha256 = "5d3f8eeacbc4331c99dbcc3c31a69ac819a0b174a3ae4f71228969bbb8dc6c2f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.2/linux-x86_64/uz/firefox-128.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.3/linux-x86_64/uz/firefox-128.0.3.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha256 = "dda3fafc2801b3c60cb3793f243cd635186b30758fa7e5713e237bd9109f1961"; + sha256 = "6851baf5993eaf5e09eaaa89beba054830a0adf1c26120a21c449b454214c242"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.2/linux-x86_64/vi/firefox-128.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.3/linux-x86_64/vi/firefox-128.0.3.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha256 = "9d4761835e54f862f11c89877834f7468b3c8efba5bfd9085f8a9a470317f13f"; + sha256 = "024478d4db191ae8b60f3e848199bb32ee49b3e6389ecf9e285e69d9cf9dfc38"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.2/linux-x86_64/xh/firefox-128.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.3/linux-x86_64/xh/firefox-128.0.3.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; - sha256 = "599fbd74956a9f8537710ed25a7602a7a3fddd3ad378cdf0a8097dc501b49565"; + sha256 = "7d0c922b4898cbd66f0ba39c261dedc4b0857a0c8520fc31b2f63516c35f34d1"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.2/linux-x86_64/zh-CN/firefox-128.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.3/linux-x86_64/zh-CN/firefox-128.0.3.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha256 = "633874453d1f10dbdfe348c0b25271ad8a0cb0145de9c77d5aa2e01448c2277c"; + sha256 = "c52691c5f03893a1fccacf7808ad56063f08c3252625f1af71cf38cfa69fd3fa"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.2/linux-x86_64/zh-TW/firefox-128.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.3/linux-x86_64/zh-TW/firefox-128.0.3.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha256 = "c368c0581987a3cfc017268068aade0c5a1c91639fc2171ba8cf5ceb6fa1f85d"; + sha256 = "57dffcb9815bffa059cebc7dbf7f8675a23a5c403f7a55975962e06cb7ca6d95"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.2/linux-i686/ach/firefox-128.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.3/linux-i686/ach/firefox-128.0.3.tar.bz2"; locale = "ach"; arch = "linux-i686"; - sha256 = "264d80795048cfbb47f29de500f52a10a45cb8745137d080b119d79c01e8287d"; + sha256 = "f2b08657849de1dc13ac0c4f91fbb150eb56c11ac86db034fa24e29e312cdad9"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.2/linux-i686/af/firefox-128.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.3/linux-i686/af/firefox-128.0.3.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha256 = "6eee58e8e644d673107ed5f131a10bb1b90179a53ca6c80941676c3a83ab60b9"; + sha256 = "0d7765da6baee9d5535cb9e941d1ed879df0b6d1eda274c88e67067a00a43736"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.2/linux-i686/an/firefox-128.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.3/linux-i686/an/firefox-128.0.3.tar.bz2"; locale = "an"; arch = "linux-i686"; - sha256 = "530e0d0b13476b3b61f326b10ef27f9b4360681bba967cddfff962dfae4c5da3"; + sha256 = "e1d3c53ba2a559547f779a3d1cffbb5904300efc79be3a77f815cb7dcfabdc9f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.2/linux-i686/ar/firefox-128.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.3/linux-i686/ar/firefox-128.0.3.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha256 = "ccf7db0e4c4dd3e47b10466a94afbf98b21f49399a0cb019e4be799a520cce35"; + sha256 = "a4b1fd7433b5b6cd759fcd556218fbbae18d57f3393c07c49730035cfa526aff"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.2/linux-i686/ast/firefox-128.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.3/linux-i686/ast/firefox-128.0.3.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha256 = "b4c5ef614ed3c7ac7aafadceff0dca0b0196767bd1a87231fc608f2acd7d02d7"; + sha256 = "01d4c3501fc5e4a3578e340eb9e08c33f04b34b8a739098c32d5061fc9b59c22"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.2/linux-i686/az/firefox-128.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.3/linux-i686/az/firefox-128.0.3.tar.bz2"; locale = "az"; arch = "linux-i686"; - sha256 = "dbca6179a577b29c96cc24977de67921d0a5974a9bc940a957536ce0997776f3"; + sha256 = "8776ab3948aa8b01f100b829b629bc782d5fe6bbad7c93e04e160edf57159b73"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.2/linux-i686/be/firefox-128.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.3/linux-i686/be/firefox-128.0.3.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha256 = "66ae7cc89ea47629d3c16958067009387fea33303196e8d3f820259e0f13642a"; + sha256 = "ff2b7451ff56bd0a20fad579e5a041d31dc73903c0545d0020fb4fa3c1c4a55a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.2/linux-i686/bg/firefox-128.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.3/linux-i686/bg/firefox-128.0.3.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha256 = "0dc8fe00ad9e3a6307743d49374bd8c3d22aff8bf8a7b83a6ccb5d5e3b5c5fba"; + sha256 = "c515a28482e17b4bcff4a5e383709be3e996bf6a6125a3a52ac40de0eb4b3e30"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.2/linux-i686/bn/firefox-128.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.3/linux-i686/bn/firefox-128.0.3.tar.bz2"; locale = "bn"; arch = "linux-i686"; - sha256 = "0f2679377c6f6f034409f6383c56d74ef941f4346bb5450001890825a1839576"; + sha256 = "6d1666c4cf705f7d8b5d2fb017a22dcdf52a6ec4c13a63466843c1e31a29c8fa"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.2/linux-i686/br/firefox-128.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.3/linux-i686/br/firefox-128.0.3.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha256 = "395860392c302b7d8d335f1c0739a335b790c1446d90ba40504d3bd4d463fa0b"; + sha256 = "c98a3a1dcbcd57c2010e5a11de53a2ea25e8ede712324827f58b4f595d9427d8"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.2/linux-i686/bs/firefox-128.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.3/linux-i686/bs/firefox-128.0.3.tar.bz2"; locale = "bs"; arch = "linux-i686"; - sha256 = "6b5ada9156639396a2bafd20ca390ffd6df3e90f4ac12f02ae510a750145d72e"; + sha256 = "c154be0309b2f958694d88fbb642fb00428b08fb7aa437e1e9f787ce4df81f5d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.2/linux-i686/ca-valencia/firefox-128.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.3/linux-i686/ca-valencia/firefox-128.0.3.tar.bz2"; locale = "ca-valencia"; arch = "linux-i686"; - sha256 = "644a305b1f3cd374bcda0ddcd8e00edc161f92784b88a0bc9223b53c61b28c6a"; + sha256 = "17f9dda977832bef37f7ddd42f735f0dd5540201af842049a6f1aecef983c2cf"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.2/linux-i686/ca/firefox-128.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.3/linux-i686/ca/firefox-128.0.3.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha256 = "794e712daed332d34c51a7f1ed549a922da4990f242d17a05379b32b84442e36"; + sha256 = "6f6e40a64d834b5e523186761d83f0be2eb07890eeab42aac2f5036626e8e40a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.2/linux-i686/cak/firefox-128.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.3/linux-i686/cak/firefox-128.0.3.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha256 = "625651b2387e4b93ed0b5a659f4e446a1b7c5e2af75431996aef8f2c177c89ce"; + sha256 = "e5f786e9dad5aa06ca7e3fd7727ace659b85f590a61ec563acab316da25b6f6e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.2/linux-i686/cs/firefox-128.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.3/linux-i686/cs/firefox-128.0.3.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha256 = "c1fe01a24745c60687f72c203432f8c6fa9b0e9264e0968722e7acf060f65ea1"; + sha256 = "832bb169593341bac8f8f488cce8e48204e9b930c781ee5e1a3df6922c19c539"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.2/linux-i686/cy/firefox-128.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.3/linux-i686/cy/firefox-128.0.3.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha256 = "d0a41b5cd551aa460af262044334068735a40b35cbb34f674c660ee234a75099"; + sha256 = "bdfcab3c818542bc9d1c54cc8a7cbcf2dc7fbc07fdb63d9cf90e449e43204faf"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.2/linux-i686/da/firefox-128.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.3/linux-i686/da/firefox-128.0.3.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha256 = "19c78eae9f38c11b31f9ab03a0819f1c44866bf82032f42694f6b5bc4c719ace"; + sha256 = "24699d2d18c03b304feda944d65881fc8dbc1f6fe361d90b9edda0ecc23c5edd"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.2/linux-i686/de/firefox-128.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.3/linux-i686/de/firefox-128.0.3.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha256 = "44df80e29a8995715bddecf6a32798571fb3578b07ae7fe3e3b66dd3fcdc9356"; + sha256 = "cfb11ac9451f399cbc2583f7002d80fc3a2cc1ea2af035d36bb03fbb57988bf7"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.2/linux-i686/dsb/firefox-128.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.3/linux-i686/dsb/firefox-128.0.3.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha256 = "c921f35f4e9a6466729c2a44acf0419f66f519cc44995931399343929fbf97db"; + sha256 = "1ca1336fed3bb89f96bd39738f9c89533a5aee62908671d3dacd5daac9d0f177"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.2/linux-i686/el/firefox-128.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.3/linux-i686/el/firefox-128.0.3.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha256 = "a8a275774061013f8b865e661ba40f2a111e45d3d1c07ebc028997944c2a6d1b"; + sha256 = "1fed734ddf2a35e78ae06dc168eaacac8064c971e9fbb5b2a14b4d8b851065cb"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.2/linux-i686/en-CA/firefox-128.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.3/linux-i686/en-CA/firefox-128.0.3.tar.bz2"; locale = "en-CA"; arch = "linux-i686"; - sha256 = "8d4e8d22bc017fbf40777740ebac48f3d20cc1484b2b4bc1fc3afb8bbe51d11e"; + sha256 = "90fc71813cb9ad70600e1cf7cbde068935d191bd096707dc63addbb716dc28b4"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.2/linux-i686/en-GB/firefox-128.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.3/linux-i686/en-GB/firefox-128.0.3.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha256 = "ba0fcc1d6b56a80b4e554fca9d92210f2249763c5de947d6f8c8587445e6fdaa"; + sha256 = "6df2cf5fef54de12e0b032ff060dd546144434bfd2a25583b9b4a556669c8bcf"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.2/linux-i686/en-US/firefox-128.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.3/linux-i686/en-US/firefox-128.0.3.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha256 = "60dc739b70c21d389d9b9b1dc4ee97f210223ffec0777f93ed74c5e606676502"; + sha256 = "e038fcb1975f458b29418c5b3074a668a33e52686954c82cdccc0c3086bf2619"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.2/linux-i686/eo/firefox-128.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.3/linux-i686/eo/firefox-128.0.3.tar.bz2"; locale = "eo"; arch = "linux-i686"; - sha256 = "cf0f42b3573a59e09f3bd8c509aa99c8fad07b13925d05a85ed739aef5d46115"; + sha256 = "f9997cb88593736c3174dc5b128519e6970ac558b45f325ceb7c90e4f4159d40"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.2/linux-i686/es-AR/firefox-128.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.3/linux-i686/es-AR/firefox-128.0.3.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha256 = "ec6beb078fa8770707532fc7e5bc4187274eeb4c912fc15178a3acc06bd3ee91"; + sha256 = "25a75790cdc8d4f27a1d3cff8d58e44002a96de62f299d57d57e2ec91864a731"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.2/linux-i686/es-CL/firefox-128.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.3/linux-i686/es-CL/firefox-128.0.3.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; - sha256 = "7cb8dae495765e2878cc6b5b0e4b62a8be0d0b5addd22cf7703c1cd66dffbd31"; + sha256 = "422f415d0dda1581eadf6cf99b5f14f98d60c0b0f92fe1e4fedf3c92d533fe9a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.2/linux-i686/es-ES/firefox-128.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.3/linux-i686/es-ES/firefox-128.0.3.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha256 = "cbe1fb89275a71b7b636e8fdbc3786b7f126d88aaedff49ab80384466d705732"; + sha256 = "b9fad354573bf5ffe08f8fe88dc072cdc57a69f7f6c07a8269d3ff68dc1d0665"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.2/linux-i686/es-MX/firefox-128.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.3/linux-i686/es-MX/firefox-128.0.3.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha256 = "fc06a00a11142c284dab406b29a52226310aa6c7efdc8d28c5e9cf83638c0e4c"; + sha256 = "ccd35a3ccee72cf3c0ec116813640c146261c395adb66b6c83f7a807cc626a24"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.2/linux-i686/et/firefox-128.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.3/linux-i686/et/firefox-128.0.3.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha256 = "9a04c89f61bdbc37fa19f2fc5a4ebed9051a24c6b614a0c3c59c359773b99677"; + sha256 = "ff8552e0cee0b5f223d52042fad54562a11b38173315e40fa4f788b2f54b84fe"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.2/linux-i686/eu/firefox-128.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.3/linux-i686/eu/firefox-128.0.3.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha256 = "b305f77f335cf3673270d5194bcab29064fa44b9cbf4add32ea63ae141a4f55e"; + sha256 = "2baa47b4f1f66c677004b1ccd106686fa15f194dd013a82fda13b26beb53a68d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.2/linux-i686/fa/firefox-128.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.3/linux-i686/fa/firefox-128.0.3.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha256 = "fdfbe0c56fb66c315a1252552ed771147a911e3c923b92a70f5344e90d2602a4"; + sha256 = "2da068631e39964443235d21d7f93784db8790b42bcf241a66a9aa9ca4831465"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.2/linux-i686/ff/firefox-128.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.3/linux-i686/ff/firefox-128.0.3.tar.bz2"; locale = "ff"; arch = "linux-i686"; - sha256 = "4cba5f6d9c259e971d5a65d9d2df0aa502863395ee32f68882ddf0687a675ccf"; + sha256 = "ec188d7cda433abe43ce9fbe1ce954f9012605423998b518ea91932a370ff886"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.2/linux-i686/fi/firefox-128.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.3/linux-i686/fi/firefox-128.0.3.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha256 = "6f09d6f4793ab820732233a6e82e8be90b89466581ae9b31433c3492edef1620"; + sha256 = "3c5b1de585c8384c970ff893ecae207e8b461c6020a0afde8680d01c1acea3b4"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.2/linux-i686/fr/firefox-128.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.3/linux-i686/fr/firefox-128.0.3.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha256 = "7b6e643185824b5d850d8070df6df1d5a7a3bb8fca0fc937457377ee622d270c"; + sha256 = "284608220afcb0cdabff62650171c0de240b2ca5abc372bc8afbfee05ccbd7fe"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.2/linux-i686/fur/firefox-128.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.3/linux-i686/fur/firefox-128.0.3.tar.bz2"; locale = "fur"; arch = "linux-i686"; - sha256 = "2ac0983d6001c7fb2268578df75aed94f5ec409480b46cf3a6d34ac1e66e7044"; + sha256 = "3c61f1f665d81024849a11a6c33304438f3a8614a8cf58fb5d1bb9f6d9d28800"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.2/linux-i686/fy-NL/firefox-128.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.3/linux-i686/fy-NL/firefox-128.0.3.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha256 = "15500ca3d0f08a9c7a03bfdfab96043a03185c3e3f401edbf82fe63b50b4aadd"; + sha256 = "4ae3c2ff14af8399d96f17d3e35192398c3f7b27f70e82d4fe551a3cd3b00164"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.2/linux-i686/ga-IE/firefox-128.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.3/linux-i686/ga-IE/firefox-128.0.3.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha256 = "573ad14016d744dc7fe04d4ed09631cf32ba7ef2be925906fc2b86086b9c923f"; + sha256 = "8fe1b68acfb0473bb6133bfc39b98dbcdd69774df6f336baca2589cb2e48d3ef"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.2/linux-i686/gd/firefox-128.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.3/linux-i686/gd/firefox-128.0.3.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha256 = "2b2c42ee6e84868c30542fba2cbc7b747177a80efe8183e6ed755dc6e397bf7e"; + sha256 = "742425d3948cff645c52e0c0e1d3a0024445a4b886885203e21c18a247df928b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.2/linux-i686/gl/firefox-128.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.3/linux-i686/gl/firefox-128.0.3.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha256 = "21bb8ab1605c83800529e051a17bac5a269ff44b48908b9dfbc9432ee485947d"; + sha256 = "66185d5c0e1e573f42b88ecca81db4aca89e261561cac90d8134ff1b47f3bae6"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.2/linux-i686/gn/firefox-128.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.3/linux-i686/gn/firefox-128.0.3.tar.bz2"; locale = "gn"; arch = "linux-i686"; - sha256 = "cc0474836293a66894245ca752da8a1e4a52f563600b771e183404396c56a3d3"; + sha256 = "13f5f27482ae77c93f59e81ed2d1b907c36c29ef821ed9e33260da264a3a2603"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.2/linux-i686/gu-IN/firefox-128.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.3/linux-i686/gu-IN/firefox-128.0.3.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; - sha256 = "d18b96452cafd50b947f2b05397039b6f58ff73ad60f4185a74e39c446e4c464"; + sha256 = "494359262fff23bc8321543135a7861c30deccaf53a5c49d9d86870fd4b92a54"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.2/linux-i686/he/firefox-128.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.3/linux-i686/he/firefox-128.0.3.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha256 = "b3c173ec6004b1f98cc5af44fa29e49078cb77d14d9496e895cef52a17a52fe8"; + sha256 = "c11558d1487082b806434634e0266771cae42d11ddd2e11a25ab520d118f9e10"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.2/linux-i686/hi-IN/firefox-128.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.3/linux-i686/hi-IN/firefox-128.0.3.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; - sha256 = "adf452e113cd55d9e1343aefdb311dbf2c32242ca7190c3db55861491d476b84"; + sha256 = "ec3fd7b93d081f44c72c3d59e8571802ed4ee6506eb270a851364f710fe50c56"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.2/linux-i686/hr/firefox-128.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.3/linux-i686/hr/firefox-128.0.3.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha256 = "93868a7949c1c2a89c335adfbc9fc266efd77135faec6f0d0c8a1996d791527c"; + sha256 = "93c792cab62a68b07d1c2ce6512a0b42ea41ef087908e2094dee9bdb25d73dcd"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.2/linux-i686/hsb/firefox-128.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.3/linux-i686/hsb/firefox-128.0.3.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha256 = "fdb1897604b8f9cea245757de1dcfbdc7e721203b6d042289cd7ae9b858eeca7"; + sha256 = "936ad42a5afa5b894772865a09b06e23f888c5523b795dec2125d8aa048a4ea0"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.2/linux-i686/hu/firefox-128.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.3/linux-i686/hu/firefox-128.0.3.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha256 = "9f59966a30da65005d706bc9bf173bb35ab7c8a9cf88b10398ab9ceb9bde87ca"; + sha256 = "d45cee09699c2848f999da792d8fa57135e62e0215710ee0683c4ac9d738b386"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.2/linux-i686/hy-AM/firefox-128.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.3/linux-i686/hy-AM/firefox-128.0.3.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha256 = "70e878f79905b6b9bc2b133f9bb4efc3e2358ecedca7b5317132b12760c2b6ad"; + sha256 = "3ac080164a88bfca803590cebf924a89f76bf799093b937e413e796fe7d22019"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.2/linux-i686/ia/firefox-128.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.3/linux-i686/ia/firefox-128.0.3.tar.bz2"; locale = "ia"; arch = "linux-i686"; - sha256 = "23238b5e9e342ef2e17f046d5aaa1cc176d37e4ace9436d9c4708c3839cccc19"; + sha256 = "35985353b5599063f19577bbff3af67b5482f5abdab47b5f77c52eab4f09c59a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.2/linux-i686/id/firefox-128.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.3/linux-i686/id/firefox-128.0.3.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha256 = "2288b8f24f527b119a1189a08a36d87a287eb1751fce16c22e6e82ce641ef7a6"; + sha256 = "65b3770135e7ec1868fb513a834acc383d5bf8ab394ffdcba2dbc0c53631d741"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.2/linux-i686/is/firefox-128.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.3/linux-i686/is/firefox-128.0.3.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha256 = "168427f4574aa71d83617c06e657b1dfc56af407b8f17e16a1cba8063f47b049"; + sha256 = "72be73fb5c057355789fba85713bbef3ce3eb478eba08214229eef31e4433662"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.2/linux-i686/it/firefox-128.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.3/linux-i686/it/firefox-128.0.3.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha256 = "fed9870891898644b60662b63bc848fb0cade6018fbefb91874ed8f85848e7fb"; + sha256 = "94ae5438eb34ba779c0dcefa8a8919e1d0254b240009c461d6f8325880a1dc2e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.2/linux-i686/ja/firefox-128.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.3/linux-i686/ja/firefox-128.0.3.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha256 = "7dee7449abba3f9794d1ce79cc9ba898dfde738f6c03ee0d15eae1cef29b8065"; + sha256 = "a6fc05c43579feced4f0cd63df7bd369d306cc96b4717fe244f0f6a527108a11"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.2/linux-i686/ka/firefox-128.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.3/linux-i686/ka/firefox-128.0.3.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha256 = "794ba99b33f48ead7c1e82feac6a78a2c7a6fc0a3683a2a8debed76278d667d0"; + sha256 = "80531b4565f4a5405a6d9fd6c4cfd1378dbc4ebe00b8525335e558971396b307"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.2/linux-i686/kab/firefox-128.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.3/linux-i686/kab/firefox-128.0.3.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha256 = "1978a5277987f5c46b6afb1efd50a7658a8f3c4d949d1bbdb882d91e47399ac5"; + sha256 = "42cd81283e7824ba606b2d43c05596ed7c0b7950ea10c9b02e7075f854a8c701"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.2/linux-i686/kk/firefox-128.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.3/linux-i686/kk/firefox-128.0.3.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha256 = "272e3cbc5f3f0e4f84f5ebbc1d99906d689f2c733629ec319b0b366977a02ca8"; + sha256 = "675fc5ff2bcb76a34f160383cc4616dceaf81380168e4e86c149d3ca9fd9d909"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.2/linux-i686/km/firefox-128.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.3/linux-i686/km/firefox-128.0.3.tar.bz2"; locale = "km"; arch = "linux-i686"; - sha256 = "41243c3d00d35147c248af1ff7202382781fb5bf04e0b4fbfb78bf3c5d86ddf6"; + sha256 = "ca3fa12dc1dcadf9e3d9ce7ae5f7ce66e29363652a0fa88f61c96c32aef5c182"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.2/linux-i686/kn/firefox-128.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.3/linux-i686/kn/firefox-128.0.3.tar.bz2"; locale = "kn"; arch = "linux-i686"; - sha256 = "d0de2c673c13e87bd9a086ff2baa6eddecf16ec8662bb20f6789ac8c128484bf"; + sha256 = "0240216828f14844b0f85387d06e42facdd12b5de0c6edf0bae87febe7b07377"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.2/linux-i686/ko/firefox-128.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.3/linux-i686/ko/firefox-128.0.3.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha256 = "6474c23951361afe745684c9222d8f5fb5a7227a33ce7678a5136887113a1d7a"; + sha256 = "5065ff3c27ed651347e9fbd6c6bd9350dc65f66c5eac335816f0daa3723fd097"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.2/linux-i686/lij/firefox-128.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.3/linux-i686/lij/firefox-128.0.3.tar.bz2"; locale = "lij"; arch = "linux-i686"; - sha256 = "9fb973dabb658f383774b47b77a49ef50e51c6cb803a893d9d289b83b638c947"; + sha256 = "fd88807694e87a8bc42888eff27e206892f39787ee36c9b020b99b803d2194ae"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.2/linux-i686/lt/firefox-128.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.3/linux-i686/lt/firefox-128.0.3.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha256 = "ea4d6a8fbce960a683526c49caab3ab4f63e2cb481b37394b1868f0bdd9a472f"; + sha256 = "d284cc9b3b47de856ee34c53d607c4aa22f8d7caebab05d95fbee97d182c4022"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.2/linux-i686/lv/firefox-128.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.3/linux-i686/lv/firefox-128.0.3.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha256 = "3ad05b32176b8d6a387de36c63744121f6760ccb7549b27434c0a691143a5773"; + sha256 = "af758c00306dfad990601041a44514c1ddf9929814d114a14b00fbfd7bec64d7"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.2/linux-i686/mk/firefox-128.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.3/linux-i686/mk/firefox-128.0.3.tar.bz2"; locale = "mk"; arch = "linux-i686"; - sha256 = "d43a2aec6870dc26173ac6c93ee8bd030107af10029723918913d674eb136ffc"; + sha256 = "b812da309e7b90cd01f7422be71f712343a23ccaa6bb5176331da2139542f059"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.2/linux-i686/mr/firefox-128.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.3/linux-i686/mr/firefox-128.0.3.tar.bz2"; locale = "mr"; arch = "linux-i686"; - sha256 = "350d378304bd5f3fdef2c5731bf050a4ac160d8d12a0a241f617cf8e4d1fbbc0"; + sha256 = "52bfd7c199d215a89e83bab76b1aa37eabfc6d75689cdfce2df6cc5b6057d7c4"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.2/linux-i686/ms/firefox-128.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.3/linux-i686/ms/firefox-128.0.3.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha256 = "a458cfb76c94b1d64f9dc2539cae1ef8976671900e7b8099b7c30312a36fe6a4"; + sha256 = "fe7b1a032f38f1003c8d41733007921bb2bcd10968d23bde213aa809243e7159"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.2/linux-i686/my/firefox-128.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.3/linux-i686/my/firefox-128.0.3.tar.bz2"; locale = "my"; arch = "linux-i686"; - sha256 = "2b3f4efd413cf55ab734179b043929e1d9d9e8ae261609cb8104d93a730fbd09"; + sha256 = "79f16c9e7ec7d850a83332e3a1c4a77c607a8bd1fbd806d4e6da7bfd2dc6deb9"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.2/linux-i686/nb-NO/firefox-128.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.3/linux-i686/nb-NO/firefox-128.0.3.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha256 = "90636874bbbb89973026f68018aa97c5280b47706303be75d7ef15d1190ed383"; + sha256 = "14d1c0ca9fb8d7ae1748669fe21a3f9620e175686ed2a600624541616f0adc6c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.2/linux-i686/ne-NP/firefox-128.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.3/linux-i686/ne-NP/firefox-128.0.3.tar.bz2"; locale = "ne-NP"; arch = "linux-i686"; - sha256 = "03c56bdde8f117ad664663d0483e78db411df2ee1c72b6d3ab9e40ba1d19009e"; + sha256 = "f1d1e634dd28daff429a4987bee6e2a33ea09bbf4afe656608a709488eca1583"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.2/linux-i686/nl/firefox-128.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.3/linux-i686/nl/firefox-128.0.3.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha256 = "a25d8b88c140a771ded2fe557bc021cb05a6af7f3579b453c614cd5c8f4564d7"; + sha256 = "e8b73288fa36895f33ddb3e40b4ef7d47ac6a359f052ab554c3573f518f98ad4"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.2/linux-i686/nn-NO/firefox-128.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.3/linux-i686/nn-NO/firefox-128.0.3.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha256 = "6388d1cccac3f53228864aca0ea26bf05061bde97a226c3c63fe5d69d13cc35e"; + sha256 = "75ab10b588993edeea6aba57dab2a1071d8d69db2a198a1402ec2c9b61fa3690"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.2/linux-i686/oc/firefox-128.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.3/linux-i686/oc/firefox-128.0.3.tar.bz2"; locale = "oc"; arch = "linux-i686"; - sha256 = "eca6eb70a59f092f61ee2db66933da1ec25bd8a3404285ea5feb7b3f82ab1947"; + sha256 = "657b09e1ec152f92526c739df956c6de037788a1708eb28ccc86ade145aa9898"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.2/linux-i686/pa-IN/firefox-128.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.3/linux-i686/pa-IN/firefox-128.0.3.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha256 = "c29d74bbd97ef0b5bceae83b6520436a57dcbc9370b5f86ba4e51e9cf110a971"; + sha256 = "cf260de05ae7ac32186aa0339bb0955bb7dc82e1e5c09c082030af03b10e1471"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.2/linux-i686/pl/firefox-128.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.3/linux-i686/pl/firefox-128.0.3.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha256 = "a15a99418fc06f678efa35aafc0bd8a2a9acc592ca18abbc852b2166dc31e30f"; + sha256 = "9eae04b0fbd4ca22fcead9c1d822ed82752fc4f3f73b81b75a1aa0d19f57eb3d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.2/linux-i686/pt-BR/firefox-128.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.3/linux-i686/pt-BR/firefox-128.0.3.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha256 = "37523ad0c2ee181e01c11bac4adc82695c86cf17b0688e6f78cd79ec19c3fb0b"; + sha256 = "7e15115d15f343749f6142674dd3a284e81761d1f6872d63a21d51796a92c1eb"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.2/linux-i686/pt-PT/firefox-128.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.3/linux-i686/pt-PT/firefox-128.0.3.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha256 = "4c2cdf0c375597e04d5812325d80c1ed598b1918ed14914e7117098f11ee427c"; + sha256 = "12ad70170a506d1719092642c0e14b41171aff0286bb6ec943c4f0ce1332541c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.2/linux-i686/rm/firefox-128.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.3/linux-i686/rm/firefox-128.0.3.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha256 = "91ac993e6d97ed1469b36321a0627ccf5afb98478e78afd7154069066a85f53b"; + sha256 = "2b2349cf2db3cb9eed5779bed2268a64737c332fe2fddea90b9531db24b842fc"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.2/linux-i686/ro/firefox-128.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.3/linux-i686/ro/firefox-128.0.3.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha256 = "cb619b50c4763b106938d4cc8e92afefd95e2bd5e800bfc3784a3d93ecb8185b"; + sha256 = "5068ddfad3139e70c6378a914725a559d794c430e9be76a6e8d3dc48a57af7c3"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.2/linux-i686/ru/firefox-128.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.3/linux-i686/ru/firefox-128.0.3.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha256 = "e249db0972f40de6c58e706478e5f89f9c9a28aa13f9c8ff17e72a753ceaaa11"; + sha256 = "c6af6765a595ec83f8a66fe19b7b187d7ac7fdbfe11f6730828e6eff889071a5"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.2/linux-i686/sat/firefox-128.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.3/linux-i686/sat/firefox-128.0.3.tar.bz2"; locale = "sat"; arch = "linux-i686"; - sha256 = "f160e2d68d4d3dbdfc9308edbfcd60722d872fbfc9dd60b8f9b01426bd8d867f"; + sha256 = "83b06a57133bfabc57f7cebf649de624fd07a663fbcfcd147270bbac699581d9"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.2/linux-i686/sc/firefox-128.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.3/linux-i686/sc/firefox-128.0.3.tar.bz2"; locale = "sc"; arch = "linux-i686"; - sha256 = "030a5b731e78896b99169d287c27d982d96c9a2b9ca5e2b7f78a3d4076ed19bd"; + sha256 = "4e8244f6a7b60c3bf780c1d024c28335227037cb89ccea6c0c5ae30a24f5ebbf"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.2/linux-i686/sco/firefox-128.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.3/linux-i686/sco/firefox-128.0.3.tar.bz2"; locale = "sco"; arch = "linux-i686"; - sha256 = "bcb2264e71974efeabd6d369a3bd389eaceff27d1edcc5ec9a115dd9b68a223f"; + sha256 = "01fc0ce83e0fdf1716eaea1bdfa36802f9ac36cc1df80afcfb03ee974a3b92ef"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.2/linux-i686/si/firefox-128.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.3/linux-i686/si/firefox-128.0.3.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha256 = "303046ad1118c044f05366bbbef2e87dcd19291c8894d352eef8a739c82b2a29"; + sha256 = "e71f10d7c120c202f2758e0a56c134280c71545003cecdf08b0d2721018c9181"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.2/linux-i686/sk/firefox-128.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.3/linux-i686/sk/firefox-128.0.3.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha256 = "651b9f9f57d687df7b9c317f3c8a3df6ca66f9e52c9d674c54fae0bab77f6959"; + sha256 = "dc38489c733175fa9be365aae5e59eb916fc2963e26e83825771ceac79c7d066"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.2/linux-i686/skr/firefox-128.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.3/linux-i686/skr/firefox-128.0.3.tar.bz2"; locale = "skr"; arch = "linux-i686"; - sha256 = "a3c714b3e27bb103fbf11ab6c10e2511dab53dc6ade45a1dced2f423d32f32a4"; + sha256 = "1ead162ee114da7b66128fa27de2cfc81f5dd32c02b1e8a6e0bfd62694c06923"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.2/linux-i686/sl/firefox-128.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.3/linux-i686/sl/firefox-128.0.3.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha256 = "117749fd27c7f5b0eeeb73511afda5037aa25124279585c5bd72f298213bc5db"; + sha256 = "acf29877d72d82dd6fbdd8041111ae60503e7bcf4f2b8b55e03f7abe469bd4c1"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.2/linux-i686/son/firefox-128.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.3/linux-i686/son/firefox-128.0.3.tar.bz2"; locale = "son"; arch = "linux-i686"; - sha256 = "a0d952ffd5419206b507651534746a736286e92c3fd72a9db4b12b52d5a75db6"; + sha256 = "13d22a9f5f13e7fb600263a29b9d89dd2465b8742325d85e2fa9793aba807e1a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.2/linux-i686/sq/firefox-128.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.3/linux-i686/sq/firefox-128.0.3.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha256 = "4785f49a0de4e9dd5f8ee030fe7e2f8eee5763a241bb2307a7eff9f87c5f6503"; + sha256 = "2976492fb2c9fb617c933be100ef1b4d96908078ab5b2164bbee03cff9b714a3"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.2/linux-i686/sr/firefox-128.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.3/linux-i686/sr/firefox-128.0.3.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha256 = "87d69852745cb7620cf76b4405b7b5980b212e5f7b878bc2170d01ed3c245214"; + sha256 = "d719bfbc45248244b16d1fc11ac4bc7c5bce9b759fd77b72bbf956a059a06693"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.2/linux-i686/sv-SE/firefox-128.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.3/linux-i686/sv-SE/firefox-128.0.3.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha256 = "44539421aa13257e85c511beadb2434567d1c230a05a25f16d830516c8184831"; + sha256 = "5f1bfcb553144f016845e19373f15a509d9b577877c7f7aef9a26cc04b5aa00d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.2/linux-i686/szl/firefox-128.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.3/linux-i686/szl/firefox-128.0.3.tar.bz2"; locale = "szl"; arch = "linux-i686"; - sha256 = "79b6dafa82f92ab1ea9063885c17a4f09ea17b7210e14cce3764d1457ed213bb"; + sha256 = "33d0952b876c09f2c5c96e1cad06a638d695eacba52b215e00f4f48d87d7c814"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.2/linux-i686/ta/firefox-128.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.3/linux-i686/ta/firefox-128.0.3.tar.bz2"; locale = "ta"; arch = "linux-i686"; - sha256 = "1000fa0b83ab184bc43db2db701b70eb0565bb9f72e6c2702e61725cb9091cad"; + sha256 = "2cd54e1ded84369a910f5dd61df1113b90c25de8868d3e27b5ef12512b2195be"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.2/linux-i686/te/firefox-128.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.3/linux-i686/te/firefox-128.0.3.tar.bz2"; locale = "te"; arch = "linux-i686"; - sha256 = "75520f08386ccee407a18c1547a07aff3e59e8c267aa3e581215c8d44c80b1d7"; + sha256 = "45b93268276b93dbaa70703fbc8b9b31e7e91a8f3cbc6bd8a86d06262240a904"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.2/linux-i686/tg/firefox-128.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.3/linux-i686/tg/firefox-128.0.3.tar.bz2"; locale = "tg"; arch = "linux-i686"; - sha256 = "a198cfa165ca260fab3d8341676e7f9129f6f7ba458a250292115635cbba4c23"; + sha256 = "6fff7c478cf6eb67dad945764793d91bbcaf01c1a9a7f092d5252a2aa2b4e48a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.2/linux-i686/th/firefox-128.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.3/linux-i686/th/firefox-128.0.3.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha256 = "8009dd6877cbfc1b89eb6ab612f3b0e113d678894ebca994f86fed10751e2aab"; + sha256 = "f5f3f3c5fa0fcc8af6b2b1b1a0bc072ce75b5f4f9801695c73f12550625af029"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.2/linux-i686/tl/firefox-128.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.3/linux-i686/tl/firefox-128.0.3.tar.bz2"; locale = "tl"; arch = "linux-i686"; - sha256 = "e3c651e61179ca944a735700591742b9ffb30e5ddce88b6978ac3e33a981db3e"; + sha256 = "39849cf29a57fc527686b5aa877bf1674b54ab5e837e200baf9513103b57cb79"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.2/linux-i686/tr/firefox-128.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.3/linux-i686/tr/firefox-128.0.3.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha256 = "87ebe236358bc3c422ec4828922b53b35f4f0ecc39314efcaad9451e3d260c58"; + sha256 = "8e1942d18e7c5a48fa5ed5850334a255e32c73c76af3db68e3b5bf04ace19e91"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.2/linux-i686/trs/firefox-128.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.3/linux-i686/trs/firefox-128.0.3.tar.bz2"; locale = "trs"; arch = "linux-i686"; - sha256 = "c9af2091e0ee5d21a053ada831f6788d5ee4d7e0dfcfedb2090671482a8932c5"; + sha256 = "37b72564a80770cc1a22a3d3528d439dc8f14f1b52f54a174b3ef20fa08fa38a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.2/linux-i686/uk/firefox-128.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.3/linux-i686/uk/firefox-128.0.3.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha256 = "c09015f88a27b6d2c1c77648c4de13ff06fdc0317364b4e88b36b8616f0965a2"; + sha256 = "fa8361c2afcdec1db5bf634ff185fe4c96bfde3c7e06e98b3ce8f04ed91b9e17"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.2/linux-i686/ur/firefox-128.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.3/linux-i686/ur/firefox-128.0.3.tar.bz2"; locale = "ur"; arch = "linux-i686"; - sha256 = "f26d7a5c31443e0eb65bc607e93785c448bd7b7a821f3524fd90f9d41242a0d6"; + sha256 = "79bdc59820686db460390966937bc61dd482b5e029a9586f5239b54d93dcc0bf"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.2/linux-i686/uz/firefox-128.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.3/linux-i686/uz/firefox-128.0.3.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha256 = "29ab0233a1255d7ac2f1b5b4b380df0dbd2df3a1c70dc575b925e46f73d6fc76"; + sha256 = "5f312dacb220dd74cd56e18ec85a997ec7631f70dd214424192732f398cd3014"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.2/linux-i686/vi/firefox-128.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.3/linux-i686/vi/firefox-128.0.3.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha256 = "f38ab642035a7a8be22b08210340966d88e85d6452c9fa578ed09d657173646b"; + sha256 = "ba7eb525502a263c6746fa617ea82d8fe172143f4b9ca0368c3f02402b25ca8a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.2/linux-i686/xh/firefox-128.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.3/linux-i686/xh/firefox-128.0.3.tar.bz2"; locale = "xh"; arch = "linux-i686"; - sha256 = "933d26028865175f8481f344a27aa32d1470e0f89077444ab80b850b1fb3042d"; + sha256 = "3946ed963353577ec0d55ccb740d2ad19d45dec71ab648be9d8dd29295c0262c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.2/linux-i686/zh-CN/firefox-128.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.3/linux-i686/zh-CN/firefox-128.0.3.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha256 = "047ad2f2092b36f6628711987d1334fc7fd3d56a45b3a95dddd38e88f4f67985"; + sha256 = "53084f6cd45c753df155c30c3c3289215e654c75bc72c19bb0f75cc03f2bade6"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.2/linux-i686/zh-TW/firefox-128.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.3/linux-i686/zh-TW/firefox-128.0.3.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha256 = "341858e2457282cc2376c5d52ad7e6cf11a0d02ae79591b28f8bb5d00079a7cc"; + sha256 = "080e1a455293f3502c10ca5dc08714c77df73ec6585920dd0edfcf3e079f14a4"; } ]; } diff --git a/pkgs/applications/networking/browsers/firefox/packages.nix b/pkgs/applications/networking/browsers/firefox/packages.nix index c9ab9006ded6..3d8fdf8af87e 100644 --- a/pkgs/applications/networking/browsers/firefox/packages.nix +++ b/pkgs/applications/networking/browsers/firefox/packages.nix @@ -5,10 +5,10 @@ { firefox = buildMozillaMach rec { pname = "firefox"; - version = "128.0.2"; + version = "128.0.3"; src = fetchurl { url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz"; - sha512 = "e5c38fa3adf26f5f072b6dfe5955004e67f576dc67ef68348d58fa0ac13bd3c7764e9289dfcadb2bbe034188bf296267d74fde13fb9b53beb5421245fee69da1"; + sha512 = "52a0a1a6fa653f5a621a9e16e1937760c05a5ebc81a058ecc16b2c3d29d09d418dc5129deabed86ad2f82abdb3100969478a67f48b11616dc3b3e3698a1acf51"; }; extraPatches = [ diff --git a/pkgs/applications/networking/browsers/ladybird/default.nix b/pkgs/applications/networking/browsers/ladybird/default.nix index 4f8443c9397f..e6067f1da4aa 100644 --- a/pkgs/applications/networking/browsers/ladybird/default.nix +++ b/pkgs/applications/networking/browsers/ladybird/default.nix @@ -7,7 +7,6 @@ , tzdata , unicode-emoji , unicode-character-database -, darwin , cmake , ninja , pkg-config diff --git a/pkgs/applications/networking/calls/default.nix b/pkgs/applications/networking/calls/default.nix index 34a26d5cf946..c0a23c652876 100644 --- a/pkgs/applications/networking/calls/default.nix +++ b/pkgs/applications/networking/calls/default.nix @@ -18,7 +18,6 @@ , desktop-file-utils , appstream-glib , libpeas -, libgdata , dbus , vala , wrapGAppsHook3 @@ -27,7 +26,6 @@ , docbook-xsl-nons , docbook_xml_dtd_43 , docutils -, gobject-introspection , gst_all_1 , sofia_sip }: diff --git a/pkgs/applications/networking/cluster/civo/default.nix b/pkgs/applications/networking/cluster/civo/default.nix index 1e2e220437fe..0c676bed1c0b 100644 --- a/pkgs/applications/networking/cluster/civo/default.nix +++ b/pkgs/applications/networking/cluster/civo/default.nix @@ -42,6 +42,6 @@ buildGoModule rec { mainProgram = "civo"; homepage = "https://github.com/civo/cli"; license = licenses.asl20; - maintainers = with maintainers; [ berryp ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/applications/networking/cluster/ktop/default.nix b/pkgs/applications/networking/cluster/ktop/default.nix index 8c5c842fac30..5dce126d5057 100644 --- a/pkgs/applications/networking/cluster/ktop/default.nix +++ b/pkgs/applications/networking/cluster/ktop/default.nix @@ -2,14 +2,14 @@ buildGoModule rec { pname = "ktop"; - version = "0.3.6"; + version = "0.3.7"; excludedPackages = [".ci"]; src = fetchFromGitHub { owner = "vladimirvivien"; repo = pname; rev = "v${version}"; - hash = "sha256-nVZ1e/GKiJFTwuq5dPIzF4Jrv2DJ2wwWAiOn304hTA4="; + hash = "sha256-oxyEkDY53HjBgjWRajlcg+8Kx092lyLkPgOJleioO7o="; }; vendorHash = "sha256-MLIcTHWo7lsqtAqH8naSvpS013t8KBVPRbch+CfeUNk="; diff --git a/pkgs/applications/networking/cluster/ktunnel/default.nix b/pkgs/applications/networking/cluster/ktunnel/default.nix index 8641209e3417..79510ae103ce 100644 --- a/pkgs/applications/networking/cluster/ktunnel/default.nix +++ b/pkgs/applications/networking/cluster/ktunnel/default.nix @@ -31,7 +31,7 @@ buildGoModule { ''; meta = with lib; { - description = "Cli that exposes your local resources to kubernetes "; + description = "Cli that exposes your local resources to kubernetes"; mainProgram = "ktunnel"; homepage = "https://github.com/omrikiei/ktunnel"; license = licenses.asl20; diff --git a/pkgs/applications/networking/cluster/kubectl-ktop/default.nix b/pkgs/applications/networking/cluster/kubectl-ktop/default.nix index ab96d337ee96..eda9ee79f1f0 100644 --- a/pkgs/applications/networking/cluster/kubectl-ktop/default.nix +++ b/pkgs/applications/networking/cluster/kubectl-ktop/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "kubectl-ktop"; - version = "0.3.6"; + version = "0.3.7"; src = fetchFromGitHub { owner = "vladimirvivien"; repo = "ktop"; rev = "v${version}"; - sha256 = "sha256-nVZ1e/GKiJFTwuq5dPIzF4Jrv2DJ2wwWAiOn304hTA4="; + sha256 = "sha256-oxyEkDY53HjBgjWRajlcg+8Kx092lyLkPgOJleioO7o="; }; vendorHash = "sha256-MLIcTHWo7lsqtAqH8naSvpS013t8KBVPRbch+CfeUNk="; diff --git a/pkgs/applications/networking/cluster/nomad/default.nix b/pkgs/applications/networking/cluster/nomad/default.nix index e170919495d3..66403998d835 100644 --- a/pkgs/applications/networking/cluster/nomad/default.nix +++ b/pkgs/applications/networking/cluster/nomad/default.nix @@ -1,6 +1,7 @@ { lib , buildGoModule , buildGo121Module +, buildGo122Module , fetchFromGitHub , nixosTests , installShellFiles @@ -44,6 +45,8 @@ let maintainers = with maintainers; [ rushmorem pradeepchhetri techknowlogick cottand ]; }; } // attrs'); + + throwUnsupportaed = version: "${version} is no longer supported upstream. You can switch to using a newer version of the nomad package, or revert to older nixpkgs if you cannot upgrade"; in rec { # Nomad never updates major go versions within a release series and is unsupported @@ -54,19 +57,9 @@ rec { nomad = nomad_1_7; - nomad_1_4 = throw "nomad_1_4 is no longer supported upstream. You can switch to using a newer version of the nomad package, or revert to older nixpkgs if you cannot upgrade"; + nomad_1_4 = throwUnsupportaed "nomad_1_4"; - nomad_1_5 = generic { - buildGoModule = buildGo121Module; - version = "1.5.15"; - sha256 = "sha256-OFmGOU+ObA0+BS48y0ZyyxR+VI5DYL39peVKcyVHgGI="; - vendorHash = "sha256-Ds94lB43cyMNyRJZti0mZDWGTtSdwY31dDijfAUxR0I="; - license = lib.licenses.mpl20; - passthru.tests.nomad = nixosTests.nomad; - preCheck = '' - export PATH="$PATH:$NIX_BUILD_TOP/go/bin" - ''; - }; + nomad_1_5 = throwUnsupportaed "nomad_1_5"; nomad_1_6 = generic { buildGoModule = buildGo121Module; @@ -81,7 +74,7 @@ rec { }; nomad_1_7 = generic { - buildGoModule = buildGo121Module; + buildGoModule = buildGo122Module; version = "1.7.7"; sha256 = "sha256-4nuRheidR6rIoytrnDQdIP69f+sBLJ3Ias5DvqVaLFc="; vendorHash = "sha256-ZuaD8iDsT+/eW0QUavf485R804Jtjl76NcQWYHA8QII="; @@ -93,10 +86,10 @@ rec { }; nomad_1_8 = generic { - buildGoModule = buildGo121Module; - version = "1.8.0"; - sha256 = "sha256-j/9wvnxYhv6h344904cO2Fi6pNeSV5IfcqS4mSjDqpo="; - vendorHash = "sha256-jNdLLs/mfARl5Uk9RalwSDFLAKqIISEkek3l1wV8EYE="; + buildGoModule = buildGo122Module; + version = "1.8.2"; + sha256 = "sha256-deVLC7yGgLHCauq+3h0Uu5ln5omoeV8/FkVtQM9CEXc="; + vendorHash = "sha256-Pr38tRzym8UFPZKs9367xOZJ9P5OHotwwClorcSgOys="; license = lib.licenses.bsl11; passthru.tests.nomad = nixosTests.nomad; preCheck = '' diff --git a/pkgs/applications/networking/cluster/pv-migrate/default.nix b/pkgs/applications/networking/cluster/pv-migrate/default.nix index 0d7b6db8a706..ebb00206586d 100644 --- a/pkgs/applications/networking/cluster/pv-migrate/default.nix +++ b/pkgs/applications/networking/cluster/pv-migrate/default.nix @@ -35,7 +35,7 @@ buildGoModule rec { ''; meta = with lib; { - description = "CLI tool to easily migrate Kubernetes persistent volumes "; + description = "CLI tool to easily migrate Kubernetes persistent volumes"; mainProgram = "pv-migrate"; homepage = "https://github.com/utkuozdemir/pv-migrate"; changelog = "https://github.com/utkuozdemir/pv-migrate/releases/tag/${version}"; diff --git a/pkgs/applications/networking/cluster/tubekit/wrapper.nix b/pkgs/applications/networking/cluster/tubekit/wrapper.nix index 7cba11c97a3a..d12f69adbfb9 100644 --- a/pkgs/applications/networking/cluster/tubekit/wrapper.nix +++ b/pkgs/applications/networking/cluster/tubekit/wrapper.nix @@ -1,5 +1,4 @@ -{ lib -, runCommand +{ runCommand , makeWrapper , tubekit-unwrapped , pname ? "tubekit" diff --git a/pkgs/applications/networking/cluster/waagent/default.nix b/pkgs/applications/networking/cluster/waagent/default.nix index 294440d820e1..39e8958d1242 100644 --- a/pkgs/applications/networking/cluster/waagent/default.nix +++ b/pkgs/applications/networking/cluster/waagent/default.nix @@ -1,9 +1,7 @@ -{ bash -, coreutils +{ coreutils , fetchFromGitHub , lib , python39 -, substituteAll }: let diff --git a/pkgs/applications/networking/feedreaders/russ/default.nix b/pkgs/applications/networking/feedreaders/russ/default.nix index aa0154227c1e..832f888dcfaa 100644 --- a/pkgs/applications/networking/feedreaders/russ/default.nix +++ b/pkgs/applications/networking/feedreaders/russ/default.nix @@ -2,7 +2,6 @@ , stdenv , fetchFromGitHub , rustPlatform -, xorg , darwin }: diff --git a/pkgs/applications/networking/gns3/default.nix b/pkgs/applications/networking/gns3/default.nix index b6838844afe4..8048b87409c1 100644 --- a/pkgs/applications/networking/gns3/default.nix +++ b/pkgs/applications/networking/gns3/default.nix @@ -1,10 +1,12 @@ { callPackage , libsForQt5 +, python311 }: let mkGui = args: callPackage (import ./gui.nix (args)) { inherit (libsForQt5) wrapQtAppsHook; + python3 = python311; }; mkServer = args: callPackage (import ./server.nix (args)) { }; diff --git a/pkgs/applications/networking/gns3/gui.nix b/pkgs/applications/networking/gns3/gui.nix index 895df8abfbc7..dfa92a444e0f 100644 --- a/pkgs/applications/networking/gns3/gui.nix +++ b/pkgs/applications/networking/gns3/gui.nix @@ -33,7 +33,8 @@ python3.pkgs.buildPythonApplication rec { psutil sentry-sdk setuptools - sip4 (pyqt5.override { withWebSockets = true; }) + sip + (pyqt5.override { withWebSockets = true; }) truststore qt5.qtwayland ] ++ lib.optionals (pythonOlder "3.9") [ diff --git a/pkgs/applications/networking/ids/zeek/broker/default.nix b/pkgs/applications/networking/ids/zeek/broker/default.nix index 1e9b6f3f0c08..4c0b673c098a 100644 --- a/pkgs/applications/networking/ids/zeek/broker/default.nix +++ b/pkgs/applications/networking/ids/zeek/broker/default.nix @@ -1,9 +1,7 @@ { stdenv , lib -, callPackage , fetchFromGitHub , cmake -, pkg-config , python3 , caf , openssl diff --git a/pkgs/applications/networking/instant-messengers/bitlbee-discord/default.nix b/pkgs/applications/networking/instant-messengers/bitlbee-discord/default.nix index 6badb7cda760..a763ed6e81e0 100644 --- a/pkgs/applications/networking/instant-messengers/bitlbee-discord/default.nix +++ b/pkgs/applications/networking/instant-messengers/bitlbee-discord/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchFromGitHub, stdenv, bitlbee, autoreconfHook, pkg-config, glib }: +{ lib, fetchFromGitHub, stdenv, bitlbee, autoreconfHook, pkg-config }: stdenv.mkDerivation rec { pname = "bitlbee-discord"; diff --git a/pkgs/applications/networking/instant-messengers/bitlbee-mastodon/default.nix b/pkgs/applications/networking/instant-messengers/bitlbee-mastodon/default.nix index 3e09a6aa25b8..0e014ea9a790 100644 --- a/pkgs/applications/networking/instant-messengers/bitlbee-mastodon/default.nix +++ b/pkgs/applications/networking/instant-messengers/bitlbee-mastodon/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchgit, stdenv, bitlbee, autoreconfHook, pkg-config, glib }: +{ lib, fetchgit, stdenv, bitlbee, autoreconfHook, pkg-config }: stdenv.mkDerivation rec { pname = "bitlbee-mastodon"; diff --git a/pkgs/applications/networking/instant-messengers/cinny-desktop/Cargo.lock b/pkgs/applications/networking/instant-messengers/cinny-desktop/Cargo.lock deleted file mode 100644 index 07f897d9fa66..000000000000 --- a/pkgs/applications/networking/instant-messengers/cinny-desktop/Cargo.lock +++ /dev/null @@ -1,4801 +0,0 @@ -# This file is automatically @generated by Cargo. -# It is not intended for manual editing. -version = 3 - -[[package]] -name = "adler" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" - -[[package]] -name = "aho-corasick" -version = "0.7.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc936419f96fa211c1b9166887b38e5e40b19958e5b895be7c1f93adec7071ac" -dependencies = [ - "memchr", -] - -[[package]] -name = "aho-corasick" -version = "1.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2969dcb958b36655471fc61f7e416fa76033bdd4bfed0678d8fee1e2d07a1f0" -dependencies = [ - "memchr", -] - -[[package]] -name = "alloc-no-stdlib" -version = "2.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc7bb162ec39d46ab1ca8c77bf72e890535becd1751bb45f64c597edb4c8c6b3" - -[[package]] -name = "alloc-stdlib" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94fb8275041c72129eb51b7d0322c29b8387a0386127718b096429201a5d6ece" -dependencies = [ - "alloc-no-stdlib", -] - -[[package]] -name = "android-tzdata" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e999941b234f3131b00bc13c22d06e8c5ff726d1b6318ac7eb276997bbb4fef0" - -[[package]] -name = "android_system_properties" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "819e7219dbd41043ac279b19830f2efc897156490d7fd6ea916720117ee66311" -dependencies = [ - "libc", -] - -[[package]] -name = "anyhow" -version = "1.0.66" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "216261ddc8289130e551ddcd5ce8a064710c0d064a4d2895c67151c92b5443f6" - -[[package]] -name = "async-broadcast" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7c48ccdbf6ca6b121e0f586cbc0e73ae440e56c67c30fa0873b4e110d9c26d2b" -dependencies = [ - "event-listener", - "futures-core", -] - -[[package]] -name = "async-channel" -version = "1.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81953c529336010edd6d8e358f886d9581267795c61b19475b71314bffa46d35" -dependencies = [ - "concurrent-queue", - "event-listener", - "futures-core", -] - -[[package]] -name = "async-executor" -version = "1.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b0c4a4f319e45986f347ee47fef8bf5e81c9abc3f6f58dc2391439f30df65f0" -dependencies = [ - "async-lock", - "async-task", - "concurrent-queue", - "fastrand 2.0.1", - "futures-lite", - "slab", -] - -[[package]] -name = "async-fs" -version = "1.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "279cf904654eeebfa37ac9bb1598880884924aab82e290aa65c9e77a0e142e06" -dependencies = [ - "async-lock", - "autocfg", - "blocking", - "futures-lite", -] - -[[package]] -name = "async-io" -version = "1.13.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fc5b45d93ef0529756f812ca52e44c221b35341892d3dcc34132ac02f3dd2af" -dependencies = [ - "async-lock", - "autocfg", - "cfg-if", - "concurrent-queue", - "futures-lite", - "log", - "parking", - "polling", - "rustix", - "slab", - "socket2", - "waker-fn", -] - -[[package]] -name = "async-lock" -version = "2.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "287272293e9d8c41773cec55e365490fe034813a2f172f502d6ddcf75b2f582b" -dependencies = [ - "event-listener", -] - -[[package]] -name = "async-process" -version = "1.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a9d28b1d97e08915212e2e45310d47854eafa69600756fc735fb788f75199c9" -dependencies = [ - "async-io", - "async-lock", - "autocfg", - "blocking", - "cfg-if", - "event-listener", - "futures-lite", - "rustix", - "signal-hook", - "windows-sys 0.48.0", -] - -[[package]] -name = "async-recursion" -version = "1.0.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5fd55a5ba1179988837d24ab4c7cc8ed6efdeff578ede0416b4225a5fca35bd0" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.38", -] - -[[package]] -name = "async-task" -version = "4.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4eb2cdb97421e01129ccb49169d8279ed21e829929144f4a22a6e54ac549ca1" - -[[package]] -name = "async-trait" -version = "0.1.74" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a66537f1bb974b254c98ed142ff995236e81b9d0fe4db0575f46612cb15eb0f9" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.38", -] - -[[package]] -name = "atk" -version = "0.15.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c3d816ce6f0e2909a96830d6911c2aff044370b1ef92d7f267b43bae5addedd" -dependencies = [ - "atk-sys", - "bitflags", - "glib", - "libc", -] - -[[package]] -name = "atk-sys" -version = "0.15.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "58aeb089fb698e06db8089971c7ee317ab9644bade33383f63631437b03aafb6" -dependencies = [ - "glib-sys", - "gobject-sys", - "libc", - "system-deps 6.0.3", -] - -[[package]] -name = "atomic-waker" -version = "1.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0" - -[[package]] -name = "autocfg" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" - -[[package]] -name = "base64" -version = "0.13.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" - -[[package]] -name = "base64" -version = "0.21.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "35636a1494ede3b646cc98f74f8e62c773a38a659ebc777a2cf26b9b74171df9" - -[[package]] -name = "bitflags" -version = "1.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" - -[[package]] -name = "block" -version = "0.1.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d8c1fef690941d3e7788d328517591fecc684c084084702d6ff1641e993699a" - -[[package]] -name = "block-buffer" -version = "0.10.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "69cce20737498f97b993470a6e536b8523f0af7892a4f928cceb1ac5e52ebe7e" -dependencies = [ - "generic-array", -] - -[[package]] -name = "blocking" -version = "1.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77231a1c8f801696fc0123ec6150ce92cffb8e164a02afb9c8ddee0e9b65ad65" -dependencies = [ - "async-channel", - "async-lock", - "async-task", - "atomic-waker", - "fastrand 1.8.0", - "futures-lite", - "log", -] - -[[package]] -name = "brotli" -version = "3.3.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1a0b1dbcc8ae29329621f8d4f0d835787c1c38bb1401979b49d13b0b305ff68" -dependencies = [ - "alloc-no-stdlib", - "alloc-stdlib", - "brotli-decompressor", -] - -[[package]] -name = "brotli-decompressor" -version = "2.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59ad2d4653bf5ca36ae797b1f4bb4dbddb60ce49ca4aed8a2ce4829f60425b80" -dependencies = [ - "alloc-no-stdlib", - "alloc-stdlib", -] - -[[package]] -name = "bstr" -version = "0.2.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba3569f383e8f1598449f1a423e72e99569137b47740b1da11ef19af3d5c3223" -dependencies = [ - "memchr", -] - -[[package]] -name = "bumpalo" -version = "3.11.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "572f695136211188308f16ad2ca5c851a712c464060ae6974944458eb83880ba" - -[[package]] -name = "bytemuck" -version = "1.12.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aaa3a8d9a1ca92e282c96a32d6511b695d7d994d1d102ba85d279f9b2756947f" - -[[package]] -name = "byteorder" -version = "1.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610" - -[[package]] -name = "bytes" -version = "1.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dfb24e866b15a1af2a1b663f10c6b6b8f397a84aadb828f12e5b289ec23a3a3c" -dependencies = [ - "serde", -] - -[[package]] -name = "cairo-rs" -version = "0.15.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c76ee391b03d35510d9fa917357c7f1855bd9a6659c95a1b392e33f49b3369bc" -dependencies = [ - "bitflags", - "cairo-sys-rs", - "glib", - "libc", - "thiserror", -] - -[[package]] -name = "cairo-sys-rs" -version = "0.15.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c55d429bef56ac9172d25fecb85dc8068307d17acd74b377866b7a1ef25d3c8" -dependencies = [ - "glib-sys", - "libc", - "system-deps 6.0.3", -] - -[[package]] -name = "cargo_toml" -version = "0.15.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "599aa35200ffff8f04c1925aa1acc92fa2e08874379ef42e210a80e527e60838" -dependencies = [ - "serde", - "toml 0.7.8", -] - -[[package]] -name = "cc" -version = "1.0.83" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0" -dependencies = [ - "libc", -] - -[[package]] -name = "cesu8" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d43a04d8753f35258c91f8ec639f792891f748a1edbd759cf1dcea3382ad83c" - -[[package]] -name = "cfb" -version = "0.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d38f2da7a0a2c4ccf0065be06397cc26a81f4e528be095826eee9d4adbb8c60f" -dependencies = [ - "byteorder", - "fnv", - "uuid", -] - -[[package]] -name = "cfg-expr" -version = "0.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3431df59f28accaf4cb4eed4a9acc66bea3f3c3753aa6cdc2f024174ef232af7" -dependencies = [ - "smallvec", -] - -[[package]] -name = "cfg-expr" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0357a6402b295ca3a86bc148e84df46c02e41f41fef186bda662557ef6328aa" -dependencies = [ - "smallvec", -] - -[[package]] -name = "cfg-if" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" - -[[package]] -name = "chrono" -version = "0.4.31" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f2c685bad3eb3d45a01354cedb7d5faa66194d1d58ba6e267a8de788f79db38" -dependencies = [ - "android-tzdata", - "iana-time-zone", - "num-traits", - "serde", - "windows-targets 0.48.5", -] - -[[package]] -name = "cinny" -version = "3.2.0" -dependencies = [ - "serde", - "serde_json", - "tauri", - "tauri-build", -] - -[[package]] -name = "cocoa" -version = "0.24.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f425db7937052c684daec3bd6375c8abe2d146dca4b8b143d6db777c39138f3a" -dependencies = [ - "bitflags", - "block", - "cocoa-foundation", - "core-foundation", - "core-graphics", - "foreign-types", - "libc", - "objc", -] - -[[package]] -name = "cocoa-foundation" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ade49b65d560ca58c403a479bb396592b155c0185eada742ee323d1d68d6318" -dependencies = [ - "bitflags", - "block", - "core-foundation", - "core-graphics-types", - "foreign-types", - "libc", - "objc", -] - -[[package]] -name = "color_quant" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d7b894f5411737b7867f4827955924d7c254fc9f4d91a6aad6b097804b1018b" - -[[package]] -name = "combine" -version = "4.6.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "35ed6e9d84f0b51a7f52daf1c7d71dd136fd7a3f41a8462b8cdb8c78d920fad4" -dependencies = [ - "bytes", - "memchr", -] - -[[package]] -name = "concurrent-queue" -version = "2.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f057a694a54f12365049b0958a1685bb52d567f5593b355fbf685838e873d400" -dependencies = [ - "crossbeam-utils", -] - -[[package]] -name = "convert_case" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6245d59a3e82a7fc217c5828a6692dbc6dfb63a0c8c90495621f7b9d79704a0e" - -[[package]] -name = "core-foundation" -version = "0.9.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "194a7a9e6de53fa55116934067c844d9d749312f75c6f6d0980e8c252f8c2146" -dependencies = [ - "core-foundation-sys", - "libc", -] - -[[package]] -name = "core-foundation-sys" -version = "0.8.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5827cebf4670468b8772dd191856768aedcb1b0278a04f989f7766351917b9dc" - -[[package]] -name = "core-graphics" -version = "0.22.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2581bbab3b8ffc6fcbd550bf46c355135d16e9ff2a6ea032ad6b9bf1d7efe4fb" -dependencies = [ - "bitflags", - "core-foundation", - "core-graphics-types", - "foreign-types", - "libc", -] - -[[package]] -name = "core-graphics-types" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3a68b68b3446082644c91ac778bf50cd4104bfb002b5a6a7c44cca5a2c70788b" -dependencies = [ - "bitflags", - "core-foundation", - "foreign-types", - "libc", -] - -[[package]] -name = "cpufeatures" -version = "0.2.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28d997bd5e24a5928dd43e46dc529867e207907fe0b239c3477d924f7f2ca320" -dependencies = [ - "libc", -] - -[[package]] -name = "crc32fast" -version = "1.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b540bd8bc810d3885c6ea91e2018302f68baba2129ab3e88f32389ee9370880d" -dependencies = [ - "cfg-if", -] - -[[package]] -name = "crossbeam-channel" -version = "0.5.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c2dd04ddaf88237dc3b8d8f9a3c1004b506b54b3313403944054d23c0870c521" -dependencies = [ - "cfg-if", - "crossbeam-utils", -] - -[[package]] -name = "crossbeam-utils" -version = "0.8.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fb766fa798726286dbbb842f174001dab8abc7b627a1dd86e0b7222a95d929f" -dependencies = [ - "cfg-if", -] - -[[package]] -name = "crypto-common" -version = "0.1.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3" -dependencies = [ - "generic-array", - "typenum", -] - -[[package]] -name = "cssparser" -version = "0.27.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "754b69d351cdc2d8ee09ae203db831e005560fc6030da058f86ad60c92a9cb0a" -dependencies = [ - "cssparser-macros", - "dtoa-short", - "itoa 0.4.8", - "matches", - "phf 0.8.0", - "proc-macro2", - "quote", - "smallvec", - "syn 1.0.105", -] - -[[package]] -name = "cssparser-macros" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dfae75de57f2b2e85e8768c3ea840fd159c8f33e2b6522c7835b7abac81be16e" -dependencies = [ - "quote", - "syn 1.0.105", -] - -[[package]] -name = "ctor" -version = "0.1.26" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d2301688392eb071b0bf1a37be05c469d3cc4dbbd95df672fe28ab021e6a096" -dependencies = [ - "quote", - "syn 1.0.105", -] - -[[package]] -name = "cty" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b365fabc795046672053e29c954733ec3b05e4be654ab130fe8f1f94d7051f35" - -[[package]] -name = "darling" -version = "0.20.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0209d94da627ab5605dcccf08bb18afa5009cfbef48d8a8b7d7bdbc79be25c5e" -dependencies = [ - "darling_core", - "darling_macro", -] - -[[package]] -name = "darling_core" -version = "0.20.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "177e3443818124b357d8e76f53be906d60937f0d3a90773a664fa63fa253e621" -dependencies = [ - "fnv", - "ident_case", - "proc-macro2", - "quote", - "strsim", - "syn 2.0.38", -] - -[[package]] -name = "darling_macro" -version = "0.20.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "836a9bbc7ad63342d6d6e7b815ccab164bc77a2d95d84bc3117a8c0d5c98e2d5" -dependencies = [ - "darling_core", - "quote", - "syn 2.0.38", -] - -[[package]] -name = "derivative" -version = "2.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fcc3dd5e9e9c0b295d6e1e4d811fb6f157d5ffd784b8d202fc62eac8035a770b" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.105", -] - -[[package]] -name = "derive_more" -version = "0.99.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fb810d30a7c1953f91334de7244731fc3f3c10d7fe163338a35b9f640960321" -dependencies = [ - "convert_case", - "proc-macro2", - "quote", - "rustc_version 0.4.0", - "syn 1.0.105", -] - -[[package]] -name = "digest" -version = "0.10.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8168378f4e5023e7218c89c891c0fd8ecdb5e5e4f18cb78f38cf245dd021e76f" -dependencies = [ - "block-buffer", - "crypto-common", -] - -[[package]] -name = "dirs-next" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b98cf8ebf19c3d1b223e151f99a4f9f0690dca41414773390fc824184ac833e1" -dependencies = [ - "cfg-if", - "dirs-sys-next", -] - -[[package]] -name = "dirs-sys-next" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ebda144c4fe02d1f7ea1a7d9641b6fc6b580adcfa024ae48797ecdeb6825b4d" -dependencies = [ - "libc", - "redox_users", - "winapi", -] - -[[package]] -name = "dispatch" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd0c93bb4b0c6d9b77f4435b0ae98c24d17f1c45b2ff844c6151a07256ca923b" - -[[package]] -name = "dtoa" -version = "0.4.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56899898ce76aaf4a0f24d914c97ea6ed976d42fec6ad33fcbb0a1103e07b2b0" - -[[package]] -name = "dtoa-short" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bde03329ae10e79ede66c9ce4dc930aa8599043b0743008548680f25b91502d6" -dependencies = [ - "dtoa", -] - -[[package]] -name = "dunce" -version = "1.0.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0bd4b30a6560bbd9b4620f4de34c3f14f60848e58a9b7216801afcb4c7b31c3c" - -[[package]] -name = "embed-resource" -version = "2.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f54cc3e827ee1c3812239a9a41dede7b4d7d5d5464faa32d71bd7cba28ce2cb2" -dependencies = [ - "cc", - "rustc_version 0.4.0", - "toml 0.8.5", - "vswhom", - "winreg 0.51.0", -] - -[[package]] -name = "embed_plist" -version = "1.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ef6b89e5b37196644d8796de5268852ff179b44e96276cf4290264843743bb7" - -[[package]] -name = "encoding_rs" -version = "0.8.31" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9852635589dc9f9ea1b6fe9f05b50ef208c85c834a562f0c6abb1c475736ec2b" -dependencies = [ - "cfg-if", -] - -[[package]] -name = "enumflags2" -version = "0.7.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5998b4f30320c9d93aed72f63af821bfdac50465b75428fce77b48ec482c3939" -dependencies = [ - "enumflags2_derive", - "serde", -] - -[[package]] -name = "enumflags2_derive" -version = "0.7.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f95e2801cd355d4a1a3e3953ce6ee5ae9603a5c833455343a8bfe3f44d418246" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.38", -] - -[[package]] -name = "equivalent" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" - -[[package]] -name = "errno" -version = "0.3.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac3e13f66a2f95e32a39eaa81f6b95d42878ca0e1db0c7543723dfe12557e860" -dependencies = [ - "libc", - "windows-sys 0.48.0", -] - -[[package]] -name = "event-listener" -version = "2.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0" - -[[package]] -name = "fastrand" -version = "1.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7a407cfaa3385c4ae6b23e84623d48c2798d06e3e6a1878f7f59f17b3f86499" -dependencies = [ - "instant", -] - -[[package]] -name = "fastrand" -version = "2.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25cbce373ec4653f1a01a31e8a5e5ec0c622dc27ff9c4e6606eefef5cbbed4a5" - -[[package]] -name = "field-offset" -version = "0.3.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e1c54951450cbd39f3dbcf1005ac413b49487dabf18a720ad2383eccfeffb92" -dependencies = [ - "memoffset 0.6.5", - "rustc_version 0.3.3", -] - -[[package]] -name = "filetime" -version = "0.2.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e884668cd0c7480504233e951174ddc3b382f7c2666e3b7310b5c4e7b0c37f9" -dependencies = [ - "cfg-if", - "libc", - "redox_syscall", - "windows-sys 0.42.0", -] - -[[package]] -name = "flate2" -version = "1.0.25" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8a2db397cb1c8772f31494cb8917e48cd1e64f0fa7efac59fbd741a0a8ce841" -dependencies = [ - "crc32fast", - "miniz_oxide", -] - -[[package]] -name = "fnv" -version = "1.0.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" - -[[package]] -name = "foreign-types" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1" -dependencies = [ - "foreign-types-shared", -] - -[[package]] -name = "foreign-types-shared" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" - -[[package]] -name = "form_urlencoded" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a9c384f161156f5260c24a097c56119f9be8c798586aecc13afbcbe7b7e26bf8" -dependencies = [ - "percent-encoding", -] - -[[package]] -name = "futf" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df420e2e84819663797d1ec6544b13c5be84629e7bb00dc960d6917db2987843" -dependencies = [ - "mac", - "new_debug_unreachable", -] - -[[package]] -name = "futures-channel" -version = "0.3.25" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "52ba265a92256105f45b719605a571ffe2d1f0fea3807304b522c1d778f79eed" -dependencies = [ - "futures-core", -] - -[[package]] -name = "futures-core" -version = "0.3.25" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04909a7a7e4633ae6c4a9ab280aeb86da1236243a77b694a49eacd659a4bd3ac" - -[[package]] -name = "futures-executor" -version = "0.3.25" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7acc85df6714c176ab5edf386123fafe217be88c0840ec11f199441134a074e2" -dependencies = [ - "futures-core", - "futures-task", - "futures-util", -] - -[[package]] -name = "futures-io" -version = "0.3.25" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "00f5fb52a06bdcadeb54e8d3671f8888a39697dcb0b81b23b55174030427f4eb" - -[[package]] -name = "futures-lite" -version = "1.13.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49a9d51ce47660b1e808d3c990b4709f2f415d928835a17dfd16991515c46bce" -dependencies = [ - "fastrand 1.8.0", - "futures-core", - "futures-io", - "memchr", - "parking", - "pin-project-lite", - "waker-fn", -] - -[[package]] -name = "futures-macro" -version = "0.3.25" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bdfb8ce053d86b91919aad980c220b1fb8401a9394410e1c289ed7e66b61835d" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.105", -] - -[[package]] -name = "futures-sink" -version = "0.3.29" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e36d3378ee38c2a36ad710c5d30c2911d752cb941c00c72dbabfb786a7970817" - -[[package]] -name = "futures-task" -version = "0.3.25" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2ffb393ac5d9a6eaa9d3fdf37ae2776656b706e200c8e16b1bdb227f5198e6ea" - -[[package]] -name = "futures-util" -version = "0.3.25" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "197676987abd2f9cadff84926f410af1c183608d36641465df73ae8211dc65d6" -dependencies = [ - "futures-core", - "futures-io", - "futures-macro", - "futures-sink", - "futures-task", - "memchr", - "pin-project-lite", - "pin-utils", - "slab", -] - -[[package]] -name = "fxhash" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c31b6d751ae2c7f11320402d34e41349dd1016f8d5d45e48c4312bc8625af50c" -dependencies = [ - "byteorder", -] - -[[package]] -name = "gdk" -version = "0.15.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a6e05c1f572ab0e1f15be94217f0dc29088c248b14f792a5ff0af0d84bcda9e8" -dependencies = [ - "bitflags", - "cairo-rs", - "gdk-pixbuf", - "gdk-sys", - "gio", - "glib", - "libc", - "pango", -] - -[[package]] -name = "gdk-pixbuf" -version = "0.15.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad38dd9cc8b099cceecdf41375bb6d481b1b5a7cd5cd603e10a69a9383f8619a" -dependencies = [ - "bitflags", - "gdk-pixbuf-sys", - "gio", - "glib", - "libc", -] - -[[package]] -name = "gdk-pixbuf-sys" -version = "0.15.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "140b2f5378256527150350a8346dbdb08fadc13453a7a2d73aecd5fab3c402a7" -dependencies = [ - "gio-sys", - "glib-sys", - "gobject-sys", - "libc", - "system-deps 6.0.3", -] - -[[package]] -name = "gdk-sys" -version = "0.15.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32e7a08c1e8f06f4177fb7e51a777b8c1689f743a7bc11ea91d44d2226073a88" -dependencies = [ - "cairo-sys-rs", - "gdk-pixbuf-sys", - "gio-sys", - "glib-sys", - "gobject-sys", - "libc", - "pango-sys", - "pkg-config", - "system-deps 6.0.3", -] - -[[package]] -name = "gdkwayland-sys" -version = "0.15.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cca49a59ad8cfdf36ef7330fe7bdfbe1d34323220cc16a0de2679ee773aee2c2" -dependencies = [ - "gdk-sys", - "glib-sys", - "gobject-sys", - "libc", - "pkg-config", - "system-deps 6.0.3", -] - -[[package]] -name = "gdkx11-sys" -version = "0.15.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4b7f8c7a84b407aa9b143877e267e848ff34106578b64d1e0a24bf550716178" -dependencies = [ - "gdk-sys", - "glib-sys", - "libc", - "system-deps 6.0.3", - "x11", -] - -[[package]] -name = "generator" -version = "0.7.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d266041a359dfa931b370ef684cceb84b166beb14f7f0421f4a6a3d0c446d12e" -dependencies = [ - "cc", - "libc", - "log", - "rustversion", - "windows 0.39.0", -] - -[[package]] -name = "generic-array" -version = "0.14.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bff49e947297f3312447abdca79f45f4738097cc82b06e72054d2223f601f1b9" -dependencies = [ - "typenum", - "version_check", -] - -[[package]] -name = "getrandom" -version = "0.1.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8fc3cb4d91f53b50155bdcfd23f6a4c39ae1969c2ae85982b135750cccaf5fce" -dependencies = [ - "cfg-if", - "libc", - "wasi 0.9.0+wasi-snapshot-preview1", -] - -[[package]] -name = "getrandom" -version = "0.2.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c05aeb6a22b8f62540c194aac980f2115af067bfe15a0734d7277a768d396b31" -dependencies = [ - "cfg-if", - "libc", - "wasi 0.11.0+wasi-snapshot-preview1", -] - -[[package]] -name = "gio" -version = "0.15.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68fdbc90312d462781a395f7a16d96a2b379bb6ef8cd6310a2df272771c4283b" -dependencies = [ - "bitflags", - "futures-channel", - "futures-core", - "futures-io", - "gio-sys", - "glib", - "libc", - "once_cell", - "thiserror", -] - -[[package]] -name = "gio-sys" -version = "0.15.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32157a475271e2c4a023382e9cab31c4584ee30a97da41d3c4e9fdd605abcf8d" -dependencies = [ - "glib-sys", - "gobject-sys", - "libc", - "system-deps 6.0.3", - "winapi", -] - -[[package]] -name = "glib" -version = "0.15.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "edb0306fbad0ab5428b0ca674a23893db909a98582969c9b537be4ced78c505d" -dependencies = [ - "bitflags", - "futures-channel", - "futures-core", - "futures-executor", - "futures-task", - "glib-macros", - "glib-sys", - "gobject-sys", - "libc", - "once_cell", - "smallvec", - "thiserror", -] - -[[package]] -name = "glib-macros" -version = "0.15.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25a68131a662b04931e71891fb14aaf65ee4b44d08e8abc10f49e77418c86c64" -dependencies = [ - "anyhow", - "heck 0.4.0", - "proc-macro-crate", - "proc-macro-error", - "proc-macro2", - "quote", - "syn 1.0.105", -] - -[[package]] -name = "glib-sys" -version = "0.15.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef4b192f8e65e9cf76cbf4ea71fa8e3be4a0e18ffe3d68b8da6836974cc5bad4" -dependencies = [ - "libc", - "system-deps 6.0.3", -] - -[[package]] -name = "glob" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b919933a397b79c37e33b77bb2aa3dc8eb6e165ad809e58ff75bc7db2e34574" - -[[package]] -name = "globset" -version = "0.4.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0a1e17342619edbc21a964c2afbeb6c820c6a2560032872f397bb97ea127bd0a" -dependencies = [ - "aho-corasick 0.7.20", - "bstr", - "fnv", - "log", - "regex", -] - -[[package]] -name = "gobject-sys" -version = "0.15.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d57ce44246becd17153bd035ab4d32cfee096a657fc01f2231c9278378d1e0a" -dependencies = [ - "glib-sys", - "libc", - "system-deps 6.0.3", -] - -[[package]] -name = "gtk" -version = "0.15.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "92e3004a2d5d6d8b5057d2b57b3712c9529b62e82c77f25c1fecde1fd5c23bd0" -dependencies = [ - "atk", - "bitflags", - "cairo-rs", - "field-offset", - "futures-channel", - "gdk", - "gdk-pixbuf", - "gio", - "glib", - "gtk-sys", - "gtk3-macros", - "libc", - "once_cell", - "pango", - "pkg-config", -] - -[[package]] -name = "gtk-sys" -version = "0.15.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d5bc2f0587cba247f60246a0ca11fe25fb733eabc3de12d1965fc07efab87c84" -dependencies = [ - "atk-sys", - "cairo-sys-rs", - "gdk-pixbuf-sys", - "gdk-sys", - "gio-sys", - "glib-sys", - "gobject-sys", - "libc", - "pango-sys", - "system-deps 6.0.3", -] - -[[package]] -name = "gtk3-macros" -version = "0.15.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "24f518afe90c23fba585b2d7697856f9e6a7bbc62f65588035e66f6afb01a2e9" -dependencies = [ - "anyhow", - "proc-macro-crate", - "proc-macro-error", - "proc-macro2", - "quote", - "syn 1.0.105", -] - -[[package]] -name = "h2" -version = "0.3.21" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91fc23aa11be92976ef4729127f1a74adf36d8436f7816b185d18df956790833" -dependencies = [ - "bytes", - "fnv", - "futures-core", - "futures-sink", - "futures-util", - "http", - "indexmap 1.9.2", - "slab", - "tokio", - "tokio-util", - "tracing", -] - -[[package]] -name = "hashbrown" -version = "0.12.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" - -[[package]] -name = "hashbrown" -version = "0.14.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f93e7192158dbcda357bdec5fb5788eebf8bbac027f3f33e719d29135ae84156" - -[[package]] -name = "heck" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d621efb26863f0e9924c6ac577e8275e5e6b77455db64ffa6c65c904e9e132c" -dependencies = [ - "unicode-segmentation", -] - -[[package]] -name = "heck" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2540771e65fc8cb83cd6e8a237f70c319bd5c29f78ed1084ba5d50eeac86f7f9" - -[[package]] -name = "hermit-abi" -version = "0.1.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33" -dependencies = [ - "libc", -] - -[[package]] -name = "hermit-abi" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d77f7ec81a6d05a3abb01ab6eb7590f6083d08449fe5a1c8b1e620283546ccb7" - -[[package]] -name = "hex" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" - -[[package]] -name = "html5ever" -version = "0.25.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5c13fb08e5d4dfc151ee5e88bae63f7773d61852f3bdc73c9f4b9e1bde03148" -dependencies = [ - "log", - "mac", - "markup5ever 0.10.1", - "proc-macro2", - "quote", - "syn 1.0.105", -] - -[[package]] -name = "html5ever" -version = "0.26.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bea68cab48b8459f17cf1c944c67ddc572d272d9f2b274140f223ecb1da4a3b7" -dependencies = [ - "log", - "mac", - "markup5ever 0.11.0", - "proc-macro2", - "quote", - "syn 1.0.105", -] - -[[package]] -name = "http" -version = "0.2.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75f43d41e26995c17e71ee126451dd3941010b0514a81a9d11f3b341debc2399" -dependencies = [ - "bytes", - "fnv", - "itoa 1.0.4", -] - -[[package]] -name = "http-body" -version = "0.4.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d5f38f16d184e36f2408a55281cd658ecbd3ca05cce6d6510a176eca393e26d1" -dependencies = [ - "bytes", - "http", - "pin-project-lite", -] - -[[package]] -name = "http-range" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21dec9db110f5f872ed9699c3ecf50cf16f423502706ba5c72462e28d3157573" - -[[package]] -name = "httparse" -version = "1.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d897f394bad6a705d5f4104762e116a75639e470d80901eed05a860a95cb1904" - -[[package]] -name = "httpdate" -version = "1.0.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9" - -[[package]] -name = "hyper" -version = "0.14.27" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffb1cfd654a8219eaef89881fdb3bb3b1cdc5fa75ded05d6933b2b382e395468" -dependencies = [ - "bytes", - "futures-channel", - "futures-core", - "futures-util", - "h2", - "http", - "http-body", - "httparse", - "httpdate", - "itoa 1.0.4", - "pin-project-lite", - "socket2", - "tokio", - "tower-service", - "tracing", - "want", -] - -[[package]] -name = "hyper-tls" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d6183ddfa99b85da61a140bea0efc93fdf56ceaa041b37d553518030827f9905" -dependencies = [ - "bytes", - "hyper", - "native-tls", - "tokio", - "tokio-native-tls", -] - -[[package]] -name = "iana-time-zone" -version = "0.1.58" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8326b86b6cff230b97d0d312a6c40a60726df3332e721f72a1b035f451663b20" -dependencies = [ - "android_system_properties", - "core-foundation-sys", - "iana-time-zone-haiku", - "js-sys", - "wasm-bindgen", - "windows-core", -] - -[[package]] -name = "iana-time-zone-haiku" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f31827a206f56af32e590ba56d5d2d085f558508192593743f16b2306495269f" -dependencies = [ - "cc", -] - -[[package]] -name = "ico" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3804960be0bb5e4edb1e1ad67afd321a9ecfd875c3e65c099468fd2717d7cae" -dependencies = [ - "byteorder", - "png", -] - -[[package]] -name = "ident_case" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39" - -[[package]] -name = "idna" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e14ddfc70884202db2244c223200c204c2bda1bc6e0998d11b5e024d657209e6" -dependencies = [ - "unicode-bidi", - "unicode-normalization", -] - -[[package]] -name = "ignore" -version = "0.4.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "713f1b139373f96a2e0ce3ac931cd01ee973c3c5dd7c40c0c2efe96ad2b6751d" -dependencies = [ - "crossbeam-utils", - "globset", - "lazy_static", - "log", - "memchr", - "regex", - "same-file", - "thread_local", - "walkdir", - "winapi-util", -] - -[[package]] -name = "image" -version = "0.24.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "69b7ea949b537b0fd0af141fff8c77690f2ce96f4f41f042ccb6c69c6c965945" -dependencies = [ - "bytemuck", - "byteorder", - "color_quant", - "num-rational", - "num-traits", -] - -[[package]] -name = "indexmap" -version = "1.9.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1885e79c1fc4b10f0e172c475f458b7f7b93061064d98c3293e98c5ba0c8b399" -dependencies = [ - "autocfg", - "hashbrown 0.12.3", - "serde", -] - -[[package]] -name = "indexmap" -version = "2.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8adf3ddd720272c6ea8bf59463c04e0f93d0bbf7c5439b691bca2987e0270897" -dependencies = [ - "equivalent", - "hashbrown 0.14.2", - "serde", -] - -[[package]] -name = "infer" -version = "0.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a898e4b7951673fce96614ce5751d13c40fc5674bc2d759288e46c3ab62598b3" -dependencies = [ - "cfb", -] - -[[package]] -name = "instant" -version = "0.1.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c" -dependencies = [ - "cfg-if", -] - -[[package]] -name = "io-lifetimes" -version = "1.0.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eae7b9aee968036d54dce06cebaefd919e4472e753296daccd6d344e3e2df0c2" -dependencies = [ - "hermit-abi 0.3.3", - "libc", - "windows-sys 0.48.0", -] - -[[package]] -name = "ipnet" -version = "2.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f518f335dce6725a761382244631d86cf0ccb2863413590b31338feb467f9c3" - -[[package]] -name = "itoa" -version = "0.4.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b71991ff56294aa922b450139ee08b3bfc70982c6b2c7562771375cf73542dd4" - -[[package]] -name = "itoa" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4217ad341ebadf8d8e724e264f13e593e0648f5b3e94b3896a5df283be015ecc" - -[[package]] -name = "javascriptcore-rs" -version = "0.16.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf053e7843f2812ff03ef5afe34bb9c06ffee120385caad4f6b9967fcd37d41c" -dependencies = [ - "bitflags", - "glib", - "javascriptcore-rs-sys", -] - -[[package]] -name = "javascriptcore-rs-sys" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "905fbb87419c5cde6e3269537e4ea7d46431f3008c5d057e915ef3f115e7793c" -dependencies = [ - "glib-sys", - "gobject-sys", - "libc", - "system-deps 5.0.0", -] - -[[package]] -name = "jni" -version = "0.20.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "039022cdf4d7b1cf548d31f60ae783138e5fd42013f6271049d7df7afadef96c" -dependencies = [ - "cesu8", - "combine", - "jni-sys", - "log", - "thiserror", - "walkdir", -] - -[[package]] -name = "jni-sys" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8eaf4bc02d17cbdd7ff4c7438cafcdf7fb9a4613313ad11b4f8fefe7d3fa0130" - -[[package]] -name = "js-sys" -version = "0.3.60" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49409df3e3bf0856b916e2ceaca09ee28e6871cf7d9ce97a692cacfdb2a25a47" -dependencies = [ - "wasm-bindgen", -] - -[[package]] -name = "json-patch" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "55ff1e1486799e3f64129f8ccad108b38290df9cd7015cd31bed17239f0789d6" -dependencies = [ - "serde", - "serde_json", - "thiserror", - "treediff", -] - -[[package]] -name = "kuchiki" -version = "0.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ea8e9c6e031377cff82ee3001dc8026cdf431ed4e2e6b51f98ab8c73484a358" -dependencies = [ - "cssparser", - "html5ever 0.25.2", - "matches", - "selectors", -] - -[[package]] -name = "kuchikiki" -version = "0.8.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f29e4755b7b995046f510a7520c42b2fed58b77bd94d5a87a8eb43d2fd126da8" -dependencies = [ - "cssparser", - "html5ever 0.26.0", - "indexmap 1.9.2", - "matches", - "selectors", -] - -[[package]] -name = "lazy_static" -version = "1.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" - -[[package]] -name = "libappindicator" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db2d3cb96d092b4824cb306c9e544c856a4cb6210c1081945187f7f1924b47e8" -dependencies = [ - "glib", - "gtk", - "gtk-sys", - "libappindicator-sys", - "log", -] - -[[package]] -name = "libappindicator-sys" -version = "0.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1b3b6681973cea8cc3bce7391e6d7d5502720b80a581c9a95c9cbaf592826aa" -dependencies = [ - "gtk-sys", - "libloading", - "once_cell", -] - -[[package]] -name = "libc" -version = "0.2.149" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a08173bc88b7955d1b3145aa561539096c421ac8debde8cbc3612ec635fee29b" - -[[package]] -name = "libloading" -version = "0.7.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b67380fd3b2fbe7527a606e18729d21c6f3951633d0500574c4dc22d2d638b9f" -dependencies = [ - "cfg-if", - "winapi", -] - -[[package]] -name = "line-wrap" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f30344350a2a51da54c1d53be93fade8a237e545dbcc4bdbe635413f2117cab9" -dependencies = [ - "safemem", -] - -[[package]] -name = "linux-raw-sys" -version = "0.3.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519" - -[[package]] -name = "lock_api" -version = "0.4.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "435011366fe56583b16cf956f9df0095b405b82d76425bc8981c0e22e60ec4df" -dependencies = [ - "autocfg", - "scopeguard", -] - -[[package]] -name = "log" -version = "0.4.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f" - -[[package]] -name = "loom" -version = "0.5.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff50ecb28bb86013e935fb6683ab1f6d3a20016f123c76fd4c27470076ac30f5" -dependencies = [ - "cfg-if", - "generator", - "scoped-tls", - "serde", - "serde_json", - "tracing", - "tracing-subscriber", -] - -[[package]] -name = "mac" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c41e0c4fef86961ac6d6f8a82609f55f31b05e4fce149ac5710e439df7619ba4" - -[[package]] -name = "mac-notification-sys" -version = "0.5.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3e72d50edb17756489e79d52eb146927bec8eba9dd48faadf9ef08bca3791ad5" -dependencies = [ - "cc", - "dirs-next", - "objc-foundation", - "objc_id", - "time", -] - -[[package]] -name = "malloc_buf" -version = "0.0.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62bb907fe88d54d8d9ce32a3cceab4218ed2f6b7d35617cafe9adf84e43919cb" -dependencies = [ - "libc", -] - -[[package]] -name = "markup5ever" -version = "0.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a24f40fb03852d1cdd84330cddcaf98e9ec08a7b7768e952fad3b4cf048ec8fd" -dependencies = [ - "log", - "phf 0.8.0", - "phf_codegen 0.8.0", - "string_cache", - "string_cache_codegen", - "tendril", -] - -[[package]] -name = "markup5ever" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a2629bb1404f3d34c2e921f21fd34ba00b206124c81f65c50b43b6aaefeb016" -dependencies = [ - "log", - "phf 0.10.1", - "phf_codegen 0.10.0", - "string_cache", - "string_cache_codegen", - "tendril", -] - -[[package]] -name = "matchers" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8263075bb86c5a1b1427b5ae862e8889656f126e9f77c484496e8b47cf5c5558" -dependencies = [ - "regex-automata 0.1.10", -] - -[[package]] -name = "matches" -version = "0.1.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3e378b66a060d48947b590737b30a1be76706c8dd7b8ba0f2fe3989c68a853f" - -[[package]] -name = "memchr" -version = "2.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" - -[[package]] -name = "memoffset" -version = "0.6.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5aa361d4faea93603064a027415f07bd8e1d5c88c9fbf68bf56a285428fd79ce" -dependencies = [ - "autocfg", -] - -[[package]] -name = "memoffset" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5de893c32cde5f383baa4c04c5d6dbdd735cfd4a794b0debdb2bb1b421da5ff4" -dependencies = [ - "autocfg", -] - -[[package]] -name = "mime" -version = "0.3.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a" - -[[package]] -name = "minisign-verify" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "933dca44d65cdd53b355d0b73d380a2ff5da71f87f036053188bf1eab6a19881" - -[[package]] -name = "miniz_oxide" -version = "0.6.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b275950c28b37e794e8c55d88aeb5e139d0ce23fdbbeda68f8d7174abdf9e8fa" -dependencies = [ - "adler", -] - -[[package]] -name = "mio" -version = "0.8.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3dce281c5e46beae905d4de1870d8b1509a9142b62eedf18b443b011ca8343d0" -dependencies = [ - "libc", - "log", - "wasi 0.11.0+wasi-snapshot-preview1", - "windows-sys 0.48.0", -] - -[[package]] -name = "native-tls" -version = "0.2.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07226173c32f2926027b63cce4bcd8076c3552846cbe7925f3aaffeac0a3b92e" -dependencies = [ - "lazy_static", - "libc", - "log", - "openssl", - "openssl-probe", - "openssl-sys", - "schannel", - "security-framework", - "security-framework-sys", - "tempfile", -] - -[[package]] -name = "ndk" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2032c77e030ddee34a6787a64166008da93f6a352b629261d0fee232b8742dd4" -dependencies = [ - "bitflags", - "jni-sys", - "ndk-sys", - "num_enum", - "thiserror", -] - -[[package]] -name = "ndk-context" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "27b02d87554356db9e9a873add8782d4ea6e3e58ea071a9adb9a2e8ddb884a8b" - -[[package]] -name = "ndk-sys" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e5a6ae77c8ee183dcbbba6150e2e6b9f3f4196a7666c02a715a95692ec1fa97" -dependencies = [ - "jni-sys", -] - -[[package]] -name = "new_debug_unreachable" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e4a24736216ec316047a1fc4252e27dabb04218aa4a3f37c6e7ddbf1f9782b54" - -[[package]] -name = "nix" -version = "0.26.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "598beaf3cc6fdd9a5dfb1630c2800c7acd31df7aaf0f565796fba2b53ca1af1b" -dependencies = [ - "bitflags", - "cfg-if", - "libc", - "memoffset 0.7.1", -] - -[[package]] -name = "nodrop" -version = "0.1.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72ef4a56884ca558e5ddb05a1d1e7e1bfd9a68d9ed024c21704cc98872dae1bb" - -[[package]] -name = "notify-rust" -version = "4.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5cc2e370356160e41aba3fd0fbac26d86a89ddd2ac4300c03de999a77cfa2509" -dependencies = [ - "mac-notification-sys", - "serde", - "tauri-winrt-notification", - "zbus", - "zvariant", - "zvariant_derive", -] - -[[package]] -name = "nu-ansi-term" -version = "0.46.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77a8165726e8236064dbb45459242600304b42a5ea24ee2948e18e023bf7ba84" -dependencies = [ - "overload", - "winapi", -] - -[[package]] -name = "num-integer" -version = "0.1.45" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "225d3389fb3509a24c93f5c29eb6bde2586b98d9f016636dff58d7c6f7569cd9" -dependencies = [ - "autocfg", - "num-traits", -] - -[[package]] -name = "num-rational" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0638a1c9d0a3c0914158145bc76cff373a75a627e6ecbfb71cbe6f453a5a19b0" -dependencies = [ - "autocfg", - "num-integer", - "num-traits", -] - -[[package]] -name = "num-traits" -version = "0.2.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "578ede34cf02f8924ab9447f50c28075b4d3e5b269972345e7e0372b38c6cdcd" -dependencies = [ - "autocfg", -] - -[[package]] -name = "num_cpus" -version = "1.14.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6058e64324c71e02bc2b150e4f3bc8286db6c83092132ffa3f6b1eab0f9def5" -dependencies = [ - "hermit-abi 0.1.19", - "libc", -] - -[[package]] -name = "num_enum" -version = "0.5.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf5395665662ef45796a4ff5486c5d41d29e0c09640af4c5f17fd94ee2c119c9" -dependencies = [ - "num_enum_derive", -] - -[[package]] -name = "num_enum_derive" -version = "0.5.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b0498641e53dd6ac1a4f22547548caa6864cc4933784319cd1775271c5a46ce" -dependencies = [ - "proc-macro-crate", - "proc-macro2", - "quote", - "syn 1.0.105", -] - -[[package]] -name = "objc" -version = "0.2.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "915b1b472bc21c53464d6c8461c9d3af805ba1ef837e1cac254428f4a77177b1" -dependencies = [ - "malloc_buf", - "objc_exception", -] - -[[package]] -name = "objc-foundation" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1add1b659e36c9607c7aab864a76c7a4c2760cd0cd2e120f3fb8b952c7e22bf9" -dependencies = [ - "block", - "objc", - "objc_id", -] - -[[package]] -name = "objc_exception" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad970fb455818ad6cba4c122ad012fae53ae8b4795f86378bce65e4f6bab2ca4" -dependencies = [ - "cc", -] - -[[package]] -name = "objc_id" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c92d4ddb4bd7b50d730c215ff871754d0da6b2178849f8a2a2ab69712d0c073b" -dependencies = [ - "objc", -] - -[[package]] -name = "once_cell" -version = "1.16.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86f0b0d4bf799edbc74508c1e8bf170ff5f41238e5f8225603ca7caaae2b7860" - -[[package]] -name = "open" -version = "3.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2078c0039e6a54a0c42c28faa984e115fb4c2d5bf2208f77d1961002df8576f8" -dependencies = [ - "pathdiff", - "windows-sys 0.42.0", -] - -[[package]] -name = "openssl" -version = "0.10.44" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "29d971fd5722fec23977260f6e81aa67d2f22cadbdc2aa049f1022d9a3be1566" -dependencies = [ - "bitflags", - "cfg-if", - "foreign-types", - "libc", - "once_cell", - "openssl-macros", - "openssl-sys", -] - -[[package]] -name = "openssl-macros" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b501e44f11665960c7e7fcf062c7d96a14ade4aa98116c004b2e37b5be7d736c" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.105", -] - -[[package]] -name = "openssl-probe" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" - -[[package]] -name = "openssl-sys" -version = "0.9.79" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5454462c0eced1e97f2ec09036abc8da362e66802f66fd20f86854d9d8cbcbc4" -dependencies = [ - "autocfg", - "cc", - "libc", - "pkg-config", - "vcpkg", -] - -[[package]] -name = "ordered-stream" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9aa2b01e1d916879f73a53d01d1d6cee68adbb31d6d9177a8cfce093cced1d50" -dependencies = [ - "futures-core", - "pin-project-lite", -] - -[[package]] -name = "os_info" -version = "3.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4750134fb6a5d49afc80777394ad5d95b04bc12068c6abb92fae8f43817270f" -dependencies = [ - "log", - "serde", - "winapi", -] - -[[package]] -name = "os_pipe" -version = "1.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c6a252f1f8c11e84b3ab59d7a488e48e4478a93937e027076638c49536204639" -dependencies = [ - "libc", - "windows-sys 0.42.0", -] - -[[package]] -name = "overload" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39" - -[[package]] -name = "pango" -version = "0.15.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22e4045548659aee5313bde6c582b0d83a627b7904dd20dc2d9ef0895d414e4f" -dependencies = [ - "bitflags", - "glib", - "libc", - "once_cell", - "pango-sys", -] - -[[package]] -name = "pango-sys" -version = "0.15.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2a00081cde4661982ed91d80ef437c20eacaf6aa1a5962c0279ae194662c3aa" -dependencies = [ - "glib-sys", - "gobject-sys", - "libc", - "system-deps 6.0.3", -] - -[[package]] -name = "parking" -version = "2.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb813b8af86854136c6922af0598d719255ecb2179515e6e7730d468f05c9cae" - -[[package]] -name = "parking_lot" -version = "0.12.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f" -dependencies = [ - "lock_api", - "parking_lot_core", -] - -[[package]] -name = "parking_lot_core" -version = "0.9.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ff9f3fef3968a3ec5945535ed654cb38ff72d7495a25619e2247fb15a2ed9ba" -dependencies = [ - "cfg-if", - "libc", - "redox_syscall", - "smallvec", - "windows-sys 0.42.0", -] - -[[package]] -name = "pathdiff" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8835116a5c179084a830efb3adc117ab007512b535bc1a21c991d3b32a6b44dd" - -[[package]] -name = "percent-encoding" -version = "2.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "478c572c3d73181ff3c2539045f6eb99e5491218eae919370993b890cdbdd98e" - -[[package]] -name = "pest" -version = "2.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc8bed3549e0f9b0a2a78bf7c0018237a2cdf085eecbbc048e52612438e4e9d0" -dependencies = [ - "thiserror", - "ucd-trie", -] - -[[package]] -name = "phf" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3dfb61232e34fcb633f43d12c58f83c1df82962dcdfa565a4e866ffc17dafe12" -dependencies = [ - "phf_macros 0.8.0", - "phf_shared 0.8.0", - "proc-macro-hack", -] - -[[package]] -name = "phf" -version = "0.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fabbf1ead8a5bcbc20f5f8b939ee3f5b0f6f281b6ad3468b84656b658b455259" -dependencies = [ - "phf_macros 0.10.0", - "phf_shared 0.10.0", - "proc-macro-hack", -] - -[[package]] -name = "phf_codegen" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cbffee61585b0411840d3ece935cce9cb6321f01c45477d30066498cd5e1a815" -dependencies = [ - "phf_generator 0.8.0", - "phf_shared 0.8.0", -] - -[[package]] -name = "phf_codegen" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fb1c3a8bc4dd4e5cfce29b44ffc14bedd2ee294559a294e2a4d4c9e9a6a13cd" -dependencies = [ - "phf_generator 0.10.0", - "phf_shared 0.10.0", -] - -[[package]] -name = "phf_generator" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17367f0cc86f2d25802b2c26ee58a7b23faeccf78a396094c13dced0d0182526" -dependencies = [ - "phf_shared 0.8.0", - "rand 0.7.3", -] - -[[package]] -name = "phf_generator" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d5285893bb5eb82e6aaf5d59ee909a06a16737a8970984dd7746ba9283498d6" -dependencies = [ - "phf_shared 0.10.0", - "rand 0.8.5", -] - -[[package]] -name = "phf_macros" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f6fde18ff429ffc8fe78e2bf7f8b7a5a5a6e2a8b58bc5a9ac69198bbda9189c" -dependencies = [ - "phf_generator 0.8.0", - "phf_shared 0.8.0", - "proc-macro-hack", - "proc-macro2", - "quote", - "syn 1.0.105", -] - -[[package]] -name = "phf_macros" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "58fdf3184dd560f160dd73922bea2d5cd6e8f064bf4b13110abd81b03697b4e0" -dependencies = [ - "phf_generator 0.10.0", - "phf_shared 0.10.0", - "proc-macro-hack", - "proc-macro2", - "quote", - "syn 1.0.105", -] - -[[package]] -name = "phf_shared" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c00cf8b9eafe68dde5e9eaa2cef8ee84a9336a47d566ec55ca16589633b65af7" -dependencies = [ - "siphasher", -] - -[[package]] -name = "phf_shared" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6796ad771acdc0123d2a88dc428b5e38ef24456743ddb1744ed628f9815c096" -dependencies = [ - "siphasher", -] - -[[package]] -name = "pin-project-lite" -version = "0.2.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e0a7ae3ac2f1173085d398531c705756c94a4c56843785df85a60c1a0afac116" - -[[package]] -name = "pin-utils" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" - -[[package]] -name = "pkg-config" -version = "0.3.26" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ac9a59f73473f1b8d852421e59e64809f025994837ef743615c6d0c5b305160" - -[[package]] -name = "plist" -version = "1.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd39bc6cdc9355ad1dc5eeedefee696bb35c34caf21768741e81826c0bbd7225" -dependencies = [ - "base64 0.13.1", - "indexmap 1.9.2", - "line-wrap", - "serde", - "time", - "xml-rs", -] - -[[package]] -name = "png" -version = "0.17.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d708eaf860a19b19ce538740d2b4bdeeb8337fa53f7738455e706623ad5c638" -dependencies = [ - "bitflags", - "crc32fast", - "flate2", - "miniz_oxide", -] - -[[package]] -name = "polling" -version = "2.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b2d323e8ca7996b3e23126511a523f7e62924d93ecd5ae73b333815b0eb3dce" -dependencies = [ - "autocfg", - "bitflags", - "cfg-if", - "concurrent-queue", - "libc", - "log", - "pin-project-lite", - "windows-sys 0.48.0", -] - -[[package]] -name = "ppv-lite86" -version = "0.2.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" - -[[package]] -name = "precomputed-hash" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "925383efa346730478fb4838dbe9137d2a47675ad789c546d150a6e1dd4ab31c" - -[[package]] -name = "proc-macro-crate" -version = "1.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eda0fc3b0fb7c975631757e14d9049da17374063edb6ebbcbc54d880d4fe94e9" -dependencies = [ - "once_cell", - "thiserror", - "toml 0.5.9", -] - -[[package]] -name = "proc-macro-error" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c" -dependencies = [ - "proc-macro-error-attr", - "proc-macro2", - "quote", - "syn 1.0.105", - "version_check", -] - -[[package]] -name = "proc-macro-error-attr" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869" -dependencies = [ - "proc-macro2", - "quote", - "version_check", -] - -[[package]] -name = "proc-macro-hack" -version = "0.5.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dbf0c48bc1d91375ae5c3cd81e3722dff1abcf81a30960240640d223f59fe0e5" - -[[package]] -name = "proc-macro2" -version = "1.0.69" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "134c189feb4956b20f6f547d2cf727d4c0fe06722b20a0eec87ed445a97f92da" -dependencies = [ - "unicode-ident", -] - -[[package]] -name = "quick-xml" -version = "0.23.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "11bafc859c6815fbaffbbbf4229ecb767ac913fecb27f9ad4343662e9ef099ea" -dependencies = [ - "memchr", -] - -[[package]] -name = "quote" -version = "1.0.33" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae" -dependencies = [ - "proc-macro2", -] - -[[package]] -name = "rand" -version = "0.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a6b1679d49b24bbfe0c803429aa1874472f50d9b363131f0e89fc356b544d03" -dependencies = [ - "getrandom 0.1.16", - "libc", - "rand_chacha 0.2.2", - "rand_core 0.5.1", - "rand_hc", - "rand_pcg", -] - -[[package]] -name = "rand" -version = "0.8.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" -dependencies = [ - "libc", - "rand_chacha 0.3.1", - "rand_core 0.6.4", -] - -[[package]] -name = "rand_chacha" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4c8ed856279c9737206bf725bf36935d8666ead7aa69b52be55af369d193402" -dependencies = [ - "ppv-lite86", - "rand_core 0.5.1", -] - -[[package]] -name = "rand_chacha" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88" -dependencies = [ - "ppv-lite86", - "rand_core 0.6.4", -] - -[[package]] -name = "rand_core" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19" -dependencies = [ - "getrandom 0.1.16", -] - -[[package]] -name = "rand_core" -version = "0.6.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" -dependencies = [ - "getrandom 0.2.8", -] - -[[package]] -name = "rand_hc" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c" -dependencies = [ - "rand_core 0.5.1", -] - -[[package]] -name = "rand_pcg" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "16abd0c1b639e9eb4d7c50c0b8100b0d0f849be2349829c740fe8e6eb4816429" -dependencies = [ - "rand_core 0.5.1", -] - -[[package]] -name = "raw-window-handle" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed7e3d950b66e19e0c372f3fa3fbbcf85b1746b571f74e0c2af6042a5c93420a" -dependencies = [ - "cty", -] - -[[package]] -name = "redox_syscall" -version = "0.2.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a" -dependencies = [ - "bitflags", -] - -[[package]] -name = "redox_users" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b033d837a7cf162d7993aded9304e30a83213c648b6e389db233191f891e5c2b" -dependencies = [ - "getrandom 0.2.8", - "redox_syscall", - "thiserror", -] - -[[package]] -name = "regex" -version = "1.9.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12de2eff854e5fa4b1295edd650e227e9d8fb0c9e90b12e7f36d6a6811791a29" -dependencies = [ - "aho-corasick 1.1.2", - "memchr", - "regex-automata 0.3.7", - "regex-syntax 0.7.5", -] - -[[package]] -name = "regex-automata" -version = "0.1.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132" -dependencies = [ - "regex-syntax 0.6.28", -] - -[[package]] -name = "regex-automata" -version = "0.3.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49530408a136e16e5b486e883fbb6ba058e8e4e8ae6621a77b048b314336e629" -dependencies = [ - "aho-corasick 1.1.2", - "memchr", - "regex-syntax 0.7.5", -] - -[[package]] -name = "regex-syntax" -version = "0.6.28" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "456c603be3e8d448b072f410900c09faf164fbce2d480456f50eea6e25f9c848" - -[[package]] -name = "regex-syntax" -version = "0.7.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dbb5fb1acd8a1a18b3dd5be62d25485eb770e05afb408a9627d14d451bae12da" - -[[package]] -name = "remove_dir_all" -version = "0.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3acd125665422973a33ac9d3dd2df85edad0f4ae9b00dafb1a05e43a9f5ef8e7" -dependencies = [ - "winapi", -] - -[[package]] -name = "reqwest" -version = "0.11.22" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "046cd98826c46c2ac8ddecae268eb5c2e58628688a5fc7a2643704a73faba95b" -dependencies = [ - "base64 0.21.5", - "bytes", - "encoding_rs", - "futures-core", - "futures-util", - "h2", - "http", - "http-body", - "hyper", - "hyper-tls", - "ipnet", - "js-sys", - "log", - "mime", - "native-tls", - "once_cell", - "percent-encoding", - "pin-project-lite", - "serde", - "serde_json", - "serde_urlencoded", - "system-configuration", - "tokio", - "tokio-native-tls", - "tokio-util", - "tower-service", - "url", - "wasm-bindgen", - "wasm-bindgen-futures", - "wasm-streams", - "web-sys", - "winreg 0.50.0", -] - -[[package]] -name = "rfd" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0149778bd99b6959285b0933288206090c50e2327f47a9c463bfdbf45c8823ea" -dependencies = [ - "block", - "dispatch", - "glib-sys", - "gobject-sys", - "gtk-sys", - "js-sys", - "lazy_static", - "log", - "objc", - "objc-foundation", - "objc_id", - "raw-window-handle", - "wasm-bindgen", - "wasm-bindgen-futures", - "web-sys", - "windows 0.37.0", -] - -[[package]] -name = "rustc_version" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0dfe2087c51c460008730de8b57e6a320782fbfb312e1f4d520e6c6fae155ee" -dependencies = [ - "semver 0.11.0", -] - -[[package]] -name = "rustc_version" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366" -dependencies = [ - "semver 1.0.14", -] - -[[package]] -name = "rustix" -version = "0.37.27" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fea8ca367a3a01fe35e6943c400addf443c0f57670e6ec51196f71a4b8762dd2" -dependencies = [ - "bitflags", - "errno", - "io-lifetimes", - "libc", - "linux-raw-sys", - "windows-sys 0.48.0", -] - -[[package]] -name = "rustversion" -version = "1.0.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97477e48b4cf8603ad5f7aaf897467cf42ab4218a38ef76fb14c2d6773a6d6a8" - -[[package]] -name = "ryu" -version = "1.0.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4501abdff3ae82a1c1b477a17252eb69cee9e66eb915c1abaa4f44d873df9f09" - -[[package]] -name = "safemem" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef703b7cb59335eae2eb93ceb664c0eb7ea6bf567079d843e09420219668e072" - -[[package]] -name = "same-file" -version = "1.0.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502" -dependencies = [ - "winapi-util", -] - -[[package]] -name = "schannel" -version = "0.1.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "88d6731146462ea25d9244b2ed5fd1d716d25c52e4d54aa4fb0f3c4e9854dbe2" -dependencies = [ - "lazy_static", - "windows-sys 0.36.1", -] - -[[package]] -name = "scoped-tls" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1cf6437eb19a8f4a6cc0f7dca544973b0b78843adbfeb3683d1a94a0024a294" - -[[package]] -name = "scopeguard" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" - -[[package]] -name = "security-framework" -version = "2.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2bc1bb97804af6631813c55739f771071e0f2ed33ee20b68c86ec505d906356c" -dependencies = [ - "bitflags", - "core-foundation", - "core-foundation-sys", - "libc", - "security-framework-sys", -] - -[[package]] -name = "security-framework-sys" -version = "2.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0160a13a177a45bfb43ce71c01580998474f556ad854dcbca936dd2841a5c556" -dependencies = [ - "core-foundation-sys", - "libc", -] - -[[package]] -name = "selectors" -version = "0.22.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df320f1889ac4ba6bc0cdc9c9af7af4bd64bb927bccdf32d81140dc1f9be12fe" -dependencies = [ - "bitflags", - "cssparser", - "derive_more", - "fxhash", - "log", - "matches", - "phf 0.8.0", - "phf_codegen 0.8.0", - "precomputed-hash", - "servo_arc", - "smallvec", - "thin-slice", -] - -[[package]] -name = "semver" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f301af10236f6df4160f7c3f04eec6dbc70ace82d23326abad5edee88801c6b6" -dependencies = [ - "semver-parser", -] - -[[package]] -name = "semver" -version = "1.0.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e25dfac463d778e353db5be2449d1cce89bd6fd23c9f1ea21310ce6e5a1b29c4" -dependencies = [ - "serde", -] - -[[package]] -name = "semver-parser" -version = "0.10.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "00b0bef5b7f9e0df16536d3961cfb6e84331c065b4066afb39768d0e319411f7" -dependencies = [ - "pest", -] - -[[package]] -name = "serde" -version = "1.0.190" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91d3c334ca1ee894a2c6f6ad698fe8c435b76d504b13d436f0685d648d6d96f7" -dependencies = [ - "serde_derive", -] - -[[package]] -name = "serde_derive" -version = "1.0.190" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67c5609f394e5c2bd7fc51efda478004ea80ef42fee983d5c67a65e34f32c0e3" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.38", -] - -[[package]] -name = "serde_json" -version = "1.0.107" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b420ce6e3d8bd882e9b243c6eed35dbc9a6110c9769e74b584e0d68d1f20c65" -dependencies = [ - "itoa 1.0.4", - "ryu", - "serde", -] - -[[package]] -name = "serde_repr" -version = "0.1.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1fe39d9fbb0ebf5eb2c7cb7e2a47e4f462fad1379f1166b8ae49ad9eae89a7ca" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.105", -] - -[[package]] -name = "serde_spanned" -version = "0.6.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12022b835073e5b11e90a14f86838ceb1c8fb0325b72416845c487ac0fa95e80" -dependencies = [ - "serde", -] - -[[package]] -name = "serde_urlencoded" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3491c14715ca2294c4d6a88f15e84739788c1d030eed8c110436aafdaa2f3fd" -dependencies = [ - "form_urlencoded", - "itoa 1.0.4", - "ryu", - "serde", -] - -[[package]] -name = "serde_with" -version = "3.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64cd236ccc1b7a29e7e2739f27c0b2dd199804abc4290e32f59f3b68d6405c23" -dependencies = [ - "base64 0.21.5", - "chrono", - "hex", - "indexmap 1.9.2", - "indexmap 2.0.2", - "serde", - "serde_json", - "serde_with_macros", - "time", -] - -[[package]] -name = "serde_with_macros" -version = "3.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93634eb5f75a2323b16de4748022ac4297f9e76b6dced2be287a099f41b5e788" -dependencies = [ - "darling", - "proc-macro2", - "quote", - "syn 2.0.38", -] - -[[package]] -name = "serialize-to-javascript" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c9823f2d3b6a81d98228151fdeaf848206a7855a7a042bbf9bf870449a66cafb" -dependencies = [ - "serde", - "serde_json", - "serialize-to-javascript-impl", -] - -[[package]] -name = "serialize-to-javascript-impl" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "74064874e9f6a15f04c1f3cb627902d0e6b410abbf36668afa873c61889f1763" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.105", -] - -[[package]] -name = "servo_arc" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d98238b800e0d1576d8b6e3de32827c2d74bee68bb97748dcf5071fb53965432" -dependencies = [ - "nodrop", - "stable_deref_trait", -] - -[[package]] -name = "sha1" -version = "0.10.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f04293dc80c3993519f2d7f6f511707ee7094fe0c6d3406feb330cdb3540eba3" -dependencies = [ - "cfg-if", - "cpufeatures", - "digest", -] - -[[package]] -name = "sha2" -version = "0.10.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "82e6b795fe2e3b1e845bafcb27aa35405c4d47cdfc92af5fc8d3002f76cebdc0" -dependencies = [ - "cfg-if", - "cpufeatures", - "digest", -] - -[[package]] -name = "sharded-slab" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "900fba806f70c630b0a382d0d825e17a0f19fcd059a2ade1ff237bcddf446b31" -dependencies = [ - "lazy_static", -] - -[[package]] -name = "shared_child" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0d94659ad3c2137fef23ae75b03d5241d633f8acded53d672decfa0e6e0caef" -dependencies = [ - "libc", - "winapi", -] - -[[package]] -name = "signal-hook" -version = "0.3.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8621587d4798caf8eb44879d42e56b9a93ea5dcd315a6487c357130095b62801" -dependencies = [ - "libc", - "signal-hook-registry", -] - -[[package]] -name = "signal-hook-registry" -version = "1.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8229b473baa5980ac72ef434c4415e70c4b5e71b423043adb4ba059f89c99a1" -dependencies = [ - "libc", -] - -[[package]] -name = "siphasher" -version = "0.3.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7bd3e3206899af3f8b12af284fafc038cc1dc2b41d1b89dd17297221c5d225de" - -[[package]] -name = "slab" -version = "0.4.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4614a76b2a8be0058caa9dbbaf66d988527d86d003c11a94fbd335d7661edcef" -dependencies = [ - "autocfg", -] - -[[package]] -name = "smallvec" -version = "1.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a507befe795404456341dfab10cef66ead4c041f62b8b11bbb92bffe5d0953e0" - -[[package]] -name = "socket2" -version = "0.4.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f7916fc008ca5542385b89a3d3ce689953c143e9304a9bf8beec1de48994c0d" -dependencies = [ - "libc", - "winapi", -] - -[[package]] -name = "soup2" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2b4d76501d8ba387cf0fefbe055c3e0a59891d09f0f995ae4e4b16f6b60f3c0" -dependencies = [ - "bitflags", - "gio", - "glib", - "libc", - "once_cell", - "soup2-sys", -] - -[[package]] -name = "soup2-sys" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "009ef427103fcb17f802871647a7fa6c60cbb654b4c4e4c0ac60a31c5f6dc9cf" -dependencies = [ - "bitflags", - "gio-sys", - "glib-sys", - "gobject-sys", - "libc", - "system-deps 5.0.0", -] - -[[package]] -name = "stable_deref_trait" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3" - -[[package]] -name = "state" -version = "0.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dbe866e1e51e8260c9eed836a042a5e7f6726bb2b411dffeaa712e19c388f23b" -dependencies = [ - "loom", -] - -[[package]] -name = "static_assertions" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" - -[[package]] -name = "string_cache" -version = "0.8.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "213494b7a2b503146286049378ce02b482200519accc31872ee8be91fa820a08" -dependencies = [ - "new_debug_unreachable", - "once_cell", - "parking_lot", - "phf_shared 0.10.0", - "precomputed-hash", - "serde", -] - -[[package]] -name = "string_cache_codegen" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6bb30289b722be4ff74a408c3cc27edeaad656e06cb1fe8fa9231fa59c728988" -dependencies = [ - "phf_generator 0.10.0", - "phf_shared 0.10.0", - "proc-macro2", - "quote", -] - -[[package]] -name = "strsim" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" - -[[package]] -name = "strum" -version = "0.22.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7ac893c7d471c8a21f31cfe213ec4f6d9afeed25537c772e08ef3f005f8729e" -dependencies = [ - "strum_macros", -] - -[[package]] -name = "strum_macros" -version = "0.22.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "339f799d8b549e3744c7ac7feb216383e4005d94bdb22561b3ab8f3b808ae9fb" -dependencies = [ - "heck 0.3.3", - "proc-macro2", - "quote", - "syn 1.0.105", -] - -[[package]] -name = "syn" -version = "1.0.105" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "60b9b43d45702de4c839cb9b51d9f529c5dd26a4aff255b42b1ebc03e88ee908" -dependencies = [ - "proc-macro2", - "quote", - "unicode-ident", -] - -[[package]] -name = "syn" -version = "2.0.38" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e96b79aaa137db8f61e26363a0c9b47d8b4ec75da28b7d1d614c2303e232408b" -dependencies = [ - "proc-macro2", - "quote", - "unicode-ident", -] - -[[package]] -name = "sys-locale" -version = "0.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8a11bd9c338fdba09f7881ab41551932ad42e405f61d01e8406baea71c07aee" -dependencies = [ - "js-sys", - "libc", - "wasm-bindgen", - "web-sys", - "windows-sys 0.45.0", -] - -[[package]] -name = "system-configuration" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba3a3adc5c275d719af8cb4272ea1c4a6d668a777f37e115f6d11ddbc1c8e0e7" -dependencies = [ - "bitflags", - "core-foundation", - "system-configuration-sys", -] - -[[package]] -name = "system-configuration-sys" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a75fb188eb626b924683e3b95e3a48e63551fcfb51949de2f06a9d91dbee93c9" -dependencies = [ - "core-foundation-sys", - "libc", -] - -[[package]] -name = "system-deps" -version = "5.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "18db855554db7bd0e73e06cf7ba3df39f97812cb11d3f75e71c39bf45171797e" -dependencies = [ - "cfg-expr 0.9.1", - "heck 0.3.3", - "pkg-config", - "toml 0.5.9", - "version-compare 0.0.11", -] - -[[package]] -name = "system-deps" -version = "6.0.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2955b1fe31e1fa2fbd1976b71cc69a606d7d4da16f6de3333d0c92d51419aeff" -dependencies = [ - "cfg-expr 0.11.0", - "heck 0.4.0", - "pkg-config", - "toml 0.5.9", - "version-compare 0.1.1", -] - -[[package]] -name = "tao" -version = "0.16.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75f5aefd6be4cd3ad3f047442242fd9f57cbfb3e565379f66b5e14749364fa4f" -dependencies = [ - "bitflags", - "cairo-rs", - "cc", - "cocoa", - "core-foundation", - "core-graphics", - "crossbeam-channel", - "dirs-next", - "dispatch", - "gdk", - "gdk-pixbuf", - "gdk-sys", - "gdkwayland-sys", - "gdkx11-sys", - "gio", - "glib", - "glib-sys", - "gtk", - "image", - "instant", - "jni", - "lazy_static", - "libappindicator", - "libc", - "log", - "ndk", - "ndk-context", - "ndk-sys", - "objc", - "once_cell", - "parking_lot", - "png", - "raw-window-handle", - "scopeguard", - "serde", - "tao-macros", - "unicode-segmentation", - "uuid", - "windows 0.39.0", - "windows-implement", - "x11-dl", -] - -[[package]] -name = "tao-macros" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec114582505d158b669b136e6851f85840c109819d77c42bb7c0709f727d18c2" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.105", -] - -[[package]] -name = "tar" -version = "0.4.38" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b55807c0344e1e6c04d7c965f5289c39a8d94ae23ed5c0b57aabac549f871c6" -dependencies = [ - "filetime", - "libc", - "xattr", -] - -[[package]] -name = "tauri" -version = "1.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9bfe673cf125ef364d6f56b15e8ce7537d9ca7e4dae1cf6fbbdeed2e024db3d9" -dependencies = [ - "anyhow", - "base64 0.21.5", - "bytes", - "cocoa", - "dirs-next", - "embed_plist", - "encoding_rs", - "flate2", - "futures-util", - "glib", - "glob", - "gtk", - "heck 0.4.0", - "http", - "ignore", - "minisign-verify", - "notify-rust", - "objc", - "once_cell", - "open", - "os_info", - "os_pipe", - "percent-encoding", - "rand 0.8.5", - "raw-window-handle", - "regex", - "reqwest", - "rfd", - "semver 1.0.14", - "serde", - "serde_json", - "serde_repr", - "serialize-to-javascript", - "shared_child", - "state", - "sys-locale", - "tar", - "tauri-macros", - "tauri-runtime", - "tauri-runtime-wry", - "tauri-utils", - "tempfile", - "thiserror", - "time", - "tokio", - "url", - "uuid", - "webkit2gtk", - "webview2-com", - "windows 0.39.0", - "zip", -] - -[[package]] -name = "tauri-build" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "defbfc551bd38ab997e5f8e458f87396d2559d05ce32095076ad6c30f7fc5f9c" -dependencies = [ - "anyhow", - "cargo_toml", - "dirs-next", - "heck 0.4.0", - "json-patch", - "semver 1.0.14", - "serde", - "serde_json", - "tauri-utils", - "tauri-winres", - "walkdir", -] - -[[package]] -name = "tauri-codegen" -version = "1.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b3475e55acec0b4a50fb96435f19631fb58cbcd31923e1a213de5c382536bbb" -dependencies = [ - "base64 0.21.5", - "brotli", - "ico", - "json-patch", - "plist", - "png", - "proc-macro2", - "quote", - "regex", - "semver 1.0.14", - "serde", - "serde_json", - "sha2", - "tauri-utils", - "thiserror", - "time", - "uuid", - "walkdir", -] - -[[package]] -name = "tauri-macros" -version = "1.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "613740228de92d9196b795ac455091d3a5fbdac2654abb8bb07d010b62ab43af" -dependencies = [ - "heck 0.4.0", - "proc-macro2", - "quote", - "syn 1.0.105", - "tauri-codegen", - "tauri-utils", -] - -[[package]] -name = "tauri-runtime" -version = "0.14.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07f8e9e53e00e9f41212c115749e87d5cd2a9eebccafca77a19722eeecd56d43" -dependencies = [ - "gtk", - "http", - "http-range", - "rand 0.8.5", - "raw-window-handle", - "serde", - "serde_json", - "tauri-utils", - "thiserror", - "url", - "uuid", - "webview2-com", - "windows 0.39.0", -] - -[[package]] -name = "tauri-runtime-wry" -version = "0.14.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8141d72b6b65f2008911e9ef5b98a68d1e3413b7a1464e8f85eb3673bb19a895" -dependencies = [ - "cocoa", - "gtk", - "percent-encoding", - "rand 0.8.5", - "raw-window-handle", - "tauri-runtime", - "tauri-utils", - "uuid", - "webkit2gtk", - "webview2-com", - "windows 0.39.0", - "wry", -] - -[[package]] -name = "tauri-utils" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34d55e185904a84a419308d523c2c6891d5e2dbcee740c4997eb42e75a7b0f46" -dependencies = [ - "brotli", - "ctor", - "dunce", - "glob", - "heck 0.4.0", - "html5ever 0.26.0", - "infer", - "json-patch", - "kuchikiki", - "log", - "memchr", - "phf 0.10.1", - "proc-macro2", - "quote", - "semver 1.0.14", - "serde", - "serde_json", - "serde_with", - "thiserror", - "url", - "walkdir", - "windows 0.39.0", -] - -[[package]] -name = "tauri-winres" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5993dc129e544393574288923d1ec447c857f3f644187f4fbf7d9a875fbfc4fb" -dependencies = [ - "embed-resource", - "toml 0.7.8", -] - -[[package]] -name = "tauri-winrt-notification" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c58de036c4d2e20717024de2a3c4bf56c301f07b21bc8ef9b57189fce06f1f3b" -dependencies = [ - "quick-xml", - "strum", - "windows 0.39.0", -] - -[[package]] -name = "tempfile" -version = "3.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5cdb1ef4eaeeaddc8fbd371e5017057064af0911902ef36b39801f67cc6d79e4" -dependencies = [ - "cfg-if", - "fastrand 1.8.0", - "libc", - "redox_syscall", - "remove_dir_all", - "winapi", -] - -[[package]] -name = "tendril" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d24a120c5fc464a3458240ee02c299ebcb9d67b5249c8848b09d639dca8d7bb0" -dependencies = [ - "futf", - "mac", - "utf-8", -] - -[[package]] -name = "thin-slice" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8eaa81235c7058867fa8c0e7314f33dcce9c215f535d1913822a2b3f5e289f3c" - -[[package]] -name = "thiserror" -version = "1.0.50" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9a7210f5c9a7156bb50aa36aed4c95afb51df0df00713949448cf9e97d382d2" -dependencies = [ - "thiserror-impl", -] - -[[package]] -name = "thiserror-impl" -version = "1.0.50" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "266b2e40bc00e5a6c09c3584011e08b06f123c00362c92b975ba9843aaaa14b8" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.38", -] - -[[package]] -name = "thread_local" -version = "1.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5516c27b78311c50bf42c071425c560ac799b11c30b31f87e3081965fe5e0180" -dependencies = [ - "once_cell", -] - -[[package]] -name = "time" -version = "0.3.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a561bf4617eebd33bca6434b988f39ed798e527f51a1e797d0ee4f61c0a38376" -dependencies = [ - "itoa 1.0.4", - "serde", - "time-core", - "time-macros", -] - -[[package]] -name = "time-core" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2e153e1f1acaef8acc537e68b44906d2db6436e2b35ac2c6b42640fff91f00fd" - -[[package]] -name = "time-macros" -version = "0.2.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d967f99f534ca7e495c575c62638eebc2898a8c84c119b89e250477bc4ba16b2" -dependencies = [ - "time-core", -] - -[[package]] -name = "tinyvec" -version = "1.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50" -dependencies = [ - "tinyvec_macros", -] - -[[package]] -name = "tinyvec_macros" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c" - -[[package]] -name = "tokio" -version = "1.23.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eab6d665857cc6ca78d6e80303a02cea7a7851e85dfbd77cbdc09bd129f1ef46" -dependencies = [ - "autocfg", - "bytes", - "libc", - "memchr", - "mio", - "num_cpus", - "pin-project-lite", - "socket2", - "windows-sys 0.42.0", -] - -[[package]] -name = "tokio-native-tls" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbae76ab933c85776efabc971569dd6119c580d8f5d448769dec1764bf796ef2" -dependencies = [ - "native-tls", - "tokio", -] - -[[package]] -name = "tokio-util" -version = "0.7.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "806fe8c2c87eccc8b3267cbae29ed3ab2d0bd37fca70ab622e46aaa9375ddb7d" -dependencies = [ - "bytes", - "futures-core", - "futures-sink", - "pin-project-lite", - "tokio", - "tracing", -] - -[[package]] -name = "toml" -version = "0.5.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d82e1a7758622a465f8cee077614c73484dac5b836c02ff6a40d5d1010324d7" -dependencies = [ - "serde", -] - -[[package]] -name = "toml" -version = "0.7.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd79e69d3b627db300ff956027cc6c3798cef26d22526befdfcd12feeb6d2257" -dependencies = [ - "serde", - "serde_spanned", - "toml_datetime", - "toml_edit 0.19.15", -] - -[[package]] -name = "toml" -version = "0.8.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3efaf127c78d5339cc547cce4e4d973bd5e4f56e949a06d091c082ebeef2f800" -dependencies = [ - "serde", - "serde_spanned", - "toml_datetime", - "toml_edit 0.20.5", -] - -[[package]] -name = "toml_datetime" -version = "0.6.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3550f4e9685620ac18a50ed434eb3aec30db8ba93b0287467bca5826ea25baf1" -dependencies = [ - "serde", -] - -[[package]] -name = "toml_edit" -version = "0.19.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421" -dependencies = [ - "indexmap 2.0.2", - "serde", - "serde_spanned", - "toml_datetime", - "winnow", -] - -[[package]] -name = "toml_edit" -version = "0.20.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "782bf6c2ddf761c1e7855405e8975472acf76f7f36d0d4328bd3b7a2fae12a85" -dependencies = [ - "indexmap 2.0.2", - "serde", - "serde_spanned", - "toml_datetime", - "winnow", -] - -[[package]] -name = "tower-service" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6bc1c9ce2b5135ac7f93c72918fc37feb872bdc6a5533a8b85eb4b86bfdae52" - -[[package]] -name = "tracing" -version = "0.1.37" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ce8c33a8d48bd45d624a6e523445fd21ec13d3653cd51f681abf67418f54eb8" -dependencies = [ - "cfg-if", - "pin-project-lite", - "tracing-attributes", - "tracing-core", -] - -[[package]] -name = "tracing-attributes" -version = "0.1.23" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4017f8f45139870ca7e672686113917c71c7a6e02d4924eda67186083c03081a" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.105", -] - -[[package]] -name = "tracing-core" -version = "0.1.30" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "24eb03ba0eab1fd845050058ce5e616558e8f8d8fca633e6b163fe25c797213a" -dependencies = [ - "once_cell", - "valuable", -] - -[[package]] -name = "tracing-log" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "78ddad33d2d10b1ed7eb9d1f518a5674713876e97e5bb9b7345a7984fbb4f922" -dependencies = [ - "lazy_static", - "log", - "tracing-core", -] - -[[package]] -name = "tracing-subscriber" -version = "0.3.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a6176eae26dd70d0c919749377897b54a9276bd7061339665dd68777926b5a70" -dependencies = [ - "matchers", - "nu-ansi-term", - "once_cell", - "regex", - "sharded-slab", - "smallvec", - "thread_local", - "tracing", - "tracing-core", - "tracing-log", -] - -[[package]] -name = "treediff" -version = "4.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "52984d277bdf2a751072b5df30ec0377febdb02f7696d64c2d7d54630bac4303" -dependencies = [ - "serde_json", -] - -[[package]] -name = "try-lock" -version = "0.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3528ecfd12c466c6f163363caf2d02a71161dd5e1cc6ae7b34207ea2d42d81ed" - -[[package]] -name = "typenum" -version = "1.16.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "497961ef93d974e23eb6f433eb5fe1b7930b659f06d12dec6fc44a8f554c0bba" - -[[package]] -name = "ucd-trie" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e79c4d996edb816c91e4308506774452e55e95c3c9de07b6729e17e15a5ef81" - -[[package]] -name = "uds_windows" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce65604324d3cce9b966701489fbd0cf318cb1f7bd9dd07ac9a4ee6fb791930d" -dependencies = [ - "tempfile", - "winapi", -] - -[[package]] -name = "unicode-bidi" -version = "0.3.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "099b7128301d285f79ddd55b9a83d5e6b9e97c92e0ea0daebee7263e932de992" - -[[package]] -name = "unicode-ident" -version = "1.0.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ceab39d59e4c9499d4e5a8ee0e2735b891bb7308ac83dfb4e80cad195c9f6f3" - -[[package]] -name = "unicode-normalization" -version = "0.1.22" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c5713f0fc4b5db668a2ac63cdb7bb4469d8c9fed047b1d0292cc7b0ce2ba921" -dependencies = [ - "tinyvec", -] - -[[package]] -name = "unicode-segmentation" -version = "1.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fdbf052a0783de01e944a6ce7a8cb939e295b1e7be835a1112c3b9a7f047a5a" - -[[package]] -name = "url" -version = "2.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d68c799ae75762b8c3fe375feb6600ef5602c883c5d21eb51c09f22b83c4643" -dependencies = [ - "form_urlencoded", - "idna", - "percent-encoding", - "serde", -] - -[[package]] -name = "utf-8" -version = "0.7.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09cc8ee72d2a9becf2f2febe0205bbed8fc6615b7cb429ad062dc7b7ddd036a9" - -[[package]] -name = "uuid" -version = "1.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "422ee0de9031b5b948b97a8fc04e3aa35230001a722ddd27943e0be31564ce4c" -dependencies = [ - "getrandom 0.2.8", -] - -[[package]] -name = "valuable" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d" - -[[package]] -name = "vcpkg" -version = "0.2.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426" - -[[package]] -name = "version-compare" -version = "0.0.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c18c859eead79d8b95d09e4678566e8d70105c4e7b251f707a03df32442661b" - -[[package]] -name = "version-compare" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "579a42fc0b8e0c63b76519a339be31bed574929511fa53c1a3acae26eb258f29" - -[[package]] -name = "version_check" -version = "0.9.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" - -[[package]] -name = "vswhom" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be979b7f07507105799e854203b470ff7c78a1639e330a58f183b5fea574608b" -dependencies = [ - "libc", - "vswhom-sys", -] - -[[package]] -name = "vswhom-sys" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3b17ae1f6c8a2b28506cd96d412eebf83b4a0ff2cbefeeb952f2f9dfa44ba18" -dependencies = [ - "cc", - "libc", -] - -[[package]] -name = "waker-fn" -version = "1.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f3c4517f54858c779bbcbf228f4fca63d121bf85fbecb2dc578cdf4a39395690" - -[[package]] -name = "walkdir" -version = "2.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "808cf2735cd4b6866113f648b791c6adc5714537bc222d9347bb203386ffda56" -dependencies = [ - "same-file", - "winapi", - "winapi-util", -] - -[[package]] -name = "want" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfa7760aed19e106de2c7c0b581b509f2f25d3dacaf737cb82ac61bc6d760b0e" -dependencies = [ - "try-lock", -] - -[[package]] -name = "wasi" -version = "0.9.0+wasi-snapshot-preview1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519" - -[[package]] -name = "wasi" -version = "0.11.0+wasi-snapshot-preview1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" - -[[package]] -name = "wasm-bindgen" -version = "0.2.83" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eaf9f5aceeec8be17c128b2e93e031fb8a4d469bb9c4ae2d7dc1888b26887268" -dependencies = [ - "cfg-if", - "wasm-bindgen-macro", -] - -[[package]] -name = "wasm-bindgen-backend" -version = "0.2.83" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c8ffb332579b0557b52d268b91feab8df3615f265d5270fec2a8c95b17c1142" -dependencies = [ - "bumpalo", - "log", - "once_cell", - "proc-macro2", - "quote", - "syn 1.0.105", - "wasm-bindgen-shared", -] - -[[package]] -name = "wasm-bindgen-futures" -version = "0.4.33" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23639446165ca5a5de86ae1d8896b737ae80319560fbaa4c2887b7da6e7ebd7d" -dependencies = [ - "cfg-if", - "js-sys", - "wasm-bindgen", - "web-sys", -] - -[[package]] -name = "wasm-bindgen-macro" -version = "0.2.83" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "052be0f94026e6cbc75cdefc9bae13fd6052cdcaf532fa6c45e7ae33a1e6c810" -dependencies = [ - "quote", - "wasm-bindgen-macro-support", -] - -[[package]] -name = "wasm-bindgen-macro-support" -version = "0.2.83" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07bc0c051dc5f23e307b13285f9d75df86bfdf816c5721e573dec1f9b8aa193c" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.105", - "wasm-bindgen-backend", - "wasm-bindgen-shared", -] - -[[package]] -name = "wasm-bindgen-shared" -version = "0.2.83" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c38c045535d93ec4f0b4defec448e4291638ee608530863b1e2ba115d4fff7f" - -[[package]] -name = "wasm-streams" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4609d447824375f43e1ffbc051b50ad8f4b3ae8219680c94452ea05eb240ac7" -dependencies = [ - "futures-util", - "js-sys", - "wasm-bindgen", - "wasm-bindgen-futures", - "web-sys", -] - -[[package]] -name = "web-sys" -version = "0.3.60" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bcda906d8be16e728fd5adc5b729afad4e444e106ab28cd1c7256e54fa61510f" -dependencies = [ - "js-sys", - "wasm-bindgen", -] - -[[package]] -name = "webkit2gtk" -version = "0.18.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b8f859735e4a452aeb28c6c56a852967a8a76c8eb1cc32dbf931ad28a13d6370" -dependencies = [ - "bitflags", - "cairo-rs", - "gdk", - "gdk-sys", - "gio", - "gio-sys", - "glib", - "glib-sys", - "gobject-sys", - "gtk", - "gtk-sys", - "javascriptcore-rs", - "libc", - "once_cell", - "soup2", - "webkit2gtk-sys", -] - -[[package]] -name = "webkit2gtk-sys" -version = "0.18.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d76ca6ecc47aeba01ec61e480139dda143796abcae6f83bcddf50d6b5b1dcf3" -dependencies = [ - "atk-sys", - "bitflags", - "cairo-sys-rs", - "gdk-pixbuf-sys", - "gdk-sys", - "gio-sys", - "glib-sys", - "gobject-sys", - "gtk-sys", - "javascriptcore-rs-sys", - "libc", - "pango-sys", - "pkg-config", - "soup2-sys", - "system-deps 6.0.3", -] - -[[package]] -name = "webview2-com" -version = "0.19.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4a769c9f1a64a8734bde70caafac2b96cada12cd4aefa49196b3a386b8b4178" -dependencies = [ - "webview2-com-macros", - "webview2-com-sys", - "windows 0.39.0", - "windows-implement", -] - -[[package]] -name = "webview2-com-macros" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eaebe196c01691db62e9e4ca52c5ef1e4fd837dcae27dae3ada599b5a8fd05ac" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.105", -] - -[[package]] -name = "webview2-com-sys" -version = "0.19.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aac48ef20ddf657755fdcda8dfed2a7b4fc7e4581acce6fe9b88c3d64f29dee7" -dependencies = [ - "regex", - "serde", - "serde_json", - "thiserror", - "windows 0.39.0", - "windows-bindgen", - "windows-metadata", -] - -[[package]] -name = "winapi" -version = "0.3.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" -dependencies = [ - "winapi-i686-pc-windows-gnu", - "winapi-x86_64-pc-windows-gnu", -] - -[[package]] -name = "winapi-i686-pc-windows-gnu" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" - -[[package]] -name = "winapi-util" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178" -dependencies = [ - "winapi", -] - -[[package]] -name = "winapi-x86_64-pc-windows-gnu" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" - -[[package]] -name = "windows" -version = "0.37.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57b543186b344cc61c85b5aab0d2e3adf4e0f99bc076eff9aa5927bcc0b8a647" -dependencies = [ - "windows_aarch64_msvc 0.37.0", - "windows_i686_gnu 0.37.0", - "windows_i686_msvc 0.37.0", - "windows_x86_64_gnu 0.37.0", - "windows_x86_64_msvc 0.37.0", -] - -[[package]] -name = "windows" -version = "0.39.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1c4bd0a50ac6020f65184721f758dba47bb9fbc2133df715ec74a237b26794a" -dependencies = [ - "windows-implement", - "windows_aarch64_msvc 0.39.0", - "windows_i686_gnu 0.39.0", - "windows_i686_msvc 0.39.0", - "windows_x86_64_gnu 0.39.0", - "windows_x86_64_msvc 0.39.0", -] - -[[package]] -name = "windows-bindgen" -version = "0.39.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68003dbd0e38abc0fb85b939240f4bce37c43a5981d3df37ccbaaa981b47cb41" -dependencies = [ - "windows-metadata", - "windows-tokens", -] - -[[package]] -name = "windows-core" -version = "0.51.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1f8cf84f35d2db49a46868f947758c7a1138116f7fac3bc844f43ade1292e64" -dependencies = [ - "windows-targets 0.48.5", -] - -[[package]] -name = "windows-implement" -version = "0.39.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba01f98f509cb5dc05f4e5fc95e535f78260f15fea8fe1a8abdd08f774f1cee7" -dependencies = [ - "syn 1.0.105", - "windows-tokens", -] - -[[package]] -name = "windows-metadata" -version = "0.39.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ee5e275231f07c6e240d14f34e1b635bf1faa1c76c57cfd59a5cdb9848e4278" - -[[package]] -name = "windows-sys" -version = "0.36.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea04155a16a59f9eab786fe12a4a450e75cdb175f9e0d80da1e17db09f55b8d2" -dependencies = [ - "windows_aarch64_msvc 0.36.1", - "windows_i686_gnu 0.36.1", - "windows_i686_msvc 0.36.1", - "windows_x86_64_gnu 0.36.1", - "windows_x86_64_msvc 0.36.1", -] - -[[package]] -name = "windows-sys" -version = "0.42.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a3e1820f08b8513f676f7ab6c1f99ff312fb97b553d30ff4dd86f9f15728aa7" -dependencies = [ - "windows_aarch64_gnullvm 0.42.2", - "windows_aarch64_msvc 0.42.2", - "windows_i686_gnu 0.42.2", - "windows_i686_msvc 0.42.2", - "windows_x86_64_gnu 0.42.2", - "windows_x86_64_gnullvm 0.42.2", - "windows_x86_64_msvc 0.42.2", -] - -[[package]] -name = "windows-sys" -version = "0.45.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0" -dependencies = [ - "windows-targets 0.42.2", -] - -[[package]] -name = "windows-sys" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" -dependencies = [ - "windows-targets 0.48.5", -] - -[[package]] -name = "windows-targets" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e5180c00cd44c9b1c88adb3693291f1cd93605ded80c250a75d472756b4d071" -dependencies = [ - "windows_aarch64_gnullvm 0.42.2", - "windows_aarch64_msvc 0.42.2", - "windows_i686_gnu 0.42.2", - "windows_i686_msvc 0.42.2", - "windows_x86_64_gnu 0.42.2", - "windows_x86_64_gnullvm 0.42.2", - "windows_x86_64_msvc 0.42.2", -] - -[[package]] -name = "windows-targets" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c" -dependencies = [ - "windows_aarch64_gnullvm 0.48.5", - "windows_aarch64_msvc 0.48.5", - "windows_i686_gnu 0.48.5", - "windows_i686_msvc 0.48.5", - "windows_x86_64_gnu 0.48.5", - "windows_x86_64_gnullvm 0.48.5", - "windows_x86_64_msvc 0.48.5", -] - -[[package]] -name = "windows-tokens" -version = "0.39.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f838de2fe15fe6bac988e74b798f26499a8b21a9d97edec321e79b28d1d7f597" - -[[package]] -name = "windows_aarch64_gnullvm" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8" - -[[package]] -name = "windows_aarch64_gnullvm" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" - -[[package]] -name = "windows_aarch64_msvc" -version = "0.36.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9bb8c3fd39ade2d67e9874ac4f3db21f0d710bee00fe7cab16949ec184eeaa47" - -[[package]] -name = "windows_aarch64_msvc" -version = "0.37.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2623277cb2d1c216ba3b578c0f3cf9cdebeddb6e66b1b218bb33596ea7769c3a" - -[[package]] -name = "windows_aarch64_msvc" -version = "0.39.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec7711666096bd4096ffa835238905bb33fb87267910e154b18b44eaabb340f2" - -[[package]] -name = "windows_aarch64_msvc" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43" - -[[package]] -name = "windows_aarch64_msvc" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" - -[[package]] -name = "windows_i686_gnu" -version = "0.36.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "180e6ccf01daf4c426b846dfc66db1fc518f074baa793aa7d9b9aaeffad6a3b6" - -[[package]] -name = "windows_i686_gnu" -version = "0.37.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3925fd0b0b804730d44d4b6278c50f9699703ec49bcd628020f46f4ba07d9e1" - -[[package]] -name = "windows_i686_gnu" -version = "0.39.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "763fc57100a5f7042e3057e7e8d9bdd7860d330070251a73d003563a3bb49e1b" - -[[package]] -name = "windows_i686_gnu" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f" - -[[package]] -name = "windows_i686_gnu" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" - -[[package]] -name = "windows_i686_msvc" -version = "0.36.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2e7917148b2812d1eeafaeb22a97e4813dfa60a3f8f78ebe204bcc88f12f024" - -[[package]] -name = "windows_i686_msvc" -version = "0.37.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce907ac74fe331b524c1298683efbf598bb031bc84d5e274db2083696d07c57c" - -[[package]] -name = "windows_i686_msvc" -version = "0.39.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7bc7cbfe58828921e10a9f446fcaaf649204dcfe6c1ddd712c5eebae6bda1106" - -[[package]] -name = "windows_i686_msvc" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060" - -[[package]] -name = "windows_i686_msvc" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" - -[[package]] -name = "windows_x86_64_gnu" -version = "0.36.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4dcd171b8776c41b97521e5da127a2d86ad280114807d0b2ab1e462bc764d9e1" - -[[package]] -name = "windows_x86_64_gnu" -version = "0.37.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2babfba0828f2e6b32457d5341427dcbb577ceef556273229959ac23a10af33d" - -[[package]] -name = "windows_x86_64_gnu" -version = "0.39.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6868c165637d653ae1e8dc4d82c25d4f97dd6605eaa8d784b5c6e0ab2a252b65" - -[[package]] -name = "windows_x86_64_gnu" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36" - -[[package]] -name = "windows_x86_64_gnu" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" - -[[package]] -name = "windows_x86_64_gnullvm" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3" - -[[package]] -name = "windows_x86_64_gnullvm" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" - -[[package]] -name = "windows_x86_64_msvc" -version = "0.36.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c811ca4a8c853ef420abd8592ba53ddbbac90410fab6903b3e79972a631f7680" - -[[package]] -name = "windows_x86_64_msvc" -version = "0.37.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4dd6dc7df2d84cf7b33822ed5b86318fb1781948e9663bacd047fc9dd52259d" - -[[package]] -name = "windows_x86_64_msvc" -version = "0.39.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e4d40883ae9cae962787ca76ba76390ffa29214667a111db9e0a1ad8377e809" - -[[package]] -name = "windows_x86_64_msvc" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0" - -[[package]] -name = "windows_x86_64_msvc" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" - -[[package]] -name = "winnow" -version = "0.5.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3b801d0e0a6726477cc207f60162da452f3a95adb368399bef20a946e06f65c" -dependencies = [ - "memchr", -] - -[[package]] -name = "winreg" -version = "0.50.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "524e57b2c537c0f9b1e69f1965311ec12182b4122e45035b1508cd24d2adadb1" -dependencies = [ - "cfg-if", - "windows-sys 0.48.0", -] - -[[package]] -name = "winreg" -version = "0.51.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "937f3df7948156640f46aacef17a70db0de5917bda9c92b0f751f3a955b588fc" -dependencies = [ - "cfg-if", - "windows-sys 0.48.0", -] - -[[package]] -name = "wry" -version = "0.24.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "88ef04bdad49eba2e01f06e53688c8413bd6a87b0bc14b72284465cf96e3578e" -dependencies = [ - "base64 0.13.1", - "block", - "cocoa", - "core-graphics", - "crossbeam-channel", - "dunce", - "gdk", - "gio", - "glib", - "gtk", - "html5ever 0.25.2", - "http", - "kuchiki", - "libc", - "log", - "objc", - "objc_id", - "once_cell", - "serde", - "serde_json", - "sha2", - "soup2", - "tao", - "thiserror", - "url", - "webkit2gtk", - "webkit2gtk-sys", - "webview2-com", - "windows 0.39.0", - "windows-implement", -] - -[[package]] -name = "x11" -version = "2.20.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c2638d5b9c17ac40575fb54bb461a4b1d2a8d1b4ffcc4ff237d254ec59ddeb82" -dependencies = [ - "libc", - "pkg-config", -] - -[[package]] -name = "x11-dl" -version = "2.20.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1536d6965a5d4e573c7ef73a2c15ebcd0b2de3347bdf526c34c297c00ac40f0" -dependencies = [ - "lazy_static", - "libc", - "pkg-config", -] - -[[package]] -name = "xattr" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d1526bbe5aaeb5eb06885f4d987bcdfa5e23187055de9b83fe00156a821fabc" -dependencies = [ - "libc", -] - -[[package]] -name = "xdg-home" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2769203cd13a0c6015d515be729c526d041e9cf2c0cc478d57faee85f40c6dcd" -dependencies = [ - "nix", - "winapi", -] - -[[package]] -name = "xml-rs" -version = "0.8.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2d7d3948613f75c98fd9328cfdcc45acc4d360655289d0a7d4ec931392200a3" - -[[package]] -name = "zbus" -version = "3.14.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31de390a2d872e4cd04edd71b425e29853f786dc99317ed72d73d6fcf5ebb948" -dependencies = [ - "async-broadcast", - "async-executor", - "async-fs", - "async-io", - "async-lock", - "async-process", - "async-recursion", - "async-task", - "async-trait", - "blocking", - "byteorder", - "derivative", - "enumflags2", - "event-listener", - "futures-core", - "futures-sink", - "futures-util", - "hex", - "nix", - "once_cell", - "ordered-stream", - "rand 0.8.5", - "serde", - "serde_repr", - "sha1", - "static_assertions", - "tracing", - "uds_windows", - "winapi", - "xdg-home", - "zbus_macros", - "zbus_names", - "zvariant", -] - -[[package]] -name = "zbus_macros" -version = "3.14.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41d1794a946878c0e807f55a397187c11fc7a038ba5d868e7db4f3bd7760bc9d" -dependencies = [ - "proc-macro-crate", - "proc-macro2", - "quote", - "regex", - "syn 1.0.105", - "zvariant_utils", -] - -[[package]] -name = "zbus_names" -version = "2.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb80bb776dbda6e23d705cf0123c3b95df99c4ebeaec6c2599d4a5419902b4a9" -dependencies = [ - "serde", - "static_assertions", - "zvariant", -] - -[[package]] -name = "zip" -version = "0.6.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "537ce7411d25e54e8ae21a7ce0b15840e7bfcff15b51d697ec3266cc76bdf080" -dependencies = [ - "byteorder", - "crc32fast", - "crossbeam-utils", -] - -[[package]] -name = "zvariant" -version = "3.15.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44b291bee0d960c53170780af148dca5fa260a63cdd24f1962fa82e03e53338c" -dependencies = [ - "byteorder", - "enumflags2", - "libc", - "serde", - "static_assertions", - "zvariant_derive", -] - -[[package]] -name = "zvariant_derive" -version = "3.15.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "934d7a7dfc310d6ee06c87ffe88ef4eca7d3e37bb251dece2ef93da8f17d8ecd" -dependencies = [ - "proc-macro-crate", - "proc-macro2", - "quote", - "syn 1.0.105", - "zvariant_utils", -] - -[[package]] -name = "zvariant_utils" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7234f0d811589db492d16893e3f21e8e2fd282e6d01b0cddee310322062cc200" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.105", -] diff --git a/pkgs/applications/networking/instant-messengers/cinny-desktop/default.nix b/pkgs/applications/networking/instant-messengers/cinny-desktop/default.nix index 23ad9cc02961..a7742b91e0c7 100644 --- a/pkgs/applications/networking/instant-messengers/cinny-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/cinny-desktop/default.nix @@ -21,19 +21,18 @@ rustPlatform.buildRustPackage rec { pname = "cinny-desktop"; # We have to be using the same version as cinny-web or this isn't going to work. - version = "3.2.0"; + version = "4.0.3"; src = fetchFromGitHub { owner = "cinnyapp"; repo = "cinny-desktop"; rev = "v${version}"; - hash = "sha256-uHGqvulH7/9JpUjkpcbCh1pPvX4/ndVIKcBXzWmDo+s="; + hash = "sha256-05T/2e5+st+vGQuO8lRw6KWz3+Qiqd14dCPvayyz5mo="; }; sourceRoot = "${src.name}/src-tauri"; - # modififying $cargoDepsCopy requires the lock to be vendored - cargoLock.lockFile = ./Cargo.lock; + cargoHash = "sha256-bM+V37PJAob/DA2jy2g69zUY99ZyZBzgO6djadbdiJw="; postPatch = let cinny' = @@ -94,12 +93,12 @@ rustPlatform.buildRustPackage rec { }) ]; - meta = with lib; { + meta = { description = "Yet another matrix client for desktop"; homepage = "https://github.com/cinnyapp/cinny-desktop"; - maintainers = with maintainers; [ qyriad ]; - license = licenses.agpl3Only; - platforms = platforms.linux ++ platforms.darwin; + maintainers = with lib.maintainers; [ qyriad ]; + license = lib.licenses.agpl3Only; + platforms = lib.platforms.linux ++ lib.platforms.darwin; mainProgram = "cinny"; }; } diff --git a/pkgs/applications/networking/instant-messengers/cinny/default.nix b/pkgs/applications/networking/instant-messengers/cinny/default.nix index 6b3f5904e975..f13c286acb57 100644 --- a/pkgs/applications/networking/instant-messengers/cinny/default.nix +++ b/pkgs/applications/networking/instant-messengers/cinny/default.nix @@ -18,16 +18,16 @@ let in buildNpmPackage rec { pname = "cinny"; - version = "3.2.0"; + version = "4.0.3"; src = fetchFromGitHub { owner = "cinnyapp"; repo = "cinny"; rev = "v${version}"; - hash = "sha256-wAa7y2mXPkXAfirRSFqwZYIJK0CKDzZG8ULzXzr4zZ4="; + hash = "sha256-5Tf1CgB/YAyGVpopHERQ8xNGwklB+f2l+yfgCKsR3I8="; }; - npmDepsHash = "sha256-dVdylvclUIHvF5syVumdxkXR4bG1FA4LOYg3GmnNzXE="; + npmDepsHash = "sha256-wtHFqnz5BtMUikdFZyTiLrw+e69WErowYBhu8cnEjkI="; # Fix error: no member named 'aligned_alloc' in the global namespace env.NIX_CFLAGS_COMPILE = lib.optionalString ( @@ -57,11 +57,11 @@ buildNpmPackage rec { runHook postInstall ''; - meta = with lib; { + meta = { description = "Yet another Matrix client for the web"; homepage = "https://cinny.in/"; - maintainers = with maintainers; [ abbe ]; - license = licenses.agpl3Only; - platforms = platforms.all; + maintainers = with lib.maintainers; [ abbe ]; + license = lib.licenses.agpl3Only; + platforms = lib.platforms.all; }; } diff --git a/pkgs/applications/networking/instant-messengers/discord/default.nix b/pkgs/applications/networking/instant-messengers/discord/default.nix index e639f2c4d023..0f14d131ac98 100644 --- a/pkgs/applications/networking/instant-messengers/discord/default.nix +++ b/pkgs/applications/networking/instant-messengers/discord/default.nix @@ -5,7 +5,7 @@ let stable = "0.0.60"; ptb = "0.0.95"; canary = "0.0.455"; - development = "0.0.23"; + development = "0.0.24"; } else { stable = "0.0.311"; ptb = "0.0.124"; @@ -29,7 +29,7 @@ let }; development = fetchurl { url = "https://dl-development.discordapp.net/apps/linux/${version}/discord-development-${version}.tar.gz"; - hash = "sha256-dLHfiWih2e0pFVglQgViZ3As+fCPIfWHIgl5Nv34Iug="; + hash = "sha256-rSlGL2BwtUxLJltSD2Ms94qmZ4kuX5i9jFqyYC30jyQ="; }; }; x86_64-darwin = { diff --git a/pkgs/applications/networking/instant-messengers/element/element-web.nix b/pkgs/applications/networking/instant-messengers/element/element-web.nix index 3c880c073164..ab264860bfe9 100644 --- a/pkgs/applications/networking/instant-messengers/element/element-web.nix +++ b/pkgs/applications/networking/instant-messengers/element/element-web.nix @@ -1,9 +1,7 @@ { lib , stdenv -, runCommand , fetchFromGitHub , fetchYarnDeps -, writeText , jq , yarn , fixup-yarn-lock diff --git a/pkgs/applications/networking/instant-messengers/feishu/default.nix b/pkgs/applications/networking/instant-messengers/feishu/default.nix index d43320558b2a..e5e7f897ecb2 100644 --- a/pkgs/applications/networking/instant-messengers/feishu/default.nix +++ b/pkgs/applications/networking/instant-messengers/feishu/default.nix @@ -55,7 +55,6 @@ , stdenv , systemd , wayland -, wrapGAppsHook3 , xdg-utils , writeScript diff --git a/pkgs/applications/networking/instant-messengers/gomuks/default.nix b/pkgs/applications/networking/instant-messengers/gomuks/default.nix index 5ee85ef79d0e..64b971b2353b 100644 --- a/pkgs/applications/networking/instant-messengers/gomuks/default.nix +++ b/pkgs/applications/networking/instant-messengers/gomuks/default.nix @@ -1,6 +1,5 @@ { lib , stdenv -, substituteAll , buildGoModule , fetchFromGitHub , makeDesktopItem diff --git a/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/default.nix b/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/default.nix index 43f4d7adbd54..4f382dc28e75 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/default.nix @@ -30,7 +30,6 @@ , glibmm_2_68 , jemalloc , rnnoise -, abseil-cpp , microsoft-gsl , boost , fmt diff --git a/pkgs/applications/networking/irc/irssi/default.nix b/pkgs/applications/networking/irc/irssi/default.nix index 940242b6668d..6e035b2bdbc2 100644 --- a/pkgs/applications/networking/irc/irssi/default.nix +++ b/pkgs/applications/networking/irc/irssi/default.nix @@ -5,7 +5,6 @@ , libgcrypt , libintl , libotr -, libtool , meson , ncurses , ninja diff --git a/pkgs/applications/networking/jxplorer/default.nix b/pkgs/applications/networking/jxplorer/default.nix index c31c27bdd5db..e7bd11e5f1d0 100644 --- a/pkgs/applications/networking/jxplorer/default.nix +++ b/pkgs/applications/networking/jxplorer/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, makeDesktopItem, ant, jdk8, copyDesktopItems, makeWrapper }: +{ lib, stdenv, fetchurl, makeDesktopItem, jdk8, copyDesktopItems, makeWrapper }: stdenv.mkDerivation rec { pname = "jxplorer"; diff --git a/pkgs/applications/networking/mailreaders/alot/default.nix b/pkgs/applications/networking/mailreaders/alot/default.nix index 878ecbf4ee5d..9fb1732c788b 100644 --- a/pkgs/applications/networking/mailreaders/alot/default.nix +++ b/pkgs/applications/networking/mailreaders/alot/default.nix @@ -4,7 +4,6 @@ , file , gnupg , gawk -, notmuch , procps , withManpage ? false }: diff --git a/pkgs/applications/networking/mailreaders/mailspring/darwin.nix b/pkgs/applications/networking/mailreaders/mailspring/darwin.nix index cccc46a4f5eb..e0166e361fe9 100644 --- a/pkgs/applications/networking/mailreaders/mailspring/darwin.nix +++ b/pkgs/applications/networking/mailreaders/mailspring/darwin.nix @@ -1,5 +1,4 @@ -{ lib -, stdenv +{ stdenv , fetchurl , pname , version diff --git a/pkgs/applications/networking/mullvad/openvpn.nix b/pkgs/applications/networking/mullvad/openvpn.nix index ad3317280169..0dcfeaabf677 100644 --- a/pkgs/applications/networking/mullvad/openvpn.nix +++ b/pkgs/applications/networking/mullvad/openvpn.nix @@ -3,7 +3,6 @@ , openvpn , fetchpatch , fetchurl -, iproute2 , libnl , autoreconfHook , pkg-config diff --git a/pkgs/applications/networking/netmaker/default.nix b/pkgs/applications/networking/netmaker/default.nix index cba1b1d45367..37fc5bdb25aa 100644 --- a/pkgs/applications/networking/netmaker/default.nix +++ b/pkgs/applications/networking/netmaker/default.nix @@ -1,6 +1,5 @@ { buildGoModule , fetchFromGitHub -, installShellFiles , lib , libglvnd , pkg-config diff --git a/pkgs/applications/networking/p2p/magnetico/default.nix b/pkgs/applications/networking/p2p/magnetico/default.nix index f3579c494ba8..aeb6ec21fb26 100644 --- a/pkgs/applications/networking/p2p/magnetico/default.nix +++ b/pkgs/applications/networking/p2p/magnetico/default.nix @@ -1,55 +1,37 @@ { lib -, fetchFromGitHub -, fetchpatch -, nixosTests +, stdenv +, fetchFromGitea , buildGoModule +, nixosTests , sqlite }: -buildGoModule { +buildGoModule rec { pname = "magnetico"; - version = "unstable-2022-08-10"; + version = "0.12.1"; - src = fetchFromGitHub { - owner = "ireun"; + src = fetchFromGitea { + domain = "maxwell.ydns.eu/git"; + owner = "rnhmjoj"; repo = "magnetico"; - rev = "828e230d3b3c0759d3274e27f5a7b70400f4d6ea"; - hash = "sha256-V1pBzillWTk9iuHAhFztxYaq4uLL3U3HYvedGk6ffbk="; + rev = "v${version}"; + hash = "sha256-cO5TVtQ1jdW1YkFtj35kmRfJG46/lXjXyz870NCPT0g="; }; - patches = [ - # https://github.com/ireun/magnetico/pull/15 - (fetchpatch { - url = "https://github.com/ireun/magnetico/commit/90db34991aa44af9b79ab4710c638607c6211c1c.patch"; - hash = "sha256-wC9lVQqfngQ5AaRgb4TtoWSgbQ2iSHeQ2UBDUyWjMK8="; - }) - ]; - - vendorHash = "sha256-JDrBXjnQAcWp8gKvnm+q1F5oV+FozKUvhHK/Me/Cyj8="; + vendorHash = "sha256-jIVMQtPCq9RYaYsH4LSZJFspH6TpCbgzHN0GX8cM/CI="; buildInputs = [ sqlite ]; - buildPhase = '' - runHook preBuild + tags = [ "fts5" "libsqlite3" ]; + ldflags = [ "-s" "-w" ]; - make magneticow magneticod - - runHook postBuild - ''; - - checkPhase = '' - runHook preCheck - - make test - - runHook postCheck - ''; + doCheck = !stdenv.hostPlatform.isStatic; passthru.tests = { inherit (nixosTests) magnetico; }; meta = with lib; { description = "Autonomous (self-hosted) BitTorrent DHT search engine suite"; - homepage = "https://github.com/ireun/magnetico"; + homepage = "https://maxwell.ydns.eu/git/rnhmjoj/magnetico"; license = licenses.agpl3Only; badPlatforms = platforms.darwin; maintainers = with maintainers; [ rnhmjoj ]; diff --git a/pkgs/applications/networking/p2p/retroshare/default.nix b/pkgs/applications/networking/p2p/retroshare/default.nix index e98afce389d9..bbfc978eef5b 100644 --- a/pkgs/applications/networking/p2p/retroshare/default.nix +++ b/pkgs/applications/networking/p2p/retroshare/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, mkDerivation, fetchFromGitHub, fetchpatch2 +{ lib, mkDerivation, fetchFromGitHub, fetchpatch2 , qmake, cmake, pkg-config, miniupnpc, bzip2 , speex, libmicrohttpd, libxml2, libxslt, sqlcipher, rapidjson, libXScrnSaver , qtbase, qtx11extras, qtmultimedia, libgnome-keyring diff --git a/pkgs/applications/networking/p2p/xd/default.nix b/pkgs/applications/networking/p2p/xd/default.nix index b513d35f2ab1..2974fe393579 100644 --- a/pkgs/applications/networking/p2p/xd/default.nix +++ b/pkgs/applications/networking/p2p/xd/default.nix @@ -1,4 +1,4 @@ -{ pkgs, buildGoModule, fetchFromGitHub, lib, perl }: +{ buildGoModule, fetchFromGitHub, lib, perl }: buildGoModule rec { pname = "XD"; diff --git a/pkgs/applications/networking/remote/citrix-workspace/generic.nix b/pkgs/applications/networking/remote/citrix-workspace/generic.nix index aa96c72e400d..231defdc34c5 100644 --- a/pkgs/applications/networking/remote/citrix-workspace/generic.nix +++ b/pkgs/applications/networking/remote/citrix-workspace/generic.nix @@ -2,7 +2,7 @@ , file, atk, alsa-lib, cairo, fontconfig, gdk-pixbuf, glib, webkitgtk, gtk2-x11, gtk3 , heimdal, krb5, libsoup, libvorbis, speex, openssl, zlib, xorg, pango, gtk2 , gnome2, mesa, nss, nspr, gtk_engines, freetype, dconf, libpng12, libxml2 -, libjpeg, libredirect, tzdata, cacert, systemd, libcxx, e2fsprogs, symlinkJoin +, libjpeg, libredirect, tzdata, cacert, systemd, libcxx, symlinkJoin , libpulseaudio, pcsclite, glib-networking, llvmPackages_12, opencv4 , libfaketime , libinput, libcap, libjson, libsecret, libcanberra-gtk3 diff --git a/pkgs/applications/networking/scaleft/default.nix b/pkgs/applications/networking/scaleft/default.nix index 8a500c5e162f..942cad0d42fe 100644 --- a/pkgs/applications/networking/scaleft/default.nix +++ b/pkgs/applications/networking/scaleft/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, rpmextract, patchelf, bash, testers, scaleft }: +{ lib, stdenv, fetchurl, rpmextract, patchelf, testers, scaleft }: stdenv.mkDerivation rec { pname = "scaleft"; diff --git a/pkgs/applications/networking/seafile-client/default.nix b/pkgs/applications/networking/seafile-client/default.nix index 0a133bb49e5e..fbb80a34c44c 100644 --- a/pkgs/applications/networking/seafile-client/default.nix +++ b/pkgs/applications/networking/seafile-client/default.nix @@ -3,7 +3,6 @@ , fetchFromGitHub , pkg-config , cmake -, qtbase , qttools , libuuid , seafile-shared diff --git a/pkgs/applications/networking/tmpmail/default.nix b/pkgs/applications/networking/tmpmail/default.nix index b55db4e64af2..55a42eebebd2 100644 --- a/pkgs/applications/networking/tmpmail/default.nix +++ b/pkgs/applications/networking/tmpmail/default.nix @@ -26,7 +26,7 @@ stdenvNoCC.mkDerivation rec { meta = with lib; { homepage = "https://github.com/sdushantha/tmpmail"; - description = "Temporary email right from your terminal written in POSIX sh "; + description = "Temporary email right from your terminal written in POSIX sh"; license = licenses.mit; maintainers = [ maintainers.lom ]; mainProgram = "tmpmail"; diff --git a/pkgs/applications/networking/wg-bond/default.nix b/pkgs/applications/networking/wg-bond/default.nix index f3dec5e6ab07..4b4ca8fd6b0b 100644 --- a/pkgs/applications/networking/wg-bond/default.nix +++ b/pkgs/applications/networking/wg-bond/default.nix @@ -1,4 +1,4 @@ -{ pkgs, lib, rustPlatform, fetchFromGitLab, wireguard-tools, makeWrapper }: +{ lib, rustPlatform, fetchFromGitLab, wireguard-tools, makeWrapper }: rustPlatform.buildRustPackage rec { pname = "wg-bond"; version = "0.2.0"; diff --git a/pkgs/applications/office/banana-accounting/default.nix b/pkgs/applications/office/banana-accounting/default.nix index a0213e05f60c..8afc96eaf88c 100644 --- a/pkgs/applications/office/banana-accounting/default.nix +++ b/pkgs/applications/office/banana-accounting/default.nix @@ -1,6 +1,5 @@ { autoPatchelfHook , cairo -, config , e2fsprogs , fetchurl , gmp diff --git a/pkgs/applications/office/cutemarked-ng/default.nix b/pkgs/applications/office/cutemarked-ng/default.nix index cd564199b016..2c55edb037aa 100644 --- a/pkgs/applications/office/cutemarked-ng/default.nix +++ b/pkgs/applications/office/cutemarked-ng/default.nix @@ -4,7 +4,6 @@ , qmake , pkg-config , qttools -, qtbase , qtwebengine , wrapQtAppsHook , qmarkdowntextedit diff --git a/pkgs/applications/office/kitsas/default.nix b/pkgs/applications/office/kitsas/default.nix index 28064da7fe4c..f8f32ecec6ed 100644 --- a/pkgs/applications/office/kitsas/default.nix +++ b/pkgs/applications/office/kitsas/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, qmake, qtbase, qtsvg, poppler, libzip, pkg-config, wrapQtAppsHook }: +{ lib, stdenv, fetchFromGitHub, qmake, qtsvg, poppler, libzip, pkg-config, wrapQtAppsHook }: stdenv.mkDerivation rec { pname = "kitsas"; diff --git a/pkgs/applications/office/libreoffice/darwin/default.nix b/pkgs/applications/office/libreoffice/darwin/default.nix index 9043d575fa06..f415b9164959 100644 --- a/pkgs/applications/office/libreoffice/darwin/default.nix +++ b/pkgs/applications/office/libreoffice/darwin/default.nix @@ -3,7 +3,6 @@ , fetchurl , undmg , writeScript -, callPackage }: let diff --git a/pkgs/applications/office/libreoffice/default.nix b/pkgs/applications/office/libreoffice/default.nix index 8a3bde81ac98..8b063ad6c70e 100644 --- a/pkgs/applications/office/libreoffice/default.nix +++ b/pkgs/applications/office/libreoffice/default.nix @@ -642,5 +642,6 @@ in stdenv.mkDerivation (finalAttrs: { license = licenses.lgpl3; maintainers = with maintainers; [ raskin ]; platforms = platforms.linux; + mainProgram = "libreoffice"; }; }) diff --git a/pkgs/applications/office/libreoffice/wrapper.nix b/pkgs/applications/office/libreoffice/wrapper.nix index 4f86406e5159..d2e62f8e5c74 100644 --- a/pkgs/applications/office/libreoffice/wrapper.nix +++ b/pkgs/applications/office/libreoffice/wrapper.nix @@ -5,7 +5,6 @@ , makeWrapper , xorg # for lndir , runCommand -, substituteAll # For Emulating wrapGAppsHook3 , gsettings-desktop-schemas , hicolor-icon-theme diff --git a/pkgs/applications/office/timetrap/default.nix b/pkgs/applications/office/timetrap/default.nix index 4ec8101db0e5..1bdc84663835 100644 --- a/pkgs/applications/office/timetrap/default.nix +++ b/pkgs/applications/office/timetrap/default.nix @@ -1,6 +1,5 @@ { stdenv , lib -, pkgs , bundlerEnv , bundlerApp , bundlerUpdateScript diff --git a/pkgs/applications/office/zk/default.nix b/pkgs/applications/office/zk/default.nix index a274ca210daf..e491e9b95fcb 100644 --- a/pkgs/applications/office/zk/default.nix +++ b/pkgs/applications/office/zk/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchFromGitHub, buildGoModule, icu }: +{ lib, fetchFromGitHub, buildGoModule }: buildGoModule rec { pname = "zk"; diff --git a/pkgs/applications/radio/digiham/default.nix b/pkgs/applications/radio/digiham/default.nix index 652c6c63cf59..c5f08e1b778a 100644 --- a/pkgs/applications/radio/digiham/default.nix +++ b/pkgs/applications/radio/digiham/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchFromGitHub -, cmake, pkg-config, protobuf, icu, csdr, codecserver +, cmake, protobuf, icu, csdr, codecserver }: stdenv.mkDerivation rec { diff --git a/pkgs/applications/radio/flamp/default.nix b/pkgs/applications/radio/flamp/default.nix index fc44826258be..b0a70b40898f 100644 --- a/pkgs/applications/radio/flamp/default.nix +++ b/pkgs/applications/radio/flamp/default.nix @@ -4,7 +4,6 @@ , autoreconfHook , pkg-config , fltk13 -, libsndfile , gettext }: diff --git a/pkgs/applications/radio/qdmr/default.nix b/pkgs/applications/radio/qdmr/default.nix index 6217a169ef25..4096b648ec1e 100644 --- a/pkgs/applications/radio/qdmr/default.nix +++ b/pkgs/applications/radio/qdmr/default.nix @@ -3,7 +3,6 @@ stdenv, fetchFromGitHub, installShellFiles, - writeText, cmake, libxslt, docbook_xsl_ns, diff --git a/pkgs/applications/radio/qlog/default.nix b/pkgs/applications/radio/qlog/default.nix index 1db81dab27ba..b8df78021495 100644 --- a/pkgs/applications/radio/qlog/default.nix +++ b/pkgs/applications/radio/qlog/default.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation rec { pname = "qlog"; - version = "0.37.1"; + version = "0.37.2"; src = fetchFromGitHub { owner = "foldynl"; repo = "QLog"; rev = "v${version}"; - hash = "sha256-ZIgKyPRTzlk6N23SmDEPNM8vXXh0FizXb9/WqtbmSCU="; + hash = "sha256-cphbM9dl+Ls2i3H5QjOugW0nXqa9bp5LpcnE9ACjqWM="; fetchSubmodules = true; }; diff --git a/pkgs/applications/science/biology/jbrowse/default.nix b/pkgs/applications/science/biology/jbrowse/default.nix index 90d71df72147..f2cbf1edf094 100644 --- a/pkgs/applications/science/biology/jbrowse/default.nix +++ b/pkgs/applications/science/biology/jbrowse/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchurl, appimageTools, wrapGAppsHook3 }: +{ lib, fetchurl, appimageTools }: let pname = "jbrowse"; diff --git a/pkgs/applications/science/biology/mrbayes/default.nix b/pkgs/applications/science/biology/mrbayes/default.nix index 54f5b9bbb370..ddc7bff44563 100644 --- a/pkgs/applications/science/biology/mrbayes/default.nix +++ b/pkgs/applications/science/biology/mrbayes/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, readline }: +{ lib, stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { pname = "mrbayes"; diff --git a/pkgs/applications/science/biology/nest/default.nix b/pkgs/applications/science/biology/nest/default.nix index 807af7ce488a..0b2dcbf9af3c 100644 --- a/pkgs/applications/science/biology/nest/default.nix +++ b/pkgs/applications/science/biology/nest/default.nix @@ -13,7 +13,6 @@ , boost , python3 , readline -, autoPatchelfHook , withPython ? false , withMpi ? false }: diff --git a/pkgs/applications/science/chemistry/jmol/default.nix b/pkgs/applications/science/chemistry/jmol/default.nix index 8bdd3f4b5da6..3e9cd1aaeaa6 100644 --- a/pkgs/applications/science/chemistry/jmol/default.nix +++ b/pkgs/applications/science/chemistry/jmol/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { baseVersion = "${lib.versions.major version}.${lib.versions.minor version}"; in fetchurl { url = "mirror://sourceforge/jmol/Jmol/Version%20${baseVersion}/Jmol%20${version}/Jmol-${version}-binary.tar.gz"; - hash = "sha256-Lpy5A7TWxSrBeGSsp+HlEXDrbkB840QZlvIeop6YUTw="; + hash = "sha256-uOPRdTmEbU376G7a7om5UpBjemkN170PwGCskJY41HE="; }; patchPhase = '' diff --git a/pkgs/applications/science/chemistry/nwchem/default.nix b/pkgs/applications/science/chemistry/nwchem/default.nix index 61266a9f0285..af63e2a77568 100644 --- a/pkgs/applications/science/chemistry/nwchem/default.nix +++ b/pkgs/applications/science/chemistry/nwchem/default.nix @@ -1,6 +1,5 @@ { lib , stdenv -, pkgs , fetchFromGitHub , fetchurl , mpiCheckPhaseHook @@ -14,7 +13,6 @@ , lapack , python3 , tcsh -, bash , automake , autoconf , libtool diff --git a/pkgs/applications/science/chemistry/quantum-espresso/default.nix b/pkgs/applications/science/chemistry/quantum-espresso/default.nix index 2c565cb5db9f..2156c1d26969 100644 --- a/pkgs/applications/science/chemistry/quantum-espresso/default.nix +++ b/pkgs/applications/science/chemistry/quantum-espresso/default.nix @@ -4,7 +4,6 @@ , fetchFromGitHub , git , cmake -, gnum4 , gfortran , pkg-config , fftw diff --git a/pkgs/applications/science/computer-architecture/accelergy/default.nix b/pkgs/applications/science/computer-architecture/accelergy/default.nix index 9eb6f341b714..42609ada09a3 100644 --- a/pkgs/applications/science/computer-architecture/accelergy/default.nix +++ b/pkgs/applications/science/computer-architecture/accelergy/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchFromGitHub, python3Packages, pkgs }: +{ lib, fetchFromGitHub, python3Packages }: python3Packages.buildPythonApplication rec { pname = "accelergy"; diff --git a/pkgs/applications/science/electronics/openroad/default.nix b/pkgs/applications/science/electronics/openroad/default.nix index 16659892a6ee..0c929fe47c18 100644 --- a/pkgs/applications/science/electronics/openroad/default.nix +++ b/pkgs/applications/science/electronics/openroad/default.nix @@ -15,7 +15,6 @@ , clp # for or-tools , eigen , glpk -, gtest , lcov , lemon-graph , libjpeg diff --git a/pkgs/applications/science/electronics/verilator/default.nix b/pkgs/applications/science/electronics/verilator/default.nix index c467bdfc547b..1bed87615756 100644 --- a/pkgs/applications/science/electronics/verilator/default.nix +++ b/pkgs/applications/science/electronics/verilator/default.nix @@ -8,11 +8,8 @@ python3, autoconf, which, - cmake, - ccache, help2man, makeWrapper, - glibcLocales, systemc, git, numactl, diff --git a/pkgs/applications/science/electronics/xyce/default.nix b/pkgs/applications/science/electronics/xyce/default.nix index 93c155038a22..85cdafb66057 100644 --- a/pkgs/applications/science/electronics/xyce/default.nix +++ b/pkgs/applications/science/electronics/xyce/default.nix @@ -17,14 +17,12 @@ , withMPI ? false # for doc , texliveMedium -, pandoc , enableDocs ? true # for tests , bash , bc , openssh # required by MPI , perl -, perlPackages , python3 , enableTests ? true }: diff --git a/pkgs/applications/science/logic/msat/default.nix b/pkgs/applications/science/logic/msat/default.nix index 299fe95224eb..3c27493baff8 100644 --- a/pkgs/applications/science/logic/msat/default.nix +++ b/pkgs/applications/science/logic/msat/default.nix @@ -1,4 +1,4 @@ -{ lib, ocamlPackages }: +{ ocamlPackages }: with ocamlPackages; buildDunePackage { pname = "msat-bin"; diff --git a/pkgs/applications/science/math/wolfram-engine/default.nix b/pkgs/applications/science/math/wolfram-engine/default.nix index 685bc1bff3b1..4ce49e6cad4c 100644 --- a/pkgs/applications/science/math/wolfram-engine/default.nix +++ b/pkgs/applications/science/math/wolfram-engine/default.nix @@ -2,8 +2,6 @@ , stdenv , autoPatchelfHook , requireFile -, callPackage -, makeWrapper , alsa-lib , dbus , fontconfig diff --git a/pkgs/applications/science/math/wolfram-engine/notebook.nix b/pkgs/applications/science/math/wolfram-engine/notebook.nix index 85570eeca7fb..07cd0afa3099 100644 --- a/pkgs/applications/science/math/wolfram-engine/notebook.nix +++ b/pkgs/applications/science/math/wolfram-engine/notebook.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, writeScriptBin, jupyter, wolfram-for-jupyter-kernel }: +{ stdenv, writeScriptBin, jupyter, wolfram-for-jupyter-kernel }: let wolfram-jupyter = jupyter.override { definitions = { wolfram = wolfram-for-jupyter-kernel.definition; }; }; diff --git a/pkgs/applications/science/medicine/xmedcon/default.nix b/pkgs/applications/science/medicine/xmedcon/default.nix index 1f0686cc0dad..b4170dfa228a 100644 --- a/pkgs/applications/science/medicine/xmedcon/default.nix +++ b/pkgs/applications/science/medicine/xmedcon/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config wrapGAppsHook3 ]; meta = with lib; { - description = "Open source toolkit for medical image conversion "; + description = "Open source toolkit for medical image conversion"; homepage = "https://xmedcon.sourceforge.net/"; license = licenses.lgpl2Plus; maintainers = with maintainers; [ arianvp flokli ]; diff --git a/pkgs/applications/science/misc/bada-bib/default.nix b/pkgs/applications/science/misc/bada-bib/default.nix index 83abd40030ee..fba372632909 100644 --- a/pkgs/applications/science/misc/bada-bib/default.nix +++ b/pkgs/applications/science/misc/bada-bib/default.nix @@ -7,7 +7,6 @@ , gdk-pixbuf , gettext , glib -, gnome , gobject-introspection , gtk4 , gtksourceview5 diff --git a/pkgs/applications/science/misc/openrefine/default.nix b/pkgs/applications/science/misc/openrefine/default.nix index 60809a420b39..6d169db23b92 100644 --- a/pkgs/applications/science/misc/openrefine/default.nix +++ b/pkgs/applications/science/misc/openrefine/default.nix @@ -10,12 +10,12 @@ }: let - version = "3.8.1"; + version = "3.8.2"; src = fetchFromGitHub { owner = "openrefine"; repo = "openrefine"; rev = version; - hash = "sha256-MnFwFJdKIU7D8GQgnDvCO+P8r8h1Se/wmbt/Z3EX+3Q="; + hash = "sha256-3KCO9ooYN8PPVirU2wh7wu4feHqugc3JSXWR2aWIanE="; }; npmPkg = buildNpmPackage { @@ -53,7 +53,7 @@ in maven.buildMavenPackage { mvnJdk = jdk; mvnParameters = "-pl !packaging"; - mvnHash = "sha256-FD4g0Mshz39N1h8MDAk907PhF5TguWTZ7AXKECHuhzQ="; + mvnHash = "sha256-AuZp+uq5bmb4gnzKvqXeTmBrsCT6qmJOrwtJq9iCkRQ="; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/applications/science/misc/root/tests/test-thisroot.nix b/pkgs/applications/science/misc/root/tests/test-thisroot.nix index 3540dde8c913..3610e23acbff 100644 --- a/pkgs/applications/science/misc/root/tests/test-thisroot.nix +++ b/pkgs/applications/science/misc/root/tests/test-thisroot.nix @@ -3,7 +3,6 @@ , root , bash , fish -, ksh , tcsh , zsh }: runCommand "test-thisroot" diff --git a/pkgs/applications/science/physics/elmerfem/default.nix b/pkgs/applications/science/physics/elmerfem/default.nix index 4b19bc4b17b4..309e81fad746 100644 --- a/pkgs/applications/science/physics/elmerfem/default.nix +++ b/pkgs/applications/science/physics/elmerfem/default.nix @@ -2,7 +2,6 @@ , stdenv , fetchFromGitHub , cmake -, git , gfortran , mpi , blas diff --git a/pkgs/applications/system/booster/default.nix b/pkgs/applications/system/booster/default.nix index e7c646faf0ac..c211a53bdc56 100644 --- a/pkgs/applications/system/booster/default.nix +++ b/pkgs/applications/system/booster/default.nix @@ -49,7 +49,7 @@ buildGoModule rec { ''; meta = with lib; { - description = "Fast and secure initramfs generator "; + description = "Fast and secure initramfs generator"; homepage = "https://github.com/anatol/booster"; license = licenses.mit; maintainers = with maintainers; [ urandom ]; diff --git a/pkgs/applications/terminal-emulators/rxvt-unicode/wrapper.nix b/pkgs/applications/terminal-emulators/rxvt-unicode/wrapper.nix index 639c7b5dda50..2e2cb076c697 100644 --- a/pkgs/applications/terminal-emulators/rxvt-unicode/wrapper.nix +++ b/pkgs/applications/terminal-emulators/rxvt-unicode/wrapper.nix @@ -1,5 +1,4 @@ -{ callPackage -, symlinkJoin +{ symlinkJoin , makeWrapper , lib , rxvt-unicode-unwrapped diff --git a/pkgs/applications/terminal-emulators/xterm/default.nix b/pkgs/applications/terminal-emulators/xterm/default.nix index 5650910cd8a6..9595da4f4d75 100644 --- a/pkgs/applications/terminal-emulators/xterm/default.nix +++ b/pkgs/applications/terminal-emulators/xterm/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchurl, xorg, ncurses, freetype, fontconfig , pkg-config, makeWrapper, nixosTests, gitUpdater -, nix, gnused, coreutils, enableDecLocator ? true }: +, enableDecLocator ? true }: stdenv.mkDerivation rec { pname = "xterm"; diff --git a/pkgs/applications/version-management/git-backdate/default.nix b/pkgs/applications/version-management/git-backdate/default.nix index c63b2e6f3429..0d7d5810b9a8 100644 --- a/pkgs/applications/version-management/git-backdate/default.nix +++ b/pkgs/applications/version-management/git-backdate/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, git, python3 }: +{ lib, stdenv, fetchFromGitHub, python3 }: stdenv.mkDerivation rec { pname = "git-backdate"; diff --git a/pkgs/applications/version-management/git-machete/default.nix b/pkgs/applications/version-management/git-machete/default.nix index 4df30e050968..6fb9f3b72a51 100644 --- a/pkgs/applications/version-management/git-machete/default.nix +++ b/pkgs/applications/version-management/git-machete/default.nix @@ -6,8 +6,6 @@ , installShellFiles , git , nix-update-script -, testers -, git-machete }: buildPythonApplication rec { diff --git a/pkgs/applications/version-management/git-open/default.nix b/pkgs/applications/version-management/git-open/default.nix index 29975c5b68d0..1b4153f2ad1d 100644 --- a/pkgs/applications/version-management/git-open/default.nix +++ b/pkgs/applications/version-management/git-open/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, git, xdg-utils, gnugrep, fetchFromGitHub, installShellFiles, makeWrapper, pandoc }: +{ lib, stdenv, xdg-utils, gnugrep, fetchFromGitHub, installShellFiles, makeWrapper, pandoc }: stdenv.mkDerivation rec { pname = "git-open"; diff --git a/pkgs/applications/version-management/gita/default.nix b/pkgs/applications/version-management/gita/default.nix index 41fe453647de..9bb602d2a5cd 100644 --- a/pkgs/applications/version-management/gita/default.nix +++ b/pkgs/applications/version-management/gita/default.nix @@ -1,8 +1,6 @@ { lib , buildPythonApplication , fetchFromGitHub -, git -, pytest , pyyaml , setuptools , installShellFiles diff --git a/pkgs/applications/version-management/gitolite/default.nix b/pkgs/applications/version-management/gitolite/default.nix index 6e7a627f9cba..df0c75976032 100644 --- a/pkgs/applications/version-management/gitolite/default.nix +++ b/pkgs/applications/version-management/gitolite/default.nix @@ -1,4 +1,4 @@ -{ stdenv, coreutils, fetchFromGitHub, git, lib, makeWrapper, nettools, perl, perlPackages, nixosTests }: +{ stdenv, coreutils, fetchFromGitHub, git, lib, makeWrapper, nettools, perl, nixosTests }: stdenv.mkDerivation rec { pname = "gitolite"; diff --git a/pkgs/applications/version-management/p4/default.nix b/pkgs/applications/version-management/p4/default.nix index 7fb7f3c8f3ac..06e4624c8ee0 100644 --- a/pkgs/applications/version-management/p4/default.nix +++ b/pkgs/applications/version-management/p4/default.nix @@ -6,7 +6,6 @@ , linkFarm , jam , openssl -, xcbuild , CoreServices , Foundation , Security diff --git a/pkgs/applications/version-management/sapling/default.nix b/pkgs/applications/version-management/sapling/default.nix index f06f72f6e9e0..714cd4e67e2c 100644 --- a/pkgs/applications/version-management/sapling/default.nix +++ b/pkgs/applications/version-management/sapling/default.nix @@ -3,7 +3,6 @@ , python3Packages , fetchFromGitHub , fetchurl -, sd , cargo , curl , pkg-config diff --git a/pkgs/applications/video/clapper/default.nix b/pkgs/applications/video/clapper/default.nix index 12a66c90e8d5..dfdcacc3b318 100644 --- a/pkgs/applications/video/clapper/default.nix +++ b/pkgs/applications/video/clapper/default.nix @@ -1,5 +1,4 @@ -{ config -, lib +{ lib , stdenv , fetchFromGitHub , gobject-introspection diff --git a/pkgs/applications/video/deface/default.nix b/pkgs/applications/video/deface/default.nix index 0b0a2d085981..054bb04aee72 100644 --- a/pkgs/applications/video/deface/default.nix +++ b/pkgs/applications/video/deface/default.nix @@ -2,7 +2,6 @@ , stdenv , python3 , fetchFromGitHub -, makeWrapper , pkgs }: diff --git a/pkgs/applications/video/epgstation/default.nix b/pkgs/applications/video/epgstation/default.nix index c5d12c8403c1..63c1e050e7de 100644 --- a/pkgs/applications/video/epgstation/default.nix +++ b/pkgs/applications/video/epgstation/default.nix @@ -6,7 +6,6 @@ , makeWrapper , bash , nodejs -, gzip , python3 }: diff --git a/pkgs/applications/video/freetube/default.nix b/pkgs/applications/video/freetube/default.nix index d206aa67528a..ed8b702c6e32 100644 --- a/pkgs/applications/video/freetube/default.nix +++ b/pkgs/applications/video/freetube/default.nix @@ -1,19 +1,25 @@ -{ stdenv, lib, fetchurl, appimageTools, makeWrapper, electron, nixosTests }: +{ + stdenv, + lib, + fetchurl, + appimageTools, + makeWrapper, + electron, + nixosTests, +}: stdenv.mkDerivation rec { pname = "freetube"; - version = "0.21.1"; + version = "0.21.2"; src = fetchurl { url = "https://github.com/FreeTubeApp/FreeTube/releases/download/v${version}-beta/freetube_${version}_amd64.AppImage"; - sha256 = "sha256-HAtOWa/2j8xIICz8BQcG9X4t5Wu+VjlpWUGcTVteeME="; + hash = "sha256-Mk8qHDiUs2Nd8APMR8q1wZhTtxyzRhBAeXew9ogC3nk="; }; passthru.tests = nixosTests.freetube; - appimageContents = appimageTools.extractType2 { - inherit pname version src; - }; + appimageContents = appimageTools.extractType2 { inherit pname version src; }; dontUnpack = true; dontConfigure = true; @@ -42,11 +48,14 @@ stdenv.mkDerivation rec { --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--enable-features=UseOzonePlatform --ozone-platform=wayland}}" ''; - meta = with lib; { + meta = { description = "Open Source YouTube app for privacy"; homepage = "https://freetubeapp.io/"; - license = licenses.agpl3Only; - maintainers = with maintainers; [ ryneeverett alyaeanyx ]; + license = lib.licenses.agpl3Only; + maintainers = with lib.maintainers; [ + ryneeverett + alyaeanyx + ]; inherit (electron.meta) platforms; mainProgram = "freetube"; }; diff --git a/pkgs/applications/video/jftui/default.nix b/pkgs/applications/video/jftui/default.nix index efd8d6ed6e2a..e30ba77dd873 100644 --- a/pkgs/applications/video/jftui/default.nix +++ b/pkgs/applications/video/jftui/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - description = "Jellyfin Terminal User Interface "; + description = "Jellyfin Terminal User Interface"; homepage = "https://github.com/Aanok/jftui"; license = licenses.unlicense; maintainers = [ maintainers.nyanloutre ]; diff --git a/pkgs/applications/video/kaffeine/default.nix b/pkgs/applications/video/kaffeine/default.nix index 40701d2cbf85..c2866e280f12 100644 --- a/pkgs/applications/video/kaffeine/default.nix +++ b/pkgs/applications/video/kaffeine/default.nix @@ -1,7 +1,6 @@ { stdenv , lib , fetchFromGitLab -, kio , cmake , extra-cmake-modules , libvlc diff --git a/pkgs/applications/video/kodi/addons/sendtokodi/default.nix b/pkgs/applications/video/kodi/addons/sendtokodi/default.nix index f801be10f35f..792f585673dd 100644 --- a/pkgs/applications/video/kodi/addons/sendtokodi/default.nix +++ b/pkgs/applications/video/kodi/addons/sendtokodi/default.nix @@ -1,4 +1,4 @@ -{ lib, buildKodiAddon, fetchFromGitHub, addonUpdateScript, kodi, inputstreamhelper }: +{ lib, buildKodiAddon, fetchFromGitHub, kodi, inputstreamhelper }: buildKodiAddon rec { pname = "sendtokodi"; diff --git a/pkgs/applications/video/kodi/addons/websocket/default.nix b/pkgs/applications/video/kodi/addons/websocket/default.nix index 40667e71392b..544f86a8bbbd 100644 --- a/pkgs/applications/video/kodi/addons/websocket/default.nix +++ b/pkgs/applications/video/kodi/addons/websocket/default.nix @@ -1,4 +1,4 @@ -{ lib, rel, buildKodiAddon, fetchzip, addonUpdateScript, six, addonDir }: +{ lib, rel, buildKodiAddon, fetchzip, addonUpdateScript, six }: buildKodiAddon rec { pname = "websocket"; diff --git a/pkgs/applications/video/kodi/unwrapped.nix b/pkgs/applications/video/kodi/unwrapped.nix index b3fd8d87881a..4c6b158b323a 100644 --- a/pkgs/applications/video/kodi/unwrapped.nix +++ b/pkgs/applications/video/kodi/unwrapped.nix @@ -1,10 +1,10 @@ -{ stdenv, lib, fetchFromGitHub, fetchzip, fetchpatch +{ stdenv, lib, fetchFromGitHub, fetchzip , autoconf, automake, libtool, makeWrapper , pkg-config, cmake, yasm, python3Packages , libxcrypt, libgcrypt, libgpg-error, libunistring , boost, avahi, lame , gettext, pcre-cpp, yajl, fribidi, which -, openssl, gperf, tinyxml2, tinyxml-2, taglib, libssh, swig, jre_headless +, openssl, gperf, tinyxml2, tinyxml-2, taglib, libssh, jre_headless , gtest, ncurses, spdlog , libxml2, systemd , alsa-lib, libGLU, libGL, ffmpeg, fontconfig, freetype, ftgl diff --git a/pkgs/applications/video/losslesscut-bin/build-from-appimage.nix b/pkgs/applications/video/losslesscut-bin/build-from-appimage.nix index 14e4cf215e7b..b6aa8009dcd0 100644 --- a/pkgs/applications/video/losslesscut-bin/build-from-appimage.nix +++ b/pkgs/applications/video/losslesscut-bin/build-from-appimage.nix @@ -1,9 +1,6 @@ -{ lib -, appimageTools +{ appimageTools , fetchurl , makeWrapper -, gtk3 -, gsettings-desktop-schemas , pname , version , hash diff --git a/pkgs/applications/video/mpv/wrapper.nix b/pkgs/applications/video/mpv/wrapper.nix index 533ede74f874..b68f2d50c5c4 100644 --- a/pkgs/applications/video/mpv/wrapper.nix +++ b/pkgs/applications/video/mpv/wrapper.nix @@ -8,7 +8,6 @@ , writeTextDir , yt-dlp # the unwrapped mpv derivation -, mpv }: let diff --git a/pkgs/applications/video/obs-studio/default.nix b/pkgs/applications/video/obs-studio/default.nix index 5a95f746ee2e..7de06b33e405 100644 --- a/pkgs/applications/video/obs-studio/default.nix +++ b/pkgs/applications/video/obs-studio/default.nix @@ -63,13 +63,13 @@ in stdenv.mkDerivation (finalAttrs: { pname = "obs-studio"; - version = "30.2.0"; + version = "30.2.2"; src = fetchFromGitHub { owner = "obsproject"; repo = "obs-studio"; rev = finalAttrs.version; - hash = "sha256-mwh2KLSz+I/8f3i/wST/2vKL/hWTCTaq53sinIEX75M="; + hash = "sha256-yMtLN/86+3wuNR+gGhsaxN4oGIC21bAcjbQfyTuXIYc="; fetchSubmodules = true; }; diff --git a/pkgs/applications/video/obs-studio/plugins/input-overlay.nix b/pkgs/applications/video/obs-studio/plugins/input-overlay.nix index bd47a3e94436..9a2069a27133 100644 --- a/pkgs/applications/video/obs-studio/plugins/input-overlay.nix +++ b/pkgs/applications/video/obs-studio/plugins/input-overlay.nix @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { dontWrapQtApps = true; meta = with lib; { - description = "Show keyboard, gamepad and mouse input on stream "; + description = "Show keyboard, gamepad and mouse input on stream"; homepage = "https://github.com/univrsal/input-overlay"; maintainers = with maintainers; [ glittershark ]; license = licenses.gpl2; diff --git a/pkgs/applications/video/rtabmap/default.nix b/pkgs/applications/video/rtabmap/default.nix index a720e672c783..b2eb371625cb 100644 --- a/pkgs/applications/video/rtabmap/default.nix +++ b/pkgs/applications/video/rtabmap/default.nix @@ -11,11 +11,9 @@ , qtbase , g2o , ceres-solver -, libpointmatcher , octomap , freenect , libdc1394 -, librealsense , libGL , libGLU , vtkWithQt5 diff --git a/pkgs/applications/video/stremio/default.nix b/pkgs/applications/video/stremio/default.nix index 1abb8f87bb29..1cef55fa9ecd 100644 --- a/pkgs/applications/video/stremio/default.nix +++ b/pkgs/applications/video/stremio/default.nix @@ -6,7 +6,6 @@ , mpv , nodejs , qmake -, qtwebchannel , qtwebengine , wrapQtAppsHook }: diff --git a/pkgs/applications/video/vdr/markad/default.nix b/pkgs/applications/video/vdr/markad/default.nix index efc08eaf06d1..c86a8ff29643 100644 --- a/pkgs/applications/video/vdr/markad/default.nix +++ b/pkgs/applications/video/vdr/markad/default.nix @@ -2,20 +2,7 @@ , stdenv , vdr , fetchFromGitHub -, graphicsmagick -, pcre -, xorgserver , ffmpeg -, libiconv -, boost -, libgcrypt -, perl -, util-linux -, groff -, libva -, xorg -, ncurses -, callPackage }: stdenv.mkDerivation rec { pname = "vdr-markad"; diff --git a/pkgs/applications/video/vdr/softhddevice/default.nix b/pkgs/applications/video/vdr/softhddevice/default.nix index 633a4b208e23..6d5e7c0342dc 100644 --- a/pkgs/applications/video/vdr/softhddevice/default.nix +++ b/pkgs/applications/video/vdr/softhddevice/default.nix @@ -14,12 +14,12 @@ }: stdenv.mkDerivation rec { pname = "vdr-softhddevice"; - version = "2.3.5"; + version = "2.3.6"; src = fetchFromGitHub { owner = "ua0lnj"; repo = "vdr-plugin-softhddevice"; - sha256 = "sha256-i/lxR/iSarmhJvqjcu8+HscTYoVExwCcweSNo206BYU="; + sha256 = "sha256-T3OG93Bx1RVyXeqkNJvhOSGojZHIWT3DHHEIzUoykds="; rev = "v${version}"; }; diff --git a/pkgs/applications/virtualization/docker/buildx.nix b/pkgs/applications/virtualization/docker/buildx.nix index 896955c6385f..bfd3c84bafcc 100644 --- a/pkgs/applications/virtualization/docker/buildx.nix +++ b/pkgs/applications/virtualization/docker/buildx.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "docker-buildx"; - version = "0.16.0"; + version = "0.16.1"; src = fetchFromGitHub { owner = "docker"; repo = "buildx"; rev = "v${version}"; - hash = "sha256-pEPm4NtuJeoULmESIZfWVW4jzS1eC6hUb5/62Tjsv0I="; + hash = "sha256-pD4drDX9jS6X6S2q/GaxODL1zVG++xGerDQiioONHII="; }; doCheck = false; diff --git a/pkgs/applications/virtualization/docker/compose.nix b/pkgs/applications/virtualization/docker/compose.nix index 7ab5852cd573..2b9d6e49451d 100644 --- a/pkgs/applications/virtualization/docker/compose.nix +++ b/pkgs/applications/virtualization/docker/compose.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "docker-compose"; - version = "2.29.0"; + version = "2.29.1"; src = fetchFromGitHub { owner = "docker"; repo = "compose"; rev = "v${version}"; - hash = "sha256-nyfTVTxdByNccxRn3kyE+75dHWqIGl2PWkIoNo8O6DM="; + hash = "sha256-6GZtKfPBE9Wl6ccwU1OY+9rq+IZr2qpOB4Vlxidhisw="; }; postPatch = '' @@ -16,7 +16,7 @@ buildGoModule rec { rm -rf e2e/ ''; - vendorHash = "sha256-ACFHejd8EMh2/NfQBLj/DM9ewIgueFtHHFc81Skgkk4="; + vendorHash = "sha256-CkXCAqHOlSc3jHqVUYovT8YDnlCZewpLv3sC0ADgwL0="; ldflags = [ "-X github.com/docker/compose/v2/internal.Version=${version}" "-s" "-w" ]; diff --git a/pkgs/applications/virtualization/docker/default.nix b/pkgs/applications/virtualization/docker/default.nix index 61a4def831b2..946544a02a95 100644 --- a/pkgs/applications/virtualization/docker/default.nix +++ b/pkgs/applications/virtualization/docker/default.nix @@ -315,15 +315,15 @@ rec { }; docker_27 = callPackage dockerGen rec { - version = "27.0.3"; + version = "27.1.1"; cliRev = "v${version}"; - cliHash = "sha256-fpjSnUq3T6WZO/FLeT377FWxwevbULob9dPiSBxZdHI="; + cliHash = "sha256-r9figEMYHHSbMYVFiw7GUMzjZBhlF+jyZqKixyCpoQ0="; mobyRev = "v${version}"; - mobyHash = "sha256-xinRILDSuubAAJh/dmpaU3csTf0VgukJIfSUkcHpa28="; + mobyHash = "sha256-LuCEdQQ3eWt8VyzmWkQTxlxTok9h/UlACTVls5LcI7g="; runcRev = "v1.1.13"; runcHash = "sha256-RQsM8Q7HogDVGbNpen3wxXNGR9lfqmNhkXTRoC+LBk8="; - containerdRev = "v1.7.18"; - containerdHash = "sha256-IlK5IwniaBhqMgxQzV8btQcbdJkNEQeUMoh6aOsBOHQ="; + containerdRev = "v1.7.20"; + containerdHash = "sha256-Q9lTzz+G5PSoChy8MZtbOpO81AyNWXC+CgGkdOg14uY="; tiniRev = "v0.19.0"; tiniHash = "sha256-ZDKu/8yE5G0RYFJdhgmCdN3obJNyRWv6K/Gd17zc1sI="; }; diff --git a/pkgs/applications/virtualization/umoci/default.nix b/pkgs/applications/virtualization/umoci/default.nix index 5dc9ae5028e8..acf03a96c747 100644 --- a/pkgs/applications/virtualization/umoci/default.nix +++ b/pkgs/applications/virtualization/umoci/default.nix @@ -3,7 +3,6 @@ , buildGoModule , go-md2man , installShellFiles -, bash }: buildGoModule rec { diff --git a/pkgs/applications/virtualization/virtualbox/guest-additions/builder.nix b/pkgs/applications/virtualization/virtualbox/guest-additions/builder.nix index 05b39e5fee00..11ae56d0a353 100644 --- a/pkgs/applications/virtualization/virtualbox/guest-additions/builder.nix +++ b/pkgs/applications/virtualization/virtualbox/guest-additions/builder.nix @@ -1,7 +1,7 @@ -{ config, stdenv, kernel, fetchurl, lib, pam, libxslt -, libX11, libXext, libXcursor, libXmu +{ stdenv, kernel, fetchurl, lib, pam, libxslt +, libXext, libXcursor, libXmu , glib, libXrandr, dbus, xz -, pkg-config, which, zlib, xorg +, pkg-config, which, xorg , yasm, patchelf, makeself , linuxHeaders, openssl}: diff --git a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix index ac867ce9ce72..4e0b8728f29b 100644 --- a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix +++ b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix @@ -1,6 +1,5 @@ -{ config, stdenv, kernel, callPackage, lib, dbus -, libX11, libXext, libXcursor, libXmu, xorg -, which, zlib, patchelf, makeWrapper +{ stdenv, kernel, callPackage, lib, dbus +, xorg, zlib, patchelf, makeWrapper }: with lib; diff --git a/pkgs/applications/window-managers/dwl/default.nix b/pkgs/applications/window-managers/dwl/default.nix index 68815952b17f..65ea637d6de1 100644 --- a/pkgs/applications/window-managers/dwl/default.nix +++ b/pkgs/applications/window-managers/dwl/default.nix @@ -8,7 +8,6 @@ , libxkbcommon , pixman , pkg-config -, substituteAll , wayland-scanner , wayland , wayland-protocols diff --git a/pkgs/applications/window-managers/maui-shell/default.nix b/pkgs/applications/window-managers/maui-shell/default.nix index 0ac02b0957fa..5a30b46e907e 100644 --- a/pkgs/applications/window-managers/maui-shell/default.nix +++ b/pkgs/applications/window-managers/maui-shell/default.nix @@ -1,11 +1,9 @@ { lib -, pkgs , mkDerivation , fetchFromGitHub , qtquickcontrols2 , cmake , extra-cmake-modules -, kio , krunner , prison , knotifyconfig diff --git a/pkgs/applications/window-managers/ragnarwm/default.nix b/pkgs/applications/window-managers/ragnarwm/default.nix index 2cb9f31e7334..6ffdc8a0a39e 100644 --- a/pkgs/applications/window-managers/ragnarwm/default.nix +++ b/pkgs/applications/window-managers/ragnarwm/default.nix @@ -61,13 +61,13 @@ stdenv.mkDerivation (finalAttrs: { providedSessions = [ "ragnar" ]; }; - meta = with lib; { + meta = { description = "Minimal, flexible & user-friendly X tiling window manager"; homepage = "https://ragnar-website.vercel.app"; changelog = "https://github.com/cococry/Ragnar/releases/tag/${finalAttrs.version}"; - license = licenses.gpl3Only; - maintainers = with maintainers; [ sigmanificient ]; + license = lib.licenses.gpl3Only; + maintainers = with lib.maintainers; [ sigmanificient ]; mainProgram = "ragnar"; - platforms = platforms.linux; + platforms = lib.platforms.linux; }; }) diff --git a/pkgs/applications/window-managers/taffybar/default.nix b/pkgs/applications/window-managers/taffybar/default.nix index 062fc2a3771d..16f6d38b222c 100644 --- a/pkgs/applications/window-managers/taffybar/default.nix +++ b/pkgs/applications/window-managers/taffybar/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, ghcWithPackages, taffybar, makeWrapper, packages ? (x: []) }: +{ stdenv, ghcWithPackages, taffybar, makeWrapper, packages ? (x: []) }: let taffybarEnv = ghcWithPackages (self: [ diff --git a/pkgs/build-support/fetchtorrent/tests.nix b/pkgs/build-support/fetchtorrent/tests.nix index e8cc3f33878b..05c91111ab68 100644 --- a/pkgs/build-support/fetchtorrent/tests.nix +++ b/pkgs/build-support/fetchtorrent/tests.nix @@ -1,4 +1,4 @@ -{ testers, fetchtorrent, lib, ... }: +{ testers, fetchtorrent, ... }: let wired-cd.meta.license = [ diff --git a/pkgs/build-support/trivial-builders/test/concat-test.nix b/pkgs/build-support/trivial-builders/test/concat-test.nix index 5ce435619069..7d023503c002 100644 --- a/pkgs/build-support/trivial-builders/test/concat-test.nix +++ b/pkgs/build-support/trivial-builders/test/concat-test.nix @@ -1,4 +1,4 @@ -{ callPackage, lib, pkgs, runCommand, concatText, writeText, hello, emptyFile }: +{ runCommand, concatText, writeText, hello, emptyFile }: let stri = writeText "pathToTest"; txt1 = stri "abc"; diff --git a/pkgs/by-name/_2/_2ship2harkinian/package.nix b/pkgs/by-name/_2/_2ship2harkinian/package.nix index c0c9ee4a7fa8..38212172c085 100644 --- a/pkgs/by-name/_2/_2ship2harkinian/package.nix +++ b/pkgs/by-name/_2/_2ship2harkinian/package.nix @@ -9,7 +9,6 @@ copyDesktopItems, makeDesktopItem, python3, - boost, SDL2, pkg-config, libpulseaudio, diff --git a/pkgs/by-name/af/affine/package.nix b/pkgs/by-name/af/affine/package.nix index 19ebf5131e5f..229d32bc1df8 100644 --- a/pkgs/by-name/af/affine/package.nix +++ b/pkgs/by-name/af/affine/package.nix @@ -1,12 +1,10 @@ { lib -, writeText , fetchurl , stdenvNoCC , copyDesktopItems , makeDesktopItem , makeWrapper , unzip -, bash , electron , commandLineArgs ? "" }: diff --git a/pkgs/servers/gemini/agate/default.nix b/pkgs/by-name/ag/agate/package.nix similarity index 87% rename from pkgs/servers/gemini/agate/default.nix rename to pkgs/by-name/ag/agate/package.nix index 18667580a5fe..90e2cf394a50 100644 --- a/pkgs/servers/gemini/agate/default.nix +++ b/pkgs/by-name/ag/agate/package.nix @@ -5,7 +5,7 @@ fetchFromGitHub, rustPlatform, libiconv, - Security, + darwin, openssl, pkg-config, nix-update-script, @@ -13,16 +13,16 @@ rustPlatform.buildRustPackage rec { pname = "agate"; - version = "3.3.7"; + version = "3.3.8"; src = fetchFromGitHub { owner = "mbrubeck"; repo = "agate"; rev = "v${version}"; - hash = "sha256-pNfTgkl59NTRDH+w23P49MUWzIXh5ElnJitMEYfsBnc="; + hash = "sha256-HK4ZTpRe6dEvBnjZLisSGXJmD5gTPEnf6f/gN0AHUsI="; }; - cargoHash = "sha256-RuSvweZhPWS2C2lwncxWAW2XLQN6+bAslv3p4IwQ2BA="; + cargoHash = "sha256-yRCH4TRZ3m7ZG/NAEi1YDisSoad6FxCyojtXVvwbU9w="; nativeBuildInputs = [ pkg-config ]; @@ -30,7 +30,7 @@ rustPlatform.buildRustPackage rec { [ openssl ] ++ lib.optionals stdenv.isDarwin [ libiconv - Security + darwin.apple_sdk.frameworks.Security ]; doInstallCheck = true; diff --git a/pkgs/by-name/al/alephone-eternal/package.nix b/pkgs/by-name/al/alephone-eternal/package.nix index c21284150618..186352db7ec1 100644 --- a/pkgs/by-name/al/alephone-eternal/package.nix +++ b/pkgs/by-name/al/alephone-eternal/package.nix @@ -1,4 +1,4 @@ -{ alephone, fetchurl, unrar }: +{ alephone, fetchurl }: alephone.makeWrapper rec { pname = "marathon-eternal"; diff --git a/pkgs/by-name/al/alephone-evil/package.nix b/pkgs/by-name/al/alephone-evil/package.nix index cf12f471a179..d6b59557133b 100644 --- a/pkgs/by-name/al/alephone-evil/package.nix +++ b/pkgs/by-name/al/alephone-evil/package.nix @@ -1,4 +1,4 @@ -{ alephone, fetchurl, unrar }: +{ alephone, fetchurl }: alephone.makeWrapper rec { pname = "marathon-evil"; diff --git a/pkgs/by-name/al/alephone-red/package.nix b/pkgs/by-name/al/alephone-red/package.nix index f24c9010cd63..a2f6a0279017 100644 --- a/pkgs/by-name/al/alephone-red/package.nix +++ b/pkgs/by-name/al/alephone-red/package.nix @@ -1,4 +1,4 @@ -{ alephone, fetchurl, unrar }: +{ alephone, fetchurl }: alephone.makeWrapper rec { pname = "marathon-red"; diff --git a/pkgs/by-name/am/am2rlauncher/package.nix b/pkgs/by-name/am/am2rlauncher/package.nix index 0698100d5bdd..2b47d0fbaafd 100644 --- a/pkgs/by-name/am/am2rlauncher/package.nix +++ b/pkgs/by-name/am/am2rlauncher/package.nix @@ -11,7 +11,6 @@ , openssl , xdelta , file -, busybox , openjdk , patchelf , fetchFromGitHub diff --git a/pkgs/by-name/ap/apvlv/package.nix b/pkgs/by-name/ap/apvlv/package.nix index 77ad5a034daa..0e5b60fd4a85 100644 --- a/pkgs/by-name/ap/apvlv/package.nix +++ b/pkgs/by-name/ap/apvlv/package.nix @@ -15,7 +15,6 @@ libxml2, libxshmfence, man, - nix-update-script, pcre, pkg-config, poppler, diff --git a/pkgs/by-name/at/atf/package.nix b/pkgs/by-name/at/atf/package.nix index a9810826dc89..e77eb5244d6c 100644 --- a/pkgs/by-name/at/atf/package.nix +++ b/pkgs/by-name/at/atf/package.nix @@ -5,7 +5,6 @@ fetchpatch, autoreconfHook, kyua, - pkg-config, gitUpdater, }: diff --git a/pkgs/by-name/au/authentik/ldap.nix b/pkgs/by-name/au/authentik/ldap.nix index d2e40497ce9b..1e1a5abf8754 100644 --- a/pkgs/by-name/au/authentik/ldap.nix +++ b/pkgs/by-name/au/authentik/ldap.nix @@ -1,4 +1,4 @@ -{ lib, buildGoModule, authentik }: +{ buildGoModule, authentik }: buildGoModule { pname = "authentik-ldap-outpost"; diff --git a/pkgs/by-name/au/authentik/radius.nix b/pkgs/by-name/au/authentik/radius.nix index 957fd3702b77..04efa139efea 100644 --- a/pkgs/by-name/au/authentik/radius.nix +++ b/pkgs/by-name/au/authentik/radius.nix @@ -1,4 +1,4 @@ -{ lib, buildGoModule, authentik }: +{ buildGoModule, authentik }: buildGoModule { pname = "authentik-radius-outpost"; diff --git a/pkgs/by-name/bi/bitmagnet/package.nix b/pkgs/by-name/bi/bitmagnet/package.nix index 15d9d7c012cc..dfeb7b31e86c 100644 --- a/pkgs/by-name/bi/bitmagnet/package.nix +++ b/pkgs/by-name/bi/bitmagnet/package.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "bitmagnet"; - version = "0.9.4"; + version = "0.9.5"; src = fetchFromGitHub { owner = "bitmagnet-io"; repo = "bitmagnet"; rev = "v${version}"; - hash = "sha256-IUWt6CBW2SXE6lc52ArKrmW+7uR1vczfbx4SOeE30IA="; + hash = "sha256-so9GD9hyGfuqqYq61OD1WJXba22cR4msOPp1wLI5vAU="; }; vendorHash = "sha256-aauXgHPZbSiTW9utuHXzJr7GsWs/2aFiGuukA/B9BRc="; diff --git a/pkgs/by-name/bl/blanket/package.nix b/pkgs/by-name/bl/blanket/package.nix index 6171cf0f88c7..72cb5c8faa65 100644 --- a/pkgs/by-name/bl/blanket/package.nix +++ b/pkgs/by-name/bl/blanket/package.nix @@ -7,7 +7,6 @@ wrapGAppsHook4, blueprint-compiler, desktop-file-utils, - appstream-glib, python3Packages, glib, gtk4, diff --git a/pkgs/by-name/bt/bt-migrate/package.nix b/pkgs/by-name/bt/bt-migrate/package.nix index 289e15960c0f..26701d1dc4f2 100644 --- a/pkgs/by-name/bt/bt-migrate/package.nix +++ b/pkgs/by-name/bt/bt-migrate/package.nix @@ -7,7 +7,6 @@ , fmt , jsoncons , pugixml -, sqlite , sqlite_orm , stdenv }: diff --git a/pkgs/by-name/bu/budgie-analogue-clock-applet/package.nix b/pkgs/by-name/bu/budgie-analogue-clock-applet/package.nix index ebc2947a4e5b..fe3c54487f6d 100644 --- a/pkgs/by-name/bu/budgie-analogue-clock-applet/package.nix +++ b/pkgs/by-name/bu/budgie-analogue-clock-applet/package.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "budgie-analogue-clock-applet"; - version = "2.0"; + version = "2.1"; src = fetchFromGitHub { owner = "samlane-ma"; repo = "analogue-clock-applet"; rev = "v${finalAttrs.version}"; - hash = "sha256-yId5bbdmELinBmZ5eISa5hQSYkeZCkix2FJ287GdcCs="; + hash = "sha256-NvXX5paRrjeJFqnOeJS9yNp+7cRohsN3+eocLqvcVj8="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ca/caido/package.nix b/pkgs/by-name/ca/caido/package.nix index a9cfb7d460d8..97d3d5b99d3c 100644 --- a/pkgs/by-name/ca/caido/package.nix +++ b/pkgs/by-name/ca/caido/package.nix @@ -1,40 +1,92 @@ -{ lib -, fetchurl -, appimageTools -, makeWrapper +{ + lib, + stdenv, + fetchurl, + appimageTools, + makeWrapper, + autoPatchelfHook, + libgcc, + appVariants ? [ ], }: let pname = "caido"; - version = "0.33.0"; - src = fetchurl { + appVariantList = [ + "cli" + "desktop" + ]; + version = "0.39.0"; + cli = fetchurl { + url = "https://storage.googleapis.com/caido-releases/v${version}/caido-cli-v${version}-linux-x86_64.tar.gz"; + hash = "sha256-I8UF2rzIKfpcrxyvDa4AReWDIHOKTCj3ERaWhG1xGG0="; + }; + desktop = fetchurl { url = "https://storage.googleapis.com/caido-releases/v${version}/caido-desktop-v${version}-linux-x86_64.AppImage"; - hash = "sha256-MUQ1tVcIpLrC2RKsWDqv8MBGaHfh56OxIC/ARArQjiU="; + hash = "sha256-KYQck2+YYPLJN3L6qchacjyVyyXR3nmJDTX5GPB4WvI="; + }; + appimageContents = appimageTools.extractType2 { + inherit pname version; + src = desktop; }; - appimageContents = appimageTools.extractType2 { inherit pname src version; }; -in appimageTools.wrapType2 { - inherit pname src version; + wrappedDesktop = appimageTools.wrapType2 { + src = desktop; + inherit pname version; - extraPkgs = pkgs: [ pkgs.libthai ]; + extraPkgs = pkgs: [ pkgs.libthai ]; - extraInstallCommands = '' - install -m 444 -D ${appimageContents}/caido.desktop -t $out/share/applications - install -m 444 -D ${appimageContents}/caido.png \ - $out/share/icons/hicolor/512x512/apps/caido.png - source "${makeWrapper}/nix-support/setup-hook" - wrapProgram $out/bin/${pname} \ - --set WEBKIT_DISABLE_COMPOSITING_MODE 1 - ''; + extraInstallCommands = '' + install -m 444 -D ${appimageContents}/caido.desktop -t $out/share/applications + install -m 444 -D ${appimageContents}/caido.png \ + $out/share/icons/hicolor/512x512/apps/caido.png + source "${makeWrapper}/nix-support/setup-hook" + wrapProgram $out/bin/caido \ + --set WEBKIT_DISABLE_COMPOSITING_MODE 1 + ''; + }; - meta = with lib; { + wrappedCli = stdenv.mkDerivation { + src = cli; + inherit pname version; + + nativeBuildInputs = [ autoPatchelfHook ]; + + buildInputs = [ libgcc ]; + + sourceRoot = "."; + + installPhase = '' + runHook preInstall + install -m755 -D caido-cli $out/bin/caido-cli + ''; + }; + + meta = { description = "Lightweight web security auditing toolkit"; homepage = "https://caido.io/"; changelog = "https://github.com/caido/caido/releases/tag/v${version}"; - license = licenses.unfree; - maintainers = with maintainers; [ octodi ]; - mainProgram = "caido"; - sourceProvenance = with sourceTypes; [ binaryNativeCode ]; + license = lib.licenses.unfree; + maintainers = with lib.maintainers; [ + octodi + d3vil0p3r + ]; platforms = [ "x86_64-linux" ]; }; -} + +in +lib.checkListOfEnum "${pname}: appVariants" appVariantList appVariants ( + if appVariants == [ "desktop" ] then + wrappedDesktop + else if appVariants == [ "cli" ] then + wrappedCli + else + stdenv.mkDerivation { + inherit pname version meta; + dontUnpack = true; + installPhase = '' + mkdir -p $out/bin + ln -s ${wrappedDesktop}/bin/caido $out/bin/caido + ln -s ${wrappedCli}/bin/caido-cli $out/bin/caido-cli + ''; + } +) diff --git a/pkgs/by-name/ce/celeste64/package.nix b/pkgs/by-name/ce/celeste64/package.nix index bcd6356015fe..7d497ec35166 100644 --- a/pkgs/by-name/ce/celeste64/package.nix +++ b/pkgs/by-name/ce/celeste64/package.nix @@ -7,7 +7,6 @@ copyDesktopItems, SDL2, libGL, - mesa, systemd, libpulseaudio, libselinux, diff --git a/pkgs/by-name/cl/clojure-lsp/package.nix b/pkgs/by-name/cl/clojure-lsp/package.nix index fc5ca91fb740..bc482b5dac7d 100644 --- a/pkgs/by-name/cl/clojure-lsp/package.nix +++ b/pkgs/by-name/cl/clojure-lsp/package.nix @@ -1,10 +1,8 @@ { lib, buildGraalvmNativeImage, - babashka, fetchurl, fetchFromGitHub, - clojure, writeScript, testers, clojure-lsp, diff --git a/pkgs/by-name/co/cosmic-edit/package.nix b/pkgs/by-name/co/cosmic-edit/package.nix index 2fc1f95082d9..9ff8810dc517 100644 --- a/pkgs/by-name/co/cosmic-edit/package.nix +++ b/pkgs/by-name/co/cosmic-edit/package.nix @@ -3,7 +3,6 @@ stdenv, fetchFromGitHub, rustPlatform, - cmake, makeBinaryWrapper, cosmic-icons, just, diff --git a/pkgs/by-name/co/cosmic-store/package.nix b/pkgs/by-name/co/cosmic-store/package.nix index fb4eb787cb70..61aa2aa4d9e7 100644 --- a/pkgs/by-name/co/cosmic-store/package.nix +++ b/pkgs/by-name/co/cosmic-store/package.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchFromGitHub, rustPlatform, appstream, makeBinaryWrapper , cosmic-icons, glib, just, pkg-config, libglvnd, libxkbcommon, libinput -, fontconfig, flatpak, freetype, openssl, mesa, wayland, xorg, vulkan-loader +, fontconfig, flatpak, freetype, openssl, wayland, xorg, vulkan-loader , vulkan-validation-layers, }: rustPlatform.buildRustPackage rec { diff --git a/pkgs/by-name/co/cosmic-term/package.nix b/pkgs/by-name/co/cosmic-term/package.nix index b2bcf3ebccbc..4d210eb6c232 100644 --- a/pkgs/by-name/co/cosmic-term/package.nix +++ b/pkgs/by-name/co/cosmic-term/package.nix @@ -8,7 +8,6 @@ , libinput , libxkbcommon , makeBinaryWrapper -, mesa , pkg-config , rustPlatform , stdenv diff --git a/pkgs/by-name/cr/cryptpad/0001-env.js-fix-httpSafePort-handling.patch b/pkgs/by-name/cr/cryptpad/0001-env.js-fix-httpSafePort-handling.patch new file mode 100644 index 000000000000..838ee033871f --- /dev/null +++ b/pkgs/by-name/cr/cryptpad/0001-env.js-fix-httpSafePort-handling.patch @@ -0,0 +1,56 @@ +From 4bf0be64fe51a9c9fd9e410ada15251378b743bf Mon Sep 17 00:00:00 2001 +From: Dominique Martinet +Date: Sat, 26 Aug 2023 09:28:59 +0900 +Subject: [PATCH] env.js: fix httpSafePort handling + +It has been clarified that this is only a dev option that should not be +used in production, but setting the value in config was still ignored, +so fix the init code to consider the config value and make it clear that +this port is not bound if safeOrigin is set. +--- + config/config.example.js | 3 ++- + lib/env.js | 5 +++-- + 2 files changed, 5 insertions(+), 3 deletions(-) + +diff --git a/config/config.example.js b/config/config.example.js +index 7c8184c6c2f6..77263643c354 100644 +--- a/config/config.example.js ++++ b/config/config.example.js +@@ -89,8 +89,9 @@ module.exports = { + + /* httpSafePort purpose is to emulate another origin for the sandbox when + * you don't have two domains at hand (i.e. when httpSafeOrigin not defined). +- * It is meant to be used only in case where you are working on a local ++ * It is meant to be used only in case where you are working on a local + * development instance. The default value is your httpPort + 1. ++ * Setting this to 0 or setting httpSafeOrigin disables this listener. + * + */ + //httpSafePort: 3001, +diff --git a/lib/env.js b/lib/env.js +index d3748750f21e..f0660cba3e11 100644 +--- a/lib/env.js ++++ b/lib/env.js +@@ -74,8 +74,9 @@ module.exports.create = function (config) { + + if (typeof(config.httpSafeOrigin) !== 'string') { + NO_SANDBOX = true; +- if (typeof(config.httpSafePort) !== 'number') { httpSafePort = httpPort + 1; } + httpSafeOrigin = deriveSandboxOrigin(httpUnsafeOrigin, httpSafePort); ++ // only set if httpSafeOrigin isn't set. ++ httpSafePort = isValidPort(config.httpSafePort) ? config.httpSafePort : (httpPort + 1); + } else { + httpSafeOrigin = canonicalizeOrigin(config.httpSafeOrigin); + } +@@ -115,7 +116,7 @@ module.exports.create = function (config) { + permittedEmbedders: typeof(permittedEmbedders) === 'string' && permittedEmbedders? permittedEmbedders: httpSafeOrigin, + + removeDonateButton: config.removeDonateButton, +- httpPort: isValidPort(config.httpPort)? config.httpPort: 3000, ++ httpPort: httpPort, + httpAddress: typeof(config.httpAddress) === 'string'? config.httpAddress: 'localhost', + websocketPath: config.externalWebsocketURL, + logIP: config.logIP, +-- +2.45.2 + diff --git a/pkgs/by-name/cr/cryptpad/package.nix b/pkgs/by-name/cr/cryptpad/package.nix new file mode 100644 index 000000000000..5362a96cda03 --- /dev/null +++ b/pkgs/by-name/cr/cryptpad/package.nix @@ -0,0 +1,135 @@ +{ + buildNpmPackage, + fetchFromGitHub, + lib, + makeBinaryWrapper, + nixosTests, + nodejs, + rdfind, +}: + +let + version = "2024.6.1"; + # nix version of install-onlyoffice.sh + # a later version could rebuild from sdkjs/web-apps as per + # https://github.com/cryptpad/onlyoffice-builds/blob/main/build.sh + onlyoffice_build = + rev: hash: + fetchFromGitHub { + inherit rev hash; + owner = "cryptpad"; + repo = "onlyoffice-builds"; + }; + onlyoffice_install = oo: '' + oo_dir="$out_cryptpad/www/common/onlyoffice/dist/${oo.subdir}" + cp -a "${onlyoffice_build oo.rev oo.hash}/." "$oo_dir" + chmod -R +w "$oo_dir" + echo "${oo.rev}" > "$oo_dir/.commit" + ''; + onlyoffice_versions = [ + { + subdir = "v1"; + rev = "4f370beb"; + hash = "sha256-TE/99qOx4wT2s0op9wi+SHwqTPYq/H+a9Uus9Zj4iSY="; + } + { + subdir = "v2b"; + rev = "d9da72fd"; + hash = "sha256-SiRDRc2vnLwCVnvtk+C8PKw7IeuSzHBaJmZHogRe3hQ="; + } + { + subdir = "v4"; + rev = "6ebc6938"; + hash = "sha256-eto1+8Tk/s3kbUCpbUh8qCS8EOq700FYG1/KiHyynaA="; + } + { + subdir = "v5"; + rev = "88a356f0"; + hash = "sha256-8j1rlAyHlKx6oAs2pIhjPKcGhJFj6ZzahOcgenyeOCc="; + } + { + subdir = "v6"; + rev = "abd8a309"; + hash = "sha256-BZdExj2q/bqUD3k9uluOot2dlrWKA+vpad49EdgXKww="; + } + { + subdir = "v7"; + rev = "9d8b914a"; + hash = "sha256-M+rPJ/Xo2olhqB5ViynGRaesMLLfG/1ltUoLnepMPnM="; + } + ]; + +in +buildNpmPackage { + inherit version; + pname = "cryptpad"; + + src = fetchFromGitHub { + owner = "cryptpad"; + repo = "cryptpad"; + rev = version; + hash = "sha256-qwyXpTY8Ds7R5687PVGZa/rlEyrAZjNzJ4+VQZpF8v0="; + }; + + npmDepsHash = "sha256-GSTPsXqe/rxiDh5OW2t+ZY1YRNgRSDxkJ0pvcLIFtFw="; + + nativeBuildInputs = [ + makeBinaryWrapper + rdfind + ]; + + patches = [ + # fix httpSafePort setting + # https://github.com/cryptpad/cryptpad/pull/1571 + ./0001-env.js-fix-httpSafePort-handling.patch + ]; + + # cryptpad build tries to write in cache dir + makeCacheWritable = true; + + # 'npm build run' (scripts/build.js) generates a customize directory, but: + # - that is not installed by npm install + # - it embeds values from config into the directory, so needs to be + # run before starting the server (it's just a few quick replaces) + # Skip it here. + dontNpmBuild = true; + + postInstall = '' + out_cryptpad="$out/lib/node_modules/cryptpad" + + # 'npm run install:components' (scripts/copy-component.js) copies + # required node modules to www/component in the build tree... + # Move to install directory manually. + npm run install:components + mv www/components "$out_cryptpad/www/" + + # install OnlyOffice (install-onlyoffice.sh without network) + mkdir -p "$out_cryptpad/www/common/onlyoffice/dist" + ${lib.concatMapStringsSep "\n" onlyoffice_install onlyoffice_versions} + rdfind -makehardlinks true -makeresultsfile false "$out_cryptpad/www/common/onlyoffice/dist" + + # cryptpad assumes it runs in the source directory and also outputs + # its state files there, which is not exactly great for us. + # There are relative paths everywhere so just substituing source paths + # is difficult and will likely break on a future update, instead we + # make links to the required source directories before running. + # The build.js step populates 'customize' from customize.dist and config; + # one would normally want to re-run it after modifying config but since it + # would overwrite user modifications only run it if there is no customize + # directory. + makeWrapper "${lib.getExe nodejs}" "$out/bin/cryptpad" \ + --add-flags "$out_cryptpad/server.js" \ + --run "for d in customize.dist lib www; do ln -sf \"$out_cryptpad/\$d\" .; done" \ + --run "if ! [ -d customize ]; then \"${lib.getExe nodejs}\" \"$out_cryptpad/scripts/build.js\"; fi" + ''; + + passthru.tests.cryptpad = nixosTests.cryptpad; + + meta = { + description = "Collaborative office suite, end-to-end encrypted and open-source."; + homepage = "https://cryptpad.org/"; + license = lib.licenses.agpl3Plus; + mainProgram = "cryptpad"; + maintainers = with lib.maintainers; [ martinetd ]; + }; +} diff --git a/pkgs/by-name/cu/cue/tests/001-all-good.nix b/pkgs/by-name/cu/cue/tests/001-all-good.nix index d9919cd7fee4..f7fc46eebea6 100644 --- a/pkgs/by-name/cu/cue/tests/001-all-good.nix +++ b/pkgs/by-name/cu/cue/tests/001-all-good.nix @@ -1,5 +1,4 @@ -{ lib -, cue +{ cue , runCommand }: diff --git a/pkgs/by-name/de/deltachat-repl/package.nix b/pkgs/by-name/de/deltachat-repl/package.nix index 3de470c08524..fe97f891caa7 100644 --- a/pkgs/by-name/de/deltachat-repl/package.nix +++ b/pkgs/by-name/de/deltachat-repl/package.nix @@ -1,5 +1,4 @@ -{ lib -, rustPlatform +{ rustPlatform , libdeltachat , perl , pkg-config diff --git a/pkgs/by-name/de/deltachat-rpc-server/package.nix b/pkgs/by-name/de/deltachat-rpc-server/package.nix index 6c57548cf9e8..b7d0dbef2374 100644 --- a/pkgs/by-name/de/deltachat-rpc-server/package.nix +++ b/pkgs/by-name/de/deltachat-rpc-server/package.nix @@ -1,5 +1,4 @@ -{ lib -, rustPlatform +{ rustPlatform , libdeltachat , perl , pkg-config diff --git a/pkgs/by-name/di/digikam/disable-tests-download.patch b/pkgs/by-name/di/digikam/disable-tests-download.patch new file mode 100644 index 000000000000..7ec21b52eb4e --- /dev/null +++ b/pkgs/by-name/di/digikam/disable-tests-download.patch @@ -0,0 +1,15 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 43636fa9b9...e8da76c480 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -208,10 +208,6 @@ + # For CI runners to run tests, the following custom target serves to perform the download automatically. + # If the directory "test-data" has already been created, the target becomes a "no-op". + # +- add_custom_command(OUTPUT ${CMAKE_SOURCE_DIR}/test-data +- COMMENT "Checkout unit-test data repository. Please wait..." +- COMMAND git +- ARGS clone https://invent.kde.org/graphics/digikam-test-data.git ${CMAKE_SOURCE_DIR}/test-data) + add_custom_target(test-data ALL DEPENDS ${CMAKE_SOURCE_DIR}/test-data) + + endif() diff --git a/pkgs/by-name/di/digikam/package.nix b/pkgs/by-name/di/digikam/package.nix index 8a83cf6583cc..1454eae6717a 100644 --- a/pkgs/by-name/di/digikam/package.nix +++ b/pkgs/by-name/di/digikam/package.nix @@ -1,149 +1,202 @@ -{ stdenv, config, lib, fetchurl, cmake, doxygen, extra-cmake-modules, wrapGAppsHook3 +{ + stdenv, + config, + lib, + fetchFromGitLab, + fetchgit, -# For `digitaglinktree` -, perl, sqlite + cmake, + ninja, + extra-cmake-modules, + flex, + bison, + wrapGAppsHook3, -, libsForQt5 + opencv, + libtiff, + libpng, + libjpeg, + libheif, + libjxl, + boost, + lcms2, + expat, + exiv2, + libxml2, + libxslt, + ffmpeg, + jasper, + eigen, + lensfun, + liblqr1, + libgphoto2, + libusb1, + imagemagick, + x265, + libGLX, + libGLU, -, bison -, boost -, eigen -, exiv2 -, ffmpeg_4 -, flex -, graphviz -, imagemagick -, lcms2 -, lensfun -, libgphoto2 -, liblqr1 -, libusb1 -, libheif -, libGL -, libGLU -, opencv -, pcre -, x265 -, jasper + kdePackages, -, bash -# For panorama and focus stacking -, enblend-enfuse -, hugin -, gnumake + # For `digitaglinktree` + perl, + sqlite, -, cudaSupport ? config.cudaSupport -, cudaPackages ? {} + runtimeShell, + # For panorama and focus stacking + enblend-enfuse, + hugin, + gnumake, }: -stdenv.mkDerivation rec { - pname = "digikam"; - version = "8.3.0"; - - src = fetchurl { - url = "mirror://kde/stable/${pname}/${version}/digiKam-${version}-1.tar.xz"; - hash = "sha256-BbFF/38vIAX6IbxXnBUqsjyBkbZ4/ylEyPBAbWud5tg="; +let + testData = fetchgit { + url = "https://invent.kde.org/graphics/digikam-test-data.git"; + rev = "d02dd20b23cc279792325a0f03d21688547a7a59"; + fetchLFS = true; + hash = "sha256-SvsmcniDRorwu9x9OLtHD9ftgquyoE5Kl8qDgqi1XdQ="; }; +in + +stdenv.mkDerivation (finalAttrs: { + pname = "digikam"; + version = "8.4.0"; + + src = fetchFromGitLab { + domain = "invent.kde.org"; + owner = "graphics"; + repo = "digikam"; + rev = "v${finalAttrs.version}"; + hash = "sha256-GJYlxJkvFEXppVk0yC9ojszylfAGt3eBMAjNUu60XDY="; + }; + + patches = [ ./disable-tests-download.patch ]; strictDeps = true; - depsBuildBuild = [ cmake ]; - nativeBuildInputs = [ cmake - doxygen + ninja extra-cmake-modules - libsForQt5.kdoctools - libsForQt5.wrapQtAppsHook + flex + bison + kdePackages.wrapQtAppsHook wrapGAppsHook3 - ] ++ lib.optionals cudaSupport (with cudaPackages; [ - cuda_nvcc - ]); + ]; + + # Based on , + # but it doesn’t have everything, so you also have to check the + # CMake files… + # + # We list non‐Qt dependencies first to override Qt’s propagated + # build inputs. buildInputs = [ - bison - boost - eigen - exiv2 - ffmpeg_4 - flex - graphviz - imagemagick - lcms2 - lensfun - libgphoto2 - libheif - liblqr1 - libusb1 - libGL - libGLU opencv - pcre - x265 + libtiff + libpng + # TODO: Figure out how on earth to get it to pick up libjpeg8 for + # lossy DNG support. + libjpeg + libheif + libjxl + boost + lcms2 + expat + exiv2 + libxml2 + libxslt + # Qt WebEngine uses and propagates FFmpeg, and if it’s a + # different version it causes linker warnings. + #ffmpeg jasper - ] ++ (with libsForQt5; [ - libkipi - libksane - libqtav + eigen + lensfun + liblqr1 + libgphoto2 + libusb1 + imagemagick + x265 + libGLX + libGLU - qtbase - qtxmlpatterns - qtsvg - qtwebengine - qtnetworkauth + kdePackages.qtbase + kdePackages.qtnetworkauth + kdePackages.qtscxml + kdePackages.qtsvg + kdePackages.qtwebengine + kdePackages.qt5compat + kdePackages.qtmultimedia - akonadi-contacts - kcalendarcore - kconfigwidgets - kcoreaddons - kfilemetadata - knotifications - knotifyconfig - ktextwidgets - kwidgetsaddons - kxmlgui + kdePackages.kconfig + kdePackages.kxmlgui + kdePackages.ki18n + kdePackages.kwindowsystem + kdePackages.kservice + kdePackages.solid + kdePackages.kcoreaddons + kdePackages.knotifyconfig + kdePackages.knotifications + kdePackages.threadweaver + kdePackages.kiconthemes + kdePackages.kfilemetadata + kdePackages.kcalendarcore + kdePackages.kio + kdePackages.sonnet + # libksane and akonadi-contacts do not yet work when building for + # Qt 6. + ]; - breeze-icons - marble - oxygen - threadweaver - ]) ++ lib.optionals cudaSupport (with cudaPackages; [ - cuda_cudart - ]); + checkInputs = [ kdePackages.qtdeclarative ]; + + postConfigure = lib.optionalString finalAttrs.doCheck '' + ln -s ${testData} $cmakeDir/test-data + ''; postPatch = '' substituteInPlace \ core/dplugins/bqm/custom/userscript/userscript.cpp \ core/utilities/import/backend/cameracontroller.cpp \ - --replace-fail \"/bin/bash\" \"${lib.getExe bash}\" + --replace-fail '"/bin/bash"' ${lib.escapeShellArg "\"${runtimeShell}\""} ''; cmakeFlags = [ - "-DENABLE_MYSQLSUPPORT=1" - "-DENABLE_INTERNALMYSQL=1" - "-DENABLE_MEDIAPLAYER=1" - "-DENABLE_QWEBENGINE=on" - "-DENABLE_APPSTYLES=on" - "-DCMAKE_CXX_FLAGS=-I${libsForQt5.libksane}/include/KF5" # fix `#include ` + (lib.cmakeBool "BUILD_WITH_QT6" true) + (lib.cmakeBool "ENABLE_KFILEMETADATASUPPORT" true) + #(lib.cmakeBool "ENABLE_AKONADICONTACTSUPPORT" true) + (lib.cmakeBool "ENABLE_MEDIAPLAYER" true) + (lib.cmakeBool "ENABLE_APPSTYLES" true) ]; + # Tests segfault for some reason… + # TODO: Get them working. + doCheck = false; + dontWrapGApps = true; preFixup = '' qtWrapperArgs+=("''${gappsWrapperArgs[@]}") - qtWrapperArgs+=(--prefix PATH : ${lib.makeBinPath [ gnumake hugin enblend-enfuse ]}) - qtWrapperArgs+=(--suffix DK_PLUGIN_PATH : ${placeholder "out"}/${libsForQt5.qtbase.qtPluginPrefix}/${pname}) + qtWrapperArgs+=(--prefix PATH : ${ + lib.makeBinPath [ + gnumake + hugin + enblend-enfuse + ] + }) + qtWrapperArgs+=(--suffix DK_PLUGIN_PATH : ${placeholder "out"}/${kdePackages.qtbase.qtPluginPrefix}/digikam) substituteInPlace $out/bin/digitaglinktree \ --replace "/usr/bin/perl" "${perl}/bin/perl" \ --replace "/usr/bin/sqlite3" "${sqlite}/bin/sqlite3" ''; - meta = with lib; { - description = "Photo Management Program"; - license = licenses.gpl2; - homepage = "https://www.digikam.org"; - maintainers = with maintainers; [ ]; - platforms = platforms.linux; + meta = { + description = "Photo management application"; + homepage = "https://www.digikam.org/"; + changelog = "${finalAttrs.src.meta.homepage}-/blob/master/project/NEWS.${finalAttrs.version}"; + sourceProvenance = [ lib.sourceTypes.fromSource ]; + license = lib.licenses.gpl2Plus; + maintainers = [ ]; + platforms = lib.platforms.linux; mainProgram = "digikam"; }; -} +}) diff --git a/pkgs/by-name/di/dita-ot/package.nix b/pkgs/by-name/di/dita-ot/package.nix new file mode 100644 index 000000000000..a1e8931eacf3 --- /dev/null +++ b/pkgs/by-name/di/dita-ot/package.nix @@ -0,0 +1,48 @@ +{ + stdenv, + fetchzip, + openjdk17, + lib, + makeWrapper, + testers, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "dita-ot"; + version = "4.2.3"; + + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ openjdk17 ]; + + src = fetchzip { + url = "https://github.com/dita-ot/dita-ot/releases/download/${finalAttrs.version}/dita-ot-${finalAttrs.version}.zip"; + hash = "sha256-siHz81OuKVF77NsDpldAhq7YxzBFvo9RwGPe/mqkquQ="; + }; + + installPhase = '' + runHook preInstall + + mkdir -p $out/bin $out/share/dita-ot/ + cp -r $src/* $out/share/dita-ot/ + + makeWrapper "$out/share/dita-ot/bin/dita" "$out/bin/dita" \ + --prefix PATH : "${lib.makeBinPath [ openjdk17 ]}" \ + --set-default JDK_HOME "${openjdk17.home}" \ + --set-default JAVA_HOME "${openjdk17.home}" + + runHook postInstall + ''; + + passthru.tests.version = testers.testVersion { package = finalAttrs.finalPackage; }; + + meta = { + homepage = "https://dita-ot.org"; + changelog = "https://www.dita-ot.org/dev/release-notes/#v${finalAttrs.version}"; + description = "The open-source publishing engine for content authored in the Darwin Information Typing Architecture"; + license = lib.licenses.asl20; + mainProgram = "dita"; + platforms = openjdk17.meta.platforms; + sourceProvenance = with lib.sourceTypes; [ binaryBytecode ]; + maintainers = with lib.maintainers; [ robertrichter ]; + }; +}) diff --git a/pkgs/by-name/do/downonspot/package.nix b/pkgs/by-name/do/downonspot/package.nix index 587201dd7923..5d115404c240 100644 --- a/pkgs/by-name/do/downonspot/package.nix +++ b/pkgs/by-name/do/downonspot/package.nix @@ -10,19 +10,19 @@ rustPlatform.buildRustPackage rec { pname = "downonspot"; - version = "0.5.0"; + version = "0.5.1"; src = fetchFromGitHub { owner = "oSumAtrIX"; repo = "DownOnSpot"; rev = "refs/tags/v${version}"; - hash = "sha256-PA11R/hVAmismayE8uU03P0eeNnrgpD2HxbMW0vlk3k="; + hash = "sha256-F0SW/qce7eEEDC4FQvO6eW9V4POkRK/WP8bMUBtzGIw="; }; # Use official public librespot version cargoPatches = [ ./Cargo.lock.patch ]; - cargoHash = "sha256-jdscYr4Emm2+mWXbxfhU1rp855tsGY5hrdJsDEfXeUo="; + cargoHash = "sha256-kLMV8jDadb2BryOqXGkiunQvZRjzjbVTh9Z+jHSSHbU="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/dp/dpp/package.nix b/pkgs/by-name/dp/dpp/package.nix index 6079585e5d29..7e639cc021d0 100644 --- a/pkgs/by-name/dp/dpp/package.nix +++ b/pkgs/by-name/dp/dpp/package.nix @@ -6,7 +6,6 @@ , zlib , libsodium , pkg-config -, autoPatchelfHook , lib }: stdenv.mkDerivation (finalAttrs: { diff --git a/pkgs/by-name/du/duckstation/shaderc-patched.nix b/pkgs/by-name/du/duckstation/shaderc-patched.nix new file mode 100644 index 000000000000..3211925699e1 --- /dev/null +++ b/pkgs/by-name/du/duckstation/shaderc-patched.nix @@ -0,0 +1,20 @@ +{ + fetchpatch, + duckstation, + shaderc, +}: + +shaderc.overrideAttrs (old: { + pname = "shaderc-patched-for-duckstation"; + patches = (old.patches or [ ]) ++ [ + (fetchpatch { + url = "file://${duckstation.src}/scripts/shaderc-changes.patch"; + hash = "sha256-Ps/D+CdSbjVWg3ZGOEcgbpQbCNkI5Nuizm4E5qiM9Wo="; + excludes = [ + "CHANGES" + "CMakeLists.txt" + "libshaderc/CMakeLists.txt" + ]; + }) + ]; +}) diff --git a/pkgs/by-name/ed/edido/package.nix b/pkgs/by-name/ed/edido/package.nix index 2d1f69e6a740..2572a0dc2af8 100644 --- a/pkgs/by-name/ed/edido/package.nix +++ b/pkgs/by-name/ed/edido/package.nix @@ -1,5 +1,4 @@ -{ lib -, writeShellApplication +{ writeShellApplication , bc , diffutils , findutils diff --git a/pkgs/by-name/ei/eintopf/frontend.nix b/pkgs/by-name/ei/eintopf/frontend.nix index 0a7bdd15dee9..f16198b30484 100644 --- a/pkgs/by-name/ei/eintopf/frontend.nix +++ b/pkgs/by-name/ei/eintopf/frontend.nix @@ -1,9 +1,7 @@ -{ lib -, stdenv +{ stdenv , fetchYarnDeps , fixup-yarn-lock , yarn -, fetchFromGitea , src , version , nodejs diff --git a/pkgs/by-name/el/elvish/tests/expect-version.nix b/pkgs/by-name/el/elvish/tests/expect-version.nix index 406f2131199d..b7935ceea671 100644 --- a/pkgs/by-name/el/elvish/tests/expect-version.nix +++ b/pkgs/by-name/el/elvish/tests/expect-version.nix @@ -1,5 +1,4 @@ -{ lib -, stdenv +{ stdenv , elvish , substituteAll }: diff --git a/pkgs/by-name/et/ethercat/package.nix b/pkgs/by-name/et/ethercat/package.nix index 3d7ae6d0854d..f8e128bf436a 100644 --- a/pkgs/by-name/et/ethercat/package.nix +++ b/pkgs/by-name/et/ethercat/package.nix @@ -1,5 +1,4 @@ { autoreconfHook -, cmake , lib , pkg-config , stdenv diff --git a/pkgs/by-name/ex/exe2hex/package.nix b/pkgs/by-name/ex/exe2hex/package.nix index 4213a6905d8f..485e0104cba2 100644 --- a/pkgs/by-name/ex/exe2hex/package.nix +++ b/pkgs/by-name/ex/exe2hex/package.nix @@ -1,5 +1,4 @@ { lib -, stdenv , fetchFromGitHub , python3Packages , expect diff --git a/pkgs/by-name/ey/eyewitness/package.nix b/pkgs/by-name/ey/eyewitness/package.nix index 7cda284f6be8..cc13cb0e13a9 100644 --- a/pkgs/by-name/ey/eyewitness/package.nix +++ b/pkgs/by-name/ey/eyewitness/package.nix @@ -1,7 +1,6 @@ { lib , fetchFromGitHub , python3Packages -, cmake , xvfb-run , firefox-esr , geckodriver diff --git a/pkgs/by-name/fa/fastfetch/package.nix b/pkgs/by-name/fa/fastfetch/package.nix index 3508a5a113c5..d11bc1cc21eb 100644 --- a/pkgs/by-name/fa/fastfetch/package.nix +++ b/pkgs/by-name/fa/fastfetch/package.nix @@ -47,13 +47,13 @@ let in stdenv'.mkDerivation (finalAttrs: { pname = "fastfetch"; - version = "2.19.1"; + version = "2.20.0"; src = fetchFromGitHub { owner = "fastfetch-cli"; repo = "fastfetch"; rev = finalAttrs.version; - hash = "sha256-3PXbuaB7QD2xgqaoVx+nRXsPmyoLC0f6Mv0EcNj5sJw="; + hash = "sha256-8N2BG9eTZpAvnc1wiG6p7GJSCPfZ+NTbz8kLGPRg5HU="; }; outputs = [ "out" "man" ]; diff --git a/pkgs/by-name/fe/fedimint/package.nix b/pkgs/by-name/fe/fedimint/package.nix index 7fa50da3620b..0872a4b9a90e 100644 --- a/pkgs/by-name/fe/fedimint/package.nix +++ b/pkgs/by-name/fe/fedimint/package.nix @@ -24,16 +24,16 @@ let in buildRustPackage rec { pname = "fedimint"; - version = "0.3.2"; + version = "0.3.3"; src = fetchFromGitHub { owner = "fedimint"; repo = "fedimint"; rev = "v${version}"; - hash = "sha256-FEzlNLo6X4zZQM3KEsf6wwJm4Uw6/8HJNZiM4jK2x2k="; + hash = "sha256-0SsIuMCdsZdYSRA1yT1axMe6+p+tIpXyN71V+1B7jYc="; }; - cargoHash = "sha256-lILETtCaPDAWgObNwHIfO/w6pqs0PkbqpDbjODRDOzw="; + cargoHash = "sha256-nQvEcgNOT04H5OgMHfN1713A4nbEaKK2KDx9E3qxcbM="; nativeBuildInputs = [ protobuf diff --git a/pkgs/by-name/fi/fira-math/package.nix b/pkgs/by-name/fi/fira-math/package.nix index 56bcb916d2d4..58b72f6b740e 100644 --- a/pkgs/by-name/fi/fira-math/package.nix +++ b/pkgs/by-name/fi/fira-math/package.nix @@ -1,4 +1,4 @@ -{ lib, fetchFromGitHub, fira-math, python3, stdenvNoCC }: +{ lib, fetchFromGitHub, python3, stdenvNoCC }: let pname = "fira-math"; diff --git a/pkgs/by-name/fo/fooyin/package.nix b/pkgs/by-name/fo/fooyin/package.nix index 8c03c4f5fe7c..f61506f28d6a 100644 --- a/pkgs/by-name/fo/fooyin/package.nix +++ b/pkgs/by-name/fo/fooyin/package.nix @@ -7,10 +7,8 @@ , ffmpeg , kdePackages , kdsingleapplication -, openssl , pipewire , taglib -, zlib }: stdenv.mkDerivation (finalAttrs: { diff --git a/pkgs/by-name/fo/forgejo/package.nix b/pkgs/by-name/fo/forgejo/package.nix index c98957268aa0..03a7b974d4ce 100644 --- a/pkgs/by-name/fo/forgejo/package.nix +++ b/pkgs/by-name/fo/forgejo/package.nix @@ -2,7 +2,6 @@ , brotli , buildGoModule , forgejo -, fetchpatch , git , gzip , lib diff --git a/pkgs/by-name/fz/fzf-make/package.nix b/pkgs/by-name/fz/fzf-make/package.nix index ae8681bf1c05..0061ad81bbcd 100644 --- a/pkgs/by-name/fz/fzf-make/package.nix +++ b/pkgs/by-name/fz/fzf-make/package.nix @@ -29,12 +29,12 @@ rustPlatform.buildRustPackage rec { --suffix PATH : ${lib.makeBinPath [ bat gnugrep gnumake ]} ''; - meta = with lib; { + meta = { description = "Fuzzy finder for Makefile"; homepage = "https://github.com/kyu08/fzf-make"; changelog = "https://github.com/kyu08/fzf-make/releases/tag/${src.rev}"; - license = licenses.mit; - maintainers = with maintainers; [ figsoda sigmanificient ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ figsoda sigmanificient ]; mainProgram = "fzf-make"; }; } diff --git a/pkgs/by-name/gf/gfal2/package.nix b/pkgs/by-name/gf/gfal2/package.nix index bde7e06b30c2..e46b8807473f 100644 --- a/pkgs/by-name/gf/gfal2/package.nix +++ b/pkgs/by-name/gf/gfal2/package.nix @@ -1,6 +1,5 @@ { lib , stdenv -, callPackage , fetchFromGitHub # Native build inputs , cmake diff --git a/pkgs/by-name/gh/ghdl/test-simple.nix b/pkgs/by-name/gh/ghdl/test-simple.nix index ae265cfba82c..bf034441be25 100644 --- a/pkgs/by-name/gh/ghdl/test-simple.nix +++ b/pkgs/by-name/gh/ghdl/test-simple.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, ghdl-llvm, ghdl-mcode, ghdl-gcc, backend }: +{ stdenv, ghdl-llvm, ghdl-mcode, ghdl-gcc, backend }: let ghdl = if backend == "llvm" then ghdl-llvm else if backend == "gcc" then ghdl-gcc else ghdl-mcode; diff --git a/pkgs/by-name/gh/ghex/package.nix b/pkgs/by-name/gh/ghex/package.nix index 0f3aefaa56be..95c4448025ef 100644 --- a/pkgs/by-name/gh/ghex/package.nix +++ b/pkgs/by-name/gh/ghex/package.nix @@ -10,7 +10,6 @@ , appstream-glib , gettext , itstool -, libxml2 , gtk4 , libadwaita , glib diff --git a/pkgs/by-name/gh/ghi/gemset.nix b/pkgs/by-name/gh/ghi/gemset.nix new file mode 100644 index 000000000000..7f03d5a41e4b --- /dev/null +++ b/pkgs/by-name/gh/ghi/gemset.nix @@ -0,0 +1,199 @@ +{ + diff-lcs = { + groups = ["default" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0rwvjahnp7cpmracd8x732rjgnilqv2sx7d1gfrysslc3h039fa9"; + type = "gem"; + }; + version = "1.5.0"; + }; + docile = { + groups = ["default" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1lxqxgq71rqwj1lpl9q1mbhhhhhhdkkj7my341f2889pwayk85sz"; + type = "gem"; + }; + version = "1.4.0"; + }; + ghi = { + dependencies = ["pygments.rb"]; + groups = ["default"]; + platforms = []; + source = { + path = ./.; + type = "path"; + }; + version = "1.2.0"; + }; + hpricot = { + groups = ["default" "development"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1jn8x9ch79gqmnzgyz78kppavjh5lqx0y0r6frykga2b86rz9s6z"; + type = "gem"; + }; + version = "0.8.6"; + }; + json = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0nrmw2r4nfxlfgprfgki3hjifgrcrs3l5zvm3ca3gb4743yr25mn"; + type = "gem"; + }; + version = "2.3.0"; + }; + mustache = { + groups = ["default" "development"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1l0p4wx15mi3wnamfv92ipkia4nsx8qi132c6g51jfdma3fiz2ch"; + type = "gem"; + }; + version = "1.1.1"; + }; + "pygments.rb" = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "047mjyzz8v4kkgi1ap6fsjf7kcp6dwirpnigif00ss0hxsxchhac"; + type = "gem"; + }; + version = "2.3.0"; + }; + rake = { + groups = ["development"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "15whn7p9nrkxangbs9hh75q585yfn66lv0v2mhj6q6dl6x8bzr2w"; + type = "gem"; + }; + version = "13.0.6"; + }; + rdiscount = { + groups = ["default" "development"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "16srf8cr8ynlafyh6ls654b9a3bqgai8n3y86zzv9mcpvlk6k27g"; + type = "gem"; + }; + version = "2.2.0.2"; + }; + ronn = { + dependencies = ["hpricot" "mustache" "rdiscount"]; + groups = ["development"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "07plsxxfx5bxdk72ii9za6km0ziqlq8jh3bicr4774dalga6zpw2"; + type = "gem"; + }; + version = "0.7.3"; + }; + rspec = { + dependencies = ["rspec-core" "rspec-expectations" "rspec-mocks"]; + groups = ["test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "19dyb6rcvgi9j2mksd29wfdhfdyzqk7yjhy1ai77559hbhpg61w9"; + type = "gem"; + }; + version = "3.11.0"; + }; + rspec-core = { + dependencies = ["rspec-support"]; + groups = ["default" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "118hkfw9b11hvvalr7qlylwal5h8dihagm9xg7k4gskg7587hca6"; + type = "gem"; + }; + version = "3.11.0"; + }; + rspec-expectations = { + dependencies = ["diff-lcs" "rspec-support"]; + groups = ["default" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "001ihayil7jpfxdlxlhakvz02kx0nk5m1w0bz6z8izdx0nc8bh53"; + type = "gem"; + }; + version = "3.11.0"; + }; + rspec-mocks = { + dependencies = ["diff-lcs" "rspec-support"]; + groups = ["default" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0y38dc66yhnfcf4ky3k47c20xak1rax940s4a96qkjxqrniy5ys3"; + type = "gem"; + }; + version = "3.11.0"; + }; + rspec-support = { + groups = ["default" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0xfk4pla77251n39zf4n792m1rhg5sn1kp63yvpvvysany34la03"; + type = "gem"; + }; + version = "3.11.0"; + }; + rspec_junit_formatter = { + dependencies = ["rspec-core"]; + groups = ["test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1sm4yj6149v4pisnizplh58ahaqri2v6p7gyzybqy1ql0zwignxy"; + type = "gem"; + }; + version = "0.3.0"; + }; + simplecov = { + dependencies = ["docile" "simplecov-html" "simplecov_json_formatter"]; + groups = ["test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1hrv046jll6ad1s964gsmcq4hvkr3zzr6jc7z1mns22mvfpbc3cr"; + type = "gem"; + }; + version = "0.21.2"; + }; + simplecov-html = { + groups = ["default" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0yx01bxa8pbf9ip4hagqkp5m0mqfnwnw2xk8kjraiywz4lrss6jb"; + type = "gem"; + }; + version = "0.12.3"; + }; + simplecov_json_formatter = { + groups = ["default" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0a5l0733hj7sk51j81ykfmlk2vd5vaijlq9d5fn165yyx3xii52j"; + type = "gem"; + }; + version = "0.1.4"; + }; +} diff --git a/pkgs/by-name/gh/ghi/package.nix b/pkgs/by-name/gh/ghi/package.nix new file mode 100644 index 000000000000..5c17846aab75 --- /dev/null +++ b/pkgs/by-name/gh/ghi/package.nix @@ -0,0 +1,45 @@ +{ lib +, stdenv +, fetchFromGitHub +, makeWrapper +, bundlerEnv +, tree +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "ghi"; + version = "1.2.1"; + + src = fetchFromGitHub { + owner = "drazisil"; + repo = "ghi"; + rev = "refs/tags/${finalAttrs.version}"; + hash = "sha256-3V1lxI4VhP0jC3VSWyNS327gOCKowbbLB6ae1idpFFI="; + }; + + env = bundlerEnv { + name = "ghi"; + + gemfile = "${finalAttrs.src}/Gemfile"; + lockfile = "${finalAttrs.src}/Gemfile.lock"; + gemset = ./gemset.nix; + }; + + nativeBuildInputs = [ makeWrapper ]; + + buildInputs = [ finalAttrs.env.wrappedRuby ]; + + installPhase = '' + mkdir -p $out/bin + + cp ghi $out/bin + ''; + + meta = { + description = "GitHub Issues on the command line"; + mainProgram = "ghi"; + homepage = "https://github.com/drazisil/ghi"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ sigmanificient]; + }; +}) diff --git a/pkgs/by-name/gi/git-get/package.nix b/pkgs/by-name/gi/git-get/package.nix index 01d3a183cf40..8e6bea06ab7f 100644 --- a/pkgs/by-name/gi/git-get/package.nix +++ b/pkgs/by-name/gi/git-get/package.nix @@ -1,4 +1,4 @@ -{ lib, fetchFromGitHub, git, buildGoModule }: +{ lib, fetchFromGitHub, buildGoModule }: let config-module = "git-get/pkg/cfg"; in diff --git a/pkgs/by-name/gi/git-instafix/package.nix b/pkgs/by-name/gi/git-instafix/package.nix index 02bdb77977ee..d05e9fab8726 100644 --- a/pkgs/by-name/gi/git-instafix/package.nix +++ b/pkgs/by-name/gi/git-instafix/package.nix @@ -1,7 +1,6 @@ { git , lib , libgit2 -, makeWrapper , rustPlatform , stdenv , fetchFromGitHub diff --git a/pkgs/by-name/gi/git-spice/package.nix b/pkgs/by-name/gi/git-spice/package.nix new file mode 100644 index 000000000000..ca58ac578aed --- /dev/null +++ b/pkgs/by-name/gi/git-spice/package.nix @@ -0,0 +1,44 @@ +{ + lib, + buildGoModule, + fetchFromGitHub, + git, + nix-update-script, +}: + +buildGoModule rec { + pname = "git-spice"; + version = "0.3.0"; + + src = fetchFromGitHub { + owner = "abhinav"; + repo = "git-spice"; + rev = "refs/tags/v${version}"; + hash = "sha256-BYIq+12piA0WgfwVSB6P6CKC81icAY/P4/pv2ZMj5N8="; + }; + + vendorHash = "sha256-AIqy0OQsYRStbFLv2L8m4R0k1tr5fVM1FeMFn90yFoY="; + + subPackages = [ "." ]; + + nativeCheckInputs = [ git ]; + + buildInputs = [ git ]; + + ldflags = [ + "-s" + "-w" + "-X=main._version=${version}" + ]; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Manage stacked Git branches"; + homepage = "https://abhinav.github.io/git-spice/"; + changelog = "https://github.com/abhinav/git-spice/blob/${src.rev}/CHANGELOG.md"; + license = lib.licenses.gpl3Only; + maintainers = [ lib.maintainers.vinnymeller ]; + mainProgram = "gs"; + }; +} diff --git a/pkgs/by-name/go/goldwarden/package.nix b/pkgs/by-name/go/goldwarden/package.nix index 264ea5268542..e6938d3be694 100644 --- a/pkgs/by-name/go/goldwarden/package.nix +++ b/pkgs/by-name/go/goldwarden/package.nix @@ -2,7 +2,6 @@ , blueprint-compiler , buildGoModule , fetchFromGitHub -, fetchpatch , gobject-introspection , gtk4 , libadwaita diff --git a/pkgs/by-name/gp/gprename/package.nix b/pkgs/by-name/gp/gprename/package.nix index 18591b735385..6ae3b792ccfd 100644 --- a/pkgs/by-name/gp/gprename/package.nix +++ b/pkgs/by-name/gp/gprename/package.nix @@ -5,10 +5,7 @@ makeWrapper, moreutils, perlPackages, - gettext, - glib, gtk3, - gobject-introspection, pango, harfbuzz, gdk-pixbuf, diff --git a/pkgs/by-name/ha/handheld-daemon/package.nix b/pkgs/by-name/ha/handheld-daemon/package.nix index a872057ff53d..a25f42e5ade6 100644 --- a/pkgs/by-name/ha/handheld-daemon/package.nix +++ b/pkgs/by-name/ha/handheld-daemon/package.nix @@ -1,5 +1,4 @@ { - config, fetchFromGitHub, hidapi, kmod, diff --git a/pkgs/by-name/ha/haunt/tests/001-test-version.nix b/pkgs/by-name/ha/haunt/tests/001-test-version.nix index 726a7ac95713..026d580c1965 100644 --- a/pkgs/by-name/ha/haunt/tests/001-test-version.nix +++ b/pkgs/by-name/ha/haunt/tests/001-test-version.nix @@ -1,5 +1,4 @@ -{ lib -, stdenv +{ stdenv , haunt }: diff --git a/pkgs/by-name/ha/havn/package.nix b/pkgs/by-name/ha/havn/package.nix index 81f0f37190fe..ed78d69b6b0d 100644 --- a/pkgs/by-name/ha/havn/package.nix +++ b/pkgs/by-name/ha/havn/package.nix @@ -6,16 +6,16 @@ rustPlatform.buildRustPackage rec { pname = "havn"; - version = "0.1.12"; + version = "0.1.13"; src = fetchFromGitHub { owner = "mrjackwills"; repo = "havn"; rev = "refs/tags/v${version}"; - hash = "sha256-BCg572435CdQMOldm3Ao4D+sDxbXUlDxMWmxa+aqTY0="; + hash = "sha256-z6505lMqNQ0FpMMRJwpOFodELfDeoIjrjG58mrfSvTY="; }; - cargoHash = "sha256-JaAlWiaOUoXSV6O4wmU7zCR5h5olO2zkB5WEGk2/ZdE="; + cargoHash = "sha256-RzfIu2apaFacSJz29UTaCKcC7Y81uxj1EerVyxZB50E="; checkFlags = [ # Skip tests that require network access diff --git a/pkgs/by-name/he/hextazy/package.nix b/pkgs/by-name/he/hextazy/package.nix index a8f4b2ba55b9..52440b774bf1 100644 --- a/pkgs/by-name/he/hextazy/package.nix +++ b/pkgs/by-name/he/hextazy/package.nix @@ -1,6 +1,5 @@ { lib, - stdenv, fetchFromGitHub, rustPlatform, }: diff --git a/pkgs/by-name/ht/htb-toolkit/package.nix b/pkgs/by-name/ht/htb-toolkit/package.nix index 9cffed873290..dbbe025bf661 100644 --- a/pkgs/by-name/ht/htb-toolkit/package.nix +++ b/pkgs/by-name/ht/htb-toolkit/package.nix @@ -8,9 +8,7 @@ , coreutils , gnome-keyring , libsecret -, bash , openvpn -, nerdfonts , gzip , killall }: diff --git a/pkgs/by-name/im/imsprog/package.nix b/pkgs/by-name/im/imsprog/package.nix index b356e7bdd5df..a8042eaef1fa 100644 --- a/pkgs/by-name/im/imsprog/package.nix +++ b/pkgs/by-name/im/imsprog/package.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "imsprog"; - version = "1.4.2"; + version = "1.4.3"; src = fetchFromGitHub { owner = "bigbigmdm"; repo = "IMSProg"; rev = "refs/tags/v${finalAttrs.version}"; - hash = "sha256-9ALiYTUnrdoRHfcyuz4nPzXFHL7pPkFUTBL2/v1atz0="; + hash = "sha256-FAvGGxw7qDuucAbyaq9gDhMvHL9mJCQApRzzQ7Kh0c8="; }; strictDeps = true; diff --git a/pkgs/by-name/in/ingress2gateway/package.nix b/pkgs/by-name/in/ingress2gateway/package.nix index 90e5a465921c..da3550ac8df6 100644 --- a/pkgs/by-name/in/ingress2gateway/package.nix +++ b/pkgs/by-name/in/ingress2gateway/package.nix @@ -19,7 +19,7 @@ buildGoModule rec { ldflags = [ "-s" "-w" ]; meta = with lib; { - description = "Convert Ingress resources to Gateway API resources "; + description = "Convert Ingress resources to Gateway API resources"; homepage = "https://github.com/kubernetes-sigs/ingress2gateway"; license = licenses.asl20; maintainers = with maintainers; [ arikgrahl ]; diff --git a/pkgs/by-name/io/ios-webkit-debug-proxy/package.nix b/pkgs/by-name/io/ios-webkit-debug-proxy/package.nix index 13ecbb058c06..8ec3a3252907 100644 --- a/pkgs/by-name/io/ios-webkit-debug-proxy/package.nix +++ b/pkgs/by-name/io/ios-webkit-debug-proxy/package.nix @@ -2,7 +2,6 @@ lib, stdenv, fetchFromGitHub, - fetchpatch, autoconf, automake, diff --git a/pkgs/by-name/it/itools/package.nix b/pkgs/by-name/it/itools/package.nix index 85cede0eb900..853efdaa6683 100644 --- a/pkgs/by-name/it/itools/package.nix +++ b/pkgs/by-name/it/itools/package.nix @@ -2,7 +2,6 @@ , stdenv , fetchFromGitHub , autoreconfHook -, pkgs , pkg-config , perl , libitl diff --git a/pkgs/by-name/jn/jnr-posix/package.nix b/pkgs/by-name/jn/jnr-posix/package.nix index 7cc3f67e083a..8ae46e7f5dc8 100644 --- a/pkgs/by-name/jn/jnr-posix/package.nix +++ b/pkgs/by-name/jn/jnr-posix/package.nix @@ -1,9 +1,7 @@ { stdenv , lib , fetchFromGitHub -, dpkg , jdk -, makeWrapper , maven , which }: diff --git a/pkgs/by-name/kc/kcl/package.nix b/pkgs/by-name/kc/kcl/package.nix index 6c02da1f986f..af6933a9cd47 100644 --- a/pkgs/by-name/kc/kcl/package.nix +++ b/pkgs/by-name/kc/kcl/package.nix @@ -1,24 +1,29 @@ { lib +, stdenv , buildGoModule , fetchFromGitHub , kclvm_cli , kclvm , makeWrapper , installShellFiles +, darwin , }: buildGoModule rec { pname = "kcl"; - version = "0.8.9"; + version = "0.9.3"; src = fetchFromGitHub { owner = "kcl-lang"; repo = "cli"; rev = "v${version}"; - hash = "sha256-slU3n7YCV5VfvXArzlcITb9epdu/gyXlAWq9KLjGdJA="; + hash = "sha256-QUVTRlzG8hT+iQx5dSycbRDAyeknjwGOWynCRw3oxlo="; }; - vendorHash = "sha256-Xv8Tfq9Kb1xGFCWZQwBFDX9xZW9j99td/DUb7jBtkpE="; + vendorHash = "sha256-AP1MOlnoTnD7luNR+1QtAdMiJL8tEEwJocT+9wBRgAo="; + + # By default, libs and bins are stripped. KCL will crash on darwin if they are. + dontStrip = stdenv.isDarwin; ldflags = [ "-w -s" @@ -26,19 +31,27 @@ buildGoModule rec { ]; nativeBuildInputs = [ makeWrapper installShellFiles ]; - buildInputs = [ kclvm kclvm_cli ]; + + buildInputs = [ kclvm kclvm_cli ] ++ ( + lib.optional stdenv.isDarwin [ + darwin.apple_sdk.frameworks.Security + darwin.apple_sdk.frameworks.CoreServices + darwin.apple_sdk.frameworks.SystemConfiguration + ] + ); subPackages = [ "cmd/kcl" ]; # env vars https://github.com/kcl-lang/kcl-go/blob/main/pkg/env/env.go#L29 postFixup = '' wrapProgram $out/bin/kcl \ - --set PATH ${lib.makeBinPath [kclvm_cli]} \ - --set KCL_LIB_HOME ${lib.makeLibraryPath [kclvm]} \ - --set KCL_GO_DISABLE_INSTALL_ARTIFACT false \ + --prefix PATH : "${lib.makeBinPath [kclvm kclvm_cli]}" \ + --prefix KCL_LIB_HOME : "${lib.makeLibraryPath [kclvm]}" \ + --prefix KCL_GO_DISABLE_INSTALL_ARTIFACT : false ''; postInstall = '' + export HOME=$(mktemp -d) installShellCompletion --cmd kcl \ --bash <($out/bin/kcl completion bash) \ --fish <($out/bin/kcl completion fish) \ @@ -49,7 +62,7 @@ buildGoModule rec { description = "A command line interface for KCL programming language"; homepage = "https://github.com/kcl-lang/cli"; license = licenses.asl20; - platforms = platforms.linux; + platforms = platforms.linux ++ platforms.darwin; maintainers = with maintainers; [ selfuryon peefy ]; mainProgram = "kcl"; }; diff --git a/pkgs/by-name/kc/kclvm/Cargo.lock b/pkgs/by-name/kc/kclvm/Cargo.lock index 083baa87aaaa..37ec7f1b8198 100644 --- a/pkgs/by-name/kc/kclvm/Cargo.lock +++ b/pkgs/by-name/kc/kclvm/Cargo.lock @@ -79,47 +79,48 @@ dependencies = [ [[package]] name = "anstream" -version = "0.6.13" +version = "0.6.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d96bd03f33fe50a863e394ee9718a706f988b9079b20c3784fb726e7678b62fb" +checksum = "418c75fa768af9c03be99d17643f93f79bbba589895012a80e3452a19ddda15b" dependencies = [ "anstyle", "anstyle-parse", "anstyle-query", "anstyle-wincon", "colorchoice", + "is_terminal_polyfill", "utf8parse", ] [[package]] name = "anstyle" -version = "1.0.6" +version = "1.0.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8901269c6307e8d93993578286ac0edf7f195079ffff5ebdeea6a59ffb7e36bc" +checksum = "038dfcf04a5feb68e9c60b21c9625a54c2c0616e79b72b0fd87075a056ae1d1b" [[package]] name = "anstyle-parse" -version = "0.2.3" +version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c75ac65da39e5fe5ab759307499ddad880d724eed2f6ce5b5e8a26f4f387928c" +checksum = "c03a11a9034d92058ceb6ee011ce58af4a9bf61491aa7e1e59ecd24bd40d22d4" dependencies = [ "utf8parse", ] [[package]] name = "anstyle-query" -version = "1.0.2" +version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e28923312444cdd728e4738b3f9c9cac739500909bb3d3c94b43551b16517648" +checksum = "a64c907d4e79225ac72e2a354c9ce84d50ebb4586dee56c82b3ee73004f537f5" dependencies = [ "windows-sys 0.52.0", ] [[package]] name = "anstyle-wincon" -version = "3.0.2" +version = "3.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1cd54b81ec8d6180e24654d0b371ad22fc3dd083b6ff8ba325b72e00c87660a7" +checksum = "61a38449feb7068f52bb06c12759005cf459ee52bb4adc1d5a7c4322d716fb19" dependencies = [ "anstyle", "windows-sys 0.52.0", @@ -127,9 +128,9 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.81" +version = "1.0.86" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0952808a6c2afd1aa8947271f3a60f1a6763c7b912d210184c5149b5cf147247" +checksum = "b3d1d046238990b9cf5bcde22a3fb3584ee5cf65fb2765f454ed428c7a0063da" dependencies = [ "backtrace", ] @@ -159,7 +160,7 @@ checksum = "16e62a023e7c117e27523144c5d2459f4397fcc3cab0085af8e2224f643a0193" dependencies = [ "proc-macro2", "quote", - "syn 2.0.58", + "syn 2.0.66", ] [[package]] @@ -175,9 +176,9 @@ dependencies = [ [[package]] name = "autocfg" -version = "1.2.0" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1fdabc7756949593fe60f30ec81974b613357de856987752631dea1e3394c80" +checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0" [[package]] name = "backtrace" @@ -206,6 +207,12 @@ version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" +[[package]] +name = "base64" +version = "0.22.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6" + [[package]] name = "bit-set" version = "0.5.3" @@ -324,9 +331,9 @@ checksum = "37b2a672a2cb129a2e41c10b1224bb368f9f37a2b16b612598138befd7b37eb5" [[package]] name = "cc" -version = "1.0.92" +version = "1.0.98" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2678b2e3449475e95b0aa6f9b506a28e61b3dc8996592b983695e8ebb58a8b41" +checksum = "41c270e7540d725e65ac7f1b212ac8ce349719624d7bcff99f8e2e488e8cf03f" [[package]] name = "cfg-if" @@ -342,9 +349,9 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "chrono" -version = "0.4.37" +version = "0.4.38" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a0d04d43504c61aa6c7531f1871dd0d418d91130162063b789da00fd7057a5e" +checksum = "a21f936df1771bf62b77f047b726c4625ff2e8aa607c01ec06e5a05bd8463401" dependencies = [ "android-tzdata", "iana-time-zone", @@ -352,7 +359,7 @@ dependencies = [ "num-traits", "serde", "wasm-bindgen", - "windows-targets 0.52.4", + "windows-targets 0.52.5", ] [[package]] @@ -443,9 +450,9 @@ checksum = "98cc8fbded0c607b7ba9dd60cd98df59af97e84d24e49c8557331cfc26d301ce" [[package]] name = "colorchoice" -version = "1.0.0" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7" +checksum = "0b6a852b24ab71dffc585bcb46eaf7959d175cb865a7152e35b348d1b2960422" [[package]] name = "compiler_base_error" @@ -505,9 +512,9 @@ dependencies = [ [[package]] name = "const_fn" -version = "0.4.9" +version = "0.4.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fbdcdcb6d86f71c5e97409ad45898af11cbc995b4ee8112d59095a28d376c935" +checksum = "373e9fafaa20882876db20562275ff58d50e0caa2590077fe7ce7bef90211d0d" [[package]] name = "core-foundation-sys" @@ -524,6 +531,15 @@ dependencies = [ "libc", ] +[[package]] +name = "crc32fast" +version = "1.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a97769d94ddab943e4510d138150169a2758b5ef3eb191a9ee688de3e23ef7b3" +dependencies = [ + "cfg-if 1.0.0", +] + [[package]] name = "criterion" version = "0.3.6" @@ -598,9 +614,9 @@ dependencies = [ [[package]] name = "crossbeam-channel" -version = "0.5.12" +version = "0.5.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab3db02a9c5b5121e1e42fbdb1aeb65f5e02624cc58c43f2884c6ccac0b82f95" +checksum = "33480d6946193aa8033910124896ca395333cae7e2d1113d1fef6c3272217df2" dependencies = [ "crossbeam-utils", ] @@ -626,9 +642,9 @@ dependencies = [ [[package]] name = "crossbeam-utils" -version = "0.8.19" +version = "0.8.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "248e3bacc7dc6baa3b21e405ee045c3047101a49145e7e9eca583ab4c2ca5345" +checksum = "22ec99545bb0ed0ea7bb9b8e1e9122ea386ff8a48c0922e43f36d45ab09e0e80" [[package]] name = "crunchy" @@ -674,10 +690,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "978747c1d849a7d2ee5e8adc0159961c48fb7e5db2f06af6723b80123bb53856" dependencies = [ "cfg-if 1.0.0", - "hashbrown 0.14.3", + "hashbrown 0.14.5", "lock_api", "once_cell", - "parking_lot_core 0.9.9", + "parking_lot_core 0.9.10", ] [[package]] @@ -721,6 +737,7 @@ checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292" dependencies = [ "block-buffer 0.10.4", "crypto-common", + "subtle", ] [[package]] @@ -758,26 +775,26 @@ checksum = "487585f4d0c6655fe74905e2504d8ad6908e4db67f744eb140876906c2f3175d" dependencies = [ "proc-macro2", "quote", - "syn 2.0.58", + "syn 2.0.66", ] [[package]] name = "dissimilar" -version = "1.0.7" +version = "1.0.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86e3bdc80eee6e16b2b6b0f87fbc98c04bee3455e35174c0de1a125d0688c632" +checksum = "59f8e79d1fbf76bdfbde321e902714bf6c49df88a7dda6fc682fc2979226962d" [[package]] name = "either" -version = "1.10.0" +version = "1.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "11157ac094ffbdde99aa67b23417ebdd801842852b500e395a45a9c0aac03e4a" +checksum = "3dca9240753cf90908d7e4aac30f630662b02aebaa1b58a3cadabdb23385b58b" [[package]] name = "ena" -version = "0.14.2" +version = "0.14.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c533630cf40e9caa44bd91aadc88a75d75a4c3a12b4cfde353cbed41daa1e1f1" +checksum = "3d248bdd43ce613d87415282f69b9bb99d947d290b10962dd6c56233312c2ad5" dependencies = [ "log", ] @@ -828,18 +845,19 @@ checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" [[package]] name = "erased-serde" -version = "0.4.4" +version = "0.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b73807008a3c7f171cc40312f37d95ef0396e048b5848d775f54b1a4dd4a0d3" +checksum = "24e2389d65ab4fab27dc2a5de7b191e1f6617d1f1c8855c0dc569c94a4cbb18d" dependencies = [ "serde", + "typeid", ] [[package]] name = "errno" -version = "0.3.8" +version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a258e46cdc063eb8519c00b9fc845fc47bcfca4130e2f08e88665ceda8474245" +checksum = "534c5cf6194dfab3db3242765c03bbe257cf92f22b38f6bc0c58d59108a820ba" dependencies = [ "libc", "windows-sys 0.52.0", @@ -867,9 +885,9 @@ dependencies = [ [[package]] name = "fastrand" -version = "2.0.2" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "658bd65b1cf4c852a3cc96f18a8ce7b5640f6b703f905c7d74532294c2a63984" +checksum = "9fc0510504f03c51ada170672ac806f1f105a88aa97a5281117e1ddc3368e51a" [[package]] name = "filetime" @@ -890,10 +908,20 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80" [[package]] -name = "fluent" -version = "0.16.0" +name = "flate2" +version = "1.0.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61f69378194459db76abd2ce3952b790db103ceb003008d3d50d97c41ff847a7" +checksum = "5f54427cfd1c7829e2a139fcefea601bf088ebca651d2bf53ebc600eac295dae" +dependencies = [ + "crc32fast", + "miniz_oxide", +] + +[[package]] +name = "fluent" +version = "0.16.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bb74634707bebd0ce645a981148e8fb8c7bccd4c33c652aeffd28bf2f96d555a" dependencies = [ "fluent-bundle", "unic-langid", @@ -901,9 +929,9 @@ dependencies = [ [[package]] name = "fluent-bundle" -version = "0.15.2" +version = "0.15.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e242c601dec9711505f6d5bbff5bedd4b61b2469f2e8bb8e57ee7c9747a87ffd" +checksum = "7fe0a21ee80050c678013f82edf4b705fe2f26f1f9877593d13198612503f493" dependencies = [ "fluent-langneg", "fluent-syntax", @@ -926,13 +954,19 @@ dependencies = [ [[package]] name = "fluent-syntax" -version = "0.11.0" +version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0abed97648395c902868fee9026de96483933faa54ea3b40d652f7dfe61ca78" +checksum = "2a530c4694a6a8d528794ee9bbd8ba0122e779629ac908d15ad5a7ae7763a33d" dependencies = [ "thiserror", ] +[[package]] +name = "fnv" +version = "1.0.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" + [[package]] name = "form_urlencoded" version = "1.2.1" @@ -1023,7 +1057,7 @@ checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" dependencies = [ "proc-macro2", "quote", - "syn 2.0.58", + "syn 2.0.66", ] [[package]] @@ -1086,9 +1120,9 @@ dependencies = [ [[package]] name = "getrandom" -version = "0.2.14" +version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94b22e06ecb0110981051723910cbf0b5f5e09a2062dd7663334ee79a9d1286c" +checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7" dependencies = [ "cfg-if 1.0.0", "libc", @@ -1145,9 +1179,9 @@ checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" [[package]] name = "hashbrown" -version = "0.14.3" +version = "0.14.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604" +checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1" [[package]] name = "heck" @@ -1179,6 +1213,15 @@ version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024" +[[package]] +name = "hmac" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c49c37c09c17a53d937dfbb742eb3a961d65a994e6bcdcf37e7399d0cc8ab5e" +dependencies = [ + "digest 0.10.7", +] + [[package]] name = "home" version = "0.5.9" @@ -1188,12 +1231,117 @@ dependencies = [ "windows-sys 0.52.0", ] +[[package]] +name = "http" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "21b9ddb458710bc376481b842f5da65cdf31522de232c1ca8146abce2a358258" +dependencies = [ + "bytes", + "fnv", + "itoa", +] + +[[package]] +name = "http-auth" +version = "0.1.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "643c9bbf6a4ea8a656d6b4cd53d34f79e3f841ad5203c1a55fb7d761923bc255" +dependencies = [ + "memchr", +] + +[[package]] +name = "http-body" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1cac85db508abc24a2e48553ba12a996e87244a0395ce011e62b37158745d643" +dependencies = [ + "bytes", + "http", +] + +[[package]] +name = "http-body-util" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0475f8b2ac86659c21b64320d5d653f9efe42acd2a4e560073ec61a155a34f1d" +dependencies = [ + "bytes", + "futures-core", + "http", + "http-body", + "pin-project-lite", +] + +[[package]] +name = "httparse" +version = "1.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d897f394bad6a705d5f4104762e116a75639e470d80901eed05a860a95cb1904" + [[package]] name = "humantime" version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" +[[package]] +name = "hyper" +version = "1.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fe575dd17d0862a9a33781c8c4696a55c320909004a67a00fb286ba8b1bc496d" +dependencies = [ + "bytes", + "futures-channel", + "futures-util", + "http", + "http-body", + "httparse", + "itoa", + "pin-project-lite", + "smallvec", + "tokio", + "want", +] + +[[package]] +name = "hyper-rustls" +version = "0.26.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a0bea761b46ae2b24eb4aef630d8d1c398157b6fc29e6350ecf090a0b70c952c" +dependencies = [ + "futures-util", + "http", + "hyper", + "hyper-util", + "rustls", + "rustls-pki-types", + "tokio", + "tokio-rustls", + "tower-service", +] + +[[package]] +name = "hyper-util" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3d8d52be92d09acc2e01dddb7fde3ad983fc6489c7db4837e605bc3fca4cb63e" +dependencies = [ + "bytes", + "futures-channel", + "futures-util", + "http", + "http-body", + "hyper", + "pin-project-lite", + "socket2", + "tokio", + "tower", + "tower-service", + "tracing", +] + [[package]] name = "iana-time-zone" version = "0.1.60" @@ -1259,7 +1407,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "168fb715dda47215e360912c096649d23d58bf392ac62f73919e831745e40f26" dependencies = [ "equivalent", - "hashbrown 0.14.3", + "hashbrown 0.14.5", ] [[package]] @@ -1278,7 +1426,7 @@ dependencies = [ "libc", "llvm-sys", "once_cell", - "parking_lot 0.12.1", + "parking_lot 0.12.3", ] [[package]] @@ -1288,7 +1436,7 @@ source = "git+https://github.com/TheDan64/inkwell?branch=master#4030f764f1c889f3 dependencies = [ "proc-macro2", "quote", - "syn 2.0.58", + "syn 2.0.66", ] [[package]] @@ -1313,9 +1461,9 @@ dependencies = [ [[package]] name = "insta" -version = "1.38.0" +version = "1.39.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3eab73f58e59ca6526037208f0e98851159ec1633cf17b6cd2e1f2c3fd5d53cc" +checksum = "810ae6042d48e2c9e9215043563a58a80b877bc863228a74cf10c49d4620a6f5" dependencies = [ "console", "lazy_static", @@ -1325,18 +1473,18 @@ dependencies = [ [[package]] name = "instant" -version = "0.1.12" +version = "0.1.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c" +checksum = "e0242819d153cba4b4b05a5a8f2a7e9bbf97b6055b2a002b395c96b5ff3c0222" dependencies = [ "cfg-if 1.0.0", ] [[package]] name = "intl-memoizer" -version = "0.5.1" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c310433e4a310918d6ed9243542a6b83ec1183df95dff8f23f87bb88a264a66f" +checksum = "fe22e020fce238ae18a6d5d8c502ee76a52a6e880d99477657e6acc30ec57bda" dependencies = [ "type-map", "unic-langid", @@ -1357,6 +1505,18 @@ version = "0.3.15" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f958d3d68f4167080a18141e10381e7634563984a537f2a49a30fd8e53ac5767" +[[package]] +name = "ipnet" +version = "2.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f518f335dce6725a761382244631d86cf0ccb2863413590b31338feb467f9c3" + +[[package]] +name = "is_terminal_polyfill" +version = "1.70.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f8478577c03552c21db0e2724ffb8986a5ce7af88107e6be5d2ee6e158c12800" + [[package]] name = "itertools" version = "0.10.5" @@ -1374,9 +1534,9 @@ checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b" [[package]] name = "jobserver" -version = "0.1.28" +version = "0.1.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab46a6e9526ddef3ae7f787c06f0f2600639ba80ea3eade3d8e670a2230f51d6" +checksum = "d2b099aaa34a9751c5bf0878add70444e1ed2dd73f347be99003d4577277de6e" dependencies = [ "libc", ] @@ -1431,12 +1591,27 @@ dependencies = [ "jsonrpc-core", "log", "tokio", - "tokio-util", + "tokio-util 0.6.10", +] + +[[package]] +name = "jwt" +version = "0.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6204285f77fe7d9784db3fdc449ecce1a0114927a51d5a41c4c7a292011c015f" +dependencies = [ + "base64 0.13.1", + "crypto-common", + "digest 0.10.7", + "hmac", + "serde", + "serde_json", + "sha2 0.10.8", ] [[package]] name = "kcl-language-server" -version = "0.8.7" +version = "0.9.3" dependencies = [ "anyhow", "chrono", @@ -1447,6 +1622,7 @@ dependencies = [ "env_logger", "im-rc", "indexmap 1.9.3", + "insta", "kclvm-ast", "kclvm-config", "kclvm-driver", @@ -1462,7 +1638,7 @@ dependencies = [ "lsp-server", "lsp-types", "maplit", - "parking_lot 0.12.1", + "parking_lot 0.12.3", "proc_macro_crate", "ra_ap_vfs", "ra_ap_vfs-notify", @@ -1479,7 +1655,7 @@ dependencies = [ [[package]] name = "kclvm" -version = "0.8.7" +version = "0.9.3" dependencies = [ "kclvm-api", "kclvm-ast", @@ -1501,7 +1677,7 @@ dependencies = [ [[package]] name = "kclvm-api" -version = "0.8.7" +version = "0.9.3" dependencies = [ "anyhow", "criterion 0.4.0", @@ -1522,6 +1698,7 @@ dependencies = [ "kclvm-sema", "kclvm-tools", "kclvm-utils", + "kclvm-version", "maplit", "once_cell", "prost", @@ -1540,7 +1717,7 @@ dependencies = [ [[package]] name = "kclvm-ast" -version = "0.8.7" +version = "0.9.3" dependencies = [ "compiler_base_span", "kclvm-error", @@ -1555,7 +1732,7 @@ dependencies = [ [[package]] name = "kclvm-ast-pretty" -version = "0.8.7" +version = "0.9.3" dependencies = [ "compiler_base_macros", "compiler_base_session", @@ -1569,7 +1746,7 @@ dependencies = [ [[package]] name = "kclvm-cmd" -version = "0.8.7" +version = "0.9.3" dependencies = [ "anyhow", "clap 4.5.4", @@ -1587,7 +1764,7 @@ dependencies = [ [[package]] name = "kclvm-compiler" -version = "0.8.7" +version = "0.9.3" dependencies = [ "ahash", "bit-set", @@ -1607,7 +1784,7 @@ dependencies = [ [[package]] name = "kclvm-config" -version = "0.8.7" +version = "0.9.3" dependencies = [ "ahash", "anyhow", @@ -1630,24 +1807,31 @@ dependencies = [ [[package]] name = "kclvm-driver" -version = "0.8.7" +version = "0.9.3" dependencies = [ "anyhow", + "flate2", "glob", + "indexmap 2.2.6", "kclvm-ast", "kclvm-config", "kclvm-parser", "kclvm-runtime", "kclvm-utils", "notify 6.1.1", + "oci-distribution", + "once_cell", + "parking_lot 0.12.3", "serde", "serde_json", + "tar", + "tokio", "walkdir", ] [[package]] name = "kclvm-error" -version = "0.8.7" +version = "0.9.3" dependencies = [ "annotate-snippets", "anyhow", @@ -1659,14 +1843,17 @@ dependencies = [ "indexmap 1.9.3", "kclvm-runtime", "kclvm-span", + "kclvm-utils", + "serde", "serde_json", "termize", + "thiserror", "tracing", ] [[package]] name = "kclvm-evaluator" -version = "0.8.7" +version = "0.9.3" dependencies = [ "anyhow", "generational-arena", @@ -1678,11 +1865,12 @@ dependencies = [ "kclvm-parser", "kclvm-runtime", "kclvm-sema", + "scopeguard", ] [[package]] name = "kclvm-lexer" -version = "0.8.7" +version = "0.9.3" dependencies = [ "expect-test", "kclvm-error", @@ -1692,7 +1880,7 @@ dependencies = [ [[package]] name = "kclvm-loader" -version = "0.8.7" +version = "0.9.3" dependencies = [ "anyhow", "indexmap 1.9.3", @@ -1708,7 +1896,7 @@ dependencies = [ [[package]] name = "kclvm-macros" -version = "0.8.7" +version = "0.9.3" dependencies = [ "proc-macro2", "quote", @@ -1718,7 +1906,7 @@ dependencies = [ [[package]] name = "kclvm-parser" -version = "0.8.7" +version = "0.9.3" dependencies = [ "anyhow", "bstr", @@ -1750,11 +1938,12 @@ dependencies = [ [[package]] name = "kclvm-query" -version = "0.8.7" +version = "0.9.3" dependencies = [ "anyhow", "compiler_base_macros", "compiler_base_session", + "fancy-regex", "indexmap 1.9.3", "kclvm-ast", "kclvm-ast-pretty", @@ -1763,11 +1952,13 @@ dependencies = [ "kclvm-sema", "maplit", "pretty_assertions", + "serde", + "serde_json", ] [[package]] name = "kclvm-runner" -version = "0.8.7" +version = "0.9.3" dependencies = [ "anyhow", "cc", @@ -1802,10 +1993,10 @@ dependencies = [ [[package]] name = "kclvm-runtime" -version = "0.8.7" +version = "0.9.3" dependencies = [ "ahash", - "base64", + "base64 0.13.1", "bstr", "chrono", "fancy-regex", @@ -1830,11 +2021,12 @@ dependencies = [ "unic-ucd-category", "unicode-casing", "uuid", + "walkdir", ] [[package]] name = "kclvm-sema" -version = "0.8.7" +version = "0.9.3" dependencies = [ "ahash", "anyhow", @@ -1868,7 +2060,7 @@ dependencies = [ [[package]] name = "kclvm-span" -version = "0.8.7" +version = "0.9.3" dependencies = [ "compiler_base_span", "kclvm-macros", @@ -1878,7 +2070,7 @@ dependencies = [ [[package]] name = "kclvm-tools" -version = "0.8.7" +version = "0.9.3" dependencies = [ "anyhow", "compiler_base_session", @@ -1911,7 +2103,7 @@ dependencies = [ [[package]] name = "kclvm-utils" -version = "0.8.7" +version = "0.9.3" dependencies = [ "anyhow", "fslock", @@ -1920,7 +2112,7 @@ dependencies = [ [[package]] name = "kclvm-version" -version = "0.8.7" +version = "0.9.3" dependencies = [ "vergen", ] @@ -1962,9 +2154,9 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" [[package]] name = "libc" -version = "0.2.153" +version = "0.2.155" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd" +checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c" [[package]] name = "libloading" @@ -1997,9 +2189,9 @@ dependencies = [ [[package]] name = "linux-raw-sys" -version = "0.4.13" +version = "0.4.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "01cda141df6706de531b6c46c3a33ecca755538219bd484262fa09410c13539c" +checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89" [[package]] name = "llvm-sys" @@ -2027,9 +2219,9 @@ dependencies = [ [[package]] name = "lock_api" -version = "0.4.11" +version = "0.4.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c168f8615b12bc01f9c17e2eb0cc07dcae1940121185446edc3744920e8ef45" +checksum = "07af8b9cdd281b7915f413fa73f29ebd5d55d0d3f0155584dade1ff18cea1b17" dependencies = [ "autocfg", "scopeguard", @@ -2037,15 +2229,15 @@ dependencies = [ [[package]] name = "log" -version = "0.4.21" +version = "0.4.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90ed8c1e510134f979dbc4f070f87d4313098b704861a105fe34231c70a3901c" +checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24" [[package]] name = "lsp-server" -version = "0.7.0" +version = "0.7.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68a9b4c78d1c3f35c5864c90e9633377b5f374a4a4983ac64c30b8ae898f9305" +checksum = "248f65b78f6db5d8e1b1604b4098a28b43d21a8eb1deeca22b1c421b276c7095" dependencies = [ "crossbeam-channel", "log", @@ -2121,10 +2313,16 @@ dependencies = [ ] [[package]] -name = "miniz_oxide" -version = "0.7.2" +name = "mime" +version = "0.3.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d811f3e15f28568be3407c8e7fdb6514c1cda3cb30683f15b6a1a1dc4ea14a7" +checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a" + +[[package]] +name = "miniz_oxide" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "87dfd01fe195c66b572b37921ad8803d010623c0aca821bea2302239d155cdae" dependencies = [ "adler", ] @@ -2195,11 +2393,10 @@ dependencies = [ [[package]] name = "num-bigint" -version = "0.4.4" +version = "0.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "608e7659b5c3d7cba262d894801b9ec9d00de989e8a82bd4bef91d08da45cdc0" +checksum = "c165a9ab64cf766f73521c0dd2cfdff64f488b8f0b3e621face3462d3db536d7" dependencies = [ - "autocfg", "num-integer", "num-traits", ] @@ -2221,9 +2418,9 @@ dependencies = [ [[package]] name = "num-traits" -version = "0.2.18" +version = "0.2.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da0df0e5185db44f69b44f26786fe401b6c293d1907744beaa7fa62b2e5a517a" +checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841" dependencies = [ "autocfg", ] @@ -2256,6 +2453,42 @@ dependencies = [ "memchr", ] +[[package]] +name = "oci-distribution" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b95a2c51531af0cb93761f66094044ca6ea879320bccd35ab747ff3fcab3f422" +dependencies = [ + "bytes", + "chrono", + "futures-util", + "http", + "http-auth", + "jwt", + "lazy_static", + "olpc-cjson", + "regex", + "reqwest", + "serde", + "serde_json", + "sha2 0.10.8", + "thiserror", + "tokio", + "tracing", + "unicase", +] + +[[package]] +name = "olpc-cjson" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d637c9c15b639ccff597da8f4fa968300651ad2f1e968aefc3b4927a6fb2027a" +dependencies = [ + "serde", + "serde_json", + "unicode-normalization", +] + [[package]] name = "once_cell" version = "1.19.0" @@ -2305,12 +2538,12 @@ dependencies = [ [[package]] name = "parking_lot" -version = "0.12.1" +version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f" +checksum = "f1bf18183cf54e8d6059647fc3063646a1801cf30896933ec2311622cc4b9a27" dependencies = [ "lock_api", - "parking_lot_core 0.9.9", + "parking_lot_core 0.9.10", ] [[package]] @@ -2329,15 +2562,15 @@ dependencies = [ [[package]] name = "parking_lot_core" -version = "0.9.9" +version = "0.9.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c42a9226546d68acdd9c0a280d17ce19bfe27a46bf68784e4066115788d008e" +checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8" dependencies = [ "cfg-if 1.0.0", "libc", - "redox_syscall 0.4.1", + "redox_syscall 0.5.1", "smallvec", - "windows-targets 0.48.5", + "windows-targets 0.52.5", ] [[package]] @@ -2354,9 +2587,9 @@ checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" [[package]] name = "pest" -version = "2.7.9" +version = "2.7.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "311fb059dee1a7b802f036316d790138c613a4e8b180c822e3925a662e9f0c95" +checksum = "560131c633294438da9f7c4b08189194b20946c8274c6b9e38881a7874dc8ee8" dependencies = [ "memchr", "thiserror", @@ -2365,9 +2598,9 @@ dependencies = [ [[package]] name = "pest_derive" -version = "2.7.9" +version = "2.7.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f73541b156d32197eecda1a4014d7f868fd2bcb3c550d5386087cfba442bf69c" +checksum = "26293c9193fbca7b1a3bf9b79dc1e388e927e6cacaa78b4a3ab705a1d3d41459" dependencies = [ "pest", "pest_generator", @@ -2375,22 +2608,22 @@ dependencies = [ [[package]] name = "pest_generator" -version = "2.7.9" +version = "2.7.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c35eeed0a3fab112f75165fdc026b3913f4183133f19b49be773ac9ea966e8bd" +checksum = "3ec22af7d3fb470a85dd2ca96b7c577a1eb4ef6f1683a9fe9a8c16e136c04687" dependencies = [ "pest", "pest_meta", "proc-macro2", "quote", - "syn 2.0.58", + "syn 2.0.66", ] [[package]] name = "pest_meta" -version = "2.7.9" +version = "2.7.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2adbf29bb9776f28caece835398781ab24435585fe0d4dc1374a61db5accedca" +checksum = "d7a240022f37c361ec1878d646fc5b7d7c4d28d5946e1a80ad5a7a4f4ca0bdcd" dependencies = [ "once_cell", "pest", @@ -2399,9 +2632,9 @@ dependencies = [ [[package]] name = "petgraph" -version = "0.6.4" +version = "0.6.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1d3afd2628e69da2be385eb6f2fd57c8ac7977ceeff6dc166ff1657b0e386a9" +checksum = "b4c5cc86750666a3ed20bdaf5ca2a0344f9c67674cae0515bec2da16fbaa47db" dependencies = [ "fixedbitset", "indexmap 2.2.6", @@ -2451,6 +2684,26 @@ dependencies = [ "siphasher", ] +[[package]] +name = "pin-project" +version = "1.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6bf43b791c5b9e34c3d182969b4abb522f9343702850a2e57f460d00d09b4b3" +dependencies = [ + "pin-project-internal", +] + +[[package]] +name = "pin-project-internal" +version = "1.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.66", +] + [[package]] name = "pin-project-lite" version = "0.2.14" @@ -2465,9 +2718,9 @@ checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" [[package]] name = "plotters" -version = "0.3.5" +version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2c224ba00d7cadd4d5c660deaf2098e5e80e07846537c51f9cfa4be50c1fd45" +checksum = "a15b6eccb8484002195a3e44fe65a4ce8e93a625797a063735536fd59cb01cf3" dependencies = [ "num-traits", "plotters-backend", @@ -2478,15 +2731,15 @@ dependencies = [ [[package]] name = "plotters-backend" -version = "0.3.5" +version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e76628b4d3a7581389a35d5b6e2139607ad7c75b17aed325f210aa91f4a9609" +checksum = "414cec62c6634ae900ea1c56128dfe87cf63e7caece0852ec76aba307cebadb7" [[package]] name = "plotters-svg" -version = "0.3.5" +version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38f6d39893cca0701371e3c27294f09797214b86f1fb951b89ade8ec04e2abab" +checksum = "81b30686a7d9c3e010b84284bdd26a29f2138574f52f5eb6f794fc0ad924e705" dependencies = [ "plotters-backend", ] @@ -2531,9 +2784,9 @@ checksum = "dc375e1527247fe1a97d8b7156678dfe7c1af2fc075c9a4db3690ecd2a148068" [[package]] name = "proc-macro2" -version = "1.0.79" +version = "1.0.84" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e835ff2298f5721608eb1a980ecaee1aef2c132bf95ecc026a11b7bf3c01c02e" +checksum = "ec96c6a92621310b51366f1e28d05ef11489516e93be030060e5fc12024a49d6" dependencies = [ "unicode-ident", ] @@ -2544,7 +2797,7 @@ version = "0.1.0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.58", + "syn 2.0.66", ] [[package]] @@ -2644,59 +2897,58 @@ dependencies = [ [[package]] name = "protoc-bin-vendored" -version = "3.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "005ca8623e5633e298ad1f917d8be0a44bcf406bf3cde3b80e63003e49a3f27d" +version = "3.1.0" +source = "git+https://github.com/andermatt64/rust-protoc-bin-vendored#b6274dad0ed303b6dd27389722744947419649e5" dependencies = [ "protoc-bin-vendored-linux-aarch_64", "protoc-bin-vendored-linux-ppcle_64", "protoc-bin-vendored-linux-x86_32", "protoc-bin-vendored-linux-x86_64", + "protoc-bin-vendored-macos-aarch_64", "protoc-bin-vendored-macos-x86_64", "protoc-bin-vendored-win32", ] [[package]] name = "protoc-bin-vendored-linux-aarch_64" -version = "3.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8fb9fc9cce84c8694b6ea01cc6296617b288b703719b725b8c9c65f7c5874435" +version = "3.1.0" +source = "git+https://github.com/andermatt64/rust-protoc-bin-vendored#b6274dad0ed303b6dd27389722744947419649e5" [[package]] name = "protoc-bin-vendored-linux-ppcle_64" -version = "3.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "02d2a07dcf7173a04d49974930ccbfb7fd4d74df30ecfc8762cf2f895a094516" +version = "3.1.0" +source = "git+https://github.com/andermatt64/rust-protoc-bin-vendored#b6274dad0ed303b6dd27389722744947419649e5" [[package]] name = "protoc-bin-vendored-linux-x86_32" -version = "3.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d54fef0b04fcacba64d1d80eed74a20356d96847da8497a59b0a0a436c9165b0" +version = "3.1.0" +source = "git+https://github.com/andermatt64/rust-protoc-bin-vendored#b6274dad0ed303b6dd27389722744947419649e5" [[package]] name = "protoc-bin-vendored-linux-x86_64" -version = "3.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b8782f2ce7d43a9a5c74ea4936f001e9e8442205c244f7a3d4286bd4c37bc924" +version = "3.1.0" +source = "git+https://github.com/andermatt64/rust-protoc-bin-vendored#b6274dad0ed303b6dd27389722744947419649e5" + +[[package]] +name = "protoc-bin-vendored-macos-aarch_64" +version = "3.1.0" +source = "git+https://github.com/andermatt64/rust-protoc-bin-vendored#b6274dad0ed303b6dd27389722744947419649e5" [[package]] name = "protoc-bin-vendored-macos-x86_64" -version = "3.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5de656c7ee83f08e0ae5b81792ccfdc1d04e7876b1d9a38e6876a9e09e02537" +version = "3.1.0" +source = "git+https://github.com/andermatt64/rust-protoc-bin-vendored#b6274dad0ed303b6dd27389722744947419649e5" [[package]] name = "protoc-bin-vendored-win32" -version = "3.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9653c3ed92974e34c5a6e0a510864dab979760481714c172e0a34e437cb98804" +version = "3.1.0" +source = "git+https://github.com/andermatt64/rust-protoc-bin-vendored#b6274dad0ed303b6dd27389722744947419649e5" [[package]] name = "quote" -version = "1.0.35" +version = "1.0.36" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef" +checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7" dependencies = [ "proc-macro2", ] @@ -2824,6 +3076,15 @@ dependencies = [ "bitflags 1.3.2", ] +[[package]] +name = "redox_syscall" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "469052894dcb553421e483e4209ee581a45100d31b4018de03e5a7ad86374a7e" +dependencies = [ + "bitflags 2.5.0", +] + [[package]] name = "redox_users" version = "0.4.5" @@ -2870,13 +3131,71 @@ version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "adad44e29e4c806119491a7f06f03de4d1af22c3a680dd47f1e6e179439d1f56" +[[package]] +name = "reqwest" +version = "0.12.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "566cafdd92868e0939d3fb961bd0dc25fcfaaed179291093b3d43e6b3150ea10" +dependencies = [ + "base64 0.22.1", + "bytes", + "futures-core", + "futures-util", + "http", + "http-body", + "http-body-util", + "hyper", + "hyper-rustls", + "hyper-util", + "ipnet", + "js-sys", + "log", + "mime", + "once_cell", + "percent-encoding", + "pin-project-lite", + "rustls", + "rustls-pemfile", + "rustls-pki-types", + "serde", + "serde_json", + "serde_urlencoded", + "sync_wrapper", + "tokio", + "tokio-rustls", + "tokio-util 0.7.11", + "tower-service", + "url", + "wasm-bindgen", + "wasm-bindgen-futures", + "wasm-streams", + "web-sys", + "webpki-roots", + "winreg", +] + +[[package]] +name = "ring" +version = "0.17.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c17fa4cb658e3583423e915b9f3acc01cceaee1860e33d59ebae66adc3a2dc0d" +dependencies = [ + "cc", + "cfg-if 1.0.0", + "getrandom", + "libc", + "spin", + "untrusted", + "windows-sys 0.52.0", +] + [[package]] name = "ron" version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "88073939a61e5b7680558e6be56b419e208420c2adb92be54921fa6b72283f1a" dependencies = [ - "base64", + "base64 0.13.1", "bitflags 1.3.2", "serde", ] @@ -2893,9 +3212,9 @@ dependencies = [ [[package]] name = "rustc-demangle" -version = "0.1.23" +version = "0.1.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76" +checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f" [[package]] name = "rustc-hash" @@ -2962,7 +3281,7 @@ dependencies = [ "jobserver", "libc", "memmap2", - "parking_lot 0.12.1", + "parking_lot 0.12.3", "rustc-hash", "rustc-rayon 0.3.2", "rustc-rayon-core 0.3.2", @@ -3022,14 +3341,14 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366" dependencies = [ - "semver 1.0.22", + "semver 1.0.23", ] [[package]] name = "rustix" -version = "0.38.32" +version = "0.38.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "65e04861e65f21776e67888bfbea442b3642beaa0138fdb1dd7a84a52dffdb89" +checksum = "70dc5ec042f7a43c4a73241207cecc9873a06d45debb38b329f8541d85c2730f" dependencies = [ "bitflags 2.5.0", "errno", @@ -3039,16 +3358,57 @@ dependencies = [ ] [[package]] -name = "rustversion" -version = "1.0.15" +name = "rustls" +version = "0.22.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "80af6f9131f277a45a3fba6ce8e2258037bb0477a67e610d3c1fe046ab31de47" +checksum = "bf4ef73721ac7bcd79b2b315da7779d8fc09718c6b3d2d1b2d94850eb8c18432" +dependencies = [ + "log", + "ring", + "rustls-pki-types", + "rustls-webpki", + "subtle", + "zeroize", +] + +[[package]] +name = "rustls-pemfile" +version = "2.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "29993a25686778eb88d4189742cd713c9bce943bc54251a33509dc63cbacf73d" +dependencies = [ + "base64 0.22.1", + "rustls-pki-types", +] + +[[package]] +name = "rustls-pki-types" +version = "1.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "976295e77ce332211c0d24d92c0e83e50f5c5f046d11082cea19f3df13a3562d" + +[[package]] +name = "rustls-webpki" +version = "0.102.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ff448f7e92e913c4b7d4c6d8e4540a1724b319b4152b8aef6d4cf8339712b33e" +dependencies = [ + "ring", + "rustls-pki-types", + "untrusted", +] + +[[package]] +name = "rustversion" +version = "1.0.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "955d28af4278de8121b7ebeb796b6a45735dc01436d898801014aced2773a3d6" [[package]] name = "ryu" -version = "1.0.17" +version = "1.0.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e86697c916019a8588c99b5fac3cead74ec0b4b819707a682fd4d23fa0ce1ba1" +checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f" [[package]] name = "salsa" @@ -3106,14 +3466,14 @@ version = "0.10.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e14e4d63b804dc0c7ec4a1e52bcb63f02c7ac94476755aa579edac21e01f915d" dependencies = [ - "self_cell 1.0.3", + "self_cell 1.0.4", ] [[package]] name = "self_cell" -version = "1.0.3" +version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "58bf37232d3bb9a2c4e641ca2a11d83b5062066f88df7fed36c28772046d65ba" +checksum = "d369a96f978623eb3dc28807c4852d6cc617fed53da5d3c400feff1ef34a714a" [[package]] name = "semver" @@ -3135,9 +3495,9 @@ dependencies = [ [[package]] name = "semver" -version = "1.0.22" +version = "1.0.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "92d43fe69e652f3df9bdc2b85b2854a0825b86e4fb76bc44d945137d053639ca" +checksum = "61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b" [[package]] name = "semver-parser" @@ -3156,9 +3516,9 @@ dependencies = [ [[package]] name = "serde" -version = "1.0.197" +version = "1.0.203" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fb1c873e1b9b056a4dc4c0c198b24c3ffa059243875552b2bd0933b1aee4ce2" +checksum = "7253ab4de971e72fb7be983802300c30b5a7f0c2e56fab8abfc6a214307c0094" dependencies = [ "serde_derive", ] @@ -3175,13 +3535,13 @@ dependencies = [ [[package]] name = "serde_derive" -version = "1.0.197" +version = "1.0.203" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7eb0b34b42edc17f6b7cac84a52a1c5f0e1bb2227e997ca9011ea3dd34e8610b" +checksum = "500cbc0ebeb6f46627f50f3f5811ccf6bf00643be300b4c3eabc0ef55dc5b5ba" dependencies = [ "proc-macro2", "quote", - "syn 2.0.58", + "syn 2.0.66", ] [[package]] @@ -3203,7 +3563,19 @@ checksum = "6c64451ba24fc7a6a2d60fc75dd9c83c90903b19028d4eff35e88fc1e86564e9" dependencies = [ "proc-macro2", "quote", - "syn 2.0.58", + "syn 2.0.66", +] + +[[package]] +name = "serde_urlencoded" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d3491c14715ca2294c4d6a88f15e84739788c1d030eed8c110436aafdaa2f3fd" +dependencies = [ + "form_urlencoded", + "itoa", + "ryu", + "serde", ] [[package]] @@ -3318,14 +3690,20 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" [[package]] name = "socket2" -version = "0.5.6" +version = "0.5.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05ffd9c0a93b7543e062e759284fcf5f5e3b098501104bfbdde4d404db792871" +checksum = "ce305eb0b4296696835b71df73eb912e0f1ffd2556a501fcede6e0c50349191c" dependencies = [ "libc", "windows-sys 0.52.0", ] +[[package]] +name = "spin" +version = "0.9.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67" + [[package]] name = "stable_deref_trait" version = "1.2.0" @@ -3408,6 +3786,12 @@ version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f" +[[package]] +name = "subtle" +version = "2.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "81cdd64d312baedb58e21336b31bc043b77e01cc99033ce76ef539f78e965ebc" + [[package]] name = "suggestions" version = "0.1.1" @@ -3430,15 +3814,21 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.58" +version = "2.0.66" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44cfb93f38070beee36b3fef7d4f5a16f27751d94b187b666a5cc5e9b0d30687" +checksum = "c42f3f41a2de00b01c0aaad383c5a45241efc8b2d1eda5661812fda5f3cdcff5" dependencies = [ "proc-macro2", "quote", "unicode-ident", ] +[[package]] +name = "sync_wrapper" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2047c6ded9c721764247e62cd3b03c09ffc529b2ba5b10ec482ae507a4a70160" + [[package]] name = "synstructure" version = "0.12.6" @@ -3451,6 +3841,17 @@ dependencies = [ "unicode-xid", ] +[[package]] +name = "tar" +version = "0.4.40" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b16afcea1f22891c49a00c751c7b63b2233284064f11a200fc624137c51e2ddb" +dependencies = [ + "filetime", + "libc", + "xattr", +] + [[package]] name = "tempfile" version = "3.10.1" @@ -3499,22 +3900,22 @@ checksum = "23d434d3f8967a09480fb04132ebe0a3e088c173e6d0ee7897abbdf4eab0f8b9" [[package]] name = "thiserror" -version = "1.0.58" +version = "1.0.61" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03468839009160513471e86a034bb2c5c0e4baae3b43f79ffc55c4a5427b3297" +checksum = "c546c80d6be4bc6a00c0f01730c08df82eaa7a7a61f11d656526506112cc1709" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.58" +version = "1.0.61" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c61f3ba182994efc43764a46c018c347bc492c79f024e705f46567b418f6d4f7" +checksum = "46c3384250002a6d5af4d114f2845d37b57521033f30d5c3f46c4d70e1197533" dependencies = [ "proc-macro2", "quote", - "syn 2.0.58", + "syn 2.0.66", ] [[package]] @@ -3553,9 +3954,9 @@ dependencies = [ [[package]] name = "time" -version = "0.3.34" +version = "0.3.36" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c8248b6521bb14bc45b4067159b9b6ad792e2d6d754d6c41fb50e29fefe38749" +checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885" dependencies = [ "deranged", "itoa", @@ -3565,7 +3966,7 @@ dependencies = [ "powerfmt", "serde", "time-core", - "time-macros 0.2.17", + "time-macros 0.2.18", ] [[package]] @@ -3586,9 +3987,9 @@ dependencies = [ [[package]] name = "time-macros" -version = "0.2.17" +version = "0.2.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ba3a3ef41e6672a2f0f001392bb5dcd3ff0a9992d618ca761a11c3121547774" +checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf" dependencies = [ "num-conv", "time-core", @@ -3652,7 +4053,7 @@ dependencies = [ "libc", "mio", "num_cpus", - "parking_lot 0.12.1", + "parking_lot 0.12.3", "pin-project-lite", "signal-hook-registry", "socket2", @@ -3668,7 +4069,18 @@ checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.58", + "syn 2.0.66", +] + +[[package]] +name = "tokio-rustls" +version = "0.25.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "775e0c0f0adb3a2f22a00c4745d728b479985fc15ee7ca6a2608388c5569860f" +dependencies = [ + "rustls", + "rustls-pki-types", + "tokio", ] [[package]] @@ -3709,6 +4121,19 @@ dependencies = [ "tokio", ] +[[package]] +name = "tokio-util" +version = "0.7.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9cf6b47b3771c49ac75ad09a6162f53ad4b8088b76ac60e8ec1455b31a189fe1" +dependencies = [ + "bytes", + "futures-core", + "futures-sink", + "pin-project-lite", + "tokio", +] + [[package]] name = "toml" version = "0.5.11" @@ -3718,12 +4143,40 @@ dependencies = [ "serde", ] +[[package]] +name = "tower" +version = "0.4.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b8fa9be0de6cf49e536ce1851f987bd21a43b771b09473c3549a6c853db37c1c" +dependencies = [ + "futures-core", + "futures-util", + "pin-project", + "pin-project-lite", + "tokio", + "tower-layer", + "tower-service", +] + +[[package]] +name = "tower-layer" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c20c8dbed6283a09604c3e69b4b7eeb54e298b8a600d4d5ecb5ad39de609f1d0" + +[[package]] +name = "tower-service" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6bc1c9ce2b5135ac7f93c72918fc37feb872bdc6a5533a8b85eb4b86bfdae52" + [[package]] name = "tracing" version = "0.1.40" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef" dependencies = [ + "log", "pin-project-lite", "tracing-attributes", "tracing-core", @@ -3737,7 +4190,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.58", + "syn 2.0.66", ] [[package]] @@ -3750,14 +4203,26 @@ dependencies = [ ] [[package]] -name = "type-map" -version = "0.4.0" +name = "try-lock" +version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6d3364c5e96cb2ad1603037ab253ddd34d7fb72a58bdddf4b7350760fc69a46" +checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b" + +[[package]] +name = "type-map" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "deb68604048ff8fa93347f02441e4487594adc20bb8a084f9e564d2b827a0a9f" dependencies = [ "rustc-hash", ] +[[package]] +name = "typeid" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "059d83cc991e7a42fc37bd50941885db0888e34209f8cfd9aab07ddec03bc9cf" + [[package]] name = "typenum" version = "1.17.0" @@ -3785,7 +4250,7 @@ checksum = "ac73887f47b9312552aa90ef477927ff014d63d1920ca8037c6c1951eab64bb1" dependencies = [ "proc-macro2", "quote", - "syn 2.0.58", + "syn 2.0.66", ] [[package]] @@ -3828,9 +4293,9 @@ dependencies = [ [[package]] name = "unic-langid" -version = "0.9.4" +version = "0.9.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "238722e6d794ed130f91f4ea33e01fcff4f188d92337a21297892521c72df516" +checksum = "23dd9d1e72a73b25e07123a80776aae3e7b0ec461ef94f9151eed6ec88005a44" dependencies = [ "unic-langid-impl", "unic-langid-macros", @@ -3838,18 +4303,18 @@ dependencies = [ [[package]] name = "unic-langid-impl" -version = "0.9.4" +version = "0.9.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4bd55a2063fdea4ef1f8633243a7b0524cbeef1905ae04c31a1c9b9775c55bc6" +checksum = "0a5422c1f65949306c99240b81de9f3f15929f5a8bfe05bb44b034cc8bf593e5" dependencies = [ "tinystr", ] [[package]] name = "unic-langid-macros" -version = "0.9.4" +version = "0.9.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c854cefb82ff2816410ce606acbad1b3af065140907b29be9229040752b83ec" +checksum = "0da1cd2c042d3c7569a1008806b02039e7a4a2bdf8f8e96bd3c792434a0e275e" dependencies = [ "proc-macro-hack", "tinystr", @@ -3859,13 +4324,13 @@ dependencies = [ [[package]] name = "unic-langid-macros-impl" -version = "0.9.4" +version = "0.9.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fea2a4c80deb4fb3ca51f66b5e2dd91e3642bbce52234bcf22e41668281208e4" +checksum = "1ed7f4237ba393424195053097c1516bd4590dc82b84f2f97c5c69e12704555b" dependencies = [ "proc-macro-hack", "quote", - "syn 2.0.58", + "syn 2.0.66", "unic-langid-impl", ] @@ -3901,6 +4366,15 @@ dependencies = [ "unic-common", ] +[[package]] +name = "unicase" +version = "2.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f7d2d4dafb69621809a81864c9c1b864479e1235c0dd4e199924b9742439ed89" +dependencies = [ + "version_check", +] + [[package]] name = "unicode-bidi" version = "0.3.15" @@ -3936,9 +4410,9 @@ checksum = "d4c87d22b6e3f4a18d4d40ef354e97c90fcb14dd91d7dc0aa9d8a1172ebf7202" [[package]] name = "unicode-width" -version = "0.1.11" +version = "0.1.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e51733f11c9c4f72aa0c160008246859e340b00807569a0da0e7a1079b27ba85" +checksum = "68f5e5f3158ecfd4b8ff6fe086db7c8467a2dfdac97fe420f2b7c4aa97af66d6" [[package]] name = "unicode-xid" @@ -3958,6 +4432,12 @@ version = "0.2.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "673aac59facbab8a9007c7f6108d11f63b603f7cabff99fabf650fea5c32b861" +[[package]] +name = "untrusted" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1" + [[package]] name = "url" version = "2.5.0" @@ -3996,7 +4476,7 @@ dependencies = [ "cfg-if 1.0.0", "rustc_version 0.4.0", "rustversion", - "time 0.3.34", + "time 0.3.36", ] [[package]] @@ -4015,6 +4495,15 @@ dependencies = [ "winapi-util", ] +[[package]] +name = "want" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bfa7760aed19e106de2c7c0b581b509f2f25d3dacaf737cb82ac61bc6d760b0e" +dependencies = [ + "try-lock", +] + [[package]] name = "wasi" version = "0.11.0+wasi-snapshot-preview1" @@ -4042,10 +4531,22 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.58", + "syn 2.0.66", "wasm-bindgen-shared", ] +[[package]] +name = "wasm-bindgen-futures" +version = "0.4.42" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "76bc14366121efc8dbb487ab05bcc9d346b3b5ec0eaa76e46594cabbe51762c0" +dependencies = [ + "cfg-if 1.0.0", + "js-sys", + "wasm-bindgen", + "web-sys", +] + [[package]] name = "wasm-bindgen-macro" version = "0.2.92" @@ -4064,7 +4565,7 @@ checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.58", + "syn 2.0.66", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -4075,6 +4576,19 @@ version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "af190c94f2773fdb3729c55b007a722abb5384da03bc0986df4c289bf5567e96" +[[package]] +name = "wasm-streams" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b65dc4c90b63b118468cf747d8bf3566c1913ef60be765b5730ead9e0a3ba129" +dependencies = [ + "futures-util", + "js-sys", + "wasm-bindgen", + "wasm-bindgen-futures", + "web-sys", +] + [[package]] name = "web-sys" version = "0.3.69" @@ -4085,6 +4599,15 @@ dependencies = [ "wasm-bindgen", ] +[[package]] +name = "webpki-roots" +version = "0.26.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b3de34ae270483955a94f4b21bdaaeb83d508bb84a01435f393818edb0012009" +dependencies = [ + "rustls-pki-types", +] + [[package]] name = "which" version = "4.4.2" @@ -4115,11 +4638,11 @@ checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" [[package]] name = "winapi-util" -version = "0.1.6" +version = "0.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f29e6f9198ba0d26b4c9f07dbe6f9ed633e1f3d5b8b414090084349e46a52596" +checksum = "4d4cc384e1e73b93bafa6fb4f1df8c41695c8a91cf9c4c64358067d15a7b6c6b" dependencies = [ - "winapi", + "windows-sys 0.52.0", ] [[package]] @@ -4134,7 +4657,7 @@ version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9" dependencies = [ - "windows-targets 0.52.4", + "windows-targets 0.52.5", ] [[package]] @@ -4176,7 +4699,7 @@ version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" dependencies = [ - "windows-targets 0.52.4", + "windows-targets 0.52.5", ] [[package]] @@ -4211,17 +4734,18 @@ dependencies = [ [[package]] name = "windows-targets" -version = "0.52.4" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7dd37b7e5ab9018759f893a1952c9420d060016fc19a472b4bb20d1bdd694d1b" +checksum = "6f0713a46559409d202e70e28227288446bf7841d3211583a4b53e3f6d96e7eb" dependencies = [ - "windows_aarch64_gnullvm 0.52.4", - "windows_aarch64_msvc 0.52.4", - "windows_i686_gnu 0.52.4", - "windows_i686_msvc 0.52.4", - "windows_x86_64_gnu 0.52.4", - "windows_x86_64_gnullvm 0.52.4", - "windows_x86_64_msvc 0.52.4", + "windows_aarch64_gnullvm 0.52.5", + "windows_aarch64_msvc 0.52.5", + "windows_i686_gnu 0.52.5", + "windows_i686_gnullvm", + "windows_i686_msvc 0.52.5", + "windows_x86_64_gnu 0.52.5", + "windows_x86_64_gnullvm 0.52.5", + "windows_x86_64_msvc 0.52.5", ] [[package]] @@ -4238,9 +4762,9 @@ checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" [[package]] name = "windows_aarch64_gnullvm" -version = "0.52.4" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bcf46cf4c365c6f2d1cc93ce535f2c8b244591df96ceee75d8e83deb70a9cac9" +checksum = "7088eed71e8b8dda258ecc8bac5fb1153c5cffaf2578fc8ff5d61e23578d3263" [[package]] name = "windows_aarch64_msvc" @@ -4256,9 +4780,9 @@ checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" [[package]] name = "windows_aarch64_msvc" -version = "0.52.4" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da9f259dd3bcf6990b55bffd094c4f7235817ba4ceebde8e6d11cd0c5633b675" +checksum = "9985fd1504e250c615ca5f281c3f7a6da76213ebd5ccc9561496568a2752afb6" [[package]] name = "windows_i686_gnu" @@ -4274,9 +4798,15 @@ checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" [[package]] name = "windows_i686_gnu" -version = "0.52.4" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b474d8268f99e0995f25b9f095bc7434632601028cf86590aea5c8a5cb7801d3" +checksum = "88ba073cf16d5372720ec942a8ccbf61626074c6d4dd2e745299726ce8b89670" + +[[package]] +name = "windows_i686_gnullvm" +version = "0.52.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "87f4261229030a858f36b459e748ae97545d6f1ec60e5e0d6a3d32e0dc232ee9" [[package]] name = "windows_i686_msvc" @@ -4292,9 +4822,9 @@ checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" [[package]] name = "windows_i686_msvc" -version = "0.52.4" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1515e9a29e5bed743cb4415a9ecf5dfca648ce85ee42e15873c3cd8610ff8e02" +checksum = "db3c2bf3d13d5b658be73463284eaf12830ac9a26a90c717b7f771dfe97487bf" [[package]] name = "windows_x86_64_gnu" @@ -4310,9 +4840,9 @@ checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" [[package]] name = "windows_x86_64_gnu" -version = "0.52.4" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5eee091590e89cc02ad514ffe3ead9eb6b660aedca2183455434b93546371a03" +checksum = "4e4246f76bdeff09eb48875a0fd3e2af6aada79d409d33011886d3e1581517d9" [[package]] name = "windows_x86_64_gnullvm" @@ -4328,9 +4858,9 @@ checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" [[package]] name = "windows_x86_64_gnullvm" -version = "0.52.4" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77ca79f2451b49fa9e2af39f0747fe999fcda4f5e241b2898624dca97a1f2177" +checksum = "852298e482cd67c356ddd9570386e2862b5673c85bd5f88df9ab6802b334c596" [[package]] name = "windows_x86_64_msvc" @@ -4346,9 +4876,30 @@ checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" [[package]] name = "windows_x86_64_msvc" -version = "0.52.4" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32b752e52a2da0ddfbdbcc6fceadfeede4c939ed16d13e648833a61dfb611ed8" +checksum = "bec47e5bfd1bff0eeaf6d8b485cc1074891a197ab4225d504cb7a1ab88b02bf0" + +[[package]] +name = "winreg" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a277a57398d4bfa075df44f501a17cfdf8542d224f0d36095a2adc7aee4ef0a5" +dependencies = [ + "cfg-if 1.0.0", + "windows-sys 0.48.0", +] + +[[package]] +name = "xattr" +version = "1.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8da84f1a25939b27f6820d92aed108f83ff920fdf11a7b19366c27c4cda81d4f" +dependencies = [ + "libc", + "linux-raw-sys", + "rustix", +] [[package]] name = "yaml-rust" @@ -4373,3 +4924,9 @@ checksum = "fe5c30ade05e61656247b2e334a031dfd0cc466fadef865bdcdea8d537951bf1" dependencies = [ "winapi", ] + +[[package]] +name = "zeroize" +version = "1.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ced3678a2879b30306d323f4542626697a464a97c0a07c9aebf7ebca65cd4dde" diff --git a/pkgs/by-name/kc/kclvm/enable_protoc_env.patch b/pkgs/by-name/kc/kclvm/enable_protoc_env.patch index 4d1f2c2cb9a8..3976f37bd155 100644 --- a/pkgs/by-name/kc/kclvm/enable_protoc_env.patch +++ b/pkgs/by-name/kc/kclvm/enable_protoc_env.patch @@ -1,37 +1,46 @@ -diff --git a/api/build.rs b/api/build.rs -index 617c1b9a..20d728e3 100644 +diff --git a/kclvm/api/build.rs b/kclvm/api/build.rs +index 7d1c39b7..0104bb6f 100644 --- a/api/build.rs +++ b/api/build.rs -@@ -5,10 +5,10 @@ use prost_wkt_build::{FileDescriptorSet, Message}; +@@ -5,12 +5,12 @@ use prost_wkt_build::{FileDescriptorSet, Message}; /// According to the file kclvm/spec/gpyrpc/gpyrpc.proto, automatically generate /// the corresponding rust source file to the directory src/model fn main() { -- std::env::set_var( -- "PROTOC", -- protoc_bin_vendored::protoc_bin_path().unwrap().as_os_str(), -- ); -+ // std::env::set_var( -+ // "PROTOC", -+ // protoc_bin_vendored::protoc_bin_path().unwrap().as_os_str(), -+ // ); - +- if env::var("PROTOC").is_err() { +- env::set_var( +- "PROTOC", +- protoc_bin_vendored::protoc_bin_path().unwrap().as_os_str(), +- ); +- } ++ //if env::var("PROTOC").is_err() { ++ // env::set_var( ++ // "PROTOC", ++ // protoc_bin_vendored::protoc_bin_path().unwrap().as_os_str(), ++ // ); ++ //} + let out = PathBuf::from(env::var("OUT_DIR").unwrap()); let descriptor_file = out.join("kclvm_service_descriptor.bin"); -diff --git b/third-party/prost-wkt/wkt-types/build.rs a/third-party/prost-wkt/wkt-types/build.rs -index e49222d5..a933ddf4 100644 +diff --git a/kclvm/third-party/prost-wkt/wkt-types/build.rs b/kclvm/third-party/prost-wkt/wkt-types/build.rs +index 620c759a..7f77e1b1 100644 --- a/third-party/prost-wkt/wkt-types/build.rs +++ b/third-party/prost-wkt/wkt-types/build.rs -@@ -13,10 +13,10 @@ use regex::Regex; - +@@ -13,12 +13,12 @@ use regex::Regex; + fn main() { //hack: set protoc_bin_vendored::protoc_bin_path() to PROTOC -- std::env::set_var( -- "PROTOC", -- protoc_bin_vendored::protoc_bin_path().unwrap().as_os_str(), -- ); -+ // std::env::set_var( -+ // "PROTOC", -+ // protoc_bin_vendored::protoc_bin_path().unwrap().as_os_str(), -+ // ); +- if env::var("PROTOC").is_err() { +- env::set_var( +- "PROTOC", +- protoc_bin_vendored::protoc_bin_path().unwrap().as_os_str(), +- ); +- } ++ //if env::var("PROTOC").is_err() { ++ // env::set_var( ++ // "PROTOC", ++ // protoc_bin_vendored::protoc_bin_path().unwrap().as_os_str(), ++ // ); ++ //} let dir = PathBuf::from(env::var("OUT_DIR").unwrap()); process_prost_pbtime(&dir); + diff --git a/pkgs/by-name/kc/kclvm/package.nix b/pkgs/by-name/kc/kclvm/package.nix index 549de0066ce0..249c9bca9812 100644 --- a/pkgs/by-name/kc/kclvm/package.nix +++ b/pkgs/by-name/kc/kclvm/package.nix @@ -1,19 +1,22 @@ { lib +, stdenv , rustPlatform , fetchFromGitHub , protobuf , pkg-config +, darwin +, rustc , }: rustPlatform.buildRustPackage rec { pname = "kclvm"; - version = "0.8.7"; + version = "0.9.3"; src = fetchFromGitHub { owner = "kcl-lang"; repo = "kcl"; rev = "v${version}"; - hash = "sha256-ieGpuNkzT6AODZYUcEanb7Jpb+PXclnQ9KkdmlehK0o="; + hash = "sha256-nk5oJRTBRj0LE2URJqno8AoZ+/342C2tEt8d6k2MAc8="; }; sourceRoot = "source/kclvm"; @@ -21,9 +24,21 @@ rustPlatform.buildRustPackage rec { lockFile = ./Cargo.lock; outputHashes = { "inkwell-0.2.0" = "sha256-JxSlhShb3JPhsXK8nGFi2uGPp8XqZUSiqniLBrhr+sM="; + "protoc-bin-vendored-3.1.0" = "sha256-RRqpPMJygpKGG5NYzD93iy4htpVqFhYMmfPgbRtpUqg="; }; }; + buildInputs = [ rustc ] ++ lib.optionals stdenv.isDarwin [ + darwin.apple_sdk.frameworks.Security + darwin.apple_sdk.frameworks.CoreServices + darwin.apple_sdk.frameworks.SystemConfiguration + ]; + + + postInstall = lib.optionalString stdenv.isDarwin '' + install_name_tool -id $out/lib/libkclvm_cli_cdylib.dylib $out/lib/libkclvm_cli_cdylib.dylib + ''; + nativeBuildInputs = [ pkg-config protobuf ]; patches = [ ./enable_protoc_env.patch ]; @@ -35,7 +50,7 @@ rustPlatform.buildRustPackage rec { description = "A high-performance implementation of KCL written in Rust that uses LLVM as the compiler backend"; homepage = "https://github.com/kcl-lang/kcl"; license = licenses.asl20; - platforms = platforms.linux; + platforms = platforms.linux ++ platforms.darwin; maintainers = with maintainers; [ selfuryon peefy ]; }; } diff --git a/pkgs/by-name/kc/kclvm_cli/Cargo.lock b/pkgs/by-name/kc/kclvm_cli/Cargo.lock deleted file mode 100644 index 2cc4275a3b8a..000000000000 --- a/pkgs/by-name/kc/kclvm_cli/Cargo.lock +++ /dev/null @@ -1,7 +0,0 @@ -# This file is automatically @generated by Cargo. -# It is not intended for manual editing. -version = 3 - -[[package]] -name = "kclvm_cli" -version = "0.8.7" diff --git a/pkgs/by-name/kc/kclvm_cli/cargo_lock.patch b/pkgs/by-name/kc/kclvm_cli/cargo_lock.patch index 7e8b91d02b3d..98d155e8c706 100644 --- a/pkgs/by-name/kc/kclvm_cli/cargo_lock.patch +++ b/pkgs/by-name/kc/kclvm_cli/cargo_lock.patch @@ -7,4 +7,4 @@ + +[[package]] +name = "kclvm_cli" -+version = "0.8.7" ++version = "0.9.3" diff --git a/pkgs/by-name/kc/kclvm_cli/package.nix b/pkgs/by-name/kc/kclvm_cli/package.nix index ad1aecafaffd..15e86da2f872 100644 --- a/pkgs/by-name/kc/kclvm_cli/package.nix +++ b/pkgs/by-name/kc/kclvm_cli/package.nix @@ -1,30 +1,40 @@ { lib +, stdenv , rustPlatform , fetchFromGitHub , kclvm +, darwin +, rustc +, }: rustPlatform.buildRustPackage rec { pname = "kclvm_cli"; - version = "0.8.7"; + version = "0.9.3"; src = fetchFromGitHub { owner = "kcl-lang"; repo = "kcl"; rev = "v${version}"; - hash = "sha256-ieGpuNkzT6AODZYUcEanb7Jpb+PXclnQ9KkdmlehK0o="; + hash = "sha256-nk5oJRTBRj0LE2URJqno8AoZ+/342C2tEt8d6k2MAc8="; }; sourceRoot = "source/cli"; - cargoLock.lockFile = ./Cargo.lock; + cargoHash = "sha256-LZUE2J/UYepl5BGf4T4eWKIZfN3mVJtMDLtm0uUmvI8="; cargoPatches = [ ./cargo_lock.patch ]; - buildInputs = [ kclvm ]; + buildInputs = [ kclvm rustc ] ++ ( + lib.optionals stdenv.isDarwin [ + darwin.apple_sdk.frameworks.Security + darwin.apple_sdk.frameworks.CoreServices + darwin.apple_sdk.frameworks.SystemConfiguration + ] + ); meta = with lib; { description = "A high-performance implementation of KCL written in Rust that uses LLVM as the compiler backend"; homepage = "https://github.com/kcl-lang/kcl"; license = licenses.asl20; - platforms = platforms.linux; + platforms = platforms.linux ++ platforms.darwin; maintainers = with maintainers; [ selfuryon peefy ]; mainProgram = "kclvm_cli"; }; diff --git a/pkgs/by-name/la/lager/package.nix b/pkgs/by-name/la/lager/package.nix index 1786e0cc503d..83144cca3bdf 100644 --- a/pkgs/by-name/la/lager/package.nix +++ b/pkgs/by-name/la/lager/package.nix @@ -2,7 +2,6 @@ , stdenv , fetchFromGitHub , cmake -, pkg-config , boost , immer , zug diff --git a/pkgs/by-name/ld/ldc/package.nix b/pkgs/by-name/ld/ldc/package.nix index f92d62430911..112a9eeb1d8e 100644 --- a/pkgs/by-name/ld/ldc/package.nix +++ b/pkgs/by-name/ld/ldc/package.nix @@ -3,15 +3,13 @@ , fetchFromGitHub , cmake , ninja -, llvm_17 +, llvm_18 , curl , tzdata -, libconfig , lit , gdb , unzip , darwin -, bash , callPackage , makeWrapper , runCommand @@ -64,7 +62,7 @@ stdenv.mkDerivation (finalAttrs: { ''; nativeBuildInputs = [ - cmake ldcBootstrap lit lit.python llvm_17.dev makeWrapper ninja unzip + cmake ldcBootstrap lit lit.python llvm_18.dev makeWrapper ninja unzip ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Foundation ] ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ @@ -148,6 +146,7 @@ stdenv.mkDerivation (finalAttrs: { platforms = [ "x86_64-linux" "i686-linux" "aarch64-linux" "x86_64-darwin" "aarch64-darwin" ]; }; + passthru.ldcBootstrap = ldcBootstrap; passthru.tests = let ldc = finalAttrs.finalPackage; helloWorld = stdenv.mkDerivation (finalAttrs: { diff --git a/pkgs/by-name/li/libcircle/package.nix b/pkgs/by-name/li/libcircle/package.nix index d176bbacc89f..1ff33ac1ac21 100644 --- a/pkgs/by-name/li/libcircle/package.nix +++ b/pkgs/by-name/li/libcircle/package.nix @@ -4,7 +4,6 @@ , autoreconfHook , pkg-config , mpi -, lwgrp }: stdenv.mkDerivation rec { diff --git a/pkgs/by-name/li/libgnome-keyring/package.nix b/pkgs/by-name/li/libgnome-keyring/package.nix index e845970a6ad7..bc4a26a0079b 100644 --- a/pkgs/by-name/li/libgnome-keyring/package.nix +++ b/pkgs/by-name/li/libgnome-keyring/package.nix @@ -1,5 +1,4 @@ -{ lib, stdenv, fetchurl, glib, dbus, libgcrypt, pkg-config, intltool, gobject-introspection, gnome -, testers +{ lib, stdenv, fetchurl, glib, dbus, libgcrypt, pkg-config, intltool, gobject-introspection, testers }: stdenv.mkDerivation (finalAttrs: { diff --git a/pkgs/by-name/li/libisoburn/package.nix b/pkgs/by-name/li/libisoburn/package.nix index cc870b72a8a8..7fc8c6aff60f 100644 --- a/pkgs/by-name/li/libisoburn/package.nix +++ b/pkgs/by-name/li/libisoburn/package.nix @@ -54,7 +54,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { homepage = "http://libburnia-project.org/"; - description = "Enables creation and expansion of ISO-9660 filesystems on CD/DVD/BD "; + description = "Enables creation and expansion of ISO-9660 filesystems on CD/DVD/BD"; changelog = "https://dev.lovelyhq.com/libburnia/libisoburn/src/tag/${finalAttrs.src.rev}/ChangeLog"; license = lib.licenses.gpl2Plus; mainProgram = "osirrox"; diff --git a/pkgs/by-name/li/libitl/package.nix b/pkgs/by-name/li/libitl/package.nix index e1d3a21e7291..8bec704064c5 100644 --- a/pkgs/by-name/li/libitl/package.nix +++ b/pkgs/by-name/li/libitl/package.nix @@ -2,7 +2,6 @@ , stdenv , fetchFromGitHub , cmake -, fetchpatch }: stdenv.mkDerivation (finalAttrs: { diff --git a/pkgs/by-name/li/librime-octagram/package.nix b/pkgs/by-name/li/librime-octagram/package.nix new file mode 100644 index 000000000000..b1b96d5eea6c --- /dev/null +++ b/pkgs/by-name/li/librime-octagram/package.nix @@ -0,0 +1,36 @@ +{ + lib, + stdenvNoCC, + fetchFromGitHub, + nix-update-script, +}: + +stdenvNoCC.mkDerivation { + pname = "librime-octagram"; + version = "0-unstable-2024-02-05"; + + src = fetchFromGitHub { + owner = "lotem"; + repo = "librime-octagram"; + rev = "bd12863f45fbbd5c7db06d5ec8be8987b10253bf"; + hash = "sha256-77g72tee4ahNcu3hfW1Okqr9z8Y6WrPgUhw316O72Ng="; + }; + + installPhase = '' + runHook preInstall + + mkdir $out + cp --archive --verbose * $out + + runHook postInstall + ''; + + passthru.updateScript = nix-update-script { extraArgs = [ "--version=branch" ]; }; + + meta = { + description = "RIME essay grammar plugin"; + homepage = "https://github.com/lotem/librime-octagram"; + license = lib.licenses.gpl3Only; + maintainers = with lib.maintainers; [ azuwis ]; + }; +} diff --git a/pkgs/by-name/lm/lmstudio/darwin.nix b/pkgs/by-name/lm/lmstudio/darwin.nix index dae243747292..2a96f05bebe6 100644 --- a/pkgs/by-name/lm/lmstudio/darwin.nix +++ b/pkgs/by-name/lm/lmstudio/darwin.nix @@ -1,7 +1,6 @@ { stdenv , fetchurl , undmg -, lib , meta , pname , version diff --git a/pkgs/by-name/lm/lmstudio/linux.nix b/pkgs/by-name/lm/lmstudio/linux.nix index d5647e72caaa..f4ed1b048000 100644 --- a/pkgs/by-name/lm/lmstudio/linux.nix +++ b/pkgs/by-name/lm/lmstudio/linux.nix @@ -1,5 +1,4 @@ -{ lib -, appimageTools +{ appimageTools , fetchurl , version , pname diff --git a/pkgs/by-name/ma/maa-assistant-arknights/fastdeploy-ppocr.nix b/pkgs/by-name/ma/maa-assistant-arknights/fastdeploy-ppocr.nix index 77b7e00b0618..98ab599b9ddc 100644 --- a/pkgs/by-name/ma/maa-assistant-arknights/fastdeploy-ppocr.nix +++ b/pkgs/by-name/ma/maa-assistant-arknights/fastdeploy-ppocr.nix @@ -1,7 +1,6 @@ { stdenv, config, - pkgs, lib, fetchFromGitHub, cmake, diff --git a/pkgs/by-name/ma/mautrix-meta/package.nix b/pkgs/by-name/ma/mautrix-meta/package.nix index 8a82adf188fd..17639dc432e3 100644 --- a/pkgs/by-name/ma/mautrix-meta/package.nix +++ b/pkgs/by-name/ma/mautrix-meta/package.nix @@ -1,5 +1,4 @@ { buildGoModule -, config , fetchFromGitHub , lib , nixosTests diff --git a/pkgs/by-name/me/media-downloader/package.nix b/pkgs/by-name/me/media-downloader/package.nix index 2db54695b3b8..5d77bbd63478 100644 --- a/pkgs/by-name/me/media-downloader/package.nix +++ b/pkgs/by-name/me/media-downloader/package.nix @@ -13,7 +13,6 @@ libsForQt5, python3, stdenv, - yt-dlp, }: stdenv.mkDerivation (finalAttrs: { diff --git a/pkgs/by-name/mf/mfcj880dwlpr/package.nix b/pkgs/by-name/mf/mfcj880dwlpr/package.nix index 8b69c85c7240..cbfcd2b54b9c 100644 --- a/pkgs/by-name/mf/mfcj880dwlpr/package.nix +++ b/pkgs/by-name/mf/mfcj880dwlpr/package.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, pkgsi686Linux, dpkg, makeWrapper, coreutils, gnused, gawk, file, cups, util-linux, xxd, runtimeShell -, ghostscript, a2ps, bash }: +, ghostscript, a2ps }: # Why: # The executable "brprintconf_mfcj880dw" binary is looking for "/opt/brother/Printers/%s/inf/br%sfunc" and "/opt/brother/Printers/%s/inf/br%src". diff --git a/pkgs/by-name/mo/mo/package.nix b/pkgs/by-name/mo/mo/package.nix index 5de0716fde5d..4ce066920b99 100644 --- a/pkgs/by-name/mo/mo/package.nix +++ b/pkgs/by-name/mo/mo/package.nix @@ -1,7 +1,6 @@ { stdenv , lib , fetchFromGitHub -, runtimeShell }: stdenv.mkDerivation rec { diff --git a/pkgs/by-name/mo/mousai/package.nix b/pkgs/by-name/mo/mousai/package.nix index 48535143a509..b67ef0d86452 100644 --- a/pkgs/by-name/mo/mousai/package.nix +++ b/pkgs/by-name/mo/mousai/package.nix @@ -7,7 +7,6 @@ , desktop-file-utils , glib , glib-networking -, gobject-introspection , gst_all_1 , gtk4 , libadwaita diff --git a/pkgs/by-name/ni/nix-web/package.nix b/pkgs/by-name/ni/nix-web/package.nix index 4f73413d2888..ad97b1356b3e 100644 --- a/pkgs/by-name/ni/nix-web/package.nix +++ b/pkgs/by-name/ni/nix-web/package.nix @@ -7,7 +7,6 @@ , nixVersions , nixPackage ? nixVersions.nix_2_18 , darwin -, nukeReferences }: let diff --git a/pkgs/by-name/ni/nixfmt-rfc-style/package.nix b/pkgs/by-name/ni/nixfmt-rfc-style/package.nix index bf1c093051d5..a11e2d29ff69 100644 --- a/pkgs/by-name/ni/nixfmt-rfc-style/package.nix +++ b/pkgs/by-name/ni/nixfmt-rfc-style/package.nix @@ -4,7 +4,6 @@ lib, runCommand, nixfmt-rfc-style, - fetchpatch, }: let inherit (haskell.lib.compose) overrideCabal justStaticExecutables; diff --git a/pkgs/by-name/nu/nuclei-templates/package.nix b/pkgs/by-name/nu/nuclei-templates/package.nix index 0e6fe513d544..6e895ee70b47 100644 --- a/pkgs/by-name/nu/nuclei-templates/package.nix +++ b/pkgs/by-name/nu/nuclei-templates/package.nix @@ -6,13 +6,13 @@ stdenvNoCC.mkDerivation rec { pname = "nuclei-templates"; - version = "9.9.1"; + version = "9.9.2"; src = fetchFromGitHub { owner = "projectdiscovery"; repo = "nuclei-templates"; rev = "refs/tags/v${version}"; - hash = "sha256-zD+mW7l7Wv6re8X6YztEnfwBYbMSLWZgbVpOpjZWNXM="; + hash = "sha256-PObtdRhj4KaQRHpSSGCZzhFXRYRAJ4mejkYi7SgOqyE="; }; installPhase = '' diff --git a/pkgs/by-name/nu/nuv/package.nix b/pkgs/by-name/nu/nuv/package.nix index 7e434984786a..386828568104 100644 --- a/pkgs/by-name/nu/nuv/package.nix +++ b/pkgs/by-name/nu/nuv/package.nix @@ -2,7 +2,6 @@ , symlinkJoin , callPackage , fetchFromGitHub -, fetchurl , buildGoModule , makeWrapper , breakpointHook diff --git a/pkgs/by-name/nv/nvidia-container-toolkit/nvidia-docker.nix b/pkgs/by-name/nv/nvidia-container-toolkit/nvidia-docker.nix index 07dfc3fdb6dc..f2ff4bafaf77 100644 --- a/pkgs/by-name/nv/nvidia-container-toolkit/nvidia-docker.nix +++ b/pkgs/by-name/nv/nvidia-container-toolkit/nvidia-docker.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, callPackage }: +{ stdenv, lib, fetchFromGitHub }: stdenv.mkDerivation rec { pname = "nvidia-docker"; version = "2.5.0"; diff --git a/pkgs/by-name/oc/ocis-bin/package.nix b/pkgs/by-name/oc/ocis-bin/package.nix index 572c78ba10f1..a0b8a62ed462 100644 --- a/pkgs/by-name/oc/ocis-bin/package.nix +++ b/pkgs/by-name/oc/ocis-bin/package.nix @@ -58,7 +58,7 @@ stdenv.mkDerivation (finalAttrs: { passthru.updateScript = ./update.py; meta = with lib; { - description = "ownCloud Infinite Scale Stack "; + description = "ownCloud Infinite Scale Stack"; homepage = "https://owncloud.dev/ocis/"; changelog = "https://github.com/owncloud/ocis/releases/tag/v${finalAttrs.version}"; # oCIS is licensed under non-free EULA which can be found here : diff --git a/pkgs/by-name/ol/ollama/package.nix b/pkgs/by-name/ol/ollama/package.nix index a1f4dcc20629..122d8fe23e15 100644 --- a/pkgs/by-name/ol/ollama/package.nix +++ b/pkgs/by-name/ol/ollama/package.nix @@ -40,13 +40,13 @@ assert builtins.elem acceleration [ let pname = "ollama"; # don't forget to invalidate all hashes each update - version = "0.2.8"; + version = "0.3.0"; src = fetchFromGitHub { owner = "ollama"; repo = "ollama"; rev = "v${version}"; - hash = "sha256-uir/GoFs0nhhHpznyYkwVjAUWxwjWmGZ7liU2htyQ04="; + hash = "sha256-69CpRAggx6a1NJq+CA9QliXuUbDgC1ERRuA3y17KVAM="; fetchSubmodules = true; }; diff --git a/pkgs/by-name/on/onlyoffice-bin/package.nix b/pkgs/by-name/on/onlyoffice-bin/package.nix index 4c9c0cd1e326..5156778b7e25 100644 --- a/pkgs/by-name/on/onlyoffice-bin/package.nix +++ b/pkgs/by-name/on/onlyoffice-bin/package.nix @@ -1,6 +1,7 @@ { stdenv , lib , fetchurl +, buildFHSEnv # Alphabetic ordering below , alsa-lib , at-spi2-atk @@ -24,6 +25,8 @@ , libudev0-shim , libdrm , makeWrapper +, mesa +, noto-fonts-cjk-sans , nspr , nss , pulseaudio @@ -52,18 +55,6 @@ let # TODO: Find out which of these fonts we'd be allowed to distribute along # with this package, or how to make this easier for users otherwise. - # Not using the `noto-fonts-cjk` package from nixpkgs, because it was - # reported that its `.ttc` file is not picked up by OnlyOffice, see: - # https://github.com/NixOS/nixpkgs/pull/116343#discussion_r593979816 - noto-fonts-cjk = fetchurl { - url = - let - version = "v20201206-cjk"; - in - "https://github.com/googlefonts/noto-cjk/raw/${version}/NotoSansCJKsc-Regular.otf"; - sha256 = "sha256-aJXSVNJ+p6wMAislXUn4JQilLhimNSedbc9nAuPVxo4="; - }; - runtimeLibs = lib.makeLibraryPath [ curl glibc @@ -72,115 +63,130 @@ let pulseaudio ]; -in -stdenv.mkDerivation rec { - pname = "onlyoffice-desktopeditors"; - version = "7.2.0"; - minor = null; - src = fetchurl { - url = "https://github.com/ONLYOFFICE/DesktopEditors/releases/download/v${version}/onlyoffice-desktopeditors_amd64.deb"; - sha256 = "sha256-O9gC/b5/eZ1YImuXpEZOJhI1rzCNuFrm5IqablnYo9Y="; + derivation = stdenv.mkDerivation rec { + pname = "onlyoffice-desktopeditors"; + version = "8.1.0"; + minor = null; + src = fetchurl { + url = "https://github.com/ONLYOFFICE/DesktopEditors/releases/download/v${version}/onlyoffice-desktopeditors_amd64.deb"; + sha256 = "sha256-hS1+gLN17sP3EFud3fQXRWeFiQbrumBONLjqXEl89Js="; + }; + + nativeBuildInputs = [ + autoPatchelfHook + dpkg + makeWrapper + wrapGAppsHook3 + ]; + + buildInputs = [ + alsa-lib + at-spi2-atk + atk + cairo + dbus + dconf + fontconfig + gdk-pixbuf + glib + gsettings-desktop-schemas + gst_all_1.gst-plugins-base + gst_all_1.gstreamer + gtk2 + gtk3 + libpulseaudio + libdrm + nspr + nss + mesa # libgbm + qt5.qtbase + qt5.qtdeclarative + qt5.qtsvg + qt5.qtwayland + xorg.libX11 + xorg.libxcb + xorg.libXcomposite + xorg.libXcursor + xorg.libXdamage + xorg.libXext + xorg.libXfixes + xorg.libXi + xorg.libXrandr + xorg.libXrender + xorg.libXScrnSaver + xorg.libXtst + ]; + + dontWrapQtApps = true; + + unpackPhase = '' + dpkg-deb --fsys-tarfile $src | tar -x --no-same-permissions --no-same-owner + ''; + + installPhase = '' + runHook preInstall + + mkdir -p $out/{bin,lib,share} + + mv usr/bin/* $out/bin + mv usr/share/* $out/share/ + mv opt/onlyoffice/desktopeditors $out/share + + for f in $out/share/desktopeditors/asc-de-*.png; do + size=$(basename "$f" ".png" | cut -d"-" -f3) + res="''${size}x''${size}" + mkdir -pv "$out/share/icons/hicolor/$res/apps" + ln -s "$f" "$out/share/icons/hicolor/$res/apps/onlyoffice-desktopeditors.png" + done; + + substituteInPlace $out/bin/onlyoffice-desktopeditors \ + --replace "/opt/onlyoffice/" "$out/share/" + + ln -s $out/share/desktopeditors/DesktopEditors $out/bin/DesktopEditors + + runHook postInstall + ''; + + preFixup = '' + gappsWrapperArgs+=( + --prefix LD_LIBRARY_PATH : "${runtimeLibs}" \ + --set QT_XKB_CONFIG_ROOT "${xkeyboard_config}/share/X11/xkb" \ + --set QTCOMPOSE "${xorg.libX11.out}/share/X11/locale" \ + --set QT_QPA_PLATFORM "xcb" + # the bundled version of qt does not support wayland + ) + ''; }; - nativeBuildInputs = [ - autoPatchelfHook - dpkg - makeWrapper - wrapGAppsHook3 +in + +# In order to download plugins, OnlyOffice uses /usr/bin/curl so we have to wrap it. +# Curl still needs to be in runtimeLibs because the library is used directly in other parts of the code. +# Fonts are also discovered by looking in /usr/share/fonts, so adding fonts to targetPkgs will include them +buildFHSEnv { + inherit (derivation) pname version; + + targetPkgs = pkgs': [ + curl + derivation + noto-fonts-cjk-sans ]; - buildInputs = [ - alsa-lib - at-spi2-atk - atk - cairo - dbus - dconf - fontconfig - gdk-pixbuf - glib - gsettings-desktop-schemas - gst_all_1.gst-plugins-base - gst_all_1.gstreamer - gtk2 - gtk3 - libpulseaudio - libdrm - nspr - nss - qt5.qtbase - qt5.qtdeclarative - qt5.qtsvg - qt5.qtwayland - xorg.libX11 - xorg.libxcb - xorg.libXcomposite - xorg.libXcursor - xorg.libXdamage - xorg.libXext - xorg.libXfixes - xorg.libXi - xorg.libXrandr - xorg.libXrender - xorg.libXScrnSaver - xorg.libXtst - ]; - - dontWrapQtApps = true; - - unpackPhase = '' - dpkg-deb --fsys-tarfile $src | tar -x --no-same-permissions --no-same-owner - ''; - - preConfigure = '' - cp --no-preserve=mode,ownership ${noto-fonts-cjk} opt/onlyoffice/desktopeditors/fonts/ - ''; - - installPhase = '' - runHook preInstall - - mkdir -p $out/{bin,lib,share} - - mv usr/bin/* $out/bin - mv usr/share/* $out/share/ - mv opt/onlyoffice/desktopeditors $out/share - - for f in $out/share/desktopeditors/asc-de-*.png; do - size=$(basename "$f" ".png" | cut -d"-" -f3) - res="''${size}x''${size}" - mkdir -pv "$out/share/icons/hicolor/$res/apps" - ln -s "$f" "$out/share/icons/hicolor/$res/apps/onlyoffice-desktopeditors.png" - done; - - substituteInPlace $out/bin/onlyoffice-desktopeditors \ - --replace "/opt/onlyoffice/" "$out/share/" - - ln -s $out/share/desktopeditors/DesktopEditors $out/bin/DesktopEditors + runScript = "/bin/onlyoffice-desktopeditors"; + extraInstallCommands = '' + mkdir -p $out/share + ln -s ${derivation}/share/icons $out/share + cp -r ${derivation}/share/applications $out/share substituteInPlace $out/share/applications/onlyoffice-desktopeditors.desktop \ - --replace "/usr/bin/onlyoffice-desktopeditor" "$out/bin/DesktopEditor" - - runHook postInstall - ''; - - preFixup = '' - gappsWrapperArgs+=( - --prefix LD_LIBRARY_PATH : "${runtimeLibs}" \ - --set QT_XKB_CONFIG_ROOT "${xkeyboard_config}/share/X11/xkb" \ - --set QTCOMPOSE "${xorg.libX11.out}/share/X11/locale" \ - --set QT_QPA_PLATFORM "xcb" - # the bundled version of qt does not support wayland - ) + --replace "/usr/bin/onlyoffice-desktopeditors" "$out/bin/onlyoffice-desktopeditors" ''; passthru.updateScript = ./update.sh; meta = with lib; { description = "Office suite that combines text, spreadsheet and presentation editors allowing to create, view and edit local documents"; - longDescription = '' - The latest versions of OnlyOffice are currently broken on wlroots environments (e.g. Hyprland, Sway). - If you are using a different environment, you can get the latest version using `onlyoffice-bin_latest`. - ''; + mainProgram = "onlyoffice-desktopeditors"; homepage = "https://www.onlyoffice.com/"; downloadPage = "https://github.com/ONLYOFFICE/DesktopEditors/releases"; changelog = "https://github.com/ONLYOFFICE/DesktopEditors/blob/master/CHANGELOG.md"; diff --git a/pkgs/by-name/on/onlyoffice-bin_latest/package.nix b/pkgs/by-name/on/onlyoffice-bin_latest/package.nix deleted file mode 100644 index 726bda8df039..000000000000 --- a/pkgs/by-name/on/onlyoffice-bin_latest/package.nix +++ /dev/null @@ -1,202 +0,0 @@ -{ stdenv -, lib -, fetchurl -, buildFHSEnv - # Alphabetic ordering below -, alsa-lib -, at-spi2-atk -, atk -, autoPatchelfHook -, cairo -, curl -, dbus -, dconf -, dpkg -, fontconfig -, gcc-unwrapped -, gdk-pixbuf -, glib -, glibc -, gsettings-desktop-schemas -, gst_all_1 -, gtk2 -, gtk3 -, libpulseaudio -, libudev0-shim -, libdrm -, makeWrapper -, mesa -, noto-fonts-cjk-sans -, nspr -, nss -, pulseaudio -, qt5 -, wrapGAppsHook3 -, xkeyboard_config -, xorg -}: -let - - # Note on fonts: - # - # OnlyOffice does not distribute unfree fonts, but makes it easy to pick up - # any fonts you install. See: - # - # * https://helpcenter.onlyoffice.com/en/installation/docs-community-install-fonts-linux.aspx - # * https://www.onlyoffice.com/blog/2020/04/how-to-add-new-fonts-to-onlyoffice-desktop-editors/ - # - # As recommended there, you should download - # - # arial.ttf, calibri.ttf, cour.ttf, symbol.ttf, times.ttf, wingding.ttf - # - # into `~/.local/share/fonts/`, otherwise the default template fonts, and - # things like bullet points, will not look as expected. - - # TODO: Find out which of these fonts we'd be allowed to distribute along - # with this package, or how to make this easier for users otherwise. - - runtimeLibs = lib.makeLibraryPath [ - curl - glibc - gcc-unwrapped.lib - libudev0-shim - pulseaudio - ]; - - derivation = stdenv.mkDerivation rec { - pname = "onlyoffice-desktopeditors"; - version = "8.1.0"; - minor = null; - src = fetchurl { - url = "https://github.com/ONLYOFFICE/DesktopEditors/releases/download/v${version}/onlyoffice-desktopeditors_amd64.deb"; - sha256 = "sha256-hS1+gLN17sP3EFud3fQXRWeFiQbrumBONLjqXEl89Js="; - }; - - nativeBuildInputs = [ - autoPatchelfHook - dpkg - makeWrapper - wrapGAppsHook3 - ]; - - buildInputs = [ - alsa-lib - at-spi2-atk - atk - cairo - dbus - dconf - fontconfig - gdk-pixbuf - glib - gsettings-desktop-schemas - gst_all_1.gst-plugins-base - gst_all_1.gstreamer - gtk2 - gtk3 - libpulseaudio - libdrm - nspr - nss - mesa # libgbm - qt5.qtbase - qt5.qtdeclarative - qt5.qtsvg - qt5.qtwayland - xorg.libX11 - xorg.libxcb - xorg.libXcomposite - xorg.libXcursor - xorg.libXdamage - xorg.libXext - xorg.libXfixes - xorg.libXi - xorg.libXrandr - xorg.libXrender - xorg.libXScrnSaver - xorg.libXtst - ]; - - dontWrapQtApps = true; - - unpackPhase = '' - dpkg-deb --fsys-tarfile $src | tar -x --no-same-permissions --no-same-owner - ''; - - installPhase = '' - runHook preInstall - - mkdir -p $out/{bin,lib,share} - - mv usr/bin/* $out/bin - mv usr/share/* $out/share/ - mv opt/onlyoffice/desktopeditors $out/share - - for f in $out/share/desktopeditors/asc-de-*.png; do - size=$(basename "$f" ".png" | cut -d"-" -f3) - res="''${size}x''${size}" - mkdir -pv "$out/share/icons/hicolor/$res/apps" - ln -s "$f" "$out/share/icons/hicolor/$res/apps/onlyoffice-desktopeditors.png" - done; - - substituteInPlace $out/bin/onlyoffice-desktopeditors \ - --replace "/opt/onlyoffice/" "$out/share/" - - ln -s $out/share/desktopeditors/DesktopEditors $out/bin/DesktopEditors - - runHook postInstall - ''; - - preFixup = '' - gappsWrapperArgs+=( - --prefix LD_LIBRARY_PATH : "${runtimeLibs}" \ - --set QT_XKB_CONFIG_ROOT "${xkeyboard_config}/share/X11/xkb" \ - --set QTCOMPOSE "${xorg.libX11.out}/share/X11/locale" \ - --set QT_QPA_PLATFORM "xcb" - # the bundled version of qt does not support wayland - ) - ''; - }; - -in - -# In order to download plugins, OnlyOffice uses /usr/bin/curl so we have to wrap it. -# Curl still needs to be in runtimeLibs because the library is used directly in other parts of the code. -# Fonts are also discovered by looking in /usr/share/fonts, so adding fonts to targetPkgs will include them -buildFHSEnv { - inherit (derivation) pname version; - - targetPkgs = pkgs': [ - curl - derivation - noto-fonts-cjk-sans - ]; - - runScript = "/bin/onlyoffice-desktopeditors"; - - extraInstallCommands = '' - mkdir -p $out/share - ln -s ${derivation}/share/icons $out/share - cp -r ${derivation}/share/applications $out/share - substituteInPlace $out/share/applications/onlyoffice-desktopeditors.desktop \ - --replace "/usr/bin/onlyoffice-desktopeditors" "$out/bin/onlyoffice-desktopeditors" - ''; - - passthru.updateScript = ./update.sh; - - meta = with lib; { - description = "Office suite that combines text, spreadsheet and presentation editors allowing to create, view and edit local documents"; - mainProgram = "onlyoffice-desktopeditors"; - longDescription = '' - This version is broken on wlroots environments (e.g. Hyprland, Sway). - If you are using one of these environments, please use `onlyoffice-bin` instead. - ''; - homepage = "https://www.onlyoffice.com/"; - downloadPage = "https://github.com/ONLYOFFICE/DesktopEditors/releases"; - changelog = "https://github.com/ONLYOFFICE/DesktopEditors/blob/master/CHANGELOG.md"; - platforms = [ "x86_64-linux" ]; - sourceProvenance = with sourceTypes; [ binaryNativeCode ]; - license = licenses.agpl3Plus; - maintainers = with maintainers; [ nh2 gtrunsec ]; - }; -} diff --git a/pkgs/by-name/on/onlyoffice-bin_latest/update.sh b/pkgs/by-name/on/onlyoffice-bin_latest/update.sh deleted file mode 100644 index d7b0bc106fa2..000000000000 --- a/pkgs/by-name/on/onlyoffice-bin_latest/update.sh +++ /dev/null @@ -1,5 +0,0 @@ -#!/usr/bin/env nix-shell -#!nix-shell -i bash -p curl jq common-updater-scripts - -version="$(curl -sL "https://api.github.com/repos/ONLYOFFICE/DesktopEditors/releases?per_page=1" | jq -r ".[0].tag_name" | sed 's/^v//')" -update-source-version onlyoffice-bin "$version" diff --git a/pkgs/by-name/oo/oo7/package.nix b/pkgs/by-name/oo/oo7/package.nix index a126a27fd107..4fcd76aedd5f 100644 --- a/pkgs/by-name/oo/oo7/package.nix +++ b/pkgs/by-name/oo/oo7/package.nix @@ -2,7 +2,6 @@ lib, rustPlatform, fetchFromGitHub, - nix-update-script, oo7, openssl, pkg-config, diff --git a/pkgs/by-name/op/openapi-tui/package.nix b/pkgs/by-name/op/openapi-tui/package.nix index fdbc0b6cb1d3..09c7eae81bf4 100644 --- a/pkgs/by-name/op/openapi-tui/package.nix +++ b/pkgs/by-name/op/openapi-tui/package.nix @@ -1,7 +1,6 @@ { lib , rustPlatform , fetchFromGitHub -, pkg-config }: rustPlatform.buildRustPackage rec { diff --git a/pkgs/by-name/op/openasar/package.nix b/pkgs/by-name/op/openasar/package.nix index 5c1ddb9a9f76..0d034ea1b8d1 100644 --- a/pkgs/by-name/op/openasar/package.nix +++ b/pkgs/by-name/op/openasar/package.nix @@ -4,7 +4,6 @@ fetchFromGitHub, unstableGitUpdater, nodejs, - bash, asar, unzip, }: diff --git a/pkgs/by-name/op/openjph/package.nix b/pkgs/by-name/op/openjph/package.nix index c19c18f17a45..5fcebb7af663 100644 --- a/pkgs/by-name/op/openjph/package.nix +++ b/pkgs/by-name/op/openjph/package.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "openjph"; - version = "0.14.2"; + version = "0.15.0"; src = fetchFromGitHub { owner = "aous72"; repo = "openjph"; rev = finalAttrs.version; - hash = "sha256-jksQfNcgw3LRzQlcsGpTAn6avmM3BsH6wGNTdX9khYY="; + hash = "sha256-v4rqBTS6rk5fgDQqvqPwFAYxLNxtsRhZuQsj+y3sE3o="; }; nativeBuildInputs = [ cmake validatePkgConfig ]; diff --git a/pkgs/by-name/pa/paralus-cli/package.nix b/pkgs/by-name/pa/paralus-cli/package.nix index 81ef70de32f7..e838acf69cf0 100644 --- a/pkgs/by-name/pa/paralus-cli/package.nix +++ b/pkgs/by-name/pa/paralus-cli/package.nix @@ -1,8 +1,6 @@ { lib , fetchFromGitHub , buildGoModule -, paralus-cli -, testers }: buildGoModule rec { diff --git a/pkgs/by-name/pa/parinfer-rust-emacs/package.nix b/pkgs/by-name/pa/parinfer-rust-emacs/package.nix index 8bed804d3d66..2c9d7a48f045 100644 --- a/pkgs/by-name/pa/parinfer-rust-emacs/package.nix +++ b/pkgs/by-name/pa/parinfer-rust-emacs/package.nix @@ -1,7 +1,6 @@ { fetchFromGitHub, lib, - llvmPackages, rustPlatform, }: rustPlatform.buildRustPackage rec { diff --git a/pkgs/by-name/pa/parsedmarc/package.nix b/pkgs/by-name/pa/parsedmarc/package.nix index fab1e01e8ba4..6c08dced6326 100644 --- a/pkgs/by-name/pa/parsedmarc/package.nix +++ b/pkgs/by-name/pa/parsedmarc/package.nix @@ -1,5 +1,4 @@ -{ lib -, python3 +{ python3 , fetchFromGitHub }: diff --git a/pkgs/by-name/pd/pdf4qt/package.nix b/pkgs/by-name/pd/pdf4qt/package.nix index ff9aa46666cf..d11d346724d2 100644 --- a/pkgs/by-name/pd/pdf4qt/package.nix +++ b/pkgs/by-name/pd/pdf4qt/package.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchFromGitHub -, substituteAll , lcms , cmake , pkg-config diff --git a/pkgs/by-name/pe/perl-debug-adapter/package.nix b/pkgs/by-name/pe/perl-debug-adapter/package.nix index eb9dd371a9b9..85deced748f6 100644 --- a/pkgs/by-name/pe/perl-debug-adapter/package.nix +++ b/pkgs/by-name/pe/perl-debug-adapter/package.nix @@ -1,7 +1,6 @@ { lib , buildNpmPackage , fetchFromGitHub -, makeWrapper , perl # Needed if you want to use it for a perl script with dependencies. , extraPerlPackages ? [] diff --git a/pkgs/by-name/pg/pghero/package.nix b/pkgs/by-name/pg/pghero/package.nix index 0f74a39add63..34c9d9466da5 100644 --- a/pkgs/by-name/pg/pghero/package.nix +++ b/pkgs/by-name/pg/pghero/package.nix @@ -1,6 +1,5 @@ { lib , stdenv -, ruby , bundlerEnv , buildPackages , fetchFromGitHub diff --git a/pkgs/by-name/ph/phpunit/package.nix b/pkgs/by-name/ph/phpunit/package.nix index 272a7d74e170..347f8e80a862 100644 --- a/pkgs/by-name/ph/phpunit/package.nix +++ b/pkgs/by-name/ph/phpunit/package.nix @@ -6,13 +6,13 @@ php.buildComposerProject (finalAttrs: { pname = "phpunit"; - version = "11.2.7"; + version = "11.2.8"; src = fetchFromGitHub { owner = "sebastianbergmann"; repo = "phpunit"; rev = finalAttrs.version; - hash = "sha256-s/zfTW8a+E/FOuHg+oSpVZdxBdfIVL0RmvBBcI6zB9Y="; + hash = "sha256-f3xLLOLpbSbgYoGpJHvUpea+wOu2U3M6jxZy/Rxro20="; }; vendorHash = "sha256-Gjii3m8wWmZbozKnJW/n9+wQUupemIU8XjmlCuTtfxU="; diff --git a/pkgs/by-name/pi/picocrypt/package.nix b/pkgs/by-name/pi/picocrypt/package.nix index 964746933186..2cad57457117 100644 --- a/pkgs/by-name/pi/picocrypt/package.nix +++ b/pkgs/by-name/pi/picocrypt/package.nix @@ -3,7 +3,6 @@ buildGoModule, fetchFromGitHub, stdenv, - darwin, copyDesktopItems, makeDesktopItem, diff --git a/pkgs/by-name/pr/prettier-plugin-go-template/package.nix b/pkgs/by-name/pr/prettier-plugin-go-template/package.nix index 162c343e7ef5..79161f56c481 100644 --- a/pkgs/by-name/pr/prettier-plugin-go-template/package.nix +++ b/pkgs/by-name/pr/prettier-plugin-go-template/package.nix @@ -17,8 +17,6 @@ buildNpmPackage rec { npmDepsHash = "sha256-PpJnVZFRxpUHux2jIBDtyBS4qNo6IJY4kwTAq6stEVQ="; - dontNpmBuild = true; - meta = { description = "Fixes prettier formatting for go templates"; mainProgram = "prettier-plugin-go-template"; diff --git a/pkgs/by-name/pr/prometheus-deluge-exporter/package.nix b/pkgs/by-name/pr/prometheus-deluge-exporter/package.nix index 3b98cf5e3d76..4adcaf0a747d 100644 --- a/pkgs/by-name/pr/prometheus-deluge-exporter/package.nix +++ b/pkgs/by-name/pr/prometheus-deluge-exporter/package.nix @@ -1,7 +1,6 @@ { lib , python3 , fetchFromGitHub -, nixosTests }: python3.pkgs.buildPythonApplication rec { diff --git a/pkgs/by-name/pr/prox/package.nix b/pkgs/by-name/pr/prox/package.nix index ef7b588ea51f..7a92dc2ab56d 100644 --- a/pkgs/by-name/pr/prox/package.nix +++ b/pkgs/by-name/pr/prox/package.nix @@ -24,7 +24,7 @@ buildGoModule rec { meta = with lib; { homepage = "https://github.com/fgrosse/prox"; - description = "Process runner for Procfile-based applications "; + description = "Process runner for Procfile-based applications"; mainProgram = "prox"; license = licenses.bsd2; maintainers = with maintainers; [ lucperkins ]; diff --git a/pkgs/by-name/pu/pupdate/package.nix b/pkgs/by-name/pu/pupdate/package.nix index a45b77d2e965..4b86f845b059 100644 --- a/pkgs/by-name/pu/pupdate/package.nix +++ b/pkgs/by-name/pu/pupdate/package.nix @@ -1,5 +1,4 @@ -{ pkgs -, stdenv +{ stdenv , lib , fetchFromGitHub , buildDotnetModule @@ -55,7 +54,7 @@ buildDotnetModule rec { meta = with lib; { homepage = "https://github.com/mattpannella/pupdate"; - description = "Pupdate - A thing for updating your Analogue Pocket "; + description = "Pupdate - A thing for updating your Analogue Pocket"; license = licenses.mit; platforms = platforms.linux; maintainers = with maintainers; [ p-rintz ]; diff --git a/pkgs/by-name/pw/pw3270/package.nix b/pkgs/by-name/pw/pw3270/package.nix index 657a21806950..953674cd3ec5 100644 --- a/pkgs/by-name/pw/pw3270/package.nix +++ b/pkgs/by-name/pw/pw3270/package.nix @@ -5,7 +5,6 @@ , pkg-config , automake , autoconf -, m4 , libtool , gtk3 , libv3270 @@ -13,7 +12,6 @@ , openssl , gettext , desktop-file-utils -, glib , wrapGAppsHook3 }: diff --git a/pkgs/by-name/ra/rasm/package.nix b/pkgs/by-name/ra/rasm/package.nix index a1708485e871..5e79bb7ae9b8 100644 --- a/pkgs/by-name/ra/rasm/package.nix +++ b/pkgs/by-name/ra/rasm/package.nix @@ -18,13 +18,13 @@ stdenv.mkDerivation rec { install -Dt $out/bin rasm ''; - meta = with lib; { + meta = { homepage = "http://rasm.wikidot.com/english-index:home"; description = "Z80 assembler"; mainProgram = "rasm"; # use -n option to display all licenses - license = licenses.mit; # expat version + license = lib.licenses.mit; # expat version maintainers = with lib.maintainers; [ sigmanificient ]; - platforms = platforms.all; + platforms = lib.platforms.all; }; } diff --git a/pkgs/by-name/ra/ratchet/tests.nix b/pkgs/by-name/ra/ratchet/tests.nix index 7585c06d9172..75ae285d734e 100644 --- a/pkgs/by-name/ra/ratchet/tests.nix +++ b/pkgs/by-name/ra/ratchet/tests.nix @@ -1,5 +1,4 @@ { - lib, runCommand, ratchet, }: let diff --git a/pkgs/by-name/re/realvnc-vnc-viewer/darwin.nix b/pkgs/by-name/re/realvnc-vnc-viewer/darwin.nix index 7b2f6523f13b..6f1f113665e9 100644 --- a/pkgs/by-name/re/realvnc-vnc-viewer/darwin.nix +++ b/pkgs/by-name/re/realvnc-vnc-viewer/darwin.nix @@ -1,5 +1,4 @@ -{ lib -, stdenvNoCC +{ stdenvNoCC , fetchurl , undmg , pname diff --git a/pkgs/by-name/re/realvnc-vnc-viewer/linux.nix b/pkgs/by-name/re/realvnc-vnc-viewer/linux.nix index 30d2b60c2042..3d13bfdf9dc4 100644 --- a/pkgs/by-name/re/realvnc-vnc-viewer/linux.nix +++ b/pkgs/by-name/re/realvnc-vnc-viewer/linux.nix @@ -1,5 +1,4 @@ -{ lib -, stdenv +{ stdenv , fetchurl , autoPatchelfHook , rpmextract diff --git a/pkgs/by-name/re/release-plz/package.nix b/pkgs/by-name/re/release-plz/package.nix index 49c4703aabd7..25958a05d8c8 100644 --- a/pkgs/by-name/re/release-plz/package.nix +++ b/pkgs/by-name/re/release-plz/package.nix @@ -9,16 +9,16 @@ }: rustPlatform.buildRustPackage rec { pname = "release-plz"; - version = "0.3.74"; + version = "0.3.79"; src = fetchFromGitHub { owner = "MarcoIeni"; repo = "release-plz"; rev = "release-plz-v${version}"; - hash = "sha256-6Cj23OlIVWnuJC4jpmd7o5L4pUSUkTycZbpu8CzSVM0="; + hash = "sha256-tI9/FtGxjKPIFg6L7pNeSx24G3FcfwOlIqcuF6wCTSU="; }; - cargoHash = "sha256-YAijOHu59BWIsS5cYFYbG4zGG0l+x9cqHfEGu3oL5l0="; + cargoHash = "sha256-UN3SkNNY8ovaT/eNb9JyF9KQWt8KG0TX9ztLjrAnPPo="; nativeBuildInputs = [ installShellFiles pkg-config perl ]; buildInputs = [ openssl ]; diff --git a/pkgs/by-name/rm/rmg/package.nix b/pkgs/by-name/rm/rmg/package.nix index 6b04798900ad..4dd9ac30d648 100644 --- a/pkgs/by-name/rm/rmg/package.nix +++ b/pkgs/by-name/rm/rmg/package.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchFromGitHub -, fetchpatch , gitUpdater , boost , cmake diff --git a/pkgs/by-name/rs/rspamd-trainer/package.nix b/pkgs/by-name/rs/rspamd-trainer/package.nix index 3ed3c7aaea08..56e6f9e9ce8e 100644 --- a/pkgs/by-name/rs/rspamd-trainer/package.nix +++ b/pkgs/by-name/rs/rspamd-trainer/package.nix @@ -2,7 +2,6 @@ , python3 , python3Packages , fetchFromGitLab -, makeWrapper , fetchpatch , rspamd }: diff --git a/pkgs/by-name/sa/salmon/package.nix b/pkgs/by-name/sa/salmon/package.nix index cf74c0677fe7..09a2fec4c257 100644 --- a/pkgs/by-name/sa/salmon/package.nix +++ b/pkgs/by-name/sa/salmon/package.nix @@ -1,7 +1,5 @@ { lib , stdenv -, autoreconfHook -, bash , boost , bzip2 , cereal_1_3_2 diff --git a/pkgs/by-name/sa/sanjuuni/package.nix b/pkgs/by-name/sa/sanjuuni/package.nix index e43efa771b57..d448f5e07132 100644 --- a/pkgs/by-name/sa/sanjuuni/package.nix +++ b/pkgs/by-name/sa/sanjuuni/package.nix @@ -2,7 +2,6 @@ lib, stdenv, fetchFromGitHub, - fetchpatch, pkg-config, ffmpeg, poco, diff --git a/pkgs/by-name/sc/schemamap/package.nix b/pkgs/by-name/sc/schemamap/package.nix new file mode 100644 index 000000000000..95908de6e1c6 --- /dev/null +++ b/pkgs/by-name/sc/schemamap/package.nix @@ -0,0 +1,51 @@ +{ + lib, + stdenv, + fetchFromGitHub, + rustPlatform, + pkg-config, + openssl, + darwin, +}: + +let + version = "0.3.0"; +in +rustPlatform.buildRustPackage rec { + pname = "schemamap"; + inherit version; + + src = fetchFromGitHub { + owner = "schemamap"; + repo = "schemamap"; + rev = "v${version}"; + hash = "sha256-49i2zyOy/yngSgvKd66RsOhF6OlYfgDnEtPEbmhEcIo="; + }; + + sourceRoot = "${src.name}/rust"; + + cargoHash = "sha256-ILgvS96D6yF4Teaa5on6jHZlVoxRLSk8A523PzH1b5Y="; + + buildInputs = + [ openssl ] + ++ lib.optionals stdenv.isDarwin ( + with darwin.apple_sdk; + [ + frameworks.Security + frameworks.CoreFoundation + frameworks.CoreServices + frameworks.SystemConfiguration + ] + ); + + nativeBuildInputs = [ pkg-config ]; + + meta = { + changelog = "https://github.com/schemamap/schemamap/releases/tag/v${version}"; + description = "Instant batch data import for Postgres"; + homepage = "https://schemamap.io"; + license = lib.licenses.mit; + mainProgram = "schemamap"; + maintainers = with lib.maintainers; [ thenonameguy ]; + }; +} diff --git a/pkgs/by-name/sc/screego/package.nix b/pkgs/by-name/sc/screego/package.nix new file mode 100644 index 000000000000..90ac0304c4fc --- /dev/null +++ b/pkgs/by-name/sc/screego/package.nix @@ -0,0 +1,78 @@ +{ + lib, + buildGoModule, + fetchFromGitHub, + fetchYarnDeps, + yarnConfigHook, + yarnBuildHook, + nodejs, + stdenv, +}: +let + + version = "1.10.3"; + + src = fetchFromGitHub { + owner = "screego"; + repo = "server"; + rev = "v${version}"; + hash = "sha256-X8KZAUh1cO8qNYH6nc9zZ+mnfItgef8N948ErJLlZII="; + }; + + ui = stdenv.mkDerivation { + pname = "screego-ui"; + inherit version; + + src = src + "/ui"; + + offlineCache = fetchYarnDeps { + yarnLock = "${src}/ui/yarn.lock"; + hash = "sha256-ye8UDkal10k/5uCd0VrZsG2FJGB727q+luExFTUmB/M="; + }; + + nativeBuildInputs = [ + yarnConfigHook + yarnBuildHook + nodejs + ]; + + installPhase = '' + cp -r build $out + ''; + + }; + +in + +buildGoModule rec { + inherit src version; + + pname = "screego-server"; + + vendorHash = "sha256-ry8LO+KmNU9MKL8/buk9qriDe/zq+2uIsws6wVZmoo4="; + + ldflags = [ + "-s" + "-w" + "-X=main.version=${version}" + "-X=main.commitHash=${src.rev}" + "-X=main.mode=prod" + ]; + + postPatch = '' + mkdir -p ./ui/build + cp -r "${ui}" ./ui/build + ''; + + postInstall = '' + mv $out/bin/server $out/bin/screego + ''; + + meta = with lib; { + description = "Screen sharing for developers"; + homepage = "https://screego.net"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ pinpox ]; + mainProgram = "screego"; + }; +} diff --git a/pkgs/by-name/sd/SDL2_image_2_0/package.nix b/pkgs/by-name/sd/SDL2_image_2_0/package.nix index c52a60637766..98de34a2530a 100644 --- a/pkgs/by-name/sd/SDL2_image_2_0/package.nix +++ b/pkgs/by-name/sd/SDL2_image_2_0/package.nix @@ -1,9 +1,5 @@ # Dependency of pygame, toppler -{ - lib, - SDL2_image, - fetchurl, -}: +{ SDL2_image, fetchurl }: SDL2_image.overrideAttrs (oldAttrs: { version = "2.0.5"; diff --git a/pkgs/by-name/sd/SDL2_image_2_6/package.nix b/pkgs/by-name/sd/SDL2_image_2_6/package.nix index ef57e146098e..edd912311b82 100644 --- a/pkgs/by-name/sd/SDL2_image_2_6/package.nix +++ b/pkgs/by-name/sd/SDL2_image_2_6/package.nix @@ -1,10 +1,6 @@ # Dependency for hedgewars: # https://github.com/NixOS/nixpkgs/pull/274185#issuecomment-1856764786 -{ - lib, - SDL2_image, - fetchurl, -}: +{ SDL2_image, fetchurl }: SDL2_image.overrideAttrs (oldAttrs: { version = "2.6.3"; diff --git a/pkgs/by-name/sk/skimpdf/package.nix b/pkgs/by-name/sk/skimpdf/package.nix index 0be793c9cb15..da7f2da2d6fe 100644 --- a/pkgs/by-name/sk/skimpdf/package.nix +++ b/pkgs/by-name/sk/skimpdf/package.nix @@ -1,19 +1,20 @@ -{ stdenv -, lib -, undmg -, fetchurl +{ + stdenv, + lib, + undmg, + fetchurl, }: stdenv.mkDerivation rec { pname = "Skim"; - version = "1.7.2"; + version = "1.7.3"; src = fetchurl { name = "Skim-${version}.dmg"; url = "mirror://sourceforge/project/skim-app/Skim/Skim-${version}/Skim-${version}.dmg"; - sha256 = "t/A3Bd7mQ8hFGdbpQou4ru9i5jX4HaYOXgMvfPAUEYc="; + hash = "sha256-AMHEzlipL0Bv68Gnyq040t4DQhPkQcmDixZ6Oo0Vobc="; }; - nativeBuildInputs = [ undmg ]; + nativeBuildInputs = [undmg]; sourceRoot = "."; @@ -28,9 +29,9 @@ stdenv.mkDerivation rec { description = "Skim is a PDF reader and note-taker for OS X"; homepage = "https://skim-app.sourceforge.io/"; license = licenses.bsd0; - sourceProvenance = with sourceTypes; [ binaryNativeCode ]; + sourceProvenance = with sourceTypes; [binaryNativeCode]; mainProgram = "Skim.app"; - maintainers = with maintainers; [ YvesStraten ]; + maintainers = with maintainers; [YvesStraten]; platforms = platforms.darwin; }; } diff --git a/pkgs/by-name/sk/skypilot/package.nix b/pkgs/by-name/sk/skypilot/package.nix index 0a951a8cd96d..fe832ae33417 100644 --- a/pkgs/by-name/sk/skypilot/package.nix +++ b/pkgs/by-name/sk/skypilot/package.nix @@ -1,7 +1,5 @@ { lib, - pkgs, - stdenv, fetchFromGitHub, python3Packages, }: diff --git a/pkgs/by-name/sm/smile/package.nix b/pkgs/by-name/sm/smile/package.nix index b6e177690659..787e456845f6 100644 --- a/pkgs/by-name/sm/smile/package.nix +++ b/pkgs/by-name/sm/smile/package.nix @@ -4,7 +4,6 @@ , desktop-file-utils , glib , gobject-introspection -, gtk4 , meson , ninja , wrapGAppsHook4 diff --git a/pkgs/by-name/sn/snekim/package.nix b/pkgs/by-name/sn/snekim/package.nix index cf7d2b718f83..8c8841b9dbd7 100644 --- a/pkgs/by-name/sn/snekim/package.nix +++ b/pkgs/by-name/sn/snekim/package.nix @@ -1,4 +1,4 @@ -{ lib, buildNimPackage, fetchFromGitea, raylib }: +{ lib, buildNimPackage, fetchFromGitea }: buildNimPackage (finalAttrs: { pname = "snekim"; diff --git a/pkgs/by-name/sn/snippetexpandergui/package.nix b/pkgs/by-name/sn/snippetexpandergui/package.nix index 7a7606e3d36b..8434f8672305 100644 --- a/pkgs/by-name/sn/snippetexpandergui/package.nix +++ b/pkgs/by-name/sn/snippetexpandergui/package.nix @@ -7,7 +7,6 @@ , xorg , gtk3 , webkitgtk -, gsettings-desktop-schemas , snippetexpanderd , snippetexpanderx }: diff --git a/pkgs/by-name/sp/spectral-language-server/package.nix b/pkgs/by-name/sp/spectral-language-server/package.nix index 9c895e171f7a..3a6ac22184ef 100644 --- a/pkgs/by-name/sp/spectral-language-server/package.nix +++ b/pkgs/by-name/sp/spectral-language-server/package.nix @@ -3,8 +3,6 @@ , stdenv , fetchYarnDeps , yarnConfigHook -, yarnBuildHook -, nodejs , fetchFromGitHub , typescript , jq diff --git a/pkgs/by-name/sp/spigot/tests/approximation.nix b/pkgs/by-name/sp/spigot/tests/approximation.nix index ffb329e6a317..fbf4875e1e61 100644 --- a/pkgs/by-name/sp/spigot/tests/approximation.nix +++ b/pkgs/by-name/sp/spigot/tests/approximation.nix @@ -1,5 +1,4 @@ -{ lib -, stdenv +{ stdenv , spigot }: diff --git a/pkgs/by-name/ss/ssh-openpgp-auth/generic.nix b/pkgs/by-name/ss/ssh-openpgp-auth/generic.nix index 5fadd5798ae8..47edd91a4f3c 100644 --- a/pkgs/by-name/ss/ssh-openpgp-auth/generic.nix +++ b/pkgs/by-name/ss/ssh-openpgp-auth/generic.nix @@ -7,7 +7,6 @@ , just , rust-script , installShellFiles -, bzip2 , nettle , openssl , sqlite diff --git a/pkgs/by-name/st/stackit-cli/package.nix b/pkgs/by-name/st/stackit-cli/package.nix index bd937c558c73..ee53cc4932d7 100644 --- a/pkgs/by-name/st/stackit-cli/package.nix +++ b/pkgs/by-name/st/stackit-cli/package.nix @@ -6,7 +6,6 @@ , less , xdg-utils , testers -, runCommand , stackit-cli }: diff --git a/pkgs/by-name/st/stackql/package.nix b/pkgs/by-name/st/stackql/package.nix index d1d749d971fa..4c13281ea436 100644 --- a/pkgs/by-name/st/stackql/package.nix +++ b/pkgs/by-name/st/stackql/package.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "stackql"; - version = "0.5.665"; + version = "0.5.699"; src = fetchFromGitHub { owner = "stackql"; repo = "stackql"; rev = "v${version}"; - hash = "sha256-oX1WB6XkjEPzbj3qqXoD8urp827LAU7Cc7lLcpTTZJE="; + hash = "sha256-nObrqCStZI80pgzZOvumgK5Osycf5Uj5ESETpWkqBx0="; }; - vendorHash = "sha256-JCWXs3tfTG+aj4hG0eFhl52FmNFvPiBuWpQG2RC6FTM="; + vendorHash = "sha256-dFrJS7qd5N2Vmm6GOhRcCltbvUh0aTJTfqnxRHMmMJo="; ldflags = [ "-s" diff --git a/pkgs/by-name/st/stalwart-mail/package.nix b/pkgs/by-name/st/stalwart-mail/package.nix index 871305321b1e..2309acd9a9fc 100644 --- a/pkgs/by-name/st/stalwart-mail/package.nix +++ b/pkgs/by-name/st/stalwart-mail/package.nix @@ -14,7 +14,6 @@ nix-update-script, nixosTests, rocksdb_8_11, - callPackage, }: let diff --git a/pkgs/by-name/sw/swayfx/package.nix b/pkgs/by-name/sw/swayfx/package.nix index 9583f9b7a710..d9fe039a2a53 100644 --- a/pkgs/by-name/sw/swayfx/package.nix +++ b/pkgs/by-name/sw/swayfx/package.nix @@ -1,5 +1,4 @@ { - lib, swayfx-unwrapped, sway, # Used by the NixOS module: diff --git a/pkgs/by-name/sw/switch-to-configuration-ng/Cargo.lock b/pkgs/by-name/sw/switch-to-configuration-ng/Cargo.lock index d66a2c6e7527..9b70ccfe23b3 100644 --- a/pkgs/by-name/sw/switch-to-configuration-ng/Cargo.lock +++ b/pkgs/by-name/sw/switch-to-configuration-ng/Cargo.lock @@ -22,9 +22,9 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.82" +version = "1.0.86" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f538837af36e6f6a9be0faa67f9a314f8119e4e4b5867c6ab40ed60360142519" +checksum = "b3d1d046238990b9cf5bcde22a3fb3584ee5cf65fb2765f454ed428c7a0063da" [[package]] name = "atty" @@ -153,9 +153,9 @@ dependencies = [ [[package]] name = "getrandom" -version = "0.2.14" +version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94b22e06ecb0110981051723910cbf0b5f5e09a2062dd7663334ee79a9d1286c" +checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7" dependencies = [ "cfg-if", "libc", @@ -202,9 +202,9 @@ checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b" [[package]] name = "libc" -version = "0.2.154" +version = "0.2.155" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae743338b92ff9146ce83992f766a31066a91a8c84a45e0e9f21e7cf6de6d346" +checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c" [[package]] name = "libdbus-sys" @@ -229,9 +229,9 @@ checksum = "ffbee8634e0d45d258acb448e7eaab3fce7a0a467395d4d9f228e3c1f01fb2e4" [[package]] name = "memchr" -version = "2.7.2" +version = "2.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c8640c5d730cb13ebd907d8d04b52f55ac9a2eec55b440c8892f40d56c76c1d" +checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3" [[package]] name = "nix" @@ -290,9 +290,9 @@ checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391" [[package]] name = "proc-macro2" -version = "1.0.81" +version = "1.0.86" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d1597b0c024618f09a9c3b8655b7e430397a36d23fdafec26d6965e9eec3eba" +checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77" dependencies = [ "unicode-ident", ] @@ -308,9 +308,9 @@ dependencies = [ [[package]] name = "regex" -version = "1.10.4" +version = "1.10.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c117dbdfde9c8308975b6a18d71f3f385c89461f7b3fb054288ecf2a2058ba4c" +checksum = "b91213439dad192326a0d7c6ee3955910425f441d7038e0d6933b0aec5c4517f" dependencies = [ "aho-corasick", "memchr", @@ -320,9 +320,9 @@ dependencies = [ [[package]] name = "regex-automata" -version = "0.4.6" +version = "0.4.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86b83b8b9847f9bf95ef68afb0b8e6cdb80f498442f5179a29fad448fcc1eaea" +checksum = "38caf58cc5ef2fed281f89292ef23f6365465ed9a41b7a7754eb4e26496c92df" dependencies = [ "aho-corasick", "memchr", @@ -331,9 +331,9 @@ dependencies = [ [[package]] name = "regex-syntax" -version = "0.8.3" +version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "adad44e29e4c806119491a7f06f03de4d1af22c3a680dd47f1e6e179439d1f56" +checksum = "7a66a03ae7c801facd77a29370b4faec201768915ac14a721ba36f20bc9c209b" [[package]] name = "rust-ini" @@ -348,18 +348,18 @@ dependencies = [ [[package]] name = "serde" -version = "1.0.200" +version = "1.0.203" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ddc6f9cc94d67c0e21aaf7eda3a010fd3af78ebf6e096aa6e2e13c79749cce4f" +checksum = "7253ab4de971e72fb7be983802300c30b5a7f0c2e56fab8abfc6a214307c0094" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.200" +version = "1.0.203" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "856f046b9400cee3c8c94ed572ecdb752444c24528c035cd35882aad6f492bcb" +checksum = "500cbc0ebeb6f46627f50f3f5811ccf6bf00643be300b4c3eabc0ef55dc5b5ba" dependencies = [ "proc-macro2", "quote", @@ -389,9 +389,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.60" +version = "2.0.67" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "909518bc7b1c9b779f1bbf07f2929d35af9f0f37e47c6e9ef7f9dddc1e1821f3" +checksum = "ff8655ed1d86f3af4ee3fd3263786bc14245ad17c4c7e85ba7187fb3ae028c90" dependencies = [ "proc-macro2", "quote", @@ -476,9 +476,9 @@ checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" [[package]] name = "unicode-width" -version = "0.1.12" +version = "0.1.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68f5e5f3158ecfd4b8ff6fe086db7c8467a2dfdac97fe420f2b7c4aa97af66d6" +checksum = "0336d538f7abc86d282a4189614dfaa90810dfc2c6f6427eaf88e16311dd225d" [[package]] name = "vec_map" diff --git a/pkgs/by-name/sw/switch-to-configuration-ng/src/main.rs b/pkgs/by-name/sw/switch-to-configuration-ng/src/main.rs index a35b55065c07..057604b03178 100644 --- a/pkgs/by-name/sw/switch-to-configuration-ng/src/main.rs +++ b/pkgs/by-name/sw/switch-to-configuration-ng/src/main.rs @@ -1656,7 +1656,16 @@ won't take effect until you reboot the system. die(); } Ok(users) => { - for (uid, name, _) in users { + for (uid, name, user_dbus_path) in users { + let gid: u32 = dbus_conn + .with_proxy( + "org.freedesktop.login1", + &user_dbus_path, + Duration::from_millis(5000), + ) + .get("org.freedesktop.login1.User", "GID") + .with_context(|| format!("Failed to get GID for {name}"))?; + eprintln!("reloading user units for {}...", name); let myself = Path::new("/proc/self/exe") .canonicalize() @@ -1664,10 +1673,12 @@ won't take effect until you reboot the system. std::process::Command::new(&myself) .uid(uid) + .gid(gid) .env("XDG_RUNTIME_DIR", format!("/run/user/{}", uid)) .env("__NIXOS_SWITCH_TO_CONFIGURATION_PARENT_EXE", &myself) .spawn() - .map(|mut child| _ = child.wait()) + .with_context(|| format!("Failed to spawn user activation for {name}"))? + .wait() .with_context(|| format!("Failed to run user activation for {name}"))?; } } @@ -1854,7 +1865,7 @@ won't take effect until you reboot the system. // A unit in auto-restart substate is a failure *if* it previously failed to start let unit_object_path = systemd .get_unit(&unit) - .context("Failed to get unit info for {unit}")?; + .with_context(|| format!("Failed to get unit info for {unit}"))?; let exec_main_status: i32 = dbus_conn .with_proxy( "org.freedesktop.systemd1", @@ -1862,7 +1873,7 @@ won't take effect until you reboot the system. Duration::from_millis(5000), ) .get("org.freedesktop.systemd1.Service", "ExecMainStatus") - .context("Failed to get ExecMainStatus for {unit}")?; + .with_context(|| format!("Failed to get ExecMainStatus for {unit}"))?; if exec_main_status != 0 { failed_units.push(unit); diff --git a/pkgs/by-name/sw/swt/package.nix b/pkgs/by-name/sw/swt/package.nix index c67424f4fc06..49f2d4ce0f88 100644 --- a/pkgs/by-name/sw/swt/package.nix +++ b/pkgs/by-name/sw/swt/package.nix @@ -1,7 +1,6 @@ { atk, fetchzip, - glib, gtk2, jdk, lib, diff --git a/pkgs/by-name/sy/symfony-cli/package.nix b/pkgs/by-name/sy/symfony-cli/package.nix index 2d9a28bf1410..47ae24c60822 100644 --- a/pkgs/by-name/sy/symfony-cli/package.nix +++ b/pkgs/by-name/sy/symfony-cli/package.nix @@ -10,14 +10,14 @@ buildGoModule rec { pname = "symfony-cli"; - version = "5.9.1"; - vendorHash = "sha256-oo4lLJTF44hBb8QaIMONj+2WRdDSlhImZaC/nniWAhs="; + version = "5.10.2"; + vendorHash = "sha256-WSZM/9inaFLlZIAwH3E8hWyRQaOvY8BJ6ECpbkqJN6g="; src = fetchFromGitHub { owner = "symfony-cli"; repo = "symfony-cli"; rev = "v${version}"; - hash = "sha256-uJbX1IzZtcXH7mZuqh2YZy9wYZHNWfUHRZ8Tlm5zEac="; + hash = "sha256-/fJ9Ovk2gXCIvvieCXxnI8gDjwrhQHJoF3Ia47dSdgQ="; leaveDotGit = true; postFetch = '' git --git-dir $out/.git log -1 --pretty=%cd --date=format:'%Y-%m-%dT%H:%M:%SZ' > $out/SOURCE_DATE diff --git a/pkgs/by-name/sy/symphony/package.nix b/pkgs/by-name/sy/symphony/package.nix index cb75fae961b1..3e420421b0f5 100644 --- a/pkgs/by-name/sy/symphony/package.nix +++ b/pkgs/by-name/sy/symphony/package.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchFromGitHub -, cmake , coin-utils , coinmp , gfortran diff --git a/pkgs/by-name/ta/taskwarrior3/package.nix b/pkgs/by-name/ta/taskwarrior3/package.nix index 17a14daf2adf..79c82c0ea509 100644 --- a/pkgs/by-name/ta/taskwarrior3/package.nix +++ b/pkgs/by-name/ta/taskwarrior3/package.nix @@ -8,7 +8,6 @@ fetchFromGitHub, cmake, libuuid, - gnutls, python3, xdg-utils, installShellFiles, diff --git a/pkgs/by-name/ti/tic-80/package.nix b/pkgs/by-name/ti/tic-80/package.nix index 0e82c4eb44d5..28839ec7716a 100644 --- a/pkgs/by-name/ti/tic-80/package.nix +++ b/pkgs/by-name/ti/tic-80/package.nix @@ -3,16 +3,13 @@ , cmake , pkg-config , python3 -, ruby , rake -, git , curl , fetchFromGitHub , libGL , libGLU , alsa-lib , libX11 -, xorgproto , libICE , libXi , libXScrnSaver @@ -30,7 +27,6 @@ , libdecor , pipewire , libpulseaudio -, libiconv # Whether to build TIC-80's "Pro" version, which is an incentive to support the project financially, # that enables some additional features. It is, however, fully open source. , withPro ? false diff --git a/pkgs/by-name/tr/transmission_3/package.nix b/pkgs/by-name/tr/transmission_3/package.nix index 32f9b92079a7..21dfed11c543 100644 --- a/pkgs/by-name/tr/transmission_3/package.nix +++ b/pkgs/by-name/tr/transmission_3/package.nix @@ -1,7 +1,6 @@ { stdenv , lib , fetchFromGitHub -, fetchurl , cmake , pkg-config , openssl diff --git a/pkgs/by-name/tu/tuifimanager/package.nix b/pkgs/by-name/tu/tuifimanager/package.nix index 8b214453a788..15706439a30a 100644 --- a/pkgs/by-name/tu/tuifimanager/package.nix +++ b/pkgs/by-name/tu/tuifimanager/package.nix @@ -62,7 +62,7 @@ python3.pkgs.buildPythonApplication rec { pythonImportsCheck = [ "TUIFIManager" ]; - meta = with lib; { + meta = { description = "Cross-platform terminal-based termux-oriented file manager"; longDescription = '' A cross-platform terminal-based termux-oriented file manager (and component), @@ -70,8 +70,8 @@ python3.pkgs.buildPythonApplication rec { attempt to get more attention to the Uni-Curses project. ''; homepage = "https://github.com/GiorgosXou/TUIFIManager"; - license = licenses.gpl3Only; - maintainers = with maintainers; [ michaelBelsanti sigmanificient ]; + license = lib.licenses.gpl3Only; + maintainers = with lib.maintainers; [ michaelBelsanti sigmanificient ]; mainProgram = "tuifi"; }; } diff --git a/pkgs/by-name/tu/tuxclocker-nvidia-plugin/package.nix b/pkgs/by-name/tu/tuxclocker-nvidia-plugin/package.nix index b783953acd93..a3bbf153aaa3 100644 --- a/pkgs/by-name/tu/tuxclocker-nvidia-plugin/package.nix +++ b/pkgs/by-name/tu/tuxclocker-nvidia-plugin/package.nix @@ -1,5 +1,4 @@ -{ lib -, stdenv +{ stdenv , boost , libX11 , libXext diff --git a/pkgs/by-name/tu/tuxclocker-plugins/package.nix b/pkgs/by-name/tu/tuxclocker-plugins/package.nix index 12deedd5c56f..2da3202e2332 100644 --- a/pkgs/by-name/tu/tuxclocker-plugins/package.nix +++ b/pkgs/by-name/tu/tuxclocker-plugins/package.nix @@ -1,7 +1,5 @@ -{ lib -, stdenv +{ stdenv , boost -, cmake , gettext , libdrm , meson diff --git a/pkgs/by-name/ub/ubuntu-classic/package.nix b/pkgs/by-name/ub/ubuntu-classic/package.nix index 23dabae70e22..edb10821d771 100644 --- a/pkgs/by-name/ub/ubuntu-classic/package.nix +++ b/pkgs/by-name/ub/ubuntu-classic/package.nix @@ -3,7 +3,6 @@ stdenvNoCC, fetchgit, gitUpdater, - rename, }: stdenvNoCC.mkDerivation (finalAttrs: { diff --git a/pkgs/by-name/uc/ucg/tests/simple.nix b/pkgs/by-name/uc/ucg/tests/simple.nix index 09910d0829da..033f408ce1b7 100644 --- a/pkgs/by-name/uc/ucg/tests/simple.nix +++ b/pkgs/by-name/uc/ucg/tests/simple.nix @@ -1,5 +1,4 @@ -{ lib -, stdenv +{ stdenv , ucg }: diff --git a/pkgs/by-name/us/ustr/package.nix b/pkgs/by-name/us/ustr/package.nix index 0da93206752b..776f82103cb1 100644 --- a/pkgs/by-name/us/ustr/package.nix +++ b/pkgs/by-name/us/ustr/package.nix @@ -41,12 +41,12 @@ stdenv.mkDerivation (finalAttrs: { find $out/lib -name \*debug\* -delete ''; - meta = with lib; { + meta = { homepage = "http://www.and.org/ustr/"; description = "Micro String API for C language"; mainProgram = "ustr-import"; - license = licenses.bsd2; + license = lib.licenses.bsd2; maintainers = with lib.maintainers; [ sigmanificient ]; - platforms = platforms.linux; + platforms = lib.platforms.linux; }; }) diff --git a/pkgs/by-name/uw/uwsm/package.nix b/pkgs/by-name/uw/uwsm/package.nix new file mode 100644 index 000000000000..669cbd123a5a --- /dev/null +++ b/pkgs/by-name/uw/uwsm/package.nix @@ -0,0 +1,71 @@ +{ + stdenv, + lib, + fetchFromGitHub, + meson, + ninja, + scdoc, + pkg-config, + nix-update-script, + dmenu, + libnotify, + python3Packages, + util-linux, + fumonSupport ? true, + uuctlSupport ? true, + uwsmAppSupport ? true, +}: +let + python = python3Packages.python.withPackages (ps: [ + ps.pydbus + ps.dbus-python + ps.pyxdg + ]); +in +stdenv.mkDerivation (finalAttrs: { + pname = "uwsm"; + version = "0.17.0"; + + src = fetchFromGitHub { + owner = "Vladimir-csp"; + repo = "uwsm"; + rev = "refs/tags/v${finalAttrs.version}"; + hash = "sha256-M2j7l5XTSS2IzaJofAHct1tuAO2A9Ps9mCgAWKEvzoE="; + }; + + nativeBuildInputs = [ + meson + ninja + pkg-config + scdoc + ]; + + buildInputs = [ + libnotify + util-linux + ] ++ (lib.optionals uuctlSupport [ dmenu ]); + + propagatedBuildInputs = [ python ]; + + mesonFlags = [ + "--prefix=${placeholder "out"}" + (lib.mapAttrsToList lib.mesonEnable { + "uwsm-app" = uwsmAppSupport; + "fumon" = fumonSupport; + "uuctl" = uuctlSupport; + "man-pages" = true; + }) + ]; + + passthru = { + updateScript = nix-update-script { }; + }; + + meta = { + description = "Universal wayland session manager"; + homepage = "https://github.com/Vladimir-csp/uwsm"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ johnrtitor ]; + platforms = lib.platforms.linux; + }; +}) diff --git a/pkgs/by-name/va/vaults/package.nix b/pkgs/by-name/va/vaults/package.nix index 6e0f1078819b..d2cb90dc51d8 100644 --- a/pkgs/by-name/va/vaults/package.nix +++ b/pkgs/by-name/va/vaults/package.nix @@ -17,7 +17,6 @@ , wayland , gocryptfs , cryfs -, cmake }: stdenv.mkDerivation rec { diff --git a/pkgs/by-name/vi/vidmerger/package.nix b/pkgs/by-name/vi/vidmerger/package.nix index 7cdfaf2944d8..cf0412b42929 100644 --- a/pkgs/by-name/vi/vidmerger/package.nix +++ b/pkgs/by-name/vi/vidmerger/package.nix @@ -31,7 +31,7 @@ rustPlatform.buildRustPackage rec { ]; meta = with lib; { - description = "Merge video & audio files via CLI "; + description = "Merge video & audio files via CLI"; homepage = "https://github.com/TGotwig/vidmerger"; license = with licenses; [ mit commons-clause ]; maintainers = with maintainers; [ ByteSudoer ]; diff --git a/pkgs/by-name/vi/vieb/package.nix b/pkgs/by-name/vi/vieb/package.nix index 707a0a0f5cbb..6927cb3e24af 100644 --- a/pkgs/by-name/vi/vieb/package.nix +++ b/pkgs/by-name/vi/vieb/package.nix @@ -1,4 +1,4 @@ -{ stdenv, buildNpmPackage, fetchFromGitHub, electron, makeWrapper, python3, makeDesktopItem, nix-update-script, lib }: +{ stdenv, buildNpmPackage, fetchFromGitHub, electron, makeWrapper, python3, makeDesktopItem, lib }: buildNpmPackage rec { pname = "vieb"; diff --git a/pkgs/by-name/vl/vlc-bin/package.nix b/pkgs/by-name/vl/vlc-bin/package.nix index d986353a2bda..275e768c7ea2 100644 --- a/pkgs/by-name/vl/vlc-bin/package.nix +++ b/pkgs/by-name/vl/vlc-bin/package.nix @@ -14,14 +14,14 @@ assert builtins.elem variant [ "arm64" "intel64" "universal" ]; stdenv.mkDerivation (finalAttrs: { pname = "vlc-bin-${variant}"; - version = "3.0.20"; + version = "3.0.21"; src = fetchurl { url = "http://get.videolan.org/vlc/${finalAttrs.version}/macosx/vlc-${finalAttrs.version}-${variant}.dmg"; hash = { - "arm64" = "sha256-XV8O5S2BmCpiL0AhkopktHBalVRJniDDPQusIlkLEY4="; - "intel64" = "sha256-pNwUQfyrjiuQxil0zlOZu4isv2xw1U8hxhWNn7H7onk="; - "universal" = "sha256-IqGPOWzMmHbGDV+0QxFslv19BC2J1Z5Qzcuja/Od1Us="; + "arm64" = "sha256-Fd1lv2SJ2p7Gpn9VhcdMQKWJk6z/QagpWKkW3XQXgEQ="; + "intel64" = "sha256-1DH9BRw9x68CvTE8bQXZDPYEtw7T7Fu6b9TEnvPmONk="; + "universal" = "sha256-UDgOVvgdYw41MUJqJlq/iz3ubAgiu3yeMLUyx9aaZcA="; }.${variant}; }; diff --git a/pkgs/by-name/wa/waf/hook.nix b/pkgs/by-name/wa/waf/hook.nix index f97a4ed22146..37757aec1888 100644 --- a/pkgs/by-name/wa/waf/hook.nix +++ b/pkgs/by-name/wa/waf/hook.nix @@ -1,6 +1,4 @@ -{ lib -, pkgs -, makeSetupHook +{ makeSetupHook , waf }: diff --git a/pkgs/by-name/wa/wakatime-cli/package.nix b/pkgs/by-name/wa/wakatime-cli/package.nix index 8ca8064f07da..dd20ce1c2d82 100644 --- a/pkgs/by-name/wa/wakatime-cli/package.nix +++ b/pkgs/by-name/wa/wakatime-cli/package.nix @@ -47,11 +47,11 @@ buildGoModule rec { command = "HOME=$(mktemp -d) wakatime-cli --version"; }; - meta = with lib; { + meta = { homepage = "https://wakatime.com/"; description = "WakaTime command line interface"; - license = licenses.bsd3; - maintainers = with maintainers; [ sigmanificient ]; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ sigmanificient ]; mainProgram = "wakatime-cli"; }; } diff --git a/pkgs/by-name/wi/windowmaker/dockapps/default.nix b/pkgs/by-name/wi/windowmaker/dockapps/default.nix index 84cfe01bddf3..d927fd951fdf 100644 --- a/pkgs/by-name/wi/windowmaker/dockapps/default.nix +++ b/pkgs/by-name/wi/windowmaker/dockapps/default.nix @@ -1,4 +1,4 @@ -{ config, lib, pkgs }: +{ lib, pkgs }: lib.makeScope pkgs.newScope (self: { diff --git a/pkgs/by-name/wl/wldash/package.nix b/pkgs/by-name/wl/wldash/package.nix index ab45f201e8e6..50dcbeea35d8 100644 --- a/pkgs/by-name/wl/wldash/package.nix +++ b/pkgs/by-name/wl/wldash/package.nix @@ -4,7 +4,6 @@ dbus, fetchFromGitHub, fontconfig, - libffi, libpulseaudio, libxkbcommon, pkg-config, diff --git a/pkgs/by-name/wr/wrangler/package.nix b/pkgs/by-name/wr/wrangler/package.nix index a6c19c4125e9..618dfdfb0277 100644 --- a/pkgs/by-name/wr/wrangler/package.nix +++ b/pkgs/by-name/wr/wrangler/package.nix @@ -12,18 +12,18 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "wrangler"; - version = "3.62.0"; + version = "3.66.0"; src = fetchFromGitHub { owner = "cloudflare"; repo = "workers-sdk"; rev = "wrangler@${finalAttrs.version}"; - hash = "sha256-/4iIkvSn85fkRggmIha2kRlW0MEwvzy0ZAmIb8+LpZQ="; + hash = "sha256-YY+wp9rmXDWeSvdMC6FQyuDf8XP3GhHeHuFe9q0uNng="; }; pnpmDeps = pnpm_9.fetchDeps { inherit (finalAttrs) pname version src; - hash = "sha256-aTTaiGXm1WYwmy+ljUC9yO3qtvN20SA+24T83dWYrI0="; + hash = "sha256-BjSpgkDYafnDb0SBdL3B6IYWT4EOqCAxdDm+Ev6QIgw="; }; buildInputs = [ @@ -84,6 +84,7 @@ stdenv.mkDerivation (finalAttrs: { maintainers = with lib.maintainers; [ seanrmurphy dezren39 + ryand56 ]; mainProgram = "wrangler"; # cpp is required for building workerd. diff --git a/pkgs/by-name/x5/x509-limbo/package.nix b/pkgs/by-name/x5/x509-limbo/package.nix index 239f1c85e300..0971d8b6cd45 100644 --- a/pkgs/by-name/x5/x509-limbo/package.nix +++ b/pkgs/by-name/x5/x509-limbo/package.nix @@ -1,7 +1,6 @@ { lib , fetchFromGitHub , python3 -, x509-limbo }: python3.pkgs.buildPythonPackage { @@ -39,7 +38,7 @@ python3.pkgs.buildPythonPackage { meta = with lib; { homepage = "https://x509-limbo.com/"; - description = "Suite of testvectors for X.509 certificate path validation and tools for building them "; + description = "Suite of testvectors for X.509 certificate path validation and tools for building them"; mainProgram = "limbo"; license = licenses.asl20; diff --git a/pkgs/by-name/ye/yeswiki/package.nix b/pkgs/by-name/ye/yeswiki/package.nix index 64ccd4353525..0e0562eaf52a 100644 --- a/pkgs/by-name/ye/yeswiki/package.nix +++ b/pkgs/by-name/ye/yeswiki/package.nix @@ -1,5 +1,4 @@ { - lib, stdenv, fetchurl, unzip, diff --git a/pkgs/tools/misc/yt-dlp/default.nix b/pkgs/by-name/yt/yt-dlp/package.nix similarity index 90% rename from pkgs/tools/misc/yt-dlp/default.nix rename to pkgs/by-name/yt/yt-dlp/package.nix index 4e88175b9aa7..f61baab5e190 100644 --- a/pkgs/tools/misc/yt-dlp/default.nix +++ b/pkgs/by-name/yt/yt-dlp/package.nix @@ -1,18 +1,9 @@ { lib -, buildPythonPackage +, python3Packages , fetchPypi -, brotli -, hatchling -, certifi -, ffmpeg +, ffmpeg-headless , rtmpdump , atomicparsley -, pycryptodomex -, websockets -, mutagen -, requests -, secretstorage -, urllib3 , atomicparsleySupport ? true , ffmpegSupport ? true , rtmpSupport ? true @@ -20,7 +11,7 @@ , update-python-libraries }: -buildPythonPackage rec { +python3Packages.buildPythonApplication rec { pname = "yt-dlp"; # The websites yt-dlp deals with are a very moving target. That means that # downloads break constantly. Because of that, updates should always be backported @@ -34,13 +25,14 @@ buildPythonPackage rec { hash = "sha256-dYeqJeI2z3sUvbk3i7//9RIC2QGwQgK+DPYsu1bTtSw="; }; - build-system = [ + build-system = with python3Packages; [ hatchling ]; - dependencies = [ + dependencies = with python3Packages; [ brotli certifi + curl-cffi mutagen pycryptodomex requests @@ -57,7 +49,7 @@ buildPythonPackage rec { let packagesToBinPath = [] ++ lib.optional atomicparsleySupport atomicparsley - ++ lib.optional ffmpegSupport ffmpeg + ++ lib.optional ffmpegSupport ffmpeg-headless ++ lib.optional rtmpSupport rtmpdump; in lib.optionals (packagesToBinPath != []) [ ''--prefix PATH : "${lib.makeBinPath packagesToBinPath}"'' ]; diff --git a/pkgs/by-name/yu/yunfaavatar/package.nix b/pkgs/by-name/yu/yunfaavatar/package.nix index 369f89d7c888..410893df44d1 100644 --- a/pkgs/by-name/yu/yunfaavatar/package.nix +++ b/pkgs/by-name/yu/yunfaavatar/package.nix @@ -2,7 +2,6 @@ lib, stdenvNoCC, fetchFromGitHub, - bash, imagemagick, makeWrapper, }: diff --git a/pkgs/by-name/za/zabbix-agent2-plugin-postgresql/package.nix b/pkgs/by-name/za/zabbix-agent2-plugin-postgresql/package.nix index f8bf2cfc6cf7..da499f9f7157 100644 --- a/pkgs/by-name/za/zabbix-agent2-plugin-postgresql/package.nix +++ b/pkgs/by-name/za/zabbix-agent2-plugin-postgresql/package.nix @@ -1,4 +1,4 @@ -{ lib, buildGoModule, fetchurl, pkg-config }: +{ lib, buildGoModule, fetchurl }: buildGoModule rec { pname = "zabbix-agent2-plugin-postgresql"; diff --git a/pkgs/by-name/ze/zeronsd/package.nix b/pkgs/by-name/ze/zeronsd/package.nix new file mode 100644 index 000000000000..71eeb50e6163 --- /dev/null +++ b/pkgs/by-name/ze/zeronsd/package.nix @@ -0,0 +1,39 @@ +{ + lib, + rustPlatform, + fetchFromGitHub, + pkg-config, + openssl, + rustfmt, +}: + +rustPlatform.buildRustPackage rec { + pname = "zeronsd"; + version = "0.5.2"; + + src = fetchFromGitHub { + owner = "zerotier"; + repo = "zeronsd"; + rev = "v${version}"; + hash = "sha256-TL0bgzQgge6j1SpZCdxv/s4pBMSg4/3U5QisjkVE6BE="; + }; + + cargoHash = "sha256-WGap0j90obpJHiMNokCWg0Q3xIAqwvmiESg9NVnFMKE="; + + strictDeps = true; + buildInputs = [ openssl ]; + nativeBuildInputs = [ pkg-config ]; + + RUSTFMT = "${rustfmt}/bin/rustfmt"; + + # Integration tests try to access the ZeroTier API which requires an API token. + # https://github.com/zerotier/zeronsd/blob/v0.5.2/tests/service/network.rs#L10 + doCheck = false; + + meta = with lib; { + description = "A DNS server for ZeroTier users"; + homepage = "https://github.com/zerotier/zeronsd"; + license = licenses.bsd3; + maintainers = [ maintainers.dstengele ]; + }; +} diff --git a/pkgs/by-name/zu/zug/package.nix b/pkgs/by-name/zu/zug/package.nix index f3356dd51ae6..0c03178b3504 100644 --- a/pkgs/by-name/zu/zug/package.nix +++ b/pkgs/by-name/zu/zug/package.nix @@ -1,6 +1,5 @@ { lib , stdenv -, pkgs , fetchFromGitHub , cmake , boost diff --git a/pkgs/data/fonts/baekmuk-ttf/default.nix b/pkgs/data/fonts/baekmuk-ttf/default.nix index 3777f69fa567..497b9bb9cb03 100644 --- a/pkgs/data/fonts/baekmuk-ttf/default.nix +++ b/pkgs/data/fonts/baekmuk-ttf/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenvNoCC, fetchurl }: +{ stdenvNoCC, fetchurl }: stdenvNoCC.mkDerivation rec { pname = "baekmuk-ttf"; diff --git a/pkgs/data/fonts/bakoma-ttf/default.nix b/pkgs/data/fonts/bakoma-ttf/default.nix index 1d305674e6aa..fa3e0e40f773 100644 --- a/pkgs/data/fonts/bakoma-ttf/default.nix +++ b/pkgs/data/fonts/bakoma-ttf/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenvNoCC, fetchurl }: +{ stdenvNoCC, fetchurl }: stdenvNoCC.mkDerivation rec { pname = "bakoma-ttf"; diff --git a/pkgs/data/fonts/cozette/default.nix b/pkgs/data/fonts/cozette/default.nix index 815024778772..ea4230d9526a 100644 --- a/pkgs/data/fonts/cozette/default.nix +++ b/pkgs/data/fonts/cozette/default.nix @@ -2,11 +2,11 @@ stdenvNoCC.mkDerivation rec { pname = "cozette"; - version = "1.24.1"; + version = "1.25.0"; src = fetchzip { url = "https://github.com/slavfox/Cozette/releases/download/v.${version}/CozetteFonts-v-${builtins.replaceStrings ["."] ["-"] version}.zip"; - hash = "sha256-G3/m0g3pdPHUlSLnJhGIFem6UOyEf1VxjOvz/0E9Vr0="; + hash = "sha256-ybq72r2p/2e41jzcZ/KxQgib3VIET6PppyCsGAQVXD8="; }; installPhase = '' diff --git a/pkgs/data/fonts/lmodern/default.nix b/pkgs/data/fonts/lmodern/default.nix index 85aa7060ea05..f567e5ed7557 100644 --- a/pkgs/data/fonts/lmodern/default.nix +++ b/pkgs/data/fonts/lmodern/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenvNoCC, fetchurl }: +{ stdenvNoCC, fetchurl }: stdenvNoCC.mkDerivation rec { pname = "lmodern"; diff --git a/pkgs/data/fonts/mph-2b-damase/default.nix b/pkgs/data/fonts/mph-2b-damase/default.nix index d5623d907bee..bc66982256ff 100644 --- a/pkgs/data/fonts/mph-2b-damase/default.nix +++ b/pkgs/data/fonts/mph-2b-damase/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenvNoCC, fetchzip }: +{ stdenvNoCC, fetchzip }: stdenvNoCC.mkDerivation rec { pname = "mph-2b-damase"; diff --git a/pkgs/desktops/deepin/library/qt6platform-plugins/default.nix b/pkgs/desktops/deepin/library/qt6platform-plugins/default.nix index c5c7d7f6e98e..335e728f8a2b 100644 --- a/pkgs/desktops/deepin/library/qt6platform-plugins/default.nix +++ b/pkgs/desktops/deepin/library/qt6platform-plugins/default.nix @@ -12,22 +12,19 @@ stdenv.mkDerivation rec { pname = "qt6platform-plugins"; - version = "6.0.16"; + version = "6.0.18"; src = fetchFromGitHub { owner = "linuxdeepin"; repo = pname; rev = version; - hash = "sha256-0/hwsdB0UNzlekxfdKeItW2lXTMTzEtBR2hS153woLo="; + hash = "sha256-O2wylkNKqN0JxKffwFNSfv7S1hPIFrVKwSsppSGTp6I="; }; - patches = [ - (fetchpatch { - name = "support-to-qt_6_7_1.patch"; - url = "https://github.com/linuxdeepin/qt6platform-plugins/commit/88ba963d11355391d62501cd5a6da9e3d5e9ddce.patch"; - hash = "sha256-9NiKIdY9PXBYgKQGRf5pFV+tNrHe7BjbVrnwII9lLFI="; - }) - ]; + postUnpack = '' + tar -xf ${qt6Packages.qtbase.src} + mv qtbase-everywhere-src-${qt6Packages.qtbase.version}/src/plugins/platforms/xcb ${src.name}/xcb/libqt6xcbqpa-dev/${qt6Packages.qtbase.version} + ''; nativeBuildInputs = [ cmake diff --git a/pkgs/desktops/gnustep/back/default.nix b/pkgs/desktops/gnustep/back/default.nix index 247c20ed69f0..e4ec5d03010a 100644 --- a/pkgs/desktops/gnustep/back/default.nix +++ b/pkgs/desktops/gnustep/back/default.nix @@ -15,11 +15,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "gnustep-back"; - version = "0.30.0"; + version = "0.31.0"; src = fetchzip { url = "ftp://ftp.gnustep.org/pub/gnustep/core/gnustep-back-${finalAttrs.version}.tar.gz"; - sha256 = "sha256-HD4PLdkE573nPWqFwffUmcHw8VYIl5rLiPKWrbnwpCI="; + sha256 = "sha256-CjcoXlKiPVPJMOdrBKjxiNauTZvLcId5Lb8DzbgBbBg="; }; nativeBuildInputs = [ make pkg-config wrapGNUstepAppsHook ]; diff --git a/pkgs/desktops/gnustep/gui/default.nix b/pkgs/desktops/gnustep/gui/default.nix index c1e01f6f3705..498b120adea4 100644 --- a/pkgs/desktops/gnustep/gui/default.nix +++ b/pkgs/desktops/gnustep/gui/default.nix @@ -7,12 +7,12 @@ }: stdenv.mkDerivation (finalAttrs: { - version = "0.30.0"; + version = "0.31.1"; pname = "gnustep-gui"; src = fetchzip { url = "ftp://ftp.gnustep.org/pub/gnustep/core/gnustep-gui-${finalAttrs.version}.tar.gz"; - sha256 = "sha256-24hL4TeIY6izlhQUcxKI0nXITysAPfRrncRqsDm2zNk="; + sha256 = "sha256-+4XEJ6PKpantbIbyNroFMaNBTFffkuW/ajSocGQO9Mo="; }; nativeBuildInputs = [ make wrapGNUstepAppsHook ]; diff --git a/pkgs/desktops/pantheon/apps/elementary-code/default.nix b/pkgs/desktops/pantheon/apps/elementary-code/default.nix index d9837b83676e..cd451d7178fe 100644 --- a/pkgs/desktops/pantheon/apps/elementary-code/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-code/default.nix @@ -26,13 +26,13 @@ stdenv.mkDerivation rec { pname = "elementary-code"; - version = "7.2.0"; + version = "7.3.0"; src = fetchFromGitHub { owner = "elementary"; repo = "code"; rev = version; - sha256 = "sha256-6lvn8c+JfbtZQf5dtViosVqtt/RWL6B/MvksXqmCfFs="; + sha256 = "sha256-AizJPWRrCJvck+TFy/BVbzI6k62+tGkVux01Nl0XReg="; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/pantheon/default.nix b/pkgs/desktops/pantheon/default.nix index 26d3f16a523a..e0f08e6e2031 100644 --- a/pkgs/desktops/pantheon/default.nix +++ b/pkgs/desktops/pantheon/default.nix @@ -123,6 +123,8 @@ lib.makeScope pkgs.newScope (self: with self; { contractor = callPackage ./services/contractor { }; + elementary-bluetooth-daemon = callPackage ./services/elementary-bluetooth-daemon { }; + elementary-capnet-assist = callPackage ./services/elementary-capnet-assist { }; elementary-notifications = callPackage ./services/elementary-notifications { }; diff --git a/pkgs/desktops/pantheon/services/elementary-bluetooth-daemon/default.nix b/pkgs/desktops/pantheon/services/elementary-bluetooth-daemon/default.nix new file mode 100644 index 000000000000..3cf021affcd2 --- /dev/null +++ b/pkgs/desktops/pantheon/services/elementary-bluetooth-daemon/default.nix @@ -0,0 +1,51 @@ +{ + stdenv, + lib, + fetchFromGitHub, + meson, + ninja, + pkg-config, + vala, + wrapGAppsHook3, + granite, + gtk3, + nix-update-script, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "elementary-bluetooth-daemon"; + version = "1.0.0"; + + src = fetchFromGitHub { + owner = "elementary"; + repo = "bluetooth-daemon"; + rev = finalAttrs.version; + hash = "sha256-09udSmd51l7zPe83RBg+AihpwsELclEF+Jn+5DKdJUI="; + }; + + nativeBuildInputs = [ + meson + ninja + pkg-config + vala + wrapGAppsHook3 + ]; + + buildInputs = [ + granite + gtk3 + ]; + + passthru = { + updateScript = nix-update-script { }; + }; + + meta = { + description = "Send and receive files via bluetooth"; + homepage = "https://github.com/elementary/bluetooth-daemon"; + license = lib.licenses.gpl3Plus; + maintainers = lib.teams.pantheon.members; + platforms = lib.platforms.linux; + mainProgram = "io.elementary.bluetooth"; + }; +}) diff --git a/pkgs/desktops/pantheon/services/xdg-desktop-portal-pantheon/default.nix b/pkgs/desktops/pantheon/services/xdg-desktop-portal-pantheon/default.nix index b01db234fdd6..f863d509204d 100644 --- a/pkgs/desktops/pantheon/services/xdg-desktop-portal-pantheon/default.nix +++ b/pkgs/desktops/pantheon/services/xdg-desktop-portal-pantheon/default.nix @@ -9,6 +9,7 @@ , wrapGAppsHook4 , glib , granite7 +, gsettings-desktop-schemas , gtk4 , systemd , xorg @@ -16,13 +17,13 @@ stdenv.mkDerivation rec { pname = "xdg-desktop-portal-pantheon"; - version = "7.1.1"; + version = "7.2.0"; src = fetchFromGitHub { owner = "elementary"; repo = "portals"; rev = version; - sha256 = "sha256-JZ2VYsNAjNGCzKOEhHCZx2uNLHFs+ktjFmROLHdFjX4="; + sha256 = "sha256-0pXb4GPUThHfe0mCqoYuQzMgRCeejsEI3fK7PxjrtJM="; }; nativeBuildInputs = [ @@ -36,6 +37,7 @@ stdenv.mkDerivation rec { buildInputs = [ glib granite7 + gsettings-desktop-schemas gtk4 systemd xorg.libX11 diff --git a/pkgs/desktops/plasma-5/plasma-mobile/default.nix b/pkgs/desktops/plasma-5/plasma-mobile/default.nix index a37a8cfe12b8..7409cf2d54db 100644 --- a/pkgs/desktops/plasma-5/plasma-mobile/default.nix +++ b/pkgs/desktops/plasma-5/plasma-mobile/default.nix @@ -1,5 +1,4 @@ { mkDerivation -, lib , extra-cmake-modules , kdoctools , libdbusmenu diff --git a/pkgs/development/compilers/circt/default.nix b/pkgs/development/compilers/circt/default.nix index 54702bbc744e..aaf560ba4e85 100644 --- a/pkgs/development/compilers/circt/default.nix +++ b/pkgs/development/compilers/circt/default.nix @@ -18,12 +18,12 @@ let in stdenv.mkDerivation rec { pname = "circt"; - version = "1.77.0"; + version = "1.78.1"; src = fetchFromGitHub { owner = "llvm"; repo = "circt"; rev = "firtool-${version}"; - hash = "sha256-eiXyGwvObrhyhj7Nj9wIafmcaRYjZt0Qy4D3D+fEsGs="; + hash = "sha256-MV70tU9orK46IXM46HUuxgAuSP4JerXdKpOyPiMfsUE="; fetchSubmodules = true; }; diff --git a/pkgs/development/compilers/gambit/bootstrap.nix b/pkgs/development/compilers/gambit/bootstrap.nix index 753938e95aa3..708640c8719c 100644 --- a/pkgs/development/compilers/gambit/bootstrap.nix +++ b/pkgs/development/compilers/gambit/bootstrap.nix @@ -1,7 +1,7 @@ # This derivation is a reduced-functionality variant of Gambit stable, # used to compile the full version of Gambit stable *and* unstable. -{ gccStdenv, lib, fetchurl, autoconf, gcc, coreutils, gambit-support, ... }: +{ gccStdenv, fetchurl, autoconf, gcc, coreutils, gambit-support, ... }: # As explained in build.nix, GCC compiles Gambit 10x faster than Clang, for code 3x better gccStdenv.mkDerivation { diff --git a/pkgs/development/compilers/gcc/default.nix b/pkgs/development/compilers/gcc/default.nix index 5eb92fd701da..9746825b2321 100644 --- a/pkgs/development/compilers/gcc/default.nix +++ b/pkgs/development/compilers/gcc/default.nix @@ -451,7 +451,7 @@ pipe ((callFile ./common/builder.nix {}) ({ if (is8 && targetPlatform.isAvr) then [] else if !(is48 || is49) then [ "aarch64-darwin" ] else platforms.darwin; - } // optionalAttrs is11 { + } // optionalAttrs is10 { badPlatforms = if targetPlatform != hostPlatform then [ "aarch64-darwin" ] else [ ]; }; } // optionalAttrs (!atLeast10 && stdenv.targetPlatform.isDarwin) { diff --git a/pkgs/development/compilers/gcc/patches/default.nix b/pkgs/development/compilers/gcc/patches/default.nix index b7da7eb925ee..2a9d987e1c3b 100644 --- a/pkgs/development/compilers/gcc/patches/default.nix +++ b/pkgs/development/compilers/gcc/patches/default.nix @@ -156,8 +156,8 @@ in }) ]; "12" = [ (fetchurl { name = "gcc-12-darwin-aarch64-support.patch"; - url = "https://raw.githubusercontent.com/Homebrew/formula-patches/f1188b90d610e2ed170b22512ff7435ba5c891e2/gcc/gcc-12.3.0.diff"; - sha256 = "sha256-naL5ZNiurqfDBiPSU8PTbTmLqj25B+vjjiqc4fAFgYs="; + url = "https://raw.githubusercontent.com/Homebrew/formula-patches/1ed9eaea059f1677d27382c62f21462b476b37fe/gcc/gcc-12.4.0.diff"; + sha256 = "sha256-wOjpT79lps4TKG5/E761odhLGCphBIkCbOPiQg/D1Fw="; }) ]; "11" = [ (fetchpatch { # There are no upstream release tags in https://github.com/iains/gcc-11-branch. @@ -165,6 +165,12 @@ in url = "https://github.com/iains/gcc-11-branch/compare/ff4bf326d03e750a8d4905ea49425fe7d15a04b8..gcc-11.4-darwin-r0.diff"; hash = "sha256-6prPgR2eGVJs7vKd6iM1eZsEPCD1ShzLns2Z+29vlt4="; }) ]; + "10" = [ (fetchpatch { + # There are no upstream release tags in https://github.com/iains/gcc-10-branch. + # d04fe55 is the commit from https://github.com/gcc-mirror/gcc/releases/tag/releases%2Fgcc-10.5.0 + url = "https://github.com/iains/gcc-10-branch/compare/d04fe5541c53cb16d1ca5c80da044b4c7633dbc6...gcc-10-5Dr0-pre-0.diff"; + hash = "sha256-kVUHZKtYqkWIcqxHG7yAOR2B60w4KWLoxzaiFD/FWYk="; + }) ]; }.${majorVersion} or []) diff --git a/pkgs/development/compilers/zig/0.10/hook.nix b/pkgs/development/compilers/zig/0.10/hook.nix index 1d3439b1af62..aec36a2c0a82 100644 --- a/pkgs/development/compilers/zig/0.10/hook.nix +++ b/pkgs/development/compilers/zig/0.10/hook.nix @@ -1,8 +1,4 @@ -{ - lib, - makeSetupHook, - zig, -}: +{ makeSetupHook, zig }: makeSetupHook { name = "zig-hook"; diff --git a/pkgs/development/compilers/zig/0.11/hook.nix b/pkgs/development/compilers/zig/0.11/hook.nix index fb0e1aa564d1..399b3889a226 100644 --- a/pkgs/development/compilers/zig/0.11/hook.nix +++ b/pkgs/development/compilers/zig/0.11/hook.nix @@ -1,8 +1,4 @@ -{ - lib, - makeSetupHook, - zig, -}: +{ makeSetupHook, zig }: makeSetupHook { name = "zig-hook"; diff --git a/pkgs/development/compilers/zig/0.12/hook.nix b/pkgs/development/compilers/zig/0.12/hook.nix index 8d3e6206d155..1f920af318be 100644 --- a/pkgs/development/compilers/zig/0.12/hook.nix +++ b/pkgs/development/compilers/zig/0.12/hook.nix @@ -1,8 +1,4 @@ -{ - lib, - makeSetupHook, - zig, -}: +{ makeSetupHook, zig }: makeSetupHook { name = "zig-hook"; diff --git a/pkgs/development/compilers/zig/0.13/hook.nix b/pkgs/development/compilers/zig/0.13/hook.nix index 2d379f1b7caf..1618702ecaec 100644 --- a/pkgs/development/compilers/zig/0.13/hook.nix +++ b/pkgs/development/compilers/zig/0.13/hook.nix @@ -1,8 +1,4 @@ -{ - lib, - makeSetupHook, - zig, -}: +{ makeSetupHook, zig }: makeSetupHook { name = "zig-hook"; diff --git a/pkgs/development/compilers/zig/0.9/hook.nix b/pkgs/development/compilers/zig/0.9/hook.nix index 1d3439b1af62..aec36a2c0a82 100644 --- a/pkgs/development/compilers/zig/0.9/hook.nix +++ b/pkgs/development/compilers/zig/0.9/hook.nix @@ -1,8 +1,4 @@ -{ - lib, - makeSetupHook, - zig, -}: +{ makeSetupHook, zig }: makeSetupHook { name = "zig-hook"; diff --git a/pkgs/development/coq-modules/coq-hammer/default.nix b/pkgs/development/coq-modules/coq-hammer/default.nix index f332f0e3a82e..33785178228f 100644 --- a/pkgs/development/coq-modules/coq-hammer/default.nix +++ b/pkgs/development/coq-modules/coq-hammer/default.nix @@ -1,4 +1,4 @@ -{ lib, mkCoqDerivation, coq, coq-hammer-tactics, version ? null }: +{ mkCoqDerivation, coq, coq-hammer-tactics, version ? null }: mkCoqDerivation { inherit version; diff --git a/pkgs/development/coq-modules/fourcolor/default.nix b/pkgs/development/coq-modules/fourcolor/default.nix index 94994fb85735..4bf4ae771a0e 100644 --- a/pkgs/development/coq-modules/fourcolor/default.nix +++ b/pkgs/development/coq-modules/fourcolor/default.nix @@ -24,7 +24,7 @@ mkCoqDerivation { propagatedBuildInputs = [ mathcomp.algebra mathcomp.ssreflect mathcomp.fingroup ]; meta = with lib; { - description = "Formal proof of the Four Color Theorem "; + description = "Formal proof of the Four Color Theorem"; maintainers = with maintainers; [ siraben ]; license = licenses.cecill-b; platforms = platforms.unix; diff --git a/pkgs/development/embedded/teensy-cmake-macros/hook.nix b/pkgs/development/embedded/teensy-cmake-macros/hook.nix index b0abdbdc681e..55f9aec729f5 100644 --- a/pkgs/development/embedded/teensy-cmake-macros/hook.nix +++ b/pkgs/development/embedded/teensy-cmake-macros/hook.nix @@ -1,5 +1,4 @@ -{ lib -, makeSetupHook +{ makeSetupHook , teensy-cmake-macros }: diff --git a/pkgs/development/interpreters/lua-5/wrap-lua.nix b/pkgs/development/interpreters/lua-5/wrap-lua.nix index c5e7c806cd17..1b9409ff948e 100644 --- a/pkgs/development/interpreters/lua-5/wrap-lua.nix +++ b/pkgs/development/interpreters/lua-5/wrap-lua.nix @@ -1,5 +1,4 @@ -{ lib -, lua +{ lua , makeSetupHook , makeWrapper }: diff --git a/pkgs/development/interpreters/octave/wrap-octave.nix b/pkgs/development/interpreters/octave/wrap-octave.nix index 1959ba6c4925..18a532226efe 100644 --- a/pkgs/development/interpreters/octave/wrap-octave.nix +++ b/pkgs/development/interpreters/octave/wrap-octave.nix @@ -1,5 +1,4 @@ -{ lib -, octave +{ octave , makeSetupHook , makeWrapper }: diff --git a/pkgs/development/interpreters/python/cpython/docs/2.7-html.nix b/pkgs/development/interpreters/python/cpython/docs/2.7-html.nix index a15bca1e013e..ab712cb734ea 100644 --- a/pkgs/development/interpreters/python/cpython/docs/2.7-html.nix +++ b/pkgs/development/interpreters/python/cpython/docs/2.7-html.nix @@ -1,6 +1,6 @@ # This file was generated and will be overwritten by ./generate.sh -{ stdenv, fetchurl, lib }: +{ stdenv, lib, fetchurl }: stdenv.mkDerivation { pname = "python27-docs-html"; diff --git a/pkgs/development/interpreters/python/cpython/docs/2.7-pdf-a4.nix b/pkgs/development/interpreters/python/cpython/docs/2.7-pdf-a4.nix index 54b28992d472..0ae044db37c9 100644 --- a/pkgs/development/interpreters/python/cpython/docs/2.7-pdf-a4.nix +++ b/pkgs/development/interpreters/python/cpython/docs/2.7-pdf-a4.nix @@ -1,6 +1,6 @@ # This file was generated and will be overwritten by ./generate.sh -{ stdenv, fetchurl, lib }: +{ stdenv, lib, fetchurl }: stdenv.mkDerivation { pname = "python27-docs-pdf-a4"; diff --git a/pkgs/development/interpreters/python/cpython/docs/2.7-pdf-letter.nix b/pkgs/development/interpreters/python/cpython/docs/2.7-pdf-letter.nix index 84cf35f385a1..85593000d421 100644 --- a/pkgs/development/interpreters/python/cpython/docs/2.7-pdf-letter.nix +++ b/pkgs/development/interpreters/python/cpython/docs/2.7-pdf-letter.nix @@ -1,6 +1,6 @@ # This file was generated and will be overwritten by ./generate.sh -{ stdenv, fetchurl, lib }: +{ stdenv, lib, fetchurl }: stdenv.mkDerivation { pname = "python27-docs-pdf-letter"; diff --git a/pkgs/development/interpreters/python/cpython/docs/2.7-text.nix b/pkgs/development/interpreters/python/cpython/docs/2.7-text.nix index 5d25344e4bdc..24a22dd14675 100644 --- a/pkgs/development/interpreters/python/cpython/docs/2.7-text.nix +++ b/pkgs/development/interpreters/python/cpython/docs/2.7-text.nix @@ -1,6 +1,6 @@ # This file was generated and will be overwritten by ./generate.sh -{ stdenv, fetchurl, lib }: +{ stdenv, lib, fetchurl }: stdenv.mkDerivation { pname = "python27-docs-text"; diff --git a/pkgs/development/interpreters/python/cpython/docs/3.10-html.nix b/pkgs/development/interpreters/python/cpython/docs/3.10-html.nix index 6efe8d571a77..0cbe633c63b1 100644 --- a/pkgs/development/interpreters/python/cpython/docs/3.10-html.nix +++ b/pkgs/development/interpreters/python/cpython/docs/3.10-html.nix @@ -1,6 +1,6 @@ # This file was generated and will be overwritten by ./generate.sh -{ stdenv, fetchurl, lib }: +{ stdenv, lib, fetchurl }: stdenv.mkDerivation { pname = "python310-docs-html"; diff --git a/pkgs/development/interpreters/python/cpython/docs/3.10-pdf-a4.nix b/pkgs/development/interpreters/python/cpython/docs/3.10-pdf-a4.nix index 1cbbf179a2e2..bb98fdffb005 100644 --- a/pkgs/development/interpreters/python/cpython/docs/3.10-pdf-a4.nix +++ b/pkgs/development/interpreters/python/cpython/docs/3.10-pdf-a4.nix @@ -1,6 +1,6 @@ # This file was generated and will be overwritten by ./generate.sh -{ stdenv, fetchurl, lib }: +{ stdenv, lib, fetchurl }: stdenv.mkDerivation { pname = "python310-docs-pdf-a4"; diff --git a/pkgs/development/interpreters/python/cpython/docs/3.10-pdf-letter.nix b/pkgs/development/interpreters/python/cpython/docs/3.10-pdf-letter.nix index 6b24450855b2..8bd6298fe151 100644 --- a/pkgs/development/interpreters/python/cpython/docs/3.10-pdf-letter.nix +++ b/pkgs/development/interpreters/python/cpython/docs/3.10-pdf-letter.nix @@ -1,6 +1,6 @@ # This file was generated and will be overwritten by ./generate.sh -{ stdenv, fetchurl, lib }: +{ stdenv, lib, fetchurl }: stdenv.mkDerivation { pname = "python310-docs-pdf-letter"; diff --git a/pkgs/development/interpreters/python/cpython/docs/3.10-texinfo.nix b/pkgs/development/interpreters/python/cpython/docs/3.10-texinfo.nix index 694ed0e9ad94..35664e17cd68 100644 --- a/pkgs/development/interpreters/python/cpython/docs/3.10-texinfo.nix +++ b/pkgs/development/interpreters/python/cpython/docs/3.10-texinfo.nix @@ -1,6 +1,6 @@ # This file was generated and will be overwritten by ./generate.sh -{ stdenv, fetchurl, lib }: +{ stdenv, lib, fetchurl }: stdenv.mkDerivation { pname = "python310-docs-texinfo"; diff --git a/pkgs/development/interpreters/python/cpython/docs/3.10-text.nix b/pkgs/development/interpreters/python/cpython/docs/3.10-text.nix index 4ada4e2b704d..eec0bf140961 100644 --- a/pkgs/development/interpreters/python/cpython/docs/3.10-text.nix +++ b/pkgs/development/interpreters/python/cpython/docs/3.10-text.nix @@ -1,6 +1,6 @@ # This file was generated and will be overwritten by ./generate.sh -{ stdenv, fetchurl, lib }: +{ stdenv, lib, fetchurl }: stdenv.mkDerivation { pname = "python310-docs-text"; diff --git a/pkgs/development/interpreters/python/cpython/docs/template-info.nix b/pkgs/development/interpreters/python/cpython/docs/template-info.nix index 4f5d4b3e37ab..f1551e1f61ef 100644 --- a/pkgs/development/interpreters/python/cpython/docs/template-info.nix +++ b/pkgs/development/interpreters/python/cpython/docs/template-info.nix @@ -1,6 +1,6 @@ # This file was generated and will be overwritten by ./generate.sh -{ stdenv, fetchurl, lib }: +{ stdenv, fetchurl }: stdenv.mkDerivation { pname = "pythonMAJORMINOR-docs-TYPE"; diff --git a/pkgs/development/interpreters/python/cpython/docs/template.nix b/pkgs/development/interpreters/python/cpython/docs/template.nix index fff6e0bedb18..adf64ddd6224 100644 --- a/pkgs/development/interpreters/python/cpython/docs/template.nix +++ b/pkgs/development/interpreters/python/cpython/docs/template.nix @@ -1,6 +1,6 @@ # This file was generated and will be overwritten by ./generate.sh -{ stdenv, fetchurl, lib }: +{ stdenv, fetchurl }: stdenv.mkDerivation { pname = "pythonMAJORMINOR-docs-TYPE"; diff --git a/pkgs/development/interpreters/python/tests/test_cpython_gdb/default.nix b/pkgs/development/interpreters/python/tests/test_cpython_gdb/default.nix index 0254d843a4cf..3d3bf549d91c 100644 --- a/pkgs/development/interpreters/python/tests/test_cpython_gdb/default.nix +++ b/pkgs/development/interpreters/python/tests/test_cpython_gdb/default.nix @@ -1,4 +1,4 @@ -{ interpreter, lib, gdb, writeText, runCommand }: +{ interpreter, gdb, writeText, runCommand }: let crashme-py = writeText "crashme.py" '' diff --git a/pkgs/development/interpreters/wasmer/default.nix b/pkgs/development/interpreters/wasmer/default.nix index bc58f89ea51c..2256851c3d2f 100644 --- a/pkgs/development/interpreters/wasmer/default.nix +++ b/pkgs/development/interpreters/wasmer/default.nix @@ -14,16 +14,16 @@ rustPlatform.buildRustPackage rec { pname = "wasmer"; - version = "4.3.4"; + version = "4.3.5"; src = fetchFromGitHub { owner = "wasmerio"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-lpWgitQAZ+voGNj3Bo2FjbjDXPRSb067rx3/bIX+C9Y="; + hash = "sha256-hEhU3o/SLHWV9zmgCtW+7K/2ev+oGAnrZmlyNtoeSV4="; }; - cargoHash = "sha256-1/krpq7+E2p70d/SlSj0vCHr/9w6SbO15OhfkQiWf2k="; + cargoHash = "sha256-xyR5pnwMGE5K4o7X0Q2JEervSgR5LK1vqpOa3Mm6xkU="; nativeBuildInputs = [ rustPlatform.bindgenHook diff --git a/pkgs/development/libraries/aws-c-cal/default.nix b/pkgs/development/libraries/aws-c-cal/default.nix index 908b4545e0e1..caf0ce60cdb2 100644 --- a/pkgs/development/libraries/aws-c-cal/default.nix +++ b/pkgs/development/libraries/aws-c-cal/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation (finalAttrs: { }; meta = with lib; { - description = "AWS Crypto Abstraction Layer "; + description = "AWS Crypto Abstraction Layer"; homepage = "https://github.com/awslabs/aws-c-cal"; license = licenses.asl20; platforms = platforms.unix; diff --git a/pkgs/development/libraries/flatcc/default.nix b/pkgs/development/libraries/flatcc/default.nix index 4d74627ee3c9..ff78f863a40f 100644 --- a/pkgs/development/libraries/flatcc/default.nix +++ b/pkgs/development/libraries/flatcc/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { ]; meta = with lib; { - description = "FlatBuffers Compiler and Library in C for C "; + description = "FlatBuffers Compiler and Library in C for C"; mainProgram = "flatcc"; homepage = "https://github.com/dvidelabs/flatcc"; license = [ licenses.asl20 ]; diff --git a/pkgs/development/libraries/glfw/3.x.nix b/pkgs/development/libraries/glfw/3.x.nix index 7ca694827301..2ec1f42d2840 100644 --- a/pkgs/development/libraries/glfw/3.x.nix +++ b/pkgs/development/libraries/glfw/3.x.nix @@ -2,7 +2,7 @@ , libGL, libXrandr, libXinerama, libXcursor, libX11, libXi, libXext , Carbon, Cocoa, Kernel, fixDarwinDylibNames , extra-cmake-modules, wayland -, wayland-scanner, wayland-protocols, libxkbcommon +, wayland-scanner, wayland-protocols, libxkbcommon, libdecor }: stdenv.mkDerivation rec { @@ -48,7 +48,11 @@ stdenv.mkDerivation rec { postPatch = lib.optionalString stdenv.isLinux '' substituteInPlace src/wl_init.c \ - --replace "libxkbcommon.so.0" "${lib.getLib libxkbcommon}/lib/libxkbcommon.so.0" + --replace-fail "libxkbcommon.so.0" "${lib.getLib libxkbcommon}/lib/libxkbcommon.so.0" \ + --replace-fail "libdecor-0.so.0" "${lib.getLib libdecor}/lib/libdecor-0.so.0" \ + --replace-fail "libwayland-client.so.0" "${lib.getLib wayland}/lib/libwayland-client.so.0" \ + --replace-fail "libwayland-cursor.so.0" "${lib.getLib wayland}/lib/libwayland-cursor.so.0" \ + --replace-fail "libwayland-egl.so.1" "${lib.getLib wayland}/lib/libwayland-egl.so.1" ''; # glfw may dlopen libwayland-client.so: diff --git a/pkgs/development/libraries/hfst-ospell/default.nix b/pkgs/development/libraries/hfst-ospell/default.nix index f0a0bc6bef48..823bcbbe8c08 100644 --- a/pkgs/development/libraries/hfst-ospell/default.nix +++ b/pkgs/development/libraries/hfst-ospell/default.nix @@ -48,7 +48,7 @@ stdenv.mkDerivation (finalAttrs: { meta = with lib; { homepage = "https://github.com/hfst/hfst-ospell/"; - description = "HFST spell checker library and command line tool "; + description = "HFST spell checker library and command line tool"; license = licenses.asl20; maintainers = with maintainers; [ lurkki ]; platforms = platforms.unix; diff --git a/pkgs/development/libraries/java/jffi/default.nix b/pkgs/development/libraries/java/jffi/default.nix index 46f270163549..dddcfd1fa303 100644 --- a/pkgs/development/libraries/java/jffi/default.nix +++ b/pkgs/development/libraries/java/jffi/default.nix @@ -65,7 +65,7 @@ stdenv.mkDerivation (finalAttrs: { meta = with lib; { broken = stdenv.isDarwin; - description = "Java Foreign Function Interface "; + description = "Java Foreign Function Interface"; homepage = "https://github.com/jnr/jffi"; platforms = platforms.unix; license = licenses.asl20; diff --git a/pkgs/development/libraries/kde-frameworks/kitemviews.nix b/pkgs/development/libraries/kde-frameworks/kitemviews.nix index ef350835f05d..20ae20f9e99e 100644 --- a/pkgs/development/libraries/kde-frameworks/kitemviews.nix +++ b/pkgs/development/libraries/kde-frameworks/kitemviews.nix @@ -1,5 +1,5 @@ { - mkDerivation, lib, + mkDerivation, extra-cmake-modules, qtbase, qttools }: diff --git a/pkgs/development/libraries/libcdada/default.nix b/pkgs/development/libraries/libcdada/default.nix index 5d1d295f74a8..8b1e4e0c7ab4 100644 --- a/pkgs/development/libraries/libcdada/default.nix +++ b/pkgs/development/libraries/libcdada/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "libcdada"; - version = "0.5.2"; + version = "0.6.0"; src = fetchFromGitHub { owner = "msune"; repo = "libcdada"; rev = "v${version}"; - hash = "sha256-rrBmsXBatvaf/u/UVHpTm9YUo+gsQv1rtuprpRF/3kU="; + hash = "sha256-fgH4gl8Uq8mY9gxa968suU66VJYnFzpSLj4JGpJcJA4="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/libde265/test-corpus-decode.nix b/pkgs/development/libraries/libde265/test-corpus-decode.nix index 763c93e6a993..9c184362d10b 100644 --- a/pkgs/development/libraries/libde265/test-corpus-decode.nix +++ b/pkgs/development/libraries/libde265/test-corpus-decode.nix @@ -1,5 +1,4 @@ -{ lib -, stdenv +{ stdenv , fetchFromGitHub , libde265 }: diff --git a/pkgs/development/libraries/libgbinder/default.nix b/pkgs/development/libraries/libgbinder/default.nix index cfdfd7482b42..34eea1047413 100644 --- a/pkgs/development/libraries/libgbinder/default.nix +++ b/pkgs/development/libraries/libgbinder/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "libgbinder"; - version = "1.1.39"; + version = "1.1.40"; src = fetchFromGitHub { owner = "mer-hybris"; repo = pname; rev = version; - sha256 = "sha256-O+Fg6NtWdBe0k+XhE/h62C1tvC6Y1BQZWva63sXJDfY="; + sha256 = "sha256-bv3UeL5xx28N/fSG1BeUSbbSvDaNgehpnx2OzIIaSXw="; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/libraries/libjpeg/default.nix b/pkgs/development/libraries/libjpeg/default.nix index 63a4e9f27be2..ce73a5955354 100644 --- a/pkgs/development/libraries/libjpeg/default.nix +++ b/pkgs/development/libraries/libjpeg/default.nix @@ -26,12 +26,12 @@ stdenv.mkDerivation (finalAttrs: { passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; - meta = with lib; { + meta = { homepage = "https://www.ijg.org/"; description = "Library that implements the JPEG image file format"; - maintainers = with maintainers; [ sigmanificient ]; - license = licenses.free; + maintainers = with lib.maintainers; [ sigmanificient ]; + license = lib.licenses.free; pkgConfigModules = [ "libjpeg" ]; - platforms = platforms.unix; + platforms = lib.platforms.unix; }; }) diff --git a/pkgs/development/libraries/libkrun/default.nix b/pkgs/development/libraries/libkrun/default.nix index 30730d38a6f7..b08232605ce7 100644 --- a/pkgs/development/libraries/libkrun/default.nix +++ b/pkgs/development/libraries/libkrun/default.nix @@ -21,20 +21,20 @@ stdenv.mkDerivation (finalAttrs: { pname = "libkrun"; - version = "1.9.3"; + version = "1.9.4"; src = fetchFromGitHub { owner = "containers"; repo = "libkrun"; rev = "refs/tags/v${finalAttrs.version}"; - hash = "sha256-LIp2/794gbHPweBJcHCjbF0m+bJAs0SPF7WivW7fxLI="; + hash = "sha256-QzyNPThwbjPKANeZ4GAT9b4f8LTcjXnCiK+vzRkhM4c="; }; outputs = [ "out" "dev" ]; cargoDeps = rustPlatform.fetchCargoTarball { inherit (finalAttrs) pname version src; - hash = "sha256-g4ceYi16mjEgvWTAQEW8ShT/e5IKnlgLgk49Mg0N2fQ="; + hash = "sha256-33s62iOWYh1a8ETY/fbPRxvnj8dR4/UfG8mjFyWwz5k="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/libkrunfw/default.nix b/pkgs/development/libraries/libkrunfw/default.nix index 21b8918d75ec..ef9e43001198 100644 --- a/pkgs/development/libraries/libkrunfw/default.nix +++ b/pkgs/development/libraries/libkrunfw/default.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "libkrunfw"; - version = "4.0.0-unstable-2024-06-10"; + version = "4.2.0"; src = fetchFromGitHub { owner = "containers"; repo = "libkrunfw"; - rev = "12236fa4caa42423ff3081b6179aa0a5f37c67c9"; - hash = "sha256-Vcbg2zBVMQsiAQF/cEEIRMqppMBVGnqUBlDquGzRBsc="; + rev = "refs/tags/v${finalAttrs.version}"; + hash = "sha256-LaIyPk9QkxPFP169r6PqyBMpFujbQBlX77z63OqKGYc="; }; kernelSrc = fetchurl { diff --git a/pkgs/development/libraries/libowlevelzs/default.nix b/pkgs/development/libraries/libowlevelzs/default.nix index e3a4ffb11e8e..6199dcca1bb8 100644 --- a/pkgs/development/libraries/libowlevelzs/default.nix +++ b/pkgs/development/libraries/libowlevelzs/default.nix @@ -17,11 +17,11 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; - meta = with lib; { + meta = { description = "Zscheile Lowlevel (utility) library"; homepage = "https://github.com/fogti/libowlevelzs"; - license = licenses.mit; + license = lib.licenses.mit; maintainers = with lib.maintainers; [ sigmanificient ]; - platforms = platforms.all; + platforms = lib.platforms.all; }; } diff --git a/pkgs/development/libraries/libqtav/default.nix b/pkgs/development/libraries/libqtav/default.nix deleted file mode 100644 index 17862e23b75b..000000000000 --- a/pkgs/development/libraries/libqtav/default.nix +++ /dev/null @@ -1,71 +0,0 @@ -{ mkDerivation -, lib -, fetchFromGitHub -, extra-cmake-modules -, qtbase -, qtmultimedia -, qttools -, libGL -, libX11 -, libass -, openal -, ffmpeg_4 -, libuchardet -, alsa-lib -, libpulseaudio -, libva -}: - -mkDerivation rec { - pname = "libqtav"; - version = "unstable-2020-09-10"; - - nativeBuildInputs = [ extra-cmake-modules qttools ]; - buildInputs = [ - qtbase - qtmultimedia - libGL - libX11 - libass - openal - ffmpeg_4 - libuchardet - alsa-lib - libpulseaudio - libva - ]; - - src = fetchFromGitHub { - sha256 = "0qwrk40dihkbwmm7krz6qaqyn9v3qdjnd2k9b4s3a67x4403pib3"; - rev = "2a470d2a8d2fe22fae969bee5d594909a07b350a"; - repo = "QtAV"; - owner = "wang-bin"; - fetchSubmodules = true; - }; - - # Make sure libqtav finds its libGL dependency at both link and run time - # by adding libGL to rpath. Not sure why it wasn't done automatically like - # the other libraries as `libGL` is part of our `buildInputs`. - NIX_CFLAGS_LINK = "-Wl,-rpath,${libGL}/lib"; - - cmakeFlags = [ - # RPATH of binary /nix/store/.../bin/... contains a forbidden reference to /build/ - "-DCMAKE_SKIP_BUILD_RPATH=ON" - ]; - - preFixup = '' - mkdir -p "$out/bin" - cp -a "./bin/"* "$out/bin" - ''; - - stripDebugList = [ "lib" "libexec" "bin" "qml" ]; - - meta = with lib; { - description = "Multimedia playback framework based on Qt + FFmpeg"; - #license = licenses.lgpl21; # For the libraries / headers only. - license = licenses.gpl3; # With the examples (under bin) and most likely some of the optional dependencies used. - homepage = "http://www.qtav.org/"; - maintainers = [ maintainers.jraygauthier ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/development/libraries/librime/default.nix b/pkgs/development/libraries/librime/default.nix index 73c335d00e15..6ff2abb11de9 100644 --- a/pkgs/development/libraries/librime/default.nix +++ b/pkgs/development/libraries/librime/default.nix @@ -1,5 +1,6 @@ { lib, stdenv, fetchFromGitHub, cmake, boost, glog, leveldb, marisa, opencc, - yaml-cpp, gtest, capnproto, pkg-config, librime-lua, plugins ? [ librime-lua ] }: + yaml-cpp, gtest, capnproto, pkg-config, librime-lua, librime-octagram, + plugins ? [ librime-lua librime-octagram ] }: let copySinglePlugin = plug: "cp -r ${plug} plugins/${plug.name}"; diff --git a/pkgs/development/libraries/libvpx/1_8.nix b/pkgs/development/libraries/libvpx/1_8.nix deleted file mode 100644 index 643dcb4d8f40..000000000000 --- a/pkgs/development/libraries/libvpx/1_8.nix +++ /dev/null @@ -1,185 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, perl, yasm -, vp8DecoderSupport ? true # VP8 decoder -, vp8EncoderSupport ? true # VP8 encoder -, vp9DecoderSupport ? true # VP9 decoder -, vp9EncoderSupport ? true # VP9 encoder -, extraWarningsSupport ? false # emit non-fatal warnings -, werrorSupport ? false # treat warnings as errors (not available with all compilers) -, debugSupport ? false # debug mode -, gprofSupport ? false # gprof profiling instrumentation -, gcovSupport ? false # gcov coverage instrumentation -, sizeLimitSupport ? true # limit max size to allow in the decoder -, optimizationsSupport ? true # compiler optimization flags -, runtimeCpuDetectSupport ? true # detect cpu capabilities at runtime -, thumbSupport ? false # build arm assembly in thumb mode -, examplesSupport ? true # build examples (vpxdec & vpxenc are part of examples) -, debugLibsSupport ? false # include debug version of each library -, postprocSupport ? true # postprocessing -, multithreadSupport ? true # multithreaded decoding & encoding -, internalStatsSupport ? false # output of encoder internal stats for debug, if supported (encoders) -, spatialResamplingSupport ? true # spatial sampling (scaling) -, realtimeOnlySupport ? false # build for real-time encoding -, ontheflyBitpackingSupport ? false # on-the-fly bitpacking in real-time encoding -, errorConcealmentSupport ? false # decoder conceals losses -, smallSupport ? false # favor smaller binary over speed -, postprocVisualizerSupport ? false # macro block/block level visualizers -, unitTestsSupport ? false, curl ? null, coreutils ? null # unit tests -, webmIOSupport ? true # input from and output to webm container -, libyuvSupport ? true # libyuv -, decodePerfTestsSupport ? false # build decoder perf tests with unit tests -, encodePerfTestsSupport ? false # build encoder perf tests with unit tests -, multiResEncodingSupport ? false # multiple-resolution encoding -, temporalDenoisingSupport ? true # use temporal denoising instead of spatial denoising -, coefficientRangeCheckingSupport ? false # decoder checks if intermediate transform coefficients are in valid range -, vp9HighbitdepthSupport ? true # 10/12 bit color support in VP9 -# Experimental features -, experimentalSpatialSvcSupport ? false # Spatial scalable video coding -, experimentalFpMbStatsSupport ? false -, experimentalEmulateHardwareSupport ? false -}: - -let - inherit (stdenv) is64bit isMips isDarwin isCygwin; - inherit (lib) enableFeature optional optionals; -in - -assert vp8DecoderSupport || vp8EncoderSupport || vp9DecoderSupport || vp9EncoderSupport; -assert internalStatsSupport && (vp9DecoderSupport || vp9EncoderSupport) -> postprocSupport; -/* If spatialResamplingSupport not enabled, build will fail with undeclared variable errors. - Variables called in vpx_scale/generic/vpx_scale.c are declared by vpx_scale/vpx_scale_rtcd.pl, - but is only executed if spatialResamplingSupport is enabled */ -assert spatialResamplingSupport; -assert postprocVisualizerSupport -> postprocSupport; -assert unitTestsSupport -> curl != null && coreutils != null; -assert vp9HighbitdepthSupport -> (vp9DecoderSupport || vp9EncoderSupport); -assert isCygwin -> unitTestsSupport && webmIOSupport && libyuvSupport; - -stdenv.mkDerivation rec { - pname = "libvpx"; - version = "1.8.2"; - - src = fetchFromGitHub { - owner = "webmproject"; - repo = "libvpx"; - rev = "v${version}"; - sha256 = "0gyq4fkbd2fv7m1mm9xrvn6rk6f4jsmbv8bnlhingmnrvyncnmnr"; - }; - - patches = [ -# ./CVE-2019-9232.CVE-2019-9325.CVE-2019-9371.CVE-2019-9433.patch - ]; - - postPatch = '' - patchShebangs --build \ - build/make/*.sh \ - build/make/*.pl \ - build/make/*.pm \ - test/*.sh \ - configure - ''; - - outputs = [ "bin" "dev" "out" ]; - setOutputFlags = false; - - configurePlatforms = []; - configureFlags = [ - (enableFeature (vp8EncoderSupport || vp8DecoderSupport) "vp8") - (enableFeature vp8EncoderSupport "vp8-encoder") - (enableFeature vp8DecoderSupport "vp8-decoder") - (enableFeature (vp9EncoderSupport || vp9DecoderSupport) "vp9") - (enableFeature vp9EncoderSupport "vp9-encoder") - (enableFeature vp9DecoderSupport "vp9-decoder") - (enableFeature extraWarningsSupport "extra-warnings") - (enableFeature werrorSupport "werror") - "--disable-install-docs" - (enableFeature examplesSupport "install-bins") - "--enable-install-libs" - "--disable-install-srcs" - (enableFeature debugSupport "debug") - (enableFeature gprofSupport "gprof") - (enableFeature gcovSupport "gcov") - # Required to build shared libraries - (enableFeature (!isCygwin) "pic") - (enableFeature optimizationsSupport "optimizations") - (enableFeature runtimeCpuDetectSupport "runtime-cpu-detect") - (enableFeature thumbSupport "thumb") - "--enable-libs" - (enableFeature examplesSupport "examples") - "--disable-docs" - "--as=yasm" - # Limit default decoder max to WHXGA - (if sizeLimitSupport then "--size-limit=5120x3200" else null) - "--disable-codec-srcs" - (enableFeature debugLibsSupport "debug-libs") - (enableFeature isMips "dequant-tokens") - (enableFeature isMips "dc-recon") - (enableFeature postprocSupport "postproc") - (enableFeature (postprocSupport && (vp9DecoderSupport || vp9EncoderSupport)) "vp9-postproc") - (enableFeature multithreadSupport "multithread") - (enableFeature internalStatsSupport "internal-stats") - (enableFeature spatialResamplingSupport "spatial-resampling") - (enableFeature realtimeOnlySupport "realtime-only") - (enableFeature ontheflyBitpackingSupport "onthefly-bitpacking") - (enableFeature errorConcealmentSupport "error-concealment") - # Shared libraries are only supported on ELF platforms - (if isDarwin || isCygwin then - "--enable-static --disable-shared" - else - "--enable-shared") - (enableFeature smallSupport "small") - (enableFeature postprocVisualizerSupport "postproc-visualizer") - (enableFeature unitTestsSupport "unit-tests") - (enableFeature webmIOSupport "webm-io") - (enableFeature libyuvSupport "libyuv") - (enableFeature decodePerfTestsSupport "decode-perf-tests") - (enableFeature encodePerfTestsSupport "encode-perf-tests") - (enableFeature multiResEncodingSupport "multi-res-encoding") - (enableFeature temporalDenoisingSupport "temporal-denoising") - (enableFeature (temporalDenoisingSupport && (vp9DecoderSupport || vp9EncoderSupport)) "vp9-temporal-denoising") - (enableFeature coefficientRangeCheckingSupport "coefficient-range-checking") - (enableFeature (vp9HighbitdepthSupport && is64bit) "vp9-highbitdepth") - (enableFeature (experimentalSpatialSvcSupport || - experimentalFpMbStatsSupport || - experimentalEmulateHardwareSupport) "experimental") - ] ++ optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ - "--enable-external-build" - # libvpx darwin targets include darwin version (ie. ARCH-darwinXX-gcc, XX being the darwin version) - # See all_platforms: https://github.com/webmproject/libvpx/blob/master/configure - # Darwin versions: 10.4=8, 10.5=9, 10.6=10, 10.7=11, 10.8=12, 10.9=13, 10.10=14 - "--force-target=${stdenv.hostPlatform.config}${ - if stdenv.hostPlatform.isDarwin then - if stdenv.hostPlatform.osxMinVersion == "10.10" then "14" - else if stdenv.hostPlatform.osxMinVersion == "10.9" then "13" - else if stdenv.hostPlatform.osxMinVersion == "10.8" then "12" - else if stdenv.hostPlatform.osxMinVersion == "10.7" then "11" - else if stdenv.hostPlatform.osxMinVersion == "10.6" then "10" - else if stdenv.hostPlatform.osxMinVersion == "10.5" then "9" - else "8" - else ""}-gcc" - (lib.optionalString stdenv.hostPlatform.isCygwin "--enable-static-msvcrt") - ] # Experimental features - ++ optional experimentalSpatialSvcSupport "--enable-spatial-svc" - ++ optional experimentalFpMbStatsSupport "--enable-fp-mb-stats" - ++ optional experimentalEmulateHardwareSupport "--enable-emulate-hardware"; - - nativeBuildInputs = [ perl yasm ]; - - buildInputs = [ ] - ++ optionals unitTestsSupport [ coreutils curl ]; - - NIX_LDFLAGS = [ - "-lpthread" # fixes linker errors - ]; - - enableParallelBuilding = true; - - postInstall = ''moveToOutput bin "$bin" ''; - - meta = with lib; { - description = "WebM VP8/VP9 codec SDK"; - homepage = "https://www.webmproject.org/"; - license = licenses.bsd3; - maintainers = with maintainers; [ codyopel ]; - platforms = platforms.all; - }; -} diff --git a/pkgs/development/libraries/multipart-parser-c/default.nix b/pkgs/development/libraries/multipart-parser-c/default.nix index 89665f2efc9a..ef4834b8c005 100644 --- a/pkgs/development/libraries/multipart-parser-c/default.nix +++ b/pkgs/development/libraries/multipart-parser-c/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { ''; meta = { - description = "Http multipart parser implemented in C "; + description = "Http multipart parser implemented in C"; homepage = "https://github.com/iafonov/multipart-parser-c"; license = [ lib.licenses.mit ]; }; diff --git a/pkgs/development/libraries/nss/latest.nix b/pkgs/development/libraries/nss/latest.nix index a28a1e26deb6..1bc691bde713 100644 --- a/pkgs/development/libraries/nss/latest.nix +++ b/pkgs/development/libraries/nss/latest.nix @@ -5,6 +5,6 @@ # Example: nix-shell ./maintainers/scripts/update.nix --argstr package cacert import ./generic.nix { - version = "3.102"; - hash = "sha256-Dl04bPMH7/IFyKktD6Ql9XZZRCnIoq7P+30Qo8j0eBQ="; + version = "3.102.1"; + hash = "sha256-rHPDPLSatEk1ZVvtEM/Ct1V5MFpCiW9kwSBQzSz0lak="; } diff --git a/pkgs/development/libraries/parson/default.nix b/pkgs/development/libraries/parson/default.nix index 3ee5c73290a1..4bdee532eea8 100644 --- a/pkgs/development/libraries/parson/default.nix +++ b/pkgs/development/libraries/parson/default.nix @@ -13,11 +13,11 @@ stdenv.mkDerivation { nativeBuildInputs = [ meson ninja ]; - meta = with lib; { + meta = { description = "Lightweight JSON library written in C"; homepage = "https://github.com/kgabis/parson"; - license = licenses.mit; - platforms = platforms.all; + license = lib.licenses.mit; + platforms = lib.platforms.all; maintainers = with lib.maintainers; [ sigmanificient ]; }; } diff --git a/pkgs/development/libraries/pkger/default.nix b/pkgs/development/libraries/pkger/default.nix index f2047c82f051..37895fbeed65 100644 --- a/pkgs/development/libraries/pkger/default.nix +++ b/pkgs/development/libraries/pkger/default.nix @@ -20,7 +20,7 @@ buildGoModule rec { doCheck = false; meta = with lib; { - description = "Embed static files in Go binaries (replacement for gobuffalo/packr) "; + description = "Embed static files in Go binaries (replacement for gobuffalo/packr)"; mainProgram = "pkger"; homepage = "https://github.com/markbates/pkger"; changelog = "https://github.com/markbates/pkger/releases/tag/v${version}"; diff --git a/pkgs/development/libraries/qt-5/modules/qtdeclarative.nix b/pkgs/development/libraries/qt-5/modules/qtdeclarative.nix index fe548129b3fb..39a6b84bf238 100644 --- a/pkgs/development/libraries/qt-5/modules/qtdeclarative.nix +++ b/pkgs/development/libraries/qt-5/modules/qtdeclarative.nix @@ -1,5 +1,4 @@ -{ lib -, qtModule, python3, qtbase, qtsvg }: +{ qtModule, python3, qtbase, qtsvg }: qtModule { pname = "qtdeclarative"; diff --git a/pkgs/development/libraries/rocksdb/default.nix b/pkgs/development/libraries/rocksdb/default.nix index df0c670828a4..b8b30e585f6e 100644 --- a/pkgs/development/libraries/rocksdb/default.nix +++ b/pkgs/development/libraries/rocksdb/default.nix @@ -19,13 +19,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "rocksdb"; - version = "9.3.1"; + version = "9.4.0"; src = fetchFromGitHub { owner = "facebook"; repo = "rocksdb"; rev = "v${finalAttrs.version}"; - hash = "sha256-bTUzh7ch14TDcm6GkfhA5I/qUVmUm+RE5d2HMZ3zaNc="; + hash = "sha256-eABOzOuaSMAipX8yuXDfZPTHDyIInyPzreE42MwAcYg="; }; patches = lib.optional (lib.versionAtLeast finalAttrs.version "6.29.3" && enableLiburing) ./fix-findliburing.patch; diff --git a/pkgs/development/libraries/tk/8.6.nix b/pkgs/development/libraries/tk/8.6.nix index 75e58dcff799..c8f4efa7f7ac 100644 --- a/pkgs/development/libraries/tk/8.6.nix +++ b/pkgs/development/libraries/tk/8.6.nix @@ -1,5 +1,4 @@ -{ lib -, callPackage +{ callPackage , fetchurl , tcl , ... diff --git a/pkgs/development/lua-modules/generated-packages.nix b/pkgs/development/lua-modules/generated-packages.nix index 1be8b965da14..b19c2f826eab 100644 --- a/pkgs/development/lua-modules/generated-packages.nix +++ b/pkgs/development/lua-modules/generated-packages.nix @@ -2973,14 +2973,14 @@ buildLuarocksPackage { rustaceanvim = callPackage({ buildLuarocksPackage, fetchurl, fetchzip, luaOlder }: buildLuarocksPackage { pname = "rustaceanvim"; - version = "4.25.1-1"; + version = "5.0.0-1"; knownRockspec = (fetchurl { - url = "mirror://luarocks/rustaceanvim-4.25.1-1.rockspec"; - sha256 = "1lrjybnicbyl9rh0qcp846s6b57gryca0fw719c8h8pasb9kf1m0"; + url = "mirror://luarocks/rustaceanvim-5.0.0-1.rockspec"; + sha256 = "0rabhsya9qx4lybd47b6s95yh6y7nnngpfpqxf2h8pf492790yxc"; }).outPath; src = fetchzip { - url = "https://github.com/mrcjkb/rustaceanvim/archive/4.25.1.zip"; - sha256 = "1rym8n7595inb9zdrmw7jwp5iy5r28b7mfjs4k2mvmlby9fxcmz0"; + url = "https://github.com/mrcjkb/rustaceanvim/archive/5.0.0.zip"; + sha256 = "07a0r6lhwxsk3asrnwmj39j51kqaz33qi3kv9788nms3mpvplxc1"; }; disabled = luaOlder "5.1"; diff --git a/pkgs/development/lua-modules/overrides.nix b/pkgs/development/lua-modules/overrides.nix index 99fe9217c960..1c9352ae1b2a 100644 --- a/pkgs/development/lua-modules/overrides.nix +++ b/pkgs/development/lua-modules/overrides.nix @@ -745,6 +745,16 @@ in }; })) {}; + rustaceanvim = prev.rustaceanvim.overrideAttrs(oa: { + doCheck = lua.luaversion == "5.1"; + nativeCheckInputs = [ final.nlua final.busted ]; + checkPhase = '' + runHook preCheck + export HOME=$(mktemp -d) + busted --lua=nlua + runHook postCheck + ''; + }); sqlite = prev.sqlite.overrideAttrs (drv: { diff --git a/pkgs/development/misc/loc/default.nix b/pkgs/development/misc/loc/default.nix index 23453e92e7f8..11375b48fe8e 100644 --- a/pkgs/development/misc/loc/default.nix +++ b/pkgs/development/misc/loc/default.nix @@ -13,13 +13,13 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "1qfqhqimp56g34bir30zgl273yssrbmwf1h8h8yvdpzkybpd92gx"; - meta = with lib; { + meta = { homepage = "https://github.com/cgag/loc"; description = "Count lines of code quickly"; mainProgram = "loc"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ sigmanificient ]; - platforms = platforms.unix; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/development/node-packages/overrides.nix b/pkgs/development/node-packages/overrides.nix index 4e256fb859a8..dc66c53123a4 100644 --- a/pkgs/development/node-packages/overrides.nix +++ b/pkgs/development/node-packages/overrides.nix @@ -204,6 +204,11 @@ final: prev: { url = "https://github.com/svanderburg/node2nix/commit/3b63e735458947ef39aca247923f8775633363e5.patch"; hash = "sha256-pe8Xm4mjPh9oKXugoMY6pRl8YYgtdw0sRXN+TienalU="; }) + # Use top-level cctools in generated files - PR svanderburg/node2nix#334 + (fetchpatch { + url = "https://github.com/svanderburg/node2nix/commit/31c308bba5f39ea0105f66b9f40dbe57fed7a292.patch"; + hash = "sha256-DdNRteonMvyffPh0uo0lUbsohKYnyqv0QcD9vjN6aXE="; + }) ]; in '' ${lib.concatStringsSep "\n" (map (patch: "patch -d $out/lib/node_modules/node2nix -p1 < ${patch}") patches)} diff --git a/pkgs/development/ocaml-modules/ipaddr/default.nix b/pkgs/development/ocaml-modules/ipaddr/default.nix index d579c22de134..b30da4c5aaa0 100644 --- a/pkgs/development/ocaml-modules/ipaddr/default.nix +++ b/pkgs/development/ocaml-modules/ipaddr/default.nix @@ -17,7 +17,7 @@ buildDunePackage rec { doCheck = true; meta = macaddr.meta // { - description = "Library for manipulation of IP (and MAC) address representations "; + description = "Library for manipulation of IP (and MAC) address representations"; maintainers = with lib.maintainers; [ alexfmpe ericbmerritt ]; }; } diff --git a/pkgs/development/ocaml-modules/metadata/default.nix b/pkgs/development/ocaml-modules/metadata/default.nix index 9a8414de75d4..4fc86d119470 100644 --- a/pkgs/development/ocaml-modules/metadata/default.nix +++ b/pkgs/development/ocaml-modules/metadata/default.nix @@ -15,7 +15,7 @@ buildDunePackage rec { meta = with lib; { homepage = "https://github.com/savonet/ocaml-metadata"; - description = "Library to read metadata from files in various formats. "; + description = "Library to read metadata from files in various formats."; license = licenses.gpl3Plus; maintainers = with maintainers; [ dandellion ]; }; diff --git a/pkgs/development/ocaml-modules/msgpck/default.nix b/pkgs/development/ocaml-modules/msgpck/default.nix index 2871e774f3fe..a766f2491366 100644 --- a/pkgs/development/ocaml-modules/msgpck/default.nix +++ b/pkgs/development/ocaml-modules/msgpck/default.nix @@ -23,7 +23,7 @@ buildDunePackage rec { doCheck = true; meta = { - description = "Fast MessagePack (http://msgpack.org) library "; + description = "Fast MessagePack (http://msgpack.org) library"; license = lib.licenses.isc; homepage = "https://github.com/vbmithr/ocaml-msgpck"; maintainers = [ lib.maintainers.ulrikstrid ]; diff --git a/pkgs/development/ocaml-modules/ocaml-print-intf/default.nix b/pkgs/development/ocaml-modules/ocaml-print-intf/default.nix index 5180b58601af..21add50c6061 100644 --- a/pkgs/development/ocaml-modules/ocaml-print-intf/default.nix +++ b/pkgs/development/ocaml-modules/ocaml-print-intf/default.nix @@ -23,7 +23,7 @@ buildDunePackage rec { buildInputs = [ dune-build-info bos ]; meta = with lib; { - description = "Pretty print an OCaml cmi/cmt/cmti file in human-readable OCaml signature form "; + description = "Pretty print an OCaml cmi/cmt/cmti file in human-readable OCaml signature form"; homepage = "https://github.com/${author}/${pname}"; license = lib.licenses.isc; maintainers = [ lib.maintainers.nerdypepper ]; diff --git a/pkgs/development/ocaml-modules/ssl/default.nix b/pkgs/development/ocaml-modules/ssl/default.nix index 329dd01f02ea..5d7e3fe2c35f 100644 --- a/pkgs/development/ocaml-modules/ssl/default.nix +++ b/pkgs/development/ocaml-modules/ssl/default.nix @@ -34,7 +34,7 @@ buildDunePackage rec { meta = { homepage = "http://savonet.rastageeks.org/"; - description = "OCaml bindings for libssl "; + description = "OCaml bindings for libssl"; license = "LGPL+link exception"; maintainers = with lib.maintainers; [ anmonteiro dandellion maggesi ]; }; diff --git a/pkgs/development/octave-modules/statistics/default.nix b/pkgs/development/octave-modules/statistics/default.nix index 552f7a4f8e37..48fbb9a67c32 100644 --- a/pkgs/development/octave-modules/statistics/default.nix +++ b/pkgs/development/octave-modules/statistics/default.nix @@ -6,13 +6,13 @@ buildOctavePackage rec { pname = "statistics"; - version = "1.6.0"; + version = "1.6.7"; src = fetchFromGitHub { owner = "gnu-octave"; repo = "statistics"; rev = "refs/tags/release-${version}"; - sha256 = "sha256-XJXDiVDg3Nw7a/ih49jtkYRmyvAhTfs3LbBQmw+87oc="; + hash = "sha256-cXAjUiv4xWPrWf7HQg9Y+JkR7ON9iefKFUGbEr9FGNA="; }; requiredOctavePackages = [ @@ -20,9 +20,9 @@ buildOctavePackage rec { ]; meta = with lib; { - homepage = "https://octave.sourceforge.io/statistics/index.html"; + homepage = "https://packages.octave.org/statistics"; license = with licenses; [ gpl3Plus publicDomain ]; maintainers = with maintainers; [ KarlJoad ]; - description = "Additional statistics functions for Octave"; + description = "Statistics package for GNU Octave"; }; } diff --git a/pkgs/development/php-packages/phan/default.nix b/pkgs/development/php-packages/phan/default.nix index af95847c37bf..bfa5b81aa1b1 100644 --- a/pkgs/development/php-packages/phan/default.nix +++ b/pkgs/development/php-packages/phan/default.nix @@ -7,13 +7,13 @@ (php.withExtensions ({ enabled, all }: enabled ++ (with all; [ ast ]))).buildComposerProject (finalAttrs: { pname = "phan"; - version = "5.4.3"; + version = "5.4.4"; src = fetchFromGitHub { owner = "phan"; repo = "phan"; rev = finalAttrs.version; - hash = "sha256-O0dtnDsz6X99B99VbRQf3Wr/xJfsJqd+2l5Z5iWxHyU="; + hash = "sha256-9kHTDuCvh0qV6Av6uLD0t4vJO5XLL9dgRAgaREsV7zM="; }; vendorHash = "sha256-yE85MBseJa0VGV5EbjT0te4QT3697YvtumGkMMfZtxI="; diff --git a/pkgs/development/python-modules/autotrash/default.nix b/pkgs/development/python-modules/autotrash/default.nix index 1d0e28405c93..6c628b392535 100644 --- a/pkgs/development/python-modules/autotrash/default.nix +++ b/pkgs/development/python-modules/autotrash/default.nix @@ -23,11 +23,11 @@ buildPythonPackage rec { pythonImportsCheck = [ "autotrash" ]; nativeCheckInputs = [ pytestCheckHook ]; - meta = with lib; { + meta = { description = "Tool to automatically purge old trashed files"; - license = licenses.gpl3Plus; + license = lib.licenses.gpl3Plus; homepage = "https://bneijt.nl/pr/autotrash"; - maintainers = with maintainers; [ sigmanificient ]; + maintainers = with lib.maintainers; [ sigmanificient ]; mainProgram = "autotrash"; }; } diff --git a/pkgs/development/python-modules/ax/default.nix b/pkgs/development/python-modules/ax/default.nix index dddcc6e1ebeb..7b3cc8f2b1c2 100644 --- a/pkgs/development/python-modules/ax/default.nix +++ b/pkgs/development/python-modules/ax/default.nix @@ -49,6 +49,8 @@ buildPythonPackage rec { pyre-extensions ]; + env.ALLOW_BOTORCH_LATEST = "1"; + checkInputs = [ hypothesis mercurial diff --git a/pkgs/development/python-modules/azure-monitor-query/default.nix b/pkgs/development/python-modules/azure-monitor-query/default.nix index 775bb82180e3..f4d0870e8180 100644 --- a/pkgs/development/python-modules/azure-monitor-query/default.nix +++ b/pkgs/development/python-modules/azure-monitor-query/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "azure-monitor-query"; - version = "1.3.0"; + version = "1.4.0"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-629Un2FJr0SExRq/m7tmEjn1eBRfi+9lSFWXbu9CL+Y="; + hash = "sha256-aZxvPFlC8J2pjO8nP/u3QDkE7EP5PA1j8Qo2e0R54Ak="; }; nativeBuildInputs = [ setuptools ]; diff --git a/pkgs/development/python-modules/barectf/default.nix b/pkgs/development/python-modules/barectf/default.nix index 532228c31e4f..968570904067 100644 --- a/pkgs/development/python-modules/barectf/default.nix +++ b/pkgs/development/python-modules/barectf/default.nix @@ -46,7 +46,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytest7CheckHook ]; meta = with lib; { - description = "Generator of ANSI C tracers which output CTF data streams "; + description = "Generator of ANSI C tracers which output CTF data streams"; mainProgram = "barectf"; homepage = "https://github.com/efficios/barectf"; license = licenses.mit; diff --git a/pkgs/development/python-modules/beaker/default.nix b/pkgs/development/python-modules/beaker/default.nix index a369c25e8970..dedbba874d1f 100644 --- a/pkgs/development/python-modules/beaker/default.nix +++ b/pkgs/development/python-modules/beaker/default.nix @@ -1,10 +1,8 @@ { - stdenv, lib, buildPythonPackage, fetchFromGitHub, glibcLocales, - nose, pylibmc, python-memcached, redis, @@ -15,7 +13,8 @@ pycrypto, cryptography, isPy27, - isPy3k, + pytestCheckHook, + setuptools, funcsigs ? null, pycryptopp ? null, }: @@ -23,16 +22,19 @@ buildPythonPackage rec { pname = "beaker"; version = "1.13.0"; + pyproject = true; # The pypy release do not contains the tests src = fetchFromGitHub { owner = "bbangert"; repo = "beaker"; rev = "refs/tags/${version}"; - sha256 = "sha256-HzjhOPXElwKoJLrhGIbVn798tbX/kaS1EpQIX+vXCtE="; + hash = "sha256-HzjhOPXElwKoJLrhGIbVn798tbX/kaS1EpQIX+vXCtE="; }; - propagatedBuildInputs = + build-system = [ setuptools ]; + + dependencies = [ sqlalchemy pycrypto @@ -47,29 +49,19 @@ buildPythonPackage rec { glibcLocales python-memcached mock - nose pylibmc pymongo redis webtest + pytestCheckHook ]; - # Can not run memcached tests because it immediately tries to connect - postPatch = '' - rm tests/test_memcached.py - ''; - + # Can not run memcached tests because it immediately tries to connect. # Disable external tests because they need to connect to a live database. - # Also disable a test in test_cache.py called "test_upgrade" because - # it currently fails on darwin. - # Please see issue https://github.com/bbangert/beaker/issues/166 - checkPhase = '' - nosetests \ - -e ".*test_ext_.*" \ - -e "test_upgrade" \ - ${lib.optionalString (!stdenv.isLinux) ''-e "test_cookie_expires_different_locale"''} \ - -vv tests - ''; + pytestFlagsArray = [ + "--ignore=tests/test_memcached.py" + "--ignore-glob='tests/test_managers/test_ext_*'" + ]; meta = { description = "Session and Caching library with WSGI Middleware"; diff --git a/pkgs/development/python-modules/bootstrap/build/default.nix b/pkgs/development/python-modules/bootstrap/build/default.nix index 2101ee06c6bb..0d693e2dde58 100644 --- a/pkgs/development/python-modules/bootstrap/build/default.nix +++ b/pkgs/development/python-modules/bootstrap/build/default.nix @@ -1,5 +1,4 @@ { - lib, stdenv, python, build, diff --git a/pkgs/development/python-modules/bootstrap/flit-core/default.nix b/pkgs/development/python-modules/bootstrap/flit-core/default.nix index d348b1f877c8..bdd4a0f535ff 100644 --- a/pkgs/development/python-modules/bootstrap/flit-core/default.nix +++ b/pkgs/development/python-modules/bootstrap/flit-core/default.nix @@ -1,5 +1,4 @@ { - lib, stdenv, python, flit-core, diff --git a/pkgs/development/python-modules/bootstrap/installer/default.nix b/pkgs/development/python-modules/bootstrap/installer/default.nix index 454ec2a239a1..9f396bb6275a 100644 --- a/pkgs/development/python-modules/bootstrap/installer/default.nix +++ b/pkgs/development/python-modules/bootstrap/installer/default.nix @@ -1,5 +1,4 @@ { - lib, stdenv, python, flit-core, diff --git a/pkgs/development/python-modules/botorch/default.nix b/pkgs/development/python-modules/botorch/default.nix index 129facf57de1..06f0922af4b1 100644 --- a/pkgs/development/python-modules/botorch/default.nix +++ b/pkgs/development/python-modules/botorch/default.nix @@ -26,13 +26,13 @@ buildPythonPackage rec { hash = "sha256-YX/G46U09y/VZuWZhKY8zU0Y+bf0NKumzSGYUWvrq/0="; }; - nativeBuildInputs = [ + build-system = [ setuptools setuptools-scm wheel ]; - propagatedBuildInputs = [ + dependenciess = [ gpytorch linear-operator multipledispatch @@ -41,9 +41,13 @@ buildPythonPackage rec { torch ]; - pythonRelaxDeps = [ "linear-operator" ]; + pythonRelaxDeps = [ + "gpytorch" + "linear-operator" + ]; + + nativeCheckInputs = [ pytestCheckHook ]; - checkInputs = [ pytestCheckHook ]; pythonImportsCheck = [ "botorch" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/braintree/default.nix b/pkgs/development/python-modules/braintree/default.nix index 7791004c1b6a..854f1451c0b1 100644 --- a/pkgs/development/python-modules/braintree/default.nix +++ b/pkgs/development/python-modules/braintree/default.nix @@ -2,44 +2,42 @@ lib, buildPythonPackage, fetchFromGitHub, - nose, pytestCheckHook, - pythonOlder, requests, + setuptools, }: buildPythonPackage rec { pname = "braintree"; - version = "4.14.0"; - format = "setuptools"; - - disabled = pythonOlder "3.7"; + version = "4.29.0"; + pyproject = true; src = fetchFromGitHub { - owner = pname; + owner = "braintree"; repo = "braintree_python"; rev = version; - hash = "sha256-qeqQX+qyy78sLe+46CA4D6VAxNHUVahS4LMYdGDzc2k="; + hash = "sha256-5MF8W2zUVvNiOnmszgJkMDmeYLZ6ppFHqmH6dmlCzQY="; }; - propagatedBuildInputs = [ requests ]; + build-system = [ setuptools ]; - nativeCheckInputs = [ - nose - pytestCheckHook - ]; + dependencies = [ requests ]; + + nativeCheckInputs = [ pytestCheckHook ]; pythonImportsCheck = [ "braintree" ]; - disabledTestPaths = [ - # Don't test integrations - "tests/integration" + pytestFlagsArray = [ + "tests/" + "tests/fixtures" + "tests/unit" + "tests/integration/test_credentials_parser.py" ]; - meta = with lib; { + meta = { description = "Python library for integration with Braintree"; homepage = "https://github.com/braintree/braintree_python"; - license = licenses.mit; - maintainers = with maintainers; [ ]; + license = lib.licenses.mit; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/cgen/default.nix b/pkgs/development/python-modules/cgen/default.nix index b0e85335e0b8..186422a49c34 100644 --- a/pkgs/development/python-modules/cgen/default.nix +++ b/pkgs/development/python-modules/cgen/default.nix @@ -27,10 +27,10 @@ buildPythonPackage rec { pytest ''; - meta = with lib; { + meta = { description = "C/C++ source generation from an AST"; homepage = "https://github.com/inducer/cgen"; - license = licenses.mit; + license = lib.licenses.mit; maintainers = with lib.maintainers; [ sigmanificient ]; }; } diff --git a/pkgs/development/python-modules/citeproc-py/default.nix b/pkgs/development/python-modules/citeproc-py/default.nix index 3cdb2e6bafe2..6b0fed8e0fb8 100644 --- a/pkgs/development/python-modules/citeproc-py/default.nix +++ b/pkgs/development/python-modules/citeproc-py/default.nix @@ -2,39 +2,41 @@ lib, buildPythonPackage, fetchPypi, - nose, git, lxml, rnc2rng, + pytestCheckHook, + setuptools, }: buildPythonPackage rec { pname = "citeproc-py"; version = "0.6.0"; - format = "setuptools"; + pyproject = true; src = fetchPypi { inherit pname version; - sha256 = "d9e3a224f936fe2e5033b5d9ffdacab769cedb61d96c4e0cf2f0b488f1d24b4e"; + hash = "sha256-2eOiJPk2/i5QM7XZ/9rKt2nO22HZbE4M8vC0iPHSS04="; }; + build-system = [ setuptools ]; + buildInputs = [ rnc2rng ]; - propagatedBuildInputs = [ lxml ]; + dependencies = [ lxml ]; nativeCheckInputs = [ - nose git + pytestCheckHook ]; - checkPhase = "nosetests tests"; - doCheck = false; # seems to want a Git repository, but fetchgit with leaveDotGit also fails + pythonImportsCheck = [ "citeproc" ]; - meta = with lib; { - homepage = "https://github.com/brechtm/citeproc-py"; + meta = { + homepage = "https://github.com/citeproc-py/citeproc-py"; description = "Citation Style Language (CSL) parser for Python"; mainProgram = "csl_unsorted"; - license = licenses.bsd2; - maintainers = with maintainers; [ bcdarwin ]; + license = lib.licenses.bsd2; + maintainers = with lib.maintainers; [ bcdarwin ]; }; } diff --git a/pkgs/development/python-modules/co2signal/default.nix b/pkgs/development/python-modules/co2signal/default.nix index 726e5736a0ea..6db0885e582f 100644 --- a/pkgs/development/python-modules/co2signal/default.nix +++ b/pkgs/development/python-modules/co2signal/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "CO2Signal" ]; meta = with lib; { - description = "Package to access the CO2 Signal API "; + description = "Package to access the CO2 Signal API"; homepage = "https://github.com/danielsjf/CO2Signal"; license = licenses.gpl3Only; maintainers = with maintainers; [ plabadens ]; diff --git a/pkgs/development/python-modules/cohere/default.nix b/pkgs/development/python-modules/cohere/default.nix index a63d570da48a..fb766bdb51ed 100644 --- a/pkgs/development/python-modules/cohere/default.nix +++ b/pkgs/development/python-modules/cohere/default.nix @@ -14,6 +14,7 @@ httpx-sse, parameterized, pydantic, + pydantic-core, requests, tokenizers, types-requests, @@ -22,7 +23,7 @@ buildPythonPackage rec { pname = "cohere"; - version = "5.6.2"; + version = "5.7.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -31,7 +32,7 @@ buildPythonPackage rec { owner = "cohere-ai"; repo = "cohere-python"; rev = "refs/tags/${version}"; - hash = "sha256-NnEjW4zDVaU87Sm1t7DM7QPbcpAf7X9MGkV346Bb4Xk="; + hash = "sha256-j8X+DLE6DOxaKoZC1J8eAWZUr3XsfY6RZMKrmJqQ6dw="; }; build-system = [ poetry-core ]; @@ -43,6 +44,7 @@ buildPythonPackage rec { httpx-sse parameterized pydantic + pydantic-core requests tokenizers types-requests diff --git a/pkgs/development/python-modules/colorspacious/default.nix b/pkgs/development/python-modules/colorspacious/default.nix index 6e0762a814e0..53ca726357d4 100644 --- a/pkgs/development/python-modules/colorspacious/default.nix +++ b/pkgs/development/python-modules/colorspacious/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { meta = { homepage = "https://github.com/njsmith/colorspacious"; - description = "Powerful, accurate, and easy-to-use Python library for doing colorspace conversions "; + description = "Powerful, accurate, and easy-to-use Python library for doing colorspace conversions"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ tbenst ]; }; diff --git a/pkgs/development/python-modules/crossandra/default.nix b/pkgs/development/python-modules/crossandra/default.nix index 423ee0aa3fc8..c7400b62f53a 100644 --- a/pkgs/development/python-modules/crossandra/default.nix +++ b/pkgs/development/python-modules/crossandra/default.nix @@ -29,11 +29,11 @@ buildPythonPackage rec { --replace-fail "result ~= 0.9.0" "result >= 0.9.0" ''; - meta = with lib; { + meta = { changelog = "https://github.com/trag1c/crossandra/blob/${src.rev}/CHANGELOG.md"; description = "Fast and simple enum/regex-based tokenizer with decent configurability"; - license = licenses.mit; + license = lib.licenses.mit; homepage = "https://trag1c.github.io/crossandra"; - maintainers = with maintainers; [ sigmanificient ]; + maintainers = with lib.maintainers; [ sigmanificient ]; }; } diff --git a/pkgs/development/python-modules/curl-cffi/default.nix b/pkgs/development/python-modules/curl-cffi/default.nix index 82a521898a63..28f8eb2da729 100644 --- a/pkgs/development/python-modules/curl-cffi/default.nix +++ b/pkgs/development/python-modules/curl-cffi/default.nix @@ -10,13 +10,13 @@ buildPythonPackage rec { pname = "curl-cffi"; - version = "0.7.0b4"; + version = "0.7.1"; src = fetchFromGitHub { owner = "yifeikong"; repo = "curl_cffi"; rev = "refs/tags/v${version}"; - hash = "sha256-txrJNUzswAPeH4Iazn0iKJI0Rqk0HHRoDrtTfDHKMoo="; + hash = "sha256-fVmZ5DKgkjnO1CPYVSa9qei26B0mXqZMtVGhtNGfEpY="; }; patches = [ ./use-system-libs.patch ]; diff --git a/pkgs/development/python-modules/cxxfilt/default.nix b/pkgs/development/python-modules/cxxfilt/default.nix index 2d09a5006d4c..e82f5c6e880e 100644 --- a/pkgs/development/python-modules/cxxfilt/default.nix +++ b/pkgs/development/python-modules/cxxfilt/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "cxxfilt" ]; meta = with lib; { - description = "Demangling C++ symbols in Python / interface to abi::__cxa_demangle "; + description = "Demangling C++ symbols in Python / interface to abi::__cxa_demangle"; homepage = "https://github.com/afq984/python-cxxfilt"; license = licenses.bsd2; maintainers = [ ]; diff --git a/pkgs/development/python-modules/dahlia/default.nix b/pkgs/development/python-modules/dahlia/default.nix index 3cb8900d3acb..6762d6e666ab 100644 --- a/pkgs/development/python-modules/dahlia/default.nix +++ b/pkgs/development/python-modules/dahlia/default.nix @@ -20,12 +20,12 @@ buildPythonPackage rec { build-system = [ poetry-core ]; pythonImportsCheck = [ "dahlia" ]; - meta = with lib; { + meta = { changelog = "https://github.com/dahlia-lib/dahlia/blob/${src.rev}/CHANGELOG.md"; description = "Simple text formatting package, inspired by the game Minecraft"; - license = licenses.mit; + license = lib.licenses.mit; homepage = "https://github.com/dahlia-lib/dahlia"; - maintainers = with maintainers; [ sigmanificient ]; + maintainers = with lib.maintainers; [ sigmanificient ]; mainProgram = "dahlia"; }; } diff --git a/pkgs/development/python-modules/deltachat/default.nix b/pkgs/development/python-modules/deltachat/default.nix index 2ea42160a892..964921eda9f4 100644 --- a/pkgs/development/python-modules/deltachat/default.nix +++ b/pkgs/development/python-modules/deltachat/default.nix @@ -1,5 +1,4 @@ { - lib, buildPythonPackage, pythonOlder, pkg-config, diff --git a/pkgs/development/python-modules/djangorestframework-recursive/default.nix b/pkgs/development/python-modules/djangorestframework-recursive/default.nix index 909a1d167d29..cc75d77a4839 100644 --- a/pkgs/development/python-modules/djangorestframework-recursive/default.nix +++ b/pkgs/development/python-modules/djangorestframework-recursive/default.nix @@ -29,7 +29,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "rest_framework_recursive" ]; meta = with lib; { - description = " Recursive Serialization for Django REST framework "; + description = " Recursive Serialization for Django REST framework"; homepage = "https://github.com/heywbj/django-rest-framework-recursive"; license = licenses.isc; maintainers = with maintainers; [ ]; diff --git a/pkgs/development/python-modules/edlib/default.nix b/pkgs/development/python-modules/edlib/default.nix index 64f9f96db407..5a16cd6e023f 100644 --- a/pkgs/development/python-modules/edlib/default.nix +++ b/pkgs/development/python-modules/edlib/default.nix @@ -1,5 +1,4 @@ { - lib, buildPythonPackage, pythonOlder, edlib, diff --git a/pkgs/development/python-modules/eduvpn-common/default.nix b/pkgs/development/python-modules/eduvpn-common/default.nix index 8c17edcf2df6..9d2bfda4ee8d 100644 --- a/pkgs/development/python-modules/eduvpn-common/default.nix +++ b/pkgs/development/python-modules/eduvpn-common/default.nix @@ -1,7 +1,5 @@ { - lib, buildPythonPackage, - callPackage, libeduvpn-common, selenium, setuptools, diff --git a/pkgs/development/python-modules/gcovr/default.nix b/pkgs/development/python-modules/gcovr/default.nix index 5bf66cdb2419..c6ec91b5946b 100644 --- a/pkgs/development/python-modules/gcovr/default.nix +++ b/pkgs/development/python-modules/gcovr/default.nix @@ -39,12 +39,12 @@ buildPythonPackage rec { "gcovr.configuration" ]; - meta = with lib; { + meta = { description = "Python script for summarizing gcov data"; mainProgram = "gcovr"; homepage = "https://www.gcovr.com/"; changelog = "https://github.com/gcovr/gcovr/blob/${version}/CHANGELOG.rst"; - license = licenses.bsd0; - maintainers = with maintainers; [ sigmanificient ]; + license = lib.licenses.bsd0; + maintainers = with lib.maintainers; [ sigmanificient ]; }; } diff --git a/pkgs/development/python-modules/glob2/default.nix b/pkgs/development/python-modules/glob2/default.nix index 2dcae7a38566..6ceaca44406b 100644 --- a/pkgs/development/python-modules/glob2/default.nix +++ b/pkgs/development/python-modules/glob2/default.nix @@ -19,10 +19,10 @@ buildPythonPackage rec { ${python.interpreter} test.py ''; - meta = with lib; { + meta = { description = "Version of the glob module that can capture patterns and supports recursive wildcards"; homepage = "https://github.com/miracle2k/python-glob2/"; - license = licenses.bsd3; + license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ sigmanificient ]; }; } diff --git a/pkgs/development/python-modules/hikari-crescent/default.nix b/pkgs/development/python-modules/hikari-crescent/default.nix index 89f78ff0770b..3d450a68de13 100644 --- a/pkgs/development/python-modules/hikari-crescent/default.nix +++ b/pkgs/development/python-modules/hikari-crescent/default.nix @@ -49,11 +49,11 @@ buildPythonPackage rec { disabledTests = [ "test_handle_resp" ]; - meta = with lib; { + meta = { description = "A command handler for Hikari that keeps your project neat and tidy"; - license = licenses.mit; + license = lib.licenses.mit; homepage = "https://github.com/hikari-crescent/hikari-crescent"; - maintainers = with maintainers; [ sigmanificient ]; + maintainers = with lib.maintainers; [ sigmanificient ]; mainProgram = "hikari-crescent"; }; } diff --git a/pkgs/development/python-modules/hikari/default.nix b/pkgs/development/python-modules/hikari/default.nix index ad275e5e3800..026176e7a7b8 100644 --- a/pkgs/development/python-modules/hikari/default.nix +++ b/pkgs/development/python-modules/hikari/default.nix @@ -68,11 +68,11 @@ buildPythonPackage rec { --replace-fail "__git_sha1__: typing.Final[str] = \"HEAD\"" "__git_sha1__: typing.Final[str] = \"$(cat $src/COMMIT)\"" ''; - meta = with lib; { + meta = { description = "Discord API wrapper for Python written with asyncio"; homepage = "https://www.hikari-py.dev/"; changelog = "https://github.com/hikari-py/hikari/releases/tag/${version}"; - license = licenses.mit; - maintainers = with maintainers; [ tomodachi94 sigmanificient ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ tomodachi94 sigmanificient ]; }; } diff --git a/pkgs/development/python-modules/horizon-eda/default.nix b/pkgs/development/python-modules/horizon-eda/default.nix index dc0a91b6d757..2741dbc3675a 100644 --- a/pkgs/development/python-modules/horizon-eda/default.nix +++ b/pkgs/development/python-modules/horizon-eda/default.nix @@ -1,7 +1,5 @@ { - lib, buildPythonPackage, - callPackage, horizon-eda, mesa, pycairo, diff --git a/pkgs/development/python-modules/inflect/default.nix b/pkgs/development/python-modules/inflect/default.nix index 36e0d96f9782..50d7deb1660b 100644 --- a/pkgs/development/python-modules/inflect/default.nix +++ b/pkgs/development/python-modules/inflect/default.nix @@ -3,10 +3,17 @@ buildPythonPackage, pythonOlder, fetchFromGitHub, - more-itertools, + + # build-system + setuptools, setuptools-scm, - pytestCheckHook, + + # dependencies + more-itertools, typeguard, + + # checks + pytestCheckHook, }: buildPythonPackage rec { @@ -23,7 +30,10 @@ buildPythonPackage rec { hash = "sha256-J0XgSKPzZIt/7WnMGARXpyYzagBGiqRiuNmNnGKDBrs="; }; - build-system = [ setuptools-scm ]; + build-system = [ + setuptools + setuptools-scm + ]; dependencies = [ more-itertools @@ -39,11 +49,11 @@ buildPythonPackage rec { pythonImportsCheck = [ "inflect" ]; - meta = with lib; { + meta = { description = "Correctly generate plurals, singular nouns, ordinals, indefinite articles"; homepage = "https://github.com/jaraco/inflect"; changelog = "https://github.com/jaraco/inflect/blob/v${version}/CHANGES.rst"; - license = licenses.mit; - maintainers = teams.tts.members; + license = lib.licenses.mit; + maintainers = lib.teams.tts.members; }; } diff --git a/pkgs/development/python-modules/intbitset/default.nix b/pkgs/development/python-modules/intbitset/default.nix index 09417bc2cc9f..4c3d1d477c5a 100644 --- a/pkgs/development/python-modules/intbitset/default.nix +++ b/pkgs/development/python-modules/intbitset/default.nix @@ -24,11 +24,11 @@ buildPythonPackage rec { pythonImportsCheck = [ "intbitset" ]; - meta = with lib; { + meta = { description = "C-based extension implementing fast integer bit sets"; homepage = "https://github.com/inveniosoftware/intbitset"; changelog = "https://github.com/inveniosoftware-contrib/intbitset/blob/v${version}/CHANGELOG.rst"; - license = licenses.lgpl3Plus; - maintainers = with maintainers; [ sigmanificient ]; + license = lib.licenses.lgpl3Plus; + maintainers = with lib.maintainers; [ sigmanificient ]; }; } diff --git a/pkgs/development/python-modules/ixia/default.nix b/pkgs/development/python-modules/ixia/default.nix index ae07ed052eed..cf9001cb7edb 100644 --- a/pkgs/development/python-modules/ixia/default.nix +++ b/pkgs/development/python-modules/ixia/default.nix @@ -20,11 +20,11 @@ buildPythonPackage rec { build-system = [ poetry-core ]; pythonImportsCheck = [ "ixia" ]; - meta = with lib; { + meta = { changelog = "https://github.com/trag1c/ixia/blob/${src.rev}/CHANGELOG.md"; description = "Connecting secrets' security with random's versatility"; - license = licenses.mit; + license = lib.licenses.mit; homepage = "https://trag1c.github.io/ixia"; - maintainers = with maintainers; [ sigmanificient ]; + maintainers = with lib.maintainers; [ sigmanificient ]; }; } diff --git a/pkgs/development/python-modules/jsonslicer/default.nix b/pkgs/development/python-modules/jsonslicer/default.nix index 4cc5e559aca8..da6f546f2c42 100644 --- a/pkgs/development/python-modules/jsonslicer/default.nix +++ b/pkgs/development/python-modules/jsonslicer/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { buildInputs = [ yajl ]; meta = with lib; { - description = "Stream JSON parser for Python "; + description = "Stream JSON parser for Python"; homepage = "https://github.com/AMDmi3/jsonslicer"; license = licenses.mit; maintainers = with maintainers; [ jopejoe1 ]; diff --git a/pkgs/development/python-modules/jupyter-collaboration/default.nix b/pkgs/development/python-modules/jupyter-collaboration/default.nix index 3c54a2140cab..4e4bfd7b456c 100644 --- a/pkgs/development/python-modules/jupyter-collaboration/default.nix +++ b/pkgs/development/python-modules/jupyter-collaboration/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { pname = "jupyter-collaboration"; - version = "2.1.1"; + version = "2.1.2"; pyproject = true; disabled = pythonOlder "3.8"; @@ -28,7 +28,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "jupyter_collaboration"; inherit version; - hash = "sha256-T1DCXG2BEmwW3q+S0r14o5svy4ZpDc5pa0AGt0DXHB8="; + hash = "sha256-uLbNYzszaSLnU4VcaDr5KBcRN+Xm/B471s+W9qJibsk="; }; postPatch = '' diff --git a/pkgs/development/python-modules/jupyter-server/default.nix b/pkgs/development/python-modules/jupyter-server/default.nix index 7560b4a3c0ae..a367bc3c0f35 100644 --- a/pkgs/development/python-modules/jupyter-server/default.nix +++ b/pkgs/development/python-modules/jupyter-server/default.nix @@ -35,14 +35,14 @@ buildPythonPackage rec { pname = "jupyter-server"; - version = "2.14.1"; + version = "2.14.2"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { pname = "jupyter_server"; inherit version; - hash = "sha256-ElWNFY7HoGU7+WzCcrx6154BJ9UDuYLtFEOZNGaU9yY="; + hash = "sha256-ZglQIaqWOM7SdsJIsdgYYuTFDyktV1kgu+lg3hxWsSs="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/jupyter-ydoc/default.nix b/pkgs/development/python-modules/jupyter-ydoc/default.nix index 7898fa90de2a..41ba6312e405 100644 --- a/pkgs/development/python-modules/jupyter-ydoc/default.nix +++ b/pkgs/development/python-modules/jupyter-ydoc/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "jupyter-ydoc"; - version = "2.0.1"; + version = "2.1.1"; pyproject = true; disabled = pythonOlder "3.7"; @@ -22,7 +22,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "jupyter_ydoc"; inherit version; - hash = "sha256-cW3ajLiviB/sL7yIrqP7DTuyS764Cpmor/LgHQidWw0="; + hash = "sha256-HcvxOGGzZ4AA1pr07zi0njoS+AgbqFHGgDk8Lhi8S4Q="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/jupyterlab-server/default.nix b/pkgs/development/python-modules/jupyterlab-server/default.nix index c7ba03645aa3..2461e5ea0de3 100644 --- a/pkgs/development/python-modules/jupyterlab-server/default.nix +++ b/pkgs/development/python-modules/jupyterlab-server/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { pname = "jupyterlab-server"; - version = "2.27.2"; + version = "2.27.3"; pyproject = true; disabled = pythonOlder "3.8"; @@ -30,7 +30,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "jupyterlab_server"; inherit version; - hash = "sha256-FcuzSdxF6VTgm6z4G5+byxCBX/Zg+yA07NdBfbOn6ic="; + hash = "sha256-6zbKylnnRHGYjwriXHeUVhC4h/d3JVqiH4Bl3vnlHtQ="; }; postPatch = '' diff --git a/pkgs/development/python-modules/jupyterlab/default.nix b/pkgs/development/python-modules/jupyterlab/default.nix index f64f383895ff..ab4c0c705323 100644 --- a/pkgs/development/python-modules/jupyterlab/default.nix +++ b/pkgs/development/python-modules/jupyterlab/default.nix @@ -21,14 +21,14 @@ buildPythonPackage rec { pname = "jupyterlab"; - version = "4.2.3"; + version = "4.2.4"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-325Glp6lHWaBUWfyPZLxBUI7fx8G+mBNT0SusBjILHs="; + hash = "sha256-NDqXn7lYL9CMhRGCPjIHAygc0HKgBJvNr9x6/tp/JTc="; }; build-system = [ diff --git a/pkgs/development/python-modules/labgrid/default.nix b/pkgs/development/python-modules/labgrid/default.nix index 405bbfa33810..b283a72b09ed 100644 --- a/pkgs/development/python-modules/labgrid/default.nix +++ b/pkgs/development/python-modules/labgrid/default.nix @@ -82,6 +82,11 @@ buildPythonPackage rec { pytest-dependency ]; + disabledtests = [ + # flaky, timing sensitive + "test_timing" + ]; + meta = with lib; { description = "Embedded control & testing library"; homepage = "https://labgrid.org"; diff --git a/pkgs/development/python-modules/libsass/default.nix b/pkgs/development/python-modules/libsass/default.nix index 9c59c487d839..acb94983dcf6 100644 --- a/pkgs/development/python-modules/libsass/default.nix +++ b/pkgs/development/python-modules/libsass/default.nix @@ -37,11 +37,11 @@ buildPythonPackage rec { pythonImportsCheck = [ "sass" ]; - meta = with lib; { + meta = { description = "Python binding for libsass to compile Sass/SCSS"; mainProgram = "pysassc"; homepage = "https://sass.github.io/libsass-python/"; - license = licenses.mit; - maintainers = with maintainers; [ sigmanificient ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ sigmanificient ]; }; } diff --git a/pkgs/development/python-modules/lightning-utilities/default.nix b/pkgs/development/python-modules/lightning-utilities/default.nix index c35d839b0600..393a965535e7 100644 --- a/pkgs/development/python-modules/lightning-utilities/default.nix +++ b/pkgs/development/python-modules/lightning-utilities/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "lightning-utilities"; - version = "0.11.5"; + version = "0.11.6"; pyproject = true; disabled = pythonOlder "3.8"; @@ -28,7 +28,7 @@ buildPythonPackage rec { owner = "Lightning-AI"; repo = "utilities"; rev = "refs/tags/v${version}"; - hash = "sha256-Ia+NF9WHU1rJHV/j3tRiqudK3TJNEolNKShFfUehxHU="; + hash = "sha256-Bw28mLz9GaMucqP+EqR1F3OKLxDJiIVacrCBIV35G/I="; }; postPatch = '' diff --git a/pkgs/development/python-modules/linien-common/tests.nix b/pkgs/development/python-modules/linien-common/tests.nix index b070abf40e0d..40a69986187c 100644 --- a/pkgs/development/python-modules/linien-common/tests.nix +++ b/pkgs/development/python-modules/linien-common/tests.nix @@ -1,5 +1,4 @@ { - lib, buildPythonPackage, linien-common, linien-client, diff --git a/pkgs/development/python-modules/llama-index/default.nix b/pkgs/development/python-modules/llama-index/default.nix index 97cfb265396d..e8bc753eb273 100644 --- a/pkgs/development/python-modules/llama-index/default.nix +++ b/pkgs/development/python-modules/llama-index/default.nix @@ -1,5 +1,4 @@ { - lib, buildPythonPackage, poetry-core, llama-index-agent-openai, diff --git a/pkgs/development/python-modules/marimo/default.nix b/pkgs/development/python-modules/marimo/default.nix index ce1d81f684f2..44b702a12711 100644 --- a/pkgs/development/python-modules/marimo/default.nix +++ b/pkgs/development/python-modules/marimo/default.nix @@ -4,15 +4,16 @@ fetchPypi, pythonOlder, setuptools, - black, click, docutils, itsdangerous, jedi, markdown, + packaging, psutil, pygments, pymdown-extensions, + ruff, starlette, tomlkit, uvicorn, @@ -23,28 +24,32 @@ buildPythonPackage rec { pname = "marimo"; - version = "0.7.1"; + version = "0.7.11"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-c+1hiOOWblN0pk+dkIlYm8HqQfHIph0FE5XAQufH86g="; + hash = "sha256-yyz0gCdyMHSCoyaMr+cqW4/kmEmaufAl2PrNVYCovOg="; }; build-system = [ setuptools ]; + # ruff is not packaged as a python module in nixpkgs + pythonRemoveDeps = [ "ruff" ]; + dependencies = [ - black click docutils itsdangerous jedi markdown + packaging psutil pygments pymdown-extensions + ruff starlette tomlkit uvicorn diff --git a/pkgs/development/python-modules/mkdocs-awesome-pages-plugin/default.nix b/pkgs/development/python-modules/mkdocs-awesome-pages-plugin/default.nix index f7bf173400dd..8799dfcd380a 100644 --- a/pkgs/development/python-modules/mkdocs-awesome-pages-plugin/default.nix +++ b/pkgs/development/python-modules/mkdocs-awesome-pages-plugin/default.nix @@ -14,7 +14,7 @@ }: buildPythonPackage rec { pname = "mkdocs-awesome-pages-plugin"; - version = "2.9.2"; + version = "2.9.3"; pyproject = true; disabled = pythonOlder "3.9"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "lukasgeiter"; repo = "mkdocs-awesome-pages-plugin"; rev = "refs/tags/v${version}"; - hash = "sha256-pYyZ84eNrslxgLSBr3teQqmV7hA+LHwJ+Z99QgPdh6U="; + hash = "sha256-jDPoMAJ20n9bQu11CRNvKLQthRUh3+jR6t+fM3+vGzY="; }; propagatedBuildInputs = [ @@ -41,11 +41,6 @@ buildPythonPackage rec { importlib-metadata ]; - disabledTestPaths = [ - # requires "generatedfiles" mkdocs plugin - "mkdocs_awesome_pages_plugin/tests/e2e/test_gen_files.py" - ]; - meta = with lib; { description = "An MkDocs plugin that simplifies configuring page titles and their order"; homepage = "https://github.com/lukasgeiter/mkdocs-awesome-pages-plugin"; diff --git a/pkgs/development/python-modules/moviepy/default.nix b/pkgs/development/python-modules/moviepy/default.nix index 7f1196b461a9..23cc5ba5e485 100644 --- a/pkgs/development/python-modules/moviepy/default.nix +++ b/pkgs/development/python-modules/moviepy/default.nix @@ -16,7 +16,7 @@ scipy, setuptools, tqdm, - youtube-dl, + yt-dlp, }: buildPythonPackage rec { @@ -56,7 +56,7 @@ buildPythonPackage rec { scikit-image scikit-learn scipy - youtube-dl + yt-dlp ]; }; diff --git a/pkgs/development/python-modules/normality/default.nix b/pkgs/development/python-modules/normality/default.nix index 966e399b2478..9777c60b6723 100644 --- a/pkgs/development/python-modules/normality/default.nix +++ b/pkgs/development/python-modules/normality/default.nix @@ -39,10 +39,10 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook ]; pythonImportsCheck = [ "normality" ]; - meta = with lib; { + meta = { description = "Micro-library to normalize text strings"; homepage = "https://github.com/pudo/normality"; - license = licenses.mit; + license = lib.licenses.mit; maintainers = with lib.maintainers; [ sigmanificient ]; }; } diff --git a/pkgs/development/python-modules/oddsprout/default.nix b/pkgs/development/python-modules/oddsprout/default.nix new file mode 100644 index 000000000000..9aca78d9e063 --- /dev/null +++ b/pkgs/development/python-modules/oddsprout/default.nix @@ -0,0 +1,34 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + poetry-core, + dahlia, + ixia +}: + +buildPythonPackage rec { + pname = "oddsprout"; + version = "0.1.0"; + pyproject = true; + + src = fetchFromGitHub { + owner = "trag1c"; + repo = "oddsprout"; + rev = "refs/tags/v${version}"; + hash = "sha256-k5/mBoW4PxGUbkwaZyHgS3MGI4533V/nNoGqEg+VXpM="; + }; + + build-system = [ poetry-core ]; + dependencies = [ dahlia ixia ]; + + pythonImportsCheck = [ "oddsprout" ]; + + meta = with lib; { + changelog = "https://github.com/trag1c/oddsprout/blob/${src.rev}/CHANGELOG.md"; + description = "Generate random JSON with no schemas involved"; + license = licenses.mit; + homepage = "https://trag1c.github.io/oddsprout"; + maintainers = with maintainers; [ sigmanificient ]; + }; +} diff --git a/pkgs/development/python-modules/onnxruntime/default.nix b/pkgs/development/python-modules/onnxruntime/default.nix index b7475fd5b480..c0227ee831f0 100644 --- a/pkgs/development/python-modules/onnxruntime/default.nix +++ b/pkgs/development/python-modules/onnxruntime/default.nix @@ -59,6 +59,7 @@ buildPythonPackage { libcufft # libcufft.so.XX cudnn # libcudnn.soXX cuda_cudart # libcudart.so.XX + nccl # libnccl.so.XX ] ); diff --git a/pkgs/development/python-modules/openstacksdk/default.nix b/pkgs/development/python-modules/openstacksdk/default.nix index 47809462a26d..afd98f1f61ed 100644 --- a/pkgs/development/python-modules/openstacksdk/default.nix +++ b/pkgs/development/python-modules/openstacksdk/default.nix @@ -16,21 +16,24 @@ pythonOlder, pyyaml, requestsexceptions, + setuptools, }: buildPythonPackage rec { pname = "openstacksdk"; - version = "3.1.0"; - format = "setuptools"; + version = "3.3.0"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-cH8V1+wHSrJDS5peGYT6yrAPgi0nL0wqXeDSKgnrec0="; + hash = "sha256-BghpDKN8pzMnsPo3YdF+ZTlb43/yALhzXY8kJ3tPSYA="; }; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ platformdirs cryptography dogpile-cache diff --git a/pkgs/development/python-modules/openstacksdk/tests.nix b/pkgs/development/python-modules/openstacksdk/tests.nix index 0b71fc111b8b..43633f98a038 100644 --- a/pkgs/development/python-modules/openstacksdk/tests.nix +++ b/pkgs/development/python-modules/openstacksdk/tests.nix @@ -54,6 +54,11 @@ buildPythonPackage { openstack.tests.unit.cloud.test_image.TestImage.test_create_image_task openstack.tests.unit.image.v2.test_proxy.TestImageProxy.test_wait_for_task_error_396 openstack.tests.unit.image.v2.test_proxy.TestImageProxy.test_wait_for_task_wait + openstack.tests.unit.image.v2.test_proxy.TestTask.test_wait_for_task_error_396 + openstack.tests.unit.image.v2.test_proxy.TestTask.test_wait_for_task_wait + openstack.tests.unit.test_resource.TestWaitForDelete.test_callback_without_progress + openstack.tests.unit.test_resource.TestWaitForDelete.test_status + openstack.tests.unit.test_resource.TestWaitForDelete.test_success_not_found openstack.tests.unit.test_resource.TestWaitForStatus.test_callback openstack.tests.unit.test_resource.TestWaitForStatus.test_status_fails openstack.tests.unit.test_resource.TestWaitForStatus.test_status_fails_different_attribute diff --git a/pkgs/development/python-modules/opentelemetry-exporter-otlp-proto-common/default.nix b/pkgs/development/python-modules/opentelemetry-exporter-otlp-proto-common/default.nix index 0dc9b6a42382..cd23b6b9d1f0 100644 --- a/pkgs/development/python-modules/opentelemetry-exporter-otlp-proto-common/default.nix +++ b/pkgs/development/python-modules/opentelemetry-exporter-otlp-proto-common/default.nix @@ -1,5 +1,4 @@ { - lib, buildPythonPackage, pythonOlder, hatchling, diff --git a/pkgs/development/python-modules/opentelemetry-exporter-otlp-proto-grpc/default.nix b/pkgs/development/python-modules/opentelemetry-exporter-otlp-proto-grpc/default.nix index 5df83c4ad433..2e55477ffc0a 100644 --- a/pkgs/development/python-modules/opentelemetry-exporter-otlp-proto-grpc/default.nix +++ b/pkgs/development/python-modules/opentelemetry-exporter-otlp-proto-grpc/default.nix @@ -1,5 +1,4 @@ { - lib, buildPythonPackage, pythonOlder, deprecated, diff --git a/pkgs/development/python-modules/opentelemetry-exporter-otlp-proto-http/default.nix b/pkgs/development/python-modules/opentelemetry-exporter-otlp-proto-http/default.nix index 2bab0a3bb80c..0599140c562b 100644 --- a/pkgs/development/python-modules/opentelemetry-exporter-otlp-proto-http/default.nix +++ b/pkgs/development/python-modules/opentelemetry-exporter-otlp-proto-http/default.nix @@ -1,5 +1,4 @@ { - lib, buildPythonPackage, pythonOlder, deprecated, diff --git a/pkgs/development/python-modules/opentelemetry-exporter-otlp/default.nix b/pkgs/development/python-modules/opentelemetry-exporter-otlp/default.nix index 710674a0b9bb..3bf2f7b04c2c 100644 --- a/pkgs/development/python-modules/opentelemetry-exporter-otlp/default.nix +++ b/pkgs/development/python-modules/opentelemetry-exporter-otlp/default.nix @@ -1,5 +1,4 @@ { - lib, buildPythonPackage, pythonOlder, hatchling, diff --git a/pkgs/development/python-modules/opentelemetry-exporter-prometheus/default.nix b/pkgs/development/python-modules/opentelemetry-exporter-prometheus/default.nix index ef0d80d4b65c..36b4b4cb5449 100644 --- a/pkgs/development/python-modules/opentelemetry-exporter-prometheus/default.nix +++ b/pkgs/development/python-modules/opentelemetry-exporter-prometheus/default.nix @@ -1,5 +1,4 @@ { - lib, buildPythonPackage, pythonOlder, hatchling, diff --git a/pkgs/development/python-modules/opentelemetry-instrumentation-aiohttp-client/default.nix b/pkgs/development/python-modules/opentelemetry-instrumentation-aiohttp-client/default.nix index 0da97f5a2316..04c5debd2f5c 100644 --- a/pkgs/development/python-modules/opentelemetry-instrumentation-aiohttp-client/default.nix +++ b/pkgs/development/python-modules/opentelemetry-instrumentation-aiohttp-client/default.nix @@ -1,5 +1,4 @@ { - lib, buildPythonPackage, pythonOlder, hatchling, diff --git a/pkgs/development/python-modules/opentelemetry-instrumentation-asgi/default.nix b/pkgs/development/python-modules/opentelemetry-instrumentation-asgi/default.nix index 9d745e0261d3..a177ae42af16 100644 --- a/pkgs/development/python-modules/opentelemetry-instrumentation-asgi/default.nix +++ b/pkgs/development/python-modules/opentelemetry-instrumentation-asgi/default.nix @@ -1,5 +1,4 @@ { - lib, buildPythonPackage, pythonOlder, asgiref, diff --git a/pkgs/development/python-modules/opentelemetry-instrumentation-django/default.nix b/pkgs/development/python-modules/opentelemetry-instrumentation-django/default.nix index 30b2fd0e35fc..5a85e42a04d3 100644 --- a/pkgs/development/python-modules/opentelemetry-instrumentation-django/default.nix +++ b/pkgs/development/python-modules/opentelemetry-instrumentation-django/default.nix @@ -1,5 +1,4 @@ { - lib, buildPythonPackage, pythonOlder, django, diff --git a/pkgs/development/python-modules/opentelemetry-instrumentation-fastapi/default.nix b/pkgs/development/python-modules/opentelemetry-instrumentation-fastapi/default.nix index 178c39fffb34..310d85e53f0e 100644 --- a/pkgs/development/python-modules/opentelemetry-instrumentation-fastapi/default.nix +++ b/pkgs/development/python-modules/opentelemetry-instrumentation-fastapi/default.nix @@ -1,5 +1,4 @@ { - lib, buildPythonPackage, fastapi, hatchling, diff --git a/pkgs/development/python-modules/opentelemetry-instrumentation-wsgi/default.nix b/pkgs/development/python-modules/opentelemetry-instrumentation-wsgi/default.nix index eaca2e81e161..e640ec959754 100644 --- a/pkgs/development/python-modules/opentelemetry-instrumentation-wsgi/default.nix +++ b/pkgs/development/python-modules/opentelemetry-instrumentation-wsgi/default.nix @@ -1,5 +1,4 @@ { - lib, buildPythonPackage, pythonOlder, hatchling, diff --git a/pkgs/development/python-modules/opentelemetry-proto/default.nix b/pkgs/development/python-modules/opentelemetry-proto/default.nix index a2036ddfb77b..8fcaf2a3b516 100644 --- a/pkgs/development/python-modules/opentelemetry-proto/default.nix +++ b/pkgs/development/python-modules/opentelemetry-proto/default.nix @@ -1,5 +1,4 @@ { - lib, buildPythonPackage, pythonOlder, hatchling, diff --git a/pkgs/development/python-modules/opentelemetry-sdk/default.nix b/pkgs/development/python-modules/opentelemetry-sdk/default.nix index 29f69f428b88..cfa6e6249512 100644 --- a/pkgs/development/python-modules/opentelemetry-sdk/default.nix +++ b/pkgs/development/python-modules/opentelemetry-sdk/default.nix @@ -1,5 +1,4 @@ { - lib, buildPythonPackage, pythonOlder, flaky, diff --git a/pkgs/development/python-modules/opentelemetry-test-utils/default.nix b/pkgs/development/python-modules/opentelemetry-test-utils/default.nix index b6af8dea4f4f..24ee1af9e91a 100644 --- a/pkgs/development/python-modules/opentelemetry-test-utils/default.nix +++ b/pkgs/development/python-modules/opentelemetry-test-utils/default.nix @@ -1,5 +1,4 @@ { - lib, buildPythonPackage, pythonOlder, asgiref, diff --git a/pkgs/development/python-modules/opentelemetry-util-http/default.nix b/pkgs/development/python-modules/opentelemetry-util-http/default.nix index ee1d76c04a99..e1bcc59c2e8e 100644 --- a/pkgs/development/python-modules/opentelemetry-util-http/default.nix +++ b/pkgs/development/python-modules/opentelemetry-util-http/default.nix @@ -1,5 +1,4 @@ { - lib, buildPythonPackage, pythonOlder, hatchling, diff --git a/pkgs/development/python-modules/outspin/default.nix b/pkgs/development/python-modules/outspin/default.nix index ae01566d9cd5..4555e9cbca3c 100644 --- a/pkgs/development/python-modules/outspin/default.nix +++ b/pkgs/development/python-modules/outspin/default.nix @@ -23,10 +23,10 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook ]; - meta = with lib; { + meta = { changelog = "https://github.com/trag1c/outspin/blob/${src.rev}/CHANGELOG.md"; description = "Conveniently read single char inputs in the console"; - license = licenses.mit; - maintainers = with maintainers; [ sigmanificient ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ sigmanificient ]; }; } diff --git a/pkgs/development/python-modules/pandas-stubs/default.nix b/pkgs/development/python-modules/pandas-stubs/default.nix index 322c3a39744a..843ae520be02 100644 --- a/pkgs/development/python-modules/pandas-stubs/default.nix +++ b/pkgs/development/python-modules/pandas-stubs/default.nix @@ -1,9 +1,20 @@ { lib, stdenv, - beautifulsoup4, buildPythonPackage, + pythonOlder, fetchFromGitHub, + + # build-system + poetry-core, + + # dependencies + numpy, + types-pytz, + + # tests + pytestCheckHook, + beautifulsoup4, html5lib, jinja2, lxml, @@ -11,16 +22,12 @@ odfpy, openpyxl, pandas, - poetry-core, pyarrow, pyreadstat, - pytestCheckHook, - pythonOlder, scipy, sqlalchemy, tables, tabulate, - types-pytz, typing-extensions, xarray, xlsxwriter, @@ -28,7 +35,7 @@ buildPythonPackage rec { pname = "pandas-stubs"; - version = "2.2.0.240218"; + version = "2.2.2.240603"; pyproject = true; disabled = pythonOlder "3.9"; @@ -37,17 +44,18 @@ buildPythonPackage rec { owner = "pandas-dev"; repo = "pandas-stubs"; rev = "refs/tags/v${version}"; - hash = "sha256-416vyaHcSfTfkSNKZ05edozfsMmNKcpOZAoPenCLFzQ="; + hash = "sha256-wJ7lN1+BGNqhwgPLmmpb3foX6rIEy3R62rOvu0mr8xs="; }; - nativeBuildInputs = [ poetry-core ]; + build-system = [ poetry-core ]; - propagatedBuildInputs = [ - pandas + dependencies = [ + numpy types-pytz ]; nativeCheckInputs = [ + pytestCheckHook beautifulsoup4 html5lib jinja2 @@ -55,9 +63,9 @@ buildPythonPackage rec { matplotlib odfpy openpyxl + pandas pyarrow pyreadstat - pytestCheckHook scipy sqlalchemy tables @@ -65,19 +73,28 @@ buildPythonPackage rec { typing-extensions xarray xlsxwriter + + # missing dependencies in nixpkgs + # python-calamine ]; disabledTests = [ - # AttributeErrors, missing dependencies, error and warning checks - "test_types_groupby" - "test_frame_groupby_resample" - "test_orc" - "test_all_read_without_lxml_dtype_backend" + # Missing dependencies, error and warning checks + "test_all_read_without_lxml_dtype_backend" # pyarrow.orc + "test_orc" # pyarrow.orc + "test_read_excel" # python-calamine + "test_plotting" # UserWarning: No artists with labels found to put in legend. + "test_spss" # FutureWarning: ChainedAssignmentError: behaviour will change in pandas 3.0! "test_show_version" ] ++ lib.optionals stdenv.isDarwin [ - "test_plotting" # Fatal Python error: Illegal instruction + "test_clipboard" # FileNotFoundError: [Errno 2] No such file or directory: 'pbcopy' + ] + ++ lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [ + # Disable tests for types that are not supported on aarch64 in `numpy` < 2.0 + "test_astype_float" # `f16` and `float128` + "test_astype_complex" # `c32` and `complex256` ]; pythonImportsCheck = [ "pandas" ]; diff --git a/pkgs/development/python-modules/pandoc-latex-environment/default.nix b/pkgs/development/python-modules/pandoc-latex-environment/default.nix new file mode 100644 index 000000000000..fef2811083d9 --- /dev/null +++ b/pkgs/development/python-modules/pandoc-latex-environment/default.nix @@ -0,0 +1,42 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + poetry-core, + poetry-dynamic-versioning, + panflute, + pytestCheckHook, + pandoc, +}: + +buildPythonPackage rec { + pname = "pandoc-latex-environment"; + version = "1.1.6.4"; + pyproject = true; + + src = fetchFromGitHub { + owner = "chdemko"; + repo = "pandoc-latex-environment"; + rev = "refs/tags/${version}"; + hash = "sha256-DLuLFCKP5ip3duHlGAZnFip7GCDzWK91bka3DrknQSA="; + }; + + build-system = [ + poetry-core + poetry-dynamic-versioning + ]; + dependencies = [ panflute ]; + + pythonImportsCheck = [ "pandoc_latex_environment" ]; + nativeCheckInputs = [ + pytestCheckHook + pandoc + ]; + + meta = { + description = "Pandoc filter for adding LaTeX environment on specific div"; + homepage = "https://github.com/chdemko/pandoc-latex-environment"; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ sigmanificient ]; + }; +} diff --git a/pkgs/development/python-modules/paperbush/default.nix b/pkgs/development/python-modules/paperbush/default.nix index e2a06a1f72d2..26f30a88908b 100644 --- a/pkgs/development/python-modules/paperbush/default.nix +++ b/pkgs/development/python-modules/paperbush/default.nix @@ -20,10 +20,10 @@ buildPythonPackage rec { build-system = [ poetry-core ]; pythonImportsCheck = [ "paperbush" ]; - meta = with lib; { + meta = { changelog = "https://github.com/trag1c/paperbush/blob/${src.rev}/CHANGELOG.md"; description = "Super concise argument parsing tool for Python"; - license = licenses.mit; - maintainers = with maintainers; [ sigmanificient ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ sigmanificient ]; }; } diff --git a/pkgs/development/python-modules/pbar/default.nix b/pkgs/development/python-modules/pbar/default.nix new file mode 100644 index 000000000000..3ae769d74e82 --- /dev/null +++ b/pkgs/development/python-modules/pbar/default.nix @@ -0,0 +1,29 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + setuptools, +}: + +buildPythonPackage rec { + pname = "pbar"; + version = "2.2.1"; + pyproject = true; + + src = fetchFromGitHub { + owner = "darvil82"; + repo = "PBar"; + rev = "refs/tags/v${version}"; + hash = "sha256-FsEjfusk8isOD52xkjndGQdVC8Vc7N3spLLWQTi3Svc="; + }; + + build-system = [ setuptools ]; + pythonImportsCheck = [ "pbar" ]; + + meta = with lib; { + description = "Display customizable progress bars on the terminal easily"; + license = licenses.mit; + homepage = "https://darvil82.github.io/PBar"; + maintainers = with maintainers; [ sigmanificient ]; + }; +} diff --git a/pkgs/development/python-modules/plumbum/default.nix b/pkgs/development/python-modules/plumbum/default.nix index b1722a47a516..a6a77dd5cbfd 100644 --- a/pkgs/development/python-modules/plumbum/default.nix +++ b/pkgs/development/python-modules/plumbum/default.nix @@ -64,7 +64,7 @@ buildPythonPackage rec { meta = with lib; { changelog = "https://github.com/tomerfiliba/plumbum/releases/tag/v${version}"; - description = " Plumbum: Shell Combinators "; + description = " Plumbum: Shell Combinators"; homepage = " https://github.com/tomerfiliba/plumbum "; license = licenses.mit; maintainers = with maintainers; [ ]; diff --git a/pkgs/development/python-modules/premailer/default.nix b/pkgs/development/python-modules/premailer/default.nix index 69e4a00c5955..dd6eec493338 100644 --- a/pkgs/development/python-modules/premailer/default.nix +++ b/pkgs/development/python-modules/premailer/default.nix @@ -36,7 +36,7 @@ buildPythonPackage rec { ]; meta = { - description = "Turns CSS blocks into style attributes "; + description = "Turns CSS blocks into style attributes"; homepage = "https://github.com/peterbe/premailer"; license = lib.licenses.bsd3; }; diff --git a/pkgs/development/python-modules/pycrdt-websocket/default.nix b/pkgs/development/python-modules/pycrdt-websocket/default.nix index 4e727cc58316..9f69727808a1 100644 --- a/pkgs/development/python-modules/pycrdt-websocket/default.nix +++ b/pkgs/development/python-modules/pycrdt-websocket/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "pycrdt-websocket"; - version = "0.13.5"; + version = "0.14.1"; pyproject = true; disabled = pythonOlder "3.8"; @@ -28,7 +28,7 @@ buildPythonPackage rec { owner = "jupyter-server"; repo = "pycrdt-websocket"; rev = "refs/tags/v${version}"; - hash = "sha256-dzlmgxrdQ97+DO/vDtoX7PIOpngEE+FGUGq1vdVmhNw="; + hash = "sha256-lQ8ZYzFKdVvIEp38WztOWFpJhi4LtA8ODpAFgSZVpU8="; }; build-system = [ hatchling ]; diff --git a/pkgs/development/python-modules/pycrdt/Cargo.lock b/pkgs/development/python-modules/pycrdt/Cargo.lock index 427961347646..0da04d69be57 100644 --- a/pkgs/development/python-modules/pycrdt/Cargo.lock +++ b/pkgs/development/python-modules/pycrdt/Cargo.lock @@ -20,12 +20,6 @@ version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0" -[[package]] -name = "bitflags" -version = "2.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de" - [[package]] name = "bumpalo" version = "3.16.0" @@ -62,9 +56,9 @@ dependencies = [ [[package]] name = "heck" -version = "0.4.1" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" +checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea" [[package]] name = "indoc" @@ -93,16 +87,6 @@ version = "0.2.155" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c" -[[package]] -name = "lock_api" -version = "0.4.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07af8b9cdd281b7915f413fa73f29ebd5d55d0d3f0155584dade1ff18cea1b17" -dependencies = [ - "autocfg", - "scopeguard", -] - [[package]] name = "log" version = "0.4.22" @@ -124,34 +108,11 @@ version = "1.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" -[[package]] -name = "parking_lot" -version = "0.12.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1bf18183cf54e8d6059647fc3063646a1801cf30896933ec2311622cc4b9a27" -dependencies = [ - "lock_api", - "parking_lot_core", -] - -[[package]] -name = "parking_lot_core" -version = "0.9.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8" -dependencies = [ - "cfg-if", - "libc", - "redox_syscall", - "smallvec", - "windows-targets", -] - [[package]] name = "portable-atomic" -version = "1.6.0" +version = "1.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7170ef9988bc169ba16dd36a7fa041e5c4cbeb6a35b76d4c03daded371eae7c0" +checksum = "da544ee218f0d287a911e9c99a39a8c9bc8fcad3cb8db5959940044ecfc67265" [[package]] name = "proc-macro2" @@ -164,7 +125,7 @@ dependencies = [ [[package]] name = "pycrdt" -version = "0.8.31" +version = "0.9.6" dependencies = [ "pyo3", "yrs", @@ -172,15 +133,15 @@ dependencies = [ [[package]] name = "pyo3" -version = "0.20.3" +version = "0.22.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53bdbb96d49157e65d45cc287af5f32ffadd5f4761438b527b055fb0d4bb8233" +checksum = "831e8e819a138c36e212f3af3fd9eeffed6bf1510a805af35b0edee5ffa59433" dependencies = [ "cfg-if", "indoc", "libc", "memoffset", - "parking_lot", + "once_cell", "portable-atomic", "pyo3-build-config", "pyo3-ffi", @@ -190,9 +151,9 @@ dependencies = [ [[package]] name = "pyo3-build-config" -version = "0.20.3" +version = "0.22.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "deaa5745de3f5231ce10517a1f5dd97d53e5a2fd77aa6b5842292085831d48d7" +checksum = "1e8730e591b14492a8945cdff32f089250b05f5accecf74aeddf9e8272ce1fa8" dependencies = [ "once_cell", "target-lexicon", @@ -200,9 +161,9 @@ dependencies = [ [[package]] name = "pyo3-ffi" -version = "0.20.3" +version = "0.22.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62b42531d03e08d4ef1f6e85a2ed422eb678b8cd62b762e53891c05faf0d4afa" +checksum = "5e97e919d2df92eb88ca80a037969f44e5e70356559654962cbb3316d00300c6" dependencies = [ "libc", "pyo3-build-config", @@ -210,9 +171,9 @@ dependencies = [ [[package]] name = "pyo3-macros" -version = "0.20.3" +version = "0.22.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7305c720fa01b8055ec95e484a6eca7a83c841267f0dd5280f0c8b8551d2c158" +checksum = "eb57983022ad41f9e683a599f2fd13c3664d7063a3ac5714cae4b7bee7d3f206" dependencies = [ "proc-macro2", "pyo3-macros-backend", @@ -222,9 +183,9 @@ dependencies = [ [[package]] name = "pyo3-macros-backend" -version = "0.20.3" +version = "0.22.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7c7e9b68bb9c3149c5b0cade5d07f953d6d125eb4337723c4ccdb665f1f96185" +checksum = "ec480c0c51ddec81019531705acac51bcdbeae563557c982aa8263bb96880372" dependencies = [ "heck", "proc-macro2", @@ -242,27 +203,12 @@ dependencies = [ "proc-macro2", ] -[[package]] -name = "redox_syscall" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c82cf8cff14456045f55ec4241383baeff27af886adb72ffb2162f99911de0fd" -dependencies = [ - "bitflags", -] - [[package]] name = "ryu" version = "1.0.18" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f" -[[package]] -name = "scopeguard" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" - [[package]] name = "serde" version = "1.0.204" @@ -311,9 +257,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" [[package]] name = "syn" -version = "2.0.69" +version = "2.0.72" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "201fcda3845c23e8212cd466bfebf0bd20694490fc0356ae8e428e0824a915a6" +checksum = "dc4b9b9bf2add8093d3f2c0204471e951b2285580335de42f9d2534f3ae7a8af" dependencies = [ "proc-macro2", "quote", @@ -322,24 +268,24 @@ dependencies = [ [[package]] name = "target-lexicon" -version = "0.12.14" +version = "0.12.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1fc403891a21bcfb7c37834ba66a547a8f402146eba7265b5a6d88059c9ff2f" +checksum = "4873307b7c257eddcb50c9bedf158eb669578359fb28428bef438fec8e6ba7c2" [[package]] name = "thiserror" -version = "1.0.61" +version = "1.0.63" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c546c80d6be4bc6a00c0f01730c08df82eaa7a7a61f11d656526506112cc1709" +checksum = "c0342370b38b6a11b6cc11d6a805569958d54cfa061a29969c3b5ce2ea405724" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.61" +version = "1.0.63" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46c3384250002a6d5af4d114f2845d37b57521033f30d5c3f46c4d70e1197533" +checksum = "a4558b58466b9ad7ca0f102865eccc95938dca1a74a856f2b57b6629050da261" dependencies = [ "proc-macro2", "quote", @@ -418,75 +364,11 @@ version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "af190c94f2773fdb3729c55b007a722abb5384da03bc0986df4c289bf5567e96" -[[package]] -name = "windows-targets" -version = "0.52.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973" -dependencies = [ - "windows_aarch64_gnullvm", - "windows_aarch64_msvc", - "windows_i686_gnu", - "windows_i686_gnullvm", - "windows_i686_msvc", - "windows_x86_64_gnu", - "windows_x86_64_gnullvm", - "windows_x86_64_msvc", -] - -[[package]] -name = "windows_aarch64_gnullvm" -version = "0.52.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3" - -[[package]] -name = "windows_aarch64_msvc" -version = "0.52.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469" - -[[package]] -name = "windows_i686_gnu" -version = "0.52.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b" - -[[package]] -name = "windows_i686_gnullvm" -version = "0.52.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66" - -[[package]] -name = "windows_i686_msvc" -version = "0.52.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66" - -[[package]] -name = "windows_x86_64_gnu" -version = "0.52.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78" - -[[package]] -name = "windows_x86_64_gnullvm" -version = "0.52.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d" - -[[package]] -name = "windows_x86_64_msvc" -version = "0.52.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" - [[package]] name = "yrs" -version = "0.18.8" +version = "0.19.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da227d69095141c331d9b60c11496d0a3c6505cd9f8e200898b197219e8e394f" +checksum = "a8ca5126331b9a5ef5bb10f3f1c3d01b05f298d348c66f8fb15497d83ee73176" dependencies = [ "arc-swap", "atomic_refcell", diff --git a/pkgs/development/python-modules/pycrdt/default.nix b/pkgs/development/python-modules/pycrdt/default.nix index 3b77a8596228..6ae1c9c5bd6c 100644 --- a/pkgs/development/python-modules/pycrdt/default.nix +++ b/pkgs/development/python-modules/pycrdt/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "pycrdt"; - version = "0.8.31"; + version = "0.9.6"; pyproject = true; src = fetchFromGitHub { owner = "jupyter-server"; repo = "pycrdt"; rev = "refs/tags/v${version}"; - hash = "sha256-fIpa4ikpeUVb8fucBfFS99zwWSK1GhGAC/QweXDc0Kg="; + hash = "sha256-1BGJ6I8ODLyEv566w+vQOsPEqN8nQlZHXTWv0tH0cR0="; }; postPatch = '' diff --git a/pkgs/development/python-modules/pygments/default.nix b/pkgs/development/python-modules/pygments/default.nix index ff8569b9b8eb..007e36f17233 100644 --- a/pkgs/development/python-modules/pygments/default.nix +++ b/pkgs/development/python-modules/pygments/default.nix @@ -48,13 +48,13 @@ let }); }; - meta = with lib; { + meta = { changelog = "https://github.com/pygments/pygments/releases/tag/${version}"; homepage = "https://pygments.org/"; description = "Generic syntax highlighter"; mainProgram = "pygmentize"; - license = licenses.bsd2; - maintainers = with maintainers; [ sigmanificient ]; + license = lib.licenses.bsd2; + maintainers = with lib.maintainers; [ sigmanificient ]; }; }; in diff --git a/pkgs/development/python-modules/pyls-isort/default.nix b/pkgs/development/python-modules/pyls-isort/default.nix index 5dc8cd76b1a2..cc2048cc0450 100644 --- a/pkgs/development/python-modules/pyls-isort/default.nix +++ b/pkgs/development/python-modules/pyls-isort/default.nix @@ -2,6 +2,7 @@ lib, buildPythonPackage, fetchFromGitHub, + setuptools, python-lsp-server, isort, }: @@ -23,6 +24,8 @@ buildPythonPackage rec { pythonImportsCheck = [ "pyls_isort" ]; + build-system = [ setuptools ]; + dependencies = [ isort python-lsp-server diff --git a/pkgs/development/python-modules/pylyrics/default.nix b/pkgs/development/python-modules/pylyrics/default.nix index 00b9776380bb..29949d8c088a 100644 --- a/pkgs/development/python-modules/pylyrics/default.nix +++ b/pkgs/development/python-modules/pylyrics/default.nix @@ -29,7 +29,7 @@ buildPythonPackage rec { doCheck = false; meta = with lib; { - description = "Pythonic Implementation of lyrics.wikia.com for getting lyrics of songs "; + description = "Pythonic Implementation of lyrics.wikia.com for getting lyrics of songs"; homepage = "https://github.com/geekpradd/PyLyrics"; license = licenses.mit; maintainers = with maintainers; [ ]; diff --git a/pkgs/development/python-modules/pypass/default.nix b/pkgs/development/python-modules/pypass/default.nix index 3a2fc269ceda..784a5e213c3b 100644 --- a/pkgs/development/python-modules/pypass/default.nix +++ b/pkgs/development/python-modules/pypass/default.nix @@ -8,11 +8,11 @@ git, gnugrep, gnupg, - nose, pbr, pexpect, pythonAtLeast, - pythonOlder, + pytestCheckHook, + setuptools, substituteAll, tree, xclip, @@ -23,11 +23,11 @@ buildPythonPackage rec { pname = "pypass"; version = "0.2.1"; - format = "setuptools"; + pyproject = true; src = fetchPypi { inherit pname version; - sha256 = "1nm4mj7pd7gz4ghic6b3wrnd1b59hd1f0axavdabfl79wy511l7r"; + hash = "sha256-+dAQiufpULdU26or4EKDqazQbOZjGRbhI/+ddo+spNo="; }; # Set absolute nix store paths to the executables that pypass uses @@ -47,42 +47,39 @@ buildPythonPackage rec { substituteInPlace requirements.txt --replace "enum34" "" ''; + build-system = [ setuptools ]; + nativeBuildInputs = [ pbr ]; - propagatedBuildInputs = [ + dependencies = [ click colorama pexpect ]; - doCheck = pythonOlder "3.12"; - - nativeCheckInputs = [ nose ]; + nativeCheckInputs = [ pytestCheckHook ]; # Configuration so that the tests work preCheck = '' - HOME=$TEMP ${git}/bin/git config --global user.email "nix-builder@nixos.org" - HOME=$TEMP ${git}/bin/git config --global user.name "Nix Builder" - HOME=$TEMP ${git}/bin/git config --global pull.ff only - HOME=$TEMP make setup_gpg + export HOME=$(mktemp -d) + export GNUPGHOME=pypass/tests/gnupg + ${git}/bin/git config --global user.email "nix-builder@nixos.org" + ${git}/bin/git config --global user.name "Nix Builder" + ${git}/bin/git config --global pull.ff only + make setup_gpg ''; - # Run tests but exclude the test that uses clipboard as I wasn't able to make - # it work - probably the X clipboard just doesn't work in the build - # environment.. - checkPhase = '' - runHook preCheck - HOME=$TEMP GNUPGHOME=pypass/tests/gnupg nosetests -v --exclude=test_show_clip . - runHook postCheck - ''; + # Presumably this test needs the X clipboard, which we don't have + # as the test environment is non-graphical. + disabledTests = [ "test_show_clip" ]; - meta = with lib; { + meta = { broken = stdenv.isDarwin; description = "Password manager pass in Python"; mainProgram = "pypass"; homepage = "https://github.com/aviau/python-pass"; - license = licenses.gpl3Plus; - platforms = platforms.all; - maintainers = with maintainers; [ jluttine ]; + license = lib.licenses.gpl3Plus; + platforms = lib.platforms.all; + maintainers = with lib.maintainers; [ jluttine ]; }; } diff --git a/pkgs/development/python-modules/pyproject-hooks/default.nix b/pkgs/development/python-modules/pyproject-hooks/default.nix index cc47f9d2a840..28db88a18cf8 100644 --- a/pkgs/development/python-modules/pyproject-hooks/default.nix +++ b/pkgs/development/python-modules/pyproject-hooks/default.nix @@ -59,7 +59,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "pyproject_hooks" ]; meta = with lib; { - description = "Low-level library for calling build-backends in `pyproject.toml`-based project "; + description = "Low-level library for calling build-backends in `pyproject.toml`-based project"; homepage = "https://github.com/pypa/pyproject-hooks"; changelog = "https://github.com/pypa/pyproject-hooks/blob/v${version}/docs/changelog.rst"; license = licenses.mit; diff --git a/pkgs/development/python-modules/pyprusalink/default.nix b/pkgs/development/python-modules/pyprusalink/default.nix index 88c7eb338ed7..61b482ee5846 100644 --- a/pkgs/development/python-modules/pyprusalink/default.nix +++ b/pkgs/development/python-modules/pyprusalink/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "pyprusalink" ]; meta = with lib; { - description = "Library to communicate with PrusaLink "; + description = "Library to communicate with PrusaLink"; homepage = "https://github.com/home-assistant-libs/pyprusalink"; changelog = "https://github.com/home-assistant-libs/pyprusalink/releases/tag/${version}"; license = with licenses; [ asl20 ]; diff --git a/pkgs/development/python-modules/pyqt5-stubs/default.nix b/pkgs/development/python-modules/pyqt5-stubs/default.nix index 008313ebb7fd..a891942d1d45 100644 --- a/pkgs/development/python-modules/pyqt5-stubs/default.nix +++ b/pkgs/development/python-modules/pyqt5-stubs/default.nix @@ -58,7 +58,7 @@ buildPythonPackage rec { ]; meta = with lib; { - description = "Stubs for PyQt5 "; + description = "Stubs for PyQt5"; homepage = "https://github.com/python-qt-tools/PyQt5-stubs"; license = licenses.gpl3; maintainers = with maintainers; [ _999eagle ]; diff --git a/pkgs/development/python-modules/pytest-mypy/default.nix b/pkgs/development/python-modules/pytest-mypy/default.nix index 554034ad08b0..6b83a3854c74 100644 --- a/pkgs/development/python-modules/pytest-mypy/default.nix +++ b/pkgs/development/python-modules/pytest-mypy/default.nix @@ -37,10 +37,10 @@ buildPythonPackage rec { doCheck = false; pythonImportsCheck = [ "pytest_mypy" ]; - meta = with lib; { + meta = { description = "Mypy static type checker plugin for Pytest"; homepage = "https://github.com/dbader/pytest-mypy"; - license = licenses.mit; + license = lib.licenses.mit; maintainers = with lib.maintainers; [ sigmanificient ]; }; } diff --git a/pkgs/development/python-modules/python-barbicanclient/default.nix b/pkgs/development/python-modules/python-barbicanclient/default.nix new file mode 100644 index 000000000000..cefe9412e86e --- /dev/null +++ b/pkgs/development/python-modules/python-barbicanclient/default.nix @@ -0,0 +1,70 @@ +{ + lib, + buildPythonPackage, + cliff, + fetchFromGitea, + keystoneauth1, + oslo-i18n, + oslo-serialization, + oslo-utils, + pbr, + pythonOlder, + requests-mock, + requests, + setuptools, + stestr, +}: + +buildPythonPackage rec { + pname = "python-barbicanclient"; + version = "7.0.0"; + pyproject = true; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitea { + domain = "opendev.org"; + owner = "openstack"; + repo = "python-barbicanclient"; + rev = version; + hash = "sha256-odoYyBulOQkjUpymFyZgvI+DYmdHJY3PaG8hh2ms+/0="; + }; + + env.PBR_VERSION = version; + + build-system = [ + pbr + setuptools + ]; + + dependencies = [ + cliff + keystoneauth1 + oslo-i18n + oslo-serialization + oslo-utils + requests + ]; + + doCheck = true; + + nativeCheckInputs = [ + requests-mock + stestr + ]; + + checkPhase = '' + runHook preCheck + stestr run + runHook postCheck + ''; + + pythonImportsCheck = [ "barbicanclient" ]; + + meta = { + homepage = "https://opendev.org/openstack/python-barbicanclient"; + description = "Client library for OpenStack Barbican API"; + license = lib.licenses.asl20; + maintainers = lib.teams.openstack.members; + }; +} diff --git a/pkgs/development/python-modules/python-designateclient/default.nix b/pkgs/development/python-modules/python-designateclient/default.nix new file mode 100644 index 000000000000..20cbf04e6ba2 --- /dev/null +++ b/pkgs/development/python-modules/python-designateclient/default.nix @@ -0,0 +1,74 @@ +{ + lib, + buildPythonPackage, + debtcollector, + fetchFromGitea, + jsonschema, + keystoneauth1, + osc-lib, + oslo-serialization, + oslo-utils, + oslotest, + pbr, + pythonOlder, + requests-mock, + requests, + setuptools, + stestr, +}: + +buildPythonPackage rec { + pname = "python-designateclient"; + version = "6.0.1"; + pyproject = true; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitea { + domain = "opendev.org"; + owner = "openstack"; + repo = "python-designateclient"; + rev = version; + hash = "sha256-vuaouOA69REx+ZrzXjLGVz5Az1/d6x4WRT1h78xeebk="; + }; + + env.PBR_VERSION = version; + + build-system = [ + pbr + setuptools + ]; + + dependencies = [ + debtcollector + jsonschema + keystoneauth1 + osc-lib + oslo-serialization + oslo-utils + requests + ]; + + doCheck = true; + + nativeCheckInputs = [ + oslotest + requests-mock + stestr + ]; + + checkPhase = '' + runHook preCheck + stestr run + runHook postCheck + ''; + + pythonImportsCheck = [ "designateclient" ]; + + meta = { + homepage = "https://opendev.org/openstack/python-designateclient"; + description = "Client library for OpenStack Designate API"; + license = lib.licenses.asl20; + maintainers = lib.teams.openstack.members; + }; +} diff --git a/pkgs/development/python-modules/python-olm/default.nix b/pkgs/development/python-modules/python-olm/default.nix index 7af0f8fd7c63..642af55ed786 100644 --- a/pkgs/development/python-modules/python-olm/default.nix +++ b/pkgs/development/python-modules/python-olm/default.nix @@ -1,5 +1,4 @@ { - lib, buildPythonPackage, isPy3k, olm, diff --git a/pkgs/development/python-modules/ruff-api/default.nix b/pkgs/development/python-modules/ruff-api/default.nix index 43170c431214..296006018edb 100644 --- a/pkgs/development/python-modules/ruff-api/default.nix +++ b/pkgs/development/python-modules/ruff-api/default.nix @@ -5,6 +5,7 @@ cargo, darwin, fetchFromGitHub, + libiconv, pythonOlder, rustc, rustPlatform, @@ -43,6 +44,7 @@ buildPythonPackage rec { buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.CoreFoundation darwin.apple_sdk.frameworks.CoreServices + libiconv ]; # Tests have issues at the moment, check with next update diff --git a/pkgs/development/python-modules/samarium/crossandra-2-fix.patch b/pkgs/development/python-modules/samarium/crossandra-2-fix.patch new file mode 100644 index 000000000000..7861ce0611af --- /dev/null +++ b/pkgs/development/python-modules/samarium/crossandra-2-fix.patch @@ -0,0 +1,18 @@ +--- a/src/samarium/tokenizer.py 2024-06-07 13:07:38.731314161 +0200 ++++ b/src/samarium/tokenizer.py 2024-06-07 13:08:11.674488226 +0200 +@@ -26,12 +26,12 @@ + Token, + ignore_whitespace=True, + rules=[ +- Rule(r"==<.*>==", converter=False, flags=re.M | re.S), +- Rule(r"==[^\n]*", converter=False, flags=re.M | re.S), ++ Rule(r"==<.*>==", flags=re.M | re.S, ignore=True), ++ Rule(r"==[^\n]*", flags=re.M | re.S, ignore=True), + Rule( + common.DOUBLE_QUOTED_STRING.pattern, + lambda x: x.replace("\n", r"\n"), +- re.S, ++ flags=re.S, + ), + Rule(rf"{SM_BIT}+`?{SM_BIT}*|`{SM_BIT}*", to_number), + Rule(r"\w+"), diff --git a/pkgs/development/python-modules/samarium/default.nix b/pkgs/development/python-modules/samarium/default.nix new file mode 100644 index 000000000000..a2b637c620a5 --- /dev/null +++ b/pkgs/development/python-modules/samarium/default.nix @@ -0,0 +1,36 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + poetry-core, + crossandra, + dahlia, + pythonRelaxDepsHook +}: + +buildPythonPackage rec { + pname = "samarium"; + version = "0.5.3"; + pyproject = true; + + src = fetchFromGitHub { + owner = "samarium-lang"; + repo = "samarium"; + rev = "refs/tags/${version}"; + hash = "sha256-4WVkTLE6OboNJE/f+6zS3xT1jEHUwV4HSLjl/PBP0FU="; + }; + + build-system = [ poetry-core pythonRelaxDepsHook ]; + dependencies = [ crossandra dahlia ]; + + patches = [ ./crossandra-2-fix.patch ]; + pythonRelaxDeps = [ "crossandra" ]; + + meta = with lib; { + changelog = "https://github.com/samarium-lang/samarium/blob/${src.rev}/CHANGELOG.md"; + description = "The Samarium Programming Language"; + license = licenses.mit; + homepage = "https://samarium-lang.github.io/Samarium"; + maintainers = with maintainers; [ sigmanificient ]; + }; +} diff --git a/pkgs/development/python-modules/sampledata/default.nix b/pkgs/development/python-modules/sampledata/default.nix index d2f547f32ca2..4583375eea00 100644 --- a/pkgs/development/python-modules/sampledata/default.nix +++ b/pkgs/development/python-modules/sampledata/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { format = "setuptools"; meta = { - description = "Sample Data generator for Python "; + description = "Sample Data generator for Python"; homepage = "https://github.com/jespino/sampledata"; license = lib.licenses.bsd3; }; diff --git a/pkgs/development/python-modules/sane/default.nix b/pkgs/development/python-modules/sane/default.nix index f5fb012436bf..1b82f6039878 100644 --- a/pkgs/development/python-modules/sane/default.nix +++ b/pkgs/development/python-modules/sane/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { meta = with lib; { homepage = "https://github.com/python-pillow/Sane"; - description = "Python interface to the SANE scanner and frame grabber "; + description = "Python interface to the SANE scanner and frame grabber"; license = licenses.mit; maintainers = with maintainers; [ doronbehar ]; }; diff --git a/pkgs/development/python-modules/scour/default.nix b/pkgs/development/python-modules/scour/default.nix index 645ded228605..815a267c0391 100644 --- a/pkgs/development/python-modules/scour/default.nix +++ b/pkgs/development/python-modules/scour/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { doCheck = false; meta = with lib; { - description = "SVG Optimizer / Cleaner "; + description = "SVG Optimizer / Cleaner"; mainProgram = "scour"; homepage = "https://github.com/scour-project/scour"; license = licenses.asl20; diff --git a/pkgs/development/python-modules/sigparse/default.nix b/pkgs/development/python-modules/sigparse/default.nix index 1c3fd7330f80..d06a2a91e49d 100644 --- a/pkgs/development/python-modules/sigparse/default.nix +++ b/pkgs/development/python-modules/sigparse/default.nix @@ -32,10 +32,10 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook ]; - meta = with lib; { + meta = { description = "Backports python 3.10 typing features into 3.7, 3.8, and 3.9"; - license = licenses.mit; + license = lib.licenses.mit; homepage = "https://github.com/Lunarmagpie/sigparse"; - maintainers = with maintainers; [ sigmanificient ]; + maintainers = with lib.maintainers; [ sigmanificient ]; }; } diff --git a/pkgs/development/python-modules/simplebayes/default.nix b/pkgs/development/python-modules/simplebayes/default.nix index ea3fdd268e4c..bfa761b59e44 100644 --- a/pkgs/development/python-modules/simplebayes/default.nix +++ b/pkgs/development/python-modules/simplebayes/default.nix @@ -2,7 +2,7 @@ lib, buildPythonPackage, fetchFromGitHub, - nose, + unittestCheckHook, mock, isPy3k, }: @@ -22,16 +22,14 @@ buildPythonPackage { }; nativeCheckInputs = [ - nose mock + unittestCheckHook ]; postPatch = lib.optionalString isPy3k '' sed -i -e 's/open *(\([^)]*\))/open(\1, encoding="utf-8")/' setup.py ''; - checkPhase = "nosetests tests/test.py"; - meta = with lib; { description = "Memory-based naive bayesian text classifier"; homepage = "https://github.com/hickeroar/simplebayes"; diff --git a/pkgs/development/python-modules/simpleitk/default.nix b/pkgs/development/python-modules/simpleitk/default.nix index e69f39820c47..f241cd0a2968 100644 --- a/pkgs/development/python-modules/simpleitk/default.nix +++ b/pkgs/development/python-modules/simpleitk/default.nix @@ -1,5 +1,4 @@ { - lib, buildPythonPackage, pythonOlder, cmake, diff --git a/pkgs/development/python-modules/spark-parser/default.nix b/pkgs/development/python-modules/spark-parser/default.nix index 3543cc0abadb..f82b7df76342 100644 --- a/pkgs/development/python-modules/spark-parser/default.nix +++ b/pkgs/development/python-modules/spark-parser/default.nix @@ -2,7 +2,7 @@ lib, buildPythonPackage, fetchPypi, - nose, + unittestCheckHook, click, }: @@ -17,9 +17,15 @@ buildPythonPackage rec { sha256 = "0np2y4jcir4a4j18wws7yzkz2zj6nqhdhn41rpq8pyskg6wrgfx7"; }; - buildInputs = [ nose ]; propagatedBuildInputs = [ click ]; + nativeCheckInputs = [ unittestCheckHook ]; + unittestFlagsArray = [ + "-s" + "test" + "-v" + ]; + meta = with lib; { description = "Early-Algorithm Context-free grammar Parser"; mainProgram = "spark-parser-coverage"; diff --git a/pkgs/development/python-modules/telfhash/default.nix b/pkgs/development/python-modules/telfhash/default.nix index 0aafd816d039..18b67b6bf502 100644 --- a/pkgs/development/python-modules/telfhash/default.nix +++ b/pkgs/development/python-modules/telfhash/default.nix @@ -6,12 +6,12 @@ packaging, pyelftools, tlsh, - nose, + setuptools, }: buildPythonPackage rec { pname = "telfhash"; version = "0.9.8"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "trendmicro"; @@ -23,22 +23,21 @@ buildPythonPackage rec { # The tlsh library's name is just "tlsh" postPatch = '' substituteInPlace requirements.txt \ - --replace "python-tlsh" "tlsh" \ - --replace "py-tlsh" "tlsh" + --replace-fail "python-tlsh" "tlsh" \ + --replace-fail "py-tlsh" "tlsh" \ + --replace-fail "nose>=1.3.7" "" ''; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ capstone pyelftools tlsh packaging ]; - nativeCheckInputs = [ nose ]; - - checkPhase = '' - nosetests - ''; + doCheck = false; # no tests pythonImportsCheck = [ "telfhash" ]; diff --git a/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix b/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix index 81e6ce498402..77d8d069079b 100644 --- a/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix +++ b/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "tencentcloud-sdk-python"; - version = "3.0.1197"; + version = "3.0.1198"; pyproject = true; disabled = pythonOlder "3.9"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "TencentCloud"; repo = "tencentcloud-sdk-python"; rev = "refs/tags/${version}"; - hash = "sha256-8rTwnKhOPUYi62NBjYKZ3DLFgbKEejHyDCnWJsVUYQQ="; + hash = "sha256-Ee+pRRmjw319AkC12TOuBRdRkFDzKibexXspteQxsAw="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/transformers/default.nix b/pkgs/development/python-modules/transformers/default.nix index 976d3a0c2bc7..9a8c3bfda567 100644 --- a/pkgs/development/python-modules/transformers/default.nix +++ b/pkgs/development/python-modules/transformers/default.nix @@ -59,7 +59,7 @@ buildPythonPackage rec { pname = "transformers"; - version = "4.43.2"; + version = "4.43.3"; pyproject = true; disabled = pythonOlder "3.8"; @@ -68,7 +68,7 @@ buildPythonPackage rec { owner = "huggingface"; repo = "transformers"; rev = "refs/tags/v${version}"; - hash = "sha256-TOuwdmuHUW/RoYl7XYLjjBuz7nAuvJWigka2Bf7yNuQ="; + hash = "sha256-CMc+bI99/kN560X7qsXh1tSho0/V8iwJMy4TALambRE="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/types-appdirs/default.nix b/pkgs/development/python-modules/types-appdirs/default.nix index 9c48d6996f8d..7185845566cb 100644 --- a/pkgs/development/python-modules/types-appdirs/default.nix +++ b/pkgs/development/python-modules/types-appdirs/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { }; meta = { - description = "This is a PEP 561 type stub package for the appdirs package. It can be used by type-checking tools like mypy, pyright, pytype, PyCharm, etc. to check code that uses appdirs. "; + description = "This is a PEP 561 type stub package for the appdirs package. It can be used by type-checking tools like mypy, pyright, pytype, PyCharm, etc. to check code that uses appdirs."; homepage = "https://pypi.org/project/types-appdirs"; license = lib.licenses.asl20; maintainers = with lib.maintainers; [ ]; diff --git a/pkgs/development/python-modules/widgetsnbextension/default.nix b/pkgs/development/python-modules/widgetsnbextension/default.nix index c0a6665a41ce..6cf9a308b820 100644 --- a/pkgs/development/python-modules/widgetsnbextension/default.nix +++ b/pkgs/development/python-modules/widgetsnbextension/default.nix @@ -1,5 +1,4 @@ { - lib, buildPythonPackage, fetchPypi, jupyter-packaging, diff --git a/pkgs/development/python-modules/xgboost/default.nix b/pkgs/development/python-modules/xgboost/default.nix index 320b1d1d6ab1..bf2c8908d286 100644 --- a/pkgs/development/python-modules/xgboost/default.nix +++ b/pkgs/development/python-modules/xgboost/default.nix @@ -1,5 +1,4 @@ { - lib, buildPythonPackage, pythonOlder, cmake, diff --git a/pkgs/development/python-modules/xlwt/default.nix b/pkgs/development/python-modules/xlwt/default.nix index 12dfb75ce341..008566a6b2dd 100644 --- a/pkgs/development/python-modules/xlwt/default.nix +++ b/pkgs/development/python-modules/xlwt/default.nix @@ -1,49 +1,41 @@ { lib, buildPythonPackage, - fetchPypi, - nose, + fetchFromGitHub, setuptools, - pythonOlder, + pytestCheckHook, + six, }: -buildPythonPackage rec { +buildPythonPackage { pname = "xlwt"; - version = "1.3.0"; + version = "1.3.0-unstable-2018-09-16"; pyproject = true; - disabled = pythonOlder "3.7"; - - src = fetchPypi { - inherit pname version; - hash = "sha256-xZkScXqbKPGjwqmP1gdBAUsGsEOTbc7LwRPqqtoVbIg="; + src = fetchFromGitHub { + owner = "python-excel"; + repo = "xlwt"; + # Use last commit before archival + rev = "5a222d0315b6d3ce52a3cedd7c3e41309587c107"; + hash = "sha256-YKbqdimX1q+d7A9BSwuKl3SndQ+0eocz+m6xMAZeMQQ="; }; build-system = [ setuptools ]; - # tests rely on nose, archived in 2020 - doCheck = pythonOlder "3.12"; + dependencies = [ six ]; - nativeCheckInputs = [ nose ]; - - checkPhase = '' - runHook preCheck - - nosetests -v - - runHook postCheck - ''; + nativeCheckInputs = [ pytestCheckHook ]; pythonImportsCheck = [ "xlwt" ]; - meta = with lib; { + meta = { description = "Library to create spreadsheet files compatible with MS"; homepage = "https://github.com/python-excel/xlwt"; - license = with licenses; [ + license = with lib.licenses; [ bsdOriginal bsd3 lgpl21Plus ]; - maintainers = with maintainers; [ ]; + maintainers = with lib.maintainers; [ pyrox0 ]; }; } diff --git a/pkgs/development/python-modules/zxing-cpp/default.nix b/pkgs/development/python-modules/zxing-cpp/default.nix index 511a939cf6fb..42372a283f39 100644 --- a/pkgs/development/python-modules/zxing-cpp/default.nix +++ b/pkgs/development/python-modules/zxing-cpp/default.nix @@ -1,5 +1,4 @@ { - lib, buildPythonPackage, cmake, setuptools-scm, diff --git a/pkgs/development/r-modules/wrapper-rstudio.nix b/pkgs/development/r-modules/wrapper-rstudio.nix index b20b61d6c58d..2b65bb3d82da 100644 --- a/pkgs/development/r-modules/wrapper-rstudio.nix +++ b/pkgs/development/r-modules/wrapper-rstudio.nix @@ -1,5 +1,4 @@ -{ lib -, runCommand +{ runCommand , R , rstudio , makeWrapper diff --git a/pkgs/development/rocm-modules/5/clr/test-opencl-example.nix b/pkgs/development/rocm-modules/5/clr/test-opencl-example.nix index 65e2e93782e9..0b612cde3f80 100644 --- a/pkgs/development/rocm-modules/5/clr/test-opencl-example.nix +++ b/pkgs/development/rocm-modules/5/clr/test-opencl-example.nix @@ -41,7 +41,7 @@ let cmakeFlags = [ "-DBUILD_CPP_CL=OFF" ]; meta = with lib; { - description = "Samples from the AMD APP SDK (with OpenCRun support) "; + description = "Samples from the AMD APP SDK (with OpenCRun support)"; homepage = "https://github.com/OpenCL/AMD_APP_samples"; license = licenses.bsd2; platforms = platforms.linux; diff --git a/pkgs/development/rocm-modules/6/clr/test-opencl-example.nix b/pkgs/development/rocm-modules/6/clr/test-opencl-example.nix index 940a670ff579..d2797d1a5016 100644 --- a/pkgs/development/rocm-modules/6/clr/test-opencl-example.nix +++ b/pkgs/development/rocm-modules/6/clr/test-opencl-example.nix @@ -41,7 +41,7 @@ let cmakeFlags = [ "-DBUILD_CPP_CL=OFF" ]; meta = with lib; { - description = "Samples from the AMD APP SDK (with OpenCRun support) "; + description = "Samples from the AMD APP SDK (with OpenCRun support)"; homepage = "https://github.com/OpenCL/AMD_APP_samples"; license = licenses.bsd2; platforms = platforms.linux; diff --git a/pkgs/development/tools/analysis/cargo-tarpaulin/default.nix b/pkgs/development/tools/analysis/cargo-tarpaulin/default.nix index 88968be7b40e..c39b6e56ef8f 100644 --- a/pkgs/development/tools/analysis/cargo-tarpaulin/default.nix +++ b/pkgs/development/tools/analysis/cargo-tarpaulin/default.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-tarpaulin"; - version = "0.30.0"; + version = "0.31.0"; src = fetchFromGitHub { owner = "xd009642"; repo = "tarpaulin"; rev = version; - hash = "sha256-RtkW2FDey049URmr0WGNYcz5sTZXIQ7dZL/OlIaKX20="; + hash = "sha256-4Qnmk9pHGFaRU/bcgrTKcuUJts0HQCcND836QLCX3Uo="; }; - cargoHash = "sha256-HBpEMjc2FQvFqvvcCtxHJBj2waFau77t+m+1ZfomguA="; + cargoHash = "sha256-riBvKGtOoN6eaJqVWbhOh1cSDDtlGUIV1xFFzVfPj4Y="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/development/tools/analysis/checkov/default.nix b/pkgs/development/tools/analysis/checkov/default.nix index 2186d82f5186..099e4f7c6026 100644 --- a/pkgs/development/tools/analysis/checkov/default.nix +++ b/pkgs/development/tools/analysis/checkov/default.nix @@ -6,14 +6,14 @@ python3.pkgs.buildPythonApplication rec { pname = "checkov"; - version = "3.2.207"; + version = "3.2.208"; pyproject = true; src = fetchFromGitHub { owner = "bridgecrewio"; repo = "checkov"; rev = "refs/tags/${version}"; - hash = "sha256-pqMzN7ON7Yv7IHlhW86DpJ0CGOmZum5by88+YA9bv24="; + hash = "sha256-bCaqwgFG/bHy9nWYKqiGMoeXvE9bTc5QZmtp3rDOkUk="; }; patches = [ ./flake8-compat-5.x.patch ]; diff --git a/pkgs/development/tools/analysis/kcov/default.nix b/pkgs/development/tools/analysis/kcov/default.nix index 473dc9d7a4bb..efb0bba4a1b2 100644 --- a/pkgs/development/tools/analysis/kcov/default.nix +++ b/pkgs/development/tools/analysis/kcov/default.nix @@ -17,13 +17,13 @@ let self = stdenv.mkDerivation rec { pname = "kcov"; - version = "42"; + version = "43"; src = fetchFromGitHub { owner = "SimonKagstrom"; repo = "kcov"; rev = "v${version}"; - sha256 = "sha256-8/182RjuNuyFzSyCgyyximGaveDyhStwIQg29S5U/pI="; + sha256 = "sha256-hRJYuHNSXyRoUDBF/yIPXPcBBxZoTO5cgoB2tBhKPwY="; }; preConfigure = "patchShebangs src/bin-to-c-source.py"; diff --git a/pkgs/development/tools/continuous-integration/agola/default.nix b/pkgs/development/tools/continuous-integration/agola/default.nix index f13f6ec2164c..e5f59a784910 100644 --- a/pkgs/development/tools/continuous-integration/agola/default.nix +++ b/pkgs/development/tools/continuous-integration/agola/default.nix @@ -34,7 +34,7 @@ buildGoModule { doCheck = false; meta = with lib; { - description = "Agola: CI/CD Redefined "; + description = "Agola: CI/CD Redefined"; homepage = "https://agola.io"; maintainers = with maintainers; [ happysalada ]; license = licenses.mit; diff --git a/pkgs/development/tools/continuous-integration/woodpecker-plugin-git/default.nix b/pkgs/development/tools/continuous-integration/woodpecker-plugin-git/default.nix index 1008d32401d5..6c6fe743896a 100644 --- a/pkgs/development/tools/continuous-integration/woodpecker-plugin-git/default.nix +++ b/pkgs/development/tools/continuous-integration/woodpecker-plugin-git/default.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "woodpecker-plugin-git"; - version = "2.5.1"; + version = "2.5.2"; src = fetchFromGitHub { owner = "woodpecker-ci"; repo = "plugin-git"; rev = "refs/tags/${version}"; - hash = "sha256-vGJk9IfpuZp0FNLzojFiUGvOpj7EP4cr9ylIoUbddmY="; + hash = "sha256-61WjfeHc8Qyl3RqgafVe1/y8cBOnL8i/fHOAIP4RCdI="; }; vendorHash = "sha256-rUXi3oaawTJoGPmVxmdR1v2eh8BIvCBjxJBz3XRygEg="; diff --git a/pkgs/development/tools/database/indradb/default.nix b/pkgs/development/tools/database/indradb/default.nix index 0df697b8df9d..d003754bc44e 100644 --- a/pkgs/development/tools/database/indradb/default.nix +++ b/pkgs/development/tools/database/indradb/default.nix @@ -14,7 +14,7 @@ let }; meta = with lib; { - description = "Graph database written in rust "; + description = "Graph database written in rust"; homepage = "https://github.com/indradb/indradb"; license = licenses.mpl20; maintainers = with maintainers; [ happysalada ]; diff --git a/pkgs/development/tools/faas-cli/default.nix b/pkgs/development/tools/faas-cli/default.nix index 66f45af3a5ba..3978737cf582 100644 --- a/pkgs/development/tools/faas-cli/default.nix +++ b/pkgs/development/tools/faas-cli/default.nix @@ -18,13 +18,13 @@ let in buildGoModule rec { pname = "faas-cli"; - version = "0.16.30"; + version = "0.16.31"; src = fetchFromGitHub { owner = "openfaas"; repo = "faas-cli"; rev = version; - sha256 = "sha256-tk0ZptDT4qxJLv5sMAh1oF8yXiTsKbv3UiQM8f4ywMA="; + sha256 = "sha256-RvDrdgHzGGjJorm55ksMk+YqPdBgQyWs1IDaxqOYON8="; }; vendorHash = null; @@ -57,7 +57,7 @@ buildGoModule rec { }; meta = with lib; { - description = "Official CLI for OpenFaaS "; + description = "Official CLI for OpenFaaS"; mainProgram = "faas-cli"; homepage = "https://github.com/openfaas/faas-cli"; license = licenses.mit; diff --git a/pkgs/development/tools/ginkgo/default.nix b/pkgs/development/tools/ginkgo/default.nix index aefcaec12e17..52c49b853470 100644 --- a/pkgs/development/tools/ginkgo/default.nix +++ b/pkgs/development/tools/ginkgo/default.nix @@ -2,15 +2,15 @@ buildGoModule rec { pname = "ginkgo"; - version = "2.19.0"; + version = "2.19.1"; src = fetchFromGitHub { owner = "onsi"; repo = "ginkgo"; rev = "v${version}"; - sha256 = "sha256-+Kh+Pn0oEq/eDXE+vsYrSOqhSoeQoIueb6mVpT2bljc="; + sha256 = "sha256-U8oSROthoqZsEEk3EUkojyHcpR3WJgDYDTAg+/ggqE8="; }; - vendorHash = "sha256-ccqhuUL99dtIeiEM4hRdi0479I0cyf8pxSZz0G6Vm+w="; + vendorHash = "sha256-JQ1BayYPsp1VSEdGtRXI3NFZamHMLv/5C8G2gEY0qY0="; # integration tests expect more file changes # types tests are missing CodeLocation diff --git a/pkgs/development/tools/gptcommit/default.nix b/pkgs/development/tools/gptcommit/default.nix index 5da71c7bc1c9..f1bd3376e160 100644 --- a/pkgs/development/tools/gptcommit/default.nix +++ b/pkgs/development/tools/gptcommit/default.nix @@ -38,7 +38,7 @@ rustPlatform.buildRustPackage { }; meta = with lib; { - description = "Git prepare-commit-msg hook for authoring commit messages with GPT-3. "; + description = "Git prepare-commit-msg hook for authoring commit messages with GPT-3."; mainProgram = "gptcommit"; homepage = "https://github.com/zurawiki/gptcommit"; license = with licenses; [ asl20 ]; diff --git a/pkgs/development/tools/img/default.nix b/pkgs/development/tools/img/default.nix index 0dab6b28dc74..f7c751cf0ea3 100644 --- a/pkgs/development/tools/img/default.nix +++ b/pkgs/development/tools/img/default.nix @@ -47,7 +47,7 @@ buildGoModule rec { doCheck = false; meta = with lib; { - description = "Standalone, daemon-less, unprivileged Dockerfile and OCI compatible container image builder. "; + description = "Standalone, daemon-less, unprivileged Dockerfile and OCI compatible container image builder."; mainProgram = "img"; license = licenses.mit; homepage = "https://github.com/genuinetools/img"; diff --git a/pkgs/development/tools/language-servers/fortls/default.nix b/pkgs/development/tools/language-servers/fortls/default.nix index f7fef6676102..5faa408ecff2 100644 --- a/pkgs/development/tools/language-servers/fortls/default.nix +++ b/pkgs/development/tools/language-servers/fortls/default.nix @@ -25,7 +25,7 @@ buildPythonApplication rec { checkPhase = "$out/bin/fortls --help 1>/dev/null"; meta = with lib; { - description = "Fortran Language Server "; + description = "Fortran Language Server"; mainProgram = "fortls"; homepage = "https://github.com/fortran-lang/fortls"; license = [ licenses.mit ]; diff --git a/pkgs/development/tools/misc/blackfire/default.nix b/pkgs/development/tools/misc/blackfire/default.nix index 4460d3dd8b20..d67b81dd4fbb 100644 --- a/pkgs/development/tools/misc/blackfire/default.nix +++ b/pkgs/development/tools/misc/blackfire/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { pname = "blackfire"; - version = "2.28.7"; + version = "2.28.9"; src = passthru.sources.${stdenv.hostPlatform.system} or (throw "Unsupported platform for blackfire: ${stdenv.hostPlatform.system}"); @@ -57,23 +57,23 @@ stdenv.mkDerivation rec { sources = { "x86_64-linux" = fetchurl { url = "https://packages.blackfire.io/debian/pool/any/main/b/blackfire/blackfire_${version}_amd64.deb"; - sha256 = "XovtaEOUy67KyfYsF0KmzDNef7Jt01gkWrAq+xPS3uQ="; + sha256 = "IP5B0vlB8W6yKunHcwsUhMuQ0c2+UZf8TDk0Rviygaw="; }; "i686-linux" = fetchurl { url = "https://packages.blackfire.io/debian/pool/any/main/b/blackfire/blackfire_${version}_i386.deb"; - sha256 = "C4LutO/wGjFOIOsulCoAmeHSkLCPgNGVd5vRclwoP9g="; + sha256 = "PJhwQ65odKWHPa5CH6b7eiYmzbbg5Rh4nJjkwxlCOsU="; }; "aarch64-linux" = fetchurl { url = "https://packages.blackfire.io/debian/pool/any/main/b/blackfire/blackfire_${version}_arm64.deb"; - sha256 = "FBuwu1EYjDTMSW/slt94kxsXzSqhqPdUspM5XYNzHsw="; + sha256 = "5GrsVTDYVjVHqTs3OKJOMpYdZGqDwjB9T90Yv3c59/4="; }; "aarch64-darwin" = fetchurl { url = "https://packages.blackfire.io/blackfire/${version}/blackfire-darwin_arm64.pkg.tar.gz"; - sha256 = "g7fsG6sWdRmXvL1S9vI3yNHDKSWOdzLrp7Ydpw1jNss="; + sha256 = "1yK3b6BXjWeqKDfgtlzD5/3FrSUqvCLrhFSAg7os3Ao="; }; "x86_64-darwin" = fetchurl { url = "https://packages.blackfire.io/blackfire/${version}/blackfire-darwin_amd64.pkg.tar.gz"; - sha256 = "Ht3K297MExglKmtws/RvhQHFPhf1bTkIoNRvT/yJ+CM="; + sha256 = "HyI4R7DZJAmMd7MfJX/i3nswoHizgRkalyH137cfChU="; }; }; diff --git a/pkgs/development/tools/ocaml/js_of_ocaml/toplevel.nix b/pkgs/development/tools/ocaml/js_of_ocaml/toplevel.nix index 814aab16cb00..90c14554b509 100644 --- a/pkgs/development/tools/ocaml/js_of_ocaml/toplevel.nix +++ b/pkgs/development/tools/ocaml/js_of_ocaml/toplevel.nix @@ -1,4 +1,4 @@ -{ lib, buildDunePackage, js_of_ocaml-compiler, ppxlib }: +{ buildDunePackage, js_of_ocaml-compiler, ppxlib }: buildDunePackage { pname = "js_of_ocaml-toplevel"; diff --git a/pkgs/development/tools/ocaml/merlin/lib.nix b/pkgs/development/tools/ocaml/merlin/lib.nix index 27c8035a5e3b..4a9bc320cdc2 100644 --- a/pkgs/development/tools/ocaml/merlin/lib.nix +++ b/pkgs/development/tools/ocaml/merlin/lib.nix @@ -1,4 +1,4 @@ -{ lib, buildDunePackage, merlin, csexp }: +{ buildDunePackage, merlin, csexp }: buildDunePackage { pname = "merlin-lib"; diff --git a/pkgs/development/tools/ocaml/opam/installer.nix b/pkgs/development/tools/ocaml/opam/installer.nix index a56621267df3..a96fd9d5f5ea 100644 --- a/pkgs/development/tools/ocaml/opam/installer.nix +++ b/pkgs/development/tools/ocaml/opam/installer.nix @@ -1,4 +1,4 @@ -{ lib, unzip, opam, ocamlPackages }: +{ unzip, opam, ocamlPackages }: ocamlPackages.buildDunePackage { pname = "opam-installer"; diff --git a/pkgs/development/tools/qtcreator/default.nix b/pkgs/development/tools/qtcreator/default.nix index ef3d61e60f77..5a097393d639 100644 --- a/pkgs/development/tools/qtcreator/default.nix +++ b/pkgs/development/tools/qtcreator/default.nix @@ -30,11 +30,11 @@ stdenv.mkDerivation rec { pname = "qtcreator"; - version = "13.0.2"; + version = "14.0.0"; src = fetchurl { url = "https://download.qt.io/official_releases/${pname}/${lib.versions.majorMinor version}/${version}/qt-creator-opensource-src-${version}.tar.xz"; - hash = "sha256-wSXMVSJhnH+PwoBadQq5bLu1al/fw4i2yxWrda9+wM4="; + hash = "sha256-8v3P+cuO1/1csfx3k1LHp6lCkieIygAN6F2229eo1FQ="; }; nativeBuildInputs = [ diff --git a/pkgs/development/tools/rust/cargo-deny/default.nix b/pkgs/development/tools/rust/cargo-deny/default.nix index 7a88815b2c1d..b76b0a2f38ac 100644 --- a/pkgs/development/tools/rust/cargo-deny/default.nix +++ b/pkgs/development/tools/rust/cargo-deny/default.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-deny"; - version = "0.14.24"; + version = "0.15.0"; src = fetchFromGitHub { owner = "EmbarkStudios"; repo = "cargo-deny"; rev = version; - hash = "sha256-pCgOT1czLTlL3u4mqhQroal9Z5FHxnBR0YLx3wqp7ps="; + hash = "sha256-utgafrYBm9UCHmvJtxEPHMjXZ0luFUUEDrgLO6i3CJg="; }; - cargoHash = "sha256-LCdP9i+LogdPVVCI4UIhqGRy6H3GTMpEwX2QOlXbo8Q="; + cargoHash = "sha256-XdBcFtt7LJq6um3QiX2VBQTIMVuOAqfpy0dY3GLIXmM="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/development/tools/rust/cargo-hf2/default.nix b/pkgs/development/tools/rust/cargo-hf2/default.nix index a4e04277d5e7..41dd6ae904b0 100644 --- a/pkgs/development/tools/rust/cargo-hf2/default.nix +++ b/pkgs/development/tools/rust/cargo-hf2/default.nix @@ -23,7 +23,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ libusb1 ] ++ lib.optionals stdenv.isDarwin [ AppKit ]; meta = with lib; { - description = "Cargo Subcommand for Microsoft HID Flashing Library for UF2 Bootloaders "; + description = "Cargo Subcommand for Microsoft HID Flashing Library for UF2 Bootloaders"; mainProgram = "cargo-hf2"; homepage = "https://lib.rs/crates/cargo-hf2"; license = with licenses; [ mit ]; diff --git a/pkgs/development/tools/rust/cargo-mobile2/default.nix b/pkgs/development/tools/rust/cargo-mobile2/default.nix index 9b5d535ec50a..ddaed69abe7c 100644 --- a/pkgs/development/tools/rust/cargo-mobile2/default.nix +++ b/pkgs/development/tools/rust/cargo-mobile2/default.nix @@ -46,7 +46,7 @@ rustPlatform.buildRustPackage { ''; meta = with lib; { - description = "Rust on mobile made easy! "; + description = "Rust on mobile made easy!"; homepage = "https://tauri.app/"; license = with licenses; [ asl20 /* or */ mit ]; maintainers = with maintainers; [ happysalada ]; diff --git a/pkgs/development/tools/rust/cargo-mutants/default.nix b/pkgs/development/tools/rust/cargo-mutants/default.nix index 1a54ba51a9a6..742000213879 100644 --- a/pkgs/development/tools/rust/cargo-mutants/default.nix +++ b/pkgs/development/tools/rust/cargo-mutants/default.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-mutants"; - version = "24.7.0"; + version = "24.7.1"; src = fetchFromGitHub { owner = "sourcefrog"; repo = "cargo-mutants"; rev = "v${version}"; - hash = "sha256-cDwNjPuXa6cpgGUDAAZVWZulcAYM6p5vUQrCs9njuUs="; + hash = "sha256-56IIMifv5epThXeWtQbNLwee1IQ52SPKik4hsHlnv6w="; }; - cargoHash = "sha256-6igY0LzjwPNmVxXTgj+RE5GpK/EyBRhv0yqHp15051s="; + cargoHash = "sha256-VRkhDgKunSUOz2/U4oC2t0YrDh5l48z4luevMazfj6o="; buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.SystemConfiguration diff --git a/pkgs/development/tools/rust/cargo-workspaces/default.nix b/pkgs/development/tools/rust/cargo-workspaces/default.nix index 1bed092b1c42..289fb2fcd3db 100644 --- a/pkgs/development/tools/rust/cargo-workspaces/default.nix +++ b/pkgs/development/tools/rust/cargo-workspaces/default.nix @@ -11,14 +11,14 @@ rustPlatform.buildRustPackage rec { pname = "cargo-workspaces"; - version = "0.3.2"; + version = "0.3.5"; src = fetchCrate { inherit pname version; - hash = "sha256-fSvs3dr8dO9n9WCiO1UFr29cp1pvKxL9faOvYnLG+wk="; + hash = "sha256-eNZOtbN3WH7/Y0RjXZCPRxC4Yv0kEtVSqMLsyznPGwU="; }; - cargoHash = "sha256-uB3iN7xt0+qEpRelZQ8uurj6Ve9t9sVTCuH6N4+tDh4="; + cargoHash = "sha256-B5Pc9nzMf9N6FTY1KZ+lj7/RSbJiK/ahotztoopzABk="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/development/tools/rust/rust-analyzer/wrapper.nix b/pkgs/development/tools/rust/rust-analyzer/wrapper.nix index 6fa5207de6eb..af0a2953edee 100644 --- a/pkgs/development/tools/rust/rust-analyzer/wrapper.nix +++ b/pkgs/development/tools/rust/rust-analyzer/wrapper.nix @@ -1,4 +1,4 @@ -{ lib, rustPlatform, runCommand, makeWrapper, rust-analyzer-unwrapped +{ rustPlatform, runCommand, makeWrapper, rust-analyzer-unwrapped , pname ? "rust-analyzer" , version ? rust-analyzer-unwrapped.version # Use name from `RUST_SRC_PATH` diff --git a/pkgs/development/tools/statik/default.nix b/pkgs/development/tools/statik/default.nix index 8b4386860e0a..5dec08d0d6e6 100644 --- a/pkgs/development/tools/statik/default.nix +++ b/pkgs/development/tools/statik/default.nix @@ -22,7 +22,7 @@ buildGoModule rec { meta = with lib; { homepage = "https://github.com/rakyll/statik"; - description = "Embed files into a Go executable "; + description = "Embed files into a Go executable"; mainProgram = "statik"; license = licenses.asl20; maintainers = with maintainers; [ Madouura ]; diff --git a/pkgs/development/tools/tailwindcss/default.nix b/pkgs/development/tools/tailwindcss/default.nix index 9d292fd5fff2..bb76ee0f8550 100644 --- a/pkgs/development/tools/tailwindcss/default.nix +++ b/pkgs/development/tools/tailwindcss/default.nix @@ -18,16 +18,16 @@ let }.${system} or throwSystem; hash = { - aarch64-darwin = "sha256-9vRoGoYCJ1CGDOZtv6D3ZmH0HA3RTPIsB5SeGzCb+Dc="; - aarch64-linux = "sha256-Z6NZ2izOWVxuiwqvoGitOHhQe8Y9lk7q73Tv4iYh6Ds="; - armv7l-linux = "sha256-xuPWvQ2isSG4CQVzzQM0CGxW+KHKYj31hIEHZI2rB/g="; - x86_64-darwin = "sha256-omsqaCM+1sPu4AG59oOgYwQBpEJ7irjvTHIo62GVCoE="; - x86_64-linux = "sha256-fPbI6np3wDqS/OGi2GikgsyMtIVHhxcl+D9lnLd0vos="; + aarch64-darwin = "sha256-Dto7yP6QUGt7nly5MDEgQnMLdqfxgCbRlBTUj7sxAO0="; + aarch64-linux = "sha256-QUam9TT/+yf5XemSbXgGpuQy7rflXLiFClfE4GJonCs="; + armv7l-linux = "sha256-hcTHFhjwv82w7fJG7W7jlKet24rzTtfb3OkpgnkkOZQ="; + x86_64-darwin = "sha256-j4tc0y/DWEPsJLvNshTpct9qnEhb9NT9BJFA+8x2a8w="; + x86_64-linux = "sha256-PCMh5mcY855IOIcHzotYeUYzj4LvPWNsjuGWcFFNM5Q="; }.${system} or throwSystem; in stdenv.mkDerivation rec { pname = "tailwindcss"; - version = "3.4.5"; + version = "3.4.7"; src = fetchurl { url = "https://github.com/tailwindlabs/tailwindcss/releases/download/v${version}/tailwindcss-${plat}"; diff --git a/pkgs/development/web/insomnia/default.nix b/pkgs/development/web/insomnia/default.nix index 0ebe273949d8..9317dbe8f4e9 100644 --- a/pkgs/development/web/insomnia/default.nix +++ b/pkgs/development/web/insomnia/default.nix @@ -21,7 +21,7 @@ let meta = with lib; { homepage = "https://insomnia.rest"; - description = " The open-source, cross-platform API client for GraphQL, REST, WebSockets, SSE and gRPC. With Cloud, Local and Git storage. "; + description = " The open-source, cross-platform API client for GraphQL, REST, WebSockets, SSE and gRPC. With Cloud, Local and Git storage."; mainProgram = "insomnia"; changelog = "https://github.com/Kong/insomnia/releases/tag/core@${version}"; license = licenses.asl20; diff --git a/pkgs/games/mnemosyne/default.nix b/pkgs/games/mnemosyne/default.nix index 371ac99b4f66..cd8142574d8d 100644 --- a/pkgs/games/mnemosyne/default.nix +++ b/pkgs/games/mnemosyne/default.nix @@ -1,5 +1,4 @@ -{ lib -, python +{ python , fetchurl , anki }: diff --git a/pkgs/games/opentyrian/default.nix b/pkgs/games/opentyrian/default.nix index 1f0e9ae18a64..3068f5a004e2 100644 --- a/pkgs/games/opentyrian/default.nix +++ b/pkgs/games/opentyrian/default.nix @@ -1,5 +1,4 @@ -{ lib -, stdenv +{ stdenv , fetchFromGitHub , fetchzip , SDL2 diff --git a/pkgs/games/osu-lazer/bin.nix b/pkgs/games/osu-lazer/bin.nix index b575c1953c5f..42ba68c851ed 100644 --- a/pkgs/games/osu-lazer/bin.nix +++ b/pkgs/games/osu-lazer/bin.nix @@ -7,22 +7,22 @@ let pname = "osu-lazer-bin"; - version = "2024.718.1"; + version = "2024.726.0"; src = { aarch64-darwin = fetchzip { url = "https://github.com/ppy/osu/releases/download/${version}/osu.app.Apple.Silicon.zip"; - hash = "sha256-23ZS2lkVDNpaWKkRMrkMwPhCaudoMxehV+k/7wXHnJ0="; + hash = "sha256-XsgKTBXfGFxbWyBdr/1BNP58p6VwMiTo3gblSkrilbY="; stripRoot = false; }; x86_64-darwin = fetchzip { url = "https://github.com/ppy/osu/releases/download/${version}/osu.app.Intel.zip"; - hash = "sha256-1ZYPnxyknm7cxPW4CmzE1G652CSC0jKI2g4+yHg7HsE="; + hash = "sha256-eeLrbaS/IiwLaRymwpQrHVDirCWcUBmVLHxA/K4V2SM="; stripRoot = false; }; x86_64-linux = fetchurl { url = "https://github.com/ppy/osu/releases/download/${version}/osu.AppImage"; - hash = "sha256-+udJYFOTAUNaQnOTzqwvSm2ryDJ+AfJfQ4hths6aEYs="; + hash = "sha256-GhX0qSicoRbmHvtyAB37AGr2dWh4OCDJApi9RcUVzwY="; }; }.${stdenv.system} or (throw "${pname}-${version}: ${stdenv.system} is unsupported."); diff --git a/pkgs/games/osu-lazer/default.nix b/pkgs/games/osu-lazer/default.nix index bee4b288aa98..392836f9cfa8 100644 --- a/pkgs/games/osu-lazer/default.nix +++ b/pkgs/games/osu-lazer/default.nix @@ -17,13 +17,13 @@ buildDotnetModule rec { pname = "osu-lazer"; - version = "2024.718.1"; + version = "2024.726.0"; src = fetchFromGitHub { owner = "ppy"; repo = "osu"; rev = version; - hash = "sha256-A3zBYdsOf/Ht15saRQtdNi1ZTnDRcAPWeSelXg6EeaI="; + hash = "sha256-SakrmL8Cx+r2C1cNV0ZARwsdC2D8saO1TibDJbAyzxI="; }; projectFile = "osu.Desktop/osu.Desktop.csproj"; diff --git a/pkgs/games/path-of-building/default.nix b/pkgs/games/path-of-building/default.nix index 8697f9dc56f4..a9f95d9b85bb 100644 --- a/pkgs/games/path-of-building/default.nix +++ b/pkgs/games/path-of-building/default.nix @@ -17,13 +17,13 @@ let data = stdenv.mkDerivation (finalAttrs: { pname = "path-of-building-data"; - version = "2.45.0"; + version = "2.46.0"; src = fetchFromGitHub { owner = "PathOfBuildingCommunity"; repo = "PathOfBuilding"; rev = "v${finalAttrs.version}"; - hash = "sha256-WxaE9QvpM+1Mp3K979HqQxDjO0QUBL4lzLaZwYdhtfc="; + hash = "sha256-L63pFaIjSDEzEud+v4IbNjFVdwTBU08/xICBIHzPutE="; }; nativeBuildInputs = [ unzip ]; diff --git a/pkgs/games/raylib-games/default.nix b/pkgs/games/raylib-games/default.nix index 802093b8682c..7a0d80a4c5e6 100644 --- a/pkgs/games/raylib-games/default.nix +++ b/pkgs/games/raylib-games/default.nix @@ -52,7 +52,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - description = "Collection of games made with raylib "; + description = "Collection of games made with raylib"; homepage = "https://www.raylib.com/games.html"; license = licenses.zlib; maintainers = with maintainers; [ ehmry ]; diff --git a/pkgs/games/shticker-book-unwritten/unwrapped.nix b/pkgs/games/shticker-book-unwritten/unwrapped.nix index d87a7f45a956..71b4477f493f 100644 --- a/pkgs/games/shticker-book-unwritten/unwrapped.nix +++ b/pkgs/games/shticker-book-unwritten/unwrapped.nix @@ -1,4 +1,4 @@ -{ lib, rustPlatform, fetchCrate, pkg-config, openssl }: +{ rustPlatform, fetchCrate, pkg-config, openssl }: rustPlatform.buildRustPackage rec { pname = "shticker-book-unwritten"; diff --git a/pkgs/misc/drivers/hplip/default.nix b/pkgs/misc/drivers/hplip/default.nix index b3bc2cf8f411..fa3c2aad09fd 100644 --- a/pkgs/misc/drivers/hplip/default.nix +++ b/pkgs/misc/drivers/hplip/default.nix @@ -282,6 +282,6 @@ python311Packages.buildPythonApplication { then licenses.unfree else with licenses; [ mit bsd2 gpl2Plus ]; platforms = [ "i686-linux" "x86_64-linux" "armv6l-linux" "armv7l-linux" "aarch64-linux" ]; - maintainers = with maintainers; [ ttuegel arthsmn ]; + maintainers = with maintainers; [ ttuegel ]; }; } diff --git a/pkgs/os-specific/bsd/freebsd/default.nix b/pkgs/os-specific/bsd/freebsd/default.nix index cfe6080b020a..2d599a7c56e7 100644 --- a/pkgs/os-specific/bsd/freebsd/default.nix +++ b/pkgs/os-specific/bsd/freebsd/default.nix @@ -1,5 +1,4 @@ { - lib, makeScopeWithSplicing', generateSplicesForMkScope, callPackage, diff --git a/pkgs/os-specific/bsd/freebsd/pkgs/libutil.nix b/pkgs/os-specific/bsd/freebsd/pkgs/libutil.nix index b7600185ae07..450cdfde0eaa 100644 --- a/pkgs/os-specific/bsd/freebsd/pkgs/libutil.nix +++ b/pkgs/os-specific/bsd/freebsd/pkgs/libutil.nix @@ -1,4 +1,4 @@ -{ mkDerivation, lib }: +{ mkDerivation }: mkDerivation { path = "lib/libutil"; extraPaths = [ "lib/libc/gen" ]; diff --git a/pkgs/os-specific/bsd/freebsd/pkgs/tsort.nix b/pkgs/os-specific/bsd/freebsd/pkgs/tsort.nix index 04a45ff980cb..8ccf12f846b3 100644 --- a/pkgs/os-specific/bsd/freebsd/pkgs/tsort.nix +++ b/pkgs/os-specific/bsd/freebsd/pkgs/tsort.nix @@ -1,5 +1,4 @@ { - lib, mkDerivation, bsdSetupHook, freebsdSetupHook, diff --git a/pkgs/os-specific/bsd/netbsd/pkgs/libedit.nix b/pkgs/os-specific/bsd/netbsd/pkgs/libedit.nix index cb9951cb8cf1..934d4d862458 100644 --- a/pkgs/os-specific/bsd/netbsd/pkgs/libedit.nix +++ b/pkgs/os-specific/bsd/netbsd/pkgs/libedit.nix @@ -1,5 +1,4 @@ { - lib, mkDerivation, libterminfo, libcurses, diff --git a/pkgs/os-specific/bsd/netbsd/pkgs/make.nix b/pkgs/os-specific/bsd/netbsd/pkgs/make.nix index 6652d5454387..4cbb488dc3c6 100644 --- a/pkgs/os-specific/bsd/netbsd/pkgs/make.nix +++ b/pkgs/os-specific/bsd/netbsd/pkgs/make.nix @@ -1,8 +1,4 @@ -{ - lib, - mkDerivation, - make-rules, -}: +{ mkDerivation, make-rules }: mkDerivation { path = "usr.bin/make"; diff --git a/pkgs/os-specific/bsd/openbsd/pkgs/include/package.nix b/pkgs/os-specific/bsd/openbsd/pkgs/include/package.nix index 481e302065fc..019f428713ff 100644 --- a/pkgs/os-specific/bsd/openbsd/pkgs/include/package.nix +++ b/pkgs/os-specific/bsd/openbsd/pkgs/include/package.nix @@ -1,5 +1,4 @@ { - lib, mkDerivation, makeMinimal, bsdSetupHook, diff --git a/pkgs/os-specific/darwin/hexfiend/default.nix b/pkgs/os-specific/darwin/hexfiend/default.nix index df81d7882d00..2a5ec7a461c5 100644 --- a/pkgs/os-specific/darwin/hexfiend/default.nix +++ b/pkgs/os-specific/darwin/hexfiend/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, undmg }: +{ stdenv, lib, fetchurl, undmg, nix-update-script }: let urlSuffix = version: if lib.versions.patch == 0 then @@ -23,6 +23,8 @@ stdenv.mkDerivation rec { cp -R . "$out/Applications/Hex Fiend.app" ''; + passthru.updateScript = nix-update-script { }; + meta = with lib; { description = "Open-source macOS hex editor"; homepage = "http://hexfiend.com/"; diff --git a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix index b90966d1e75f..ba5daf6887aa 100644 --- a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix +++ b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix @@ -6,14 +6,14 @@ let # NOTE: When updating these, please also take a look at the changes done to # kernel config in the xanmod version commit ltsVariant = { - version = "6.6.41"; - hash = "sha256-74bM7zKEo2wdCEygiWd+niGQm1abM6OIJ2C5CXdrIMY="; + version = "6.6.42"; + hash = "sha256-0YqvOObUHP2S8Jf1H+fzAZ+wOMoFt1BLxWilqt6ohVg="; variant = "lts"; }; mainVariant = { - version = "6.9.10"; - hash = "sha256-SHYuEIfpykFNa7bPI0G7DDmBHsXBWYVOxcIS3ShZ6Rw="; + version = "6.9.11"; + hash = "sha256-c6Mkk37SFoC9hJfh/iQqyNzGJJjN0W28VLta/nayCgc="; variant = "main"; }; diff --git a/pkgs/os-specific/linux/nftables/python.nix b/pkgs/os-specific/linux/nftables/python.nix index 7980b8ff6de6..bb9ebd621fcd 100644 --- a/pkgs/os-specific/linux/nftables/python.nix +++ b/pkgs/os-specific/linux/nftables/python.nix @@ -1,5 +1,4 @@ -{ lib -, buildPythonPackage +{ buildPythonPackage , setuptools , nftables }: diff --git a/pkgs/os-specific/linux/reap/default.nix b/pkgs/os-specific/linux/reap/default.nix index 79bfe2936276..f8ba9fa6b0ec 100644 --- a/pkgs/os-specific/linux/reap/default.nix +++ b/pkgs/os-specific/linux/reap/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://github.com/leahneukirchen/reap"; - description = "run process until all its spawned processes are dead "; + description = "run process until all its spawned processes are dead"; mainProgram = "reap"; license = with licenses; [ publicDomain ]; platforms = platforms.linux; diff --git a/pkgs/pkgs-lib/formats/hocon/test/backwards-compatibility/default.nix b/pkgs/pkgs-lib/formats/hocon/test/backwards-compatibility/default.nix index 5f0b3d12a2d0..8b9196b16428 100644 --- a/pkgs/pkgs-lib/formats/hocon/test/backwards-compatibility/default.nix +++ b/pkgs/pkgs-lib/formats/hocon/test/backwards-compatibility/default.nix @@ -1,4 +1,4 @@ -{ lib, formats, stdenvNoCC, writeText, ... }: +{ formats, stdenvNoCC, ... }: let hocon = formats.hocon { }; diff --git a/pkgs/servers/apache-airflow/default.nix b/pkgs/servers/apache-airflow/default.nix index 5021f66390ba..1055f79806d4 100644 --- a/pkgs/servers/apache-airflow/default.nix +++ b/pkgs/servers/apache-airflow/default.nix @@ -1,5 +1,4 @@ -{ lib -, fetchFromGitHub +{ fetchFromGitHub , fetchPypi , python3 }: diff --git a/pkgs/servers/apache-kafka/default.nix b/pkgs/servers/apache-kafka/default.nix index 70445612115f..fd7cd084a60b 100644 --- a/pkgs/servers/apache-kafka/default.nix +++ b/pkgs/servers/apache-kafka/default.nix @@ -3,9 +3,9 @@ let versionMap = { "3_7" = { - kafkaVersion = "3.7.0"; + kafkaVersion = "3.7.1"; scalaVersion = "2.13"; - sha256 = "sha256-ZfJuWTe7t23+eN+0FnMN+n4zeLJ+E/0eIE8aEJm/r5w="; + sha256 = "sha256-YqyuShQ92YPcfrSATVdEugxQsZm1CPWZ7wAQIOJVj8k="; jre = jdk17_headless; }; "3_6" = { diff --git a/pkgs/servers/etcd/3.5/default.nix b/pkgs/servers/etcd/3.5/default.nix index 00cade7d5242..b293d5f45ade 100644 --- a/pkgs/servers/etcd/3.5/default.nix +++ b/pkgs/servers/etcd/3.5/default.nix @@ -1,11 +1,11 @@ { lib, buildGoModule, fetchFromGitHub, symlinkJoin, nixosTests, k3s }: let - version = "3.5.14"; - etcdSrcHash = "sha256-BbrOWAVrUj3LxFGvm1ycnFHglskaZesL0XILLnN8TIE="; - etcdServerVendorHash = "sha256-LNVRwPaaqpk7PKcgzwNrtBx+Dy9JJS88RT71RBDJ0ug="; - etcdUtlVendorHash = "sha256-fFERNwaWwdukTtACuihlMZZYpdo0cnZnnFb5xmug2vI="; - etcdCtlVendorHash = "sha256-cQMWb0PGYUPLlYvILrD2vxcDhcpYdAts9ARTeAh1Wew="; + version = "3.5.15"; + etcdSrcHash = "sha256-AY6ug9WU4cFP5sHWrigEPYsF7B386DGtlc689dnrbUw="; + etcdServerVendorHash = "sha256-aIvZYc0ouJtEv4nf9IA8kZkmCP9KXuqhv9zEpzEwRF8="; + etcdUtlVendorHash = "sha256-omBRlu3pOmUHEyhxFvUEaGragTl1y5YXn7iLMlQ95CA="; + etcdCtlVendorHash = "sha256-mr2TLEgAM4hMtnN2t8oGIQwI1+8vRQH8VjPDwymfkTY="; src = fetchFromGitHub { owner = "etcd-io"; diff --git a/pkgs/servers/freeradius/default.nix b/pkgs/servers/freeradius/default.nix index 1227bf59f3af..5be808d6b483 100644 --- a/pkgs/servers/freeradius/default.nix +++ b/pkgs/servers/freeradius/default.nix @@ -1,11 +1,11 @@ { lib , stdenv -, fetchurl +, fetchFromGitHub , autoreconfHook , bsd-finger , perl , talloc -, linkOpenssl? true, openssl +, linkOpenssl ? true, openssl , withCap ? true, libcap , withCollectd ? false, collectd , withJson ? false, json_c @@ -25,9 +25,11 @@ stdenv.mkDerivation rec { pname = "freeradius"; version = "3.2.5"; - src = fetchurl { - url = "https://github.com/FreeRADIUS/freeradius-server/releases/download/release_${lib.replaceStrings [ "." ] [ "_" ] version}/freeradius-server-${version}.tar.gz"; - hash = "sha256-HnX1/Blh2YVNHLPGkhYS++K57bjuUIpafL1p8edgcRU="; + src = fetchFromGitHub { + owner = "FreeRADIUS"; + repo = "freeradius-server"; + rev = "refs/tags/release_${lib.replaceStrings [ "." ] [ "_" ] version}"; + hash = "sha256-1n447BpTqmkg5tyXe9yPzjfDoh7wMLZhwouUEzkwxKM="; }; nativeBuildInputs = [ autoreconfHook ]; diff --git a/pkgs/servers/home-assistant/build-custom-component/default.nix b/pkgs/servers/home-assistant/build-custom-component/default.nix index 17677e99d125..7f45ac6bcb00 100644 --- a/pkgs/servers/home-assistant/build-custom-component/default.nix +++ b/pkgs/servers/home-assistant/build-custom-component/default.nix @@ -39,5 +39,9 @@ home-assistant.python.pkgs.buildPythonPackage ( packaging ] ++ (args.nativeCheckInputs or []); - } // builtins.removeAttrs args [ "nativeCheckInputs" ] + passthru = { + isHomeAssistantComponent = true; + } // args.passthru or { }; + + } // builtins.removeAttrs args [ "nativeCheckInputs" "passthru" ] ) diff --git a/pkgs/servers/home-assistant/custom-components/samsungtv-smart/default.nix b/pkgs/servers/home-assistant/custom-components/samsungtv-smart/default.nix index f4af035e51fe..fea99dce2ef6 100644 --- a/pkgs/servers/home-assistant/custom-components/samsungtv-smart/default.nix +++ b/pkgs/servers/home-assistant/custom-components/samsungtv-smart/default.nix @@ -29,7 +29,7 @@ buildHomeAssistantComponent rec { meta = with lib; { changelog = "https://github.com/ollo69/ha-samsungtv-smart/releases/tag/v${version}"; - description = "Home Assistant Samsung TV Integration "; + description = "Home Assistant Samsung TV Integration"; homepage = "https://github.com/ollo69/ha-samsungtv-smart"; maintainers = with maintainers; [ mindstorms6 ]; license = licenses.asl20; diff --git a/pkgs/servers/http/apache-modules/mod_spkac/default.nix b/pkgs/servers/http/apache-modules/mod_spkac/default.nix index 639045d18aff..140d598a66f6 100644 --- a/pkgs/servers/http/apache-modules/mod_spkac/default.nix +++ b/pkgs/servers/http/apache-modules/mod_spkac/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { }; meta = with lib; { - description = "RedWax CA service module for handling the Netscape keygen requests. "; + description = "RedWax CA service module for handling the Netscape keygen requests."; homepage = "https://redwax.eu"; changelog = "https://source.redwax.eu/projects/RS/repos/mod_spkac/browse/ChangeLog"; license = licenses.asl20; diff --git a/pkgs/servers/http/nginx/modules.nix b/pkgs/servers/http/nginx/modules.nix index f06b5b9426f2..591e0852241e 100644 --- a/pkgs/servers/http/nginx/modules.nix +++ b/pkgs/servers/http/nginx/modules.nix @@ -600,7 +600,7 @@ let self = { inputs = [ pam ]; meta = with lib; { - description = "Use PAM for simple http authentication "; + description = "Use PAM for simple http authentication"; homepage = "https://github.com/sto/ngx_http_auth_pam_module"; license = with licenses; [ bsd2 ]; maintainers = with maintainers; [ ]; diff --git a/pkgs/servers/keycloak/keycloak-metrics-spi/default.nix b/pkgs/servers/keycloak/keycloak-metrics-spi/default.nix index 82e6163491ba..a595dab70333 100644 --- a/pkgs/servers/keycloak/keycloak-metrics-spi/default.nix +++ b/pkgs/servers/keycloak/keycloak-metrics-spi/default.nix @@ -1,21 +1,21 @@ -{ maven, stdenv, lib, fetchFromGitHub }: +{ + maven, + lib, + fetchFromGitHub, +}: maven.buildMavenPackage rec { pname = "keycloak-metrics-spi"; - version = "5.0.0"; + version = "6.0.0"; src = fetchFromGitHub { owner = "aerogear"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-iagXbsKsU4vNP9eg05bwXEo67iij3N2FF0BW50MjRGE="; + hash = "sha256-MMonBRau8FpfCqija6NEdvp4zJfEub2Kwk4MA7FYWHI="; }; - mvnHash = { - aarch64-linux = "sha256-zO79pRrY8TqrSK4bB8l4pl6834aFX2pidyk1j9Itz1E=`"; - x86_64-linux = "sha256-+ySBrQ9yQ5ZxuVUh/mnHNEmugru3n8x5VR/RYEDCLAo="; - }.${stdenv.hostPlatform.system} or (throw "Unsupported system ${stdenv.hostPlatform.system} for ${pname}"); - + mvnHash = "sha256-u+UAbKDqtlBEwrzh6LRgs8sZfMZ1u2TAluzOxsBrb/k="; installPhase = '' runHook preInstall @@ -23,11 +23,11 @@ maven.buildMavenPackage rec { runHook postInstall ''; - meta = with lib; { + meta = { homepage = "https://github.com/aerogear/keycloak-metrics-spi"; description = "Keycloak Service Provider that adds a metrics endpoint"; - license = licenses.asl20; - maintainers = with maintainers; [ benley ]; - platforms = [ "aarch64-linux" "x86_64-linux" ]; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ benley ]; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/servers/mail/mailpit/default.nix b/pkgs/servers/mail/mailpit/default.nix index 273489107580..da62efd9f7a2 100644 --- a/pkgs/servers/mail/mailpit/default.nix +++ b/pkgs/servers/mail/mailpit/default.nix @@ -1,24 +1,29 @@ -{ lib -, stdenv -, buildGoModule -, nodejs -, python3 -, libtool -, npmHooks -, fetchFromGitHub -, fetchNpmDeps -, testers -, mailpit +{ + lib, + stdenv, + buildGoModule, + nodejs, + python3, + libtool, + npmHooks, + fetchFromGitHub, + fetchNpmDeps, + testers, + mailpit, }: let - version = "1.15.1"; + source = import ./source.nix; + + inherit (source) + version + vendorHash; src = fetchFromGitHub { owner = "axllent"; repo = "mailpit"; rev = "v${version}"; - hash = "sha256-5QEn4sEZgtoFrVonZsAtvzhEkxYGDEWwhJOxqwWQJTk="; + hash = source.hash; }; # Separate derivation, because if we mix this in buildGoModule, the separate @@ -30,7 +35,7 @@ let npmDeps = fetchNpmDeps { inherit src; - hash = "sha256-5F68ia2V8mw4iPAjSoz0b8z1lplWtAg98BgDXYOmMKs="; + hash = source.npmDepsHash; }; env = lib.optionalAttrs (stdenv.isDarwin && stdenv.isx86_64) { @@ -39,7 +44,12 @@ let NIX_CFLAGS_COMPILE = "-D__ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__=101300"; }; - nativeBuildInputs = [ nodejs python3 libtool npmHooks.npmConfigHook ]; + nativeBuildInputs = [ + nodejs + python3 + libtool + npmHooks.npmConfigHook + ]; buildPhase = '' npm run package @@ -54,13 +64,15 @@ in buildGoModule { pname = "mailpit"; - inherit src version; - - vendorHash = "sha256-e2mlOwGDU5NlKZSstHMdTidSfhNeeY6cBgtW+W9nwV8="; + inherit src version vendorHash; CGO_ENABLED = 0; - ldflags = [ "-s" "-w" "-X github.com/axllent/mailpit/config.Version=${version}" ]; + ldflags = [ + "-s" + "-w" + "-X github.com/axllent/mailpit/config.Version=${version}" + ]; preBuild = '' cp -r ${ui} server/ui/dist @@ -71,6 +83,11 @@ buildGoModule { command = "mailpit version"; }; + passthru.updateScript = { + supportedFeatures = [ "commit" ]; + command = ./update.sh; + }; + meta = with lib; { description = "Email and SMTP testing tool with API for developers"; homepage = "https://github.com/axllent/mailpit"; diff --git a/pkgs/servers/mail/mailpit/source.nix b/pkgs/servers/mail/mailpit/source.nix new file mode 100644 index 000000000000..d04d36e80489 --- /dev/null +++ b/pkgs/servers/mail/mailpit/source.nix @@ -0,0 +1,6 @@ +{ + version = "1.15.1"; + hash = "sha256-5QEn4sEZgtoFrVonZsAtvzhEkxYGDEWwhJOxqwWQJTk="; + npmDepsHash = "sha256-5F68ia2V8mw4iPAjSoz0b8z1lplWtAg98BgDXYOmMKs="; + vendorHash = "sha256-e2mlOwGDU5NlKZSstHMdTidSfhNeeY6cBgtW+W9nwV8="; +} diff --git a/pkgs/servers/mail/mailpit/update.sh b/pkgs/servers/mail/mailpit/update.sh new file mode 100755 index 000000000000..979cd11cda8a --- /dev/null +++ b/pkgs/servers/mail/mailpit/update.sh @@ -0,0 +1,73 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i bash -p nix coreutils curl jq nix-prefetch-git prefetch-npm-deps + +set -euo pipefail + +OWNER=axllent +REPO=mailpit + +TARGET_TAG="$(curl -L -s ${GITHUB_TOKEN:+-u ":${GITHUB_TOKEN}"} "https://api.github.com/repos/$OWNER/$REPO/releases/latest" | jq -r '.tag_name')" +TARGET_VERSION="$(echo "$TARGET_TAG" | sed -e 's/^v//')" + +if [[ "$UPDATE_NIX_OLD_VERSION" == "$TARGET_VERSION" ]]; then + # mailpit is up-to-date + if [[ -n "$UPDATE_NIX_ATTR_PATH" ]]; then + echo "[{}]"; + fi + + exit 0 +fi + +extractVendorHash() { + original="${1?original hash missing}" + result="$(nix-build -A mailpit.goModules 2>&1 | tail -n3 | grep 'got:' | cut -d: -f2- | xargs echo || true)" + [ -z "$result" ] && { echo "$original"; } || { echo "$result"; } +} + +TMP="$(mktemp -d)" +trap 'rm -rf "$TMP"' exit + +NIXPKGS_MAILPIT_PATH=$(cd $(dirname ${BASH_SOURCE[0]}); pwd -P)/ +VERSIONS_NIX="$NIXPKGS_MAILPIT_PATH/versions.nix" + +PREFETCH_JSON=$TMP/prefetch.json +nix-prefetch-git --rev "$TARGET_TAG" --url "https://github.com/$OWNER/$REPO" > "$PREFETCH_JSON" +PREFETCH_HASH="$(jq '.hash' -r < "$PREFETCH_JSON")" +PREFETCH_PATH="$(jq '.path' -r < "$PREFETCH_JSON")" +NPM_DEPS_HASH="$(prefetch-npm-deps $PREFETCH_PATH/package-lock.json)" + +FAKE_HASH="sha256-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA="; + +cat > $VERSIONS_NIX <<-EOF +{ + version = "$TARGET_VERSION"; + hash = "$PREFETCH_HASH"; + npmDepsHash = "$NPM_DEPS_HASH"; + vendorHash = "$FAKE_HASH"; +} +EOF + +GO_HASH="$(nix-instantiate --eval -A mailpit.vendorHash | tr -d '"')" +VENDOR_HASH=$(extractVendorHash "$GO_HASH") + +cat > $VERSIONS_NIX <<-EOF +{ + version = "$TARGET_VERSION"; + hash = "$PREFETCH_HASH"; + npmDepsHash = "$NPM_DEPS_HASH"; + vendorHash = "$VENDOR_HASH"; +} +EOF + +if [[ -z "$UPDATE_NIX_ATTR_PATH" ]]; then + exit 0 +fi + +cat <<-EOF +[{ + "attrPath": "$UPDATE_NIX_ATTR_PATH", + "oldVersion": "$UPDATE_NIX_OLD_VERSION", + "newVersion": "$TARGET_VERSION", + "files": ["$VERSIONS_NIX"] +}] +EOF diff --git a/pkgs/servers/mlflow-server/default.nix b/pkgs/servers/mlflow-server/default.nix index a043d22aa978..6916b3b65547 100644 --- a/pkgs/servers/mlflow-server/default.nix +++ b/pkgs/servers/mlflow-server/default.nix @@ -1,4 +1,4 @@ -{lib, python3, writeText}: +{ python3, writeText}: let py = python3.pkgs; diff --git a/pkgs/servers/monitoring/grafana/plugins/grafana-oncall-app/default.nix b/pkgs/servers/monitoring/grafana/plugins/grafana-oncall-app/default.nix index 893a46e87f78..a1d67c5283a5 100644 --- a/pkgs/servers/monitoring/grafana/plugins/grafana-oncall-app/default.nix +++ b/pkgs/servers/monitoring/grafana/plugins/grafana-oncall-app/default.nix @@ -3,8 +3,8 @@ grafanaPlugin { pname = "grafana-oncall-app"; versionPrefix = "v"; - version = "1.7.1"; - zipHash = "sha256-G3QZq26fzv6sJ5j7QKdPPXhEj95iounZO+Ak8cXZDLc="; + version = "1.8.5"; + zipHash = "sha256-HuZYHPTWm0EPKQbmapALK2j+PzM+J7gcWM9w8vU2yI0="; meta = with lib; { description = "Developer-friendly incident response for Grafana"; license = licenses.agpl3Only; diff --git a/pkgs/servers/monitoring/loki/promtail.nix b/pkgs/servers/monitoring/loki/promtail.nix index e8539ee60a32..15bf192e2351 100644 --- a/pkgs/servers/monitoring/loki/promtail.nix +++ b/pkgs/servers/monitoring/loki/promtail.nix @@ -1,4 +1,4 @@ -{ lib, grafana-loki }: +{ grafana-loki }: grafana-loki.overrideAttrs (o: { pname = "promtail"; diff --git a/pkgs/servers/monitoring/prometheus/atlas-exporter.nix b/pkgs/servers/monitoring/prometheus/atlas-exporter.nix index c46959598149..755f1d64e15c 100644 --- a/pkgs/servers/monitoring/prometheus/atlas-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/atlas-exporter.nix @@ -14,7 +14,7 @@ buildGoModule rec { vendorHash = "sha256-tR+OHxj/97AixuAp0Kx9xQsKPAxpvF6hDha5BgMBha0="; meta = with lib; { - description = "Prometheus exporter for RIPE Atlas measurement results "; + description = "Prometheus exporter for RIPE Atlas measurement results"; mainProgram = "atlas_exporter"; homepage = "https://github.com/czerwonk/atlas_exporter"; license = licenses.lgpl3; diff --git a/pkgs/servers/monitoring/prometheus/fastly-exporter.nix b/pkgs/servers/monitoring/prometheus/fastly-exporter.nix index 84c990e4f704..277d2a96d32c 100644 --- a/pkgs/servers/monitoring/prometheus/fastly-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/fastly-exporter.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "fastly-exporter"; - version = "8.1.0"; + version = "9.0.0"; src = fetchFromGitHub { owner = "fastly"; repo = "fastly-exporter"; rev = "v${version}"; - hash = "sha256-SpYdcLPknI7ecZ2ef3kJ2nBkQ39vzjk1fNTdDaFZwO0="; + hash = "sha256-H7EaNQmgrRomIQo2xm2Qqkud0LMSYFshNv54lRdrEyw="; }; vendorHash = "sha256-k/n9muWFtTBv8PxMdevFBeTtAOIiCDrK3GoCGeMtBn4="; diff --git a/pkgs/servers/monitoring/prometheus/nginx-exporter.nix b/pkgs/servers/monitoring/prometheus/nginx-exporter.nix index 9a6c6c250ad7..474067622453 100644 --- a/pkgs/servers/monitoring/prometheus/nginx-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/nginx-exporter.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "nginx_exporter"; - version = "1.2.0"; + version = "1.3.0"; src = fetchFromGitHub { owner = "nginxinc"; repo = "nginx-prometheus-exporter"; rev = "v${version}"; - sha256 = "sha256-VzgcAyXR9TKpK6CJzKoqN5EgO9rWnZBhwv5Km/k8cK0="; + sha256 = "sha256-TcQXYZsr3hjE93GfeBt8AJLuQQA7UM+wv1SmCnqON+M="; }; - vendorHash = "sha256-HoRE9hvnyPkLpwc+FfUmithd5UDEJ0TnoDfcifa/0o0="; + vendorHash = "sha256-qmyqAbwQYgUFFQwCLakQGta2XMGCbCOvCB93S8/TWIs="; ldflags = [ "-s" "-w" "-X main.version=${version}" ]; diff --git a/pkgs/servers/monitoring/prometheus/pve-exporter.nix b/pkgs/servers/monitoring/prometheus/pve-exporter.nix index aaf5f46b075e..7bc1d9280a64 100644 --- a/pkgs/servers/monitoring/prometheus/pve-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/pve-exporter.nix @@ -5,12 +5,12 @@ }: python3.pkgs.buildPythonApplication rec { - pname = "prometheus-pve-exporter"; - version = "3.2.4"; + pname = "prometheus_pve_exporter"; + version = "3.4.3"; src = fetchPypi { inherit pname version; - hash = "sha256-C7agnOUdtd4YncAiaPQaZqBJ8DKZoM1Fa+dr1F4xYgI="; + hash = "sha256-5xvTUOwBj3N0hxLKfAlEq8y8snoDb92f7o7u7j0RdhY="; }; propagatedBuildInputs = with python3.pkgs; [ diff --git a/pkgs/servers/nosql/apache-jena/fuseki-test.nix b/pkgs/servers/nosql/apache-jena/fuseki-test.nix index bbf98a838259..dd8a82d8494f 100644 --- a/pkgs/servers/nosql/apache-jena/fuseki-test.nix +++ b/pkgs/servers/nosql/apache-jena/fuseki-test.nix @@ -1,4 +1,4 @@ -{ lib, runCommand, apache-jena-fuseki, curl }: +{ runCommand, apache-jena-fuseki, curl }: runCommand "fuseki-test-${apache-jena-fuseki.name}" { nativeBuildInputs = [ curl apache-jena-fuseki ]; } '' export FUSEKI_BASE="$PWD/fuseki-base" diff --git a/pkgs/servers/nosql/mongodb/6.0.nix b/pkgs/servers/nosql/mongodb/6.0.nix index 537fe93e01c5..4e1df2d7a297 100644 --- a/pkgs/servers/nosql/mongodb/6.0.nix +++ b/pkgs/servers/nosql/mongodb/6.0.nix @@ -1,4 +1,4 @@ -{ stdenv, callPackage, lib, fetchpatch +{ stdenv, callPackage, fetchpatch , sasl, boost, Security, CoreFoundation, cctools , avxSupport ? stdenv.hostPlatform.avxSupport }: diff --git a/pkgs/servers/roapi/http.nix b/pkgs/servers/roapi/http.nix index 7edc3dd89b2a..885293d6be96 100644 --- a/pkgs/servers/roapi/http.nix +++ b/pkgs/servers/roapi/http.nix @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - description = "Create full-fledged APIs for static datasets without writing a single line of code. "; + description = "Create full-fledged APIs for static datasets without writing a single line of code."; homepage = "https://roapi.github.io/docs/"; license = licenses.asl20; maintainers = with maintainers; [ happysalada ]; diff --git a/pkgs/servers/search/lnx/default.nix b/pkgs/servers/search/lnx/default.nix index 34b9f9c7c5ba..447602b0463f 100644 --- a/pkgs/servers/search/lnx/default.nix +++ b/pkgs/servers/search/lnx/default.nix @@ -27,7 +27,7 @@ rustPlatform.buildRustPackage { }; buildInputs = lib.optionals stdenv.isDarwin [ DiskArbitration Foundation ]; meta = with lib; { - description = "Insanely fast, Feature-rich searching. lnx is the adaptable, typo tollerant deployment of the tantivy search engine. Standing on the shoulders of giants. "; + description = "Insanely fast, Feature-rich searching. lnx is the adaptable, typo tollerant deployment of the tantivy search engine. Standing on the shoulders of giants."; mainProgram = "lnx"; homepage = "https://lnx.rs/"; license = licenses.mit; diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-checklist/default.nix b/pkgs/servers/web-apps/discourse/plugins/discourse-checklist/default.nix index 1c252397d48e..a44c9771cd01 100644 --- a/pkgs/servers/web-apps/discourse/plugins/discourse-checklist/default.nix +++ b/pkgs/servers/web-apps/discourse/plugins/discourse-checklist/default.nix @@ -12,6 +12,6 @@ mkDiscoursePlugin { homepage = "https://github.com/discourse/discourse-checklist"; maintainers = with maintainers; [ ryantm ]; license = licenses.gpl2Only; - description = "Simple checklist rendering plugin for discourse "; + description = "Simple checklist rendering plugin for discourse"; }; } diff --git a/pkgs/servers/web-apps/healthchecks/default.nix b/pkgs/servers/web-apps/healthchecks/default.nix index ce1f17dc0a74..ee7d2122917d 100644 --- a/pkgs/servers/web-apps/healthchecks/default.nix +++ b/pkgs/servers/web-apps/healthchecks/default.nix @@ -92,7 +92,7 @@ py.pkgs.buildPythonApplication rec { meta = with lib; { homepage = "https://github.com/healthchecks/healthchecks"; - description = "Cron monitoring tool written in Python & Django "; + description = "Cron monitoring tool written in Python & Django"; license = licenses.bsd3; maintainers = with maintainers; [ phaer ]; }; diff --git a/pkgs/shells/zsh/zsh-bd/default.nix b/pkgs/shells/zsh/zsh-bd/default.nix index ebfa55ecd229..b0704065901b 100644 --- a/pkgs/shells/zsh/zsh-bd/default.nix +++ b/pkgs/shells/zsh/zsh-bd/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { ''; meta = { - description = "Jump back to a specific directory, without doing `cd ../../..` "; + description = "Jump back to a specific directory, without doing `cd ../../..`"; homepage = "https://github.com/Tarrasch/zsh-bd"; license = lib.licenses.free; diff --git a/pkgs/test/dhall/buildDhallUrl/default.nix b/pkgs/test/dhall/buildDhallUrl/default.nix index a75101a303d6..f266cde11a51 100644 --- a/pkgs/test/dhall/buildDhallUrl/default.nix +++ b/pkgs/test/dhall/buildDhallUrl/default.nix @@ -1,4 +1,4 @@ -{ dhallPackages, lib }: +{ dhallPackages }: # This file tests that dhallPackages.buildDhallUrl is able to successfully # build a Nix Dhall package for a given remote Dhall import. diff --git a/pkgs/test/vim/default.nix b/pkgs/test/vim/default.nix index 75633adbd1a5..5a3bf376fb88 100644 --- a/pkgs/test/vim/default.nix +++ b/pkgs/test/vim/default.nix @@ -1,7 +1,4 @@ -{ vimUtils, vim-full, writeText, vimPlugins -, lib -, pkgs -}: +{ vimUtils, vim-full, vimPlugins, pkgs }: let inherit (vimUtils) buildVimPlugin; diff --git a/pkgs/tools/admin/pulumi-bin/data.nix b/pkgs/tools/admin/pulumi-bin/data.nix index ce7d9351cad3..f65dcc465fdb 100644 --- a/pkgs/tools/admin/pulumi-bin/data.nix +++ b/pkgs/tools/admin/pulumi-bin/data.nix @@ -1,36 +1,36 @@ # DO NOT EDIT! This file is generated automatically by update.sh { }: { - version = "3.126.0"; + version = "3.127.0"; pulumiPkgs = { x86_64-linux = [ { - url = "https://get.pulumi.com/releases/sdk/pulumi-v3.126.0-linux-x64.tar.gz"; - sha256 = "0icdrxg0n61npmwq9idzxrx9zncp3vnrw4q04b5y4h5w5b5sz9fv"; + url = "https://get.pulumi.com/releases/sdk/pulumi-v3.127.0-linux-x64.tar.gz"; + sha256 = "19ndjx7k7gqchqw6rh66c7jpxqxq49cx98r5kya0wgsdhm1ppnxi"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v6.18.0-linux-amd64.tar.gz"; - sha256 = "1iyjviw3vqwan1gxwwwz4kgy1xm4gvr7iw0284176qmjy8pci2hk"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v6.20.0-linux-amd64.tar.gz"; + sha256 = "0ihn2rn05c1ajs3kh6sk62qsd19a932z27061kym4810fdw3vqai"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-akamai-v7.3.0-linux-amd64.tar.gz"; sha256 = "0ra89zi6ka0d9szgd0i4vlzw5wzvg9da5pi1ns3bf7kwv0mrxdmc"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.59.0-linux-amd64.tar.gz"; - sha256 = "1yh2k9yd6ygmmic11xzv4jvfyajwg1j5j1hbmfhp6pnsxc515akk"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.59.1-linux-amd64.tar.gz"; + sha256 = "0vcps3pzl8dfcrsk2vc3qgqzjxfb2waq90jld7ap6glc882sr19d"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v7.2.0-linux-amd64.tar.gz"; - sha256 = "1krglpjj5j3zxhvg7mrxbb98k2d3b5z8p8hqw7js59358g04766b"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v7.2.1-linux-amd64.tar.gz"; + sha256 = "0792bjc3csjfv55pg9b6imwrasxz40g928jbackrvdl1c2pawpkn"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v3.5.0-linux-amd64.tar.gz"; sha256 = "11kpczajnshx3ky6m8imsydxpw7a8k608bz3bhy9wd43x2gcg5qd"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v6.45.2-linux-amd64.tar.gz"; - sha256 = "0fv5lqdak26dvka627j6ybr4mz1027pqgig0vabfifnrgbybk5ra"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v6.46.0-linux-amd64.tar.gz"; + sha256 = "15fc8i0y0xhq85p6vf68df2kavdzph769lzjrrmrayvlclblaiz2"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v5.85.0-linux-amd64.tar.gz"; @@ -41,16 +41,16 @@ sha256 = "0yzv3xyijma1sxvilf1bgqcc3d0hdcx6pfpzw2s0fix7pi25qszn"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuredevops-v3.1.1-linux-amd64.tar.gz"; - sha256 = "05vyz81a5z96k35hh8ky9bl6c505jfb6rxsc82qlfh8kx110p66l"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuredevops-v3.2.0-linux-amd64.tar.gz"; + sha256 = "02v61pqpsxj652937rm7fwdr0612cq157g8wxkah27cxyyyf6qzq"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v5.34.0-linux-amd64.tar.gz"; - sha256 = "19g248srvghmzz5d6nk9awifmjfy1r45p0plv6zlg9iad0yfa471"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v5.35.0-linux-amd64.tar.gz"; + sha256 = "11rjl9ddg495awnslnd0q7cfc6x31mwzvcjz56xllgkxxryn8c1n"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-consul-v3.11.3-linux-amd64.tar.gz"; - sha256 = "1g6rzqsgak4801b2zzhq3ss6gkvkc8y7swpbm92sdbns71hxvw6w"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-consul-v3.11.4-linux-amd64.tar.gz"; + sha256 = "0gb8yrsl7js41ffq993x5cibl3drgdjgaq3nl1xd72248b82pik4"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-datadog-v4.31.0-linux-amd64.tar.gz"; @@ -61,8 +61,8 @@ sha256 = "1fsslwik687gqpcj3i5d1zv5jwcf2knkx2whn61bm0gir8wcl3iq"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-docker-v4.5.4-linux-amd64.tar.gz"; - sha256 = "1sbscig80kf3k2w5j5934ld78w2760s97dn9cqnwf040wq3x2bqk"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-docker-v4.5.5-linux-amd64.tar.gz"; + sha256 = "1yszi5baiix59c0pbhs74s323v4my08dfcjsj3scdy98az65n5hm"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-equinix-metal-v3.2.1-linux-amd64.tar.gz"; @@ -97,8 +97,8 @@ sha256 = "04bldr5h13gfpk19d4s74fvhskyzihi199af1rq0n7ks8mf43ig2"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v4.23.0-linux-amd64.tar.gz"; - sha256 = "1nn0vj67034sg696x93pzvkai0kswy0gxrl5xp1vg89yw4x4mmji"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v4.24.0-linux-amd64.tar.gz"; + sha256 = "00yhd0a5gic68q5b8xqk10xylnda0h2zrh7l7r6crjnb811n3myx"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mailgun-v3.5.4-linux-amd64.tar.gz"; @@ -109,8 +109,8 @@ sha256 = "1vl57mjz23krcp7801q5v2vb64daxpyqpas57y8hxvi5np7qnpk4"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-openstack-v4.0.0-linux-amd64.tar.gz"; - sha256 = "195m7xxdzlwzglaz72iajdx13yr3j78x38z3ajbw7c89wvpp8p6l"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-openstack-v4.1.0-linux-amd64.tar.gz"; + sha256 = "1zh21cnnr3pfsraad0spv3nnds6pnad1xa3whms9qzdk62lrh0zh"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-postgresql-v3.11.3-linux-amd64.tar.gz"; @@ -163,32 +163,32 @@ ]; x86_64-darwin = [ { - url = "https://get.pulumi.com/releases/sdk/pulumi-v3.126.0-darwin-x64.tar.gz"; - sha256 = "08zmjayipsv7j713dy4pk3s6ixx4sqw5n99n6jqm2zr97jz8jknh"; + url = "https://get.pulumi.com/releases/sdk/pulumi-v3.127.0-darwin-x64.tar.gz"; + sha256 = "0mvyjbvabgxqmv1bjfbiid31grzgcajflhqsmhi5nrdb72w0sq2d"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v6.18.0-darwin-amd64.tar.gz"; - sha256 = "0qw32ya0xnrdg51spwbh6g9c6zgmy5xyb5y38h3v93ksc45d0kab"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v6.20.0-darwin-amd64.tar.gz"; + sha256 = "148ksf36bfvl4xysw949yhixcc8q9lm945r03pb8rfrb04561fx2"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-akamai-v7.3.0-darwin-amd64.tar.gz"; sha256 = "1d1famsg3pg69300vl5rifjbcvf5linajgwn5hi3wiwrszk2fcg7"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.59.0-darwin-amd64.tar.gz"; - sha256 = "1pkpxw36m0insgbg3whvs32q3lyvi1i8ihnc61hrcmvslhkfvzx2"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.59.1-darwin-amd64.tar.gz"; + sha256 = "01bbbwczlakxb08p35s74rd5yqnk8z7580k146ib0l9xgzf0a811"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v7.2.0-darwin-amd64.tar.gz"; - sha256 = "02sg8gdlxf5dclgnjcjhmrgwn93ngy8rk9n0g02h2y4a1lz7a41a"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v7.2.1-darwin-amd64.tar.gz"; + sha256 = "1b1fwvwxdiwk7cq4gf1ssjj294abx86j93q8rp1vqj1hfj75glyl"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v3.5.0-darwin-amd64.tar.gz"; sha256 = "00p3b7m2rnp5w4nsh15w2s3hbhwv6wm2x30d8g939z07z6dxzq3s"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v6.45.2-darwin-amd64.tar.gz"; - sha256 = "031x0yi2znc71drb13h1idn0x48z05ylygjlx7gcp3lci67p66lc"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v6.46.0-darwin-amd64.tar.gz"; + sha256 = "0yqp5fajmlsxgsin6vrpikr49b5fxi1v6alw5ix2i04mv8fzs5i7"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v5.85.0-darwin-amd64.tar.gz"; @@ -199,16 +199,16 @@ sha256 = "16vkx1cnfzwyzsk7f9f794p6mg1ny8g5qxiy0825gd0prf8dzdm5"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuredevops-v3.1.1-darwin-amd64.tar.gz"; - sha256 = "0blhx82diydpwbfr7grj2zxk29pvg0b2w2rawlv60mhc3dw6ixar"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuredevops-v3.2.0-darwin-amd64.tar.gz"; + sha256 = "1xranra0rkcnvahna4jrb091jy23sgk9ib92dbzl2gw26yj6x9gx"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v5.34.0-darwin-amd64.tar.gz"; - sha256 = "0x0c41nrai2p7gim8aqq7jn601jy8s9f8835bzz8vnbgbj7ip6fw"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v5.35.0-darwin-amd64.tar.gz"; + sha256 = "14h8dr3xs17lqjr9vxa63m2pwiqc0hd227f1n6x4vchb726h7iam"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-consul-v3.11.3-darwin-amd64.tar.gz"; - sha256 = "1gcv6ri58a4k8g7dzh0xvpmv1x6ndlihkmd5n2gza303i9c8466n"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-consul-v3.11.4-darwin-amd64.tar.gz"; + sha256 = "0q9ycpaavrnzl3dh1wa9pi4acpr52s2f3plf3x9yx3l3jdqs8m76"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-datadog-v4.31.0-darwin-amd64.tar.gz"; @@ -219,8 +219,8 @@ sha256 = "0lwwq0na0334ynddmpy1fy71js5f35i4ps3084z4cxzaz0amlnv1"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-docker-v4.5.4-darwin-amd64.tar.gz"; - sha256 = "1viwf0afhmisxvz0dkmf79b3ncbba4xz9hp9h0h2866l05h9v5d0"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-docker-v4.5.5-darwin-amd64.tar.gz"; + sha256 = "0w01z3kq1fm8nn48m3vx08ivsdqv991r8g22jd0gs2d70rqx2xms"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-equinix-metal-v3.2.1-darwin-amd64.tar.gz"; @@ -255,8 +255,8 @@ sha256 = "0lnlahbrsccz6qhjrbrmgjh1dc2qvhr4rxhj0zbmvjmgch81cy1a"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v4.23.0-darwin-amd64.tar.gz"; - sha256 = "0dbjrnz45vx7fw4lgx240d08h0xgzvzxxaqzli91ccag1lrb3b8b"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v4.24.0-darwin-amd64.tar.gz"; + sha256 = "0jkns8pmq40y4lcdrh8vjlb5wzmcqfi9f5zyc08j907lhcbh1d6j"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mailgun-v3.5.4-darwin-amd64.tar.gz"; @@ -267,8 +267,8 @@ sha256 = "1a7gd4vbkvbmk2870xc2dgkq6dd4bvcmdcrkny51m2bcns94b2xl"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-openstack-v4.0.0-darwin-amd64.tar.gz"; - sha256 = "0f3xrcnn65yqpfrqkywa6blsxb501xjw2j3apb3351ii5dmmi31q"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-openstack-v4.1.0-darwin-amd64.tar.gz"; + sha256 = "1y3z2jlw5x1zmfljf25dy8a48arkk030qjc9isxzal6ij8v4ylml"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-postgresql-v3.11.3-darwin-amd64.tar.gz"; @@ -321,32 +321,32 @@ ]; aarch64-linux = [ { - url = "https://get.pulumi.com/releases/sdk/pulumi-v3.126.0-linux-arm64.tar.gz"; - sha256 = "0h5fhiyqgs0zvmj72z5asmqyp1y3fmwd0vi3acx38ra65bnwd5yp"; + url = "https://get.pulumi.com/releases/sdk/pulumi-v3.127.0-linux-arm64.tar.gz"; + sha256 = "1w7k6g8rch463hmgh1qymblikk9j5pcgl0scl422ffd3clqrl8zm"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v6.18.0-linux-arm64.tar.gz"; - sha256 = "15f5zcnrz9p4fkmaj7cw7jgkhy38yyj9xh33qjcfk7k1qgxy8jf7"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v6.20.0-linux-arm64.tar.gz"; + sha256 = "0rva2s47fgii2c3l52gmfnpf0fs8rw3w4prhz7afpv96s9m0qpjb"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-akamai-v7.3.0-linux-arm64.tar.gz"; sha256 = "0zpcz79ca84lhccg2ivr442hr2gfmx7826rmw0ppnyi5cna1wvkr"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.59.0-linux-arm64.tar.gz"; - sha256 = "1d4f6jy09aplg47qclkv9xgp7ilpsz8cxab8nfj9qgjhf6vq8bza"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.59.1-linux-arm64.tar.gz"; + sha256 = "0cs456c4hlasjzd7whnna5adv0x9y4q8jqjmrkb3ijnlyi1l24pv"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v7.2.0-linux-arm64.tar.gz"; - sha256 = "0qd5kljm58xgig34gxnzfsfqihc50isxm9ynyjzf5sad7nlxq2j6"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v7.2.1-linux-arm64.tar.gz"; + sha256 = "0jmvk7158384y512g9qycq7d9877rxzk1snwzbz0lfg4rqlw169p"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v3.5.0-linux-arm64.tar.gz"; sha256 = "0kabsgjxhg8dlj0qa33mfsm90vsd9lzizw1a5sfmf9py7flcvn0y"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v6.45.2-linux-arm64.tar.gz"; - sha256 = "1hvv63kmpn2277577i95wcdnzc4fy9dmp6jwmx8nv7ddh9fqw0ha"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v6.46.0-linux-arm64.tar.gz"; + sha256 = "0aihaakzb4cbrdp6xdqxidh08n7zwqgg1ncb57j841gilzf7ya1m"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v5.85.0-linux-arm64.tar.gz"; @@ -357,16 +357,16 @@ sha256 = "0p16833m7igpz7b6p05clcf6qk5jj10iqrdm8wkdj7zv9q1v60hk"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuredevops-v3.1.1-linux-arm64.tar.gz"; - sha256 = "1chrfqdiwx6lvylrih6zx7m1zkrmcb7lz0x1cb9hc0l5fy93rc63"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuredevops-v3.2.0-linux-arm64.tar.gz"; + sha256 = "03rvhz2zbjdldlp3c1335cbp2b8c3y3p88czwsfy6dsd9hry8fsa"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v5.34.0-linux-arm64.tar.gz"; - sha256 = "0111viyc9vsk408wpnyz4blxz977vdgmdb97q29ydm2lkbdzvib9"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v5.35.0-linux-arm64.tar.gz"; + sha256 = "1kphr21na2rzspd4m2kh962mfbr6df23f0rfas3qdrd2nw7vh1rq"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-consul-v3.11.3-linux-arm64.tar.gz"; - sha256 = "0rmn667z8s4pndck24h82qp5fyshixvji736x6barlpiamy4lkhj"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-consul-v3.11.4-linux-arm64.tar.gz"; + sha256 = "1zaxwkn4kg4nnns90dbx6dwdjw5mbbpm9h8wjcd41zhhbd4b3vld"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-datadog-v4.31.0-linux-arm64.tar.gz"; @@ -377,8 +377,8 @@ sha256 = "10asvq6ds4y9sfxy2lh81ldzxdr347nwvhphjzs3sb2pxrx9dksz"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-docker-v4.5.4-linux-arm64.tar.gz"; - sha256 = "117a8xaj6n9hgr7r8brmwf3kmdlgd2xzmssai8nn5r9hq7r8z79f"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-docker-v4.5.5-linux-arm64.tar.gz"; + sha256 = "0x2nwvi1b13sj8n32ab7vw56ksa6n4bix11zz1b5cz4l0l9v00wf"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-equinix-metal-v3.2.1-linux-arm64.tar.gz"; @@ -413,8 +413,8 @@ sha256 = "00mla8clf53jwdivd0magmzc0psm6ac3xps7xbx979aqd7lgxzv6"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v4.23.0-linux-arm64.tar.gz"; - sha256 = "09fi0qhw9aw2wmz4bd4zns2s2cyq3ny0qjhv809ndy2c3az3kf6d"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v4.24.0-linux-arm64.tar.gz"; + sha256 = "0ssj159b3vgr7gxi2b0fib7jlzn1g3gkr18wsaj1i55avmk9gm40"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mailgun-v3.5.4-linux-arm64.tar.gz"; @@ -425,8 +425,8 @@ sha256 = "0krvvhm842lkxa14xfpkk2b1namgxnk3y6n5lcvhsnswga10r2xq"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-openstack-v4.0.0-linux-arm64.tar.gz"; - sha256 = "0gg3f461j6ca31cnnlsn9nlnb63mhhr6rwkypa5wnvf38xsfbmf6"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-openstack-v4.1.0-linux-arm64.tar.gz"; + sha256 = "1mvx5hq5s4s6hvcjfk4ficdacz5ivrczr10d182n7hzai8nmq3c3"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-postgresql-v3.11.3-linux-arm64.tar.gz"; @@ -479,32 +479,32 @@ ]; aarch64-darwin = [ { - url = "https://get.pulumi.com/releases/sdk/pulumi-v3.126.0-darwin-arm64.tar.gz"; - sha256 = "07s197xz1mv3c3jj15q1hk31q4awf08m7q2s3kkhkqslq6c4ijyn"; + url = "https://get.pulumi.com/releases/sdk/pulumi-v3.127.0-darwin-arm64.tar.gz"; + sha256 = "06sfzk8hm2lgfaj2k0br9w1z6yfa7pfxqvh4wp0c2gxq5vykjw2m"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v6.18.0-darwin-arm64.tar.gz"; - sha256 = "0dgimn8pi53aml8zzwcirvqdjg7mm50lh9897p266zsfbzlp3i4r"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v6.20.0-darwin-arm64.tar.gz"; + sha256 = "097wrym5h2x3bak28sflpslvfmzh2sw05hgaj3wslcmvvc0h1s5r"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-akamai-v7.3.0-darwin-arm64.tar.gz"; sha256 = "12954vrf9fjjynrzgj8qm34bl258v4fdvvzyi0m8wp92rsp4icjq"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.59.0-darwin-arm64.tar.gz"; - sha256 = "0p89svy3d28lkg89bsv0218a89fdmhhg432x2kpw3zfs5idamkgc"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.59.1-darwin-arm64.tar.gz"; + sha256 = "1gpaz8nrx85mrhp03nn3m44q7ksg4irszzj62yyhckdj1jpfkahz"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v7.2.0-darwin-arm64.tar.gz"; - sha256 = "1q4f25zb7ghdyxgwr658q7jf5qdzl0s3v1b91s32bz4lpy6cgjca"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v7.2.1-darwin-arm64.tar.gz"; + sha256 = "17mh63n9w45y320fjcafvcdic52zfmnvkd2fq193ppfx930lz1zc"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v3.5.0-darwin-arm64.tar.gz"; sha256 = "1mmrvn31njs2sr9h6cj7m1ph2gh465qqx0pigvbidjfhl9ag2hrx"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v6.45.2-darwin-arm64.tar.gz"; - sha256 = "1x4768mr61mf4kf4rfyg8ifgin4jwxm7s1i3gi7nbfwr8qlkh643"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v6.46.0-darwin-arm64.tar.gz"; + sha256 = "1rkavb9la0dmbd49hzwbg8sv5py1h3n88v4sf7y2fjb877xaq1ni"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v5.85.0-darwin-arm64.tar.gz"; @@ -515,16 +515,16 @@ sha256 = "13r7yzgj4lbsvsw9y1fxc5n6dhral0763ny8mahxhj3cl6mmxvi7"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuredevops-v3.1.1-darwin-arm64.tar.gz"; - sha256 = "1m53gzviimjcr3dl0pydafa6dl1r0q6ih1gwhm7lvgpll300wl1q"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuredevops-v3.2.0-darwin-arm64.tar.gz"; + sha256 = "04wibkfpq76qhyy8kf0y89qkssapwgmkv56bspdxpydlnnwvn714"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v5.34.0-darwin-arm64.tar.gz"; - sha256 = "02vv8fy5x6i1fq5pvfcp7rcqqb9kqhar09swp5c8yzqz64kv1k28"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v5.35.0-darwin-arm64.tar.gz"; + sha256 = "10vr6vr9dna44g6qsrk5dkc7g03qq7v91x4js8hz20aql7qp68p7"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-consul-v3.11.3-darwin-arm64.tar.gz"; - sha256 = "1wfiq9rzdzp8pa88g7dbgz644dih8f9f0apw6vfngjjsd2kj3k1c"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-consul-v3.11.4-darwin-arm64.tar.gz"; + sha256 = "1w04f1w8f1ir1jfbkn6rmrpjj49k6ddw2nfx2617q2icmvaj3q7p"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-datadog-v4.31.0-darwin-arm64.tar.gz"; @@ -535,8 +535,8 @@ sha256 = "0gi776zhi37nrj37aalz5qmkyf2wihgq4jhm7h6qr5vgr7chld34"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-docker-v4.5.4-darwin-arm64.tar.gz"; - sha256 = "128wvq4qvyrgv2q07bpvf96c5vm0fm77x4dcycf0j89hq3rj09zy"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-docker-v4.5.5-darwin-arm64.tar.gz"; + sha256 = "1zzb1v9fq6x23pc7ar1hna7hqnaqghss0rfx4viyhhah8659k3va"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-equinix-metal-v3.2.1-darwin-arm64.tar.gz"; @@ -571,8 +571,8 @@ sha256 = "0qa07scjj7mjwqjmv260ansiy8qk3ch9bf50p33ig86599r4indp"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v4.23.0-darwin-arm64.tar.gz"; - sha256 = "17hh4h4116mw93icvk7bybqz3cnf28b2rpqsy4jazq18aaj8wwxy"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v4.24.0-darwin-arm64.tar.gz"; + sha256 = "1bv6k8d6h0bv8rdzf78szavd03gqa9x1j5s5zv3fngq404zs9nn0"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mailgun-v3.5.4-darwin-arm64.tar.gz"; @@ -583,8 +583,8 @@ sha256 = "0girslx186bif03hxkpsgs21g88sy2r1py05b2kqb67izcbh996v"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-openstack-v4.0.0-darwin-arm64.tar.gz"; - sha256 = "1ljqziijcdni2vgh55qb5sglb2vwzlkzvpbhxcjj6x3ap4ywiiyf"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-openstack-v4.1.0-darwin-arm64.tar.gz"; + sha256 = "007v4jacfg1i0skarsab918i8qwipgvklrsa6fqv4gwqjcz6y2lr"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-postgresql-v3.11.3-darwin-arm64.tar.gz"; diff --git a/pkgs/tools/audio/beets/builtin-plugins.nix b/pkgs/tools/audio/beets/builtin-plugins.nix index 61b5969701ca..ebb58191a3ca 100644 --- a/pkgs/tools/audio/beets/builtin-plugins.nix +++ b/pkgs/tools/audio/beets/builtin-plugins.nix @@ -3,11 +3,9 @@ , flac , imagemagick , keyfinder-cli -, lib , mp3gain , mp3val , python3Packages -, version , ... }: { absubmit = { diff --git a/pkgs/tools/cd-dvd/sacd/default.nix b/pkgs/tools/cd-dvd/sacd/default.nix index c24a5e7c15c7..67c70ebc76a0 100644 --- a/pkgs/tools/cd-dvd/sacd/default.nix +++ b/pkgs/tools/cd-dvd/sacd/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation (finalAttrs: { ]; meta = with lib; { - description = "Converts SACD image files, Philips DSDIFF and Sony DSF files to 24-bit high resolution wave files. Handles both DST and DSD streams. "; + description = "Converts SACD image files, Philips DSDIFF and Sony DSF files to 24-bit high resolution wave files. Handles both DST and DSD streams."; longDescription = '' Super Audio CD decoder. Converts SACD image files, Philips DSDIFF and Sony DSF files to 24-bit high resolution wave files. Handles both DST and DSD streams. diff --git a/pkgs/tools/misc/chafa/default.nix b/pkgs/tools/misc/chafa/default.nix index a5c6cf8b6828..3a6270d19602 100644 --- a/pkgs/tools/misc/chafa/default.nix +++ b/pkgs/tools/misc/chafa/default.nix @@ -4,14 +4,14 @@ }: stdenv.mkDerivation rec { - version = "1.14.1"; + version = "1.14.2"; pname = "chafa"; src = fetchFromGitHub { owner = "hpjansson"; repo = "chafa"; rev = version; - sha256 = "sha256-25GVRZGrYcQ+uo+S45HvX4jrdHKnYuSkXHQUr9NHdyY="; + sha256 = "sha256-BK2QTlcns+e3LL3NgcVYk4an+j/x0btpKAuBZ+QIN+Q="; }; nativeBuildInputs = [ autoconf diff --git a/pkgs/tools/misc/crudini/default.nix b/pkgs/tools/misc/crudini/default.nix index ec3cad6e8747..041a0095fb1c 100644 --- a/pkgs/tools/misc/crudini/default.nix +++ b/pkgs/tools/misc/crudini/default.nix @@ -50,7 +50,7 @@ python3Packages.buildPythonApplication rec { ''; meta = with lib; { - description = "Utility for manipulating ini files "; + description = "Utility for manipulating ini files"; homepage = "https://www.pixelbeat.org/programs/crudini/"; license = licenses.gpl2Only; maintainers = with maintainers; [ peterhoeg ]; diff --git a/pkgs/tools/misc/iam-policy-json-to-terraform/default.nix b/pkgs/tools/misc/iam-policy-json-to-terraform/default.nix index a015f3dabfac..1c83bb6e3d99 100644 --- a/pkgs/tools/misc/iam-policy-json-to-terraform/default.nix +++ b/pkgs/tools/misc/iam-policy-json-to-terraform/default.nix @@ -14,7 +14,7 @@ buildGoModule rec { vendorHash = "sha256-1WTc7peTJI3IvHJqznqRz29uQ2NG0CZpAAzlyYymZCQ="; meta = with lib; { - description = "Small tool to convert an IAM Policy in JSON format into a Terraform aws_iam_policy_document "; + description = "Small tool to convert an IAM Policy in JSON format into a Terraform aws_iam_policy_document"; homepage = "https://github.com/flosell/iam-policy-json-to-terraform"; changelog = "https://github.com/flosell/iam-policy-json-to-terraform/releases/tag/${version}"; license = licenses.asl20; diff --git a/pkgs/tools/misc/opencorsairlink/default.nix b/pkgs/tools/misc/opencorsairlink/default.nix index 4d455977d6d9..c7e92770b7d6 100644 --- a/pkgs/tools/misc/opencorsairlink/default.nix +++ b/pkgs/tools/misc/opencorsairlink/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { ]; meta = with lib; { - description = "Linux and Mac OS support for the CorsairLink Devices "; + description = "Linux and Mac OS support for the CorsairLink Devices"; homepage = "https://github.com/audiohacked/OpenCorsairLink"; license = licenses.gpl2Plus; platforms = platforms.all; diff --git a/pkgs/tools/misc/pcb2gcode/default.nix b/pkgs/tools/misc/pcb2gcode/default.nix index 2db24a46bfe0..1ba4a8aea5e4 100644 --- a/pkgs/tools/misc/pcb2gcode/default.nix +++ b/pkgs/tools/misc/pcb2gcode/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - description = "Command-line tool for isolation, routing and drilling of PCBs "; + description = "Command-line tool for isolation, routing and drilling of PCBs"; longDescription = '' pcb2gcode is a command-line software for the isolation, routing and drilling of PCBs. It takes Gerber files as input and it outputs gcode files, suitable for the milling of PCBs. diff --git a/pkgs/tools/misc/precice-config-visualizer/default.nix b/pkgs/tools/misc/precice-config-visualizer/default.nix index 9b6d40a0c733..743d107ee534 100644 --- a/pkgs/tools/misc/precice-config-visualizer/default.nix +++ b/pkgs/tools/misc/precice-config-visualizer/default.nix @@ -20,7 +20,7 @@ python3Packages.buildPythonApplication rec { meta = with lib; { homepage = "https://github.com/precice/config-visualizer"; - description = "Small python tool for visualizing the preCICE xml configuration "; + description = "Small python tool for visualizing the preCICE xml configuration"; license = licenses.gpl3Only; maintainers = with maintainers; [ Scriptkiddi ]; mainProgram = "precice-config-visualizer"; diff --git a/pkgs/tools/misc/starship/default.nix b/pkgs/tools/misc/starship/default.nix index 06944a40eb1e..f7abf34490da 100644 --- a/pkgs/tools/misc/starship/default.nix +++ b/pkgs/tools/misc/starship/default.nix @@ -13,13 +13,13 @@ rustPlatform.buildRustPackage rec { pname = "starship"; - version = "1.19.0"; + version = "1.20.0"; src = fetchFromGitHub { owner = "starship"; repo = "starship"; rev = "v${version}"; - hash = "sha256-3IO9hHuhzJsCHU/6BA5ylEKQI2ik6ZiRul/iO/vzii4="; + hash = "sha256-TJU/pojUE+uwyZlqzJ4ULt9r+3bZpetwfaXK8kBtEG8="; }; nativeBuildInputs = [ installShellFiles cmake ]; @@ -44,7 +44,7 @@ rustPlatform.buildRustPackage rec { cp docs/public/presets/toml/*.toml $presetdir ''; - cargoHash = "sha256-zX04gX40dFYsK+R6gafHNtDevzrWiGufMwrGfhqYVG0="; + cargoHash = "sha256-A4SipsaMjVkG7ImN1aK34ZGJxlPld9NE9IjffI0+eDA="; nativeCheckInputs = [ git ]; diff --git a/pkgs/tools/misc/timetagger_cli/default.nix b/pkgs/tools/misc/timetagger_cli/default.nix index f6204e2d8fe1..cea0a53c79de 100644 --- a/pkgs/tools/misc/timetagger_cli/default.nix +++ b/pkgs/tools/misc/timetagger_cli/default.nix @@ -24,7 +24,7 @@ python3.pkgs.buildPythonApplication rec { doCheck = false; meta = with lib; { - description = "Track your time from the command-line "; + description = "Track your time from the command-line"; homepage = "https://github.com/almarklein/timetagger_cli"; license = with licenses; [ mit ]; maintainers = with maintainers; [ matthiasbeyer ]; diff --git a/pkgs/tools/misc/vix/default.nix b/pkgs/tools/misc/vix/default.nix index 9e759536d74c..262958c9c2fd 100644 --- a/pkgs/tools/misc/vix/default.nix +++ b/pkgs/tools/misc/vix/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation { buildInputs = [ SDL ]; meta = with lib; { - description = "Visual Interface heXadecimal dump "; + description = "Visual Interface heXadecimal dump"; homepage = "http://actinid.org/vix/"; license = licenses.gpl3; maintainers = [ maintainers.ehmry ]; diff --git a/pkgs/tools/networking/netmask/default.nix b/pkgs/tools/networking/netmask/default.nix index 4f55df3cc279..5939c752dbde 100644 --- a/pkgs/tools/networking/netmask/default.nix +++ b/pkgs/tools/networking/netmask/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://github.com/tlby/netmask"; - description = "IP address formatting tool "; + description = "IP address formatting tool"; license = licenses.gpl2Plus; platforms = platforms.linux; maintainers = [ maintainers.jensbin ]; diff --git a/pkgs/tools/networking/xrootd/test-runner.nix b/pkgs/tools/networking/xrootd/test-runner.nix index 5bcf1ae86759..b878febc7bff 100644 --- a/pkgs/tools/networking/xrootd/test-runner.nix +++ b/pkgs/tools/networking/xrootd/test-runner.nix @@ -1,7 +1,4 @@ -{ lib -, runCommand -, xrootd -}: +{ runCommand, xrootd }: # These tests are specified in the test procedure of the upstream CD: # https://github.com/xrootd/xrootd/blob/master/.github/workflows/build.yml#L90-L98 diff --git a/pkgs/tools/nix/web-devmode.nix b/pkgs/tools/nix/web-devmode.nix index 6ebdc31118f0..202fa23c2a27 100644 --- a/pkgs/tools/nix/web-devmode.nix +++ b/pkgs/tools/nix/web-devmode.nix @@ -1,13 +1,21 @@ { - pkgs, + lib, + findutils, + mkShell, + nodejs_latest, + parallel, + rsync, + watchexec, + writeShellScriptBin, # arguments to `nix-build`, e.g. `"foo.nix -A bar"` buildArgs, # what path to open a browser at open, -}: let - inherit (pkgs) lib; +}: +let + inherit (nodejs_latest.pkgs) live-server; - error_page = pkgs.writeShellScriptBin "error_page" '' + error_page = writeShellScriptBin "error_page" '' echo " @@ -30,7 +38,7 @@ # Using rsync here, instead of `cp`, to get as close to an atomic # directory copy operation as possible. `--delay-updates` should # also go towards that. - build_and_copy = pkgs.writeShellScriptBin "build_and_copy" '' + build_and_copy = writeShellScriptBin "build_and_copy" '' set -euxo pipefail set +e @@ -41,7 +49,7 @@ if [ $exit_status -eq 0 ]; then # setting permissions to be able to clean up - ${lib.getBin pkgs.rsync}/bin/rsync \ + ${lib.getBin rsync}/bin/rsync \ --recursive \ --chmod=u=rwX \ --delete-before \ @@ -53,7 +61,7 @@ ${lib.getBin error_page}/bin/error_page "$stderr" > $error_page_absolute set -x - ${lib.getBin pkgs.findutils}/bin/find $serve \ + ${lib.getBin findutils}/bin/find $serve \ -type f \ ! -name $error_page_relative \ -delete @@ -61,10 +69,10 @@ ''; # https://watchexec.github.io/ - watcher = pkgs.writeShellScriptBin "watcher" '' + watcher = writeShellScriptBin "watcher" '' set -euxo pipefail - ${lib.getBin pkgs.watchexec}/bin/watchexec \ + ${lib.getBin watchexec}/bin/watchexec \ --shell=none \ --restart \ --print-events \ @@ -74,10 +82,10 @@ # A Rust alternative to live-server exists, but it was not in nixpkgs. # `--no-css-inject`: without this it seems that only CSS is auto-reloaded. # https://www.npmjs.com/package/live-server - server = pkgs.writeShellScriptBin "server" '' + server = writeShellScriptBin "server" '' set -euxo pipefail - ${lib.getBin pkgs.nodePackages_latest.live-server}/bin/live-server \ + ${lib.getBin live-server}/bin/live-server \ --host=127.0.0.1 \ --verbose \ --no-css-inject \ @@ -86,32 +94,33 @@ $serve ''; - devmode = - pkgs.writeShellScriptBin "devmode" - '' - set -euxo pipefail + devmode = writeShellScriptBin "devmode" '' + set -euxo pipefail - function handle_exit { - rm -rf "$tmpdir" - } + function handle_exit { + rm -rf "$tmpdir" + } - tmpdir=$(mktemp -d) - trap handle_exit EXIT + tmpdir=$(mktemp -d) + trap handle_exit EXIT - export out_link="$tmpdir/result" - export serve="$tmpdir/serve" - mkdir $serve - export error_page_relative=error.html - export error_page_absolute=$serve/$error_page_relative - ${lib.getBin error_page}/bin/error_page "building …" > $error_page_absolute + export out_link="$tmpdir/result" + export serve="$tmpdir/serve" + mkdir $serve + export error_page_relative=error.html + export error_page_absolute=$serve/$error_page_relative + ${lib.getBin error_page}/bin/error_page "building …" > $error_page_absolute - ${lib.getBin pkgs.parallel}/bin/parallel \ - --will-cite \ - --line-buffer \ - --tagstr '{/}' \ - ::: \ - "${lib.getBin watcher}/bin/watcher" \ - "${lib.getBin server}/bin/server" - ''; + ${lib.getBin parallel}/bin/parallel \ + --will-cite \ + --line-buffer \ + --tagstr '{/}' \ + ::: \ + "${lib.getBin watcher}/bin/watcher" \ + "${lib.getBin server}/bin/server" + ''; in - devmode +mkShell { + name = "web-devmode"; + packages = [ devmode ]; +} diff --git a/pkgs/tools/security/pinentry-bemenu/default.nix b/pkgs/tools/security/pinentry-bemenu/default.nix index 65e7a88bcfbb..e165fad36737 100644 --- a/pkgs/tools/security/pinentry-bemenu/default.nix +++ b/pkgs/tools/security/pinentry-bemenu/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "pinentry-bemenu"; - version = "0.13.2"; + version = "0.14.0"; src = fetchFromGitHub { owner = "t-8ch"; repo = pname; rev = "v${version}"; - sha256 = "sha256-m6P8/cCdGH2c9ne8aLrh6pUJ6Ekn+CNyEn3WlD2LhU8="; + sha256 = "sha256-kiGUCcQIS58XjE4r0yiK4hJ85Sg5wrtBqeSYcgUKAmo="; }; nativeBuildInputs = [ meson ninja pkg-config ]; diff --git a/pkgs/tools/system/automatic-timezoned/default.nix b/pkgs/tools/system/automatic-timezoned/default.nix index 4bdc6674e08b..f65553b39ce8 100644 --- a/pkgs/tools/system/automatic-timezoned/default.nix +++ b/pkgs/tools/system/automatic-timezoned/default.nix @@ -5,16 +5,16 @@ rustPlatform.buildRustPackage rec { pname = "automatic-timezoned"; - version = "2.0.22"; + version = "2.0.25"; src = fetchFromGitHub { owner = "maxbrunet"; repo = pname; rev = "v${version}"; - sha256 = "sha256-W1VfJiQHgYp3KzLaXYIJfvNRHKNZ7NxFr4WbBUtwh8k="; + sha256 = "sha256-+1MOGpk4nxYNtadjv88drubmHyEciiVWax7rdVWrjMY="; }; - cargoHash = "sha256-N9xQqMFd14tkRGYrRUvqg9Y6rqnWwukutD3nv61gKuc="; + cargoHash = "sha256-+n+3BEZ84pYzjBLxW0YEz15RhgRqyakdamMA77Z+BeI="; meta = with lib; { description = "Automatically update system timezone based on location"; diff --git a/pkgs/tools/system/bottom/default.nix b/pkgs/tools/system/bottom/default.nix index 160baf72636b..5c04bd8c7473 100644 --- a/pkgs/tools/system/bottom/default.nix +++ b/pkgs/tools/system/bottom/default.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage rec { pname = "bottom"; - version = "0.9.6"; + version = "0.9.7"; src = fetchFromGitHub { owner = "ClementTsang"; repo = pname; rev = version; - hash = "sha256-czOYEZevZD7GfExmqwB7vhLXl6+etag1PjZFA2G9aGA="; + hash = "sha256-WZf6BR0D7VDdRu9mCVd2dwPraQ8IYXQcgblwL5wqHYQ="; }; - cargoHash = "sha256-RDOGf1jujZikcRXRtL71BUGgmZyt7vQOTk1LkKpXDuo="; + cargoHash = "sha256-F0T9jbgfdu6rimIq+3ijYlkFRMkhuuQchy0o4xhCoXE="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/tools/text/mdbook-i18n-helpers/default.nix b/pkgs/tools/text/mdbook-i18n-helpers/default.nix index f9343e163798..83d81f1f6389 100644 --- a/pkgs/tools/text/mdbook-i18n-helpers/default.nix +++ b/pkgs/tools/text/mdbook-i18n-helpers/default.nix @@ -5,17 +5,17 @@ rustPlatform.buildRustPackage rec { pname = "mdbook-i18n-helpers"; - version = "0.3.4"; + version = "0.3.5"; src = fetchFromGitHub { owner = "google"; repo = "mdbook-i18n-helpers"; # TODO fix once upstream uses semver for tags again rev = "refs/tags/mdbook-i18n-helpers-${version}"; - hash = "sha256-nIavOBWPyCmCLwPcDbjjG1sa71HObGnhms9sSCAR2iA="; + hash = "sha256-FdguzuYpMl6i1dvoPNE1Bk+GTmeTrqLUY/sVRsbETtU="; }; - cargoHash = "sha256-bBUgsZHvJPwsdM3DjhaoAvIkPXQ6gzPOdfcE5rAnMQk="; + cargoHash = "sha256-sPRylKXTSkVkhDvpAvHuYIr9TSi1ustIs1HTwEIbk/w="; meta = with lib; { description = "Helpers for a mdbook i18n workflow based on Gettext"; diff --git a/pkgs/tools/wayland/aw-watcher-window-wayland/default.nix b/pkgs/tools/wayland/aw-watcher-window-wayland/default.nix index 5c51ff25d1ef..5235832f78e3 100644 --- a/pkgs/tools/wayland/aw-watcher-window-wayland/default.nix +++ b/pkgs/tools/wayland/aw-watcher-window-wayland/default.nix @@ -33,7 +33,7 @@ rustPlatform.buildRustPackage rec { ]; meta = with lib; { - description = "WIP window and afk watcher for wayland "; + description = "WIP window and afk watcher for wayland"; homepage = "https://github.com/ActivityWatch/aw-watcher-window-wayland"; license = licenses.mpl20; maintainers = with maintainers; [ esau79p ]; diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 99116ed6f119..b1f936e5ffe8 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -745,6 +745,7 @@ mapAliases ({ libtorrentRasterbar-2_0_x = libtorrent-rasterbar-2_0_x; # Added 2020-12-20 libungif = giflib; # Added 2020-02-12 libusb = libusb1; # Added 2020-04-28 + libvpx_1_8 = throw "libvpx_1_8 has been removed because it is impacted by security issues and not used in nixpkgs, move to 'libvpx'"; # Added 2024-07-26 libwnck3 = libwnck; libyamlcpp = yaml-cpp; # Added 2023-01-29 libyamlcpp_0_3 = yaml-cpp_0_3; # Added 2023-01-29 @@ -1049,8 +1050,9 @@ mapAliases ({ optparse-bash = throw "'optparse-bash' (GitHub: nk412/optparse) has been removed. Use 'argparse' instead"; # Added 2024-01-12 orchis = orchis-theme; # Added 2021-06-09 oni2 = throw "oni2 was removed, because it is unmaintained and was abandoned years ago."; #Added 2024-01-15 - onlyoffice-bin_7_2 = throw "onlyoffice-bin_7_2 has been renamed to onlyoffice-bin"; # Added 2024-02-05 - onlyoffice-bin_7_5 = throw "onlyoffice-bin_7_5 has been renamed to onlyoffice-bin_latest (and updated from 7.5.x)"; # Added 2024-02-05 + onlyoffice-bin_latest = onlyoffice-bin; # Added 2024-07-03 + onlyoffice-bin_7_2 = throw "onlyoffice-bin_7_2 has been removed. Please use the latest version available under onlyoffice-bin"; # Added 2024-07-03 + onlyoffice-bin_7_5 = throw "onlyoffice-bin_7_5 has been removed. Please use the latest version available under onlyoffice-bin"; # Added 2024-07-03 oroborus = throw "oroborus was removed, because it was abandoned years ago."; #Added 2023-09-10 osxfuse = macfuse-stubs; # Added 2021-03-20 oxen = throw "'oxen' has been removed, because it was broken, outdated and unmaintained"; # Added 2023-12-09 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a9be2baa50ec..91f48757e5b7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1598,10 +1598,6 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) CoreServices; }; - agate = callPackage ../servers/gemini/agate { - inherit (darwin.apple_sdk.frameworks) Security; - }; - agi = callPackage ../tools/graphics/agi { }; agola = callPackage ../development/tools/continuous-integration/agola { }; @@ -17193,8 +17189,8 @@ with pkgs; python27Packages = python27.pkgs; python39Packages = python39.pkgs; python310Packages = python310.pkgs; - python311Packages = python311.pkgs; - python312Packages = python312.pkgs; + python311Packages = recurseIntoAttrs python311.pkgs; + python312Packages = recurseIntoAttrs python312.pkgs; python313Packages = python313.pkgs; pypyPackages = pypy.pkgs; pypy2Packages = pypy2.pkgs; @@ -22711,7 +22707,6 @@ with pkgs; libviperfx = callPackage ../development/libraries/libviperfx { }; libvpx = callPackage ../development/libraries/libvpx { }; - libvpx_1_8 = callPackage ../development/libraries/libvpx/1_8.nix { }; libvterm = callPackage ../development/libraries/libvterm { }; libvterm-neovim = callPackage ../development/libraries/libvterm-neovim { }; @@ -23393,6 +23388,7 @@ with pkgs; openslp = callPackage ../development/libraries/openslp { }; openstackclient = with python311Packages; toPythonApplication python-openstackclient; + barbicanclient = with python311Packages; toPythonApplication python-barbicanclient; glanceclient = with python311Packages; toPythonApplication python-glanceclient; heatclient = with python311Packages; toPythonApplication python-heatclient; ironicclient = with python311Packages; toPythonApplication python-ironicclient; @@ -35305,9 +35301,11 @@ with pkgs; youki = callPackage ../applications/virtualization/youki { }; - yt-dlp = with python3Packages; toPythonApplication yt-dlp; - - yt-dlp-light = with python3Packages; toPythonApplication yt-dlp-light; + yt-dlp-light = yt-dlp.override { + atomicparsleySupport = false; + ffmpegSupport = false; + rtmpSupport = false; + }; youtube-viewer = perlPackages.WWWYoutubeViewer; @@ -39137,6 +39135,8 @@ with pkgs; nixpkgs-lint-community = callPackage ../tools/nix/nixpkgs-lint { }; + nixpkgs-manual = callPackage ../../doc/doc-support/package.nix { }; + rnix-hashes = callPackage ../tools/nix/rnix-hashes { }; nixos-artwork = callPackage ../data/misc/nixos-artwork { }; diff --git a/pkgs/top-level/coq-packages.nix b/pkgs/top-level/coq-packages.nix index b5fdb99b5334..ef32cb685255 100644 --- a/pkgs/top-level/coq-packages.nix +++ b/pkgs/top-level/coq-packages.nix @@ -219,6 +219,6 @@ in rec { coqPackages_8_19 = mkCoqPackages coq_8_19; coqPackages_8_20 = mkCoqPackages coq_8_20; - coqPackages = coqPackages_8_19; + coqPackages = recurseIntoAttrs coqPackages_8_19; coq = coqPackages.coq; } diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 7c5ac7cbb3fc..9759073c4e6e 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -9288,6 +9288,8 @@ self: super: with self; { od = callPackage ../development/python-modules/od { }; + oddsprout = callPackage ../development/python-modules/oddsprout { }; + odfpy = callPackage ../development/python-modules/odfpy { }; odp-amsterdam = callPackage ../development/python-modules/odp-amsterdam { }; @@ -9666,6 +9668,8 @@ self: super: with self; { pandoc-attributes = callPackage ../development/python-modules/pandoc-attributes { }; + pandoc-latex-environment = callPackage ../development/python-modules/pandoc-latex-environment { }; + pandoc-xnos = callPackage ../development/python-modules/pandoc-xnos { }; pandocfilters = callPackage ../development/python-modules/pandocfilters { }; @@ -9790,6 +9794,8 @@ self: super: with self; { paypalrestsdk = callPackage ../development/python-modules/paypalrestsdk { }; + pbar = callPackage ../development/python-modules/pbar { }; + pbkdf2 = callPackage ../development/python-modules/pbkdf2 { }; pbr = callPackage ../development/python-modules/pbr { }; @@ -12606,6 +12612,8 @@ self: super: with self; { python-axolotl-curve25519 = callPackage ../development/python-modules/python-axolotl-curve25519 { }; + python-barbicanclient = callPackage ../development/python-modules/python-barbicanclient { }; + python-barcode = callPackage ../development/python-modules/python-barcode { }; python-baseconv = callPackage ../development/python-modules/python-baseconv { }; @@ -12640,6 +12648,8 @@ self: super: with self; { python-decouple = callPackage ../development/python-modules/python-decouple { }; + python-designateclient = callPackage ../development/python-modules/python-designateclient { }; + pythondialog = callPackage ../development/python-modules/pythondialog { }; python-didl-lite = callPackage ../development/python-modules/python-didl-lite { }; @@ -13868,6 +13878,8 @@ self: super: with self; { saneyaml = callPackage ../development/python-modules/saneyaml { }; + samarium = callPackage ../development/python-modules/samarium { }; + sampledata = callPackage ../development/python-modules/sampledata { }; samplerate = callPackage ../development/python-modules/samplerate { @@ -17628,15 +17640,13 @@ self: super: with self; { yoyo-migrations = callPackage ../development/python-modules/yoyo-migrations { }; - yt-dlp = callPackage ../tools/misc/yt-dlp { - ffmpeg = pkgs.ffmpeg-headless; - }; + yt-dlp = toPythonModule (pkgs.yt-dlp.override { + python3Packages = self; + }); - yt-dlp-light = callPackage ../tools/misc/yt-dlp { - atomicparsleySupport = false; - ffmpegSupport = false; - rtmpSupport = false; - }; + yt-dlp-light = toPythonModule (pkgs.yt-dlp-light.override { + python3Packages = self; + }); youtube-search = callPackage ../development/python-modules/youtube-search { }; diff --git a/pkgs/top-level/qt5-packages.nix b/pkgs/top-level/qt5-packages.nix index d0c6487dec64..2e746d5c7d5d 100644 --- a/pkgs/top-level/qt5-packages.nix +++ b/pkgs/top-level/qt5-packages.nix @@ -171,8 +171,6 @@ in (noExtraAttrs (kdeFrameworks // plasmaMobileGear // plasma5 // plasma5.thirdP libqofono = callPackage ../development/libraries/libqofono { }; - libqtav = callPackage ../development/libraries/libqtav { }; - libquotient = callPackage ../development/libraries/libquotient { }; libqaccessibilityclient = callPackage ../development/libraries/libqaccessibilityclient { }; diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix index f79352bf3ffe..5800376c9153 100644 --- a/pkgs/top-level/release.nix +++ b/pkgs/top-level/release.nix @@ -77,9 +77,8 @@ let release-checks = import ./nixpkgs-basic-release-checks.nix { inherit pkgs nixpkgs supportedSystems; }; + manual = pkgs.nixpkgs-manual.override { inherit nixpkgs; }; metrics = import ./metrics.nix { inherit pkgs nixpkgs; }; - - manual = import ../../doc { inherit pkgs nixpkgs; }; lib-tests = import ../../lib/tests/release.nix { inherit pkgs; }; pkgs-lib-tests = import ../pkgs-lib/tests { inherit pkgs; };