diff options
Diffstat (limited to 'pkgs')
123 files changed, 1744 insertions, 785 deletions
diff --git a/pkgs/applications/audio/pt2-clone/default.nix b/pkgs/applications/audio/pt2-clone/default.nix index cebf20ae78b..0eaea39f241 100644 --- a/pkgs/applications/audio/pt2-clone/default.nix +++ b/pkgs/applications/audio/pt2-clone/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "pt2-clone"; - version = "1.38"; + version = "1.39"; src = fetchFromGitHub { owner = "8bitbubsy"; repo = "pt2-clone"; rev = "v${version}"; - sha256 = "sha256-fnPYlZvCZYiKkQmp5bNtrqgZAkVtKLmLMcfkbbysMyU="; + sha256 = "sha256-ZmgsNp2fRebbLxSzzCsLdM6/7kBKo+YFUCdWLSYfI5A="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/applications/audio/strawberry/default.nix b/pkgs/applications/audio/strawberry/default.nix index fd75a4a8e5d..e3200d8e43f 100644 --- a/pkgs/applications/audio/strawberry/default.nix +++ b/pkgs/applications/audio/strawberry/default.nix @@ -36,13 +36,13 @@ mkDerivation rec { pname = "strawberry"; - version = "1.0.0"; + version = "1.0.1"; src = fetchFromGitHub { owner = "jonaski"; repo = pname; rev = version; - sha256 = "sha256-m1BB5OIeCIQuJpxEO1xmb/Z8tzeHF31jYg67OpVWWRM="; + sha256 = "sha256-MlS1ShRXfsTMs97MeExW6sfpv40OcQLDIzIzOYGk7Rw="; }; buildInputs = [ diff --git a/pkgs/applications/editors/texstudio/default.nix b/pkgs/applications/editors/texstudio/default.nix index 9d1a04128c0..06876d37eee 100644 --- a/pkgs/applications/editors/texstudio/default.nix +++ b/pkgs/applications/editors/texstudio/default.nix @@ -3,13 +3,13 @@ mkDerivation rec { pname = "texstudio"; - version = "4.1.2"; + version = "4.2.0"; src = fetchFromGitHub { owner = "${pname}-org"; repo = pname; rev = version; - sha256 = "sha256-+HEA0IvWy0jvjFdU0sG9CzOKzysERMZBs/yHoE0I8B4="; + sha256 = "sha256-L3r71srvdSsCc1HZcu6lsH+oTJQ7TatVd2Oy3meAVYk="; }; nativeBuildInputs = [ qmake wrapQtAppsHook pkg-config ]; diff --git a/pkgs/applications/misc/blender/wrapper.nix b/pkgs/applications/misc/blender/wrapper.nix new file mode 100644 index 00000000000..24ff72e14f6 --- /dev/null +++ b/pkgs/applications/misc/blender/wrapper.nix @@ -0,0 +1,39 @@ +{ stdenv +, lib +, blender +, makeWrapper +, python39Packages +}: +{ name ? "wrapped" +, packages ? [] +}: +stdenv.mkDerivation { + pname = "blender-${name}"; + inherit (blender) version; + src = blender; + + nativeBuildInputs = [ python39Packages.wrapPython makeWrapper ]; + installPhase = '' + mkdir $out/{share/applications,bin} -p + sed 's/Exec=blender/Exec=blender-${name}/g' $src/share/applications/blender.desktop > $out/share/applications/blender-${name}.desktop + cp -r $src/share/blender $out/share + cp -r $src/share/doc $out/share + cp -r $src/share/icons $out/share + + buildPythonPath "$pythonPath" + + echo '#!/usr/bin/env bash ' >> $out/bin/blender-${name} + for p in $program_PATH; do + echo "export PATH=\$PATH:$p " >> $out/bin/blender-${name} + done + for p in $program_PYTHONPATH; do + echo "export PYTHONPATH=\$PYTHONPATH:$p " >> $out/bin/blender-${name} + done + echo 'exec ${blender}/bin/blender "$@"' >> $out/bin/blender-${name} + chmod +x $out/bin/blender-${name} + ''; + + pythonPath = packages; + + meta = blender.meta; +} diff --git a/pkgs/applications/misc/calibre/default.nix b/pkgs/applications/misc/calibre/default.nix index ba3de9a63aa..1d6af843e2f 100644 --- a/pkgs/applications/misc/calibre/default.nix +++ b/pkgs/applications/misc/calibre/default.nix @@ -111,6 +111,7 @@ mkDerivation rec { setuptools zeroconf jeepney + pycryptodome # the following are distributed with calibre, but we use upstream instead odfpy ] ++ lib.optional (unrarSupport) unrardll diff --git a/pkgs/applications/misc/octoprint/default.nix b/pkgs/applications/misc/octoprint/default.nix index 716b750948b..a38421b3178 100644 --- a/pkgs/applications/misc/octoprint/default.nix +++ b/pkgs/applications/misc/octoprint/default.nix @@ -129,9 +129,11 @@ let version = "5.0.0"; src = oldAttrs.src.override { inherit version; - sha256 = "sha256-MTkw/d3nA9jjcCmjBL+RQpzRGu72PFfebayp2Vjh8lU="; + hash = "sha256-MTkw/d3nA9jjcCmjBL+RQpzRGu72PFfebayp2Vjh8lU="; }; - doCheck = false; + disabledTestPaths = [ + "t/unit/backends/test_mongodb.py" + ]; }); } ) diff --git a/pkgs/applications/misc/sigi/default.nix b/pkgs/applications/misc/sigi/default.nix index 2d64883d008..731608db7da 100644 --- a/pkgs/applications/misc/sigi/default.nix +++ b/pkgs/applications/misc/sigi/default.nix @@ -1,24 +1,28 @@ -{ lib, rustPlatform, fetchFromGitHub, testVersion, sigi }: +{ lib, rustPlatform, fetchCrate, installShellFiles, testVersion, sigi }: rustPlatform.buildRustPackage rec { pname = "sigi"; - version = "2.1.1"; + version = "3.0.0"; - src = fetchFromGitHub { - owner = "hiljusti"; - repo = pname; - rev = "v${version}"; - sha256 = "sha256-y0m1AQE5qoUfPZjJfo7w5h+zZ1pbz8FkLFDM13MTWvQ="; + src = fetchCrate { + inherit pname version; + sha256 = "sha256-1xZMj6NjwA9pVOEL4CDv4XHC3usu3WdjsLJuW3vgxc8="; }; - cargoSha256 = "sha256-NTjL57Y1Uzk5F34BW3lB3xUpD60Opt0fGWuXHQU5L3g="; + nativeBuildInputs = [ installShellFiles ]; + + postInstall = '' + installManPage sigi.1 + ''; + + cargoSha256 = "sha256-NUWm2GkK7bASo6bAOgQgHate45iDG5l3G/KhtLrjzQ8="; passthru.tests.version = testVersion { package = sigi; }; meta = with lib; { description = "CLI tool for organization and planning"; homepage = "https://github.com/hiljusti/sigi"; - license = licenses.gpl3; + license = licenses.gpl2; maintainers = with maintainers; [ hiljusti ]; }; } diff --git a/pkgs/applications/misc/variety/default.nix b/pkgs/applications/misc/variety/default.nix index 948719aae76..3d5b99eb171 100644 --- a/pkgs/applications/misc/variety/default.nix +++ b/pkgs/applications/misc/variety/default.nix @@ -1,21 +1,21 @@ -{ stdenv, lib, fetchFromGitHub -, python3Packages -, fehSupport ? false, feh -, imagemagickSupport ? true, imagemagick -, intltool -, gtk3 +{ lib +, stdenv +, fetchFromGitHub , gexiv2 -, libnotify , gobject-introspection +, gtk3 , hicolor-icon-theme +, intltool +, libnotify , librsvg +, python3 +, runtimeShell , wrapGAppsHook -, makeWrapper +, fehSupport ? false, feh +, imagemagickSupport ? true, imagemagick }: -with python3Packages; - -buildPythonApplication rec { +python3.pkgs.buildPythonApplication rec { pname = "variety"; version = "0.8.5"; @@ -26,9 +26,34 @@ buildPythonApplication rec { sha256 = "sha256-6dLz4KXavXwnk5GizBH46d2EHMHPjRo0WnnUuVMtI1M="; }; - nativeBuildInputs = [ makeWrapper intltool wrapGAppsHook ]; + nativeBuildInputs = [ + intltool + wrapGAppsHook + ]; - buildInputs = [ distutils_extra ]; + propagatedBuildInputs = [ + gexiv2 + gobject-introspection + gtk3 + hicolor-icon-theme + libnotify + librsvg + ] + ++ (with python3.pkgs; [ + beautifulsoup4 + configobj + dbus-python + distutils_extra + httplib2 + lxml + pillow + pycairo + pygobject3 + requests + setuptools + ]) + ++ lib.optional fehSupport feh + ++ lib.optional imagemagickSupport imagemagick; doCheck = false; @@ -38,33 +63,14 @@ buildPythonApplication rec { prePatch = '' substituteInPlace variety_lib/varietyconfig.py \ - --replace "__variety_data_directory__ = \"../data\"" "__variety_data_directory__ = \"$out/share/variety\"" + --replace "__variety_data_directory__ = \"../data\"" \ + "__variety_data_directory__ = \"$out/share/variety\"" substituteInPlace data/scripts/set_wallpaper \ - --replace /bin/bash ${stdenv.shell} + --replace /bin/bash ${runtimeShell} substituteInPlace data/scripts/get_wallpaper \ - --replace /bin/bash ${stdenv.shell} + --replace /bin/bash ${runtimeShell} ''; - propagatedBuildInputs = [ - beautifulsoup4 - configobj - dbus-python - gexiv2 - gobject-introspection - gtk3 - hicolor-icon-theme - httplib2 - libnotify - librsvg - lxml - pillow - pycairo - pygobject3 - requests - setuptools - ] ++ lib.optional fehSupport feh - ++ lib.optional imagemagickSupport imagemagick; - meta = with lib; { homepage = "https://github.com/varietywalls/variety"; description = "A wallpaper manager for Linux systems"; @@ -80,8 +86,7 @@ buildPythonApplication rec { Variety also includes a range of image effects, such as oil painting and blur, as well as options to layer quotes and a clock onto the background. ''; - license = licenses.gpl3; + license = licenses.gpl3Plus; maintainers = with maintainers; [ p3psi AndersonTorres zfnmxt ]; - platforms = with platforms; linux; }; } diff --git a/pkgs/applications/misc/xiphos/default.nix b/pkgs/applications/misc/xiphos/default.nix index 01706011e2d..87656db5e5f 100644 --- a/pkgs/applications/misc/xiphos/default.nix +++ b/pkgs/applications/misc/xiphos/default.nix @@ -1,43 +1,143 @@ -{ lib, stdenv, fetchFromGitHub, pkg-config -, python -, intltool -, docbook2x, docbook_xml_dtd_412, libxslt -, sword, clucene_core, biblesync +{ lib +, stdenv +, fetchFromGitHub +, fetchpatch +, appstream-glib +, at-spi2-core +, biblesync +, brotli +, clucene_core +, cmake +, dbus +, dbus-glib +, desktop-file-utils +, docbook2x +, docbook_xml_dtd_412 +, enchant +, gconf +, glib , gnome-doc-utils -, libgsf, gconf -, gtkhtml, libglade, scrollkeeper +, gtk2 +, gtkhtml +, icu +, intltool +, isocodes +, itstool +, libdatrie +, libepoxy +, libglade +, libgsf +, libpsl +, libselinux +, libsepol +, libsysprof-capture +, libthai +, libuuid +, libxkbcommon +, libxslt +, minizip +, pcre +, pkg-config +, python +, scrollkeeper +, sqlite +, sword , webkitgtk -, dbus-glib, enchant, isocodes, libuuid, icu , wrapGAppsHook -, wafHook +, xorg +, yelp-tools +, zip }: stdenv.mkDerivation rec { pname = "xiphos"; - version = "4.1.0"; + version = "4.2.1"; src = fetchFromGitHub { owner = "crosswire"; repo = "xiphos"; rev = version; - sha256 = "14il9k4i58qbc78hcadw3gqy21sb9q661d75vlj6fwpczbzj7x1a"; + hash = "sha256-H5Q+azE2t3fgu77C9DxrkeUCJ7iJz3Cc91Ln4dqLvD8="; }; - nativeBuildInputs = [ pkg-config wrapGAppsHook wafHook ]; - buildInputs = [ python intltool docbook2x docbook_xml_dtd_412 libxslt - sword clucene_core biblesync gnome-doc-utils libgsf gconf gtkhtml - libglade scrollkeeper webkitgtk dbus-glib enchant isocodes libuuid icu ]; + nativeBuildInputs = [ + appstream-glib + cmake + desktop-file-utils + itstool + pkg-config + wrapGAppsHook + yelp-tools + ]; - prePatch = '' - patchShebangs .; - ''; + buildInputs = [ + at-spi2-core + biblesync + brotli + clucene_core + dbus + dbus-glib + docbook2x + docbook_xml_dtd_412 + enchant + gconf + glib + gnome-doc-utils + gtk2 + gtkhtml + icu + intltool + isocodes + libdatrie + libepoxy + libglade + libgsf + libpsl + libselinux + libsepol + libsysprof-capture + libthai + libuuid + libxkbcommon + libxslt + minizip + pcre + python + scrollkeeper + sqlite + sword + webkitgtk + zip + ] + ++ (with xorg; [ + libXdmcp + libXtst + ]); + + cmakeFlags = [ + "-DDBUS=OFF" + "-DGTKHTML=ON" + ]; preConfigure = '' + # The build script won't continue without the version saved locally. + echo "${version}" > cmake/source_version.txt + export CLUCENE_HOME=${clucene_core}; export SWORD_HOME=${sword}; ''; - wafConfigureFlags = [ "--enable-webkit2" ]; + patchFlags = [ "-p0" ]; + + patches = [ + # GLIB_VERSION_MIN_REQUIRED is not defined. + # https://github.com/crosswire/xiphos/issues/1083#issuecomment-820304874 + (fetchpatch { + name ="xiphos-glibc.patch"; + url = "https://aur.archlinux.org/cgit/aur.git/plain/xiphos-glibc.patch?h=xiphos"; + sha256 = "sha256-0WadztJKXW2adqsDP8iSAYVShbdqHoDvP+aVJC0cQB0="; + }) + ]; meta = with lib; { description = "A GTK Bible study tool"; diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.json b/pkgs/applications/networking/browsers/chromium/upstream-info.json index 7358c1e3ab3..4fa284a107e 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.json +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.json @@ -19,9 +19,9 @@ } }, "beta": { - "version": "98.0.4758.48", - "sha256": "0c6lxmr8xxjhifm28v9ri05v5al9ph6infksx9qgd045svmfynxs", - "sha256bin64": "0m7vbd7fy4wrbk28hw3hy6x8yb8vyyyisnicdhkp6j0xq9ni5jhj", + "version": "98.0.4758.54", + "sha256": "0w3pvp23y0vyj9p7j6nfxgnnzc5jyjn65k1khx0i333hs97vidbc", + "sha256bin64": "1qxkqw45jzcrg2ziqh4npg19a52b5j1hvag4n5qlrq4bfblsbwwh", "deps": { "gn": { "version": "2021-12-07", diff --git a/pkgs/applications/networking/browsers/telescope/default.nix b/pkgs/applications/networking/browsers/telescope/default.nix index ae4a649724b..5695dd2ecd4 100644 --- a/pkgs/applications/networking/browsers/telescope/default.nix +++ b/pkgs/applications/networking/browsers/telescope/default.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "telescope"; - version = "0.6.1"; + version = "0.7"; src = fetchFromGitHub { owner = "omar-polo"; repo = pname; rev = version; - sha256 = "sha256-r2+jvmnW9EeQf/2X2cOxnOa+HGuGHV6YMftT2MxbSYQ="; + sha256 = "sha256-YF7pysKwEwtyERBDiF0AbnDfqK3S/ZS/y+/rd17dLDw="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/networking/cluster/kube-capacity/default.nix b/pkgs/applications/networking/cluster/kube-capacity/default.nix index 9e04a719708..596a71251b2 100644 --- a/pkgs/applications/networking/cluster/kube-capacity/default.nix +++ b/pkgs/applications/networking/cluster/kube-capacity/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "kube-capacity"; - version = "0.6.2"; + version = "0.7.0"; src = fetchFromGitHub { rev = "v${version}"; owner = "robscott"; repo = pname; - sha256 = "sha256-rpCocokLj1iJonOt3rP+n1BpijjWlTie/a7vT2dMYnA="; + sha256 = "sha256-jop1dn+D0A6BkR1UCMrU9qcbZ1AHVth430cTd+kUYJw="; }; vendorSha256 = "sha256-1D+nQ6WrHwJwcszCvoZ08SHX0anksdI69Jra5b9jPCY="; diff --git a/pkgs/applications/networking/cluster/kubectl-example/default.nix b/pkgs/applications/networking/cluster/kubectl-example/default.nix index 228f12075c4..ed74f2f102e 100644 --- a/pkgs/applications/networking/cluster/kubectl-example/default.nix +++ b/pkgs/applications/networking/cluster/kubectl-example/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "kubectl-example"; - version = "1.0.1"; + version = "1.1.0"; src = fetchFromGitHub { owner = "seredot"; repo = pname; rev = "v${version}"; - sha256 = "18vp53cda93qjssxygwqp55yc80a93781839gf3138awngf731yq"; + sha256 = "sha256-7tqeIE6Ds8MrLH9k8cdzpeJP9pXVptduoEFE0zdrLlo="; }; vendorSha256 = null; diff --git a/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix b/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix index b3ecb27dfb2..893473ff15f 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix @@ -1,655 +1,655 @@ { - version = "91.4.1"; + version = "91.5.0"; sources = [ - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.4.1/linux-x86_64/af/thunderbird-91.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-x86_64/af/thunderbird-91.5.0.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha256 = "7af2c19b46daf1869af49289c1ab080559f8640c6dfc21cdae1ff48cdc26bf1f"; + sha256 = "20272a9fbf08651ca804f324aca1c0c7b6b04351b0a773790510a69d56ef19fb"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.4.1/linux-x86_64/ar/thunderbird-91.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-x86_64/ar/thunderbird-91.5.0.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha256 = "dfabb7336f9b5929041c43997ad7ac34fca0750d70293dacdc32f9048de2fc7d"; + sha256 = "208937e2b22db6a159b2c744d9ad6d9e96fddf21f753673d9006b2576e5ddd24"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.4.1/linux-x86_64/ast/thunderbird-91.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-x86_64/ast/thunderbird-91.5.0.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha256 = "3aade12867be4da3fb890214a7cd8551e12e962fb2a66b7e76da20a06755d045"; + sha256 = "a8b078c5699d174db89c4adbcce45c4add38d88561d1154dcaff56be4731b29d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.4.1/linux-x86_64/be/thunderbird-91.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-x86_64/be/thunderbird-91.5.0.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha256 = "8bb288330b957d8361880738b7d5e5833602dd81aad580a96f1031e88bd963f4"; + sha256 = "91be973a0658dc7a284cde429b537bc70db88143abe42fd6ce6c4a0a450353ca"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.4.1/linux-x86_64/bg/thunderbird-91.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-x86_64/bg/thunderbird-91.5.0.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha256 = "fcd8bbef82a24b146f4473da351cbd5262f8286d5b7ea78265516e815c7c84da"; + sha256 = "bdb25d9c1e3ed725d667b9b613a425a3f1c18bd6ff78417a32f04fc6257c7b66"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.4.1/linux-x86_64/br/thunderbird-91.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-x86_64/br/thunderbird-91.5.0.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha256 = "c1d331f6621fc120076d49015046f22ff898b089af8cac5226491bbe82391b9a"; + sha256 = "b8cf6f6f490a3f7a06a036bf84d71cdcdfb21e4e253190d2c8c648df8f7af931"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.4.1/linux-x86_64/ca/thunderbird-91.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-x86_64/ca/thunderbird-91.5.0.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha256 = "7b2a63bd30d1e47db16f64ea077623dfca965d71b2aa7f7ce56f8940a2f59301"; + sha256 = "5a55055b5eb29e209e02b2980895719883bfc9929910d0f336e431ebea870856"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.4.1/linux-x86_64/cak/thunderbird-91.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-x86_64/cak/thunderbird-91.5.0.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha256 = "f22de3c4bc4237610e7826ed6d46f84f8a02d5370e7d0675932abd98ee24256e"; + sha256 = "fe192c81dd6f04d37c4f603c3e0367d462c5dc6effe7c8a07a030d5584118c58"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.4.1/linux-x86_64/cs/thunderbird-91.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-x86_64/cs/thunderbird-91.5.0.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha256 = "8dd685427622c1bc710d8056e527d5766f7e5f0c47ca7e170b8e48ed01e8c5a5"; + sha256 = "bce9c7bd093631e2f0096ac3c8c2cdb19d9567d5233d912169c238e33372da1e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.4.1/linux-x86_64/cy/thunderbird-91.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-x86_64/cy/thunderbird-91.5.0.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha256 = "d98ebd1787b29a6ee785a4b7cfaa2283b836f23214c3c27d4fbb3e7154c1e9e5"; + sha256 = "4128f704289b9267316eb373a3142305096897b37a2daa79a84f4448aea54b14"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.4.1/linux-x86_64/da/thunderbird-91.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-x86_64/da/thunderbird-91.5.0.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha256 = "202729a6f4813bb3760a5ae834731a019593dbcd5d66173999f5cbbedf277f00"; + sha256 = "39e5239860b450079cc10179e215bef63d77957c47bc3690c16c086a30e01317"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.4.1/linux-x86_64/de/thunderbird-91.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-x86_64/de/thunderbird-91.5.0.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha256 = "c035ce2cb81b7083d0c6fc859ee259afce5440bc8f2c8e1ca1db02ce97f0b237"; + sha256 = "0bc2cabac439734fdddfcfc1426696559ac1ee3e9a7bad1182329d83fb47d8cb"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.4.1/linux-x86_64/dsb/thunderbird-91.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-x86_64/dsb/thunderbird-91.5.0.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha256 = "413eda01d4390e41f6d859def75c5972c4595b453fc9da948415e8e38f4766c0"; + sha256 = "2c4d8fc6ae4c9a2adabe0a1593d7289596b97dd7b9e39b44da926f925f754ef2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.4.1/linux-x86_64/el/thunderbird-91.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-x86_64/el/thunderbird-91.5.0.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha256 = "b238ee1b8dbf54ab0aa4c6f23a646e037a48e31d77749698744dc122bf38608a"; + sha256 = "07e10b923d0829e6cddc35bd56fe51afd07b35664b4feb725dfedbd51e99029a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.4.1/linux-x86_64/en-CA/thunderbird-91.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-x86_64/en-CA/thunderbird-91.5.0.tar.bz2"; locale = "en-CA"; arch = "linux-x86_64"; - sha256 = "4ef51ab9fdcd3c6ab1323a402253f5cd8682fa100f3b05fa62bf1153bbc04c28"; + sha256 = "7f583ea36dc9d8a1a2136343773a8e7434d466f31ddf50f5f7da7675a08dbd03"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.4.1/linux-x86_64/en-GB/thunderbird-91.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-x86_64/en-GB/thunderbird-91.5.0.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha256 = "3ee22d3b5c23bfba703d36e58185ef139ccfa923c1877f983fed90419e7fdf8b"; + sha256 = "46bd4e13d215bd9be875ebe3f999da3927a480401aa4a2e51f0388d3cf28a3a0"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.4.1/linux-x86_64/en-US/thunderbird-91.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-x86_64/en-US/thunderbird-91.5.0.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha256 = "6bd3bbcf3d92efe04b19bb45c0d9ac3abe8dd68fc84e255b76467b37ea5918b1"; + sha256 = "f6d62b3161d1b7cf665fdb965526632fc4eefcaf1727ece7986e956c7575cf0d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.4.1/linux-x86_64/es-AR/thunderbird-91.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-x86_64/es-AR/thunderbird-91.5.0.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha256 = "14b7fac461e90c4dd1790f6095e291e1ba510561d51655b16bda4ad7050dca8e"; + sha256 = "4f190b4d64db8fe9accafe1941e3f949ba21488b4411a506f6f61d437f17d61e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.4.1/linux-x86_64/es-ES/thunderbird-91.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-x86_64/es-ES/thunderbird-91.5.0.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha256 = "ee910bc3415e314d5f3b072608d61089ae55e969a138ee446377edf0e5ba710a"; + sha256 = "61065d0c72451cebbf5d83c92e460e240e7f477322531a3f4d082b3c0e6c213e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.4.1/linux-x86_64/et/thunderbird-91.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-x86_64/et/thunderbird-91.5.0.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha256 = "a643d96e71123c554a8af69bc875515113ffd30ab621d5f3b5678c33931cfab0"; + sha256 = "cba4afe259ccd7c6619f4ee0adf167659eb4f80e9355b25138d9f370ecbcf932"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.4.1/linux-x86_64/eu/thunderbird-91.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-x86_64/eu/thunderbird-91.5.0.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha256 = "b910976d8e940331d46ac92f82f56aff61f8d91137bae9c869715cb371309f9e"; + sha256 = "4e8569190b2702ad6e10156b434100cdf879dfb3a5ee798c876fc46871e1abf3"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.4.1/linux-x86_64/fi/thunderbird-91.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-x86_64/fi/thunderbird-91.5.0.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha256 = "a8dd93299fde700cf1419187da06405093b3f010e7fdd327742fbddcef1721a0"; + sha256 = "93e3b7624d6de0b77f87bb192384437e006530abd03bdc5589dc0dc47e0af304"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.4.1/linux-x86_64/fr/thunderbird-91.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-x86_64/fr/thunderbird-91.5.0.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha256 = "526f4f4feae5f6a0b9f1d80b0f76a7f26af7456e1eb09e36eadd51fc8d4115ed"; + sha256 = "a35c370b69a977160a83ffc4d24f5a9a9f1000e1012c71fcd1e7adc6c16c68b8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.4.1/linux-x86_64/fy-NL/thunderbird-91.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-x86_64/fy-NL/thunderbird-91.5.0.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha256 = "df5320f98ecd32439273b18237a742c34590e5b533a7da9471cfd37921725108"; + sha256 = "c392fb2f59d13f912e757be716a4bfc464a0cb2f69f8af780bbaec8e6bbcdf0f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.4.1/linux-x86_64/ga-IE/thunderbird-91.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-x86_64/ga-IE/thunderbird-91.5.0.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha256 = "c13529036ec2186e0e3088f63e351086bee21b0f8a3479586420c6a2701ee8f1"; + sha256 = "210aeb0fe2c3214f82948ef39205416e4c50750be0226fa56b2c5548ed06a182"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.4.1/linux-x86_64/gd/thunderbird-91.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-x86_64/gd/thunderbird-91.5.0.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha256 = "f6c2c7cf6c8a39997e272d9aae5c7ab4620f426e2be96b4e90c3641db672a6ea"; + sha256 = "c02818558da950caa540cc73597bb2ba1cbfcf02240b085856776df5155b59eb"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.4.1/linux-x86_64/gl/thunderbird-91.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-x86_64/gl/thunderbird-91.5.0.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha256 = "ba0d17f99ca15bc81631201057509694c5dc656176a03e67d5f89371a4200eda"; + sha256 = "5704fa5d4efb470e516c23a6f15d238ebaeaa7ad1ce14f49b7a5a3bd19524f92"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.4.1/linux-x86_64/he/thunderbird-91.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-x86_64/he/thunderbird-91.5.0.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha256 = "c71bf27c55ad5b6c7981a434d598eeab8a927dbfc0510d4d68df357cb1abff9f"; + sha256 = "c366556e481757da8f48b89f1ef54492e5d5e41a45d9ec55f5e81081de4d8b58"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.4.1/linux-x86_64/hr/thunderbird-91.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-x86_64/hr/thunderbird-91.5.0.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha256 = "9cf92e922329ec46ed68f352284de30c78aa2d25f040da4e1289d5ea0226bc3a"; + sha256 = "47a713172ea17582ec988fdef33cab24f3245274badefbefee7f665af7e9e917"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.4.1/linux-x86_64/hsb/thunderbird-91.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-x86_64/hsb/thunderbird-91.5.0.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha256 = "e4d6baa0d92fbe7f40071045fcdb20f59944a0c1422c1095b946019461013242"; + sha256 = "019271fd8d9343581783dcd6a59698de726fdeca39e4e71226b7361a42e7478b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.4.1/linux-x86_64/hu/thunderbird-91.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-x86_64/hu/thunderbird-91.5.0.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha256 = "cea2f9b614e0b7cec709947ff75b9eb6abe6600b76d642b60910e2de1788f09b"; + sha256 = "bbdd56ba0a2f1079d2dfe63f2cbf56dc98f5f0675c73413880aba147d797d1c2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.4.1/linux-x86_64/hy-AM/thunderbird-91.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-x86_64/hy-AM/thunderbird-91.5.0.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha256 = "8708acca6f1e4088f10f94f8c26a7790913fe55acbf0ab555e22b1256b74a866"; + sha256 = "8393fdba3c2d7024c1ad5d017853c1a13fec47a29e31db4ba0f38c5ee49843ec"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.4.1/linux-x86_64/id/thunderbird-91.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-x86_64/id/thunderbird-91.5.0.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha256 = "745ecb2038a84b1571e326ed0e6d38e7519bcf5b7f2bacf6ef053c9a88926c77"; + sha256 = "51ff83923eda81e69d5c74bd49878c17eb3552072b196e2fc933b3dbf89a7513"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.4.1/linux-x86_64/is/thunderbird-91.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-x86_64/is/thunderbird-91.5.0.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha256 = "e04b6fc88ddd46e6e6cbe47eb681acce91b47df355847f65e793d92419dc4204"; + sha256 = "9f6bdf8f9a97788137e698464e391f6942e3cbff5870e8b4f534597f0b582f5d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.4.1/linux-x86_64/it/thunderbird-91.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-x86_64/it/thunderbird-91.5.0.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha256 = "e23eb2075bcac5abc195b1abffe64b8e1a409c855699c6d5bcbd102c19a2ad4b"; + sha256 = "33b0169fec2ba8822c086837fce0ed59d77676f6fe804948dfd0ad0c328e1cc7"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.4.1/linux-x86_64/ja/thunderbird-91.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-x86_64/ja/thunderbird-91.5.0.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha256 = "a79711803c46b6ab95f654d5b9dffafe85733b6c839238de8f76d30f9757553c"; + sha256 = "bf93f1e234aa13edb416912377a23ffb370de5a249cc66ec13587632493f0efc"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.4.1/linux-x86_64/ka/thunderbird-91.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-x86_64/ka/thunderbird-91.5.0.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha256 = "3076defee6dadfad4560800ecf2b3556fcf8f4dd5a8795bb578ee73bbbccf72f"; + sha256 = "dee6e5c984c0dafa66476bd4342385beedeb826a947991b2b4bc3a0e1d7bafd4"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.4.1/linux-x86_64/kab/thunderbird-91.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-x86_64/kab/thunderbird-91.5.0.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha256 = "65f796d71d02118794b79d5460ef9db06e3d172e5d15ff350eff52cc214587dc"; + sha256 = "fcf175d175327f8a6c76d0e81062a967813f486e8005aafa7998fa682542e5db"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.4.1/linux-x86_64/kk/thunderbird-91.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-x86_64/kk/thunderbird-91.5.0.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha256 = "f8df25990df8b577e224551f1af44fb87c867b7d7622931214bbceeec3699646"; + sha256 = "22e2bff84795a512eaa486acb11440afa51afddd5feb6828c025bfdd796cc5e8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.4.1/linux-x86_64/ko/thunderbird-91.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-x86_64/ko/thunderbird-91.5.0.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha256 = "77d6e16972f9ddb553d9bd19627a0725d25d42a0ad6d1e665d249b094b137dc9"; + sha256 = "a3c8fb1b1cfc7e68ad177fce78a8751c86cb4d95965d05abeff384c19f470bce"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.4.1/linux-x86_64/lt/thunderbird-91.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-x86_64/lt/thunderbird-91.5.0.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha256 = "208eb06ba9e8b1cd391a7694552af6e7ba3ead33567d51fda82d70e024378f56"; + sha256 = "5aaa95d61662a69d3d92cad9d5cbf24a348a7c6d7db1440412a324799167bd7d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.4.1/linux-x86_64/lv/thunderbird-91.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-x86_64/lv/thunderbird-91.5.0.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha256 = "a4a85c3f969dc40149ad82d0dbc4e1089de67ba3c6d7495f5c45196e8c7083a8"; + sha256 = "ec61d867216b50649e2900e8922603f38ebd4c67596b29984c60c1933f1f00a6"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.4.1/linux-x86_64/ms/thunderbird-91.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-x86_64/ms/thunderbird-91.5.0.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha256 = "e5f3259e002b31d9a2738ad81826d59dd464aa34532441e9092e976efe8be7b4"; + sha256 = "27bf8b301dc1c05a22c413559f833d522fb42934c136be126de90d3519df7c1d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.4.1/linux-x86_64/nb-NO/thunderbird-91.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-x86_64/nb-NO/thunderbird-91.5.0.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha256 = "33fa29d2490c7618d1f9bbaceb34b898d150e57fc9b96b957a5b348b6fe47cfc"; + sha256 = "587b27872162ac8e7580183b362192f7c2439a4a7a783aa4fc6ae81e87e7b4bd"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.4.1/linux-x86_64/nl/thunderbird-91.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-x86_64/nl/thunderbird-91.5.0.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha256 = "726962fd26948726230b49736f2d1e6c6daa562a4389e0fa0069ab737304cbac"; + sha256 = "be970367d664bcc2a5e6a0805d0b63fc991221c41497ccfa1a1ce5102b20450a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.4.1/linux-x86_64/nn-NO/thunderbird-91.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-x86_64/nn-NO/thunderbird-91.5.0.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha256 = "09bab6f8061400413e7167693e4c2f14caa4aba0ac68c7cfeaf9ed2dfa44ea0a"; + sha256 = "92e168f3db1bef0c2fd33dd8da8f2ba8732e63c1b36aeb0e01f3478e67dafba2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.4.1/linux-x86_64/pa-IN/thunderbird-91.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-x86_64/pa-IN/thunderbird-91.5.0.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha256 = "2203476872b140a1fec867435bf1a006b63a7ffc018eb466ea164597474a2083"; + sha256 = "485d231b5153fde23d9a35154c713b97dbcf96a8f1058399b09796210c831391"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.4.1/linux-x86_64/pl/thunderbird-91.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-x86_64/pl/thunderbird-91.5.0.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha256 = "3cc4fa964b4deaef9d901fd9fba597059f638b1b8322515ac02cbb97f5a5c28b"; + sha256 = "112240a352a3d833de9df127ab0118841b88e67c4496a17c8cc63abbd19f1166"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.4.1/linux-x86_64/pt-BR/thunderbird-91.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-x86_64/pt-BR/thunderbird-91.5.0.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha256 = "c68055c96551a1b529bdf81659231ec5244c4c68255d88f581c378046bbb5e84"; + sha256 = "7388f54dc99de6498af19f0a6e7b80bf2c7465c68d94c4e04ca5038a2e087960"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.4.1/linux-x86_64/pt-PT/thunderbird-91.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-x86_64/pt-PT/thunderbird-91.5.0.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha256 = "36c9b2170aff5e6f58377efd53f679e9e823f45b67d7407cb3c34d72f676625a"; + sha256 = "1ca7c9a460e8603d0daadbc07fd12fe6d0d07ef288144ba5da389fdbb5ccf4e2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.4.1/linux-x86_64/rm/thunderbird-91.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-x86_64/rm/thunderbird-91.5.0.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha256 = "2f00df17c29128e2b135136fe700930ff0078e8896e1cb4f7c34b44af0cfd8f2"; + sha256 = "954516da6b44ad4dfc56f3b837e45bc0816498fe426ae3aa4d3363621cb2c289"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.4.1/linux-x86_64/ro/thunderbird-91.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-x86_64/ro/thunderbird-91.5.0.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha256 = "ed93041b32a711e04de6737c5d6fbcf6b598ca9eccefe5ab0e02cf3cacba5ffa"; + sha256 = "e5d83482c7381d89445d49b5c85b5645533dae173010f2ebfcf706c01337f4e2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.4.1/linux-x86_64/ru/thunderbird-91.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-x86_64/ru/thunderbird-91.5.0.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha256 = "206ccfcb5d6a9d70f4258ddeff0cc79c38e801d860a05bf6214c03b24e2f9057"; + sha256 = "51db5bfaca6c9404eddb71cc6559c7c83534fbe57bf27da14c35b4b268cdfc98"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.4.1/linux-x86_64/sk/thunderbird-91.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-x86_64/sk/thunderbird-91.5.0.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha256 = "aa8e6dd53d5b741bee345d1f7a5b03866121619f54993233cb4239c6107eb3e6"; + sha256 = "5803d8547bddaffa6a9532eb6abd2f66f6936c6614a1c322a8065a01e6c831c9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.4.1/linux-x86_64/sl/thunderbird-91.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-x86_64/sl/thunderbird-91.5.0.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha256 = "95f3a97adc32abb33c0a7579c19247595f6f27c7da0cf06bf1fa9d8270b41996"; + sha256 = "2837b957b89184978c0ead48e7a2d58a7ee140ed280be8d744fac929d66cfd0a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.4.1/linux-x86_64/sq/thunderbird-91.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-x86_64/sq/thunderbird-91.5.0.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha256 = "fe8255e55081a6cae15085cfcf793c4094de55a2b12d3732c7e75ce567b85716"; + sha256 = "fd98ce5bb9bccfc8c9ae022cdf0416848e3564b59ccaf3ce8888eb7d4d02f0ce"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.4.1/linux-x86_64/sr/thunderbird-91.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-x86_64/sr/thunderbird-91.5.0.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha256 = "f889e1ff38542aae19d6ebaf827a2c6d6f8dbd6e16a80966bc311588e4e10ffc"; + sha256 = "d9c1ec7df7e66e1b4e28a68c9ed74e8ea17a166dee2d2aaf7c9be616bfde97a0"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.4.1/linux-x86_64/sv-SE/thunderbird-91.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-x86_64/sv-SE/thunderbird-91.5.0.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha256 = "2f90c95bbdcb6bfd59cee40013cc1c498e50f5cc0209799dfe1dfc57afbc37ad"; + sha256 = "e9e8ea82bf5fdb900c36ef22afda90d518ac52a4fadff5a3f1afbb09b4d1ebe4"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.4.1/linux-x86_64/th/thunderbird-91.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-x86_64/th/thunderbird-91.5.0.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha256 = "3fa19fef25c76f49f9e6ee9edc2f24cd02c2b589b8e2cea270f4aa71f1a1a621"; + sha256 = "4a58f3d88283cbe83bc6f9ff26c5b621bde3a52a8e5cda283f9bac6fa329e2a1"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.4.1/linux-x86_64/tr/thunderbird-91.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-x86_64/tr/thunderbird-91.5.0.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha256 = "7de3ccbe109401dab260ed1c8ae9fc360e5392c81111df930d0c7f7d46211f83"; + sha256 = "489e5d4448c25310ae14c6a74405d582b50113a73c394aa51776c2c3b37104ec"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.4.1/linux-x86_64/uk/thunderbird-91.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-x86_64/uk/thunderbird-91.5.0.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha256 = "967020d05810d1514be84635cb56162b83f7f28a2bea221ad21ecb4ebd960968"; + sha256 = "cefeaf9df2e5fab13cf131d597393b83c1101d83b6dda04207c4428abbb62d15"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.4.1/linux-x86_64/uz/thunderbird-91.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-x86_64/uz/thunderbird-91.5.0.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha256 = "371d60bc164552f04cf680a29af5992f1ac353e8bb30af62a5cdadf744576c71"; + sha256 = "7a330fa612f09f1337c3c775d0c0447dd2878e79c2555c7e1a13f611e2712720"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.4.1/linux-x86_64/vi/thunderbird-91.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-x86_64/vi/thunderbird-91.5.0.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha256 = "600cc9d18a18ebc13bd8371140b573723b913e100937b3bb22ab04cf7846e1e7"; + sha256 = "c1c11ce007f1e8cdfd039c8b9dbc73e879adafc40d6ef11dbf82134ff76c8d48"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.4.1/linux-x86_64/zh-CN/thunderbird-91.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-x86_64/zh-CN/thunderbird-91.5.0.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha256 = "ae59930a4c609e4ce0562338019db1202c3eafc2e3dabd90888076ece4fe8ee5"; + sha256 = "041aa19e78aad8be563bf4466572deb8bbd16f3a74c24f297da0667dfc65739f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.4.1/linux-x86_64/zh-TW/thunderbird-91.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-x86_64/zh-TW/thunderbird-91.5.0.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha256 = "2cd58c1fb54b572e6a2f63b9881f53ee65d9992d75c0905ea2e1047afabd08a9"; + sha256 = "dee8d2dea78128f250054d5f8aaf948b19d3e43acc228a0c751df84d601ce76c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.4.1/linux-i686/af/thunderbird-91.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-i686/af/thunderbird-91.5.0.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha256 = "bbf9e3a8856f66ed2d263b05d5520a9be26719f45380a5f29e6cf27c891c3e23"; + sha256 = "6e19fa5338b63c3aa163cbb9d84953a0f1bc4bb593cbc685cf4e59249425f948"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.4.1/linux-i686/ar/thunderbird-91.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-i686/ar/thunderbird-91.5.0.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha256 = "0df457c90aedef53adca7dafe34dc95847b77603362b27f814f4e88d40311ccb"; + sha256 = "2b35a83198c30bc9838849260477b4846dbd35b82607261534e05336911129c5"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.4.1/linux-i686/ast/thunderbird-91.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-i686/ast/thunderbird-91.5.0.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha256 = "b97a3fc046dcd75e2703629e01abbe2c7a81bc98746fdd96ac195b2508e396b7"; + sha256 = "01712e869983cb089f9e98449ae215c95aa59e70ad2a7e61a17788f74c50c905"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.4.1/linux-i686/be/thunderbird-91.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-i686/be/thunderbird-91.5.0.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha256 = "158495d87e2bc8c2b257d055fc9096580bbb7dcc126b3b83a4aa0f3deaae9cf7"; + sha256 = "e7cfd5b52f0a809c514ac17f29bf30d2aa1959193020f742b8e907fc4772eb8b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.4.1/linux-i686/bg/thunderbird-91.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-i686/bg/thunderbird-91.5.0.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha256 = "77497a922cd441a3ed791d6f497586b2d3b286a64cf057cf34b07e38b6c1f5f2"; + sha256 = "e74a5073ec17e2ac75c81e9dbe418167932d53d47fb1449a919b7a6824f7ace3"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.4.1/linux-i686/br/thunderbird-91.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-i686/br/thunderbird-91.5.0.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha256 = "862629fb07c7743a2bc909883ebe19347fea71fc91b8df927d846054ce2b1b08"; + sha256 = "a8b13e933e1767d6f42fa4e02892d99ef5d8da14c9aad51e2089d16c2b935c6b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.4.1/linux-i686/ca/thunderbird-91.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-i686/ca/thunderbird-91.5.0.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha256 = "33ab06809f5982036b849aed5ec46d7271c217cb7330149f4783fd308c19ef46"; + sha256 = "047e158f5b81c5c5837c583e63f1852e94ab65365e7551dc14dee4e91711ee89"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.4.1/linux-i686/cak/thunderbird-91.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-i686/cak/thunderbird-91.5.0.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha256 = "6bd1cd49eb18ce7bb88e4e023063bf03e2c2078f7c3ccf0f1c477d712b4e67fb"; + sha256 = "1175e2c893f720fd128de26ff7832367e2e8792d1a0fb968c23cf0c2971d87a5"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.4.1/linux-i686/cs/thunderbird-91.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-i686/cs/thunderbird-91.5.0.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha256 = "528aba25c407f52e728361e5174cb232f2583ef5ff62bf47386d4766f776566d"; + sha256 = "9c80c6afa31ed73ccb2e1c813acabc3be484e00f6c498dece19e095d5fc7e1ab"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.4.1/linux-i686/cy/thunderbird-91.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-i686/cy/thunderbird-91.5.0.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha256 = "efd1490cd2a357c1d61d5225a8d1b1b9a61be5c25805b26496ea3ad946d4cbcc"; + sha256 = "79418720066cdeca5abee231952b3b26f1209eaf59ceab0882f798ba86305aee"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.4.1/linux-i686/da/thunderbird-91.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-i686/da/thunderbird-91.5.0.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha256 = "00e9e787a8bf21caebcd1b21889c5534d38d14d8eb2e10b297b320e71455910f"; + sha256 = "4797af3b1d72199565fafe269d5514042420d3ffd276fb94b3bdda5cea2191f2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.4.1/linux-i686/de/thunderbird-91.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-i686/de/thunderbird-91.5.0.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha256 = "1c93e59e8d55ff671e630dc86091b1503b73e8b92f7bf0b6726d3b9829bfa8d1"; + sha256 = "c15470c0a61190749d88c857d1a4490e331fc0046cd7aa18fffa5d23b33c1460"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.4.1/linux-i686/dsb/thunderbird-91.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-i686/dsb/thunderbird-91.5.0.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha256 = "d8de15bf2699fa44b82aab0872b966d20dae733b46404b03a1e8c41e28b2c4dd"; + sha256 = "64c176f0c64d877a505006b03eb0d685042b7120293b733de029868a3ae562ec"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.4.1/linux-i686/el/thunderbird-91.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-i686/el/thunderbird-91.5.0.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha256 = "1ecb81092cd8bdae878792f2be7a32edc378d3691ca696bcfe3899e81ace7cd7"; + sha256 = "b220e7f82cbd674b5e98d082766b06a52bc69e18c7d1c91bb0a9dc6d2f129c99"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.4.1/linux-i686/en-CA/thunderbird-91.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-i686/en-CA/thunderbird-91.5.0.tar.bz2"; locale = "en-CA"; arch = "linux-i686"; - sha256 = "68836e09adf5f9d2b5c9f3b96ed5b05f56931faa33bbb17c578436c13c5cc4ee"; + sha256 = "0cc5344d19e62fc86843d71792a59b310be9604ba2bc1ea633d71d6f54ea7eae"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.4.1/linux-i686/en-GB/thunderbird-91.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-i686/en-GB/thunderbird-91.5.0.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha256 = "b20a74cc35abd3d066384f57b5d2f7a6a1dd24193b720fedce693d8b864058b6"; + sha256 = "04285f839530ce6917a1918d557cc86448debbd8910d54ca051b9f1b63749b7d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.4.1/linux-i686/en-US/thunderbird-91.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-i686/en-US/thunderbird-91.5.0.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha256 = "8f3bffb289081a898f9e77c291ef1ce63af8c0e966894b54a3c533741b655aa9"; + sha256 = "fa96eb80909cc7f485abda8fdc093f0ef1e2e5fe69f4919bdeeea27651fa264c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.4.1/linux-i686/es-AR/thunderbird-91.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-i686/es-AR/thunderbird-91.5.0.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha256 = "b1c26f4dd600995a88ad960f55fbf6026ad2ff93b94ac12af991440ada44a54a"; + sha256 = "5affd961efe6b8d6b7616ef1103095c068627f6d3c571aaf71924bc8f8bc58ec"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.4.1/linux-i686/es-ES/thunderbird-91.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-i686/es-ES/thunderbird-91.5.0.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha256 = "a28fb5020e2e5a577958f4702cd3f15dadf4fcc62c3bfc954d5df3777ef4152a"; + sha256 = "1dae610383b6dd35e4d6e7d0f8a757b98ab98c6b587940818c239c95f7829e24"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.4.1/linux-i686/et/thunderbird-91.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-i686/et/thunderbird-91.5.0.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha256 = "9a8fc8ba9df9aa179ca6b18d412ee0395c54ed3e2394d951c1cb85d4cb656808"; + sha256 = "3b2979496032f3f140460295fcae7ff6b08b7970c18eff6bd83df6f582c20651"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.4.1/linux-i686/eu/thunderbird-91.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-i686/eu/thunderbird-91.5.0.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha256 = "56b10b3f9a824fbd91d1107db46e085b45d2c7d78a67a9eb8554afa7aab881a9"; + sha256 = "a10fddb7405cb311d0a8c69dafca4dce66084c64f68fc7dabbdd7292d265d528"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.4.1/linux-i686/fi/thunderbird-91.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-i686/fi/thunderbird-91.5.0.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha256 = "ef41d1f5a985f1bf98790f76cd9dc9cf8d02614b0d780c59f95fe30224678f02"; + sha256 = "edc8f3c7368126e3678f8ea6c22e8e575cd34054a94e21b1eac0a44f44689790"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.4.1/linux-i686/fr/thunderbird-91.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-i686/fr/thunderbird-91.5.0.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha256 = "2af9a88a1bf2bc0932ef0131a53b2ab3fda256ceaf3e8f256e41f648153eea8f"; + sha256 = "bae7f4e7cd6d72c3e8270f12483f382c939f3012df6597bb3233af9a3d0bab03"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.4.1/linux-i686/fy-NL/thunderbird-91.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-i686/fy-NL/thunderbird-91.5.0.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha256 = "3406057ce9f70c9f1a2efce979fd9b1bffa2ad7fe63bb90e541ea539a2eb071f"; + sha256 = "dd38566e30d30d1a15283ef1c4382d350cfd4afe8cdaeefc38b995cc82045964"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.4.1/linux-i686/ga-IE/thunderbird-91.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-i686/ga-IE/thunderbird-91.5.0.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha256 = "ee6a8941da6093a7b342da1f124ab5d82cfc9ed288a7385c2ce33e5d95370fb6"; + sha256 = "7b16826113f3c46601465dbc3b44a24b5e62d9a6a0639d4f74b6314250f24224"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.4.1/linux-i686/gd/thunderbird-91.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-i686/gd/thunderbird-91.5.0.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha256 = "9b57c51af6dbdb9c654e0fc96fe086c04f4dc482fa3528c9658261b9710bc229"; + sha256 = "4287667e5ff7a6ff39c74066a7c22229736ce503fad749293710a25cf74b5836"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.4.1/linux-i686/gl/thunderbird-91.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-i686/gl/thunderbird-91.5.0.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha256 = "d2d12a17334c0b74904fd5a64294c0ca86430d79ebd765d7118b3451cb361819"; + sha256 = "bcca84aaab4c48e8842f1c921ac398f56eaa569cda6ffa6b5aa3cd0ec709e42e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.4.1/linux-i686/he/thunderbird-91.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-i686/he/thunderbird-91.5.0.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha256 = "da8791864ea612b37839075a85ed446aecd4be941c4f624ed212fa1e4d322768"; + sha256 = "fd9be0e774dde17d5c2b5d1887c9e9ab75fcb7c797f5b6d59c991679eeb870a7"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.4.1/linux-i686/hr/thunderbird-91.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-i686/hr/thunderbird-91.5.0.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha256 = "11ef3a9c2b7555ef144cc0689265f928c29b01fccded781d76a3f2105d15ed67"; + sha256 = "4dbc9d9a2d9409688c2f67f5c73fbb31fd1027ee787527f437f95582103c728a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.4.1/linux-i686/hsb/thunderbird-91.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-i686/hsb/thunderbird-91.5.0.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha256 = "bce0ebbaa3e19912d74e5a9754a45a93948f41d5fa9dfab77aea03856ea70ef4"; + sha256 = "5cf4fc68d7d9464d55686dbac2dba4a38ca50bb36e6661ed4d58b91726f0b312"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.4.1/linux-i686/hu/thunderbird-91.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-i686/hu/thunderbird-91.5.0.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha256 = "dd1b5a48fb175be82967f3b9ca72ea86b2797ebb68285fee143c77ae72a9e659"; + sha256 = "dd1b4a5f2498eb2e3a3956fdf6379cdde04f0eb60efc201c86237f07dfc01a2f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.4.1/linux-i686/hy-AM/thunderbird-91.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-i686/hy-AM/thunderbird-91.5.0.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha256 = "cc172a84b6c586a786a7691eb728e8bce5af253316cec64b989fe2f10f253f95"; + sha256 = "4e717d157784d865f4de4dd8b14718d39103ce24be1d72c5720629c74d74ae94"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.4.1/linux-i686/id/thunderbird-91.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-i686/id/thunderbird-91.5.0.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha256 = "6ac4c494569bb7d5a9948d1e19cb273135638b3b0fa487a535d36f2b70c86bfa"; + sha256 = "a705929998084e28016cc60df3b7ae6a1f70929270be16307e9be89f1324de2c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.4.1/linux-i686/is/thunderbird-91.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-i686/is/thunderbird-91.5.0.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha256 = "e98642ccc27cc77180a83b34a55a59f9b653beb993e80647b76b1c2d1fec003a"; + sha256 = "48d7eb8c949e9590699031c45bcdd746d1e86ed8dd893bb3afa7025f7bc4c247"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.4.1/linux-i686/it/thunderbird-91.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-i686/it/thunderbird-91.5.0.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha256 = "bada535c73a41318650acb3e744771beea09bf192b3f88e6e8be0de0f9c15b4f"; + sha256 = "0278a174914da7f874a974847a30bc52851496e79690a8ccde2c3a0a24e9aa39"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.4.1/linux-i686/ja/thunderbird-91.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-i686/ja/thunderbird-91.5.0.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha256 = "dc30bc5943518dbde7b213df3fdd0b454550612d741e167003efc0463b3fd2ae"; + sha256 = "243e610020c892cf44de3d76b27539e57c5c9eeaef6c5d8298af59ee4be8b448"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.4.1/linux-i686/ka/thunderbird-91.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-i686/ka/thunderbird-91.5.0.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha256 = "747b850fdb8cad7607b807bf402e2b6d9b58006c9d8323947c2c991d3d775d1e"; + sha256 = "c641e2f92c87a7454603d059dc34dd2719aefe9b10548dba9e4b95e728583181"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.4.1/linux-i686/kab/thunderbird-91.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-i686/kab/thunderbird-91.5.0.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha256 = "fd063bc5e41bec78ad7d006370ecc0be0644a63bb0f5d6cfdda7148790113059"; + sha256 = "a47675e0ec44e8bb94dd950e5282f26f0ee878be90a87c0cffe50fe74adc754a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.4.1/linux-i686/kk/thunderbird-91.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-i686/kk/thunderbird-91.5.0.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha256 = "f853aeb878ed181070b192f1b27dd985a6f0b2318500373b23358c53a56c3d97"; + sha256 = "1a4cc1087fd9fd0f9cb303c1a0de438d95ec9a665360d9c9915af4269af6f5e9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.4.1/linux-i686/ko/thunderbird-91.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-i686/ko/thunderbird-91.5.0.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha256 = "7444d40c6db9b592d3831115e981208567311a58d47606da6947217e58650e90"; + sha256 = "f45540f54fab28b107c2938b91191a65f2051fbf435e00530d343f076cb84373"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.4.1/linux-i686/lt/thunderbird-91.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-i686/lt/thunderbird-91.5.0.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha256 = "c7f1cf8b583e6659ec84a0546a3e7828626bae3664de35bc9bcd9fbbb97b56ba"; + sha256 = "be4d02c3b07aab05e82de8d167ae22269ca5c5ee020a6d8cad0e53a433135160"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.4.1/linux-i686/lv/thunderbird-91.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-i686/lv/thunderbird-91.5.0.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha256 = "30671983c35bb5c112b2b9755e56a1c36afe5bd03c0f09ba930095880b7ab25a"; + sha256 = "76e3c3c943d4f3598f6f49b51ab9c8625322ad78b6809418905e8d0c7d586ee7"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.4.1/linux-i686/ms/thunderbird-91.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-i686/ms/thunderbird-91.5.0.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha256 = "233464fc722e9deba822c3cec0c7ebf5b1b72295a6847a3203410784e8e33f0f"; + sha256 = "e125a89ea9d9f013ddd2f816ab10c6916b514ff329011f54e517e2d6e5edb865"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.4.1/linux-i686/nb-NO/thunderbird-91.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-i686/nb-NO/thunderbird-91.5.0.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha256 = "299f50b9d2077ea8300959cd90aaf3113b5fc5da77fa66617533d2b6d4a11f72"; + sha256 = "f1645ab9430323efefff6751696e1fe601063eef5c5ac70b90889620f6bd9680"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.4.1/linux-i686/nl/thunderbird-91.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-i686/nl/thunderbird-91.5.0.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha256 = "4374b5d175d4c990d706241083886e9459f9aa51b1c9862dc02c5134df6a8523"; + sha256 = "2c1cc1a8ed006e45d4649fa89d5446a9df2e95e2656e9a18130556c42ee0db78"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.4.1/linux-i686/nn-NO/thunderbird-91.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-i686/nn-NO/thunderbird-91.5.0.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha256 = "786c23053df9dedb177bd22ab3cf78e3083b73b9bd11b45c17bae35921f8c762"; + sha256 = "089e6cb230da93b30aac8a81d22f6ac97233d20f6a0e50e96ef8675acfcc407c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.4.1/linux-i686/pa-IN/thunderbird-91.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-i686/pa-IN/thunderbird-91.5.0.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha256 = "cc3df207d658cdc6b13e8d67dec598afa477520d81d6c4bda23bfa0a3bdfe9f7"; + sha256 = "6ca6b68ac5ab40966b8bc13d6a8f1ef26730d8065cad27f93bd3139295b5fcbc"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.4.1/linux-i686/pl/thunderbird-91.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-i686/pl/thunderbird-91.5.0.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha256 = "9471ddfc7086cf21222eb1de8c5de76f61f0d9479d6691fa4cce16ea4a481361"; + sha256 = "93f94b83a17569b5b626277af71651a607d74c32fa17fc35896ac42556075d2d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.4.1/linux-i686/pt-BR/thunderbird-91.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-i686/pt-BR/thunderbird-91.5.0.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha256 = "0e466b0a1a0e258b9d3b5288902dcf4fc114a192ba156d956d8be9bbcea1a42a"; + sha256 = "9c7e02da587136eebf6111fe4e25687f904b8db7629be251c84ab25b6adfd2e5"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.4.1/linux-i686/pt-PT/thunderbird-91.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-i686/pt-PT/thunderbird-91.5.0.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha256 = "83b0e2bfe657f16b88906f2a70a0d954b73d053c01b545812e40d02f343b50ef"; + sha256 = "8666b71ac2fa83da6175c8c26ab73a957f19dcc6b36cca7f980407aa7a42111d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.4.1/linux-i686/rm/thunderbird-91.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-i686/rm/thunderbird-91.5.0.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha256 = "507059e7cad7c0665c0468436e334a3c2cef258751fe97e90a731d067e0cc672"; + sha256 = "f278f045fe7c941b4545ea452152859960d952704f2d666d39bb6a91175c7027"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.4.1/linux-i686/ro/thunderbird-91.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-i686/ro/thunderbird-91.5.0.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha256 = "61e4d4652ecbce03421dab02aa15f49e4a782cf63380d76207173afd07dc6183"; + sha256 = "2c43f39a8fcd557efde852eb7f859eff048672806ec23620037a28d4d98da99a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.4.1/linux-i686/ru/thunderbird-91.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-i686/ru/thunderbird-91.5.0.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha256 = "b3c1d07ace631bc8117d1003029216a5579a64f7e83a4289877fe5101c0b261b"; + sha256 = "63041d68d0072699dfc7e3fa448ac9a3bf065795c455dd3f5671cae97d5d121a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.4.1/linux-i686/sk/thunderbird-91.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-i686/sk/thunderbird-91.5.0.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha256 = "ec8949eec7a001e075888500749f7b0211996afe4d25dc081df34e20a214e835"; + sha256 = "be1cdf0cd47f788d736c9bfae340b6cf9edd661293e5ce5b5bca6b2aa169438c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.4.1/linux-i686/sl/thunderbird-91.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-i686/sl/thunderbird-91.5.0.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha256 = "026a55fbb143621ba98d2218ff72c5eea2491ea74e3abbf46dc4d8405a7df327"; + sha256 = "128a46d7df356375536a432d7bd13bdea8d4932b105cdf4b8288af3dfa878b7d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.4.1/linux-i686/sq/thunderbird-91.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-i686/sq/thunderbird-91.5.0.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha256 = "0a22abf8961874edc88fb7654d8b66694050f98ed4440eb7aabbf7a4969bd993"; + sha256 = "6a8fa0c4806240a886393c51f63992e567524264c821ccf4f12e202f4f30e7ce"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.4.1/linux-i686/sr/thunderbird-91.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-i686/sr/thunderbird-91.5.0.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha256 = "4304ac8a1283065aabc63b39734cd7d023a82b590cc1d255093d73cc1155e30c"; + sha256 = "e2639022166d0be0d30846a269c08940652475e77ef114089e22c9d5ddf61f98"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.4.1/linux-i686/sv-SE/thunderbird-91.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-i686/sv-SE/thunderbird-91.5.0.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha256 = "b2196727748a1d42bc67fcde4df47e7e1661a446e0620e11c64dcc1a7db0da06"; + sha256 = "d8a419a6c8105fbf6ee29a38cba3e40729ef8f12743d87ce2a623e8707ba0414"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.4.1/linux-i686/th/thunderbird-91.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-i686/th/thunderbird-91.5.0.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha256 = "de52a8a1a64b26d29721be3843c12df6bdb732354c9263782f989918a51dee2a"; + sha256 = "ac2926a73937c0789ba63d6ecce8a17dcf5a65a7fca5dd439618384588c0dce5"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.4.1/linux-i686/tr/thunderbird-91.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-i686/tr/thunderbird-91.5.0.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha256 = "bba119fb7749350c06760d6885a89efa0632098e593f22a23451a592dbea9e1d"; + sha256 = "efcf840a32ab0264484c7f1fa2b3a0961cdd1e8ff37f4f83126ab0626c19834b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.4.1/linux-i686/uk/thunderbird-91.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-i686/uk/thunderbird-91.5.0.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha256 = "34198ab171b0783d0ac592e0a72ea355aae75b950f2569d2e6ed30a9b1a5d2f8"; + sha256 = "e1fabb41564ebd683cf298bb3bc13e3478dfef6522f6524a7c2ab69c64d59251"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.4.1/linux-i686/uz/thunderbird-91.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-i686/uz/thunderbird-91.5.0.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha256 = "1adcedb12bb9485da32b47558352d5fa9182fd8411450386d9ac8a528b40cca4"; + sha256 = "2dac221764006b5db352416159311849cfa62c67894ec40a2914caf3191c79d9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.4.1/linux-i686/vi/thunderbird-91.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-i686/vi/thunderbird-91.5.0.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha256 = "c22cd41206fd7e4d80c6855c7217071be3890e84460cd030f4029a910c672bb2"; + sha256 = "fb482c3579b6bde18214ca68fa731d50ac254152dc51c5d13e283f16559f0886"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.4.1/linux-i686/zh-CN/thunderbird-91.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-i686/zh-CN/thunderbird-91.5.0.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha256 = "744515522d16884b4067a75412977243753baece132c4d5c815ac60d5a26bd7b"; + sha256 = "4e596742711f72eae50621fbc0b329bdf736267c753c51ab8dd1713cc0860285"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.4.1/linux-i686/zh-TW/thunderbird-91.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-i686/zh-TW/thunderbird-91.5.0.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha256 = "21fcb4c30b76c607e215363688966ea92ae1f3cd658ce7c9118f3d0f2cfff729"; + sha256 = "c97873b840540297f08ad866479789f2f7cc8baa48de6bdf9eb4b945a5c135c4"; } ]; } diff --git a/pkgs/applications/networking/mailreaders/thunderbird/packages.nix b/pkgs/applications/networking/mailreaders/thunderbird/packages.nix index 1ba3c40ea98..c9cc9f901a3 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird/packages.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird/packages.nix @@ -10,12 +10,12 @@ in rec { thunderbird = common rec { pname = "thunderbird"; - version = "91.4.1"; + version = "91.5.0"; application = "comm/mail"; binaryName = pname; src = fetchurl { url = "mirror://mozilla/thunderbird/releases/${version}/source/thunderbird-${version}.source.tar.xz"; - sha512 = "aa442ef886277f5091ebadff907a29451a0ee6542f24adb5c1fb4223193d719c2cb01474d3ccd96067695b19ce3cbf042893b0beaaeb7c65e0660ab5072bf82e"; + sha512 = "e1cafbd99e67e8fef346e936890a22aeadded4aa8be604607535ae933251bc1b2a3b56c2b62045b3d37ecb09999adb746157df188d1a32dfe75685f3af959b7d"; }; patches = [ # The file to be patched is different from firefox's `no-buildconfig-ffx90.patch`. diff --git a/pkgs/applications/radio/dablin/default.nix b/pkgs/applications/radio/dablin/default.nix index a9f5fc991ff..46b0714bd44 100644 --- a/pkgs/applications/radio/dablin/default.nix +++ b/pkgs/applications/radio/dablin/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "dablin"; - version = "1.13.0"; + version = "1.14.0"; src = fetchFromGitHub { owner = "Opendigitalradio"; repo = "dablin"; rev = version; - sha256 = "0143jnhwwh4din6mlrkbm8m2wm8vnrlk0yk9r5qcvj70r2314bgq"; + sha256 = "02mhxaqpj0094sbb3c28r5xznw9z8ayvlkczknizlk75ag895zz2"; }; nativeBuildInputs = [ cmake pkg-config ]; diff --git a/pkgs/applications/science/electronics/kicad/base.nix b/pkgs/applications/science/electronics/kicad/base.nix index 2f4fd63574b..961519bad19 100644 --- a/pkgs/applications/science/electronics/kicad/base.nix +++ b/pkgs/applications/science/electronics/kicad/base.nix @@ -68,7 +68,6 @@ stdenv.mkDerivation rec { # tagged releases don't have "unknown" # kicad nightlies use git describe --dirty # nix removes .git, so its approximated here - # "6.99.0" doesn't have "-unknown", yet; so leaving this in case it returns postPatch = '' substituteInPlace CMakeModules/KiCadVersion.cmake \ --replace "unknown" "${builtins.substring 0 10 src.rev}" \ @@ -105,7 +104,7 @@ stdenv.mkDerivation rec { ++ optionals (withI18n) [ "-DKICAD_BUILD_I18N=ON" ] - ++ optionals (!withPCM) [ + ++ optionals (!withPCM && stable) [ "-DKICAD_PCM=OFF" ]; diff --git a/pkgs/applications/science/electronics/kicad/versions.nix b/pkgs/applications/science/electronics/kicad/versions.nix index 5fed12b0027..f1ae123c715 100644 --- a/pkgs/applications/science/electronics/kicad/versions.nix +++ b/pkgs/applications/science/electronics/kicad/versions.nix @@ -3,45 +3,45 @@ { "kicad" = { kicadVersion = { - version = "6.0.0"; + version = "6.0.1"; src = { - rev = "d3dd2cf0fa975548d027db88d19b8a88866866d8"; - sha256 = "1jrfwyi4zs0rpcpsj01z6687a433nnr56cxbnz12jfg2yafpxk23"; + rev = "79c1e3a40b913f818bddb69ae98d4d38ab81f926"; + sha256 = "1vpcbhhw8844hm6vpk3kk405wak531pvcvcpc66z0b48iprk3imr"; }; }; libVersion = { - version = "6.0.0"; + version = "6.0.1"; libSources = { - symbols.rev = "275f22eb9eecd5b6deabdefd82c9a826254d9f23"; - symbols.sha256 = "0wjk464l60xknvgc9d870901lqnx296dw7amlh3wg0wf78izarfr"; - templates.rev = "3a422b5b0928f3fd31579769d4dee2b009a85a11"; - templates.sha256 = "0vbjy1v5923942ma0rqcp1dhylhxk1m4vyfxjxw13sizkrpmlwr1"; - footprints.rev = "3ea7895b0817abecaa34276346749a711b0c69f6"; - footprints.sha256 = "0jv2plwzhhkfx7a2zankkjkbfzjxv43ab8rqpxzqfq2fnx83q6r5"; - packages3d.rev = "e607286d4a48ddf654585b37b45d74416a9a70c7"; + symbols.rev = "9f21fdcd5728ce6339dd4e1b26ebe60a1bba05e0"; + symbols.sha256 = "1azjx1bmxaz8bniyw75lq60mc8hvay00jn9qdc2zp7isy3c9ibp0"; + templates.rev = "5a9266bc796ba5c285401dd1fd900dbc4b6a8cd3"; + templates.sha256 = "13h9ly6amiwm7zkwa2fd9730kh295ls8j95fszlfjp9rczv2yyzm"; + footprints.rev = "c7f4881b9ec1cbe7f7e5a0828946d0dd909afbee"; + footprints.sha256 = "0mv9xs0mmmfn0yhzx1v55r5app13ckagb16249rabyiz3v5crdpb"; + packages3d.rev = "5d0c3590b26835f9d206a355d7579706c06d8bfe"; packages3d.sha256 = "0vwcbzq42hzjl4f0zjaswmiff1x59hv64g5n00mx1gl0gwngnyla"; }; }; }; "kicad-unstable" = { kicadVersion = { - version = "2021-12-23"; + version = "2022-01-13"; src = { - rev = "21eb92821866d558acd9e737b643b300a8b18202"; - sha256 = "01hg0byp60xzgz0xxfwvyq1hbvbllsys6lx9yfj27d3qjc3bdk42"; + rev = "33a4c9b08e040a17daefae9069fdf834063555b4"; + sha256 = "1ma0i0vgvdsjrmlfzdi34byly7n1vsaynwp9f1hny4s1m53nirha"; }; }; libVersion = { - version = "2021-12-25"; + version = "2022-01-13"; libSources = { - symbols.rev = "125a2e736504e776e4c6fb7f5131efad75edf245"; - symbols.sha256 = "0wjk464l60xknvgc9d870901lqnx296dw7amlh3wg0wf78izarfr"; - templates.rev = "8c9ff3dadb9c75cf2932f11c09a46c0c9d84784b"; - templates.sha256 = "0vbjy1v5923942ma0rqcp1dhylhxk1m4vyfxjxw13sizkrpmlwr1"; - footprints.rev = "ac8de318d8ef7b3eb64c78c6c2650b7b085f3271"; - footprints.sha256 = "0jv2plwzhhkfx7a2zankkjkbfzjxv43ab8rqpxzqfq2fnx83q6r5"; - packages3d.rev = "1080b6e565e56bae9be46db2278a1542092d7a2d"; - packages3d.sha256 = "0vwcbzq42hzjl4f0zjaswmiff1x59hv64g5n00mx1gl0gwngnyla"; + symbols.rev = "e3b198d827817b79fb8a6df07f0cfc1cb9140edf"; + symbols.sha256 = "1azjx1bmxaz8bniyw75lq60mc8hvay00jn9qdc2zp7isy3c9ibp0"; + templates.rev = "a27d83f0a20f0be0c1ab04b139a0c518da51a5d4"; + templates.sha256 = "13h9ly6amiwm7zkwa2fd9730kh295ls8j95fszlfjp9rczv2yyzm"; + footprints.rev = "a939c691f1c515d6830e54cf035a420de3e5a92c"; + footprints.sha256 = "13g6y1l95znz6ixc4dpqsxp3icrzs951xpabnzr5znw42577gm9j"; + packages3d.rev = "196a26294d8e501b0e8b06c1df1abae0ebe23051"; + packages3d.sha256 = "0ywlk00dfwv7hc494finmazdh3g1yx0ir7bvnd8zp6cq4ql0nwl4"; }; }; }; diff --git a/pkgs/applications/terminal-emulators/syncterm/default.nix b/pkgs/applications/terminal-emulators/syncterm/default.nix new file mode 100644 index 00000000000..d1f0ab5e8cf --- /dev/null +++ b/pkgs/applications/terminal-emulators/syncterm/default.nix @@ -0,0 +1,39 @@ +{ lib, stdenv, fetchurl, pkg-config, perl, unzip, autoPatchelfHook, ncurses, SDL2, alsa-lib }: + +stdenv.mkDerivation rec { + pname = "syncterm"; + version = "1.1"; + + src = fetchurl { + url = "mirror://sourceforge/${pname}/${pname}-${version}-src.tgz"; + sha256 = "19m76bisipp1h3bc8mbq83b851rx3lbysxb0azpbr5nbqr2f8xyi"; + }; + sourceRoot = "${pname}-${version}/src/syncterm"; + + CFLAGS = [ + "-DHAS_INTTYPES_H" + "-DXPDEV_DONT_DEFINE_INTTYPES" + + "-Wno-unused-result" + "-Wformat-overflow=0" + ] ++ (lib.optionals stdenv.isLinux [ + "-DUSE_ALSA_SOUND" # Don't use OSS for beeps. + ]); + makeFlags = [ + "PREFIX=$(out)" + "RELEASE=1" + "USE_SDL_AUDIO=1" + ]; + + nativeBuildInputs = [ autoPatchelfHook pkg-config SDL2 perl unzip ]; # SDL2 for `sdl2-config`. + buildInputs = [ ncurses SDL2 ] + ++ (lib.optional stdenv.isLinux alsa-lib); + runtimeDependencies = [ ncurses SDL2 ]; # Both of these are dlopen()'ed at runtime. + + meta = with lib; { + homepage = "https://syncterm.bbsdev.net/"; + description = "BBS terminal emulator"; + maintainers = with maintainers; [ embr ]; + license = licenses.gpl2Plus; + }; +} diff --git a/pkgs/applications/version-management/git-and-tools/git-hub/default.nix b/pkgs/applications/version-management/git-and-tools/git-hub/default.nix index 83397d1934e..be1fd992a9d 100644 --- a/pkgs/applications/version-management/git-and-tools/git-hub/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-hub/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "git-hub"; - version = "2.1.1"; + version = "2.1.2"; src = fetchFromGitHub { owner = "sociomantic-tsunami"; repo = "git-hub"; rev = "v${version}"; - sha256 = "sha256-k8sGgDhQn9e0lxM604Wz2sy4lrX5o82xAgWbqscOmQw="; + sha256 = "sha256-Iq6IrW2gAGqq56b2gXpEkg+I/5FcmsESWBJQiG1XWWA="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/version-management/git-repo/default.nix b/pkgs/applications/version-management/git-repo/default.nix index bc496cbbaae..03ca6111e34 100644 --- a/pkgs/applications/version-management/git-repo/default.nix +++ b/pkgs/applications/version-management/git-repo/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "git-repo"; - version = "2.19"; + version = "2.20"; src = fetchFromGitHub { owner = "android"; repo = "tools_repo"; rev = "v${version}"; - sha256 = "sha256-aJnerKeZobgw3e4s7D7de7/nP6vwymLpeKnrLmPzDow="; + sha256 = "sha256-5yyiQMIoAtaNh9H1pjU1gXAbmU3/VdXGt7AL4wmJC28="; }; # Fix 'NameError: name 'ssl' is not defined' diff --git a/pkgs/applications/version-management/gitlab/data.json b/pkgs/applications/version-management/gitlab/data.json index 4a47fdeaf2b..121e9b14400 100644 --- a/pkgs/applications/version-management/gitlab/data.json +++ b/pkgs/applications/version-management/gitlab/data.json @@ -1,14 +1,14 @@ { - "version": "14.6.1", - "repo_hash": "0zgznf0f7jxyznil6q3fac2rvhaa2lhlpxcnbmkg9djyx1vcm7k1", + "version": "14.6.2", + "repo_hash": "0n7l1f1w70nqb9ackcmi1yhx69a32zlkxa962v67782nn2vdcbiz", "yarn_hash": "1kcjbf8xn3bwac2s9i2i7dpgbkwcjh09wvgbgysm5yffpdswg6nl", "owner": "gitlab-org", "repo": "gitlab", - "rev": "v14.6.1-ee", + "rev": "v14.6.2-ee", "passthru": { - "GITALY_SERVER_VERSION": "14.6.1", + "GITALY_SERVER_VERSION": "14.6.2", "GITLAB_PAGES_VERSION": "1.49.0", "GITLAB_SHELL_VERSION": "13.22.1", - "GITLAB_WORKHORSE_VERSION": "14.6.1" + "GITLAB_WORKHORSE_VERSION": "14.6.2" } } diff --git a/pkgs/applications/version-management/gitlab/gitaly/default.nix b/pkgs/applications/version-management/gitlab/gitaly/default.nix index 04cfd0e4714..8366de49cf6 100644 --- a/pkgs/applications/version-management/gitlab/gitaly/default.nix +++ b/pkgs/applications/version-management/gitlab/gitaly/default.nix @@ -33,7 +33,7 @@ let }; }; - version = "14.6.1"; + version = "14.6.2"; gitaly_package = "gitlab.com/gitlab-org/gitaly/v${lib.versions.major version}"; in @@ -45,7 +45,7 @@ buildGoModule { owner = "gitlab-org"; repo = "gitaly"; rev = "v${version}"; - sha256 = "sha256-nbE71s+KoDC6EK26cmq+YIw9MFSQv1y6qwZAJXVXGj4="; + sha256 = "sha256-a9qFAtQP5QtI+E6V3LBYAMYQbvhgOcn75l+6pSQPZ+0="; }; vendorSha256 = "sha256-ZLd4E3+e25Hqmd6ZyF3X6BveMEg7OF0FX9IvNBWn3v0="; diff --git a/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix b/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix index 0ac84d8aa01..6977dd81e2b 100644 --- a/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix +++ b/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix @@ -5,7 +5,7 @@ in buildGoModule rec { pname = "gitlab-workhorse"; - version = "14.6.1"; + version = "14.6.2"; src = fetchFromGitLab { owner = data.owner; diff --git a/pkgs/applications/video/mpv/scripts/update-sponsorblock.sh b/pkgs/applications/video/mpv/scripts/update-sponsorblock.sh index 6422a53aa98..b4888365a6f 100755 --- a/pkgs/applications/video/mpv/scripts/update-sponsorblock.sh +++ b/pkgs/applications/video/mpv/scripts/update-sponsorblock.sh @@ -26,7 +26,7 @@ if [ ! -d "$git_dir" ]; then git init --initial-branch="$git_branch" "$git_dir" git -C "$git_dir" remote add origin "$git_url" fi -git -C "$git_dir" fetch --depth=1 origin "$git_branch" +git -C "$git_dir" fetch origin "$git_branch" # use latest commit before today, we should not call the version *today* # because there might still be commits coming diff --git a/pkgs/applications/virtualization/colima/default.nix b/pkgs/applications/virtualization/colima/default.nix index e39805ad629..557941677f9 100644 --- a/pkgs/applications/virtualization/colima/default.nix +++ b/pkgs/applications/virtualization/colima/default.nix @@ -8,18 +8,18 @@ buildGoModule rec { pname = "colima"; - version = "0.2.2"; + version = "0.3.1"; src = fetchFromGitHub { owner = "abiosoft"; repo = pname; rev = "v${version}"; - sha256 = "sha256-vWNkYsT2XF+oMOQ3pb1+/a207js8B+EmVanRQrYE/2A="; + sha256 = "sha256-+P4kxiib1xkS4iGC2HrYAt0YMyXyEYPqoo1BkDs7jp8="; }; nativeBuildInputs = [ installShellFiles makeWrapper ]; - vendorSha256 = "sha256-VGSwu1WBYfcWjA6BczfMY1s+r9s9aGjlQJjPXgss56s="; + vendorSha256 = "sha256-Z4+qwoX04VnLsUIYRfOowFLgcaA9w8oGRl77jzFigIc="; postInstall = '' wrapProgram $out/bin/colima \ @@ -35,7 +35,6 @@ buildGoModule rec { description = "Container runtimes on MacOS with minimal setup"; homepage = "https://github.com/abiosoft/colima"; license = licenses.mit; - platforms = platforms.darwin; maintainers = with maintainers; [ aaschmid ]; }; } diff --git a/pkgs/applications/virtualization/crun/default.nix b/pkgs/applications/virtualization/crun/default.nix index 1e59fa0d6ae..2164f16bd3e 100644 --- a/pkgs/applications/virtualization/crun/default.nix +++ b/pkgs/applications/virtualization/crun/default.nix @@ -37,13 +37,13 @@ let in stdenv.mkDerivation rec { pname = "crun"; - version = "1.4"; + version = "1.4.1"; src = fetchFromGitHub { owner = "containers"; repo = pname; rev = version; - sha256 = "sha256-hO3gOZ0AaSvymIDvoylHzlHscoN1+G7wDXTCP1c5uIw="; + sha256 = "sha256-j2+ga+jnKnjnFGmrOOym99keLALg7wR7Jk+jjesiMc4="; fetchSubmodules = true; }; diff --git a/pkgs/applications/virtualization/lima/default.nix b/pkgs/applications/virtualization/lima/default.nix index d2020613468..ad9955cc477 100644 --- a/pkgs/applications/virtualization/lima/default.nix +++ b/pkgs/applications/virtualization/lima/default.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "lima"; - version = "0.8.0"; + version = "0.8.1"; src = fetchFromGitHub { owner = "lima-vm"; repo = pname; rev = "v${version}"; - sha256 = "sha256-bO7o3z9E7mGiUtlqI+mhhh+D6CG9j3BZ7IB8o/LDUPM="; + sha256 = "sha256-vOoRwV4BO40cUWNxmWubgbN1q7WPKe2vifg8F1duaVA="; }; - vendorSha256 = "sha256-xIkB1QG/nYPe3CuZP7zVHCCAJeNRqKtFWxEqswyXp5o="; + vendorSha256 = "sha256-118TYmpGUNMZgFKsOzqOy71SabG9tN6IeOkpgwVSXTY="; nativeBuildInputs = [ makeWrapper installShellFiles ]; diff --git a/pkgs/data/icons/qogir-icon-theme/default.nix b/pkgs/data/icons/qogir-icon-theme/default.nix index c0f65ab7ead..24ad687834e 100644 --- a/pkgs/data/icons/qogir-icon-theme/default.nix +++ b/pkgs/data/icons/qogir-icon-theme/default.nix @@ -1,14 +1,20 @@ -{ lib, stdenv, fetchFromGitHub, gtk3, hicolor-icon-theme, jdupes }: - -stdenv.mkDerivation rec { +{ lib +, stdenvNoCC +, fetchFromGitHub +, gtk3 +, hicolor-icon-theme +, jdupes +}: + +stdenvNoCC.mkDerivation rec { pname = "qogir-icon-theme"; - version = "2021-10-14"; + version = "2022-01-12"; src = fetchFromGitHub { owner = "vinceliuice"; repo = pname; rev = version; - sha256 = "0qbbg0hcdda7apk892b8nhbrsvji12nv97ss7lv412xwcmxsj9fp"; + sha256 = "1daayxsqh7di3bvfnl39h1arsj1fypd3ba30mas6dl1d0qy17z1p"; }; nativeBuildInputs = [ gtk3 jdupes ]; @@ -26,7 +32,7 @@ stdenv.mkDerivation rec { patchShebangs install.sh mkdir -p $out/share/icons name= ./install.sh -d $out/share/icons - jdupes -l -r $out/share/icons + jdupes -L -r $out/share/icons runHook postInstall ''; diff --git a/pkgs/desktops/gnome-2/default.nix b/pkgs/desktops/gnome-2/default.nix index 72216863206..5ef6026f2ff 100644 --- a/pkgs/desktops/gnome-2/default.nix +++ b/pkgs/desktops/gnome-2/default.nix @@ -49,7 +49,7 @@ lib.makeScope pkgs.newScope (self: with self; { gtkhtml = callPackage ./platform/gtkhtml { enchant = pkgs.enchant1; }; - gtkhtml4 = callPackage ./platform/gtkhtml/4.x.nix { enchant = pkgs.enchant1; }; + gtkhtml4 = callPackage ./platform/gtkhtml/4.x.nix { enchant = pkgs.enchant2; }; gtkglext = callPackage ./platform/gtkglext { }; diff --git a/pkgs/desktops/gnome-2/platform/gtkhtml/4.x.nix b/pkgs/desktops/gnome-2/platform/gtkhtml/4.x.nix index d8e1ea7108e..9447a381a3f 100644 --- a/pkgs/desktops/gnome-2/platform/gtkhtml/4.x.nix +++ b/pkgs/desktops/gnome-2/platform/gtkhtml/4.x.nix @@ -1,16 +1,30 @@ -{ stdenv, fetchurl, pkg-config, gtk3, intltool +{ stdenv, fetchFromGitLab, pkg-config, gtk3, intltool, autoreconfHook, fetchpatch , GConf, enchant, isocodes, gnome-icon-theme, gsettings-desktop-schemas }: stdenv.mkDerivation rec { version = "4.10.0"; pname = "gtkhtml"; - src = fetchurl { - url = "mirror://gnome/sources/gtkhtml/4.10/${pname}-${version}.tar.xz"; - sha256 = "1hq6asgb5n9q3ryx2vngr4jyi8lg65lzpnlgrgcwayiczcj68fya"; + src = fetchFromGitLab { + domain = "gitlab.gnome.org"; + owner = "Archive"; + repo = "gtkhtml"; + rev = "master"; + sha256 = "sha256-jL8YADvhW0o6I/2Uo5FNARMAnSbvtmFp+zWH1yCVvQk="; }; - propagatedBuildInputs = [ gsettings-desktop-schemas gtk3 gnome-icon-theme GConf ]; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ intltool enchant isocodes ]; + buildInputs = [ intltool enchant isocodes autoreconfHook ]; + + patchFlags = [ "-p0" ]; + + patches = [ + # Enables enchant2 support. + # Upstream is dead, no further releases are coming. + (fetchpatch { + name ="enchant-2.patch"; + url = "https://aur.archlinux.org/cgit/aur.git/plain/enchant-2.patch?h=gtkhtml4&id=0218303a63d64c04d6483a6fe9bb55063fcfaa43"; + sha256 = "sha256-jkA/GgIiJZmxkbcBGQ26OZ1nuI502BMPwbPhsZkbgbY="; + }) + ]; } diff --git a/pkgs/desktops/gnome/core/evolution-data-server/default.nix b/pkgs/desktops/gnome/core/evolution-data-server/default.nix index c4eaeea9b39..048fe600797 100644 --- a/pkgs/desktops/gnome/core/evolution-data-server/default.nix +++ b/pkgs/desktops/gnome/core/evolution-data-server/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "evolution-data-server"; - version = "3.42.2"; + version = "3.42.3"; outputs = [ "out" "dev" ]; src = fetchurl { url = "mirror://gnome/sources/evolution-data-server/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "HBTYbnoNjm5PGpYTfjGmGdK8+/yArR8OrDje4sAkerw="; + sha256 = "b1hHoSNHmQc+lYXbhhwhOBoJ7VUNwKISXwC6X5C9Nh0="; }; patches = [ diff --git a/pkgs/development/compilers/scala/2.x.nix b/pkgs/development/compilers/scala/2.x.nix index f39ab7ed68b..bac99fd79ac 100644 --- a/pkgs/development/compilers/scala/2.x.nix +++ b/pkgs/development/compilers/scala/2.x.nix @@ -26,8 +26,8 @@ let }; "2.13" = { - version = "2.13.7"; - sha256 = "FO8WAIeGvHs3E1soS+YkUHcB9lE5bRb9ikijWkvOqU4="; + version = "2.13.8"; + sha256 = "LLMdhGnGUYOfDpyDehqwZVDQMXJnUvVJBr4bneATFM8="; pname = "scala_2_13"; }; }; diff --git a/pkgs/development/embedded/stm32/stm32cubemx/default.nix b/pkgs/development/embedded/stm32/stm32cubemx/default.nix index bca4f87f9a5..9652a95ee27 100644 --- a/pkgs/development/embedded/stm32/stm32cubemx/default.nix +++ b/pkgs/development/embedded/stm32/stm32cubemx/default.nix @@ -9,11 +9,11 @@ let in stdenv.mkDerivation rec { pname = "stm32cubemx"; - version = "6.2.1"; + version = "6.4.0"; src = fetchzip { url = "https://sw-center.st.com/packs/resource/library/stm32cube_mx_v${builtins.replaceStrings ["."] [""] version}-lin.zip"; - sha256 = "0m5h01iq0mgrr9svj4gmykfi9lsyjpqzrkvlizff26c8dqad59c5"; + sha256 = "sha256-5qotjAyaNFtYUjHlNKwywmBJGAzS/IM9bF+dmONE4bk="; stripRoot = false; }; diff --git a/pkgs/development/interpreters/python/update-python-libraries/update-python-libraries.py b/pkgs/development/interpreters/python/update-python-libraries/update-python-libraries.py index 3a6a14133ea..ee610b26202 100755 --- a/pkgs/development/interpreters/python/update-python-libraries/update-python-libraries.py +++ b/pkgs/development/interpreters/python/update-python-libraries/update-python-libraries.py @@ -242,7 +242,9 @@ DEFAULT_SETUPTOOLS_EXTENSION = 'tar.gz' FORMATS = { 'setuptools' : DEFAULT_SETUPTOOLS_EXTENSION, - 'wheel' : 'whl' + 'wheel' : 'whl', + 'pyproject' : 'tar.gz', + 'flit' : 'tar.gz' } def _determine_fetcher(text): @@ -281,12 +283,8 @@ def _determine_extension(text, fetcher): if extension is None: if src_format is None: src_format = 'setuptools' - elif src_format == 'flit': - raise ValueError("Don't know how to update a Flit package.") elif src_format == 'other': raise ValueError("Don't know how to update a format='other' package.") - elif src_format == 'pyproject': - raise ValueError("Don't know how to update a pyproject package.") extension = FORMATS[src_format] elif fetcher == 'fetchurl': @@ -352,9 +350,19 @@ def _update_package(path, target): text = _replace_value('hash', sri_hash, text) if fetcher == 'fetchFromGitHub': - text = _replace_value('rev', f"{prefix}${{version}}", text) - # incase there's no prefix, just rewrite without interpolation - text = text.replace('"${version}";', 'version;') + # in the case of fetchFromGitHub, it's common to see `rev = version;` + # in which no string value is meant to be substituted. + # Verify that the attribute is set to a variable + regex = '(rev\s+=\s+([_a-zA-Z][_a-zA-Z0-9\.]*);)' + regex = re.compile(regex) + value = regex.findall(text) + n = len(value) + + if n == 0: + # value is set to a string, e.g. `rev = "v${version}";` + text = _replace_value('rev', f"{prefix}${{version}}", text) + # incase there's no prefix, just rewrite without interpolation + text = text.replace('"${version}";', 'version;') with open(path, 'w') as f: f.write(text) diff --git a/pkgs/development/interpreters/spidermonkey/91.nix b/pkgs/development/interpreters/spidermonkey/91.nix index 57e62e319d1..61b340ac185 100644 --- a/pkgs/development/interpreters/spidermonkey/91.nix +++ b/pkgs/development/interpreters/spidermonkey/91.nix @@ -20,11 +20,11 @@ stdenv.mkDerivation rec { pname = "spidermonkey"; - version = "91.4.0"; + version = "91.5.0"; src = fetchurl { url = "mirror://mozilla/firefox/releases/${version}esr/source/firefox-${version}esr.source.tar.xz"; - sha256 = "09xkzk27krzyj1qx8cjjn2zpnws1cncka75828kk7ychnjfq48p7"; + sha256 = "04y8nj1f065b3dn354f1ns3cm9xp4kljr5ippvmfdqr7cb4xjp7l"; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/libraries/audio/libkeyfinder/default.nix b/pkgs/development/libraries/audio/libkeyfinder/default.nix index 8265cd0ba7c..cb34f24ced8 100644 --- a/pkgs/development/libraries/audio/libkeyfinder/default.nix +++ b/pkgs/development/libraries/audio/libkeyfinder/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "libkeyfinder"; - version = "2.2.5"; + version = "2.2.6"; src = fetchFromGitHub { owner = "mixxxdj"; repo = "libkeyfinder"; rev = "v${version}"; - sha256 = "sha256-4jbnsKMGJKUIRfRPymGGgqPgwPyLInc6rLvCXnOcQ5g="; + sha256 = "sha256-7w/Wc9ncLinbnM2q3yv5DBtFoJFAM2e9xAUTsqvE9mg="; }; # needed for finding libkeyfinder.so to link it into keyfinder-tests executable diff --git a/pkgs/development/libraries/gdk-pixbuf/xlib.nix b/pkgs/development/libraries/gdk-pixbuf/xlib.nix index bc4c14beb45..dd498bb9aea 100644 --- a/pkgs/development/libraries/gdk-pixbuf/xlib.nix +++ b/pkgs/development/libraries/gdk-pixbuf/xlib.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { pname = "gdk-pixbuf-xlib"; - version = "2020-06-11-unstable"; + version = "2.40.2"; outputs = [ "out" "dev" "devdoc" ]; @@ -20,8 +20,8 @@ stdenv.mkDerivation rec { domain = "gitlab.gnome.org"; owner = "Archive"; repo = "gdk-pixbuf-xlib"; - rev = "3116b8ae55501cf48d16970aa2b50a5530e15223"; - sha256 = "15wisf2xld3cr7lprnic8fvwpcmww4rydwc1bn2zilyi52vzl2zd"; + rev = version; + hash = "sha256-b4EUaYzg2NlBMU90dGQivOvkv9KKSzES/ymPqzrelu8="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/igraph/default.nix b/pkgs/development/libraries/igraph/default.nix index 159943d8db4..06aad781bc7 100644 --- a/pkgs/development/libraries/igraph/default.nix +++ b/pkgs/development/libraries/igraph/default.nix @@ -21,13 +21,13 @@ stdenv.mkDerivation rec { pname = "igraph"; - version = "0.9.5"; + version = "0.9.6"; src = fetchFromGitHub { owner = "igraph"; repo = pname; rev = version; - sha256 = "sha256-R5v1nbfYyIOzdw7LmkGQE4yVxpTVs6YF62jkfFrA1z8="; + sha256 = "sha256-nMM4ZQLIth9QHlLu+sXE4AXoDlq1UP20+YuBi+Op+go="; }; # Normally, igraph wants us to call bootstrap.sh, which will call diff --git a/pkgs/development/libraries/sqlcipher/default.nix b/pkgs/development/libraries/sqlcipher/default.nix index cbac792e44e..35334721566 100644 --- a/pkgs/development/libraries/sqlcipher/default.nix +++ b/pkgs/development/libraries/sqlcipher/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, openssl, tcl, installShellFiles, buildPackages, readline, ncurses, zlib }: +{ stdenv, lib, fetchFromGitHub, openssl, tcl, installShellFiles, buildPackages, readline, ncurses, zlib, sqlite }: stdenv.mkDerivation rec { pname = "sqlcipher"; @@ -21,9 +21,8 @@ stdenv.mkDerivation rec { ]; CFLAGS = [ - "-DSQLITE_ENABLE_COLUMN_METADATA=1" - "-DSQLITE_SECURE_DELETE=1" - "-DSQLITE_ENABLE_UNLOCK_NOTIFY=1" + # We want feature parity with sqlite + sqlite.NIX_CFLAGS_COMPILE "-DSQLITE_HAS_CODEC" ]; diff --git a/pkgs/development/libraries/stfl/default.nix b/pkgs/development/libraries/stfl/default.nix index 48c5edd13bf..1ed1a05004b 100644 --- a/pkgs/development/libraries/stfl/default.nix +++ b/pkgs/development/libraries/stfl/default.nix @@ -11,13 +11,11 @@ stdenv.mkDerivation rec { buildInputs = [ ncurses libiconv ]; - buildPhase = '' + preBuild = '' sed -i s/gcc/cc/g Makefile sed -i s%ncursesw/ncurses.h%ncurses.h% stfl_internals.h - '' + (lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.isDarwin '' sed -i s/-soname/-install_name/ Makefile - '') + '' - make ''; installPhase = '' diff --git a/pkgs/development/libraries/zxing-cpp/default.nix b/pkgs/development/libraries/zxing-cpp/default.nix index aa7db78c4c3..514ebe9975a 100644 --- a/pkgs/development/libraries/zxing-cpp/default.nix +++ b/pkgs/development/libraries/zxing-cpp/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "zxing-cpp"; - version = "1.1.1"; + version = "1.2.0"; src = fetchFromGitHub { owner = "nu-book"; repo = pname; rev = "v${version}"; - hash = "sha256-N2FTzsjxm3EE5Wqz7xt+FS4zQ60Ow4WbdX6Eo08ktek="; + hash = "sha256-M565VNKhSmYFmCMEI9UFuHWNZWeHrf9qzZkMAw9LUr4="; }; nativeBuildInputs = [ @@ -23,6 +23,7 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DBUILD_EXAMPLES=OFF" + "-DBUILD_BLACKBOX_TESTS=OFF" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/aioresponses/default.nix b/pkgs/development/python-modules/aioresponses/default.nix index 2a3a2e60be7..a23b1eca77c 100644 --- a/pkgs/development/python-modules/aioresponses/default.nix +++ b/pkgs/development/python-modules/aioresponses/default.nix @@ -11,12 +11,14 @@ buildPythonPackage rec { pname = "aioresponses"; - version = "0.7.2"; + version = "0.7.3"; + format = "setuptools"; + disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; - sha256 = "sha256-guSV0Ri3SJaqW01H4X7/teLMeD5RCuOVzq3l6Hyr6Jo="; + sha256 = "sha256-LGTtVxDujLTpWMVpGE2tEvTJzVk5E1yzj4jGqCYczrM="; }; nativeBuildInputs = [ @@ -39,7 +41,9 @@ buildPythonPackage rec { "test_pass_through_with_origin_params" ]; - pythonImportsCheck = [ "aioresponses" ]; + pythonImportsCheck = [ + "aioresponses" + ]; meta = { description = "A helper to mock/fake web requests in python aiohttp package"; diff --git a/pkgs/development/python-modules/amqp/default.nix b/pkgs/development/python-modules/amqp/default.nix index 6156472896a..c23c1d012da 100644 --- a/pkgs/development/python-modules/amqp/default.nix +++ b/pkgs/development/python-modules/amqp/default.nix @@ -1,24 +1,46 @@ -{ lib, buildPythonPackage, fetchPypi, pytestCheckHook, case, vine }: +{ lib +, buildPythonPackage +, case +, fetchPypi +, pytestCheckHook +, pythonOlder +, vine +}: buildPythonPackage rec { pname = "amqp"; - version = "5.0.6"; + version = "5.0.9"; + format = "setuptools"; + + disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "03e16e94f2b34c31f8bf1206d8ddd3ccaa4c315f7f6a1879b7b1210d229568c2"; + hash = "sha256-Hl9wdCTlRAeMoZbnKuahSIfOdOAr0Sa+VLfAPJcb7xg="; }; - propagatedBuildInputs = [ vine ]; + propagatedBuildInputs = [ + vine + ]; + + checkInputs = [ + case + pytestCheckHook + ]; - checkInputs = [ pytestCheckHook case ]; disabledTests = [ - "test_rmq.py" # requires network access + # Requires network access + "test_rmq.py" + ]; + + pythonImportsCheck = [ + "amqp" ]; meta = with lib; { homepage = "https://github.com/celery/py-amqp"; description = "Python client for the Advanced Message Queuing Procotol (AMQP). This is a fork of amqplib which is maintained by the Celery project"; - license = licenses.lgpl21; + license = licenses.bsd3; + maintainers = with maintainers; [ fab ]; }; } diff --git a/pkgs/development/python-modules/azure-eventhub/default.nix b/pkgs/development/python-modules/azure-eventhub/default.nix index 95910a66e82..de3ddb803aa 100644 --- a/pkgs/development/python-modules/azure-eventhub/default.nix +++ b/pkgs/development/python-modules/azure-eventhub/default.nix @@ -7,12 +7,12 @@ buildPythonPackage rec { pname = "azure-eventhub"; - version = "5.6.1"; + version = "5.7.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "sha256-ssjTesjPFITaB5Uy061podqL14ojeCIVm3LWsF3kY40="; + sha256 = "6ac364e5f1c5b376604c3b5a25ad0be5e3a5f96368f590e05b47e6745f1006ee"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/azure-mgmt-apimanagement/default.nix b/pkgs/development/python-modules/azure-mgmt-apimanagement/default.nix index 2b2327d9f0e..7b088728b27 100644 --- a/pkgs/development/python-modules/azure-mgmt-apimanagement/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-apimanagement/default.nix @@ -6,13 +6,13 @@ }: buildPythonPackage rec { - version = "2.1.0"; + version = "3.0.0"; pname = "azure-mgmt-apimanagement"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "58296bd45e876df33f93f3a41c866c36476f5f3bd46818e8891308794f041c94"; + sha256 = "9262f54ed387eb083d8dae66d32a8df35647319b902bd498cdc376f50a12d154"; extension = "zip"; }; diff --git a/pkgs/development/python-modules/azure-mgmt-applicationinsights/default.nix b/pkgs/development/python-modules/azure-mgmt-applicationinsights/default.nix index 2685d8803b8..545eef7f6d8 100644 --- a/pkgs/development/python-modules/azure-mgmt-applicationinsights/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-applicationinsights/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "azure-mgmt-applicationinsights"; - version = "1.0.0"; + version = "2.0.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "c287a2c7def4de19f92c0c31ba02867fac6f5b8df71b5dbdab19288bb455fc5b"; + sha256 = "c5f831ff09573247579c0dabe7854324620d176143b28cc4ef2e71ca49791dcc"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/azure-mgmt-datafactory/default.nix b/pkgs/development/python-modules/azure-mgmt-datafactory/default.nix index cb1d15179b2..bfd0b619695 100644 --- a/pkgs/development/python-modules/azure-mgmt-datafactory/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-datafactory/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "azure-mgmt-datafactory"; - version = "2.1.0"; + version = "2.2.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "d2a3cfe844bd9e51499b81bba7510e2c8df4fc3a40a7059e6224ed043d65a786"; + sha256 = "bc2560b4de1528292883b53a337b89f04a5ceab7c3500b6bc388e3a77ff093cc"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/azure-mgmt-eventgrid/default.nix b/pkgs/development/python-modules/azure-mgmt-eventgrid/default.nix index 2023eb0ab56..e61cd221db9 100644 --- a/pkgs/development/python-modules/azure-mgmt-eventgrid/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-eventgrid/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "azure-mgmt-eventgrid"; - version = "10.0.0"; + version = "10.1.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "582e314ca05a9be0cd391c64689e6a5332d5bbad76c2ea751b727cfe99a2a3d2"; + sha256 = "4da3bf142d31bc25d80ee26641b95b7f52eb1baf4f326b9954e9f0613944ef3c"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/azure-mgmt-imagebuilder/default.nix b/pkgs/development/python-modules/azure-mgmt-imagebuilder/default.nix index 404caf4ebf5..005f5ca8f0c 100644 --- a/pkgs/development/python-modules/azure-mgmt-imagebuilder/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-imagebuilder/default.nix @@ -1,26 +1,36 @@ { lib, buildPythonPackage, fetchPypi, isPy27 , azure-common +, azure-mgmt-core , msrest , msrestazure }: buildPythonPackage rec { - version = "0.4.0"; + version = "1.0.0"; pname = "azure-mgmt-imagebuilder"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "4c9291bf16b40b043637e5e4f15650f71418ac237393e62219cab478a7951733"; + sha256 = "634e398de9a23e712aa27a4a59f9ea5d5091d1dfcfed5ac977230918872c4430"; extension = "zip"; }; - propagatedBuildInputs = [ azure-common msrest msrestazure ]; + propagatedBuildInputs = [ + azure-common + azure-mgmt-core + msrest + msrestazure + ]; # no tests included doCheck = false; - pythonImportsCheck = [ "azure.common" "azure.mgmt.imagebuilder" ]; + pythonImportsCheck = [ + "azure.common" + "azure.mgmt.core" + "azure.mgmt.imagebuilder" + ]; meta = with lib; { description = "Microsoft Azure Image Builder Client Library for Python"; diff --git a/pkgs/development/python-modules/azure-mgmt-netapp/default.nix b/pkgs/development/python-modules/azure-mgmt-netapp/default.nix index dbe22478d7b..edf8057e503 100644 --- a/pkgs/development/python-modules/azure-mgmt-netapp/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-netapp/default.nix @@ -6,13 +6,13 @@ }: buildPythonPackage rec { - version = "5.1.0"; + version = "6.0.1"; pname = "azure-mgmt-netapp"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "306088088ee10e86c4cf24cc82a9ca619db5cdfc0da3fa207d00ec7f77f06e8e"; + sha256 = "6ce683587be1638d8d77620b7af118060b8b7dfc4fd23d46a623a66edcb388e1"; extension = "zip"; }; diff --git a/pkgs/development/python-modules/azure-mgmt-web/default.nix b/pkgs/development/python-modules/azure-mgmt-web/default.nix index 1c9cb2e9457..ad7930016ab 100644 --- a/pkgs/development/python-modules/azure-mgmt-web/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-web/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "azure-mgmt-web"; - version = "5.0.0"; + version = "6.0.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "0b10542600cd268d6369681c3367373a925eedcda5414eacbd3fbc9a0bdf1f24"; + sha256 = "a58750df23d5d4cb8eff283a93312e933ee3ef4272324576005c3dc8c22ce944"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/azure-servicebus/default.nix b/pkgs/development/python-modules/azure-servicebus/default.nix index bf474c03143..b4e37c33fef 100644 --- a/pkgs/development/python-modules/azure-servicebus/default.nix +++ b/pkgs/development/python-modules/azure-servicebus/default.nix @@ -12,13 +12,13 @@ buildPythonPackage rec { pname = "azure-servicebus"; - version = "7.4.0"; + version = "7.5.0"; format = "setuptools"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "sha256-nlt4wNHI613tK7JB85fBW2LE/FOa8+2aLeT6wzP1PQ4="; + sha256 = "e97a069c6a73fce3042a5ef0d438cc564152cfbcc2e7db6f7a19fbd51bb3555b"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/azure-servicefabric/default.nix b/pkgs/development/python-modules/azure-servicefabric/default.nix index 283a3146662..64e7a8f63d3 100644 --- a/pkgs/development/python-modules/azure-servicefabric/default.nix +++ b/pkgs/development/python-modules/azure-servicefabric/default.nix @@ -7,12 +7,12 @@ buildPythonPackage rec { pname = "azure-servicefabric"; - version = "8.0.0.0"; + version = "8.2.0.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "f414cc114e28a358a7f39772205f3f15d7fc1aa30a08d106b0b80623f4303f1d"; + sha256 = "f49c8759447970817b9b2d3d4b97439765dcf75ba01b6066ce96b605052fbb23"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/azure-synapse-artifacts/default.nix b/pkgs/development/python-modules/azure-synapse-artifacts/default.nix index 4be6c43ba9a..b24417b325a 100644 --- a/pkgs/development/python-modules/azure-synapse-artifacts/default.nix +++ b/pkgs/development/python-modules/azure-synapse-artifacts/default.nix @@ -6,12 +6,12 @@ buildPythonPackage rec { pname = "azure-synapse-artifacts"; - version = "0.10.0"; + version = "0.11.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "3f782c9b590b8ae43678c6e003df8ca8cca675832039d270b0b7437ff01557fd"; + sha256 = "79eb973280ea89c0e6e2872d8f3f175b172b7438c2e2b9b4e655ae206be705fa"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/bbox/default.nix b/pkgs/development/python-modules/bbox/default.nix new file mode 100644 index 00000000000..a07551197b8 --- /dev/null +++ b/pkgs/development/python-modules/bbox/default.nix @@ -0,0 +1,30 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pythonOlder +, pyquaternion +, numpy +}: + +buildPythonPackage rec { + pname = "bbox"; + version = "0.9.2"; + + disabled = pythonOlder "3.6"; + + src = fetchPypi { + inherit pname version; + sha256 = "sha256-ucR7mg9eubEefjC7ratEgrb9h++a26z8KV38n3N2kcw="; + }; + + propagatedBuildInputs = [ pyquaternion numpy ]; + + pythonImportsCheck = [ "bbox" ]; + + meta = with lib; { + description = "Python library for 2D/3D bounding boxes"; + homepage = "https://github.com/varunagrawal/bbox"; + license = licenses.mit; + maintainers = with maintainers; [ lucasew ]; + }; +} diff --git a/pkgs/development/python-modules/boltons/default.nix b/pkgs/development/python-modules/boltons/default.nix index 0986a5dc7c4..f884e164d63 100644 --- a/pkgs/development/python-modules/boltons/default.nix +++ b/pkgs/development/python-modules/boltons/default.nix @@ -3,40 +3,53 @@ , fetchFromGitHub , fetchpatch , pytestCheckHook +, pythonAtLeast +, pythonOlder }: buildPythonPackage rec { pname = "boltons"; version = "20.2.1"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; - # No tests in PyPi Tarball src = fetchFromGitHub { owner = "mahmoud"; repo = "boltons"; rev = version; - sha256 = "0vw0h0z81gfxgjfijqiza92ic0siv9xy65mklgj5d0dzr1k9waw8"; + hash = "sha256-iCueZsi/gVbko7MW43vaUQMWRVI/YhmdfN29gD6AgG8="; }; - patches = [ + checkInputs = [ + pytestCheckHook + ]; + + patches = lib.optionals (pythonAtLeast "3.10") [ + # pprint has no attribute _safe_repr, https://github.com/mahmoud/boltons/issues/294 (fetchpatch { - url = "https://github.com/mahmoud/boltons/commit/754afddf141ea26956c88c7e13fe5e7ca7942654.patch"; - sha256 = "14kcq8pl4pmgcnlnmj1sh1yrksgym0kn0kgz2648g192svqkbpz8"; + name = "fix-pprint-attribute.patch"; + url = "https://github.com/mahmoud/boltons/commit/270e974975984f662f998c8f6eb0ebebd964de82.patch"; + sha256 = "sha256-pZLfr6SRCw2aLwZeYaX7bzfJeZC4cFUILEmnVsKR6zc="; }) ]; - checkInputs = [ pytestCheckHook ]; disabledTests = [ - # This test is broken without this PR, which has not yet been merged + # This test is broken without this PR. Merged but not released # https://github.com/mahmoud/boltons/pull/283 - "test_frozendict_ior" + "test_frozendict" + ]; + + pythonImportsCheck = [ + "boltons" ]; meta = with lib; { homepage = "https://github.com/mahmoud/boltons"; - description = "220+ constructs, recipes, and snippets extending (and relying on nothing but) the Python standard library"; + description = "Constructs, recipes, and snippets extending the Python standard library"; longDescription = '' - Boltons is a set of over 220 BSD-licensed, pure-Python utilities - in the same spirit as — and yet conspicuously missing from — the + Boltons is a set of over 200 BSD-licensed, pure-Python utilities + in the same spirit as - and yet conspicuously missing from - the standard library, including: - Atomic file saving, bolted on with fileutils diff --git a/pkgs/development/python-modules/boxx/default.nix b/pkgs/development/python-modules/boxx/default.nix new file mode 100644 index 00000000000..a3f0db80faf --- /dev/null +++ b/pkgs/development/python-modules/boxx/default.nix @@ -0,0 +1,57 @@ +{ lib +, buildPythonPackage +, fetchPypi +, python +, xvfb-run +, matplotlib +, scikitimage +, numpy +, pandas +, imageio +, snakeviz +, fn +, pyopengl +, seaborn +, pytorch +, torchvision +}: + +buildPythonPackage rec { + pname = "boxx"; + version = "0.9.9"; + + src = fetchPypi { + inherit pname version; + sha256 = "sha256-Mc6R6ruUVhFs2D0CTJsAiM9aGOusS973hRS5r2kQsy4="; + }; + + propagatedBuildInputs = [ + matplotlib + scikitimage + numpy + pandas + imageio + snakeviz + fn + pyopengl + seaborn + ]; + + pythonImportsCheck = [ "boxx" ]; + checkInputs = [ + xvfb-run + pytorch + torchvision + ]; + + checkPhase = '' + xvfb-run ${python.interpreter} -m unittest + ''; + + meta = with lib; { + description = "Tool-box for efficient build and debug in Python. Especially for Scientific Computing and Computer Vision."; + homepage = "https://github.com/DIYer22/boxx"; + license = licenses.mit; + maintainers = with maintainers; [ lucasew ]; + }; +} diff --git a/pkgs/development/python-modules/bpycv/bpycv-test.py b/pkgs/development/python-modules/bpycv/bpycv-test.py new file mode 100644 index 00000000000..94e1bb122c7 --- /dev/null +++ b/pkgs/development/python-modules/bpycv/bpycv-test.py @@ -0,0 +1,76 @@ +# based on https://github.com/DIYer22/bpycv/blob/c576e01622d87eb3534f73bf1a5686bd2463de97/example/ycb_demo.py +import bpy +import bpycv + +import os +import glob +import random + +example_data_dir = os.environ['BPY_EXAMPLE_DATA'] + +models = sorted(glob.glob(os.path.join(example_data_dir, "model", "*", "*.obj"))) +cat_id_to_model_path = dict(enumerate(sorted(models), 1)) + +distractors = sorted(glob.glob(os.path.join(example_data_dir, "distractor", "*.obj"))) + +bpycv.clear_all() +bpy.context.scene.frame_set(1) +bpy.context.scene.render.engine = "CYCLES" +bpy.context.scene.cycles.samples = 32 +bpy.context.scene.render.resolution_y = 1024 +bpy.context.scene.render.resolution_x = 1024 + +# A transparency stage for holding rigid body +stage = bpycv.add_stage(transparency=True) + +bpycv.set_cam_pose(cam_radius=1, cam_deg=45) + +hdri_dir = os.path.join(example_data_dir, "background_and_light") +hdri_manager = bpycv.HdriManager( + hdri_dir=hdri_dir, download=False +) # if download is True, will auto download .hdr file from HDRI Haven +hdri_path = hdri_manager.sample() +bpycv.load_hdri_world(hdri_path, random_rotate_z=True) + +# load 5 objects +for index in range(5): + cat_id = random.choice(list(cat_id_to_model_path)) + model_path = cat_id_to_model_path[cat_id] + obj = bpycv.load_obj(model_path) + obj.location = ( + random.uniform(-0.2, 0.2), + random.uniform(-0.2, 0.2), + random.uniform(0.1, 0.3), + ) + obj.rotation_euler = [random.uniform(-3.1415, 3.1415) for _ in range(3)] + # set each instance a unique inst_id, which is used to generate instance annotation. + obj["inst_id"] = cat_id * 1000 + index + with bpycv.activate_obj(obj): + bpy.ops.rigidbody.object_add() + +# load 6 distractors +for index in range(6): + distractor_path = random.choice(distractors) + target_size = random.uniform(0.1, 0.3) + distractor = bpycv.load_distractor(distractor_path, target_size=target_size) + distractor.location = ( + random.uniform(-0.2, 0.2), + random.uniform(-0.2, 0.2), + random.uniform(0.1, 0.3), + ) + distractor.rotation_euler = [random.uniform(-3.1415, 3.1415) for _ in range(3)] + with bpycv.activate_obj(distractor): + bpy.ops.rigidbody.object_add() + +# run pyhsic engine for 20 frames +for i in range(20): + bpy.context.scene.frame_set(bpy.context.scene.frame_current + 1) + +# render image, instance annoatation and depth in one line code +result = bpycv.render_data() + +dataset_dir = "./dataset" +result.save(dataset_dir=dataset_dir, fname="0", save_blend=True) +print(f'Save to "{dataset_dir}"') +print(f'Open "{dataset_dir}/vis/" to see visualize result.') + diff --git a/pkgs/development/python-modules/bpycv/default.nix b/pkgs/development/python-modules/bpycv/default.nix new file mode 100644 index 00000000000..7a88a4078f0 --- /dev/null +++ b/pkgs/development/python-modules/bpycv/default.nix @@ -0,0 +1,62 @@ +{ lib +, buildPythonPackage +, fetchPypi +, fetchFromGitHub +, fetchurl +, writeText +, blender +, minexr +, beautifulsoup4 +, zcs +, requests +, opencv3 +, boxx +}: + +buildPythonPackage rec { + pname = "bpycv"; + version = "0.2.43"; + + src = fetchPypi { + inherit pname version; + sha256 = "sha256-6LXhKuNkX3yKeZARLXmOVNAUQhJghtzKhnszJ1G/a8U="; + }; + + propagatedBuildInputs = [ + beautifulsoup4 + minexr + zcs + requests + opencv3 + boxx + ]; + + postPatch = '' + sed -i 's/opencv-python//g' requirements.txt + ''; + + # pythonImportsCheck = [ "bpycv" ]; # this import depends on bpy that is only available inside blender + checkInputs = [ blender ]; + checkPhase = let + bpycv_example_data = fetchFromGitHub { + owner = "DIYer22"; + repo = "bpycv_example_data"; + sha256 = "sha256-dGb6KvbXTGTu5f4AqhA+i4AwTqBoR5SdXk0vsMEcD3Q="; + rev = "6ce0e65c107d572011394da16ffdf851e988dbb4"; + }; + in '' + TEMPDIR=$(mktemp -d) + pushd $TEMPDIR + cp -r ${bpycv_example_data} example_data + chmod +w -R example_data + BPY_EXAMPLE_DATA=${bpycv_example_data} blender -b -P ${./bpycv-test.py} + popd + ''; + + meta = with lib; { + description = "Computer vision utils for Blender"; + homepage = "https://github.com/DIYer22/bpycv"; + license = licenses.mit; + maintainers = with maintainers; [ lucasew ]; + }; +} diff --git a/pkgs/development/python-modules/catalogue/default.nix b/pkgs/development/python-modules/catalogue/default.nix index a62dcbd249a..7105e360561 100644 --- a/pkgs/development/python-modules/catalogue/default.nix +++ b/pkgs/development/python-modules/catalogue/default.nix @@ -2,13 +2,16 @@ , buildPythonPackage , fetchPypi , pytestCheckHook +, pythonAtLeast , pythonOlder , typing-extensions +, zipp }: buildPythonPackage rec { pname = "catalogue"; version = "2.0.6"; + format = "setuptools"; disabled = pythonOlder "3.6"; @@ -19,16 +22,27 @@ buildPythonPackage rec { propagatedBuildInputs = lib.optionals (pythonOlder "3.8") [ typing-extensions + zipp ]; - checkInputs = [ pytestCheckHook ]; + checkInputs = [ + pytestCheckHook + ]; + + disabledTests = lib.optionals (pythonAtLeast "3.10") [ + # https://github.com/explosion/catalogue/issues/27 + "test_entry_points" + ]; - pythonImportsCheck = [ "catalogue" ]; + pythonImportsCheck = [ + "catalogue" + ]; meta = with lib; { description = "Tiny library for adding function or object registries"; homepage = "https://github.com/explosion/catalogue"; changelog = "https://github.com/explosion/catalogue/releases/tag/v${version}"; license = licenses.mit; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/celery/default.nix b/pkgs/development/python-modules/celery/default.nix index cdd646fed14..eabb3521416 100644 --- a/pkgs/development/python-modules/celery/default.nix +++ b/pkgs/development/python-modules/celery/default.nix @@ -7,6 +7,7 @@ , click-didyoumean , click-plugins , click-repl +, dnspython , fetchPypi , kombu , moto @@ -22,14 +23,14 @@ buildPythonPackage rec { pname = "celery"; - version = "5.2.1"; + version = "5.2.3"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "b41a590b49caf8e6498a57db628e580d5f8dc6febda0f42de5d783aed5b7f808"; + hash = "sha256-4s1BZnrZfU9qL0Zy0cam662hlMYZJTBYtfI3BKqtqoI="; }; propagatedBuildInputs = [ @@ -46,6 +47,7 @@ buildPythonPackage rec { checkInputs = [ boto3 case + dnspython moto pymongo pytest-celery @@ -54,6 +56,11 @@ buildPythonPackage rec { pytestCheckHook ]; + postPatch = '' + substituteInPlace requirements/default.txt \ + --replace "setuptools>=59.1.1,<59.7.0" "setuptools" + ''; + disabledTestPaths = [ # test_eventlet touches network "t/unit/concurrency/test_eventlet.py" @@ -75,6 +82,6 @@ buildPythonPackage rec { description = "Distributed task queue"; homepage = "https://github.com/celery/celery/"; license = licenses.bsd3; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ fab ]; }; } diff --git a/pkgs/development/python-modules/cssutils/default.nix b/pkgs/development/python-modules/cssutils/default.nix index 9d1aec86250..6c1c5de2c56 100644 --- a/pkgs/development/python-modules/cssutils/default.nix +++ b/pkgs/development/python-modules/cssutils/default.nix @@ -1,6 +1,8 @@ { lib , buildPythonPackage +, pythonAtLeast , pythonOlder +, fetchpatch , fetchPypi , setuptools-scm , toml @@ -22,6 +24,14 @@ buildPythonPackage rec { sha256 = "sha256-stOxYEfKroLlxZADaTW6+htiHPRcLziIWvS+SDjw/QA="; }; + patches = lib.optionals (pythonAtLeast "3.10") [ + # fix tests for python3.10 + (fetchpatch { + url = "https://github.com/jaraco/cssutils/pull/17/commits/355b1795dde77bd4b49d8df35377230fdb503802.patch"; + sha256 = "sha256-hwe8oeZO2rq00cs079lje3wjQDEczAu3Tfy/X/M9+GQ="; + }) + ]; + nativeBuildInputs = [ setuptools-scm toml diff --git a/pkgs/development/python-modules/debugpy/default.nix b/pkgs/development/python-modules/debugpy/default.nix index bf2ed362867..dc58d8f7b03 100644 --- a/pkgs/development/python-modules/debugpy/default.nix +++ b/pkgs/development/python-modules/debugpy/default.nix @@ -13,11 +13,13 @@ , pytestCheckHook , requests , isPy3k +, pythonAtLeast }: buildPythonPackage rec { pname = "debugpy"; version = "1.5.1"; + format = "setuptools"; src = fetchFromGitHub { owner = "Microsoft"; @@ -67,6 +69,7 @@ buildPythonPackage rec { )''; doCheck = isPy3k; + checkInputs = [ django flask @@ -79,9 +82,25 @@ buildPythonPackage rec { ]; # Override default arguments in pytest.ini - pytestFlagsArray = [ "--timeout=0" "-n=$NIX_BUILD_CORES" ]; + pytestFlagsArray = [ + "--timeout=0" + "-n=$NIX_BUILD_CORES" + ]; - pythonImportsCheck = [ "debugpy" ]; + disabledTests = lib.optionals (pythonAtLeast "3.10") [ + "test_flask_breakpoint_multiproc" + "test_subprocess[program-launch-None]" + "test_systemexit[0-zero-uncaught-raised-launch(integratedTerminal)-module]" + "test_systemexit[0-zero-uncaught--attach_pid-program]" + "test_success_exitcodes[-break_on_system_exit_zero-0-attach_listen(cli)-module]" + "test_success_exitcodes[--0-attach_connect(api)-program]" + "test_run[code-attach_connect(api)]" + "test_subprocess[program-launch-None]" + ]; + + pythonImportsCheck = [ + "debugpy" + ]; meta = with lib; { description = "An implementation of the Debug Adapter Protocol for Python"; diff --git a/pkgs/development/python-modules/deemix/default.nix b/pkgs/development/python-modules/deemix/default.nix index e9bbb8a6377..c12bdac5fd0 100644 --- a/pkgs/development/python-modules/deemix/default.nix +++ b/pkgs/development/python-modules/deemix/default.nix @@ -12,12 +12,14 @@ buildPythonPackage rec { pname = "deemix"; - version = "3.6.5"; + version = "3.6.6"; + format = "setuptools"; + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "c56245b2a2142dafb0658d60919ccf34e04e5d87720d5909e0e030521349a65a"; + sha256 = "sha256-xEahzA1PIrGPfnnOcuXQLVQpSVOUFk6/0v9ViLgWCwk="; }; propagatedBuildInputs = [ @@ -31,18 +33,14 @@ buildPythonPackage rec { # Project has no tests doCheck = false; + pythonImportsCheck = [ - "spotipy" - "click" - "Cryptodome" - "mutagen" - "requests" "deezer" ]; meta = with lib; { - homepage = "https://git.freezer.life/RemixDev/deemix-py"; description = "Deezer downloader built from the ashes of Deezloader Remix"; + homepage = "https://git.freezerapp.xyz/RemixDev/deemix-py"; license = licenses.gpl3Plus; maintainers = with maintainers; [ natto1784 ]; }; diff --git a/pkgs/development/python-modules/enaml/default.nix b/pkgs/development/python-modules/enaml/default.nix index 8257af2e45f..cc162317734 100644 --- a/pkgs/development/python-modules/enaml/default.nix +++ b/pkgs/development/python-modules/enaml/default.nix @@ -12,13 +12,13 @@ buildPythonPackage rec { pname = "enaml"; - version = "0.13.0"; + version = "0.14.0"; src = fetchFromGitHub { owner = "nucleic"; repo = pname; rev = version; - sha256 = "sha256-8ZahvFDYW7xUTSTZP1UXnQBCg9RVUywoO7EbqtTQPJI="; + sha256 = "sha256-u+T3jD/rulfWunWkCa02XKXYvDaB9oAnohgqrJXgtJw="; }; # qt bindings cannot be found during tests diff --git a/pkgs/development/python-modules/eventlet/default.nix b/pkgs/development/python-modules/eventlet/default.nix index 038b66a8efe..7c8f520647e 100644 --- a/pkgs/development/python-modules/eventlet/default.nix +++ b/pkgs/development/python-modules/eventlet/default.nix @@ -1,7 +1,7 @@ { lib , stdenv , buildPythonPackage -, fetchPypi +, fetchFromGitHub , pythonOlder , dnspython , greenlet @@ -10,22 +10,35 @@ , nose , pyopenssl , iana-etc +, pytestCheckHook , libredirect }: buildPythonPackage rec { pname = "eventlet"; version = "0.33.0"; + format = "setuptools"; - src = fetchPypi { - inherit pname version; - sha256 = "80144f489c1bb273a51b6f96ff9785a382d2866b9bab1f5bd748385019f4141f"; + src = fetchFromGitHub { + owner = "eventlet"; + repo = pname; + rev = "v${version}"; + hash = "sha256-kE/eYBbaTt1mPGoUIMhonvFBlQOdAfPU5GvCvPaRHvs="; }; - propagatedBuildInputs = [ dnspython greenlet pyopenssl six ] - ++ lib.optional (pythonOlder "3.5") monotonic; + propagatedBuildInputs = [ + dnspython + greenlet + pyopenssl + six + ] ++ lib.optional (pythonOlder "3.5") [ + monotonic + ]; - checkInputs = [ nose ]; + checkInputs = [ + pytestCheckHook + nose + ]; doCheck = !stdenv.isDarwin; @@ -37,23 +50,48 @@ buildPythonPackage rec { export EVENTLET_IMPORT_VERSION_ONLY=0 ''; - checkPhase = '' - runHook preCheck + disabledTests = [ + # Tests requires network access + "test_017_ssl_zeroreturnerror" + "test_getaddrinfo" + "test_hosts_no_network" + "test_leakage_from_tracebacks" + "test_patcher_existing_locks_locked" + ]; - # test_fork-after_monkey_patch fails on aarch64 on hydra only - # AssertionError: Expected single line "pass" in stdout - nosetests --exclude test_getaddrinfo --exclude test_hosts_no_network --exclude test_fork_after_monkey_patch - - runHook postCheck - ''; + disabledTestPaths = [ + # Tests are out-dated + "tests/stdlib/test_asynchat.py" + "tests/stdlib/test_asyncore.py" + "tests/stdlib/test_ftplib.py" + "tests/stdlib/test_httplib.py" + "tests/stdlib/test_httpservers.py" + "tests/stdlib/test_os.py" + "tests/stdlib/test_queue.py" + "tests/stdlib/test_select.py" + "tests/stdlib/test_SimpleHTTPServer.py" + "tests/stdlib/test_socket_ssl.py" + "tests/stdlib/test_socket.py" + "tests/stdlib/test_socketserver.py" + "tests/stdlib/test_ssl.py" + "tests/stdlib/test_subprocess.py" + "tests/stdlib/test_thread__boundedsem.py" + "tests/stdlib/test_thread.py" + "tests/stdlib/test_threading_local.py" + "tests/stdlib/test_threading.py" + "tests/stdlib/test_timeout.py" + "tests/stdlib/test_urllib.py" + "tests/stdlib/test_urllib2_localnet.py" + "tests/stdlib/test_urllib2.py" + ]; # unfortunately, it needs /etc/protocol to be present to not fail # pythonImportsCheck = [ "eventlet" ]; meta = with lib; { - homepage = "https://github.com/eventlet/eventlet/"; description = "A concurrent networking library for Python"; - maintainers = with maintainers; [ SuperSandro2000 ]; + homepage = "https://github.com/eventlet/eventlet/"; license = licenses.mit; + maintainers = with maintainers; [ SuperSandro2000 ]; }; } diff --git a/pkgs/development/python-modules/faraday-plugins/default.nix b/pkgs/development/python-modules/faraday-plugins/default.nix index ebef907f91f..ca0969b9517 100644 --- a/pkgs/development/python-modules/faraday-plugins/default.nix +++ b/pkgs/development/python-modules/faraday-plugins/default.nix @@ -16,14 +16,14 @@ buildPythonPackage rec { pname = "faraday-plugins"; - version = "1.5.9"; + version = "1.5.10"; format = "setuptools"; src = fetchFromGitHub { owner = "infobyte"; repo = "faraday_plugins"; rev = "v${version}"; - sha256 = "sha256-rU7BF1lXLgJYLed5FVKXroivxKpmmNE5woGCpAcKAwg="; + sha256 = "sha256-Xj1Ibl+xDN3uCww54StUBCc+w/iPMdbWucRqdb+GHVI="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/glom/default.nix b/pkgs/development/python-modules/glom/default.nix index d30a0c7eb1c..ccef9ece378 100644 --- a/pkgs/development/python-modules/glom/default.nix +++ b/pkgs/development/python-modules/glom/default.nix @@ -4,24 +4,47 @@ , boltons , attrs , face -, pytest +, pytestCheckHook , pyyaml +, pythonOlder }: buildPythonPackage rec { pname = "glom"; version = "20.11.0"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "54051072bccc9cdb3ebbd8af0559195137a61d308f04bff19678e4b61350eb12"; + hash = "sha256-VAUQcrzMnNs+u9ivBVkZUTemHTCPBL/xlnjkthNQ6xI="; }; - propagatedBuildInputs = [ boltons attrs face ]; + propagatedBuildInputs = [ + boltons + attrs + face + ]; + + checkInputs = [ + pytestCheckHook + pyyaml + ]; + + preCheck = '' + # test_cli.py checks the output of running "glom" + export PATH=$out/bin:$PATH + ''; + + disabledTests = [ + # Test is outdated (was made for PyYAML 3.x) + "test_main_yaml_target" + ]; - checkInputs = [ pytest pyyaml ]; - # test_cli.py checks the output of running "glom" - checkPhase = "PATH=$out/bin:$PATH pytest glom/test"; + pythonImportsCheck = [ + "glom" + ]; meta = with lib; { homepage = "https://github.com/mahmoud/glom"; diff --git a/pkgs/development/python-modules/hahomematic/default.nix b/pkgs/development/python-modules/hahomematic/default.nix index 058a8f4d987..c20ff49b5cb 100644 --- a/pkgs/development/python-modules/hahomematic/default.nix +++ b/pkgs/development/python-modules/hahomematic/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "hahomematic"; - version = "0.19.0"; + version = "0.21.2"; format = "setuptools"; disabled = pythonOlder "3.9"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "danielperna84"; repo = pname; rev = version; - sha256 = "sha256-i3pNbIYISvZ681KLnxP9ZpITnkX7p0rBWjs1KidlFrM="; + sha256 = "sha256-oD4HXdzlQJZ/+ceF9zfmGs6S8DEVoxzLv5h/IURJnOY="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/humanfriendly/default.nix b/pkgs/development/python-modules/humanfriendly/default.nix index b88fc963379..77f0c75e010 100644 --- a/pkgs/development/python-modules/humanfriendly/default.nix +++ b/pkgs/development/python-modules/humanfriendly/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "humanfriendly"; - version = "9.2"; + version = "10.0"; src = fetchPypi { inherit pname version; - sha256 = "f7dba53ac7935fd0b4a2fc9a29e316ddd9ea135fb3052d3d0279d10c18ff9c48"; + sha256 = "6b0b831ce8f15f7300721aa49829fc4e83921a9a301cc7f606be6686a2288ddc"; }; propagatedBuildInputs = lib.optional (pythonOlder "3.3") monotonic; diff --git a/pkgs/development/python-modules/igraph/default.nix b/pkgs/development/python-modules/igraph/default.nix index f5b21d58866..f7409dc0823 100644 --- a/pkgs/development/python-modules/igraph/default.nix +++ b/pkgs/development/python-modules/igraph/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "igraph"; - version = "0.9.8"; + version = "0.9.9"; disabled = pythonOlder "3.6"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "igraph"; repo = "python-igraph"; rev = version; - sha256 = "sha256-RtvT5/LZ/xP68yBB7DDKJGeNCiX4HyPTCuk+Ijd2nFs="; + hash = "sha256-jHK8whCg+WitRSL5LmkqfdqiAdi9vZPicygzKThnW2U="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/kombu/default.nix b/pkgs/development/python-modules/kombu/default.nix index 319461b9834..bb39b29c0d5 100644 --- a/pkgs/development/python-modules/kombu/default.nix +++ b/pkgs/development/python-modules/kombu/default.nix @@ -1,27 +1,28 @@ { lib -, buildPythonPackage -, pythonOlder -, fetchPypi , amqp -, vine -, cached-property -, importlib-metadata , azure-servicebus +, buildPythonPackage +, cached-property , case +, fetchPypi +, importlib-metadata , Pyro4 , pytestCheckHook +, pythonOlder , pytz +, vine }: buildPythonPackage rec { pname = "kombu"; - version = "5.2.2"; + version = "5.2.3"; + format = "setuptools"; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "0f5d0763fb916808f617b886697b2be28e6bc35026f08e679697fc814b48a608"; + hash = "sha256-gakMHel+CNPbN9vxY+qvZnRF4QaMmL/YnwUaQOn2270="; }; propagatedBuildInputs = [ @@ -40,9 +41,14 @@ buildPythonPackage rec { pytz ]; + pythonImportsCheck = [ + "kombu" + ]; + meta = with lib; { description = "Messaging library for Python"; - homepage = "https://github.com/celery/kombu"; - license = licenses.bsd3; + homepage = "https://github.com/celery/kombu"; + license = licenses.bsd3; + maintainers = with maintainers; [ fab ]; }; } diff --git a/pkgs/development/python-modules/marshmallow-dataclass/default.nix b/pkgs/development/python-modules/marshmallow-dataclass/default.nix index 145005fd5e3..4b36ee9b74e 100644 --- a/pkgs/development/python-modules/marshmallow-dataclass/default.nix +++ b/pkgs/development/python-modules/marshmallow-dataclass/default.nix @@ -4,6 +4,7 @@ , marshmallow , marshmallow-enum , pytestCheckHook +, pythonAtLeast , pythonOlder , typeguard , typing-inspect @@ -34,7 +35,20 @@ buildPythonPackage rec { typeguard ]; - pythonImportsCheck = [ "marshmallow_dataclass" ]; + pytestFlagsArray = [ + # DeprecationWarning: The distutils package is deprecated and slated for removal in Python 3.12. + "-W" + "ignore::DeprecationWarning" + ]; + + disabledTests = lib.optionals (pythonAtLeast "3.10") [ + # TypeError: UserId is not a dataclass and cannot be turned into one. + "test_newtype" + ]; + + pythonImportsCheck = [ + "marshmallow_dataclass" + ]; meta = with lib; { description = "Automatic generation of marshmallow schemas from dataclasses"; diff --git a/pkgs/development/python-modules/meshtastic/default.nix b/pkgs/development/python-modules/meshtastic/default.nix index 983b214bd79..93b82f195ce 100644 --- a/pkgs/development/python-modules/meshtastic/default.nix +++ b/pkgs/development/python-modules/meshtastic/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "meshtastic"; - version = "1.2.53"; + version = "1.2.54"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "meshtastic"; repo = "Meshtastic-python"; rev = version; - sha256 = "sha256-UJ0bq/xBE+qyd//tk/xlI3wtUcE0+PLCIVGmjFMZ+VQ="; + sha256 = "sha256-YTE0lcsPBvcTdeYRrADQjs5b8inO7+nSw2YW2xalo74="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/minexr/default.nix b/pkgs/development/python-modules/minexr/default.nix new file mode 100644 index 00000000000..0417fe7594f --- /dev/null +++ b/pkgs/development/python-modules/minexr/default.nix @@ -0,0 +1,31 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pytestCheckHook +, numpy +, pillow +}: + +buildPythonPackage rec { + pname = "minexr"; + version = "1.0.1"; + + src = fetchFromGitHub { + owner = "cheind"; + repo = "py-minexr"; + rev = "v${version}"; + sha256 = "sha256-Om67ttAHxu7C3IwPB+JHYi78E9qBi1E6layMVg4+S3M="; + }; + + propagatedBuildInputs = [ numpy ]; + + pythonImportsCheck = [ "minexr" ]; + checkInputs = [ pytestCheckHook pillow ]; + + meta = with lib; { + description = "Minimal, standalone OpenEXR reader for single-part, uncompressed scan line files."; + homepage = "https://github.com/cheind/py-minexr"; + license = licenses.mit; + maintainers = with maintainers; [ lucasew ]; + }; +} diff --git a/pkgs/development/python-modules/msal-extensions/default.nix b/pkgs/development/python-modules/msal-extensions/default.nix index a673d96893f..f81395f0245 100644 --- a/pkgs/development/python-modules/msal-extensions/default.nix +++ b/pkgs/development/python-modules/msal-extensions/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "msal-extensions"; - version = "0.3.0"; + version = "0.3.1"; src = fetchPypi { inherit pname version; - sha256 = "0qbq5qn46053aclpwyzac5zs2xgqirn4hwrf1plrg0m8bnhxy8sm"; + sha256 = "d9029af70f2cbdc5ad7ecfed61cb432ebe900484843ccf72825445dbfe62d311"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pijuice/default.nix b/pkgs/development/python-modules/pijuice/default.nix new file mode 100644 index 00000000000..f46ddfca1be --- /dev/null +++ b/pkgs/development/python-modules/pijuice/default.nix @@ -0,0 +1,61 @@ +{ lib +, fetchFromGitHub +, buildPythonPackage +, pythonOlder +, smbus-cffi +, urwid +}: + +buildPythonPackage rec { + pname = "pijuice"; + version = "1.7"; + disabled = pythonOlder "3.6"; + + src = fetchFromGitHub { + owner = "PiSupply"; + repo = "PiJuice"; + # rev hash retrieved from the latest modification on file Software/Source/VERSION, as this project + # does not use Github tags facility + rev = "3ba6719ab614a3dc7495d5d9c900dd4ea977c7e3"; + sha256 = "GoNN07YgVaktpeY5iYDbfpy5fxkU1x0V3Sb1hgGAQt4="; + }; + + patches = [ + # The pijuice_cli.cli file doesn't have a shebang as the first line of the + # script. Without it, the pythonWrapPrograms hook will not wrap the program. + # Add a python shebang here so that the the hook is triggered. + ./patch-shebang.diff + ]; + + PIJUICE_BUILD_BASE = 1; + + preBuild = '' + cd Software/Source + ''; + + propagatedBuildInputs = [ smbus-cffi urwid ]; + + # Remove the following files from the package: + # + # pijuice_cli - A precompiled ELF binary that is a setuid wrapper for calling + # pijuice_cli.py + # + # pijuiceboot - a precompiled ELF binary for flashing firmware. Not needed for + # the python library. + # + # pijuice_sys.py - A program that acts as a system daemon for monitoring the + # pijuice. + preFixup = '' + rm $out/bin/pijuice_cli + rm $out/bin/pijuice_sys.py + rm $out/bin/pijuiceboot + mv $out/bin/pijuice_cli.py $out/bin/pijuice_cli + ''; + + meta = with lib; { + description = "Library and resources for PiJuice HAT for Raspberry Pi"; + homepage = "https://github.com/PiSupply/PiJuice"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ hexagonal-sun ]; + }; +} diff --git a/pkgs/development/python-modules/pijuice/patch-shebang.diff b/pkgs/development/python-modules/pijuice/patch-shebang.diff new file mode 100644 index 00000000000..eb899c9a5bd --- /dev/null +++ b/pkgs/development/python-modules/pijuice/patch-shebang.diff @@ -0,0 +1,9 @@ +diff --git a/Software/Source/src/pijuice_cli.py b/Software/Source/src/pijuice_cli.py +index c366fee..37af383 100644 +--- a/Software/Source/src/pijuice_cli.py ++++ b/Software/Source/src/pijuice_cli.py +@@ -1,3 +1,4 @@ ++#!/usr/bin/python3 + # This python script to be executed as user pijuice by the setuid program pijuice_cli + # Python 3 only + # diff --git a/pkgs/development/python-modules/pygal/default.nix b/pkgs/development/python-modules/pygal/default.nix index eb6734649b5..ae7277202bb 100644 --- a/pkgs/development/python-modules/pygal/default.nix +++ b/pkgs/development/python-modules/pygal/default.nix @@ -15,22 +15,14 @@ buildPythonPackage rec { pname = "pygal"; - version = "2.4.0"; + version = "3.0.0"; doCheck = !isPyPy; # one check fails with pypy src = fetchPypi { inherit pname version; - sha256 = "9204f05380b02a8a32f9bf99d310b51aa2a932cba5b369f7a4dc3705f0a4ce83"; + sha256 = "sha256-KSP5XS5RWTCqWplyGdzO+/PZK36vX8HJ/ruVsJk1/bI="; }; - patches = [ - # Fixes compatibility with latest pytest. October 12, 2020. - # Should be included in the next release after 2.4.0 - (fetchpatch { - url = "https://github.com/Kozea/pygal/commit/19e5399be18a054b3b293f4a8a2777d2df4f9c18.patch"; - sha256 = "1j0hpcvd2mhi449wmlr0ml9gw4cakqk3av1j79bi2qy86dyrss2l"; - }) - ]; buildInputs = [ flask diff --git a/pkgs/development/python-modules/pyquaternion/default.nix b/pkgs/development/python-modules/pyquaternion/default.nix new file mode 100644 index 00000000000..48c8d991175 --- /dev/null +++ b/pkgs/development/python-modules/pyquaternion/default.nix @@ -0,0 +1,34 @@ +{ lib +, buildPythonPackage +, fetchPypi +, numpy +, nose +}: + +buildPythonPackage rec { + pname = "pyquaternion"; + version = "0.9.9"; + + src = fetchPypi { + inherit pname version; + sha256 = "sha256-sfYa8hnLL+lmtft5oZISTy5jo/end6w8rfKVexqBvqg="; + }; + + # The VERSION.txt file is required for setup.py + # See: https://github.com/KieranWynn/pyquaternion/blob/master/setup.py#L14-L15 + postPatch = '' + echo "${version}" > VERSION.txt + ''; + + propagatedBuildInputs = [ numpy ]; + + checkInputs = [ nose ]; + pythonImportsCheck = [ "pyquaternion" ]; + + meta = with lib; { + description = "Library for representing and using quaternions."; + homepage = "http://kieranwynn.github.io/pyquaternion/"; + license = licenses.mit; + maintainers = with maintainers; [ lucasew ]; + }; +} diff --git a/pkgs/development/python-modules/restview/default.nix b/pkgs/development/python-modules/restview/default.nix index b25b28eca94..9a4a0f13369 100644 --- a/pkgs/development/python-modules/restview/default.nix +++ b/pkgs/development/python-modules/restview/default.nix @@ -5,18 +5,20 @@ , readme_renderer , packaging , pygments -, mock , pytestCheckHook +, pythonOlder }: buildPythonPackage rec { pname = "restview"; - version = "2.9.3"; + version = "3.0.0"; format = "setuptools"; + disabled = pythonOlder "3.6"; + src = fetchPypi { inherit pname version; - sha256 = "sha256-WVGqIYLnqao6uQbb0PDTPfj+k+ZjGKholknBIorXTNg="; + sha256 = "sha256-K5iWEKrtL9Qtpk9s3FOc8+5wzjcLy6hy23JCGtUV3R4="; }; propagatedBuildInputs = [ @@ -27,7 +29,6 @@ buildPythonPackage rec { ]; checkInputs = [ - mock pytestCheckHook ]; diff --git a/pkgs/development/python-modules/time-machine/default.nix b/pkgs/development/python-modules/time-machine/default.nix index 240a8ac0c37..8ac7f66565b 100644 --- a/pkgs/development/python-modules/time-machine/default.nix +++ b/pkgs/development/python-modules/time-machine/default.nix @@ -10,16 +10,16 @@ buildPythonPackage rec { pname = "time-machine"; - version = "2.5.0"; + version = "2.6.0"; format = "setuptools"; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "adamchainz"; repo = pname; rev = version; - sha256 = "sha256-U/OgkwRgZMdEkMIQuN9bWXWeeMHiduy1C1xOBUl8NsQ="; + sha256 = "sha256-D3cbArF09b5+LkkdosNbYMfndnzCPWwNqzIww23pOtk="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/uamqp/default.nix b/pkgs/development/python-modules/uamqp/default.nix index 15f098d90e4..f3c8792e569 100644 --- a/pkgs/development/python-modules/uamqp/default.nix +++ b/pkgs/development/python-modules/uamqp/default.nix @@ -16,11 +16,11 @@ buildPythonPackage rec { pname = "uamqp"; - version = "1.4.3"; + version = "1.5.1"; src = fetchPypi { inherit pname version; - sha256 = "sha256-L4IQWnxRRL3yopNT91Mk8KKdph9Vg2PHkGH+86uDu7c="; + sha256 = "sha256-VevtbXtOTKQEqVYpNKFrDhvyDBJY+uQMhld6in+EroE="; }; nativeBuildInputs = [ @@ -41,15 +41,6 @@ buildPythonPackage rec { enum34 ]; - patches = [ - (fetchpatch { - url = "https://github.com/Azure/azure-c-shared-utility/commit/52ab2095649b5951e6af77f68954209473296983.patch"; - sha256 = "06pxhdpkv94pv3lhj1vy0wlsqsdznz485bvg3zafj67r55g40lhd"; - stripLen = "2"; - extraPrefix = "src/vendor/azure-uamqp-c/deps/azure-c-shared-utility/"; - }) - ]; - dontUseCmakeConfigure = true; # Project has no tests diff --git a/pkgs/development/python-modules/vine/default.nix b/pkgs/development/python-modules/vine/default.nix index 8fc895cfa44..3f272a84b89 100644 --- a/pkgs/development/python-modules/vine/default.nix +++ b/pkgs/development/python-modules/vine/default.nix @@ -1,22 +1,36 @@ -{ lib, buildPythonPackage, fetchPypi -, case, pytest, pythonOlder }: +{ lib +, buildPythonPackage +, case +, fetchPypi +, pytestCheckHook +, pythonOlder +}: buildPythonPackage rec { pname = "vine"; version = "5.0.0"; + format = "setuptools"; - disable = pythonOlder "2.7"; + disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "7d3b1624a953da82ef63462013bbd271d3eb75751489f9807598e8f340bd637e"; + hash = "sha256-fTsWJKlT2oLvY0YgE7vScdPrdXUUifmAdZjo80C9Y34="; }; - buildInputs = [ case pytest ]; + checkInputs = [ + case + pytestCheckHook + ]; + + pythonImportsCheck = [ + "vine" + ]; meta = with lib; { description = "Python promises"; homepage = "https://github.com/celery/vine"; license = licenses.bsd3; + maintainers = with maintainers; [ fab ]; }; } diff --git a/pkgs/development/python-modules/wandb/default.nix b/pkgs/development/python-modules/wandb/default.nix index 528e39878be..f4d14ed2e89 100644 --- a/pkgs/development/python-modules/wandb/default.nix +++ b/pkgs/development/python-modules/wandb/default.nix @@ -35,13 +35,13 @@ buildPythonPackage rec { pname = "wandb"; - version = "0.12.7"; + version = "0.12.9"; src = fetchFromGitHub { owner = pname; repo = "client"; rev = "v${version}"; - sha256 = "sha256-YG0BSIENnmF9n+oNIBcbpTh7obYx+Lpuak8pJzvjuJ8="; + sha256 = "0704iv5dlsjs0gj6l4nx9hk9kzq46wlgd67ifw7i3qk6v4ljfs6y"; }; # The wandb requirements.txt does not distinguish python2/3 dependencies. We diff --git a/pkgs/development/python-modules/weasyprint/default.nix b/pkgs/development/python-modules/weasyprint/default.nix index e19ed16d48a..9ddb0631f5d 100644 --- a/pkgs/development/python-modules/weasyprint/default.nix +++ b/pkgs/development/python-modules/weasyprint/default.nix @@ -77,6 +77,9 @@ buildPythonPackage rec { disabledTests = [ # needs the Ahem font (fails on macOS) "test_font_stretch" + # sensitive to sandbox environments + "test_tab_size" + "test_tabulation_character" ]; FONTCONFIG_FILE = "${fontconfig.out}/etc/fonts/fonts.conf"; diff --git a/pkgs/development/python-modules/yacs/default.nix b/pkgs/development/python-modules/yacs/default.nix new file mode 100644 index 00000000000..7abf151a08f --- /dev/null +++ b/pkgs/development/python-modules/yacs/default.nix @@ -0,0 +1,32 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, python +, pyyaml +}: + +buildPythonPackage rec { + pname = "yacs"; + version = "0.1.8"; + + src = fetchFromGitHub { + owner = "rbgirshick"; + repo = "yacs"; + rev = "v${version}"; + sha256 = "sha256-nO8FL4tTkfTthXYXxXORLieFwvn780DDxfrxC9EUUJ0="; + }; + + propagatedBuildInputs = [ pyyaml ]; + + pythonImportsCheck = [ "yacs" ]; + checkPhase = '' + ${python.interpreter} yacs/tests.py + ''; + + meta = with lib; { + description = "Yet Another Configuration System"; + homepage = "https://github.com/rbgirshick/yacs"; + license = licenses.apsl20; + maintainers = with maintainers; [ lucasew ]; + }; +} diff --git a/pkgs/development/python-modules/zcs/default.nix b/pkgs/development/python-modules/zcs/default.nix new file mode 100644 index 00000000000..9f22cd1dfc8 --- /dev/null +++ b/pkgs/development/python-modules/zcs/default.nix @@ -0,0 +1,33 @@ +{ lib +, buildPythonPackage +, fetchPypi +, python +, yacs +, boxx +}: + +buildPythonPackage rec { + pname = "zcs"; + version = "0.1.17"; + + src = fetchPypi { + inherit pname version; + sha256 = "sha256-ZoQgAaJy3kKHLljyKA0Oo/D1kefE8X9FlsGDSNt1nPw="; + }; + + propagatedBuildInputs = [ yacs ]; + + pythonImportsCheck = [ "zcs" ]; + + checkInputs = [ boxx ]; + checkPhase = '' + ${python.interpreter} test/test_zcs.py + ''; + + meta = with lib; { + description = "A flexible powerful configuration system which takes advantage of both argparse and yacs"; + homepage = "https://github.com/DIYer22/zcs"; + license = licenses.mit; + maintainers = with maintainers; [ lucasew ]; + }; +} diff --git a/pkgs/development/tools/build-managers/bloop/default.nix b/pkgs/development/tools/build-managers/bloop/default.nix index ebb4bb5f36c..10d3dca8412 100644 --- a/pkgs/development/tools/build-managers/bloop/default.nix +++ b/pkgs/development/tools/build-managers/bloop/default.nix @@ -11,11 +11,11 @@ stdenv.mkDerivation rec { pname = "bloop"; - version = "1.4.11"; + version = "1.4.12"; bloop-coursier-channel = fetchurl { url = "https://github.com/scalacenter/bloop/releases/download/v${version}/bloop-coursier.json"; - sha256 = "CoF/1nggjaL17SWmWDcKicfgoyqpOSZUse8f+3TgD0E="; + sha256 = "bf3uHuGfmJukf0Qeudv8ZXz/9Uql/qsmvPS0XBb7oTQ="; }; bloop-bash = fetchurl { @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { bloop-fish = fetchurl { url = "https://github.com/scalacenter/bloop/releases/download/v${version}/fish-completions"; - sha256 = "oBKlzHa1fbzhf60jfzuXvqaUb/xuoLYawigRQQOCSN0="; + sha256 = "eFESR6iPHRDViGv+Fk3sCvPgVAhk2L1gCG4LnfXO/v4="; }; bloop-zsh = fetchurl { @@ -60,8 +60,8 @@ stdenv.mkDerivation rec { outputHashMode = "recursive"; outputHashAlgo = "sha256"; - outputHash = if stdenv.isLinux && stdenv.isx86_64 then "0c02n779z4l7blzla5820bzfhblbp5nlizx9f8wns4miwnph357f" - else if stdenv.isDarwin && stdenv.isx86_64 then "1gy5k9ii86rxyv2v9if4n1clvmb1hi4ym32mp6miwgcjla10sv30" + outputHash = if stdenv.isLinux && stdenv.isx86_64 then "jqcecAM51qEDmTim2VBNm8IO8wQmwU19R57Zk4pxwSA=" + else if stdenv.isDarwin && stdenv.isx86_64 then "15m2rahf9kihw29hp6bwd9xqav6dcr17w5c2rsw0ijpchr2av72q" else throw "unsupported platform"; }; diff --git a/pkgs/development/tools/database/pgcli/default.nix b/pkgs/development/tools/database/pgcli/default.nix index 9fa8685734e..d4e2f4d049e 100644 --- a/pkgs/development/tools/database/pgcli/default.nix +++ b/pkgs/development/tools/database/pgcli/default.nix @@ -20,13 +20,13 @@ buildPythonApplication rec { pname = "pgcli"; - version = "3.2.0"; + version = "3.3.0"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "6cde97e71996bf910a40b579e5285483c10ea04962a08def01c12433d5f7c6b7"; + sha256 = "sha256-PQ7UDfaR1gJUzLTVZUpSwcY3P3fSs89qkK6m7pn+pDk="; }; propagatedBuildInputs = [ @@ -46,11 +46,7 @@ buildPythonApplication rec { checkInputs = [ pytestCheckHook mock ]; - disabledTests = [ - # tests that expect output from an older version of cli-helpers - "test_format_output" - "test_format_output_auto_expand" - ] ++ lib.optionals stdenv.isDarwin [ "test_application_name_db_uri" ]; + disabledTests = lib.optionals stdenv.isDarwin [ "test_application_name_db_uri" ]; meta = with lib; { description = "Command-line interface for PostgreSQL"; diff --git a/pkgs/development/tools/electron/default.nix b/pkgs/development/tools/electron/default.nix index eeca6ccfbb4..b7b8e3ed3b7 100644 --- a/pkgs/development/tools/electron/default.nix +++ b/pkgs/development/tools/electron/default.nix @@ -24,41 +24,6 @@ rec { electron = electron_16; - electron_3 = mkElectron "3.1.13" { - x86_64-linux = "1psmbplz6jhnnf6hmfhxbmmhn4n1dpnhzbc12pxn645xhfpk9ark"; - x86_64-darwin = "1vvjm4jifzjqvbs2kjlwg1h9p2czr2b5imjr9hld1j8nyfrzb0dx"; - i686-linux = "04i0rcp4ajp4nf4arcl5crcc7a85sf0ixqd8jx07k2b1irv4dc23"; - armv7l-linux = "1pzs2cj12xw18jwab0mb8xhndwd95lbsj5ml5xdw2mb0ip5jsvsa"; - aarch64-linux = "13pc7xn0dkb8i31vg9zplqcvb7r9r7q3inmr3419b5p9bl0687x8"; - }; - - electron_4 = mkElectron "4.2.12" { - x86_64-linux = "72c5319c92baa7101bea3254a036c0cd3bcf257f4a03a0bb153668b7292ee2dd"; - x86_64-darwin = "89b0e16bb9b7072ed7ed1906fccd08540acdd9f42dd8a29c97fa17d811b8c5e5"; - i686-linux = "bf96b1736141737bb064e48bdb543302fd259de634b1790b7cf930525f47859f"; - armv7l-linux = "2d970b3020627e5381fd4916dd8fa50ca9556202c118ab4cba09c293960689e9"; - aarch64-linux = "938b7cc5f917247a120920df30374f86414b0c06f9f3dc7ab02be1cadc944e55"; - headers = "0943wc2874s58pkpzm1l55ycgbhv60m62r8aix88gl45i6zngb2g"; - }; - - electron_5 = mkElectron "5.0.13" { - x86_64-linux = "8ded43241c4b7a6f04f2ff21c75ae10e4e6db1794e8b1b4f7656c0ed21667f8f"; - x86_64-darwin = "589834815fb9667b3c1c1aa6ccbd87d50e5660ecb430f6b475168b772b9857cd"; - i686-linux = "ccf4a5ed226928a30bd3ea830913d99853abb089bd4a6299ffa9fa0daa8d026a"; - armv7l-linux = "96ad83802bc61d87bb952027d49e5dd297f58e4493e66e393b26e51e09065add"; - aarch64-linux = "01f0fd313b060fb28a1022d68fb224d415fa22986e2a8f4aded6424b65e35add"; - headers = "0najajj1kjj0rbqzjvk9ipq0pgympwad77hs019cz2m8ssaxqfrv"; - }; - - electron_6 = mkElectron "6.1.12" { - x86_64-linux = "dc628216588a896e72991d46071d06ef11aed2cdeca18d11d472c29cfbf12349"; - x86_64-darwin = "6c7244319fdfb90899a48ffd0f426e36dba7c3fc5e29b28a4d29fdca7fb924d3"; - i686-linux = "4e61dc4aed1c1b933b233e02833948f3b17f81f3444f02e9108a78c0540159ab"; - armv7l-linux = "06071b4dc59a6773ff604550ed9e7a7ae8722b5343cbb5d4b94942fe537211dc"; - aarch64-linux = "4ae23b75be821044f7e5878fe8e56ab3109cbd403ecd88221effa6abf850260b"; - headers = "0im694h8wqp31yzncwfnhz5g1ijrmqnypcakl0h7xcn7v25yp7s3"; - }; - electron_7 = mkElectron "7.3.3" { x86_64-linux = "a947228a859149bec5bd937f9f3c03eb0aa4d78cfe4dfa9aead60d3646a357f9"; x86_64-darwin = "e081436abef52212065f560ea6add1c0cd13d287a1b3cc76b28d2762f7651a4e"; @@ -115,43 +80,43 @@ rec { headers = "1idam1xirxqxqg4g7n33kdx2skk0r351m00g59a8yx9z82g06ah9"; }; - electron_13 = mkElectron "13.6.6" { - armv7l-linux = "4d8a8bde1c993bfc20afb2b23e55101ad2048f5ddd89ab86043f510470aeba8d"; - aarch64-linux = "6d1480f80d43cdebd9f74cb62b64c9d16bee29b68b863faf7c50fcb91f63985c"; - x86_64-linux = "62b9ba2fea4f0f54fd54bce8a532d14132302a66ec99173764f44234fa76925e"; - i686-linux = "b83860318b2e591b150dc9578ea749f66ab9a18aafbe69dadb622b9ca131e695"; - x86_64-darwin = "a59b7270f86286e4ee217552b8729621f4b282360ad15391886d5686008b6933"; - aarch64-darwin = "1f445d2f02d1054a760bdaafb755677a35c495e64385e2d2a5547b6750a82dfa"; - headers = "0qdlw17jxhhcamr8g2ybbs2jkijzdq82qgc3knr4kdxb425q898r"; + electron_13 = mkElectron "13.6.7" { + armv7l-linux = "13acf496801d2a311f9c0644d086df26976259e915cb2201fd29665d8122a98b"; + aarch64-linux = "8d751e9e998f5eece15dba8cae1a7aa4b780da1b802235bafcd86a3540f4efe2"; + x86_64-linux = "af93b62e197a40c648c964d44939d24fc56ff4fa8ccac22cfb020660c726f4e7"; + i686-linux = "68085a6849aa571fea7682b66207abd2b6adb0a515195a00862776f37f2ff3f0"; + x86_64-darwin = "70d51ac6adc50df3195af022e700d3d10056c9e1fb770c79540215cdee9d67b3"; + aarch64-darwin = "4d9facf75a94f6d053c02db97ca4012833274b3d3f9ab0438733a302d4a28f60"; + headers = "1ydyl2s58vf65ywih2n3iam8l6yggmsn6hv0jhwp1rsash8hl4x4"; }; - electron_14 = mkElectron "14.2.3" { - armv7l-linux = "d4ed85690c49b6ec1b532256bd63ccfb670d14da9bb5ccf706e03da2f5fe377e"; - aarch64-linux = "ac8be1a06ad4b3da16438cc9c257b3c443417d5d9272830b0d51c1f2c9b14f52"; - x86_64-linux = "c72ce5943e9e5e9b10b0822b3e60de74612db81c4ebaf475e5fa8735af344b22"; - i686-linux = "9dec585682c0a08f048f1eda6a931cad3c85d47842786aae565af930a7ef7b51"; - x86_64-darwin = "fb90d61855b63ac1115a60683d476931a6b6bf194e77867192d927bbb9051070"; - aarch64-darwin = "035e6e2e8d50e867eee37b0631fc95b3f0e8760294af71c23bc73c0f3fc99f83"; - headers = "0m03nb1nlwd03wn765rs06yiqzkxlk9jafab0zaxywsq94z5np0y"; + electron_14 = mkElectron "14.2.4" { + armv7l-linux = "d644d2df745a9809794929762db1faa56b77f519ccc0d430dd2238235739ace3"; + aarch64-linux = "1f198a61a5f67954f568e49879e390c94ef9cb05545664e24bac513e05dea0d9"; + x86_64-linux = "faf6c0501811e3dec056f536e53f0ec087345b852e7de47ae86ea175cc070a2f"; + i686-linux = "1f9baa2f3aa1cd935cc29f67aa273c8b1b65da144af3894bd855ce02a6730fc1"; + x86_64-darwin = "4a3c146da911162c7081e280f2c311c41f132e1d3274bc3676ed71cc9392dc5d"; + aarch64-darwin = "279cc3c04c7db9f3361b09f442750f4d18c8b2c7f633bca17aa9fb3656bfb74c"; + headers = "1zkf1j82psbj9mw8zb9ghl9y6bkw77cxqzkp3q1bbn6wvj41lvyh"; }; - electron_15 = mkElectron "15.3.4" { - armv7l-linux = "caff953cbffdac63307b75a3b78be82ea6003782e981edfdcba14da5ee48b8b6"; - aarch64-linux = "dba1e09b3e4924148b57539d86840fa22e5500f3e15a694dcd2e26b830c1f780"; - x86_64-linux = "5e13b64c3b1b025ddea92b3bda577e00fc533902a9cf92bfd87b976637f7b59a"; - i686-linux = "1253e837e98fc41c14f6b71f0f917b8f42a0777bd2554046567b512f747240d8"; - x86_64-darwin = "ea1cb757f9c8c4c99c840357ecab42a0bcbe8c7a6a3a1265106c238088ad18f1"; - aarch64-darwin = "65b9b3235efdb681e3a4db85068dc9fe6dfbcb7fbb146053c0a534e4b44a2f7a"; - headers = "1xnbzskvf8p5a07bha41qqnw1hb68f019qrda3z2jn96m3qnj46r"; + electron_15 = mkElectron "15.3.5" { + armv7l-linux = "c5540cd94711a31fe0098da982d4a25ed1b606e0d4213c9f7863826b2c8e7eaf"; + aarch64-linux = "6550387135605b64b8549b1034eae672a8f94419032dacbaff7b92934cc0508d"; + x86_64-linux = "3b61eaa48f3c5f1983a24152e6b12f39c3a29abb52d17c13891c16a25e3c209a"; + i686-linux = "30d6de074bebe985bb07f20788a8378c7fa1ded564e3c1e8183b0113ba76b282"; + x86_64-darwin = "fe2c138bb11b3db07d02c1cbf7838765036ac2552582f9ce2265ffe6609ea2e1"; + aarch64-darwin = "7c887b8ae24ad7ca9585a001f29108919bc39d27c3818012aeefb8072e23178d"; + headers = "0fkvwlnxjy8dwfnxhgk6i4qayhmg7dbqmd9nfi94a7kdbwp714r5"; }; - electron_16 = mkElectron "16.0.6" { - armv7l-linux = "f15d665cbf487538f5448a318519e16e3c07a5f7b55895541df1c067c9cfcb55"; - aarch64-linux = "92037b0886a9404c7f9027e7597df552b2c0011ded100537f4287e4e925db6dc"; - x86_64-linux = "0017aba47756b962b9571ccd9dcf6297af0f603b879e26f49bab8728bb64567d"; - i686-linux = "11ae3628d27d12612a8742b72b0dc4521c9b2cd303619046c6f6a36282f43c72"; - x86_64-darwin = "250489ca6b1bec91f4d59766c1d4f65407f016765395517a6dfd5625e93d646f"; - aarch64-darwin = "a4416627a3055308259689fd156a7d4fd704983420a20e8939409b08195af204"; - headers = "00iq8v3nm42f9fphwd50vdng51bd291rk33zcavpidiw29hrqi9m"; + electron_16 = mkElectron "16.0.7" { + armv7l-linux = "8a8567c745ab1c2b1de19305da0a0036ba100b27e1fc4eb014aca325aff3193e"; + aarch64-linux = "6d27cc9acc3f580118cdd685d629d39c2a1fc094376b719fa0100a7446f8fede"; + x86_64-linux = "544cd6d48262f24c8a82d2e8079b20889ec5e83959404fdda9ad00c86e9efa70"; + i686-linux = "8b79ce5fbc704eb03c34d4b96765314074a687ae3165cab21f84f77fee36d755"; + x86_64-darwin = "e5c825d4cfc1dabd066986fa1cae3ee880f222b053c760b700b24899fb02d4db"; + aarch64-darwin = "9fa9dc44e5d71de7a999b3db07a583e0a04252747486c16955232eba498b259d"; + headers = "0r4gd2v9rzrg1msxw62rq1s93ifrjj4yb4gfcma5mbj88m3v5p63"; }; } diff --git a/pkgs/development/tools/fnm/default.nix b/pkgs/development/tools/fnm/default.nix index efbdce1e592..68725a16c09 100644 --- a/pkgs/development/tools/fnm/default.nix +++ b/pkgs/development/tools/fnm/default.nix @@ -10,20 +10,20 @@ rustPlatform.buildRustPackage rec { pname = "fnm"; - version = "1.28.2"; + version = "1.29.2"; src = fetchFromGitHub { owner = "Schniz"; repo = pname; rev = "v${version}"; - sha256 = "sha256-8/J7LfSk2a0Bq9v6CH63BIyUkT56EY+4UcEUdwkbZ4U="; + sha256 = "sha256-9U0AOFlD7SROTditW/lv12BtvfstCkU5QOMA/19KG+k="; }; nativeBuildInputs = [ installShellFiles ]; buildInputs = lib.optionals stdenv.isDarwin [ DiskArbitration Foundation Security ]; - cargoSha256 = "sha256-k3WZpN6DSbFFKLilFEN2lDMbJH5q1KgfE12OoGv+eGk="; + cargoSha256 = "sha256-l5H8O0OLnnv3kku/e6yK0Ps1VcIY5YoR5yFTk5w3h4k="; doCheck = false; diff --git a/pkgs/development/tools/metals/default.nix b/pkgs/development/tools/metals/default.nix index a5b8540db45..c7043803905 100644 --- a/pkgs/development/tools/metals/default.nix +++ b/pkgs/development/tools/metals/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "metals"; - version = "0.10.9"; + version = "0.11.0"; deps = stdenv.mkDerivation { name = "${pname}-deps-${version}"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { ''; outputHashMode = "recursive"; outputHashAlgo = "sha256"; - outputHash = "sha256-Z0wngo7FP5sHpmPkTwitqTvNL0IEqqWwccy3mZpTIKU="; + outputHash = "sha256-sxm4xh4INXz1wtgVkuJ9sJG2k+9OC4ck6wFJjhD37XY=="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/development/tools/open-policy-agent/default.nix b/pkgs/development/tools/open-policy-agent/default.nix index ec394630fdb..93493452d23 100644 --- a/pkgs/development/tools/open-policy-agent/default.nix +++ b/pkgs/development/tools/open-policy-agent/default.nix @@ -8,13 +8,13 @@ buildGoModule rec { pname = "open-policy-agent"; - version = "0.35.0"; + version = "0.36.1"; src = fetchFromGitHub { owner = "open-policy-agent"; repo = "opa"; rev = "v${version}"; - sha256 = "sha256-IiYEDvTHb25xolE/IfpFgcJArxU6c89P5oNgt1T2VXA="; + sha256 = "sha256-Eoc+1Jwv0xUAQNtyHWCKezcpV6zWMFgNYtmkqAoedV0="; }; vendorSha256 = null; diff --git a/pkgs/development/tools/scalafmt/default.nix b/pkgs/development/tools/scalafmt/default.nix index 3b3e5be296f..c1b47d90198 100644 --- a/pkgs/development/tools/scalafmt/default.nix +++ b/pkgs/development/tools/scalafmt/default.nix @@ -2,7 +2,7 @@ let baseName = "scalafmt"; - version = "3.3.0"; + version = "3.3.1"; deps = stdenv.mkDerivation { name = "${baseName}-deps-${version}"; buildCommand = '' @@ -13,7 +13,7 @@ let ''; outputHashMode = "recursive"; outputHashAlgo = "sha256"; - outputHash = "PlLQVNn2HomcR9grqGFgaXYWxg9EU7ihd28wXruZiBs="; + outputHash = "hEfy8hNuWin7mKXs9yD9bEKHCVNuxrz5qasTeLOi1zY="; }; in stdenv.mkDerivation { diff --git a/pkgs/misc/vscode-extensions/default.nix b/pkgs/misc/vscode-extensions/default.nix index 0f0327db7c1..954af1706fe 100644 --- a/pkgs/misc/vscode-extensions/default.nix +++ b/pkgs/misc/vscode-extensions/default.nix @@ -1472,8 +1472,8 @@ let mktplcRef = { name = "metals"; publisher = "scalameta"; - version = "1.10.15"; - sha256 = "1yzvwdxipilxpg50sh1glm6p2mmn75pzq8kadk7cyl1kqlqd40ii"; + version = "1.11.0"; + sha256 = "0a4agm0g16cxhvhvsmbsvvicfsjr53330rsab5xdi7gcpx9a1dff"; }; meta = { license = lib.licenses.asl20; diff --git a/pkgs/os-specific/darwin/maloader/default.nix b/pkgs/os-specific/darwin/maloader/default.nix index bcd9fe6488d..1313c189704 100644 --- a/pkgs/os-specific/darwin/maloader/default.nix +++ b/pkgs/os-specific/darwin/maloader/default.nix @@ -1,11 +1,12 @@ -{ lib, stdenv, fetchgit, opencflite, clang, libcxx }: +{ lib, stdenv, fetchFromGitHub, opencflite, clang, libcxx }: stdenv.mkDerivation { pname = "maloader"; version = "unstable-2014-02-25"; - src = fetchgit { - url = "git://github.com/shinh/maloader.git"; + src = fetchFromGitHub { + owner = "shinh"; + repo = "maloader"; rev = "5f220393e0b7b9ad0cf1aba0e89df2b42a1f0442"; sha256 = "0dd1pn07x1y8pyn5wz8qcl1c1xwghyya4d060m3y9vx5dhv9xmzw"; }; diff --git a/pkgs/os-specific/linux/cryptsetup/default.nix b/pkgs/os-specific/linux/cryptsetup/default.nix index a66147dd22e..9bbd6ddafed 100644 --- a/pkgs/os-specific/linux/cryptsetup/default.nix +++ b/pkgs/os-specific/linux/cryptsetup/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "cryptsetup"; - version = "2.4.2"; + version = "2.4.3"; outputs = [ "out" "dev" "man" ]; src = fetchurl { url = "mirror://kernel/linux/utils/cryptsetup/v2.4/${pname}-${version}.tar.xz"; - sha256 = "sha256-FwzCMmqdru61eFeRdr0Q1KYO5cT8W8aQGM5n2vxUC5w="; + sha256 = "sha256-/A35RRiBciZOxb8dC9oIJk+tyKP4VtR+upHzH+NUtQc="; }; # Disable 4 test cases that fail in a sandbox diff --git a/pkgs/os-specific/linux/rdma-core/default.nix b/pkgs/os-specific/linux/rdma-core/default.nix index 710a74d67d8..02321d84351 100644 --- a/pkgs/os-specific/linux/rdma-core/default.nix +++ b/pkgs/os-specific/linux/rdma-core/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "rdma-core"; - version = "38.0"; + version = "38.1"; src = fetchFromGitHub { owner = "linux-rdma"; repo = "rdma-core"; rev = "v${version}"; - sha256 = "1z9yrkqdknzidg4g1g5rqrs7i0325nmzzw0nf2ki1nzlfwqxy9qv"; + sha256 = "05r5f9agpn7dcx5jmggrsm9953w2k6ly6gfbg9b8wjdc853apqp7"; }; strictDeps = true; diff --git a/pkgs/servers/code-server/default.nix b/pkgs/servers/code-server/default.nix index d6e39f8cdb1..4a8d19687f7 100644 --- a/pkgs/servers/code-server/default.nix +++ b/pkgs/servers/code-server/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchFromGitHub, buildGoModule, makeWrapper, runCommand -, moreutils, jq, git, cacert, zip, rsync, pkg-config, yarn, python3 -, esbuild, nodejs-14_x, libsecret, xorg, ripgrep -, AppKit, Cocoa, Security, cctools }: +, cacert, moreutils, jq, git, rsync, pkg-config, yarn, python3 +, esbuild, nodejs-14_x, node-gyp, libsecret, xorg, ripgrep +, AppKit, Cocoa, CoreServices, Security, cctools, xcbuild }: let system = stdenv.hostPlatform.system; @@ -11,16 +11,24 @@ let yarn' = yarn.override { inherit nodejs; }; defaultYarnOpts = [ "frozen-lockfile" "non-interactive" "no-progress"]; + # replaces esbuild's download script with a binary from nixpkgs + patchEsbuild = path : version : '' + mkdir -p ${path}/node_modules/esbuild/bin + jq "del(.scripts.postinstall)" ${path}/node_modules/esbuild/package.json | sponge ${path}/node_modules/esbuild/package.json + sed -i 's/${version}/${esbuild.version}/g' ${path}/node_modules/esbuild/lib/main.js + ln -s -f ${esbuild}/bin/esbuild ${path}/node_modules/esbuild/bin/esbuild + ''; + in stdenv.mkDerivation rec { pname = "code-server"; - version = "3.12.0"; - commit = "798dc0baf284416dbbf951e4ef596beeab6cb6c4"; + version = "4.0.1"; + commit = "7fe23daf009e5234eaa54a1ea5ff26df384c47ac"; src = fetchFromGitHub { owner = "cdr"; repo = "code-server"; rev = "v${version}"; - sha256 = "17v3sz0wjrmikmzyh9xswr4kf1vcj9njlibqb4wwj0pq0d72wdvl"; + sha256 = "1s3dcmzlkyh7qfs3ai1p7dlp45iys0ax1fbxxz17p395pw9anrrl"; }; cloudAgent = buildGoModule rec { @@ -63,27 +71,16 @@ in stdenv.mkDerivation rec { outputHashAlgo = "sha256"; # to get hash values use nix-build -A code-server.prefetchYarnCache - outputHash = { - x86_64-linux = "1clfdl9hy5j2dj6jj6a9vgq0wzllfj0h2hbb73959k3w85y4ad2w"; - aarch64-linux = "1clfdl9hy5j2dj6jj6a9vgq0wzllfj0h2hbb73959k3w85y4ad2w"; - x86_64-darwin = "1clfdl9hy5j2dj6jj6a9vgq0wzllfj0h2hbb73959k3w85y4ad2w"; - }.${system} or (throw "Unsupported system ${system}"); + outputHash = "0qmfsirld1qfl2s26rxbpmvxsyj2pvzkgk8w89zlrgbhgc5fj8p9"; }; - # Extract the Node.js source code which is used to compile packages with - # native bindings - nodeSources = runCommand "node-sources" {} '' - tar --no-same-owner --no-same-permissions -xf ${nodejs.src} - mv node-* $out - ''; - nativeBuildInputs = [ - nodejs yarn' python pkg-config zip makeWrapper git rsync jq moreutils + nodejs yarn' python pkg-config makeWrapper git rsync jq moreutils ]; buildInputs = lib.optionals (!stdenv.isDarwin) [ libsecret ] ++ (with xorg; [ libX11 libxkbfile ]) ++ lib.optionals stdenv.isDarwin [ - AppKit Cocoa Security cctools + AppKit Cocoa CoreServices Security cctools xcbuild ]; patches = [ @@ -119,9 +116,17 @@ in stdenv.mkDerivation rec { # skip unnecessary electron download export ELECTRON_SKIP_BINARY_DOWNLOAD=1 - '' + lib.optionalString stdenv.isLinux '' - # set nodedir, so we can build binaries later - npm config set nodedir "${nodeSources}" + + # set nodedir to prevent node-gyp from downloading headers + # taken from https://nixos.org/manual/nixpkgs/stable/#javascript-tool-specific + mkdir -p $HOME/.node-gyp/${nodejs.version} + echo 9 > $HOME/.node-gyp/${nodejs.version}/installVersion + ln -sfv ${nodejs}/include $HOME/.node-gyp/${nodejs.version} + export npm_config_nodedir=${nodejs} + + # use updated node-gyp. fixes the following error on Darwin: + # PermissionError: [Errno 1] Operation not permitted: '/usr/sbin/pkgutil' + export npm_config_node_gyp=${node-gyp}/lib/node_modules/node-gyp/bin/node-gyp.js ''; buildPhase = '' @@ -169,6 +174,9 @@ in stdenv.mkDerivation rec { # sw_vers before that variable is checked. patch -p1 -i ${./playwright.patch} + # Patch out remote download of nodejs from build script + patch -p1 -i ${./remove-node-download.patch} + # Replicate install vscode dependencies without running script for all vscode packages # that require patching for postinstall scripts to succeed find ./vendor/modules/code-oss-dev -path "*node_modules" -prune -o \ @@ -176,21 +184,21 @@ in stdenv.mkDerivation rec { xargs -I {} yarn --cwd {} \ --frozen-lockfile --offline --ignore-scripts --ignore-engines + # patch shebangs of everything to allow binary packages to build patchShebangs . - # patch build esbuild - mkdir -p vendor/modules/code-oss-dev/build/node_modules/esbuild/bin - jq "del(.scripts.postinstall)" vendor/modules/code-oss-dev/build/node_modules/esbuild/package.json | sponge vendor/modules/code-oss-dev/build/node_modules/esbuild/package.json - sed -i 's/0.12.6/${esbuild.version}/g' vendor/modules/code-oss-dev/build/node_modules/esbuild/lib/main.js - ln -s -f ${esbuild}/bin/esbuild vendor/modules/code-oss-dev/build/node_modules/esbuild/bin/esbuild - - # patch extensions esbuild - mkdir -p vendor/modules/code-oss-dev/extensions/node_modules/esbuild/bin - jq "del(.scripts.postinstall)" vendor/modules/code-oss-dev/extensions/node_modules/esbuild/package.json | sponge vendor/modules/code-oss-dev/extensions/node_modules/esbuild/package.json - sed -i 's/0.11.12/${esbuild.version}/g' vendor/modules/code-oss-dev/extensions/node_modules/esbuild/lib/main.js - ln -s -f ${esbuild}/bin/esbuild vendor/modules/code-oss-dev/extensions/node_modules/esbuild/bin/esbuild - + ${patchEsbuild "./vendor/modules/code-oss-dev/build" "0.12.6"} + ${patchEsbuild "./vendor/modules/code-oss-dev/extensions" "0.11.23"} + '' + lib.optionalString stdenv.isDarwin '' + # use prebuilt binary for @parcel/watcher, which requires macOS SDK 10.13+ + # (see issue #101229) + pushd ./vendor/modules/code-oss-dev/remote/node_modules/@parcel/watcher + mkdir -p ./build/Release + mv ./prebuilds/darwin-x64/node.napi.glibc.node ./build/Release/watcher.node + jq "del(.scripts) | .gypfile = false" ./package.json | sponge ./package.json + popd + '' + '' # rebuild binaries, we use npm here, as yarn does not provide an alternative # that would not attempt to try to reinstall everything and break our # patching attempts diff --git a/pkgs/servers/code-server/playwright.patch b/pkgs/servers/code-server/playwright.patch index e03d7f82184..95a74748189 100644 --- a/pkgs/servers/code-server/playwright.patch +++ b/pkgs/servers/code-server/playwright.patch @@ -4,7 +4,7 @@ * limitations under the License. */ --const { installBrowsersWithProgressBar } = require('./lib/install/installer'); +-const { installDefaultBrowsersForNpmInstall } = require('playwright-core/lib/utils/registry'); - --installBrowsersWithProgressBar(); +-installDefaultBrowsersForNpmInstall(); +process.stdout.write('Browser install disabled by Nix build script\n'); diff --git a/pkgs/servers/code-server/remove-cloud-agent-download.patch b/pkgs/servers/code-server/remove-cloud-agent-download.patch index dd8f6fccb5b..0b16e16aec8 100644 --- a/pkgs/servers/code-server/remove-cloud-agent-download.patch +++ b/pkgs/servers/code-server/remove-cloud-agent-download.patch @@ -1,10 +1,11 @@ --- ./ci/build/npm-postinstall.sh +++ ./ci/build/npm-postinstall.sh -@@ -56,13 +56,6 @@ - ;; - esac - -- OS="$(uname | tr '[:upper:]' '[:lower:]')" +@@ -58,14 +58,6 @@ + + OS="$(uname | tr '[:upper:]' '[:lower:]')" + +- mkdir -p ./lib +- - if curl -fsSL "https://github.com/cdr/cloud-agent/releases/latest/download/cloud-agent-$OS-$ARCH" -o ./lib/coder-cloud-agent; then - chmod +x ./lib/coder-cloud-agent - else diff --git a/pkgs/servers/code-server/remove-node-download.patch b/pkgs/servers/code-server/remove-node-download.patch new file mode 100644 index 00000000000..282d716752f --- /dev/null +++ b/pkgs/servers/code-server/remove-node-download.patch @@ -0,0 +1,27 @@ +--- ./vendor/modules/code-oss-dev/build/gulpfile.reh.js ++++ ./vendor/modules/code-oss-dev/build/gulpfile.reh.js +@@ -277,8 +277,6 @@ + .pipe(util.stripSourceMappingURL()) + .pipe(jsFilter.restore); + +- const nodePath = `.build/node/v${nodeVersion}/${platform}-${platform === 'darwin' ? 'x64' : arch}`; +- const node = gulp.src(`${nodePath}/**`, { base: nodePath, dot: true }); + + let web = []; + if (type === 'reh-web') { +@@ -296,7 +294,6 @@ + license, + sources, + deps, +- node, + ...web + ); + +@@ -376,7 +373,6 @@ + const destinationFolderName = `vscode-${type}${dashed(platform)}${dashed(arch)}`; + + const serverTaskCI = task.define(`vscode-${type}${dashed(platform)}${dashed(arch)}${dashed(minified)}-ci`, task.series( +- gulp.task(`node-${platform}-${platform === 'darwin' ? 'x64' : arch}`), + util.rimraf(path.join(BUILD_ROOT, destinationFolderName)), + packageTask(type, platform, arch, sourceFolderName, destinationFolderName) + )); diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index f175802acf4..1556ffbd9cc 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -232,6 +232,33 @@ let }); }) + # Remove as soon the dependency is updated and pytest-httpx > 0.15 + (self: super: { + luftdaten = super.luftdaten.overridePythonAttrs (oldAttrs: rec { + version = "0.7.1"; + src = fetchFromGitHub { + owner = "home-assistant-ecosystem"; + repo = "python-luftdaten"; + rev = version; + sha256 = "sha256-76Y5TJet0WtzYXuK8Og0rmpsUIlXK7b37oesh+MliU8="; + }; + }); + }) + + # Remove as soon the dependency is updated and pytest-httpx > 0.15 + (self: super: { + pyrmvtransport = super.pyrmvtransport.overridePythonAttrs (oldAttrs: rec { + version = "0.3.3"; + src = fetchFromGitHub { + owner = "cgtobi"; + repo = "pyrmvtransport"; + rev = "v${version}"; + sha256 = "sha256-nFxGEyO+wyRzPayjjv8WNIJ+XIWbVn0dyyjQKHiyr40="; + }; + doCheck = false; + }); + }) + # home-assistant-frontend does not exist in python3.pkgs (self: super: { home-assistant-frontend = self.callPackage ./frontend.nix { }; @@ -986,6 +1013,9 @@ in with py.pkgs; buildPythonApplication rec { # august/test_lock.py: AssertionError: assert 'unlocked' == 'locked' / assert 'off' == 'on' "test_lock_update_via_pubnub" "test_door_sense_update_via_pubnub" + # Tests are flaky + "test_config_platform_valid" + "test_hls_stream" ]; preCheck = '' diff --git a/pkgs/servers/http/nginx/quic.nix b/pkgs/servers/http/nginx/quic.nix index 5173b4c6890..f0a7a367555 100644 --- a/pkgs/servers/http/nginx/quic.nix +++ b/pkgs/servers/http/nginx/quic.nix @@ -6,8 +6,8 @@ callPackage ./generic.nix args { src = fetchhg { url = "https://hg.nginx.org/nginx-quic"; - rev = "10522e8dea41"; # branch=quic - sha256 = "sha256-BnAhnJKq2uHAp0WqVWIk+Hw0GXF/rAOxKCTwwsiiZdo="; + rev = "6f8253673669"; # branch=quic + sha256 = "sha256:0zl4rws07vr8z7ml7sqlb70v3cx1cms7iablndqd38iqcx0bvjrq"; }; preConfigure = '' diff --git a/pkgs/servers/monitoring/loki/default.nix b/pkgs/servers/monitoring/loki/default.nix index 96879c3408b..0a460e335b4 100644 --- a/pkgs/servers/monitoring/loki/default.nix +++ b/pkgs/servers/monitoring/loki/default.nix @@ -8,14 +8,14 @@ }: buildGoModule rec { - version = "2.4.1"; + version = "2.4.2"; pname = "grafana-loki"; src = fetchFromGitHub { rev = "v${version}"; owner = "grafana"; repo = "loki"; - sha256 = "sha256-QLHhGAeTtXe/76uMombWBORXGvfaUQMGCgkeGCnI0Ag="; + sha256 = "sha256-HSEdN3PN4wQQ3A7bICNIAgdwhwD/PIUeOdW9ZgwmbCw="; }; vendorSha256 = null; diff --git a/pkgs/tools/admin/azure-cli/default.nix b/pkgs/tools/admin/azure-cli/default.nix index 728fcf6eec5..6f6e06db2a0 100644 --- a/pkgs/tools/admin/azure-cli/default.nix +++ b/pkgs/tools/admin/azure-cli/default.nix @@ -1,7 +1,7 @@ { stdenv, lib, python3, fetchFromGitHub, installShellFiles }: let - version = "2.30.0"; + version = "2.32.0"; srcName = "azure-cli-${version}-src"; src = fetchFromGitHub { @@ -9,7 +9,7 @@ let owner = "Azure"; repo = "azure-cli"; rev = "azure-cli-${version}"; - sha256 = "sha256-b4hNacraNomhiFGEiHcMweqbEq3vTHus+xbFPv5X5HQ="; + sha256 = "sha256-PXY32bfuK0bQGI0N+XHs9lakF6K7+WjrHMvuNgDFSJM="; }; # put packages that needs to be overriden in the py package scope diff --git a/pkgs/tools/admin/azure-cli/python-packages.nix b/pkgs/tools/admin/azure-cli/python-packages.nix index 6e7504e5ab5..a917112cc5f 100644 --- a/pkgs/tools/admin/azure-cli/python-packages.nix +++ b/pkgs/tools/admin/azure-cli/python-packages.nix @@ -68,7 +68,6 @@ let postPatch = '' substituteInPlace setup.py \ - --replace "azure-mgmt-core>=1.2.0,<1.3.0" "azure-mgmt-core~=1.2" \ --replace "requests[socks]~=2.25.1" "requests[socks]~=2.25" \ --replace "cryptography>=3.2,<3.4" "cryptography" ''; @@ -145,17 +144,17 @@ let azure-mgmt-recoveryservices = overrideAzureMgmtPackage super.azure-mgmt-recoveryservices "2.0.0" "zip" "sha256-p9MTfVxGD1CsLUQGHWCnC08nedTKhEt3QZtXJeZeCb4="; - azure-mgmt-recoveryservicesbackup = overrideAzureMgmtPackage super.azure-mgmt-recoveryservicesbackup "3.0.0" "zip" - "sha256-GZJIayjd1tT1l/0wBCF80sr09NyKDOcSJrWudnrOOhg="; + azure-mgmt-recoveryservicesbackup = overrideAzureMgmtPackage super.azure-mgmt-recoveryservicesbackup "4.0.0" "zip" + "a848ac1d99c935e61dfb91ca3e1577904a3eff5820fce179eb6937df8e1019ec"; - azure-mgmt-resource = overrideAzureMgmtPackage super.azure-mgmt-resource "19.0.0" "zip" - "bbb60bb9419633c2339569d4e097908638c7944e782b5aef0f5d9535085a9100"; + azure-mgmt-resource = overrideAzureMgmtPackage super.azure-mgmt-resource "20.0.0" "zip" + "622dca4484be64f9f5ce335d327dffabf3e71e14e8a3f4a1051dc85a5c3ebbca"; azure-mgmt-appconfiguration = overrideAzureMgmtPackage super.azure-mgmt-appconfiguration "2.0.0" "zip" "b58bbe82a7429ba589292024896b58d96fe9fa732c578569cac349928dc2ca5f"; - azure-mgmt-cognitiveservices = overrideAzureMgmtPackage super.azure-mgmt-cognitiveservices "12.0.0" "zip" - "73054bd19866577e7e327518afc8f47e1639a11aea29a7466354b81804f4a676"; + azure-mgmt-cognitiveservices = overrideAzureMgmtPackage super.azure-mgmt-cognitiveservices "13.0.0" "zip" + "dc6116e8394d45312c7ad5a9098ce0dd2370bd92d43afd33d8b3bfab724fa498"; azure-mgmt-compute = overrideAzureMgmtPackage super.azure-mgmt-compute "23.1.0" "zip" "sha256-Sduw9RAG1VfL0LIpmcuezz6rwr5G2W78xtZRxrM3VLM="; @@ -181,17 +180,17 @@ let azure-mgmt-eventgrid = overrideAzureMgmtPackage super.azure-mgmt-eventgrid "9.0.0" "zip" "aecbb69ecb010126c03668ca7c9a2be8e965568f5b560f0e7b5bc152b157b510"; - azure-mgmt-imagebuilder = overrideAzureMgmtPackage super.azure-mgmt-imagebuilder "0.4.0" "zip" - "0cqpjnkpid6a34ifd4vk4fn1h57pa1bg3r756wv082xl2szr34jc"; + azure-mgmt-imagebuilder = overrideAzureMgmtPackage super.azure-mgmt-imagebuilder "1.0.0" "zip" + "634e398de9a23e712aa27a4a59f9ea5d5091d1dfcfed5ac977230918872c4430"; azure-mgmt-iothub = overrideAzureMgmtPackage super.azure-mgmt-iothub "2.1.0" "zip" "2724f48cadb1be7ee96fc26c7bfa178f82cea5d325e785e91d9f26965fa8e46f"; - azure-mgmt-iothubprovisioningservices = overrideAzureMgmtPackage super.azure-mgmt-iothubprovisioningservices "0.3.0" "zip" - "sha256-0Bt3JfP2jFpv8CGEqb3ajHdYiK9mN43YMUkD0KRuMrk="; + azure-mgmt-iothubprovisioningservices = overrideAzureMgmtPackage super.azure-mgmt-iothubprovisioningservices "1.0.0" "zip" + "e5871b03488b5ae6dfc441cdbda40cb39c000635ee57c513053792b3c15826a9"; - azure-mgmt-iotcentral = overrideAzureMgmtPackage super.azure-mgmt-iotcentral "9.0.0b1" "zip" - "sha256-WEF5HuiaUTnka/2w0cVX/VwRt8/GD0+5fqGkn1BVx4I="; + azure-mgmt-iotcentral = overrideAzureMgmtPackage super.azure-mgmt-iotcentral "9.0.0" "zip" + "64df73df449a6f3717f3d0963e5869224ed3e6216c79de571493bea7c1b52cb6"; azure-mgmt-kusto = overrideAzureMgmtPackage super.azure-mgmt-kusto "0.3.0" "zip" "1pmcdgimd66h964a3d5m2j2fbydshcwhrk87wblhwhfl3xwbgf4y"; @@ -200,16 +199,16 @@ let "1397ksrd61jv7400mgn8sqngp6ahir55fyq9n5k69wk88169qm2r"; azure-mgmt-netapp = overrideAzureMgmtPackage super.azure-mgmt-netapp "5.1.0" "zip" - "7195e413a0764684cd42bec9e429c13c290db9ab5c465dbed586a6f6d0ec8a4a"; + "sha256-MGCICI7hDobEzyTMgqnKYZ21zfwNo/ogfQDsf3fwbo4="; azure-mgmt-dns = overrideAzureMgmtPackage super.azure-mgmt-dns "8.0.0" "zip" "407c2dacb33513ffbe9ca4be5addb5e9d4bae0cb7efa613c3f7d531ef7bf8de8"; - azure-mgmt-loganalytics = overrideAzureMgmtPackage super.azure-mgmt-loganalytics "11.0.0" "zip" - "41671fc6e95180fb6147cb40567410c34b85fb69bb0a9b3e09feae1ff370ee9d"; + azure-mgmt-loganalytics = overrideAzureMgmtPackage super.azure-mgmt-loganalytics "12.0.0" "zip" + "da128a7e0291be7fa2063848df92a9180cf5c16d42adc09d2bc2efd711536bfb"; - azure-mgmt-network = overrideAzureMgmtPackage super.azure-mgmt-network "19.1.0" "zip" - "sha256-Yu9/6LqY5WQStDTJw13HVbPF5GnywBu+0s4NEpc6BEs="; + azure-mgmt-network = overrideAzureMgmtPackage super.azure-mgmt-network "19.3.0" "zip" + "0b6a1ccdffd76e057ab16a6c319740a0ca68d59fedf7e9c02f2437396e72aa11"; azure-mgmt-maps = overrideAzureMgmtPackage super.azure-mgmt-maps "2.0.0" "zip" "384e17f76a68b700a4f988478945c3a9721711c0400725afdfcb63cf84e85f0e"; @@ -238,8 +237,8 @@ let azure-mgmt-redhatopenshift = overrideAzureMgmtPackage super.azure-mgmt-redhatopenshift "1.0.0" "zip" "94cd41f1ebd82e40620fd3e6d88f666b5c19ac7cf8b4e8edadb9721bd7c80980"; - azure-mgmt-redis = overrideAzureMgmtPackage super.azure-mgmt-redis "13.0.0" "zip" - "283f776afe329472c20490b1f2c21c66895058cb06fb941eccda42cc247217f1"; + azure-mgmt-redis = overrideAzureMgmtPackage super.azure-mgmt-redis "13.1.0" "zip" + "ece913e5fc7f157e945809e557443f79ff7691cabca4bbc5ecb266352f843179"; azure-mgmt-reservations = overrideAzureMgmtPackage super.azure-mgmt-reservations "0.6.0" "zip" "16ycni3cjl9c0mv419gy5rgbrlg8zp0vnr6aj8z8p2ypdw6sgac3"; @@ -271,8 +270,8 @@ let azure-mgmt-eventhub = overrideAzureMgmtPackage super.azure-mgmt-eventhub "9.1.0" "zip" "0ba9f10e1e8d03247a316e777d6f27fabf268d596dda2af56ac079fcdf5e7afe"; - azure-mgmt-keyvault = overrideAzureMgmtPackage super.azure-mgmt-keyvault "9.2.0" "zip" - "sha256-N+zUTEnOyn18lDHlkUj+vRXX/sJhZR7XLd1YdV50ULA="; + azure-mgmt-keyvault = overrideAzureMgmtPackage super.azure-mgmt-keyvault "9.3.0" "zip" + "54156422e618b686d52232a7989594b240bd18afd0fa381e12e4772ed4ab5ea8"; azure-mgmt-cdn = overrideAzureMgmtPackage super.azure-mgmt-cdn "11.0.0" "zip" "28e7070001e7208cdb6c2ad253ec78851abdd73be482230d2c0874eed5bc0907"; @@ -280,8 +279,8 @@ let azure-mgmt-containerregistry = overrideAzureMgmtPackage super.azure-mgmt-containerregistry "8.2.0" "zip" "f2bcdbcf0b9fdc2df0df9eccb77cb489091d3c670ed53cba77e5ffd734e9539b"; - azure-mgmt-monitor = overrideAzureMgmtPackage super.azure-mgmt-monitor "2.0.0" "zip" - "e7f7943fe8f0efe98b3b1996cdec47c709765257a6e09e7940f7838a0f829e82"; + azure-mgmt-monitor = overrideAzureMgmtPackage super.azure-mgmt-monitor "3.0.0" "zip" + "91ddb7333bf2b9541a53864cc8d2501e3694a03a9c0e41cbfae3348558675ce6"; azure-mgmt-advisor = overrideAzureMgmtPackage super.azure-mgmt-advisor "9.0.0" "zip" "fc408b37315fe84781b519124f8cb1b8ac10b2f4241e439d0d3e25fd6ca18d7b"; @@ -348,11 +347,11 @@ let }); azure-synapse-artifacts = super.azure-synapse-artifacts.overrideAttrs(oldAttrs: rec { - version = "0.8.0"; + version = "0.10.0"; src = super.fetchPypi { inherit (oldAttrs) pname; inherit version; - sha256 = "sha256-PU/f0L1maYT3vce8DHpgGMNaXUaoGjLdGTsHwDtSi3I="; + sha256 = "sha256-P3gsm1kLiuQ2eMbgA9+MqMymdYMgOdJwsLdDf/AVV/0="; extension = "zip"; }; }); @@ -492,12 +491,12 @@ let }); knack = super.knack.overridePythonAttrs(oldAttrs: rec { - version = "0.8.2"; + version = "0.9.0"; src = super.fetchPypi { inherit (oldAttrs) pname; inherit version; - sha256 = "sha256-TqpQocXnnRxcjl4XBbZhchsLg6CJaV5Z4inMJsZJY7k="; + sha256 = "7fcab17585c0236885eaef311c01a1e626d84c982aabcac81703afda3f89c81f"; }; }); diff --git a/pkgs/tools/admin/mycli/default.nix b/pkgs/tools/admin/mycli/default.nix index e128b9803c2..83dc7214928 100644 --- a/pkgs/tools/admin/mycli/default.nix +++ b/pkgs/tools/admin/mycli/default.nix @@ -7,11 +7,11 @@ with python3.pkgs; buildPythonApplication rec { pname = "mycli"; - version = "1.24.1"; + version = "1.24.2"; src = fetchPypi { inherit pname version; - sha256 = "sha256-dI2Yvj2llI9TlMFbs35ijYeFuGqoTovZyRh+ILhNMmY="; + sha256 = "sha256-XrPho+bPjyzj2d6W4KR4P09T1/FXkrQvhGPotgooIB4="; }; propagatedBuildInputs = [ @@ -29,7 +29,7 @@ buildPythonApplication rec { sqlparse ]; - checkInputs = [ pytest mock glibcLocales ]; + checkInputs = [ pytest glibcLocales ]; checkPhase = '' export HOME=. diff --git a/pkgs/tools/misc/anystyle-cli/default.nix b/pkgs/tools/misc/anystyle-cli/default.nix index 7a437cafc28..379ed14f8ef 100644 --- a/pkgs/tools/misc/anystyle-cli/default.nix +++ b/pkgs/tools/misc/anystyle-cli/default.nix @@ -30,7 +30,7 @@ buildRubyGem rec { propagatedBuildInputs = [ deps ]; preFixup = '' - wrapProgram $out/bin/anystyle --prefix PATH ${poppler_utils}/bin + wrapProgram $out/bin/anystyle --prefix PATH : ${poppler_utils}/bin ''; meta = with lib; { diff --git a/pkgs/tools/misc/pandoc-drawio-filter/default.nix b/pkgs/tools/misc/pandoc-drawio-filter/default.nix new file mode 100644 index 00000000000..1279296143c --- /dev/null +++ b/pkgs/tools/misc/pandoc-drawio-filter/default.nix @@ -0,0 +1,78 @@ +{ buildPythonApplication +, drawio +, fetchFromGitHub +, lib +, pandoc +, pandocfilters +, runCommand +, runtimeShell +, texlive +, writeScriptBin +, xvfb-run +}: + +let + version = "1.1"; + + src = fetchFromGitHub { + owner = "tfc"; + repo = "pandoc-drawio-filter"; + rev = version; + sha256 = "sha256-2XJSAfxqEmmamWIAM3vZqi0mZjUUugmR3zWw8Imjadk="; + }; + + wrappedDrawio = writeScriptBin "drawio" '' + #!${runtimeShell} + + # Electron really wants a configuration directory to not die with: + # "Error: Failed to get 'appData' path" + # so we give it some temp dir as XDG_CONFIG_HOME + tmpdir=$(mktemp -d) + + function cleanup { + rm -rf "$tmpdir" + } + trap cleanup EXIT + + # Drawio needs to run in a virtual X session, because Electron + # refuses to work and dies with an unhelpful error message otherwise: + # "The futex facility returned an unexpected error code." + XDG_CONFIG_HOME="$tmpdir" ${xvfb-run}/bin/xvfb-run ${drawio}/bin/drawio $@ + ''; + + pandoc-drawio-filter = buildPythonApplication { + pname = "pandoc-drawio-filter"; + + inherit src version; + + propagatedBuildInputs = [ + wrappedDrawio + pandocfilters + ]; + + passthru.tests.example-doc = + let + env = { + nativeBuildInputs = [ + pandoc + pandoc-drawio-filter + texlive.combined.scheme-tetex + ]; + }; + in + runCommand "$pandoc-drawio-filter-example-doc.pdf" env '' + cp -r ${src}/example/* . + pandoc -F pandoc-drawio example.md -T pdf -o $out + ''; + + meta = with lib; { + homepage = "https://github.com/tfc/pandoc-drawio-filter"; + description = "Pandoc filter which converts draw.io diagrams to PDF"; + license = licenses.mit; + maintainers = with maintainers; [ tfc ]; + }; + }; + +in + +pandoc-drawio-filter diff --git a/pkgs/tools/misc/synth/default.nix b/pkgs/tools/misc/synth/default.nix index 8bfca884f1f..1d922a21843 100644 --- a/pkgs/tools/misc/synth/default.nix +++ b/pkgs/tools/misc/synth/default.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage rec { pname = "synth"; - version = "0.6.2"; + version = "0.6.4"; src = fetchFromGitHub { owner = "getsynth"; repo = pname; rev = "v${version}"; - sha256 = "sha256-MeZ5bkOMTJVvaBfGahKsXvaYhfMKcYzPFsBp/p2dPQQ="; + sha256 = "sha256-TtIZwGHSfY7Xz6hmrsmaB7dXfjSPcBD4yDyC27TJ4B4="; }; - cargoSha256 = "sha256-lNeDpUla/PfGd/AogdcOtrmL1Jp+0Ji9LH1CF7uOEe0="; + cargoSha256 = "sha256-V5GA5XR3wkcBdbxRjO8PkF7Q3yg1NVUjXsdAHVip4Bc="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/tools/misc/ttygif/default.nix b/pkgs/tools/misc/ttygif/default.nix index 226109ab20c..d9a97f6c235 100644 --- a/pkgs/tools/misc/ttygif/default.nix +++ b/pkgs/tools/misc/ttygif/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "ttygif"; - version = "1.5.0"; + version = "1.6.0"; src = fetchFromGitHub { owner = "icholy"; repo = pname; rev = version; - sha256 = "1w9c3h6hik2gglwsw8ww63piy66i4zqr3273wh5rc9r2awiwh643"; + sha256 = "sha256-GsMeVR2wNivQguZ6B/0v39Td9VGHg+m3RtAG9DYkNmU="; }; makeFlags = [ "CC:=$(CC)" "PREFIX=${placeholder "out"}" ]; diff --git a/pkgs/tools/networking/inadyn/default.nix b/pkgs/tools/networking/inadyn/default.nix index 359c1343594..3d5a54c41f5 100644 --- a/pkgs/tools/networking/inadyn/default.nix +++ b/pkgs/tools/networking/inadyn/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "inadyn"; - version = "2.9.0"; + version = "2.9.1"; src = fetchFromGitHub { owner = "troglobit"; repo = "inadyn"; rev = "v${version}"; - sha256 = "sha256-WYl602gDcPKxjQAlBedPHEOCNtaGgcaVZ/KbxcP2El4="; + sha256 = "sha256-mHqy/cBw+pwJwzMzAmqIQcLkpc87dtYD11TMRXeWdUg="; }; nativeBuildInputs = [ autoreconfHook pkg-config ]; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = with lib; { - homepage = "https://troglobit.com/project/inadyn/"; + homepage = "https://troglobit.com/projects/inadyn/"; description = "Free dynamic DNS client"; license = licenses.gpl2Plus; maintainers = with maintainers; [ ]; diff --git a/pkgs/tools/networking/proxychains-ng/default.nix b/pkgs/tools/networking/proxychains-ng/default.nix index cc1cc9daf65..6a131af0311 100644 --- a/pkgs/tools/networking/proxychains-ng/default.nix +++ b/pkgs/tools/networking/proxychains-ng/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchFromGitHub +, fetchpatch }: stdenv.mkDerivation rec { @@ -14,11 +15,20 @@ stdenv.mkDerivation rec { sha256 = "128d502y8pn7q2ls6glx9bvibwzfh321sah5r5li6b6iywh2zqlc"; }; + patches = [ + # Fix build on aarch64-darwin, should be removed in v4.16 + # https://github.com/rofl0r/proxychains-ng/issues/400 + (fetchpatch { + url = "https://github.com/rofl0r/proxychains-ng/commit/7de7dd0de1ff387a627620ac3482b4cd9b3fba95.patch?full_index=1"; + sha256 = "sha256-m3a4Jal8L7w+xA0OJTPU68ILTaKgiITgsM1WVxuMce0="; + }) + ]; + meta = with lib; { description = "A preloader which hooks calls to sockets in dynamically linked programs and redirects it through one or more socks/http proxies"; homepage = "https://github.com/rofl0r/proxychains-ng"; license = licenses.gpl2Plus; maintainers = with maintainers; [ zenithal ]; - platforms = platforms.linux; + platforms = platforms.linux ++ [ "aarch64-darwin" ]; }; } diff --git a/pkgs/tools/networking/tinyssh/default.nix b/pkgs/tools/networking/tinyssh/default.nix index 9bfa8aa3ab5..e09a181d007 100644 --- a/pkgs/tools/networking/tinyssh/default.nix +++ b/pkgs/tools/networking/tinyssh/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "tinyssh"; - version = "20210601"; + version = "20220101"; src = fetchFromGitHub { owner = "janmojzis"; repo = "tinyssh"; rev = version; - sha256 = "sha256-+THoPiD6dW5ZuiQmmLckOJGyjhzdF3qF0DgC51zjGY8="; + sha256 = "sha256-3GW7WNUy7539dN2ckd/0PejzsiaCXcOIMR5FlZKBkMo="; }; preConfigure = '' diff --git a/pkgs/tools/security/go365/default.nix b/pkgs/tools/security/go365/default.nix index 432dfb49da1..02e4c32c6ce 100644 --- a/pkgs/tools/security/go365/default.nix +++ b/pkgs/tools/security/go365/default.nix @@ -1,4 +1,5 @@ { lib +, stdenv , buildGoModule , fetchFromGitHub }: @@ -16,7 +17,7 @@ buildGoModule rec { vendorSha256 = "0fx2966xfzmi8yszw1cq6ind3i2dvacdwfs029v3bq0n8bvbm3r2"; - postInstall = '' + postInstall = lib.optionalString (!stdenv.isDarwin) '' mv $out/bin/Go365 $out/bin/$pname ''; diff --git a/pkgs/tools/security/maigret/default.nix b/pkgs/tools/security/maigret/default.nix index 08ef82ff9d6..cf8a03e8123 100644 --- a/pkgs/tools/security/maigret/default.nix +++ b/pkgs/tools/security/maigret/default.nix @@ -5,13 +5,13 @@ python3.pkgs.buildPythonApplication rec { pname = "maigret"; - version = "0.3.1"; + version = "0.4.0"; src = fetchFromGitHub { owner = "soxoj"; repo = pname; rev = "v${version}"; - sha256 = "cq7pATICVQa2yTx2uiP58OBTn4B6iCjIB6LMmpaQfx0="; + sha256 = "1jvfi3d7b1x4x1h0hz193n541fa0qgp7lynd6j0w050cgg753hpz"; }; propagatedBuildInputs = with python3.pkgs; [ diff --git a/pkgs/tools/text/yaml-merge/default.nix b/pkgs/tools/text/yaml-merge/default.nix index 921437c2571..85ea3cd360d 100644 --- a/pkgs/tools/text/yaml-merge/default.nix +++ b/pkgs/tools/text/yaml-merge/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation { pname = "yaml-merge"; - version = "unstable-2016-02-16"; + version = "unstable-2022-01-12"; src = fetchFromGitHub { owner = "abbradar"; repo = "yaml-merge"; - rev = "4eef7b68632d79dec369b4eff5a8c63f995f81dc"; - sha256 = "0mwda2shk43i6f22l379fcdchmb07fm7nf4i2ii7fk3ihkhb8dgp"; + rev = "2f0174fe92fc283dd38063a3a14f7fe71db4d9ec"; + sha256 = "sha256-S2eZw+FOZvOn0XupZDRNcolUPd4PhvU1ziu+kx2AwnY="; }; pythonPath = with python3Packages; [ pyyaml ]; diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 861d649d079..bb63adac584 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -234,6 +234,10 @@ mapAliases ({ ec2_api_tools = ec2-api-tools; # added 2021-10-08 elasticmq = throw "elasticmq has been removed in favour of elasticmq-server-bin"; # added 2021-01-17 elasticsearch7-oss = throw "elasticsearch7-oss has been removed, as the distribution is no longer provided by upstream. https://github.com/NixOS/nixpkgs/pull/114456"; # added 2021-06-09 + electron_3 = throw "electron_3 has been removed in favor of newer versions"; # added 2021-01-06 + electron_4 = throw "electron_4 has been removed in favor of newer versions"; # added 2021-01-06 + electron_5 = throw "electron_5 has been removed in favor of newer versions"; # added 2021-01-06 + electron_6 = throw "electron_6 has been removed in favor of newer versions"; # added 2021-01-06 electrum-dash = throw "electrum-dash has been removed from nixpkgs as the project is abandoned."; # added 2022-01-01 emacsPackagesGen = emacsPackagesFor; # added 2018-08-18 emacsPackagesNgGen = emacsPackagesFor; # added 2018-08-18 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 359ba4a0a94..38021155d1d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8102,6 +8102,8 @@ with pkgs; pandoc-imagine = python3Packages.callPackage ../tools/misc/pandoc-imagine { }; + pandoc-drawio-filter = python3Packages.callPackage ../tools/misc/pandoc-drawio-filter { }; + pandoc-plantuml-filter = python3Packages.callPackage ../tools/misc/pandoc-plantuml-filter { }; patray = callPackage ../tools/audio/patray { }; @@ -14102,10 +14104,6 @@ with pkgs; inherit (callPackages ../development/tools/electron { }) electron - electron_3 - electron_4 - electron_5 - electron_6 electron_7 electron_8 electron_9 @@ -24505,6 +24503,8 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Cocoa CoreGraphics ForceFeedback OpenAL OpenGL; }; + blender-with-packages = callPackage ../applications/misc/blender/wrapper.nix {}; + blflash = callPackage ../tools/misc/blflash { }; blogc = callPackage ../applications/misc/blogc { }; @@ -27460,6 +27460,8 @@ with pkgs; pijul = callPackage ../applications/version-management/pijul { }; + pijuice = with python3Packages; toPythonApplication pijuice; + ping = callPackage ../applications/networking/ping { }; piper = callPackage ../os-specific/linux/piper { }; @@ -28774,6 +28776,8 @@ with pkgs; syncplay = python3.pkgs.callPackage ../applications/networking/syncplay { }; + syncterm = callPackage ../applications/terminal-emulators/syncterm { }; + inherit (callPackages ../applications/networking/syncthing { }) syncthing syncthing-discovery @@ -29391,8 +29395,9 @@ with pkgs; }; code-server = callPackage ../servers/code-server { - inherit (darwin.apple_sdk.frameworks) AppKit Cocoa Security; + inherit (darwin.apple_sdk.frameworks) AppKit Cocoa CoreServices Security; inherit (darwin) cctools; + inherit (nodePackages) node-gyp; }; vue = callPackage ../applications/misc/vue { }; @@ -29739,7 +29744,7 @@ with pkgs; inherit (gnome2) libglade scrollkeeper; gtkhtml = gnome2.gtkhtml4; python = python27; - enchant = enchant1; + enchant = enchant2; }; xournal = callPackage ../applications/graphics/xournal { diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 7a82697055a..cf58483ebde 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1132,6 +1132,8 @@ in { bayespy = callPackage ../development/python-modules/bayespy { }; + bbox = callPackage ../development/python-modules/bbox { }; + bc-python-hcl2 = callPackage ../development/python-modules/bc-python-hcl2 { }; bcdoc = callPackage ../development/python-modules/bcdoc { }; @@ -1304,6 +1306,10 @@ in { bottleneck = callPackage ../development/python-modules/bottleneck { }; + boxx = callPackage ../development/python-modules/boxx { }; + + bpycv = callPackage ../development/python-modules/bpycv {}; + bpython = callPackage ../development/python-modules/bpython { }; braceexpand = callPackage ../development/python-modules/braceexpand { }; @@ -4975,6 +4981,8 @@ in { millheater = callPackage ../development/python-modules/millheater { }; + minexr = callPackage ../development/python-modules/minexr { }; + miniaudio = callPackage ../development/python-modules/miniaudio { }; minidb = callPackage ../development/python-modules/minidb { }; @@ -5945,6 +5953,8 @@ in { piexif = callPackage ../development/python-modules/piexif { }; + pijuice = callPackage ../development/python-modules/pijuice { }; + pika = callPackage ../development/python-modules/pika { }; pika-pool = callPackage ../development/python-modules/pika-pool { }; @@ -7251,6 +7261,8 @@ in { pyquery = callPackage ../development/python-modules/pyquery { }; + pyquaternion = callPackage ../development/python-modules/pyquaternion { }; + pyquil = callPackage ../development/python-modules/pyquil { }; pyrabbit2 = callPackage ../development/python-modules/pyrabbit2 { }; @@ -10562,6 +10574,8 @@ in { yattag = callPackage ../development/python-modules/yattag { }; + yacs = callPackage ../development/python-modules/yacs { }; + ydiff = callPackage ../development/python-modules/ydiff { }; yeelight = callPackage ../development/python-modules/yeelight { }; @@ -10618,6 +10632,8 @@ in { zconfig = callPackage ../development/python-modules/zconfig { }; + zcs = callPackage ../development/python-modules/zcs { }; + zdaemon = callPackage ../development/python-modules/zdaemon { }; zeek = toPythonModule (pkgs.zeek.override { |