From aa010a329dd3393b81c56ff7cd09688ead07f619 Mon Sep 17 00:00:00 2001 From: Emily Trau Date: Wed, 6 Apr 2022 04:45:11 +1000 Subject: [PATCH 01/56] openvscode-server: 1.62.3 -> 1.66.0 --- pkgs/servers/openvscode-server/default.nix | 25 ++++++++----------- .../remove-node-download.patch | 16 ++++++------ 2 files changed, 20 insertions(+), 21 deletions(-) diff --git a/pkgs/servers/openvscode-server/default.nix b/pkgs/servers/openvscode-server/default.nix index 67f525d46a07..99ef62210bf9 100644 --- a/pkgs/servers/openvscode-server/default.nix +++ b/pkgs/servers/openvscode-server/default.nix @@ -13,7 +13,8 @@ let vsBuildTarget = { x86_64-linux = "linux-x64"; aarch64-linux = "linux-arm64"; - x86_64-darwin = "darwin"; + x86_64-darwin = "darwin-x64"; + aarch64-darwin = "darwin-arm64"; }.${system} or (throw "Unsupported system ${system}"); # replaces esbuild's download script with a binary from nixpkgs @@ -26,13 +27,13 @@ let in stdenv.mkDerivation rec { pname = "openvscode-server"; - version = "1.62.3"; + version = "1.66.0"; src = fetchFromGitHub { owner = "gitpod-io"; repo = "openvscode-server"; rev = "openvscode-server-v${version}"; - sha256 = "0822181gbd6y8bzn65liv7prqv7pg067sbl8nac02zg7268qwi6j"; + sha256 = "g5QaxZDVXvE/vOe2BjBXlqYLGZ2EG4nTKdUlLdt8H8A="; }; yarnCache = stdenv.mkDerivation { @@ -55,7 +56,7 @@ in stdenv.mkDerivation rec { outputHashMode = "recursive"; outputHashAlgo = "sha256"; - outputHash = "0rmcixcn7lmrndb2pq0x895qp34hc271h1j0n3xq9rv603v1ayvk"; + outputHash = "sha256-BeVJsruiRLReGMwThfcEm/ez4UFcr0oI4wwevJwxt58="; }; # Extract the Node.js source code which is used to compile packages with @@ -123,7 +124,7 @@ in stdenv.mkDerivation rec { patchShebangs ./remote/node_modules # put ripgrep binary into bin so postinstall does not try to download it - find -name vscode-ripgrep -type d \ + find -path "*@vscode/ripgrep" -type d \ -execdir mkdir -p {}/bin \; \ -execdir ln -s ${ripgrep}/bin/rg {}/bin/rg \; '' + lib.optionalString stdenv.isDarwin '' @@ -150,13 +151,9 @@ in stdenv.mkDerivation rec { ''; installPhase = '' - mkdir -p $out/libexec - - cp -R -T ../vscode-reh-web-${vsBuildTarget} "$out/libexec" - - ln -s ${nodejs}/bin/node $out/libexec - - makeWrapper "$out/libexec/server.sh" "$out/bin/openvscode-server" + mkdir -p $out + cp -R -T ../vscode-reh-web-${vsBuildTarget} $out + ln -s ${nodejs}/bin/node $out ''; meta = with lib; { @@ -167,7 +164,7 @@ in stdenv.mkDerivation rec { ''; homepage = "https://github.com/gitpod-io/openvscode-server"; license = licenses.mit; - maintainers = with maintainers; [ dguenther ghuntley ]; - platforms = [ "x86_64-linux" "aarch64-linux" "x86_64-darwin" ]; + maintainers = with maintainers; [ dguenther ghuntley emilytrau ]; + platforms = [ "x86_64-linux" "aarch64-linux" "x86_64-darwin" "aarch64-darwin" ]; }; } diff --git a/pkgs/servers/openvscode-server/remove-node-download.patch b/pkgs/servers/openvscode-server/remove-node-download.patch index 9262be5b293d..c53b79de019e 100644 --- a/pkgs/servers/openvscode-server/remove-node-download.patch +++ b/pkgs/servers/openvscode-server/remove-node-download.patch @@ -1,15 +1,17 @@ ---- ./build/gulpfile.reh.js -+++ ./build/gulpfile.reh.js -@@ -277,8 +277,6 @@ +diff --git a/build/gulpfile.reh.js b/build/gulpfile.reh.js +index a44941a1e73..5fc924cb367 100644 +--- a/build/gulpfile.reh.js ++++ b/build/gulpfile.reh.js +@@ -265,8 +265,6 @@ function packageTask(type, platform, arch, sourceFolderName, destinationFolderNa .pipe(util.stripSourceMappingURL()) .pipe(jsFilter.restore); -- const nodePath = `.build/node/v${nodeVersion}/${platform}-${platform === 'darwin' ? 'x64' : arch}`; +- const nodePath = `.build/node/v${nodeVersion}/${platform}-${arch}`; - const node = gulp.src(`${nodePath}/**`, { base: nodePath, dot: true }); let web = []; if (type === 'reh-web') { -@@ -296,7 +294,6 @@ +@@ -284,7 +282,6 @@ function packageTask(type, platform, arch, sourceFolderName, destinationFolderNa license, sources, deps, @@ -17,11 +19,11 @@ ...web ); -@@ -376,7 +373,6 @@ +@@ -382,7 +379,6 @@ function tweakProductForServerWeb(product) { 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}`), +- gulp.task(`node-${platform}-${arch}`), util.rimraf(path.join(BUILD_ROOT, destinationFolderName)), packageTask(type, platform, arch, sourceFolderName, destinationFolderName) )); From 0c5dc9c01ac7b9ed14bb24670fb314332b83503e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tomek=20Ma=C5=84ko?= Date: Tue, 26 Apr 2022 17:19:44 +0200 Subject: [PATCH 02/56] brave: 1.37.116 -> 1.38.109 and fix VAAPI/Vulkan Co-authored-by: Sandro --- .../networking/browsers/brave/default.nix | 113 ++++++++++-------- 1 file changed, 63 insertions(+), 50 deletions(-) diff --git a/pkgs/applications/networking/browsers/brave/default.nix b/pkgs/applications/networking/browsers/brave/default.nix index 5d6df5dac0de..ed9f16066b0d 100644 --- a/pkgs/applications/networking/browsers/brave/default.nix +++ b/pkgs/applications/networking/browsers/brave/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl +{ lib, stdenv, fetchurl, wrapGAppsHook , dpkg , alsa-lib , at-spi2-atk @@ -15,7 +15,6 @@ , gnome , gsettings-desktop-schemas , gtk3 -, libpulseaudio , libuuid , libdrm , libX11 @@ -41,63 +40,58 @@ , xorg , zlib , xdg-utils -, wrapGAppsHook +, snappy + +# command line arguments which are always set e.g "--disable-gpu" , commandLineArgs ? "" + +# Necessary for USB audio devices. +, pulseSupport ? stdenv.isLinux +, libpulseaudio + +# For video acceleration via VA-API (--enable-features=VaapiVideoDecoder,VaapiVideoEncoder) +, libvaSupport ? stdenv.isLinux +, libva +, enableVideoAcceleration ? libvaSupport + +# For Vulkan support (--enable-features=Vulkan); disabled by default as it seems to break VA-API +, vulkanSupport ? false +, addOpenGLRunpath +, enableVulkan ? vulkanSupport }: let + inherit (lib) optional optionals makeLibraryPath makeSearchPathOutput makeBinPath + optionalString strings escapeShellArg; -rpath = lib.makeLibraryPath [ - alsa-lib - at-spi2-atk - at-spi2-core - atk - cairo - cups - dbus - expat - fontconfig - freetype - gdk-pixbuf - glib - gtk3 - libdrm - libpulseaudio - libX11 - libxkbcommon - libXScrnSaver - libXcomposite - libXcursor - libXdamage - libXext - libXfixes - libXi - libXrandr - libXrender - libxshmfence - libXtst - libuuid - mesa - nspr - nss - pango - pipewire - udev - wayland - xdg-utils - xorg.libxcb - zlib -]; + deps = [ + alsa-lib at-spi2-atk at-spi2-core atk cairo cups dbus expat + fontconfig freetype gdk-pixbuf glib gtk3 libdrm libX11 + libxkbcommon libXScrnSaver libXcomposite libXcursor libXdamage + libXext libXfixes libXi libXrandr libXrender libxshmfence + libXtst libuuid mesa nspr nss pango pipewire udev wayland + xdg-utils xorg.libxcb zlib snappy + ] + ++ optional pulseSupport libpulseaudio + ++ optional libvaSupport libva; + rpath = makeLibraryPath deps + ":" + makeSearchPathOutput "lib" "lib64" deps; + binpath = makeBinPath deps; + + enableFeatures = optionals enableVideoAcceleration [ "VaapiVideoDecoder" "VaapiVideoEncoder" ] + ++ optional enableVulkan "Vulkan"; + + # The feature disable is needed for VAAPI to work correctly: https://github.com/brave/brave-browser/issues/20935 + disableFeatures = optional enableVideoAcceleration "UseChromeOSDirectVideoDecoder"; in stdenv.mkDerivation rec { pname = "brave"; - version = "1.37.116"; + version = "1.38.109"; src = fetchurl { url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_amd64.deb"; - sha256 = "HoqmzUyYas5ho9S8ZeXHj+LuNspejuQ69B6HxuKXWtw="; + sha256 = "sha256-w/Wm8msW4etF6E1UDujLfixhxmKBcnB+uw/CMcj4jGI="; }; dontConfigure = true; @@ -107,7 +101,13 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ dpkg wrapGAppsHook ]; - buildInputs = [ glib gsettings-desktop-schemas gnome.adwaita-icon-theme ]; + buildInputs = [ + # needed for GSETTINGS_SCHEMAS_PATH + glib gsettings-desktop-schemas gtk3 + + # needed for XDG_ICON_DIRS + gnome.adwaita-icon-theme + ]; unpackPhase = "dpkg-deb --fsys-tarfile $src | tar -x --no-same-permissions --no-same-owner"; @@ -161,8 +161,21 @@ stdenv.mkDerivation rec { preFixup = '' # Add command line args to wrapGApp. - gappsWrapperArgs+=(--add-flags ${lib.escapeShellArg commandLineArgs}) - gappsWrapperArgs+=(--add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform=wayland}}") + gappsWrapperArgs+=( + --prefix LD_LIBRARY_PATH : ${rpath} + --prefix PATH : ${binpath} + ${optionalString (enableFeatures != []) '' + --add-flags "--enable-features=${strings.concatStringsSep "," enableFeatures}" + ''} + ${optionalString (disableFeatures != []) '' + --add-flags "--disable-features=${strings.concatStringsSep "," disableFeatures}" + ''} + --add-flags ${escapeShellArg commandLineArgs} + --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform=wayland}}" + ${optionalString vulkanSupport '' + --prefix XDG_DATA_DIRS : "${addOpenGLRunpath.driverLink}/share" + ''} + ) ''; installCheckPhase = '' @@ -175,7 +188,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://brave.com/"; description = "Privacy-oriented browser for Desktop and Laptop computers"; - changelog = "https://github.com/brave/brave-browser/blob/master/CHANGELOG_DESKTOP.md#" + lib.replaceStrings [ "." ] [ "" ] version; + changelog = "https://github.com/brave/brave-browser/blob/master/CHANGELOG_DESKTOP.md#" + replaceStrings [ "." ] [ "" ] version; longDescription = '' Brave browser blocks the ads and trackers that slow you down, chew up your bandwidth, and invade your privacy. Brave lets you From 5b13c1e65713d1ebd19e8972adfb7ab9a4c2606d Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Fri, 22 Apr 2022 10:29:09 +0800 Subject: [PATCH 03/56] stdenv: use gcc11 for riscv --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index bd01fc2dd2d2..be637dafe862 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12419,7 +12419,7 @@ with pkgs; num = if (with stdenv.targetPlatform; isVc4 || libc == "relibc") then 6 else if (stdenv.targetPlatform.isAarch64 && stdenv.isDarwin) then 11 - else if (stdenv.targetPlatform.isx86_64) then 11 + else if (stdenv.targetPlatform.isx86_64 || stdenv.targetPlatform.isRiscV) then 11 else if stdenv.targetPlatform.isAarch64 then 9 else 10; numS = toString num; From 2a08573b1ecac12293afe33c3869ab97fef9ac93 Mon Sep 17 00:00:00 2001 From: Simonas Kazlauskas Date: Wed, 27 Apr 2022 01:40:31 +0300 Subject: [PATCH 04/56] tracy: 0.8 -> 0.8.1 --- pkgs/development/tools/tracy/default.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/development/tools/tracy/default.nix b/pkgs/development/tools/tracy/default.nix index fa0f472463c3..2904e20c99fc 100644 --- a/pkgs/development/tools/tracy/default.nix +++ b/pkgs/development/tools/tracy/default.nix @@ -1,23 +1,25 @@ -{ stdenv, lib, darwin, fetchFromGitHub, tbb, gtk3, glfw, pkg-config, freetype, Carbon, AppKit, capstone }: +{ stdenv, lib, darwin, fetchFromGitHub +, tbb, gtk3, glfw, pkg-config, freetype, Carbon, AppKit, capstone, dbus +}: let disableLTO = stdenv.cc.isClang && stdenv.isDarwin; # workaround issue #19098 in stdenv.mkDerivation rec { pname = "tracy"; - version = "0.8"; + version = "0.8.1"; src = fetchFromGitHub { owner = "wolfpld"; repo = "tracy"; rev = "v${version}"; - sha256 = "sha256-wsb2pOF8Y+cFHHSkDSJngTyWeLKCtFNK/mm+usyo+0k="; + sha256 = "sha256-4z3tos/sQUCL5UAcvqHzIzwoxo1fCGldNpmKsCXKJDs="; }; nativeBuildInputs = [ pkg-config ]; buildInputs = [ glfw capstone ] ++ lib.optionals stdenv.isDarwin [ Carbon AppKit freetype ] - ++ lib.optionals stdenv.isLinux [ gtk3 tbb ]; + ++ lib.optionals stdenv.isLinux [ gtk3 tbb dbus ]; NIX_CFLAGS_COMPILE = [ ] # Apple's compiler finds a format string security error on From 676ca56fb32b2f82dfce6a5adc523da8d08d5025 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sun, 1 May 2022 19:30:44 +0000 Subject: [PATCH 05/56] python3Packages.mat2: 0.12.3 -> 0.12.4 https://0xacab.org/jvoisin/mat2/-/blob/0.12.4/CHANGELOG.md --- pkgs/development/python-modules/mat2/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mat2/default.nix b/pkgs/development/python-modules/mat2/default.nix index 1d5a76b7b804..e8b514bc45aa 100644 --- a/pkgs/development/python-modules/mat2/default.nix +++ b/pkgs/development/python-modules/mat2/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { pname = "mat2"; - version = "0.12.3"; + version = "0.12.4"; disabled = pythonOlder "3.5"; @@ -31,7 +31,7 @@ buildPythonPackage rec { owner = "jvoisin"; repo = "mat2"; rev = version; - hash = "sha256-TW+FwlZ+J1tanPL5WuwXtZJmtYB9LaimeIaPlN/jzqo="; + hash = "sha256-HjPr4pb0x2Sdq8ALaZeQRnGHmNAoEV8XUGbhOjY00jc="; }; patches = [ From 0fac08c0b5abbb8ea44d8aa4c311aae3b5f75d5e Mon Sep 17 00:00:00 2001 From: Serge Belov Date: Mon, 4 Apr 2022 17:02:08 +1200 Subject: [PATCH 06/56] lao: init at 0.0.20060226 --- pkgs/data/fonts/lao/default.nix | 22 ++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 24 insertions(+) create mode 100644 pkgs/data/fonts/lao/default.nix diff --git a/pkgs/data/fonts/lao/default.nix b/pkgs/data/fonts/lao/default.nix new file mode 100644 index 000000000000..abe359410b3a --- /dev/null +++ b/pkgs/data/fonts/lao/default.nix @@ -0,0 +1,22 @@ +{ fetchzip, lib }: + +let + version = "0.0.20060226"; +in +fetchzip { + name = "lao-${version}"; + url = "mirror://debian/pool/main/f/fonts-lao/fonts-lao_${version}.orig.tar.xz"; + sha256 = "sha256-Ti3DNOgLR5VBJ1mSe8M+qs4UYbCR7qOPgqxRfmHa+jY="; + + postFetch = '' + mkdir -p $out/share/fonts + tar xf $downloadedFile --strip-components=1 -C $out/share/fonts fonts-lao-${version}/Phetsarath_OT.ttf + ''; + + meta = with lib; { + description = "TrueType font for Lao language"; + license = licenses.gpl2Plus; + maintainers = with lib.maintainers; [ serge ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index bfca44e2701d..a3dce075bb88 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -24376,6 +24376,8 @@ with pkgs; layan-kde = callPackage ../data/themes/layan-kde { }; + lao = callPackage ../data/fonts/lao {}; + lato = callPackage ../data/fonts/lato {}; league-of-moveable-type = callPackage ../data/fonts/league-of-moveable-type {}; From 5dacb960165067ab7d04e48edb1b61c1a2ef2b52 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 2 May 2022 02:27:06 +0000 Subject: [PATCH 07/56] python310Packages.Nikola: 8.2.1 -> 8.2.2 --- pkgs/development/python-modules/Nikola/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/Nikola/default.nix b/pkgs/development/python-modules/Nikola/default.nix index 001b750e752d..c95283acda51 100644 --- a/pkgs/development/python-modules/Nikola/default.nix +++ b/pkgs/development/python-modules/Nikola/default.nix @@ -41,12 +41,12 @@ buildPythonPackage rec { pname = "Nikola"; - version = "8.2.1"; + version = "8.2.2"; disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; - sha256 = "sha256-+LSnyIVA/lR9xbDIgreLyU+V/Z2pJD8v8agvJj05w94="; + sha256 = "sha256-lfSrBRwkWMHTFEJ4KmrWIx9XIMO5I9XxcuJe7zTxJsE="; }; propagatedBuildInputs = [ From 4bc73f44e6417806d6ba25a8de60b222b985eb6a Mon Sep 17 00:00:00 2001 From: techknowlogick Date: Mon, 2 May 2022 01:23:51 -0400 Subject: [PATCH 08/56] gitea: 1.16.6 -> 1.16.7 --- pkgs/applications/version-management/gitea/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/gitea/default.nix b/pkgs/applications/version-management/gitea/default.nix index 57147e360a21..6ad600e07ccb 100644 --- a/pkgs/applications/version-management/gitea/default.nix +++ b/pkgs/applications/version-management/gitea/default.nix @@ -16,12 +16,12 @@ with lib; buildGoPackage rec { pname = "gitea"; - version = "1.16.6"; + version = "1.16.7"; # not fetching directly from the git repo, because that lacks several vendor files for the web UI src = fetchurl { url = "https://github.com/go-gitea/gitea/releases/download/v${version}/gitea-src-${version}.tar.gz"; - sha256 = "sha256-LlAnTTFuqbMa7QPf51D6+RalWuYqTKlSlxGXyt4h0aE="; + sha256 = "sha256-UVmbFtHC4W3WF+DptdHMMUoe8UE5TVgoM9QRuczSrEg="; }; unpackPhase = '' From a5e152175d3f3fae591d5798464b8beaf2e55157 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 30 Apr 2022 17:21:21 +0200 Subject: [PATCH 09/56] python310Packages.pydeps: init at 1.10.17 --- .../python-modules/pydeps/default.nix | 60 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + pkgs/top-level/python-packages.nix | 4 ++ 3 files changed, 66 insertions(+) create mode 100644 pkgs/development/python-modules/pydeps/default.nix diff --git a/pkgs/development/python-modules/pydeps/default.nix b/pkgs/development/python-modules/pydeps/default.nix new file mode 100644 index 000000000000..9cfd0fe3c9cf --- /dev/null +++ b/pkgs/development/python-modules/pydeps/default.nix @@ -0,0 +1,60 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, graphviz +, stdlib-list +, pytestCheckHook +, pythonOlder +, pyyaml +}: + +buildPythonPackage rec { + pname = "pydeps"; + version = "1.10.17"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "thebjorn"; + repo = pname; + rev = "v${version}"; + hash = "sha256-V0LgHFvGvJqDHmyXJNb0sJjRuqGGDZpV467XDmdFg5k="; + }; + + buildInputs = [ + graphviz + ]; + + propagatedBuildInputs = [ + graphviz + stdlib-list + ]; + + checkInputs = [ + pytestCheckHook + pyyaml + ]; + + postPatch = '' + # Path is hard-coded + substituteInPlace pydeps/dot.py \ + --replace "dot -Gstart=1" "${lib.makeBinPath [ graphviz ]}/dot -Gstart=1" + ''; + + disabledTests = [ + # Would require to have additional modules available + "test_find_package_names" + ]; + + pythonImportsCheck = [ + "pydeps" + ]; + + meta = with lib; { + description = "Python module dependency visualization"; + homepage = "https://github.com/thebjorn/pydeps"; + license = licenses.bsd2; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 80bc32f334bd..18749d568f0a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9558,6 +9558,8 @@ with pkgs; py-spy = callPackage ../development/tools/py-spy { }; + pydeps = with python3Packages; toPythonApplication pydeps; + pytrainer = callPackage ../applications/misc/pytrainer { }; pywal = with python3Packages; toPythonApplication pywal; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 2cbe36ee8f5d..3d8ede6a29a5 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6993,6 +6993,10 @@ in { pydenticon = callPackage ../development/python-modules/pydenticon { }; + pydeps = callPackage ../development/python-modules/pydeps { + inherit (pkgs) graphviz; + }; + pydes = callPackage ../development/python-modules/pydes { }; py-desmume = callPackage ../development/python-modules/py-desmume { }; From d4801769322666d7d10117dad1e61aa3b871d3a3 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 2 May 2022 09:33:06 +0200 Subject: [PATCH 10/56] grype: 0.35.0 -> 0.36.0 --- pkgs/tools/security/grype/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/grype/default.nix b/pkgs/tools/security/grype/default.nix index c8326fe09ff2..0b67babddef2 100644 --- a/pkgs/tools/security/grype/default.nix +++ b/pkgs/tools/security/grype/default.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "grype"; - version = "0.35.0"; + version = "0.36.0"; src = fetchFromGitHub { owner = "anchore"; repo = pname; rev = "v${version}"; - sha256 = "sha256-DZ3/t6+iVmPCH4LBbtEqIdPdzmQu7fsNlJnHZ54alVw="; + sha256 = "sha256-8bU7vuTbPoHGCoXiCc4p0rPzCSsYuXM3A2NAgIaHuIw="; # populate values that require us to use git. By doing this in postFetch we # can delete .git afterwards and maintain better reproducibility of the src. leaveDotGit = true; @@ -25,7 +25,7 @@ buildGoModule rec { ''; }; - vendorSha256 = "sha256-RHsDwbQO+2OLmpqCSC9goHv9ut64Kp+cw18jdLvhmK8="; + vendorSha256 = "sha256-Dn3lDdwUK+C7pQwN3uq7p4WkyG5tXTPd18rQGpwqcPI="; nativeBuildInputs = [ installShellFiles From becaf4acdf8407c4d33e5f80090600f55599e93a Mon Sep 17 00:00:00 2001 From: Alexander Bakker Date: Mon, 2 May 2022 10:55:55 +0200 Subject: [PATCH 11/56] python3Packages.flask_login: 0.6.0 -> 0.6.1 --- pkgs/development/python-modules/flask-login/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/flask-login/default.nix b/pkgs/development/python-modules/flask-login/default.nix index 62eb3287f8c7..cd5bab252cc8 100644 --- a/pkgs/development/python-modules/flask-login/default.nix +++ b/pkgs/development/python-modules/flask-login/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "flask-login"; - version = "0.6.0"; + version = "0.6.1"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -20,7 +20,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "Flask-Login"; inherit version; - sha256 = "sha256-qoT8+0w88JyljAjoFre85z8TSboc8T0A2N/8WHLV/PY="; + sha256 = "sha256-EwbUdKJwoDbW/RT0VkDE13NV5PHGfKQzGzctNEiZe4w="; }; propagatedBuildInputs = [ From b1b3f87d63c9ed6f0e22f0ec0670d281a32f10a9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Mon, 2 May 2022 12:01:30 +0200 Subject: [PATCH 12/56] htop: remove with lib over entire file --- pkgs/tools/system/htop/default.nix | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/pkgs/tools/system/htop/default.nix b/pkgs/tools/system/htop/default.nix index 26d10d1278da..7024fdfb0cd2 100644 --- a/pkgs/tools/system/htop/default.nix +++ b/pkgs/tools/system/htop/default.nix @@ -5,8 +5,6 @@ , systemdSupport ? stdenv.isLinux, systemd }: -with lib; - assert systemdSupport -> stdenv.isLinux; stdenv.mkDerivation rec { @@ -23,25 +21,25 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook ]; buildInputs = [ ncurses ] - ++ optional stdenv.isDarwin IOKit - ++ optional sensorsSupport lm_sensors - ++ optional systemdSupport systemd + ++ lib.optional stdenv.isDarwin IOKit + ++ lib.optional sensorsSupport lm_sensors + ++ lib.optional systemdSupport systemd ; configureFlags = [ "--enable-unicode" "--sysconfdir=/etc" ] - ++ optional sensorsSupport "--with-sensors" + ++ lib.optional sensorsSupport "--with-sensors" ; postFixup = let - optionalPatch = pred: so: optionalString pred "patchelf --add-needed ${so} $out/bin/htop"; + optionalPatch = pred: so: lib.optionalString pred "patchelf --add-needed ${so} $out/bin/htop"; in '' ${optionalPatch sensorsSupport "${lm_sensors}/lib/libsensors.so"} ${optionalPatch systemdSupport "${systemd}/lib/libsystemd.so"} ''; - meta = { + meta = with lib; { description = "An interactive process viewer for Linux"; homepage = "https://htop.dev"; license = licenses.gpl2Only; From 9f0746f997cbbadad1f69ccd97f89430f15daecb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Mon, 2 May 2022 12:01:54 +0200 Subject: [PATCH 13/56] htop: make changelog url better clickable --- pkgs/tools/system/htop/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/system/htop/default.nix b/pkgs/tools/system/htop/default.nix index 7024fdfb0cd2..74f8095a681f 100644 --- a/pkgs/tools/system/htop/default.nix +++ b/pkgs/tools/system/htop/default.nix @@ -45,6 +45,6 @@ stdenv.mkDerivation rec { license = licenses.gpl2Only; platforms = platforms.all; maintainers = with maintainers; [ rob relrod ]; - changelog = "https://github.com/htop-dev/${pname}/blob/${version}/ChangeLog"; + changelog = "https://github.com/htop-dev/htop/blob/${version}/ChangeLog"; }; } From e5cd0b86b1ff8ddb45eb4438f310c6c2624ab560 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 2 May 2022 10:08:41 +0000 Subject: [PATCH 14/56] python310Packages.pims: 0.5 -> 0.6.0 --- pkgs/development/python-modules/pims/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pims/default.nix b/pkgs/development/python-modules/pims/default.nix index 2f9fbdccd550..d331bf372bbc 100644 --- a/pkgs/development/python-modules/pims/default.nix +++ b/pkgs/development/python-modules/pims/default.nix @@ -10,12 +10,12 @@ }: buildPythonPackage rec { - version = "0.5"; + version = "0.6.0"; pname = "PIMS"; src = fetchPypi { inherit pname version; - sha256 = "a02cdcbb153e2792042fb0bae7df4f30878bbba1f2d176114a87ee0dc18715a0"; + sha256 = "sha256-EQJ0LWQsi4rMcQ011QK11whe4SiMNhg3PvjEcgMLxoM="; }; checkInputs = [ nose ]; From f5a3980a5b24bbffef9b66aba48b1eba6cfa05c8 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 2 May 2022 12:30:19 +0200 Subject: [PATCH 15/56] adreaper: init at 1.1 --- pkgs/tools/security/adreaper/default.nix | 33 ++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 35 insertions(+) create mode 100644 pkgs/tools/security/adreaper/default.nix diff --git a/pkgs/tools/security/adreaper/default.nix b/pkgs/tools/security/adreaper/default.nix new file mode 100644 index 000000000000..e0329a83f62b --- /dev/null +++ b/pkgs/tools/security/adreaper/default.nix @@ -0,0 +1,33 @@ +{ lib +, stdenv +, buildGoModule +, fetchFromGitHub +}: + +buildGoModule rec { + pname = "adreaper"; + version = "1.1"; + + src = fetchFromGitHub { + owner = "AidenPearce369"; + repo = "ADReaper"; + rev = "ADReaperv${version}"; + sha256 = "sha256-+FCb5TV9MUcRyex2M4rn2RhcIsXQFbtm1T4r7MpcRQs="; + }; + + vendorSha256 = "sha256-lU39kj/uz0l7Rodsu6+UMv2o579eu1KUbutUNZni7bM="; + + postInstall = lib.optionalString (!stdenv.isDarwin) '' + mv $out/bin/ADReaper $out/bin/$pname + ''; + + meta = with lib; { + description = "Enumeration tool for Windows Active Directories"; + homepage = "https://github.com/AidenPearce369/ADReaper"; + # Upstream doesn't have a license yet + # https://github.com/AidenPearce369/ADReaper/issues/2 + license = with licenses; [ unfree ]; + maintainers = with maintainers; [ fab ]; + mainProgram = "ADReaper"; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e780640be541..38a48914f602 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14684,6 +14684,8 @@ with pkgs; actionlint = callPackage ../development/tools/analysis/actionlint { }; + adreaper = callPackage ../tools/security/adreaper { }; + adtool = callPackage ../tools/admin/adtool { }; inherit (callPackage ../development/tools/alloy { From 42b719a3be121861df8497b4d3de44e631694216 Mon Sep 17 00:00:00 2001 From: Erik Arvstedt Date: Mon, 2 May 2022 12:38:48 +0200 Subject: [PATCH 16/56] tesseract: fix `fetch-language-hashes` - Don't match spaces in language names - Remove duplicate languages --- pkgs/applications/graphics/tesseract/fetch-language-hashes | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/graphics/tesseract/fetch-language-hashes b/pkgs/applications/graphics/tesseract/fetch-language-hashes index c431f1d97c26..05d4514898e3 100755 --- a/pkgs/applications/graphics/tesseract/fetch-language-hashes +++ b/pkgs/applications/graphics/tesseract/fetch-language-hashes @@ -25,7 +25,7 @@ else >&2 echo "Invalid tessdataRev: $tessdataRev" exit 1 }) - langCodes=$(echo $(echo "$repoPage" | grep -ohP "(?<=/)[^/]+?(?=\.traineddata)" | sort)) + langCodes=$(echo $(echo "$repoPage" | grep -ohP "(?<=/)[^/ ]+?(?=\.traineddata)" | sort -u)) fi for lang in $langCodes; do From 683c50d805dcb6037a5b67331cc796dc2d60707b Mon Sep 17 00:00:00 2001 From: Erik Arvstedt Date: Mon, 2 May 2022 12:38:49 +0200 Subject: [PATCH 17/56] tesseract: switch to SRI hash format --- .../graphics/tesseract/fetch-language-hashes | 2 +- .../graphics/tesseract/languages.nix | 225 +++++++++--------- .../graphics/tesseract/tesseract3.nix | 2 +- .../graphics/tesseract/tesseract4.nix | 2 +- 4 files changed, 116 insertions(+), 115 deletions(-) diff --git a/pkgs/applications/graphics/tesseract/fetch-language-hashes b/pkgs/applications/graphics/tesseract/fetch-language-hashes index 05d4514898e3..b8aedcfbd9c0 100755 --- a/pkgs/applications/graphics/tesseract/fetch-language-hashes +++ b/pkgs/applications/graphics/tesseract/fetch-language-hashes @@ -30,6 +30,6 @@ fi for lang in $langCodes; do url=https://github.com/tesseract-ocr/tessdata/raw/$tessdataRev/$lang.traineddata - hash=$(nix-prefetch-url $url 2>/dev/null) + hash=$(nix hash to-sri --type sha256 $(nix-prefetch-url $url 2>/dev/null)) echo "$lang = \"$hash\";" done diff --git a/pkgs/applications/graphics/tesseract/languages.nix b/pkgs/applications/graphics/tesseract/languages.nix index 08512a5cdd9d..87d3e25b8a11 100644 --- a/pkgs/applications/graphics/tesseract/languages.nix +++ b/pkgs/applications/graphics/tesseract/languages.nix @@ -7,12 +7,12 @@ rec { owner = "tesseract-ocr"; repo = "tessdata"; rev = tessdataRev; - sha256 = tessdata; + hash = tessdata; }; - languageFile = lang: sha256: fetchurl { + languageFile = lang: hash: fetchurl { url = "https://github.com/tesseract-ocr/tessdata/raw/${tessdataRev}/${lang}.traineddata"; - inherit sha256; + inherit hash; }; in { @@ -32,118 +32,119 @@ rec { v3 = makeLanguages { tessdataRev = "3cf1e2df1fe1d1da29295c9ef0983796c7958b7d"; - tessdata = "1v4b63v5nzcxr2y3635r19l7lj5smjmc9vfk0wmxlryxncb4vpg7"; - all = "0yj6h9n6h0kzzcqsn3z87vsi8pa60szp0yiayb0znd0v9my0dqhn"; + tessdata = "sha256-591NFrPdZ9orB9PtxKqsukh6aAq5DDO8yJ19W/Ywi+w="; + all = "sha256-FuIGfE0bNPvB8ip6cL8GRl0U9T7oD6sx+38CaGyCRno="; # Run `./fetch-language-hashes ` to generate these hashes languages = { - afr = "15dsnzy4i9ai26ilm73gkfj4ck039raa88i6w443c4b1fnay2akf"; - amh = "1wbcsdq3svxga3j1alk61xs72a9fhsfsyjxhp3cwxfaqfhrzg7h4"; - ara = "0nk495gki6jbbnwcl2ybsx4nd02d6qykcjncq0d2g8pbgapqmj91"; - asm = "0c3wq15yphq7x74s2sn3f90k6z1cf5j7ic62z0dynidrv99bddfh"; - aze = "0pz073hxqkx1a1cshlgg5k11lj73s52sdxa7k3020drc314lhaxw"; - aze_cyrl = "0djbfgx28ykcjsn2p0766qrmj256g7vhc7valc3ivsva8b906lxq"; - bel = "04zqy8vik0fcakq6apfp8wjhkkhlg0yn9kmag1lk7s8fy9ax3ws2"; - ben = "0q7812kn5xjm47hcgdcg911lhbgqr7hbvqckfxxm8qw0yjx2cy0m"; - bod = "0rwq7539zzfs8xs0bf1535z1cwkm0yk1ni25f5gjav7nm6qpiaan"; - bos = "1qr04dj7lx347gxpin5nfprbggmxq2mwx8kf3pcc3vb5x3pa57g4"; - bul = "0cyyqgi3i4y9bfzwls0lwljzgd0r8ayfqb4bbvdh4qmbni9x42ya"; - cat = "0kgw8f5pdw9lfbn6cfp5n1s0j8pj3418yx6rsbagzcf1gr36gbr9"; - ceb = "1g1n4np4vhar7wfwx2km5k6kldb600rrl7npfbf75229rar068f1"; - ces = "0zxkkyhpd74i6321nv86pkjb0k7p9cp6m174rbn42nl7jz6qxib0"; - chi_sim = "0k250xr0gk9yh22yqxd0zpxdsrqfzs164kdv5n9rxx1g996yffij"; - chi_tra = "03nxqpd546p0gwfj6pqzbdbv5zjpdddzlpa10xn4nvmks1mmckbp"; - chr = "1k1sg3hap0kd5aa36ysvmhp7r3fynxf0f7lzz814h6p3g250zclb"; - cym = "0d6wbf9cmrrzf66mhcckwdfy3xh2i38r0by9nk6isw9rl7bf7j07"; - dan = "1s1yj56rpzmif3ir3qs4iab744cgpflk7y8812z2665bh61illpr"; - dan_frak = "1bxi53ymib5g0139vfd2pflh7nl5925vqznq3sfgaqx7gdx630vi"; - deu = "0fna7fqk1a8ivd7q2k38vx37qm3vbn183zh4z5zfqb4pgqmb8znb"; - deu_frak = "1y4krkvarg7jxhcq49fgybg4phbn58y9c0z2bm8mnp28jkih1cnb"; - dzo = "1fcz0imi7zxi99762pxfcm5iz2jcbqj3s742magka4ihrxnz07xm"; - ell = "0r0f71jy4y29bg055qvvy93wchi3lh08zz0k9c8l7466b03yvq5v"; - eng = "0vghah8kqcv0n5fnjb88w6siz156ysrc41fckw3f2y8c3sgmqlf0"; - enm = "10y61xv3w1ypgqz5rgb22y5hh1i4zx03cwiqw21ifqvg4xdrln46"; - epo = "1y5lh55mbcx33cm7qlf1dcah8ffycxmlcpzjzx9r6ij14fdd4964"; - equ = "1nqrd0a9jqqh6byy8snfhad1hisrc92dcx44wsy7v4nf40j3mx1s"; - est = "12ll8lq1hjcsq9hh93020w78r7f1rcxcwlvrjqw8j5p3k9jg5a4g"; - eus = "034s9mp7lw1a4yvf2cmbbj2fbqbaq6xnjqh30yn0wq0c0jck96nw"; - fas = "0m61p4byc0kzf75cdn6g18s8hcg9r8ifs34wr85lbsb65kil4ijx"; - fin = "1wac333k0lcd5jwprzg99b10bq8sdc96b9d6275kg9imyqjwcc7q"; - fra = "1ax7i0nw1lwkz4sbrvn4z0lcrcai77ymdpla7qk7yij6s4xb5bw6"; - frk = "16nmr71p93724vk1x5mq4r8vxpwnm448p6dwqv8scg8asch1cidp"; - frm = "00yz3hz7wcralq8wbx1ap4c6b37ac6vnz5bgmxmgdx0kqzibiddn"; - gle = "1n8z8kmn5m628rlzgz5v0iw6h46aalflq5asa1wj5rygx1y2azpa"; - glg = "0fdniayplc3iwmlmvhblarh1gm97dp8rqhhkb8b0clwfd9cj342z"; - grc = "04r2193qcxqyab5998xn8bf7197wiccmjm7iakij8d0c7l61dnxb"; - guj = "0dp8mlxmf0x9wb8dg0c508sdwz03icq94z8ji8jhwgdqgv8hw1al"; - hat = "0793mmlxbb09c8103jhdvlczz647nyn4ykkgd3gwgavncmjh72v8"; - heb = "16za9ff1i3ya6hz75l9v3v7j4039kscxxw21g3i2w5p9zn52hyag"; - hin = "1vnn5wpc724kgib8jbx0kpnnp4al60ivqir72gnbyh6cpnflb6bf"; - hrv = "15rqd6xiv2bdmalb5s6rxvw0yk6w9agn9fli3bvi703q6vpj2yn3"; - hun = "19zzwdxwi3h3vdsgr271i1m87gfpdirk6b1ljw2j8qmfilp4sw56"; - iku = "1v1yvc1194qycjgb4ihh5hpj6472nlbp66dii183514g2dh9x0db"; - ind = "120d4b41wvsgcd1sgy2mp78i9hvi7w03a63078dz1yds0yqdwf1p"; - isl = "003ngk8dfv6dglkq8pmi6jsglrfkc65js5ywh3vvkg7qfqf6qsxz"; - ita = "1lxklk3zc3x3k8yfpp6ygyv7fndgs57dfasc97rh8782ds16wkjs"; - ita_old = "188gby1y51pa1ycyc8y17d16hs5w27yl5ch7xzni98bdjkwbkl1z"; - jav = "1fjyjznjchls5ifbnx2b9xagisgxvgj9lsf39rr9d87sbzdbbwbp"; - jpn = "1wmayj8wh3pfwznjhalad2qzv38mhrzw2sxl71mycvzvpdy9ag1w"; - kan = "0hak4953whw9vd9dzl0hq076kzb19kk45kmfxk03af4k6gb206vg"; - kat = "16k0057cvvdc6snm5svhdv3cr7cw71g74yy8215njjbsi838imi3"; - kat_old = "02gl755d38plyvzwfjqxvjgfqkbjs9rvzx33qfhm2zvmgbwrfrfh"; - kaz = "0hc36w7zz5waycsk220v0r83sg991gd5f5r937mvz44viql80sgm"; - khm = "1gb2nv5qdq5fz9w9xq4fj68p46b62sd1m986ra5qbnskxqizr12s"; - kir = "1b1ing6qqi8qqfh4xpk76rp4gxp69wdjdl5m777ayx3v02d7nhh3"; - kor = "1rldj6f8h1nn5wpx57b0ci7p0fnivnwzgaf0d3576xls26z2wcgv"; - kur = "1cp2pfd6g662gvxi7ywkxfbfq1lwbis888bf1gg8ynzy342mx1ic"; - lao = "03bdaxakmxpbbr9vsnbzzfksvm6js0l5i0ijwl71piqyxqjj1gxf"; - lat = "1q7v7drnwpna9k2l79jbdlxiv1j617rqzjc9d48h3lfrma5z97sj"; - lav = "0fxzyvw7n67rmw2irvlghkf1bii4w47200zv26p0v3a9dwvhc7sg"; - lit = "0f00ggjjqrl94kwwjmjqwajyfprsml0br8vhn2gvn11gaxvm52hm"; - mal = "1i83plhin3m6sq8p92vzlyng5z59gvvqypyh7rnmvdmm9rranx8a"; - mar = "0ay7q53yl3709crvn5l9c9jx7hw6m5d3x2crmvnvczsh83ayfdik"; - mkd = "1q1wadcr4j1dzssyyqz43qmizc6vfqkbivr6xi2p7p4h9rl11x73"; - mlt = "1qp4v6habak1l7xrw322wglvjjndrfp4j7bj8d4npwbzk1sh4s0h"; - msa = "048p6mkx9zr40s9s5vbi0gnizhvqwn0g8i1hf1l8db7igbax5xyj"; - mya = "17nyr5bd42kzvid3421n3mwckd49vzrjhjahd8rnfsmbsy1x382l"; - nep = "154375r32sdmvcnp1ckvgbp3wxvb2xiiypb8bxbsvrabrz4wzjqc"; - nld = "1clwbky71zkz55zd3f8r9hj8fhpnbkply80p1js4fvs7x12r715x"; - nor = "1ynvrz6s0vmlq1xkjd8k2w6bx8770x6v29qgx83d4nl17ngjd459"; - ori = "0dsakc8gnwhs6z5kxc2wdkbn31gkkiqk5vriw0swghychp164aac"; - osd = "1zq0dfliavglmix7zzrqdxz1w01rm1f1x1352bqn8xf4zivdbxcw"; - pan = "1fwdpwkydfmr6drwgkqzn89z12r2rdm02a75vvdxhxg2a9yiwmbv"; - pol = "155z870ygzws476kp7qpzi8jcjcv3jb5px8rbzhnag1fklqr48hx"; - por = "1814cff2rffpzlg4hyyrjzpf5ps2i95rmpa4c8ikblbvrlcv97q8"; - pus = "1iz5nn1zfvn1l9gb1jriwx991d2hwwc7x4k1nvzjlwpzscplx25b"; - ron = "11lr80zhvnnngvwwk01z1d3prfpbh3qbwpl1nl5fp7h09d6n3wzl"; - rus = "1d6a8lg4bmd3np16jds1py3qpkaq4ahnhwghd5r0159y0jpxq00q"; - san = "169f4ajgwn99yfdfrlwfvdgvv1abal7fpdp31sknvq8l7w2sak3g"; - sin = "1411g18r6f6j6f4n0sn7ajgs4gkplb892s6ak0hi9nyyxwv3r1gm"; - slk = "0bxfbrg1nf6px0xzkh6ihdi71fmr1rxxs99qb191k7pm16x2lpds"; - slk_frak = "0zyqnn1y5cyx1y7wzgw743k4584ljl0rhvk2q1ni6jnjx9ciwzqy"; - slv = "1kjn9m9hbwp0m0p2v8c3skpzr6f8x42hz8x48zl22550a7hq8n1h"; - spa = "1npgl8ylvfm60hd4214z8a3lriy1hckhijschrbjpzmwdfcqafgj"; - spa_old = "0w4ivkv8flyn7bjlyjcrcrdnslkvrrfs7l33mvird1jhhkyqd8sx"; - sqi = "15wzvh6qm3yx7yf0k5j7g1imsaqxvq7r2xh6a0xgmkqbyypbbkdf"; - srp = "05blqriv30x02c80ds3x7zhw0y21nc6lkqlv5jwgwnjgw4yfpgrm"; - srp_latn = "0ss8s3q60aq8sd2a3sbnzvp13qqarxnjw4hij8hd9ab5gsjw0nwr"; - swa = "1pwwhx7ldq21cv06cchws8gvwsmkwn5sjcy9z3nk3nbp9qjsf44f"; - swe = "0l10iyn2cr7ibgk0akmpg8725mpwpydawgv3s77izsw7y6xhfr1a"; - syr = "08bxil13wyp5h4hvbxjcys7ypgqgg46rrp653m7gyv5q94ycjgb0"; - tam = "1g155kyba2wjfgzgy48g6yd2csinwbfjdi5r7vw0wm3dh1z39dvz"; - tel = "0fydrcb54b6mmqazb337x4s36i2a64sb4xm7y7g3nqqmk9afsipv"; - tgk = "0f6j37friywj7y132fv0jm6aj4sx8f0b7brspj3pbjqqpi4v5ws0"; - tgl = "0f1r0gicif57qhyw8xaa1sqgny720q3z5cpd5srrn9i6fihaz577"; - tha = "1y2hw55jfpidk95y8qbsiczgg2r2khabac97s1y3gl0v93a44jna"; - tir = "1y7iryhjr83ca4yh5jjz7qlnrx4kbrp0a0p650whjvk2gnv8m98h"; - tur = "0xqnq99b2jb4v74bj95py6wmg14dm31zp5s3l48dmcv6zdgcxg2w"; - uig = "1sdddr15zlb33kd1d7hzi5lfd15bfhqn105d7x6snfpqp7vq4bxv"; - ukr = "0cdwjnfnnmzz7jdn49l96vqgaimclfxcxaw09cm63f5my382r2rg"; - urd = "10xcn1zs2lfswp5yai0ckyg7js587qhr5cf7qib3i35qjbw7nc18"; - uzb = "1jkkd5j6vsx5jv5gwprbfwg1vwh714prm8j446wzvp74brmk949l"; - uzb_cyrl = "1kdia38rgm2qd3ly80a412jyagxxryr09h1nz2d0iw71bmfn4855"; - vie = "1ja18jxxaw282y4jljxpjf1gj15il61vc2ykpfy22vn88wvydxff"; - yid = "1jddd0g8mm5v00z5kb8rbpfs7ppzgq9kzm1xlhhvv960yfdbi6fd"; + afr = "sha256-birhlXVhETYI4SYipFROA0xGpJtvnEqjEVGlSPy3upU="; + amh = "sha256-BJ73M3RYuc7ZuLBLr52GLilxdA9mUhXkUK9vPXDTbPE="; + ara = "sha256-IcmKr3rroicawMxKNj02TYBmSdfLC8q4XUuaOF9JZFo="; + asm = "sha256-0LW2Utq5Resb+MKweGRxLHwzQXLDaqHJ6QfD60vAfDA="; + aze = "sha256-vCtISRgsNyDAmEf1pkXR40gawizvUahZUKFP3OE44F8="; + aze_cyrl = "sha256-uFMD0kJq6x0Ho2ofBvd5pghZMzbmgCuslmx6JPpzSzY="; + bel = "sha256-QvPRVfIO6TNpeKrOZD14FM4JJUfXXWXwVMyBGTfy+BM="; + ben = "sha256-FXgmuvSAY1R7d5PhveDJ+C1IQ0iPtcfgIVX2YqcI6GA="; + bod = "sha256-Vql4san2bCVfcUVEG6YHdXIWfhkluAV0R9r9n0Y5mGc="; + bos = "sha256-5J2i7uhl7cHYHW6izqvAvb638nW22Hj7O2R0emQjIOM="; + bul = "sha256-ygvSU7SrYgLbXoss7LxCGbT3JeUUaMq/W8mTOOLD3jM="; + cat = "sha256-Ka9nRn7Bsf/U0tl0jwIZ8iIJdLDlOmbscjTxdotD/E0="; + ceb = "sha256-wSEDsspJiHLcctcemjMAZjU6zSx1is4dP1nBTa4lNrw="; + ces = "sha256-YMWOzZeHWkHsyuSEai5L90yw5LwGbRvEMJGcdqGfs38="; + chi_sim = "sha256-MjrnTUov9J6TLbtNYoL+Dmfd+v2gdeyFgD7NB3IHRUw="; + chi_tra = "sha256-d01Wa9CzbktsB0Fd+ltrV/6yV1sfXyMdf+AaUtrF3Q4="; + chr = "sha256-i7IPinjjGkgC+p8eB1y33o18LqxbezOUKm2Cq+B4Osw="; + cym = "sha256-B8jj1qE5cR3NtMkvkNGIAvbhXeOTMViNcT/nypJb3DQ="; + dan = "sha256-+VIag4GrGCO+CAj5M6m7jxFylopE45HjcLH+m02RPug="; + dan_frak = "sha256-cYNhenunY/WcHth+vItIhdoDqbuiuZ1GAK+sWP0osa8="; + deu = "sha256-y360Kn6XLOx++QT+gYJde1R8Rt9oTIFP2xGpMLE7yjo="; + deu_frak = "sha256-y7IA45RIXFtRXeIDljwqdsFL3vLPJYIZ7PK8rPbMk/g="; + dzo = "sha256-tR/wbc8wEjWfqoIcPSReTIofS2WuX2FOSrH/E2sEn7k="; + ell = "sha256-u+DtB1jGkEMRSxP8jwCkI0LGR/J741LAW0l44mU4DmQ="; + eng = "sha256-wFFcnx4MeeEGn8wFwrL2poQfteEILWldsWAzPBFU8G0="; + enm = "sha256-hliaWydvYxeD4DhyNkD/JAYIixdivVw+ftcHPnYPxoM="; + epo = "sha256-xCTSmiNBRpNT//JfRmtn3jkEFWvBUXwqG6OzVUuBtPg="; + equ = "sha256-OvQ6JCDOkn285oR01kRiWUcYmoLOauT9MhBjmRRoGds="; + est = "sha256-j6jyZJrjFok4lnlTzjrLwZ2MDgcCjARhwppJGDBFlIo="; + eus = "sha256-3Jo0mQQMYA6sBwNiabvBauHlhFyrMuG2Jypwem5Nmgw="; + fas = "sha256-XUZC4yxm6UULypwM7SLK6TGINArP2MbKcX8C5he5wVQ="; + fin = "sha256-+DDGJfY1pjfLEaalZRJrGuEFwkrp/Xy5LI1RMMcYTPE="; + fra = "sha256-hq+yOtFGRn8mPoreVv05UbHMKPjE7rw0+ZPTwC2Ip6s="; + frk = "sha256-t0UWINMKPabRxryZiwiplt++USa4lh7mJuKMdMPJ1Zo="; + frm = "sha256-trW44scT9PZqr2+Vb7dh6oxlGLkq9MURpiozfj4c3wM="; + gle = "sha256-6n4lfOjP5yJ5UFoVTB1VyhBoeAS7/PdpRsLUYutEH9k="; + glg = "sha256-X5AhWWqOUwYWWhNCnNFtJ9UXYFZ0wV1p5XEwer2Ktjk="; + grc = "sha256-q9sWDD0MNCTjVPFUWRmL/KRw3EK2o5TKUh53hkcKIhM="; + guj = "sha256-VAUO0X64PQ4lihJ9kjCLA3zeNAKFgdfQ4qkDVzut6DY="; + hat = "sha256-aIsDZWV2q8ffaG9OT6y3h5j/Gd0NygECYgms1WmtIx0="; + heb = "sha256-T3koiv3pFi7ieEHw3pmeaQAizx470XI+NMqPGJxL6ps="; + hin = "sha256-bplFnb3MQL/sEydHvCMwVJFr7Z2gL4lWfJOIwy4v1u4="; + hrv = "sha256-w3oh7zZ4gBP3GpG6ZJ9K3EwP+O7Z6LKoqm2JHbtpOJc="; + hun = "sha256-pnBNLo2uYiQFlzQsM3Ns172DaojhiPx02wOOyHvj/6c="; + iku = "sha256-q4GeYBOPhDJQiLEZcxe14hAjLywQRrKeZB6TFALbPuw="; + ind = "sha256-NzjesAe6+fAbOmAYNQA/ccMU0blV+KdDY09vHsgiDYg="; + isl = "sha256-v2tsHHb4vLn3gNwXLYth02X6tDSxXoQnfc1s19B8dgA="; + ita = "sha256-Wk5ugm4CHQTzSUwr107Rr1l3tn/e3Os8mqMP9seks9M="; + ita_old = "sha256-P9C5+JRtoRTt7weyQv0RvGhoQjvBI+aZD+qG4oNfD6E="; + jav = "sha256-d/G12l/6oJZyTsNpmuTb/en4VE9LdLtcLJpCJu2XXro="; + jpn = "sha256-PDyVfLv7b+ZrOLRrwX+GFY39sWiKKijt5+4OyJH0qvI="; + kan = "sha256-bxsg1jOTODXA7K7OQuZMYf1pDsAQ0N9S24lDPkoiU0E="; + kat = "sha256-I9aIBop6SWlLEMh7cl44nJ3Mxm5w61KtNqztzU4BYJo="; + kat_old = "sha256-0GWX+Xp1f1Ghw2P0v3PSck3sntwdS8f/9vSi0Uo59Ak="; + kaz = "sha256-9WmAKI6bkL/rGSkXV9oLKT09UAYbCDE184qX/w83g0E="; + khm = "sha256-WoT8I+5T24WLygalGpoWZhlykZGO4J54+q7ghsu2Yr0="; + kir = "sha256-A0J7mgB7dK/OObXQJhtP5vZHbjZn3k6gwxhFjM2zMaw="; + kor = "sha256-+zEuvhGadnPKaMCp97nd0TpwT2RgndIvL9YGiJyRjeY="; + kur = "sha256-LIZeBRn+W4/eC24hhHRcnAbsluuT+xP7fsKYZ5q74rI="; + lao = "sha256-rr8gJe4exxsO5TKCWCjQ0tStp/t/Wb1TXuv2OlVXbQ0="; + lat = "sha256-Up/0i6rZ0QERaYnJj/MJRoYdO21LpkPFTMpebnM7++A="; + lav = "sha256-Tx8GN29JjQ2uEfsDIA7hJMYV3ISP7hwFr/kYe/j2vzs="; + lit = "sha256-FYpSd1cvBLufsHCjvACtOl/npeJYVsn5JIlmLOV7ADg="; + mal = "sha256-CnWrck61tl1tPtBfj/d+qfzyrKd/i3QR1qYOGyG9A8U="; + mar = "sha256-Mzbn1UBQf7btrpmJPlqphsPTZWKJFrszS+AM6kfBxys="; + mkd = "sha256-4/QQaE6Q3HNF7CbvuCZ227AfKx7kY++1/i1IkllTPOA="; + mlt = "sha256-EGgCdZh/8WtJQ3IdSa7LzUq56eNCDJ77oWGqpaDZ5OI="; + msa = "sha256-0vfS1XrxrIZocDBE9IDleMMf7QNx7aKTBiT/1Gc1FxE="; + mya = "sha256-VKDRg9eramczalBJKPPfibTJeB02CDJa3H8K0lbJ3p4="; + nep = "sha256-DMvPyc9L5a1XX2hdH2MXa3c+7np7snAt27VpMXI5g5Q="; + nld = "sha256-vYSTRehHb0e0DBcgT+9c9kKHJEwZudF+KX/+cPxcnLI="; + nor = "sha256-qZAmnz2BWtIG6g8nsU0H56C+DBcTNTl7wLRuoM3P2/o="; + ori = "sha256-TCliwoXMw8c14DHvMnGc84Vh12xcsD7LNxpy+xCbSjc="; + osd = "sha256-nPXVdvzEdWTxEmWEHlyoOQAefm84/396rPRtFalrAP8="; + pan = "sha256-e1UefVLiddjb3uUoAWrLIovwE7Ifz8dzM7m65ie/jbs="; + pol = "sha256-HSKSMZ0uPGXhXxn1W5Ycm0kmUfwXnzvNIZr/58FBv5Q="; + por = "sha256-CJ+0Gc170TUjYkTdmkuKQt/i7pfZe0ge/de5LJxjJKA="; + pus = "sha256-q4hOL9P/cir/tmGSfhjnULSQUucxy7BeosFu94O15cc="; + ron = "sha256-9PNhTUsAnusKtYFevvCA67p8Rws/gMn5ftbaDT9AmYY="; + rus = "sha256-GADcrwQ+lQByafBxaKEiWM2Lh79BN2nCtaPVRR5FyrQ="; + san = "sha256-b0ylBT8U4W2nDuO26w5VS4W9X9uO0+ya8ylZ/qQiLpk="; + sin = "sha256-9YU8Nu/e2xQhmMpokdCidz6in1THamCJM9I4k1F4IZA="; + slk = "sha256-ul0qugn1nhlSWDgl3XsOubpwYoPRwPk76Nc4G15eri8="; + slk_frak = "sha256-Hn8eWerSShNtwGJumAGVlKBC5iCHv8+PD92z4oO12H8="; + slv = "sha256-MFiE4VGgFCHoR6SjDwXpyJn879SDoS0uqODyBVNNVs4="; + spa = "sha256-8jmFmWu8/itXhkzLCCeDwcdMh0KfBEEaBKa6TT2i79o="; + spa_old = "sha256-XaOG/YRQhpbjrmPQo13Oe1JtW2aZSU/lOtZTh/bckXA="; + sqi = "sha256-rs21rvcLz/o6UAZ2kQ/eHStdY3hHlgmcP92Pig3cn5c="; + srp = "sha256-Nb/rPOFPWv64LJviSQ2zQXjA4T996AYQE6CDsWPGdBU="; + srp_latn = "sha256-mVvApX5lqdQgkhESLm3PCuMR7v526aFE0wgrYPDQSGs="; + swa = "sha256-jhCnJU532THt+MkzqYvls2q+H9IcMmbAZkHgRk+HnN8="; + swe = "sha256-KmQHu/GH6x/P0WM/rpq//NYiDnq3TgXmW/FkJqyPIFA="; + syr = "sha256-YD3JPEm4bP9OHcXcnA15D7/rj/ZM9rUhgeV6PgKNfSE="; + tam = "sha256-f7c0foBtVA74PrnEJt3iNmommjcPEf/+c5ILtfwsJbw="; + tel = "sha256-+0btVJoVYzve8ad2sjQxSkQzNOlnjPUVrtUsUhbLzTs="; + tgk = "sha256-QPOySbwYy3WHvDqvs4BDXROpTJVgOzGCP5L7mN0Z0jg="; + tgl = "sha256-55SvYHQmJpuzLu2y8gcG4nj7sA5KdcQ9xKe4yOIDOTg="; + tha = "sha256-ykpC1Egb0Dd80CcxtRScIov3Pot6YeRLmi1eJ0vhUPg="; + tir = "sha256-EKWKtn1ibgk5KOYCBW5ek/RsKT5fygI9UWygLKHP8fg="; + tur = "sha256-XLzOXvtms9oQoUOX+8OojYRXufG3JLnI2WRJsVLCFnc="; + uig = "sha256-uy+C97n4OqtNP62AYDF0q4TmaIkfnhbaHGPRX0Jurek="; + ukr = "sha256-L4ss0PC1uGEqS4CrzrqjrEb18DaJJmKbPP9Xa52VvDE="; + urd = "sha256-KDB7+JK4jDhWxMexkiE+qGh5np8MROXL5dpRoX+wrIM="; + uzb = "sha256-NJE0a17k3P25IUSimi8JB/IdHncrX/7KlqXrbWRpc8o="; + uzb_cyrl = "sha256-pSBiXV3h8Aia+DbABLLPvT/lpQhEAeTpaFjUl9FQsc0="; + vie = "sha256-zvXmN0fIbiG8u9MLtoOhsQT5gpO3SyqJF0hw1btEQck="; + yid = "sha256-zZm4mvPApL0hpD3UPxN+/96j3V0ZrVk+ALvUih5orck="; + }; }; diff --git a/pkgs/applications/graphics/tesseract/tesseract3.nix b/pkgs/applications/graphics/tesseract/tesseract3.nix index 7b9669bc465e..85f2e89d27b1 100644 --- a/pkgs/applications/graphics/tesseract/tesseract3.nix +++ b/pkgs/applications/graphics/tesseract/tesseract3.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { owner = "tesseract-ocr"; repo = "tesseract"; rev = version; - sha256 = "11wrpcfl118wxsv2c3w2scznwb48c4547qml42s2bpdz079g8y30"; + hash = "sha256-YHj00gG/3SW0ILTiQwphiCxuP9OCDya27hyFQB27mYc="; }; enableParallelBuilding = true; diff --git a/pkgs/applications/graphics/tesseract/tesseract4.nix b/pkgs/applications/graphics/tesseract/tesseract4.nix index f78220d2f401..6a3039c71fea 100644 --- a/pkgs/applications/graphics/tesseract/tesseract4.nix +++ b/pkgs/applications/graphics/tesseract/tesseract4.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { owner = "tesseract-ocr"; repo = "tesseract"; rev = version; - sha256 = "1ca27zbjpx35nxh9fha410z3jskwyj06i5hqiqdc08s2d7kdivwn"; + hash = "sha256-lu/Y5mlCI8AajhiWaID0fGo5PghEQZdgt2X0K9c/QrE="; }; patches = [ From 05325328358a960a7308ba37fd1094758059f297 Mon Sep 17 00:00:00 2001 From: Erik Arvstedt Date: Mon, 2 May 2022 12:38:50 +0200 Subject: [PATCH 18/56] tesseract: use multi-line build inputs format --- .../graphics/tesseract/tesseract3.nix | 15 +++++++++++++-- .../graphics/tesseract/tesseract4.nix | 16 ++++++++++++++-- 2 files changed, 27 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/graphics/tesseract/tesseract3.nix b/pkgs/applications/graphics/tesseract/tesseract3.nix index 85f2e89d27b1..0e5f38ae7918 100644 --- a/pkgs/applications/graphics/tesseract/tesseract3.nix +++ b/pkgs/applications/graphics/tesseract/tesseract3.nix @@ -14,8 +14,19 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - nativeBuildInputs = [ pkg-config autoreconfHook ]; - buildInputs = [ leptonica libpng libtiff icu pango opencl-headers ]; + nativeBuildInputs = [ + pkg-config + autoreconfHook + ]; + + buildInputs = [ + leptonica + libpng + libtiff + icu + pango + opencl-headers + ]; LIBLEPT_HEADERSDIR = "${leptonica}/include"; diff --git a/pkgs/applications/graphics/tesseract/tesseract4.nix b/pkgs/applications/graphics/tesseract/tesseract4.nix index 6a3039c71fea..d1f936fab079 100644 --- a/pkgs/applications/graphics/tesseract/tesseract4.nix +++ b/pkgs/applications/graphics/tesseract/tesseract4.nix @@ -26,8 +26,20 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - nativeBuildInputs = [ pkg-config autoreconfHook autoconf-archive ]; - buildInputs = [ leptonica libpng libtiff icu pango opencl-headers ]; + nativeBuildInputs = [ + pkg-config + autoreconfHook + autoconf-archive + ]; + + buildInputs = [ + leptonica + libpng + libtiff + icu + pango + opencl-headers + ]; meta = { description = "OCR engine"; From 15122dfdd9d70e4889bda2820fd05a87eb090cd3 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 2 May 2022 11:16:26 +0000 Subject: [PATCH 19/56] python310Packages.apispec: 5.2.0 -> 5.2.1 --- pkgs/development/python-modules/apispec/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/apispec/default.nix b/pkgs/development/python-modules/apispec/default.nix index e859f3127dcc..0c1458488109 100644 --- a/pkgs/development/python-modules/apispec/default.nix +++ b/pkgs/development/python-modules/apispec/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "apispec"; - version = "5.2.0"; + version = "5.2.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-XqNGC0MRULYWMj3WHsu3VXwurnF9r8HW50SUuF2PksE="; + hash = "sha256-z3VMQ5pW3xLwFJ/FaQpCJ3TprDOV+2eYiCwX+8OinS0="; }; propagatedBuildInputs = [ From 8fc246e8cf6803d63526eba0baacfa3332ab0e4b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 2 May 2022 11:23:34 +0000 Subject: [PATCH 20/56] python310Packages.svdtools: 0.1.22 -> 0.1.23 --- pkgs/development/python-modules/svdtools/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/svdtools/default.nix b/pkgs/development/python-modules/svdtools/default.nix index 98b59c18bdc3..21e6a143ce7e 100644 --- a/pkgs/development/python-modules/svdtools/default.nix +++ b/pkgs/development/python-modules/svdtools/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "svdtools"; - version = "0.1.22"; + version = "0.1.23"; format = "setuptools"; disabled = pythonOlder "3.8"; src = fetchPypi { inherit version pname; - hash = "sha256-5zMuCFCvh7BXr9BbyyDhWw1Lt/Fomv0SALiPJQbxJNQ="; + hash = "sha256-LuursRuUZEDLbk9Wbnq/S0dsZHbzIJo1YCSVFMUoiog="; }; propagatedBuildInputs = [ From 7d2cee008b636b2bb754bfbe43f09d8fbc460296 Mon Sep 17 00:00:00 2001 From: Erik Arvstedt Date: Mon, 2 May 2022 12:38:51 +0200 Subject: [PATCH 21/56] tesseract: add wrapper test --- .../graphics/tesseract/wrapper.nix | 32 +++++++++++++++++-- 1 file changed, 29 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/graphics/tesseract/wrapper.nix b/pkgs/applications/graphics/tesseract/wrapper.nix index 1dfc4393c46b..59686e3251f2 100644 --- a/pkgs/applications/graphics/tesseract/wrapper.nix +++ b/pkgs/applications/graphics/tesseract/wrapper.nix @@ -1,4 +1,5 @@ { lib, makeWrapper, tesseractBase, languages +, runCommand, imagemagick # A list of languages like [ "eng" "spa" … ] or `null` for all available languages , enableLanguages ? null @@ -12,8 +13,6 @@ }: let - passthru = { inherit tesseractBase languages tessdata; }; - tesseractWithData = tesseractBase.overrideAttrs (_: { inherit tesseractBase tessdata; @@ -47,9 +46,36 @@ let exit 1 fi ''; + }); - tesseract = (if enableLanguages == [] then tesseractBase else tesseractWithData) // passthru; + passthru = { inherit tesseractBase languages tessdata; }; + + # Only run test when all languages are available + test = lib.optionalAttrs (enableLanguages == null) { + tests.default = runCommand "tesseract-test-ocr" { + buildInputs = [ + tesseractWithData + imagemagick + ]; + } '' + text="hello nix" + + convert -size 400x40 xc:white -font 'DejaVu-Sans' -pointsize 20 \ + -fill black -annotate +5+20 "$text" /tmp/test-img.png 2>/dev/null + ocrResult=$(tesseract /tmp/test-img.png - | tr -d "\f") + + if [[ $ocrResult != $text ]]; then + echo "OCR test failed" + echo "expected: '$text'" + echo "actual: '$ocrResult'" + exit 1 + fi + touch $out + ''; + }; + + tesseract = (if enableLanguages == [] then tesseractBase else tesseractWithData) // passthru // test; in if enableLanguagesHash == null then tesseract From 1b38ecfc74e47d49f207d9092571852de834d3e1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Anselm=20Sch=C3=BCler?= Date: Mon, 2 May 2022 12:38:52 +0200 Subject: [PATCH 22/56] tesseract4.tessdata: 4.0.0 -> 4.1.0 --- .../graphics/tesseract/languages.nix | 265 +++++++++--------- 1 file changed, 132 insertions(+), 133 deletions(-) diff --git a/pkgs/applications/graphics/tesseract/languages.nix b/pkgs/applications/graphics/tesseract/languages.nix index 87d3e25b8a11..11270f70b5da 100644 --- a/pkgs/applications/graphics/tesseract/languages.nix +++ b/pkgs/applications/graphics/tesseract/languages.nix @@ -149,142 +149,141 @@ rec { }; v4 = makeLanguages { - tessdataRev = "4.0.0"; - tessdata = "1chw1ya5zf8aaj2ixr9x013x7vwwwjjmx6f2ag0d6i14lypygy28"; - all = "0dqgkp369rcvq72yhgnzj1pj8yrv7kqzc7y6sqs7nzcq7l5qazlg"; + tessdataRev = "4.1.0"; + tessdata = "sha256-70bp4prs1zUbSzQmcqd7v736cyYWv8oNNbmZXypik5I="; + all = "sha256-hk+DjoVWf7RW9S+Gu9XUX8aWYYsL5dU5c6jLSKJp+MY="; # Run `./fetch-language-hashes ` to generate these hashes languages = { - afr = "1a9f8pnrspfmcq9gpjnxn2kkhjlsmh912bnpx671fjizxpmiri2y"; - amh = "0m1vdyxjx57kmf2qra0p31k509y1cqn4pyckzw00i5n3wx11d2j0"; - ara = "0nswl6n0s94g900j5k1gwzp7m140c0yd9a2fdb2lzhdvg1krf190"; - asm = "025d9vrjcrwyd6cc6hrw1x8xqhicgrb9wpvhhmlw71ql04dadslf"; - aze = "01shcs78a6xn3my8p3y42x1c9f5hzfn83w2n2nwpffbgz4y2nsgf"; - aze_cyrl = "1sbd89i5r7rnkjh2in8j0plrxnfiill9jl8pr68iw77ghih6q1vg"; - bel = "0dhyymsxcyzwal8474q7ag3m2akv0b92hkdz7rka5z1cxry1cn8c"; - ben = "0a7q9414k3frn37x2qcglz722ysg2iivj6kqaaa0ik7z14ibc8v0"; - bod = "0rh7x54nlh6ir6ldccj8hi7g8hwlp13r3fkljw8gndvhwmgfkkar"; - bos = "1szym4n605hlx12a9vpz4jjs76jscajh22rgkqwbv4qdsl0gi3nd"; - bre = "070f4c84iznblsw4jkwpzh9dss8nfb678160szm5r8dlv2yinrrk"; - bul = "03bg2yw79lg8rl43y9288313jrfh0h69vl4s4cmlgbmnbx8pvxwj"; - cat = "19xs691aj8yy2ff07c3gzm07zicd5ha0gmcjxjh9pknqf2gfy7qv"; - ceb = "1896vn41hqc4anm6hjvrnn022i0p8pmhwsp5rv9w2cvr6738l79r"; - ces = "0fh2g47msfr91285rnccxcmcshihm126sqy496s4vrr0vk8ix1nf"; - chi_sim = "0qxkvbpm5l7gzsshnn72wfx473pprf5nmw8hd4i4x2qxnfddh1gw"; - chi_sim_vert = "1f75pzvxbda82vxa2zb1z9b9f13sh81kzaw45vg5118ncsklj8w7"; - chi_tra = "056vjws1fir1v5iv44pzykkxs5q1dbb2j8blhj47i53w1zf6g42m"; - chi_tra_vert = "10c9cdycg1a5kwlgg60sh8yp07w2fl4whinpxfhlzrzs56allql4"; - chr = "19qq8a6c27973djsc4xpcklis92r58x21fg4mz5azdyka5i1n46l"; - cos = "0z9kx1hw8h5n00pcahxla808wya50wrkk8cz7x676pd93ibyrlyx"; - cym = "13pk9cpf43xxqbz3blfz2av2yd1ma6ds6jbdiqw8anhhj7l9ch2d"; - dan = "1jirmahxvyyswhhyzhinvcqaycz7m3ixchqrj3lgfcdi3anvabr2"; - dan_frak = "17wcgdqxmbzn7qchnx5gsa05aj4wmhbwk43w173bl3wr6h5ylmh0"; - deu = "194rqsg4nlycca9bg2fqf15xgcl110rxp182l7dbjfjhar4knsw9"; - deu_frak = "12hhhp32f15c7fw2jp05mwim9ps14kmamhh6vmalvm7r2033vbm7"; - div = "09mm9r5hxhsc4qpyg10ym9mc2kdpawx8zk0aiv1xpgd35rzpyz41"; - dzo = "1zk7crgcazgqy5zmslp6iw4jws07nja31qdxx0rpzhn3c0bjgw1b"; - ell = "1hhym18a9411953j47xjk47jx9ij9xi2qwlx05c93zl41528nsqg"; - eng = "0iy07z182lwhqfa0q288ha691scpsry330aynaizn68wcmywk86s"; - enm = "1dhr1qvil38bil43wk5ci645sbm3my2y9y7qlcbnwz2p4pflayvm"; - epo = "1jig4db7050vww32vxsqyig3j1b0vgz9ipxbsw0jpkjia84k44n9"; - equ = "02qwg6s1z7pynwm0p6dvpwi04ivfkr1s7qgssbla1dx7v0ih6rlg"; - est = "1jxygahy6by7fbirbmjmd68k6560q1a3h5mvpzdx15h5fw0q58gl"; - eus = "0cai7nm7si8680avrrls8bf9ski980rvsj560fh9y6n9rz7mh9mp"; - fao = "1n3434jf18bzakbylzyg3jaw2ad4h376g56dsql32bgh2yvyww8a"; - fas = "17wjkfka9725rz32clgqgk9msmbz4axs59vz30jmhhxyrkliafqb"; - fil = "0p713k8g27df9z384ns111xqxii5kq20m8brflsmd3yckw1mibhz"; - fin = "1wc3y9nnm7rb2c2c5fkj7cv7jb27jlkb2bh0g8kaz57h6imfmb2g"; - fra = "04qrfvi6irlaahh1pgn5azyfhbhavm12yyybza8603alf8firh7a"; - frk = "05cqmxxxjqdl5hjyzi6dpmixnjpd6f3jr6741yapdmnxvkzxkiyp"; - frm = "0a86yy6hd0lvlbzvnzjmyapzc0rn7mnkdadqycd65bw1b714cvy2"; - fry = "0i84r8g9hlkr9nlhypl4lq6ncrhbcpskqkdcijgk88c2fdknh57h"; - gla = "17idyhb505waz9dnb8dsk54faw7y0xvvb12yw71k0skq3i90akar"; - gle = "1q87h5zzcva54pg364d3hl6q9hdlydlyj1qmq8n5k7hqk11msxmk"; - glg = "01xssz1rhpy3a0sm4i43nba61wc2srz6wv327vdw1kg8ijm0s0g4"; - grc = "00x0s3smx4wg5h12y2b9al0j2jk1y3f0yy2x6f2qf7ps831drgyl"; - guj = "028v4fgn0zi2044vk6j2rlqklc9i0kj22s52vhifmx1g02kz9154"; - hat = "1bca516pr2cnyjlwycc7pr6gfmdjb8565hp06pw9nwpr20ry0hss"; - heb = "1qfkffjh29b21frs0mv6llsrchixl5kjkpj1if7fq816g9mym9kx"; - hin = "1rkfam5c6qil2590lfffzndhq3bncdgf4ij0cyjcglgyljgx0xnc"; - hrv = "0da7b6mk0rwc9zlbqkycwjpddp3qpy07l643i00ia5a1zq35fmgp"; - hun = "0w2s4mn9p74zqzmp9hh2017zgsh5v43k4lid4pv29f4b0y5gj9xi"; - hye = "0ifzm875wlbjh4vkpmj1n6f14m8i174413l6pc6i44y4p5fpgxrf"; - iku = "19arnv82xbxhbcy8pf9fv1sl5zc5707mk34nh7w46dlz86qkidmn"; - ind = "1d421hizwni4m6sr4f3nqqpr1g744hzn0krk130m7x8mhzgamba5"; - isl = "1hjjw8k2r9qa990ziq5wxr36kyf16mnmrqfmq5vbcjprka9h08pq"; - ita = "1qyrvlf7pjxzyb29sc7aq3gq61bww14sijka44scxggfw7134l3r"; - ita_old = "1pf8461jbj0vpyry0b54crmkf2bk9mh4klxvmj09jvf0aq2vm9s6"; - jav = "18vvbyimj0y462amjmwvqa6h9n8l122j9v0w3hfp63hlxpfprm0m"; - jpn = "16hma9w32vdh41ihymp894jza72b0d235hwriv18r78j5n86nhbg"; - jpn_vert = "0yca09l9sbpfjgb2slnpb9q7qd7vz3a1wb6bkln30d3nl0d9r1rn"; - kan = "0lcmx37rjfxkbhhbrld1ndmkwkm9w9b3pzxhas0cv5dqsx2f84jd"; - kat = "1b164bgwa7bbvw4177h8fxfh0fbh4bycfl9pkaa184dpjpaiqpia"; - kat_old = "1mgff7sh93hdp3wh0ckikdggrdgf0syp75s39pickpbkp9ic41ai"; - kaz = "0h37y0kb5lwsp5zpl7bvxg3ryqldl5hxfnardliwgyqgnag951vi"; - khm = "0m7x1fynr18sid2kjjw8xa9ika0a0fc6a6hvc7ihizi47893hdfb"; - kir = "09kxwqpqf6kxjii07qlqsiii83zk12rszp88xnzzjp8rjsnk78s3"; - kor = "0nsr43fwrp9876ia1fc0zcviv2n8hw16n0wfh158vhygwglvy84m"; - kor_vert = "1wmvdznmikk9fq7wdffvn22scxmcl26vjh26jhicqwxpc7kg4bh8"; - kur = "0gbsf3ny3n5mgb30v54bz3crgnimdpg19jn633pbpzryzg3xhd25"; - kur_ara = "1sbj0cczhi9q119fbzpi0m6zr9kjp3k76bv9w8szkv1wc5y4fng6"; - lao = "1gvxlg8bw3a4c9izg3c2a2yl7q6rsy7z9y64axdw9a04pz2ndbl5"; - lat = "0b7an3q3xrf9c55bhiqqh7l45ga88l0kwvkp1akmlr98piach3vr"; - lav = "0fqsmy47cygamddxyjfrdgkfa9bvmrvf4csvppnkdvfzy6iiv0c2"; - lit = "0wjgbkwc3bf5khdqali7ylnhhs4xvpx19m3zx2y9s27v2wjbb6kv"; - ltz = "02zdxbniiqfl87fzsiaaqgldqfsv15z5hja1xhxnqpl0nds7shfc"; - mal = "0a41ifz8i6lj2ywxjkwvymxzxahkz2cjv4apbrawdj1h42bn7frd"; - mar = "00swhlh9bckvmlxanfmlw5j4n9qqhggl84bsq0827bmijsqwnl44"; - mkd = "1bqfiwxlzfpz4fs4z5ci2wbv01qhrcayk1inmk3dxq7dsywx1ajg"; - mlt = "1rmmga2aw88hr7q7cfr5cvhnsgnf1mi069d5k7z66zp4vzbl4zyz"; - mon = "1jksvcavn9plsmjdmhg40mwq5rlvrd1b9gvghdjg7zkf6qqqynlh"; - mri = "0jlfawx20s5clsnk82ndy3v2zidh4cfh4acrh8nindk21xmiwh5i"; - msa = "0m7zs8anaa3l4z5f3xvbhs4syp41dp4all2yfpi1plyr0hy784an"; - mya = "0hljm5haadlr4k5rhw4mvhkygcnrr709rvl7amz7av3nskmi8mb1"; - nep = "1dhy0m2h6xfgwibf92iwxsn926dmrhfvkg9rafkdaqcr4pq6w563"; - nld = "0bspf5bv1s7qzm6k4aqbpq91zvk4kxxhx5zv08w91xfsa1zpdxmi"; - nor = "08majhc9m0fjvac50yq52ia2af9kscclimwkv403klnj4kgf8ndq"; - oci = "1mzrw9gsdjrd1xj3zv7l5gzgjq5jrygxf8cfkz20d9lls0wj1xdv"; - ori = "1sh42mjzb1hv6l6lljp3wifjmz7wrv818f9f16m8qjikwqxm0s78"; - osd = "03mvfk1q1xp1klpf4bwna903rnp51bkqr3gl5hvxybvrc3l2m7z1"; - pan = "0165kr94p6x5yxzs4p8sfppvg9cywp65ps0xaym5rqz9iashz32h"; - pol = "0g0b71ms6ddgykmkna4mlavgzgmh9vj6s62fi8l4ja93nfpr37hp"; - por = "132jbhzmcsq8skanm15bw2niyx9xpbrqr411wn7w9r5i3cvnlv01"; - pus = "0iiglnkn478al11avigsav625pn7ifscycnxpj6fg8835vjww3xr"; - que = "01vkmfi9idjwskv5pllmrxpil0v5h7f7rzv5viclxrzkmbvrz9b5"; - ron = "0ag6vs0cn3sryavs1mfrallgdgi4h28114g7m61rhlhq0z484g0m"; - rus = "1hippm3w5d73sh50r136x0xff2p6x128ry2x4fywf6xdpv1f46v8"; - san = "1qlpqkr5c5wqcf1bvlipy72advqnvd4wm61vghmrj2sda8mx87sx"; - sin = "097d2s4ma0zsq0ab5qs1ylgl9l5phw91fnpsvb7vjmz2mw3ic964"; - slk = "0c97pp5iffhdzyma605x8q3rx1qq9pq2h6cai1kppaj92rz3ji9k"; - slk_frak = "16ivsam1g18zlpw6pgidvzwb7h8rvw1s10nigs6yfwir8hjxsgki"; - slv = "0644jlm55p0dg4zchgrashmbv36zb4x649ckmf2jkbss8bzx7wsf"; - snd = "1i2mfi4414l3v9nznjy7959y2jcr8ymvf6w8zpyrw6nad4d1aak7"; - spa = "15kwvr7cpcnlxm1ja1yyc022dmsd04gmk7h1p0df12aicsscn3qb"; - spa_old = "1jq80c4mi3rmwnfhb3mbaaq0ci101mgbibkji9ala4l5dkcwjra3"; - sqi = "19cvvixhz9906p4c9i2grpr386rbp5alp4fp14xm9nd81bmq4701"; - srp = "1jd25n13h6vxsa3gzbj6q6mdh02rjl4qrd1bffr5psp33asqvw0l"; - srp_latn = "1k7577mn3z0bm5ma9d8l14sn5wpvw50hq1nxwbc36yn3a5b3mhiz"; - sun = "0lvlaw3jfvr7b5v09669kq8mm19jdsk9g5h09jsa2gr6fvsq11pa"; - swa = "0qy9qc5pa1dzzqrh1z40gk845z1r4d2smywnzydknbb3n240lhz0"; - swe = "1y56r7bgzw0pqkdylbah07r1f0v03sblkggiql8x5200rhaxvqi4"; - syr = "1vfj5fsiv170jghryrxwyz0i9mdsaki1kglxrklkb2caal9kwy38"; - tam = "0rhhdbnp0a2hpg00vpc0xyxcl2w36i1kn63mrvwx1f9q7m3y1fmf"; - tat = "0a74rp8pyp4yivv2xcy2m8xgwch8scr3wmk1fzniwzf43fsrqp76"; - tel = "0gcq8hxhxvilyh7x7kiikq07hllqysc8sfyr88gvpj4xi092h2bx"; - tgk = "1458gk0k6gk49n8lr6fj7l7cwkhxn0lrhybzq10zl1ly7yzjhf67"; - tgl = "12yscwckdy3l21mvsrj1021gxw2isjrg369r08rsf7lh96wn4wkn"; - tha = "01f0j7gsc5slxaaql1gqbhk4wlwaxc29dlmfxwjzikxc46gjl0w8"; - tir = "1q6w48b1jchv55713pq20inzjjdymh32fw8wxfaj1qi7bjqfb9fk"; - ton = "06g60ga8rys8jaimqrvd4svh40qs1nz4bszdnf2hdv05ibryibdq"; - tur = "0g9g1wvibp61qbriy8ys948yfkl88xk9g8f93bnq8w8dx029b6s8"; - uig = "09sajx21lw3a3ph62dyqr10pjaq2mij10sdhkhvvjiydk34dn548"; - ukr = "14q8ls8gkrg7c9pc6qzm6yf5ady3i3303vs1hz4d2idcl6yry334"; - urd = "15vszhqraxqdcng1069p6i4xq3ck3904q207nkbap6dfpcpjig40"; - uzb = "03hyw0vavmjirqs4wkd5r85g91w2avsyl14z624fhm3gc66pqg7n"; - uzb_cyrl = "1433lrrp2lfgb1k0a4sc20b35b2jcl8f1z92vm2936y7w04xpaq7"; - vie = "02k40d3wji74d1jgvkr3zrn9gpzlmp0lqhrrdmc48r2sgvnrnk8n"; - yid = "0xnbvi04xv1qapqg72wa3bjwbw51pkdnyncjpjp37vn6dzh04l0z"; - yor = "07w3aci52ng6i6nyp97q5zb2dqlj08w6im90y1h691qah1x44zlv"; + afr = "sha256-XsQc6+0/SheO6dcuERKsmko4p7DdyvsSZtVdne1FLqk="; + amh = "sha256-QIoWQufDlggA/5P5SyxmwSdQZhgXqIyFq/OULrtvO1Q="; + ara = "sha256-IAWXZ3i7wU/Fak6o1DxggIR67ucvzCIBSI8kDayhXFs="; + asm = "sha256-juqmGgEUh8NphXBfnlZ+LELcUQ88Q8OYaZ5nJvNOrQg="; + aze = "sha256-7mkrPPlvOXe5FVbwgaz7sLjEQhfEj4t8HbYbhY5mUAc="; + aze_cyrl = "sha256-bwdsYITvHB6RyRdRmSiN0dme6QUS2SignDafXGJCbek="; + bel = "sha256-DFkWfO4s/KJmPr9NKNICeypRx1MHk0MQVfx71nX1HjY="; + ben = "sha256-YCO2Ign/zAiUUngauWMUT3shzqePYdHPsNmNSQJJ+Cg="; + bod = "sha256-Wc3pXuVwN/sQl3S6kUe4lEP0ToRIMtaoydFAaknpB2Y="; + bos = "sha256-zY74ANUNk704ni8LAaViWpqjpST/7qRE6BQWYCyp/us="; + bre = "sha256-M2cbvdi0oVzq18AEdMxyFmndEvyXT0m4psv+SBAjDhw="; + bul = "sha256-kvd9UV+2rkcrI5rQnQwE0GU5wkBIJD8IzejRdLgXbw0="; + cat = "sha256-Gx/vnnDYzpug7JLVBxQsjcV/QP1vsAOcE94jqUIyuqc="; + ceb = "sha256-OR2KxjF5M8HTzuVqDutFF0QhgLV5S2iqVYRhGIjdJqE="; + ces = "sha256-zoYe0dwg5020ScRjbUSoMELNKuuM2VyQCCk7XQ95Ajo="; + chi_sim = "sha256-/AXYmrMdi04iaRDxaovL945DuuPiWAu1/u/QUu/as2M="; + chi_sim_vert = "sha256-hyNJp2YWhVDeLoSrPwOCegSXVvphfaH6Fki11fe/5bg="; + chi_tra = "sha256-VZBn3A98lHiIhHQhKdZqARfd5/T/ErJj2SFHFzSX2xQ="; + chi_tra_vert = "sha256-hGJKlSn650+h69dGyAl1gh9wPYIamPcon0WFx3xjiYE="; + chr = "sha256-1BAbYlHTt6/Kr+S5IDoqWSQd6WS3E6ZlGycdwYxCGKc="; + cos = "sha256-3dPsVxypXXNMP5+hOTMHRXmOAFK0Q8UuALZAxGHoM30="; + cym = "sha256-TUCW6JEQWoU4jm1Jo5tRNTQvthLf0TX+wr0P4i5L844="; + dan = "sha256-Ii+1rRqxMffokBlD1uOo5zOvMNs2wu8h5Nr73aGqOco="; + dan_frak = "sha256-AFbqCzSZD7rGCXyQyResnEhVgNKvdAsZPvav2nF7jJ8="; + deu = "sha256-iWs7SVZQOrnaoQKF2zMIgbLXS3DYibeSYsxTS57GmaQ="; + deu_frak = "sha256-p649BhD51E1V3QbCquokQd9UI68FXCm4O6wEJ8aFEIo="; + div = "sha256-gXx/fy6jvdvDjgrMjzpXt03BaqoehOcvJkzDDktOtSY="; + dzo = "sha256-K/AnF2DDwn8z6L3hMJS0B2guCY/mUl1/8fh9xV5mZ/4="; + ell = "sha256-D2uLRAmE/pFYAZ1yLGJPMqYuD5myHyJHSSGQpFCoHsI="; + eng = "sha256-2qDJfWUcGfujsl6BMXzWl+mQjIIICQyUw5BTgcI/wEc="; + enm = "sha256-dXtF3SVXfG4Xo/j45IWvoy5diImsTD4IjQsNGjcOGbY="; + epo = "sha256-yRIyCVJRzisB16vfmP7bYAU5XvRY9y0G5xsUcFYjL8o="; + equ = "sha256-j2YDI9int6Do0vrho0OebkcCIr+7mQsqt/6eH7R5HAs="; + est = "sha256-9KGCAXcFltDbv7sWOFTAwBQzkWlV1pXjcscv46F6vss="; + eus = "sha256-tyZYz8/JGp+gA6ZIvTNAKU6d3EKa5rwVQAZFfao9UTE="; + fao = "sha256-CnHutxfwLTEo1s2UZ86ApCnBlRzPf+rXVH+h4CQZZNg="; + fas = "sha256-CzsV6cy+Q1glGH+norsif1Vd03z4USbGz0WcpKabkp8="; + fil = "sha256-H65YA5/Mj1Y1dXmhCgSeJcaOewhBW4LGT64d8dAc4Vw="; + fin = "sha256-T6zqajTwlK8megAusSaVRyx5NjtyusIEEyufam3yg/E="; + fra = "sha256-6sAcHXJUDWCQ+st7L0LdCi7o/FfFvhsgVIrmaOJ2GRM="; + frk = "sha256-18fZ/9zd1naVD+SYLIcz7UrbY73NxO8lLLRh2XuvmBU="; + frm = "sha256-wm9GwlmBr2Ia87ipNm09NgP2r/JVfrv/opuCBo33Bik="; + fry = "sha256-8BRoZ3OCITSfjKxNPPVlC2ZmDaaEXg+pTXlSmB7KBEU="; + gla = "sha256-WU0FUhx4ajDD4V6EtXcH/nDlSJm6oWVb+ooXUBb0LZ4="; + gle = "sha256-s3ZdQ5gYnlkswhUH6WnztMGEDYWjETPeJUVt9n+BB+E="; + glg = "sha256-5AENqozozcDbPmJsbn7WgvFg1LKDRFI1UMNfmMPXugc="; + grc = "sha256-1L/cwkD6HoeFM114D9zwYUohAVVpCS8CLI+TXvXQoAM="; + guj = "sha256-pIT0pwAv9Ooi3KJoIeQEMTE6Mc1CmrkJASJ+YJ8jGwk="; + hat = "sha256-WkPgMxD5cpv4NeDCYgpaslX3TL6HMc+p9JaJfE0oiq0="; + heb = "sha256-fabqa3omIOyOi0HeKWehPUKWNaVmV6CzC2IlAaVz0+E="; + hin = "sha256-zHbQn6T+0cekZ0BG4l5jdg0Mm/3OOQpSETRiw0pVbuY="; + hrv = "sha256-91VXBv5BFRUBiIMYeoC/eNzWruTMT7zoT4xnMKtZRzU="; + hun = "sha256-sSf5igeLuCT2JS1SMgfZBer3TwACwnTrx5+cm2wlWnA="; + hye = "sha256-Lvd3XbnEExINu4aOQMgJEVUSnLFB1js3gXJRXg6q30U="; + iku = "sha256-trY4sUGfNkP4gZaMWQ84hf1CddguuYs8W7CvLtC2WaU="; + ind = "sha256-Ra2q3ocV9VPBCDNPYD8k5LyQL8Z2OJK1qSRa/iMMgrQ="; + isl = "sha256-+CIAk5r5SrZ2wdXhXG01wflpRu684PhBSgqnLCbiUsI="; + ita = "sha256-T3R2xhExK+uPjhgoiNoI6mQtmCSuRALMYjX2GrFAZAY="; + ita_old = "sha256-Rqe6BVbAbZmArLvTSWBNcwk3a2akLOCzvxvIJYMhyN0="; + jav = "sha256-FdR83e0UDnMdHBzsJIUIFNkEjcKbV1mVMMQDWaNfe6M="; + jpn = "sha256-b0FrkC0SnYzCjpnDMkQDSxz1JUnoVg9jILBtMXhSFZo="; + jpn_vert = "sha256-NoecGqB2NDAsncssHtT4+zR8cFrXUi3Wk+4unWgCink="; + kan = "sha256-TRLkRNe4lc2AVrD/O1biqU4+a7Oh0bwgXLM7mc/olVE="; + kat = "sha256-Kl4c1ZW3ERSUmjdRx/wicDkAXXcInhMI32sdxd8iJqw="; + kat_old = "sha256-UQXCYrpz3cniTUOXc70G7rX8XptxMgD5uA2OBPVx7tU="; + kaz = "sha256-cYeSnrIP+8cjbVlZ12GhjWKfx+t7HXp/uZrTsibwZ0A="; + khm = "sha256-yzU4Ejok/gjjYRsaZZgDCqgZk+qISzlFixqFbL0L/VQ="; + kir = "sha256-Q6MzrZYZXfm/7Qjdr7MI8w8UY9SY4gNilH0ahy/mfSY="; + kmr = "sha256-5llHfGE87Pk14mkvc+a4cqb8TQXx/uVSCDhF+BkDcuk="; + kor = "sha256-lSC/6ePPw41KgI4DawKHyIodN/uAuaCiOSjdzN0gWVs="; + kor_vert = "sha256-CC7y5mG3c8wilEZAuY2grHamhbDbucYPdmnOWO1vu/I="; + lao = "sha256-ha5mxb8EqMRbV8T49I/X2eBDvVCCjfdjYkQNvtCjfb8="; + lat = "sha256-eQ/IVLwoZVqnCnduPgFFSL1C6IEYR7hKYcnlPvCw6iw="; + lav = "sha256-goEdo/Hf7TbtvVsz4naueyXl5mvZSd9bq+p5doivGjs="; + lit = "sha256-e5q1JBf7CJ286H/UFPrdnWgILfUnUoUbnMWtwfhcT3I="; + ltz = "sha256-zEF9dLOAXmw77EFJWH4JWzvc6MNKRf3dQdThGO3q7Qs="; + mal = "sha256-LbtjlyAwyMZVXleRLZn4E6r+e/WbT9m5F5KaiL6LgSg="; + mar = "sha256-hFDLsZaxriMQwHoRRN+DGCdLZOG0Oqs6rXuylSCFXAM="; + mkd = "sha256-T6rQudft4N7GrDaG6RXLEAewFxeRlU+0I/+6TzuPDq8="; + mlt = "sha256-339C19/kfmP+maUlA2INzj5t4WYlO3bwyRAhroR6teY="; + mon = "sha256-kFqPMTZu/vNkg2+/tELLm+aCeQXkwdpk1fQmuxXbeso="; + mri = "sha256-sUAeaw9iNhstgpkpAh0jsMUv9vDNCjStpqxoIDpXjko="; + msa = "sha256-VhF0PATZ0xvidV5QqshtgVyviYZr9+HKJ3QoZRXS/1Q="; + mya = "sha256-YVUU69R2bHV+VYfunMDJ2bLnJ9yVcJjLJJk2pWCpkkI="; + nep = "sha256-wxRu8CWZYdWmUzm9uR3MtRmRrO48iuRW5M91A0UFHrY="; + nld = "sha256-sfZ2f1Da9ZA4AvuXDnufZO4fEr4LKzJN/fjosFdxVy8="; + nor = "sha256-uFnk3iTS0jkA2ZPXSBnTMzklVBQFe1CY2tKBmhiUqiI="; + oci = "sha256-u/UgOdCUpgbEn44h15/PsmD5/iv07D9kDy3Lpl/i+dc="; + ori = "sha256-6GhQO+YzSoyqCS45FNDO/PwqXeTjSkoNNRuG9WUVBOo="; + osd = "sha256-4Z8q6GB5L983LPSNjOcK5do8QFKWL+IuneH2gMN0uw4="; + pan = "sha256-UIwPtYrp41yqVx3oW8zlnqW373UaXaJ/96WbS1KexQQ="; + pol = "sha256-F56Rr7MjKUkoik4YbeROsL7/tqKVKDvr9K81o2s4Czw="; + por = "sha256-AWxqNxux5MSP5SGQjPO6PXUfreCrhGrV1AhrVj9cUow="; + pus = "sha256-uQ/O5S4DoeeMvN0yz7SLx94izFb6xa1CoAodYqelL0Y="; + que = "sha256-ZaWf96rz505Z3GX/fNyBZQMab8+V0lv21Fy2mKKrcwc="; + ron = "sha256-FTyCyAcYUpiDqeeREJCAJL72KFXZ1aC38lkPy4De5ik="; + rus = "sha256-aBviwr6tG8e9I134jETo5grnOuhmhAwK1OO0wke9N8I="; + san = "sha256-XR/UK1JNC5krfDuYyknbFu+mxPE30r2CY5gXVvLEl+I="; + sin = "sha256-xCQWB6/iV7nP2vpaFxKHt9BEH/VB47IUwPoDVYkW7SQ="; + slk = "sha256-M0U5fhZJqntniIoZKPBNGIeeB0a9AKOq/w06F8u9JzE="; + slk_frak = "sha256-cT7dJUQ5cueNftGCoAPfGcGz+N8tvmv4pR+FF6rSO5o="; + slv = "sha256-TvPT/0JarymFq5MlYjpZ34y9KtQqP8g+eQ3cUiqVhBg="; + snd = "sha256-ZyoVGmnKGp79/Ygbt6tHmUnhU0nHS/tt2oOSQEh0VcQ="; + spa = "sha256-Cw/LtGZRieAauAGeWR8BTdcmBGDeByVD7dSyy07efJY="; + spa_old = "sha256-Q2XJ2WyFEkVVinKuuF4NIEQGsFKrjgWd5TWPWAkDCMs="; + sqi = "sha256-ARyC6wqo2VQ7CdeRS1W5Kxs08s1PxMTINSClD3vcm6U="; + srp = "sha256-FPCNtRrj6luycyu0jAmVWQDYqsFGrv+G0n0bOIItosk="; + srp_latn = "sha256-P8I6VlHDejPY4t0GDEHh+/JiNQkUtaRqqQv8Yes55cw="; + sun = "sha256-6oaA9XYmP6G0TACWl6ZuMoVaEZ7JmAR2WSdvJwdXdFM="; + swa = "sha256-4EMKiLBjLTub/5b7qkUjOfxC0HyA/AAz/r8FdQvDyWM="; + swe = "sha256-JOLdFcwAiNIRxfG9SZceYAMX8gFQLerbxBfw/9bJpvg="; + syr = "sha256-aHg+E1WKiTXpzJ2+GeJUutUUwfe8Z5/hk+CEHbUr0u0="; + tam = "sha256-rrrgRz04udD5znUYO0M0gwvKuu+A3Q3Au1AocO1qEGY="; + tat = "sha256-5lyctRvEfR7td2FWPjLTCDL+OqrCsy72jp5cf9HN5Cg="; + tel = "sha256-fQkoEoidyLsfQtk7jZj2mFJ4AJ4xztMP9DTuDjtEmD0="; + tgk = "sha256-xzgovz+eBvpBwH95mCmwHU7ODj3SmUyRTWQ+M8F8qJA="; + tgl = "sha256-dnJiuUmQHqczAjmZ8bLUUfD+ggBBZr1rEHT4Nhln2os="; + tha = "sha256-iAMqnyGsz/gl767SlgTrilNOJlz4BYqV6lQXpt+RwAU="; + tir = "sha256-06XlsFwn4iCV6xxxJwasvkn5bQQC3xFOKRsyGRYi3OA="; + ton = "sha256-uK3o84oF7AaFs+3rRb4NGgMCtyZtZ1yjkkj7jNQD5hk="; + tur = "sha256-SJuVBOgNcYTtGsmhl2ZHiE7nEUnaIx/zwsHcFTcPLz0="; + uig = "sha256-iBTbyJjNR7k3nLBpEGSsAit5QcjYN2HgHWpwGkSXSic="; + ukr = "sha256-ZAyfvaGsRdHIh0HvAcaIwzdVnDf1Y8NuYufl+ZCmCJM="; + urd = "sha256-gLwoL7uumavWtAcITEAakw3cSTQ3GRCeZQ13lTH8epc="; + uzb = "sha256-9jx8jWFvVOiIMJ8E6vVWgof0CsqlTU40zlHWrTbgHg4="; + uzb_cyrl = "sha256-B6vbCeDHm5FE3SL94BBlUqwyFhBMEwVmWM9RcXOmY5A="; + vie = "sha256-Fk2b7X5aZERYbTlDTMGt9N+XbP4jz/1kaOREyUcDZAo="; + yid = "sha256-H1AC4G/G7jOuvJJZb9u8ofDF5RqKi/PwVTjsTkDcy3Y="; + yor = "sha256-m35CeoAKh2Rg8CDVaDgCkuIm1i/4pOutieZZUSJTgx8="; }; }; } From 92a849e613e506252d45b6b5483d87377b09ebd7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Anselm=20Sch=C3=BCler?= Date: Mon, 2 May 2022 12:38:53 +0200 Subject: [PATCH 23/56] tesseract5: init at 5.1.0 --- maintainers/maintainer-list.nix | 7 ++++ .../graphics/tesseract/default.nix | 6 +++ .../graphics/tesseract/tesseract5.nix | 39 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 3 +- 4 files changed, 54 insertions(+), 1 deletion(-) create mode 100644 pkgs/applications/graphics/tesseract/tesseract5.nix diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 36d7ae48119f..7324dcff047f 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -829,6 +829,13 @@ githubId = 5327697; name = "Anatolii Prylutskyi"; }; + anselmschueler = { + email = "mail@anselmschueler.com"; + github = "schuelermine"; + githubId = 48802534; + name = "Anselm Schüler"; + matrix = "@schuelermine:matrix.org"; + }; antoinerg = { email = "roygobeil.antoine@gmail.com"; github = "antoinerg"; diff --git a/pkgs/applications/graphics/tesseract/default.nix b/pkgs/applications/graphics/tesseract/default.nix index 840c87de216b..dc5f97318708 100644 --- a/pkgs/applications/graphics/tesseract/default.nix +++ b/pkgs/applications/graphics/tesseract/default.nix @@ -3,6 +3,7 @@ let base3 = callPackage ./tesseract3.nix {}; base4 = callPackage ./tesseract4.nix {}; + base5 = callPackage ./tesseract5.nix {}; languages = callPackage ./languages.nix {}; in { @@ -15,4 +16,9 @@ in tesseractBase = base4; languages = languages.v4; }); + + tesseract5 = lowPrio (callPackage ./wrapper.nix { + tesseractBase = base5; + languages = languages.v4; + }); } diff --git a/pkgs/applications/graphics/tesseract/tesseract5.nix b/pkgs/applications/graphics/tesseract/tesseract5.nix new file mode 100644 index 000000000000..dd4d6cb2791d --- /dev/null +++ b/pkgs/applications/graphics/tesseract/tesseract5.nix @@ -0,0 +1,39 @@ +{ lib, stdenv, fetchFromGitHub, autoreconfHook, autoconf-archive, pkg-config +, leptonica, libpng, libtiff, icu, pango, opencl-headers, fetchpatch }: + +stdenv.mkDerivation rec { + pname = "tesseract"; + version = "5.1.0"; + + src = fetchFromGitHub { + owner = "tesseract-ocr"; + repo = "tesseract"; + rev = version; + sha256 = "sha256-B1x3wxr9Sn2rsG8AHncPTEErhDo7YtpDRxfW9ZOPWoU="; + }; + + enableParallelBuilding = true; + + nativeBuildInputs = [ + pkg-config + autoreconfHook + autoconf-archive + ]; + + buildInputs = [ + leptonica + libpng + libtiff + icu + pango + opencl-headers + ]; + + meta = { + description = "OCR engine"; + homepage = "https://github.com/tesseract-ocr/tesseract"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ anselmschueler ]; + platforms = with lib.platforms; linux ++ darwin; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index db85ec622476..390ceac60b9c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -29784,7 +29784,8 @@ with pkgs; inherit (callPackage ../applications/graphics/tesseract {}) tesseract3 - tesseract4; + tesseract4 + tesseract5; tesseract = tesseract3; tetraproc = callPackage ../applications/audio/tetraproc { }; From 6022fd57b2a98cc7da139c998bcf4fd84029e0b2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Mon, 2 May 2022 12:02:09 +0200 Subject: [PATCH 24/56] htop: add SuperSandro2000 as maintainer --- pkgs/tools/system/htop/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/system/htop/default.nix b/pkgs/tools/system/htop/default.nix index 74f8095a681f..c074b075d232 100644 --- a/pkgs/tools/system/htop/default.nix +++ b/pkgs/tools/system/htop/default.nix @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { homepage = "https://htop.dev"; license = licenses.gpl2Only; platforms = platforms.all; - maintainers = with maintainers; [ rob relrod ]; + maintainers = with maintainers; [ rob relrod SuperSandro2000 ]; changelog = "https://github.com/htop-dev/htop/blob/${version}/ChangeLog"; }; } From db312071f9413048769e23fc9f9117235b00eae2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Mon, 2 May 2022 12:03:07 +0200 Subject: [PATCH 25/56] htop: 3.1.2 -> 3.2.0 --- pkgs/tools/system/htop/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/system/htop/default.nix b/pkgs/tools/system/htop/default.nix index c074b075d232..823d20630eb3 100644 --- a/pkgs/tools/system/htop/default.nix +++ b/pkgs/tools/system/htop/default.nix @@ -9,13 +9,13 @@ assert systemdSupport -> stdenv.isLinux; stdenv.mkDerivation rec { pname = "htop"; - version = "3.1.2"; + version = "3.2.0"; src = fetchFromGitHub { owner = "htop-dev"; repo = pname; rev = version; - sha256 = "sha256-RKYS8UYZTVKMR/3DG31eqkG4knPRl8WXsZU/XGmGmAg="; + sha256 = "sha256-p/lc7G/XFllulXrM47mPE6W5vVuoi4uXB8To36PIgZo="; }; nativeBuildInputs = [ autoreconfHook ]; From a2192e10df52feb2117c656c6621afe86dcd0c59 Mon Sep 17 00:00:00 2001 From: Michael Hoang Date: Fri, 1 Apr 2022 02:00:09 +1100 Subject: [PATCH 26/56] ff2mpv: init at 4.0.0 --- pkgs/applications/misc/ff2mpv/default.nix | 34 +++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 36 insertions(+) create mode 100644 pkgs/applications/misc/ff2mpv/default.nix diff --git a/pkgs/applications/misc/ff2mpv/default.nix b/pkgs/applications/misc/ff2mpv/default.nix new file mode 100644 index 000000000000..b26e09012cf5 --- /dev/null +++ b/pkgs/applications/misc/ff2mpv/default.nix @@ -0,0 +1,34 @@ +{ lib, stdenv, fetchFromGitHub, python3, mpv }: + +stdenv.mkDerivation rec { + pname = "ff2mpv"; + version = "4.0.0"; + + src = fetchFromGitHub { + owner = "woodruffw"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-sxUp/JlmnYW2sPDpIO2/q40cVJBVDveJvbQMT70yjP4="; + }; + + buildInputs = [ python3 mpv ]; + + postPatch = '' + patchShebangs . + substituteInPlace ff2mpv.json \ + --replace '/home/william/scripts/ff2mpv' "$out/bin/ff2mpv.py" + ''; + + installPhase = '' + mkdir -p $out/bin $out/lib/mozilla/native-messaging-hosts + cp ff2mpv.py $out/bin + cp ff2mpv.json $out/lib/mozilla/native-messaging-hosts + ''; + + meta = { + description = "Native Messaging Host for ff2mpv firefox addon."; + homepage = "https://github.com/woodruffw/ff2mpv"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ Enzime ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 08479d754a1c..d5872be63433 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -25747,6 +25747,8 @@ with pkgs; fetchmail = callPackage ../applications/misc/fetchmail { }; + ff2mpv = callPackage ../applications/misc/ff2mpv { }; + fff = callPackage ../applications/misc/fff { }; fig2dev = callPackage ../applications/graphics/fig2dev { }; From 902a2859182b9b17a96b6c7649b8f052450fa84e Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 2 May 2022 14:57:52 +0200 Subject: [PATCH 27/56] python310Packages.fqdn: init at 1.5.1 --- .../python-modules/fqdn/default.nix | 36 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 38 insertions(+) create mode 100644 pkgs/development/python-modules/fqdn/default.nix diff --git a/pkgs/development/python-modules/fqdn/default.nix b/pkgs/development/python-modules/fqdn/default.nix new file mode 100644 index 000000000000..cff62be2afff --- /dev/null +++ b/pkgs/development/python-modules/fqdn/default.nix @@ -0,0 +1,36 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pytestCheckHook +, pythonOlder +}: + +buildPythonPackage rec { + pname = "fqdn"; + version = "1.5.1"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "ypcrts"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-T0CdWWr8p3JVhp3nol5hyxsrD3951JE2EDpFt+m+3bE="; + }; + + checkInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "fqdn" + ]; + + meta = with lib; { + description = "RFC-compliant FQDN validation and manipulation"; + homepage = "https://github.com/ypcrts/fqdn"; + license = licenses.mpl20; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 51100fb611a7..91a57b3ed87c 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3166,6 +3166,8 @@ in { fpyutils = callPackage ../development/python-modules/fpyutils { }; + fqdn = callPackage ../development/python-modules/fqdn { }; + freebox-api = callPackage ../development/python-modules/freebox-api { }; freetype-py = callPackage ../development/python-modules/freetype-py { }; From 380878b5d1f2272e29f404a9736d1cc1e0eb08a1 Mon Sep 17 00:00:00 2001 From: Aaron Jheng Date: Mon, 2 May 2022 15:04:17 +0000 Subject: [PATCH 28/56] go-motion: 2018-04-09 -> 1.1.0 --- pkgs/development/tools/go-motion/default.nix | 23 +++++++++----------- 1 file changed, 10 insertions(+), 13 deletions(-) diff --git a/pkgs/development/tools/go-motion/default.nix b/pkgs/development/tools/go-motion/default.nix index 5004afc28e35..d06f6e5acd17 100644 --- a/pkgs/development/tools/go-motion/default.nix +++ b/pkgs/development/tools/go-motion/default.nix @@ -1,23 +1,20 @@ -{ buildGoPackage -, lib -, fetchFromGitHub -}: +{ lib, buildGoModule, fetchFromGitHub }: -buildGoPackage rec { - pname = "motion-unstable"; - version = "2018-04-09"; - rev = "218875ebe23806e7af82f3b5b14bb3355534f679"; - - goPackagePath = "github.com/fatih/motion"; +buildGoModule rec { + pname = "motion"; + version = "1.1.0"; src = fetchFromGitHub { - inherit rev; - owner = "fatih"; repo = "motion"; - sha256 = "08lp61hmb77p0cknf71jp8lssplxad3ddyqjxh8x3cr0bmn9ykr9"; + rev = "v${version}"; + sha256 = "sha256-bD6Mm9/LOzguoK/xMpVEeT7G8j1shCsMv14wFostlW4="; }; + vendorSha256 = "sha256-pQpattmS9VmO3ZIQUFn66az8GSmB4IvYhTTCFn6SUmo="; + + ldflags = [ "-s" "-w" ]; + meta = with lib; { description = "Navigation and insight in Go"; longDescription = '' From 50d31845fcc7f03a33128ffb85550fb8de6dff66 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 2 May 2022 15:40:23 +0000 Subject: [PATCH 29/56] python310Packages.monty: 2022.1.19 -> 2022.4.26 --- pkgs/development/python-modules/monty/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/monty/default.nix b/pkgs/development/python-modules/monty/default.nix index ea95e2b2d85d..8e115bf3a180 100644 --- a/pkgs/development/python-modules/monty/default.nix +++ b/pkgs/development/python-modules/monty/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "monty"; - version = "2022.1.19"; + version = "2022.4.26"; disabled = pythonOlder "3.5"; # uses type annotations src = fetchFromGitHub { owner = "materialsvirtuallab"; repo = pname; - rev = "v${version}"; - sha256 = "sha256-CGYYPpXRBvqf6GJYYZUARpzt4XFc5uAw91n21UInYpU="; + rev = "refs/tags/v${version}"; + sha256 = "sha256-SQku10nzTSuO5ISUDyDKAEoMhBBxPzyLNhoAyrlKH+E="; }; postPatch = '' From a1337c5d1ff8f24ac6fb027294dc00a39a917d9f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 2 May 2022 16:35:49 +0000 Subject: [PATCH 30/56] python310Packages.gensim: 4.1.2 -> 4.2.0 --- pkgs/development/python-modules/gensim/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/gensim/default.nix b/pkgs/development/python-modules/gensim/default.nix index 5cf36c15dfad..3249fd83e78a 100644 --- a/pkgs/development/python-modules/gensim/default.nix +++ b/pkgs/development/python-modules/gensim/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "gensim"; - version = "4.1.2"; + version = "4.2.0"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "1932c257de4eccbb64cc40d46e8577a25f5f47b94b96019a969fb36150f11d15"; + sha256 = "sha256-mV69KXCjHUfBAKqsECEvR+K/EuKwZTbTiIPJUf807vE="; }; propagatedBuildInputs = [ smart-open numpy six scipy ]; From 02a4cef89caa632fde96f695a3f0be583186ff20 Mon Sep 17 00:00:00 2001 From: K900 Date: Mon, 2 May 2022 16:41:45 +0000 Subject: [PATCH 31/56] =?UTF-8?q?n8n:=200.174.0=20=E2=86=92=200.175.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../networking/n8n/node-packages.nix | 557 ++++++++++-------- 1 file changed, 316 insertions(+), 241 deletions(-) diff --git a/pkgs/applications/networking/n8n/node-packages.nix b/pkgs/applications/networking/n8n/node-packages.nix index 5aaa2f10fc3f..c0a2b9a5fd98 100644 --- a/pkgs/applications/networking/n8n/node-packages.nix +++ b/pkgs/applications/networking/n8n/node-packages.nix @@ -508,22 +508,22 @@ let sha512 = "YATxVxgRqNH6nHEIsvg6k2Boc1JHI9ZbH5iWFFv/MTkchz3b1ieGDa5T0a9RznNdI0KhVbdbWSN+KWWrQZRxTw=="; }; }; - "@types/node-12.20.49" = { + "@types/node-12.20.50" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "12.20.49"; + version = "12.20.50"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-12.20.49.tgz"; - sha512 = "5e6QNb9bkeh4Hni4ktLqUZuUqnGTX/kou2aZkXyxtuYaHXgBm+In1SHR9V+7kDzWzjB08KC2uqt2doDi7cuAAA=="; + url = "https://registry.npmjs.org/@types/node/-/node-12.20.50.tgz"; + sha512 = "+9axpWx2b2JCVovr7Ilgt96uc6C1zBKOQMpGtRbWT9IoR/8ue32GGMfGA4woP8QyP2gBs6GQWEVM3tCybGCxDA=="; }; }; - "@types/node-17.0.26" = { + "@types/node-17.0.31" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "17.0.26"; + version = "17.0.31"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-17.0.26.tgz"; - sha512 = "z/FG/6DUO7pnze3AE3TBGIjGGKkvCcGcWINe1C7cADY8hKLJPDYpzsNE37uExQ4md5RFtTCvg+M8Mu1Enyeg2A=="; + url = "https://registry.npmjs.org/@types/node/-/node-17.0.31.tgz"; + sha512 = "AR0x5HbXGqkEx9CadRH3EBYx/VkiUgZIhP4wvPn/+5KIsgpNoyFaRlVe0Zlx9gRtg8fA06a9tskE2MSN7TcG4Q=="; }; }; "@types/node-fetch-2.6.1" = { @@ -661,13 +661,13 @@ let sha512 = "H5aqjkogmFxfaOrfn/e42vyspHVXuJ8er63KuljJXpOyJ1ZO/U5CrHfO8BLKIy2w7mBM02L5quL0vbfQqrGQbA=="; }; }; - "acorn-8.7.0" = { + "acorn-8.7.1" = { name = "acorn"; packageName = "acorn"; - version = "8.7.0"; + version = "8.7.1"; src = fetchurl { - url = "https://registry.npmjs.org/acorn/-/acorn-8.7.0.tgz"; - sha512 = "V/LGr1APy+PXIwKebEWrkZPwoeoF+w1jiOBUmuxuiUIaOHtob8Qc9BTrYo7VuI5fR8tqsy+buA2WFooR5olqvQ=="; + url = "https://registry.npmjs.org/acorn/-/acorn-8.7.1.tgz"; + sha512 = "Xx54uLJQZ19lKygFXOWsscKUbsBZW0CPykPhVQdhIeIwrbPmJzqeASDInc8nKBnp/JT6igTs82qPXz069H8I/A=="; }; }; "acorn-walk-8.2.0" = { @@ -940,6 +940,15 @@ let sha512 = "spZRyzKL5l5BZQrr/6m/SqFdBN0q3OCI0f9rjfBzCMBIP4p75P620rR3gTmaksNOhmzgdxcaxdNfMy6anrbM0g=="; }; }; + "async-validator-1.8.5" = { + name = "async-validator"; + packageName = "async-validator"; + version = "1.8.5"; + src = fetchurl { + url = "https://registry.npmjs.org/async-validator/-/async-validator-1.8.5.tgz"; + sha512 = "tXBM+1m056MAX0E8TL2iCjg8WvSyXu0Zc8LNtYqrVeyoL3+esHRZ4SieE9fKQyyU09uONjnMEjrNBMqT0mbvmA=="; + }; + }; "asynckit-0.4.0" = { name = "asynckit"; packageName = "asynckit"; @@ -967,13 +976,13 @@ let sha512 = "z4oo33lmnvvNRqfUe3YjDGGpqu/L2+wXBIhMtwq6oqZ+exOUAkQYM6zd2VWKF7AIlajOF8ZZuPFfryTG9iLC/w=="; }; }; - "aws-sdk-2.1120.0" = { + "aws-sdk-2.1125.0" = { name = "aws-sdk"; packageName = "aws-sdk"; - version = "2.1120.0"; + version = "2.1125.0"; src = fetchurl { - url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.1120.0.tgz"; - sha512 = "3cKXUFxC3CDBbJ/JlXEKmJZKFZhqGii7idGaLxvV5/OzqEDUstYkHGX3TCJdQRHrRwpFvRVOekXSwLxBltqXuQ=="; + url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.1125.0.tgz"; + sha512 = "2syNkKDqDcDmB/chc61a5xx+KYzaarLs1/KshE0b1Opp2oSq2FARyUBbk59HgwKaDUB61uPF33ZG9sHiIVx2hQ=="; }; }; "aws-sign2-0.7.0" = { @@ -1003,13 +1012,31 @@ let sha512 = "ut5vewkiu8jjGBdqpM44XxjuCjq9LAKeHVmoVfHVzy8eHgxxq8SbAVQNovDA8mVi05kP0Ea/n/UzcSHcTJQfNg=="; }; }; - "axios-retry-3.2.4" = { + "axios-retry-3.2.5" = { name = "axios-retry"; packageName = "axios-retry"; - version = "3.2.4"; + version = "3.2.5"; src = fetchurl { - url = "https://registry.npmjs.org/axios-retry/-/axios-retry-3.2.4.tgz"; - sha512 = "Co3UXiv4npi6lM963mfnuH90/YFLKWWDmoBYfxkHT5xtkSSWNqK9zdG3fw5/CP/dsoKB5aMMJCsgab+tp1OxLQ=="; + url = "https://registry.npmjs.org/axios-retry/-/axios-retry-3.2.5.tgz"; + sha512 = "a8umkKbfIkTiYJQLx3v3TzKM85TGKB8ZQYz4zwykt2fpO64TsRlUhjaPaAb3fqMWCXFm2YhWcd8V5FHDKO9bSA=="; + }; + }; + "babel-helper-vue-jsx-merge-props-2.0.3" = { + name = "babel-helper-vue-jsx-merge-props"; + packageName = "babel-helper-vue-jsx-merge-props"; + version = "2.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/babel-helper-vue-jsx-merge-props/-/babel-helper-vue-jsx-merge-props-2.0.3.tgz"; + sha512 = "gsLiKK7Qrb7zYJNgiXKpXblxbV5ffSwR0f5whkPAaBAR4fhi6bwRZxX9wBlIc5M/v8CCkXUbXZL4N/nSE97cqg=="; + }; + }; + "babel-runtime-6.26.0" = { + name = "babel-runtime"; + packageName = "babel-runtime"; + version = "6.26.0"; + src = fetchurl { + url = "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.26.0.tgz"; + sha1 = "965c7058668e82b55d7bfe04ff2337bc8b5647fe"; }; }; "balanced-match-1.0.2" = { @@ -1165,15 +1192,6 @@ let sha512 = "c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA=="; }; }; - "body-parser-1.19.2" = { - name = "body-parser"; - packageName = "body-parser"; - version = "1.19.2"; - src = fetchurl { - url = "https://registry.npmjs.org/body-parser/-/body-parser-1.19.2.tgz"; - sha512 = "SAAwOxgoCKMGs9uUAUFHygfLAyaniaoun6I8mFY9pRAJL9+Kec34aU+oIjDhTycub1jozEfEwx1W1IuOYxVSFw=="; - }; - }; "body-parser-1.20.0" = { name = "body-parser"; packageName = "body-parser"; @@ -1804,13 +1822,13 @@ let sha512 = "ZwrFkGJxUR3EIoXtO+yVE69Eb7KlixbaeAWfBQB9vVsNn/o+Yw69gBWSSDK825hQNdN+wF8zELf3dFNl/kxkUA=="; }; }; - "cookie-0.4.2" = { + "cookie-0.5.0" = { name = "cookie"; packageName = "cookie"; - version = "0.4.2"; + version = "0.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/cookie/-/cookie-0.4.2.tgz"; - sha512 = "aSWTXFzaKWkvHO1Ny/s+ePFpvKsPnjc551iI41v3ny/ow6tBG5Vd+FuqGNhh1LxOmVzOlGUriIlOaokOvhaStA=="; + url = "https://registry.npmjs.org/cookie/-/cookie-0.5.0.tgz"; + sha512 = "YZ3GUyn/o8gfKJlnlX7g7xq4gyO6OSuhGPKaaGssGB2qgDUS0gPgtTvoyZLTt9Ab6dC4hfc9dV5arkvc/OCmrw=="; }; }; "cookie-parser-1.4.6" = { @@ -1831,13 +1849,22 @@ let sha1 = "e303a882b342cc3ee8ca513a79999734dab3ae2c"; }; }; - "core-js-3.22.2" = { + "core-js-2.6.12" = { name = "core-js"; packageName = "core-js"; - version = "3.22.2"; + version = "2.6.12"; src = fetchurl { - url = "https://registry.npmjs.org/core-js/-/core-js-3.22.2.tgz"; - sha512 = "Z5I2vzDnEIqO2YhELVMFcL1An2CIsFe9Q7byZhs8c/QxummxZlAHw33TUHbIte987LkisOgL0LwQ1P9D6VISnA=="; + url = "https://registry.npmjs.org/core-js/-/core-js-2.6.12.tgz"; + sha512 = "Kb2wC0fvsWfQrgk8HU5lW6U/Lcs8+9aaYcy4ZFc6DDlo4nZ7n70dEgE5rtR0oG6ufKDUnrwfWL1mXR5ljDatrQ=="; + }; + }; + "core-js-3.22.3" = { + name = "core-js"; + packageName = "core-js"; + version = "3.22.3"; + src = fetchurl { + url = "https://registry.npmjs.org/core-js/-/core-js-3.22.3.tgz"; + sha512 = "1t+2a/d2lppW1gkLXx3pKPVGbBdxXAkqztvWb1EJ8oF8O2gIGiytzflNiFEehYwVK/t2ryUsGBoOFFvNx95mbg=="; }; }; "core-util-is-1.0.2" = { @@ -2002,6 +2029,15 @@ let sha1 = "aa24ffb9ac3df9a2351837cfb2d279360cd78492"; }; }; + "deepmerge-1.5.2" = { + name = "deepmerge"; + packageName = "deepmerge"; + version = "1.5.2"; + src = fetchurl { + url = "https://registry.npmjs.org/deepmerge/-/deepmerge-1.5.2.tgz"; + sha512 = "95k0GDqvBjZavkuvzx/YqVLv/6YYa17fz6ILMSf7neqQITCPbnfEnQvEgMPNjH4kgobe7+WIL0yJEHku+H3qtQ=="; + }; + }; "deepmerge-4.2.2" = { name = "deepmerge"; packageName = "deepmerge"; @@ -2056,15 +2092,6 @@ let sha512 = "tfiWc6BQLXNLpNiR5iGd0Ocu3P3VpxfzFiqubLgMfhfOw9WyvgJBd46CClNn9k3qfbjvT//0cf7AlYRX/OslMQ=="; }; }; - "depd-1.1.2" = { - name = "depd"; - packageName = "depd"; - version = "1.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz"; - sha1 = "9bcd52e14c097763e749b274c4346ed2e560b5a9"; - }; - }; "depd-2.0.0" = { name = "depd"; packageName = "depd"; @@ -2074,15 +2101,6 @@ let sha512 = "g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw=="; }; }; - "destroy-1.0.4" = { - name = "destroy"; - packageName = "destroy"; - version = "1.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/destroy/-/destroy-1.0.4.tgz"; - sha1 = "978857442c44749e4206613e37946205826abd80"; - }; - }; "destroy-1.2.0" = { name = "destroy"; packageName = "destroy"; @@ -2236,6 +2254,15 @@ let sha1 = "590c61156b0ae2f4f0255732a158b266bc56b21d"; }; }; + "element-ui-2.15.8" = { + name = "element-ui"; + packageName = "element-ui"; + version = "2.15.8"; + src = fetchurl { + url = "https://registry.npmjs.org/element-ui/-/element-ui-2.15.8.tgz"; + sha512 = "N54zxosRFqpYax3APY3GeRmtOZwIls6Z756WM0kdPZ5Q92PIeKHnZgF1StlamIg9bLxP1k+qdhTZvIeQlim09A=="; + }; + }; "emoji-regex-8.0.0" = { name = "emoji-regex"; packageName = "emoji-regex"; @@ -2272,13 +2299,13 @@ let sha1 = "ad3ff4c86ec2d029322f5a02c3a9a606c95b3f59"; }; }; - "encoding-japanese-1.0.30" = { + "encoding-japanese-2.0.0" = { name = "encoding-japanese"; packageName = "encoding-japanese"; - version = "1.0.30"; + version = "2.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/encoding-japanese/-/encoding-japanese-1.0.30.tgz"; - sha512 = "bd/DFLAoJetvv7ar/KIpE3CNO8wEuyrt9Xuw6nSMiZ+Vrz/Q21BPsMHvARL2Wz6IKHKXgb+DWZqtRg1vql9cBg=="; + url = "https://registry.npmjs.org/encoding-japanese/-/encoding-japanese-2.0.0.tgz"; + sha512 = "++P0RhebUC8MJAwJOsT93dT+5oc5oPImp1HubZpAuCZ5kTLnhuuBhKHj2jJeO/Gj93idPBWmIuQ9QWMe5rX3pQ=="; }; }; "end-of-stream-1.4.4" = { @@ -2461,13 +2488,13 @@ let sha1 = "97e801aa052df02454de46b02bf621642cdc8502"; }; }; - "express-4.17.3" = { + "express-4.18.1" = { name = "express"; packageName = "express"; - version = "4.17.3"; + version = "4.18.1"; src = fetchurl { - url = "https://registry.npmjs.org/express/-/express-4.17.3.tgz"; - sha512 = "yuSQpz5I+Ch7gFrPCk4/c+dIBKlQUxtgwqzph132bsT6qhuzss6I8cLJQz7B3rFblzd6wtcI0ZbGltH/C4LjUg=="; + url = "https://registry.npmjs.org/express/-/express-4.18.1.tgz"; + sha512 = "zZBcOX9TfehHQhtupq57OF8lFZ3UZi08Y97dwFCkD8p9d/d2Y3M+ykKcwaMDEL+4qyUolgBDX6AblpR3fL212Q=="; }; }; "extend-3.0.2" = { @@ -2587,13 +2614,13 @@ let sha512 = "qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ=="; }; }; - "finalhandler-1.1.2" = { + "finalhandler-1.2.0" = { name = "finalhandler"; packageName = "finalhandler"; - version = "1.1.2"; + version = "1.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/finalhandler/-/finalhandler-1.1.2.tgz"; - sha512 = "aAWcW57uxVNrQZqFXjITpW3sIUQmHGG3qSb9mUah9MgMC4NeWhNOlNjXEYq3HjRAvL6arUviZGGJsBg6z0zsWA=="; + url = "https://registry.npmjs.org/finalhandler/-/finalhandler-1.2.0.tgz"; + sha512 = "5uXcUVftlQMFnWC9qu/svkWv3GTd2PfUhK/3PLkYNAe7FbqJMt3515HaxE6eRL74GdsriiwujiawdaB1BpEISg=="; }; }; "flatted-3.2.5" = { @@ -3064,13 +3091,13 @@ let sha512 = "eSmmWE5bZTK2Nou4g0AI3zZ9rswp7GRKoKXS1BLUkvPviOqs4YTN1djQIqrXy9k5gEtdLPy86JjRwsNM9tnDcA=="; }; }; - "html-to-text-8.0.0" = { + "html-to-text-8.2.0" = { name = "html-to-text"; packageName = "html-to-text"; - version = "8.0.0"; + version = "8.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/html-to-text/-/html-to-text-8.0.0.tgz"; - sha512 = "fEtul1OerF2aMEV+Wpy+Ue20tug134jOY1GIudtdqZi7D0uTudB2tVJBKfVhTL03dtqeJoF8gk8EPX9SyMEvLg=="; + url = "https://registry.npmjs.org/html-to-text/-/html-to-text-8.2.0.tgz"; + sha512 = "CLXExYn1b++Lgri+ZyVvbUEFwzkLZppjjZOwB7X1qv2jIi8MrMEvxWX5KQ7zATAzTvcqgmtO00M2kCRMtEdOKQ=="; }; }; "htmlparser2-6.1.0" = { @@ -3082,15 +3109,6 @@ let sha512 = "gyyPk6rgonLFEDGoeRgQNaEUvdJ4ktTmmUh/h2t7s+M8oPpIPxgNACWa+6ESR57kXstwqPiCut0V8NRpcwgU7A=="; }; }; - "http-errors-1.8.1" = { - name = "http-errors"; - packageName = "http-errors"; - version = "1.8.1"; - src = fetchurl { - url = "https://registry.npmjs.org/http-errors/-/http-errors-1.8.1.tgz"; - sha512 = "Kpk9Sm7NmI+RHhnj6OIWDI1d6fIoFAtFt9RLaTMRlg/8w49juAStsrBgp0Dp4OdxdVbRIeKhtCUvoi/RuAhO4g=="; - }; - }; "http-errors-2.0.0" = { name = "http-errors"; packageName = "http-errors"; @@ -3145,15 +3163,6 @@ let sha512 = "kERHXvpSaB4aU3eANwidg79K8FlrN77m8G9V+0vOR3HYaRifrlwMEpT7ZBJqLSEIHnEgJTHcWK82wwLwwKwtag=="; }; }; - "iconv-lite-0.6.2" = { - name = "iconv-lite"; - packageName = "iconv-lite"; - version = "0.6.2"; - src = fetchurl { - url = "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.2.tgz"; - sha512 = "2y91h5OpQlolefMPmUlivelittSWy0rP+oYVpn6A7GwVHNE8AWzoYOBNmlwks3LobaJxgHCYZAnyNo2GgpNRNQ=="; - }; - }; "iconv-lite-0.6.3" = { name = "iconv-lite"; packageName = "iconv-lite"; @@ -3451,6 +3460,15 @@ let sha512 = "k1U0IRzLMo7ZlYIfzRu23Oh6MiIFasgpb9X76eqfFZAqwH44UI4KTBvBYIZ1dSL9ZzChTB9ShHfLkR4pdW5krQ=="; }; }; + "is-plain-object-5.0.0" = { + name = "is-plain-object"; + packageName = "is-plain-object"; + version = "5.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-plain-object/-/is-plain-object-5.0.0.tgz"; + sha512 = "VRSzKkbMm5jMDoKLbltAkFQ5Qr7VDiTFGXxYFXXowVj387GeGNOCsOH6Msy00SGZ3Fp84b1Naa1psqgcCIEP5Q=="; + }; + }; "is-promise-1.0.1" = { name = "is-promise"; packageName = "is-promise"; @@ -3820,13 +3838,13 @@ let sha512 = "l+nePcPbIG1fNlqMzrh68MLkX/gTxk/+vdvAb388Ssi7UuUN31MI44w4Yf33mM3Cm4xDfw48mdf3rkdHszLNew=="; }; }; - "libmime-5.0.0" = { + "libmime-5.1.0" = { name = "libmime"; packageName = "libmime"; - version = "5.0.0"; + version = "5.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/libmime/-/libmime-5.0.0.tgz"; - sha512 = "2Bm96d5ktnE217Ib1FldvUaPAaOst6GtZrsxJCwnJgi9lnsoAKIHyU0sae8rNx6DNYbjdqqh8lv5/b9poD8qOg=="; + url = "https://registry.npmjs.org/libmime/-/libmime-5.1.0.tgz"; + sha512 = "xOqorG21Va+3CjpFOfFTU7SWohHH2uIX9ZY4Byz6J+lvpfvc486tOAT/G9GfbrKtJ9O7NCX9o0aC2lxqbnZ9EA=="; }; }; "libphonenumber-js-1.9.52" = { @@ -3856,13 +3874,13 @@ let sha512 = "FWWMIEOxz3GwUI4Ts/IvgVy6LPvoMPgjMdQ185nN6psJyBJ4yOpzqm695/h5umdLJg2vW3GR5iG11MAkR2AzJA=="; }; }; - "linkify-it-3.0.3" = { + "linkify-it-4.0.0" = { name = "linkify-it"; packageName = "linkify-it"; - version = "3.0.3"; + version = "4.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/linkify-it/-/linkify-it-3.0.3.tgz"; - sha512 = "ynTsyrFSdE5oZ/O9GEf00kPngmOfVwazR5GKDq6EYfhlpFug3J2zybX56a2PRRpc9P+FuSoGNAwjlbDs9jJBPQ=="; + url = "https://registry.npmjs.org/linkify-it/-/linkify-it-4.0.0.tgz"; + sha512 = "QAxkXyzT/TXgwGyY4rTgC95Ex6/lZ5/lYTV9nug6eJt93BCBQGOE47D/g2+/m5J1MrVLr2ot97OXkBZ9bBpR4A=="; }; }; "localtunnel-2.0.2" = { @@ -4135,22 +4153,22 @@ let sha512 = "MlAQQVMFhGk4WUA6gpfsy0QycnKP0+NlCBJRVRNPxxSIbjrCbQ65nrpJD3FVyJNZLuJ0uoqL57ye6BmDYgHaSw=="; }; }; - "mailparser-3.4.0" = { + "mailparser-3.5.0" = { name = "mailparser"; packageName = "mailparser"; - version = "3.4.0"; + version = "3.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/mailparser/-/mailparser-3.4.0.tgz"; - sha512 = "u2pfpLg+xr7m2FKDl+ohQhy2gMok1QZ+S9E5umS9ez5DSJWttrqSmBGswyj9F68pZMVTwbhLpBt7Kd04q/W4Vw=="; + url = "https://registry.npmjs.org/mailparser/-/mailparser-3.5.0.tgz"; + sha512 = "mdr2DFgz8LKC0/Q6io6znA0HVnzaPFT0a4TTnLeZ7mWHlkfnm227Wxlq7mHh7AgeP32h7gOUpXvyhSfJJIEeyg=="; }; }; - "mailsplit-5.3.1" = { + "mailsplit-5.3.2" = { name = "mailsplit"; packageName = "mailsplit"; - version = "5.3.1"; + version = "5.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/mailsplit/-/mailsplit-5.3.1.tgz"; - sha512 = "o6R6HCzqWYmI2/IYlB+v2IMPgYqC2EynmagZQICAhR7zAq0CO6fPcsO6CrYmVuYT+SSwvLAEZR5WniohBELcAA=="; + url = "https://registry.npmjs.org/mailsplit/-/mailsplit-5.3.2.tgz"; + sha512 = "coES12hhKqagkuBTJoqERX+y9bXNpxbxw3Esd07auuwKYmcagouVlgucyIVRp48fnswMKxcUtLoFn/L1a75ynQ=="; }; }; "make-dir-3.1.0" = { @@ -4486,49 +4504,49 @@ let sha512 = "z81GNO7nnYMEhrGh9LeymoE4+Yr0Wn5McHIZMK5cfQCl+NDX08sCZgUc9/6MHni9IWuFLm1Z3HTCXu2z9fN62Q=="; }; }; - "n8n-core-0.115.0" = { + "n8n-core-0.116.0" = { name = "n8n-core"; packageName = "n8n-core"; - version = "0.115.0"; + version = "0.116.0"; src = fetchurl { - url = "https://registry.npmjs.org/n8n-core/-/n8n-core-0.115.0.tgz"; - sha512 = "VXmnbbAQKk9Nbw4g4kSpJ5bxKOydVsMnz6wU2Q4tmRd1ajp+jyjHLUWyJIoVMDWm6nLEC6GORh+Zsap7Jf2xjw=="; + url = "https://registry.npmjs.org/n8n-core/-/n8n-core-0.116.0.tgz"; + sha512 = "D9X+D7gsUTKMacHIixEJuZpOB7DW/g42W+FBKLrj+6BUP1JMKG02G0C+Ef38e2XuNObMoLdLkI70snyvi1oq1g=="; }; }; - "n8n-design-system-0.18.0" = { + "n8n-design-system-0.19.0" = { name = "n8n-design-system"; packageName = "n8n-design-system"; - version = "0.18.0"; + version = "0.19.0"; src = fetchurl { - url = "https://registry.npmjs.org/n8n-design-system/-/n8n-design-system-0.18.0.tgz"; - sha512 = "TurjQwQC+TRHwoEtsFBqBVg9VRSDPBg6ghmz4rm2U6X61yqg960dLQlAIl5d+oas2jezAnhHIxL47wl+9M8V/A=="; + url = "https://registry.npmjs.org/n8n-design-system/-/n8n-design-system-0.19.0.tgz"; + sha512 = "qIcmHAtVJotgiYo3vVMLwC9qaU5ih5ti4+aPu2I1onD6WEu8GMNF38AzIAceYl6U8EhvDB+DOsF/SjYHfl26iw=="; }; }; - "n8n-editor-ui-0.141.0" = { + "n8n-editor-ui-0.142.0" = { name = "n8n-editor-ui"; packageName = "n8n-editor-ui"; - version = "0.141.0"; + version = "0.142.0"; src = fetchurl { - url = "https://registry.npmjs.org/n8n-editor-ui/-/n8n-editor-ui-0.141.0.tgz"; - sha512 = "CH1Jd9vyf+DsBukIgV9dICxGzyI1cbeHvv7XTv8qUVfMdNrsPan/OTAmyuoFl+aSuI0H8NedJTpzMytoLghvjw=="; + url = "https://registry.npmjs.org/n8n-editor-ui/-/n8n-editor-ui-0.142.0.tgz"; + sha512 = "aDXm64Y+tcLicd0z9pIxhSfqCb/JjsMIAOJ7DB35HKg7riOE7TGBHkWQ6F61XEjusJLl6ZGr15V+9EoCTu+02g=="; }; }; - "n8n-nodes-base-0.172.0" = { + "n8n-nodes-base-0.173.0" = { name = "n8n-nodes-base"; packageName = "n8n-nodes-base"; - version = "0.172.0"; + version = "0.173.0"; src = fetchurl { - url = "https://registry.npmjs.org/n8n-nodes-base/-/n8n-nodes-base-0.172.0.tgz"; - sha512 = "/Wm9E4nxftG5bTU7AMdXrYiCRq/S/rqiZO7Cn34Nvp/fyT5MndU5C6socz0Bz/ScDrRCAmsEF5I+G1+zQwuQUA=="; + url = "https://registry.npmjs.org/n8n-nodes-base/-/n8n-nodes-base-0.173.0.tgz"; + sha512 = "9ya0cgRMk6iz01m2shZHahe4KurL89/T+iGLywrUZdPdIRni7LR4ywSG51B4jko73+zsKPNYjya650BGNz7TaQ=="; }; }; - "n8n-workflow-0.97.0" = { + "n8n-workflow-0.98.0" = { name = "n8n-workflow"; packageName = "n8n-workflow"; - version = "0.97.0"; + version = "0.98.0"; src = fetchurl { - url = "https://registry.npmjs.org/n8n-workflow/-/n8n-workflow-0.97.0.tgz"; - sha512 = "RZlUhe8rW7r5prjn/WmdE1yZfZsDrpjjT0Bk22ItmKA+BeRW1k+VonWHBZEAsg6scui0web/MfXfXdRsRDnLdQ=="; + url = "https://registry.npmjs.org/n8n-workflow/-/n8n-workflow-0.98.0.tgz"; + sha512 = "MrlEpSUueIkMc9P75h09ozXN2SQyV26qEe2PlQ9+nwRnCPYkikQQtgYZDqQI+bHVHFCMdBZOnq59fse0cMpYfQ=="; }; }; "named-placeholders-1.1.2" = { @@ -4666,15 +4684,6 @@ let sha1 = "64ab69a7bdbaf03ce107b4f0335c87c0b9e91b1d"; }; }; - "nodemailer-6.7.0" = { - name = "nodemailer"; - packageName = "nodemailer"; - version = "6.7.0"; - src = fetchurl { - url = "https://registry.npmjs.org/nodemailer/-/nodemailer-6.7.0.tgz"; - sha512 = "AtiTVUFHLiiDnMQ43zi0YgkzHOEWUkhDgPlBXrsDzJiJvB29Alo4OKxHQ0ugF3gRqRQIneCLtZU3yiUo7pItZw=="; - }; - }; "nodemailer-6.7.3" = { name = "nodemailer"; packageName = "nodemailer"; @@ -4684,6 +4693,15 @@ let sha512 = "KUdDsspqx89sD4UUyUKzdlUOper3hRkDVkrKh/89G+d9WKsU5ox51NWS4tB1XR5dPUdR4SP0E3molyEfOvSa3g=="; }; }; + "nodemailer-6.7.4" = { + name = "nodemailer"; + packageName = "nodemailer"; + version = "6.7.4"; + src = fetchurl { + url = "https://registry.npmjs.org/nodemailer/-/nodemailer-6.7.4.tgz"; + sha512 = "TBSS3qS8WG45ycUwEvEA/3UM1o3sLz9jUl4TPUKPz4ImWWM6UgRCb5pLO+HOouDKEj57yNLOrzQlO8+9IjWZoA=="; + }; + }; "nopt-5.0.0" = { name = "nopt"; packageName = "nopt"; @@ -4711,6 +4729,15 @@ let sha512 = "6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA=="; }; }; + "normalize-wheel-1.0.1" = { + name = "normalize-wheel"; + packageName = "normalize-wheel"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/normalize-wheel/-/normalize-wheel-1.0.1.tgz"; + sha1 = "aec886affdb045070d856447df62ecf86146ec45"; + }; + }; "npmlog-5.0.1" = { name = "npmlog"; packageName = "npmlog"; @@ -4792,15 +4819,6 @@ let sha512 = "VdDoCwvJI4QdC6ndjpqFmoL3/+HxffFBbcJzKi5hwLLqqx3mdbedRpfZDdK0SrOSauj8X4GzBvnDZl4vTN7dOw=="; }; }; - "on-finished-2.3.0" = { - name = "on-finished"; - packageName = "on-finished"; - version = "2.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/on-finished/-/on-finished-2.3.0.tgz"; - sha1 = "20f1336481b083cd75337992a16971aa2d906947"; - }; - }; "on-finished-2.4.1" = { name = "on-finished"; packageName = "on-finished"; @@ -4981,6 +4999,15 @@ let sha1 = "6d5b934a456993b23d37f40a382d6f1666a8e5c6"; }; }; + "parse-srcset-1.0.2" = { + name = "parse-srcset"; + packageName = "parse-srcset"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/parse-srcset/-/parse-srcset-1.0.2.tgz"; + sha1 = "f2bd221f6cc970a938d88556abc589caaaa2bde1"; + }; + }; "parse5-5.1.1" = { name = "parse5"; packageName = "parse5"; @@ -5242,6 +5269,15 @@ let sha512 = "FdW9r/jQZhSeohs1Z3sI1yxFQNFvMcnmfuj4WBMUTxOrAyLMaTcE1aAMBiTlbMNaXvBCQuVi0R7hd8udDSP7ug=="; }; }; + "picocolors-1.0.0" = { + name = "picocolors"; + packageName = "picocolors"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/picocolors/-/picocolors-1.0.0.tgz"; + sha512 = "1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ=="; + }; + }; "picomatch-2.3.1" = { name = "picomatch"; packageName = "picomatch"; @@ -5314,6 +5350,15 @@ let sha512 = "epKaq3TTfTzXcxBxjpoKYMcTTcAX8Rykus6QZu77XNhJuRHSRxMd+JJrbX/3PFI0opFGSN0BabbAYCbGxbu0mA=="; }; }; + "postcss-8.4.13" = { + name = "postcss"; + packageName = "postcss"; + version = "8.4.13"; + src = fetchurl { + url = "https://registry.npmjs.org/postcss/-/postcss-8.4.13.tgz"; + sha512 = "jtL6eTBrza5MPzy8oJLFuUscHDXTV5KcLlqAWHl5q5WYRfnNRGSmOZmOZ1T6Gy7A99mOZfqungmZMpMmCVJ8ZA=="; + }; + }; "postgres-array-2.0.0" = { name = "postgres-array"; packageName = "postgres-array"; @@ -5548,15 +5593,6 @@ let sha512 = "qxXIEh4pCGfHICj1mAJQ2/2XVZkjCDTcEgfoSQxc/fYivUZxTkk7L3bDBJSoNrEzXI17oUO5Dp07ktqE5KzczA=="; }; }; - "qs-6.9.7" = { - name = "qs"; - packageName = "qs"; - version = "6.9.7"; - src = fetchurl { - url = "https://registry.npmjs.org/qs/-/qs-6.9.7.tgz"; - sha512 = "IhMFgUmuNpyRfxA90umL7ByLlgRXu6tIfKPpF5TmcfRLlLCckfP/g3IQmju6jjpu+Hh8rA+2p6A27ZSPOOHdKw=="; - }; - }; "querystring-0.2.0" = { name = "querystring"; packageName = "querystring"; @@ -5638,15 +5674,6 @@ let sha512 = "Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg=="; }; }; - "raw-body-2.4.3" = { - name = "raw-body"; - packageName = "raw-body"; - version = "2.4.3"; - src = fetchurl { - url = "https://registry.npmjs.org/raw-body/-/raw-body-2.4.3.tgz"; - sha512 = "UlTNLIcu0uzb4D2f4WltY6cVjLi+/jEN4lgEUj3E04tpMDpUlkBo/eSn6zou9hum2VMNpCCUone0O0WeJim07g=="; - }; - }; "raw-body-2.5.1" = { name = "raw-body"; packageName = "raw-body"; @@ -5746,6 +5773,15 @@ let sha512 = "Ts1Y/anZELhSsjMcU605fU9RE4Oi3p5ORujwbIKXfWa+0Zxs510Qrmrce5/Jowq3cHSZSJqBjypxmHarc+vEWg=="; }; }; + "regenerator-runtime-0.11.1" = { + name = "regenerator-runtime"; + packageName = "regenerator-runtime"; + version = "0.11.1"; + src = fetchurl { + url = "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz"; + sha512 = "MguG95oij0fC3QV3URf4V2SDYGJhJnJGqvIIgdECeODCT98wSWDAJ94SSuVpYQUoTcGUIL6L4yNB7j1DFFHSBg=="; + }; + }; "regenerator-runtime-0.13.9" = { name = "regenerator-runtime"; packageName = "regenerator-runtime"; @@ -5809,13 +5845,13 @@ let sha512 = "wcW+sIUiWnKgNY0dqCpOZkUbF/I+YPi+f09JZIDa39Ec+q82CpSYniDp+ISgTTbKmnpJWASeJBPZmoxH84wt3g=="; }; }; - "requestretry-7.0.2" = { + "requestretry-7.1.0" = { name = "requestretry"; packageName = "requestretry"; - version = "7.0.2"; + version = "7.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/requestretry/-/requestretry-7.0.2.tgz"; - sha512 = "Zz8z7G2OuVs4F0wR0shKMEMm7lNvPNHM0UIHNns9qfyuBDKSExoTsZGtSjKst6nPEwlMrbA9G+m/yC0AbGj+8w=="; + url = "https://registry.npmjs.org/requestretry/-/requestretry-7.1.0.tgz"; + sha512 = "TqVDgp251BW4b8ddQ2ptaj/57Z3LZHLscAUT7v6qs70buqF2/IoOVjYbpjJ6HiW7j5+waqegGI8xKJ/+uzgDmw=="; }; }; "require-at-1.0.6" = { @@ -5845,6 +5881,15 @@ let sha1 = "925d2601d39ac485e091cf0da5c6e694dc3dcaff"; }; }; + "resize-observer-polyfill-1.5.1" = { + name = "resize-observer-polyfill"; + packageName = "resize-observer-polyfill"; + version = "1.5.1"; + src = fetchurl { + url = "https://registry.npmjs.org/resize-observer-polyfill/-/resize-observer-polyfill-1.5.1.tgz"; + sha512 = "LwZrotdHOo12nQuZlHEmtuXdqGoOD0OhaxopaNFxWzInpEgaLWoVuAMbTzixuosCx2nEG58ngzW3vxdWoxIgdg=="; + }; + }; "restore-cursor-3.1.0" = { name = "restore-cursor"; packageName = "restore-cursor"; @@ -5989,6 +6034,15 @@ let sha512 = "YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="; }; }; + "sanitize-html-2.7.0" = { + name = "sanitize-html"; + packageName = "sanitize-html"; + version = "2.7.0"; + src = fetchurl { + url = "https://registry.npmjs.org/sanitize-html/-/sanitize-html-2.7.0.tgz"; + sha512 = "jfQelabOn5voO7FAfnQF7v+jsA6z9zC/O4ec0z3E35XPEtHYJT/OdUziVWlKW4irCr2kXaQAyXTXDHWAibg1tA=="; + }; + }; "sax-1.2.1" = { name = "sax"; packageName = "sax"; @@ -6070,13 +6124,13 @@ let sha512 = "QlYTucUYOews+WeEujDoEGziz4K6c47V/Bd+LjSSYcA94p+DmINdf7ncaUinThfvZyu13lN9OY1XDxt8C0Tw0g=="; }; }; - "send-0.17.2" = { + "send-0.18.0" = { name = "send"; packageName = "send"; - version = "0.17.2"; + version = "0.18.0"; src = fetchurl { - url = "https://registry.npmjs.org/send/-/send-0.17.2.tgz"; - sha512 = "UJYB6wFSJE3G00nEivR5rgWp8c2xXvJ3OPWPhmuteU0IKj8nKbG3DrjiOmLwpnHGYWAVwA69zmTm++YG0Hmwww=="; + url = "https://registry.npmjs.org/send/-/send-0.18.0.tgz"; + sha512 = "qqWzuOjSFOuqPjFe4NOsMLafToQQwBSOEpS+FwEt3A2V3vKubTquT3vmLTQpFgMXp8AlFWFuP1qKaJZOtPpVXg=="; }; }; "sentence-case-3.0.4" = { @@ -6106,13 +6160,13 @@ let sha512 = "SaaNal9imEO737H2c05Og0/8LUXG7EnsZyMa8MzkmuHoELfT6txuj0cMqRj6zfPKnmQ1yasR4PCJc8x+M4JSPA=="; }; }; - "serve-static-1.14.2" = { + "serve-static-1.15.0" = { name = "serve-static"; packageName = "serve-static"; - version = "1.14.2"; + version = "1.15.0"; src = fetchurl { - url = "https://registry.npmjs.org/serve-static/-/serve-static-1.14.2.tgz"; - sha512 = "+TMNA9AFxUEGuC0z2mevogSnn9MXKb4fa7ngeRMJaaGv8vTwnIEkKi+QGvPt33HSnf8pRS+WGM0EbMtCJLKMBQ=="; + url = "https://registry.npmjs.org/serve-static/-/serve-static-1.15.0.tgz"; + sha512 = "XGuRDNjXUijsUL0vl6nSD7cwURuzEgglbOaFuZM9g3kwDXOWVTck0jLzjPzGD+TazWbboZYu52/9/XPdUgne9g=="; }; }; "servie-4.3.3" = { @@ -6259,6 +6313,15 @@ let sha512 = "UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g=="; }; }; + "source-map-js-1.0.2" = { + name = "source-map-js"; + packageName = "source-map-js"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/source-map-js/-/source-map-js-1.0.2.tgz"; + sha512 = "R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw=="; + }; + }; "spex-3.2.0" = { name = "spex"; packageName = "spex"; @@ -6304,13 +6367,13 @@ let sha512 = "VE0SOVEHCk7Qc8ulkWw3ntAzXuqf7S2lvwQaDLRnUeIEaKNQJzV6BwmLKhOqT61aGhfUMrXeaBk+oDGCzvhcug=="; }; }; - "sqlite3-5.0.5" = { + "sqlite3-5.0.6" = { name = "sqlite3"; packageName = "sqlite3"; - version = "5.0.5"; + version = "5.0.6"; src = fetchurl { - url = "https://registry.npmjs.org/sqlite3/-/sqlite3-5.0.5.tgz"; - sha512 = "ZZFOMW31IOMbUeSiL23TuWSjNyS7Z83EDJ80HJxCe78OZ+5BJT6IhAwAUnQgPsUl5z+Er0DGx7VjuTP7PKPNcg=="; + url = "https://registry.npmjs.org/sqlite3/-/sqlite3-5.0.6.tgz"; + sha512 = "uT1dC6N3ReF+jchY01zvl1wVFFJ5xO86wSnCpK39uA/zmAHBDm6TiAq1v876QKv8JgiijxQ7/fb5C2LPm7ZAJA=="; }; }; "sqlstring-2.3.3" = { @@ -6340,13 +6403,13 @@ let sha512 = "+idbmIXoYET47hH+d7dfm2epdOMUDjqcB4648sTZ+t2JwoyBFL/insLfB/racrDmsKB3diwsDA696pZMieAC5g=="; }; }; - "ssh2-1.9.0" = { + "ssh2-1.10.0" = { name = "ssh2"; packageName = "ssh2"; - version = "1.9.0"; + version = "1.10.0"; src = fetchurl { - url = "https://registry.npmjs.org/ssh2/-/ssh2-1.9.0.tgz"; - sha512 = "rhhIZT0eMPvCBSOG8CpqZZ7gre2vgXaIqmb3Jb83t88rjsxIsFzDanqBJM9Ns8BmP1835A5IbQ199io4EUZwOA=="; + url = "https://registry.npmjs.org/ssh2/-/ssh2-1.10.0.tgz"; + sha512 = "OnKAAmf4j8wCRrXXZv3Tp5lCZkLJZtgZbn45ELiShCg27djDQ3XFGvIzuGsIsf4hdHslP+VdhA9BhUQdTdfd9w=="; }; }; "ssh2-sftp-client-7.2.3" = { @@ -6385,15 +6448,6 @@ let sha512 = "qoRRSyROncaz1z0mvYqIE4lCd9p2R90i6GxW3uZv5ucSu8tU7B5HXUP1gG8pVZsYNVaXjk8ClXHPttLyxAL48A=="; }; }; - "statuses-1.5.0" = { - name = "statuses"; - packageName = "statuses"; - version = "1.5.0"; - src = fetchurl { - url = "https://registry.npmjs.org/statuses/-/statuses-1.5.0.tgz"; - sha1 = "161c7dac177659fd9811f43771fa99381478628c"; - }; - }; "statuses-2.0.1" = { name = "statuses"; packageName = "statuses"; @@ -6601,6 +6655,15 @@ let sha1 = "1a1918d402d8fc3f98fbf234db0bcc8cc10e9726"; }; }; + "throttle-debounce-1.1.0" = { + name = "throttle-debounce"; + packageName = "throttle-debounce"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/throttle-debounce/-/throttle-debounce-1.1.0.tgz"; + sha512 = "XH8UiPCQcWNuk2LYePibW/4qL97+ZQ1AN3FNXwZRBNPPowo/NRU5fAlDCSNBJIYCKbioZfuYtMhG4quqoJhVzg=="; + }; + }; "through-2.3.8" = { name = "through"; packageName = "through"; @@ -6655,13 +6718,13 @@ let sha512 = "vJhccZPs965sV/L2sU4oRQVAos0pQXwsvTLkWYdqJ+a8Q5kPFzJTuOFwy7UniPli44NKQGAglksjvOcpo95aZA=="; }; }; - "tlds-1.224.0" = { + "tlds-1.231.0" = { name = "tlds"; packageName = "tlds"; - version = "1.224.0"; + version = "1.231.0"; src = fetchurl { - url = "https://registry.npmjs.org/tlds/-/tlds-1.224.0.tgz"; - sha512 = "Jgdc8SEijbDFUsmCn6Wk/f7E6jBLFZOG3U1xK0amGSfEH55Xx97ItUS/d2NngsuApjn11UeWCWj8Um3VRhseZQ=="; + url = "https://registry.npmjs.org/tlds/-/tlds-1.231.0.tgz"; + sha512 = "L7UQwueHSkGxZHQBXHVmXW64oi+uqNtzFt2x6Ssk7NVnpIbw16CRs4eb/jmKOZ9t2JnqZ/b3Cfvo97lnXqKrhw=="; }; }; "tmp-0.0.33" = { @@ -7471,10 +7534,10 @@ in n8n = nodeEnv.buildNodePackage { name = "n8n"; packageName = "n8n"; - version = "0.174.0"; + version = "0.175.0"; src = fetchurl { - url = "https://registry.npmjs.org/n8n/-/n8n-0.174.0.tgz"; - sha512 = "6opUG0aQ1JSQqKRgUbK0hLnH7XIs0FjH8NoLvBA51tntxMQ6ZnK2Nck1GH/6VVKqI6a+/udmSRFvd7Ohpwqzqw=="; + url = "https://registry.npmjs.org/n8n/-/n8n-0.175.0.tgz"; + sha512 = "FKIroWsEZNZ/HUdM6iQ8QY6WxYs4uQufodBoKpbcu6JJKF/ufYO4U8lpIM0nV2YCMaB+JAVvswim0SUDB6KF3A=="; }; dependencies = [ (sources."@azure/abort-controller-1.0.5" // { @@ -7594,7 +7657,7 @@ in sources."@types/lodash-4.14.182" sources."@types/lossless-json-1.0.1" sources."@types/mime-1.3.2" - sources."@types/node-17.0.26" + sources."@types/node-17.0.31" (sources."@types/node-fetch-2.6.1" // { dependencies = [ sources."form-data-3.0.1" @@ -7614,7 +7677,7 @@ in sources."abort-controller-3.0.0" sources."accepts-1.3.8" sources."access-control-1.0.1" - sources."acorn-8.7.0" + sources."acorn-8.7.1" sources."acorn-walk-8.2.0" (sources."adal-node-0.2.3" // { dependencies = [ @@ -7654,6 +7717,7 @@ in sources."assert-options-0.7.0" sources."assert-plus-1.0.0" sources."async-2.6.4" + sources."async-validator-1.8.5" sources."asynckit-0.4.0" (sources."auto-changelog-1.16.4" // { dependencies = [ @@ -7661,7 +7725,7 @@ in ]; }) sources."avsc-5.7.4" - (sources."aws-sdk-2.1120.0" // { + (sources."aws-sdk-2.1125.0" // { dependencies = [ sources."buffer-4.9.2" sources."events-1.1.1" @@ -7676,7 +7740,14 @@ in sources."aws-sign2-0.7.0" sources."aws4-1.11.0" sources."axios-0.21.4" - sources."axios-retry-3.2.4" + sources."axios-retry-3.2.5" + sources."babel-helper-vue-jsx-merge-props-2.0.3" + (sources."babel-runtime-6.26.0" // { + dependencies = [ + sources."core-js-2.6.12" + sources."regenerator-runtime-0.11.1" + ]; + }) sources."balanced-match-1.0.2" sources."base64-js-1.5.1" (sources."basic-auth-2.0.1" // { @@ -7831,7 +7902,7 @@ in sources."cookie-0.4.1" sources."cookie-parser-1.4.6" sources."cookie-signature-1.0.6" - sources."core-js-3.22.2" + sources."core-js-3.22.3" sources."core-util-is-1.0.2" sources."crc-32-1.2.2" sources."cron-1.7.2" @@ -7852,7 +7923,7 @@ in sources."date-utils-1.2.21" sources."debug-4.3.4" sources."debuglog-1.0.1" - sources."deepmerge-4.2.2" + sources."deepmerge-1.5.2" sources."define-properties-1.1.4" sources."delayed-stream-1.0.0" sources."delegates-1.0.0" @@ -7886,10 +7957,11 @@ in sources."ecc-jsbn-0.1.2" sources."ecdsa-sig-formatter-1.0.11" sources."ee-first-1.1.1" + sources."element-ui-2.15.8" sources."emoji-regex-8.0.0" sources."enabled-1.0.2" sources."encodeurl-1.0.2" - sources."encoding-japanese-1.0.30" + sources."encoding-japanese-2.0.0" sources."end-of-stream-1.4.4" sources."entities-2.2.0" sources."env-variable-0.0.6" @@ -7908,18 +7980,11 @@ in sources."eventsource-1.1.0" sources."exit-on-epipe-1.0.1" sources."expand-tilde-2.0.2" - (sources."express-4.17.3" // { + (sources."express-4.18.1" // { dependencies = [ - sources."body-parser-1.19.2" - sources."cookie-0.4.2" + sources."cookie-0.5.0" sources."debug-2.6.9" - sources."depd-1.1.2" - sources."http-errors-1.8.1" sources."ms-2.0.0" - sources."on-finished-2.3.0" - sources."qs-6.9.7" - sources."raw-body-2.4.3" - sources."statuses-1.5.0" ]; }) sources."extend-3.0.2" @@ -7939,12 +8004,10 @@ in }) sources."file-type-14.7.1" sources."fill-range-7.0.1" - (sources."finalhandler-1.1.2" // { + (sources."finalhandler-1.2.0" // { dependencies = [ sources."debug-2.6.9" sources."ms-2.0.0" - sources."on-finished-2.3.0" - sources."statuses-1.5.0" ]; }) sources."flatted-3.2.5" @@ -8015,7 +8078,11 @@ in sources."help-me-1.1.0" sources."highlight.js-10.7.3" sources."homedir-polyfill-1.0.3" - sources."html-to-text-8.0.0" + (sources."html-to-text-8.2.0" // { + dependencies = [ + sources."deepmerge-4.2.2" + ]; + }) sources."htmlparser2-6.1.0" sources."http-errors-2.0.0" sources."http-proxy-agent-4.0.1" @@ -8052,6 +8119,7 @@ in sources."is-negative-zero-2.0.2" sources."is-number-7.0.0" sources."is-number-object-1.0.7" + sources."is-plain-object-5.0.0" sources."is-promise-1.0.1" sources."is-property-1.0.2" sources."is-regex-1.1.4" @@ -8095,15 +8163,15 @@ in sources."kuler-1.0.1" sources."leven-2.1.0" sources."libbase64-1.2.1" - (sources."libmime-5.0.0" // { + (sources."libmime-5.1.0" // { dependencies = [ - sources."iconv-lite-0.6.2" + sources."iconv-lite-0.6.3" ]; }) sources."libphonenumber-js-1.9.52" sources."libqp-1.1.0" sources."limiter-1.1.5" - sources."linkify-it-3.0.3" + sources."linkify-it-4.0.0" (sources."localtunnel-2.0.2" // { dependencies = [ sources."debug-4.3.2" @@ -8145,13 +8213,13 @@ in ]; }) sources."luxon-2.3.2" - (sources."mailparser-3.4.0" // { + (sources."mailparser-3.5.0" // { dependencies = [ sources."iconv-lite-0.6.3" - sources."nodemailer-6.7.0" + sources."nodemailer-6.7.3" ]; }) - sources."mailsplit-5.3.1" + sources."mailsplit-5.3.2" (sources."make-dir-3.1.0" // { dependencies = [ sources."semver-6.3.0" @@ -8212,15 +8280,15 @@ in ]; }) sources."mz-2.7.0" - sources."n8n-core-0.115.0" - sources."n8n-design-system-0.18.0" - sources."n8n-editor-ui-0.141.0" - (sources."n8n-nodes-base-0.172.0" // { + sources."n8n-core-0.116.0" + sources."n8n-design-system-0.19.0" + sources."n8n-editor-ui-0.142.0" + (sources."n8n-nodes-base-0.173.0" // { dependencies = [ sources."iconv-lite-0.6.3" ]; }) - sources."n8n-workflow-0.97.0" + sources."n8n-workflow-0.98.0" (sources."named-placeholders-1.1.2" // { dependencies = [ sources."lru-cache-4.1.5" @@ -8249,9 +8317,10 @@ in sources."node-html-parser-5.3.3" sources."node-ssh-12.0.4" sources."nodeify-1.0.1" - sources."nodemailer-6.7.3" + sources."nodemailer-6.7.4" sources."nopt-5.0.0" sources."normalize-path-3.0.0" + sources."normalize-wheel-1.0.1" sources."npmlog-5.0.1" sources."nth-check-2.0.1" sources."oauth-1.0a-2.2.6" @@ -8292,6 +8361,7 @@ in sources."parent-require-1.0.0" sources."parse-github-url-1.0.2" sources."parse-passwd-1.0.0" + sources."parse-srcset-1.0.2" sources."parse5-6.0.1" sources."parse5-htmlparser2-tree-adapter-6.0.1" sources."parseley-0.7.0" @@ -8339,6 +8409,7 @@ in sources."split2-4.1.0" ]; }) + sources."picocolors-1.0.0" sources."picomatch-2.3.1" sources."popsicle-12.1.0" sources."popsicle-content-encoding-1.0.0" @@ -8347,6 +8418,7 @@ in sources."popsicle-transport-http-1.2.1" sources."popsicle-transport-xhr-2.0.0" sources."popsicle-user-agent-1.0.0" + sources."postcss-8.4.13" sources."postgres-array-2.0.0" sources."postgres-bytea-1.0.0" sources."postgres-date-1.0.7" @@ -8414,10 +8486,11 @@ in sources."tough-cookie-2.5.0" ]; }) - sources."requestretry-7.0.2" + sources."requestretry-7.1.0" sources."require-at-1.0.6" sources."require-directory-2.1.1" sources."requires-port-1.0.0" + sources."resize-observer-polyfill-1.5.1" sources."restore-cursor-3.1.0" sources."ret-0.1.15" sources."retry-0.12.0" @@ -8437,24 +8510,24 @@ in sources."safe-buffer-5.2.1" sources."safe-stable-stringify-2.3.1" sources."safer-buffer-2.1.2" + (sources."sanitize-html-2.7.0" // { + dependencies = [ + sources."deepmerge-4.2.2" + ]; + }) sources."sax-1.2.4" sources."sb-promise-queue-2.1.0" sources."sb-scandir-3.1.0" sources."selderee-0.6.0" sources."semver-7.3.7" - (sources."send-0.17.2" // { + (sources."send-0.18.0" // { dependencies = [ (sources."debug-2.6.9" // { dependencies = [ sources."ms-2.0.0" ]; }) - sources."depd-1.1.2" - sources."destroy-1.0.4" - sources."http-errors-1.8.1" sources."ms-2.1.3" - sources."on-finished-2.3.0" - sources."statuses-1.5.0" ]; }) (sources."sentence-case-3.0.4" // { @@ -8464,7 +8537,7 @@ in }) sources."seq-queue-0.0.5" sources."serialize-javascript-5.0.1" - sources."serve-static-1.14.2" + sources."serve-static-1.15.0" sources."servie-4.3.3" sources."set-blocking-2.0.0" sources."setheader-1.0.2" @@ -8495,6 +8568,7 @@ in ]; }) sources."source-map-0.6.1" + sources."source-map-js-1.0.2" sources."spex-3.2.0" (sources."split2-3.2.2" // { dependencies = [ @@ -8503,11 +8577,11 @@ in ]; }) sources."sprintf-js-1.1.2" - sources."sqlite3-5.0.5" + sources."sqlite3-5.0.6" sources."sqlstring-2.3.3" sources."sse-channel-3.1.1" sources."ssf-0.11.2" - sources."ssh2-1.9.0" + sources."ssh2-1.10.0" sources."ssh2-sftp-client-7.2.3" sources."sshpk-1.17.0" sources."stack-trace-0.0.10" @@ -8528,7 +8602,7 @@ in sources."tdigest-0.1.1" (sources."tedious-6.7.1" // { dependencies = [ - sources."@types/node-12.20.49" + sources."@types/node-12.20.50" sources."bl-3.0.1" sources."iconv-lite-0.5.2" sources."readable-stream-3.6.0" @@ -8539,6 +8613,7 @@ in sources."text-hex-1.0.0" sources."thenify-3.3.1" sources."thenify-all-1.6.0" + sources."throttle-debounce-1.1.0" sources."through-2.3.8" (sources."through2-2.0.5" // { dependencies = [ @@ -8552,7 +8627,7 @@ in sources."throwback-4.1.0" sources."timeago.js-4.0.2" sources."tinycolor2-1.4.2" - sources."tlds-1.224.0" + sources."tlds-1.231.0" sources."tmp-0.0.33" (sources."tmp-promise-3.0.3" // { dependencies = [ From d515e117997d8634fce0675fce363a8c6c30ccd6 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 2 May 2022 16:46:09 +0000 Subject: [PATCH 32/56] python310Packages.ghp-import: 2.0.2 -> 2.1.0 --- pkgs/development/python-modules/ghp-import/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ghp-import/default.nix b/pkgs/development/python-modules/ghp-import/default.nix index 03aabc4ab6e2..f606867c167b 100644 --- a/pkgs/development/python-modules/ghp-import/default.nix +++ b/pkgs/development/python-modules/ghp-import/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "ghp-import"; - version = "2.0.2"; + version = "2.1.0"; src = fetchPypi { inherit pname version; - hash = "sha256-lHs3cfEb6FDIUsZLVhxgD93feUurNjBghUwe560F4HE="; + hash = "sha256-nFNcTGEZPC34hxIiVn1/1+UBTYNfl9x7dDkGniQT00M="; }; propagatedBuildInputs = [ python-dateutil ]; From fe2be5eec29e2761d18d68f60c06232c36de6736 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 2 May 2022 19:20:11 +0200 Subject: [PATCH 33/56] bore-cli: 0.2.3 -> 0.4.0 --- pkgs/tools/networking/bore-cli/default.nix | 18 ++++++++++++++---- pkgs/top-level/all-packages.nix | 6 +++++- 2 files changed, 19 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/networking/bore-cli/default.nix b/pkgs/tools/networking/bore-cli/default.nix index 370a726caa64..5ca16499fe82 100644 --- a/pkgs/tools/networking/bore-cli/default.nix +++ b/pkgs/tools/networking/bore-cli/default.nix @@ -1,17 +1,26 @@ -{ lib, rustPlatform, fetchFromGitHub }: +{ lib +, stdenv +, rustPlatform +, fetchFromGitHub +, Security +}: rustPlatform.buildRustPackage rec { pname = "bore-cli"; - version = "0.2.3"; + version = "0.4.0"; src = fetchFromGitHub { owner = "ekzhang"; repo = "bore"; rev = "v${version}"; - sha256 = "sha256-KSJ5KYXOwjtK1oE9IpsVKb7H4uuKJroCpM1Dk+2XJlY="; + hash = "sha256-ywdJH39OYLaM4st/DIcvvtIUzExpbAucMMpqouJL1yI="; }; - cargoSha256 = "sha256-HPMEbHDRmsmcr7Fuhsyr+NkdI9t1sL7q8uzj8sFks0s="; + cargoSha256 = "sha256-ZnEVTFiPo3AFyo1BoV88X2nCqYzRK6PkcbawiR+QnV0="; + + buildInputs = lib.optional stdenv.isDarwin [ + Security + ]; # tests do not find grcov path correctly meta = with lib; { @@ -19,5 +28,6 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/ekzhang/bore"; license = licenses.mit; maintainers = with maintainers; [ DieracDelta ]; + mainProgram = "bore"; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e780640be541..c27e0d56ac1a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14987,7 +14987,11 @@ with pkgs; libodb = callPackage ../development/libraries/libodb { }; libodb-sqlite = callPackage ../development/libraries/libodb-sqlite { }; bdep = callPackage ../development/tools/build-managers/build2/bdep.nix { }; - bore-cli = callPackage ../tools/networking/bore-cli/default.nix {}; + + bore-cli = callPackage ../tools/networking/bore-cli/default.nix { + inherit (darwin.apple_sdk.frameworks) Security; + }; + bpkg = callPackage ../development/tools/build-managers/build2/bpkg.nix { }; buildkite-agent = callPackage ../development/tools/continuous-integration/buildkite-agent { }; From 01048fa37c386a749bf8315422bf9ba4baeca833 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 2 May 2022 19:23:41 +0200 Subject: [PATCH 34/56] python310Packages.ghp-import: disable on older Python releases --- .../python-modules/ghp-import/default.nix | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ghp-import/default.nix b/pkgs/development/python-modules/ghp-import/default.nix index f606867c167b..956b1098e33f 100644 --- a/pkgs/development/python-modules/ghp-import/default.nix +++ b/pkgs/development/python-modules/ghp-import/default.nix @@ -2,23 +2,31 @@ , buildPythonPackage , fetchPypi , python-dateutil +, pythonOlder }: buildPythonPackage rec { pname = "ghp-import"; version = "2.1.0"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; hash = "sha256-nFNcTGEZPC34hxIiVn1/1+UBTYNfl9x7dDkGniQT00M="; }; - propagatedBuildInputs = [ python-dateutil ]; + propagatedBuildInputs = [ + python-dateutil + ]; # Does not include any unit tests doCheck = false; - pythonImportsCheck = [ "ghp_import" ]; + pythonImportsCheck = [ + "ghp_import" + ]; meta = with lib; { description = "Copy your docs directly to the gh-pages branch"; From 1ce2275cf000c8aad3cbd6f86b3e03dfc89dff7c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 2 May 2022 17:39:57 +0000 Subject: [PATCH 35/56] sigma-cli: 0.4.2 -> 0.4.3 --- pkgs/tools/security/sigma-cli/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/sigma-cli/default.nix b/pkgs/tools/security/sigma-cli/default.nix index d3099340ff1b..4b7965b26994 100644 --- a/pkgs/tools/security/sigma-cli/default.nix +++ b/pkgs/tools/security/sigma-cli/default.nix @@ -5,14 +5,14 @@ python3.pkgs.buildPythonApplication rec { pname = "sigma-cli"; - version = "0.4.2"; + version = "0.4.3"; format = "pyproject"; src = fetchFromGitHub { owner = "SigmaHQ"; repo = pname; - rev = "v${version}"; - hash = "sha256-UA28A/C7RyIs96a/U98WpkgeCotT4qmpZwvO3HYUE9Q="; + rev = "refs/tags/v${version}"; + hash = "sha256-3LFakeS3aQaacm7HqeAJPMJhi3Wf8zbJc//SEWUA1Rg="; }; nativeBuildInputs = with python3.pkgs; [ From 129a6899a000fa3d0fe209d80ced736de85f35d1 Mon Sep 17 00:00:00 2001 From: deinferno <14363193+deinferno@users.noreply.github.com> Date: Fri, 4 Feb 2022 19:31:49 +0500 Subject: [PATCH 36/56] pantum-driver: init at 1.1.84 --- pkgs/misc/drivers/pantum-driver/default.nix | 52 +++++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 ++ 2 files changed, 56 insertions(+) create mode 100644 pkgs/misc/drivers/pantum-driver/default.nix diff --git a/pkgs/misc/drivers/pantum-driver/default.nix b/pkgs/misc/drivers/pantum-driver/default.nix new file mode 100644 index 000000000000..1677dbca6fa7 --- /dev/null +++ b/pkgs/misc/drivers/pantum-driver/default.nix @@ -0,0 +1,52 @@ +{ lib +, stdenv +, fetchzip +, libusb1 +, cups +, dpkg +, libjpeg8 +, makeWrapper +, autoPatchelfHook +, enablePtqpdf ? false # Pantum's version of qpdf +}: + +let + architecture = { + i686-linux = "i386"; + x86_64-linux = "amd64"; + }.${stdenv.hostPlatform.system} or (throw "unsupported system ${stdenv.hostPlatform.system}"); +in +stdenv.mkDerivation rec { + pname = "pantum-driver"; + version = "1.1.84"; + + src = fetchzip { + url = "https://drivers.pantum.com/Pantum_Ubuntu_Driver_V${version}_1.zip"; + sha256 = "sha256-UJzYBsGj/TMhQoMourx7UPGBpN0MPi4pEN8m1sXLw/g="; + }; + + buildInputs = [ libusb1 libjpeg8 cups ]; + nativeBuildInputs = [ dpkg autoPatchelfHook ]; + + installPhase = '' + dpkg-deb -x ./Resources/pantum_${version}-1_${architecture}.deb . + + mkdir -p $out $out/lib + cp -r etc $out/ + cp -r usr/lib/cups $out/lib/ + cp -r usr/local/lib/* $out/lib/ + cp -r usr/share $out/ + cp Resources/locale/en_US.UTF-8/* $out/share/doc/pantum/ + '' + lib.optionalString enablePtqpdf '' + cp -r opt/pantum/* $out/ + ln -s $out/lib/libqpdf.so* $out/lib/libqpdf.so + ln -s $out/lib/libqpdf.so $out/lib/libqpdf.so.21 + ''; + + meta = { + description = "Pantum universal driver"; + homepage = "https://global.pantum.com/"; + license = lib.licenses.unfree; + platforms = [ "i686-linux" "x86_64-linux" ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a6783dba0442..a279b9be070c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9428,6 +9428,10 @@ with pkgs; poretools = callPackage ../applications/science/biology/poretools { }; + pantum-driver = callPackage ../misc/drivers/pantum-driver { + libjpeg8 = libjpeg.override { enableJpeg8 = true; }; + }; + postscript-lexmark = callPackage ../misc/drivers/postscript-lexmark { }; povray = callPackage ../tools/graphics/povray { From 3a8257c77be30e8908328f5ce2f5c6e9e01bd381 Mon Sep 17 00:00:00 2001 From: Malo Bourgon Date: Mon, 2 May 2022 11:28:30 -0700 Subject: [PATCH 37/56] sigma-cli: add meta.mainProgram --- pkgs/tools/security/sigma-cli/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/tools/security/sigma-cli/default.nix b/pkgs/tools/security/sigma-cli/default.nix index d3099340ff1b..e549330664d8 100644 --- a/pkgs/tools/security/sigma-cli/default.nix +++ b/pkgs/tools/security/sigma-cli/default.nix @@ -48,5 +48,6 @@ python3.pkgs.buildPythonApplication rec { homepage = "https://github.com/SigmaHQ/sigma-cli"; license = with licenses; [ lgpl21Plus ]; maintainers = with maintainers; [ fab ]; + mainProgram = "sigma"; }; } From 6870929ad1ffa5b78cf613b66e389ce949fc3b95 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 2 May 2022 21:07:34 +0200 Subject: [PATCH 38/56] python310Packages.gensim:disable on older Python releases - fix license - update inputs - add pythonImportsCheck --- .../python-modules/gensim/default.nix | 55 ++++++++++++------- 1 file changed, 36 insertions(+), 19 deletions(-) diff --git a/pkgs/development/python-modules/gensim/default.nix b/pkgs/development/python-modules/gensim/default.nix index 3249fd83e78a..06d645e13c6e 100644 --- a/pkgs/development/python-modules/gensim/default.nix +++ b/pkgs/development/python-modules/gensim/default.nix @@ -1,43 +1,60 @@ { lib , buildPythonPackage +, cython , fetchPypi +, mock , numpy -, six , scipy , smart-open -, scikit-learn, testfixtures, unittest2 -, isPy3k +, testfixtures +, pyemd +, pytestCheckHook +, pythonOlder }: buildPythonPackage rec { pname = "gensim"; version = "4.2.0"; - disabled = !isPy3k; + format = "setuptools"; + + disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-mV69KXCjHUfBAKqsECEvR+K/EuKwZTbTiIPJUf807vE="; + hash = "sha256-mV69KXCjHUfBAKqsECEvR+K/EuKwZTbTiIPJUf807vE="; }; - propagatedBuildInputs = [ smart-open numpy six scipy ]; + nativeBuildInputs = [ + cython + ]; - checkInputs = [ scikit-learn testfixtures unittest2 ]; + propagatedBuildInputs = [ + smart-open + numpy + scipy + ]; - # Two tests fail. - # - # ERROR: testAddMorphemesToEmbeddings (gensim.test.test_varembed_wrapper.TestVarembed) - # ImportError: Could not import morfessor. - # This package is not in nix - # - # ERROR: testWmdistance (gensim.test.test_fasttext_wrapper.TestFastText) - # ImportError: Please install pyemd Python package to compute WMD. - # This package is not in nix + checkInputs = [ + mock + pyemd + pytestCheckHook + ]; + + pythonImportsCheck = [ + "gensim" + ]; + + # Test setup takes several minutes doCheck = false; - meta = { + pytestFlagsArray = [ + "gensim/test" + ]; + + meta = with lib; { description = "Topic-modelling library"; homepage = "https://radimrehurek.com/gensim/"; - license = lib.licenses.lgpl21; - maintainers = with lib.maintainers; [ jyp ]; + license = licenses.lgpl21Only; + maintainers = with maintainers; [ jyp ]; }; } From 2e24a02d0f05a92e3611f396329f9d2359a62a68 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 2 May 2022 21:17:06 +0200 Subject: [PATCH 39/56] python310Packages.pims: enable tests - fix license - update inputs --- .../python-modules/pims/default.nix | 54 ++++++++++++------- 1 file changed, 36 insertions(+), 18 deletions(-) diff --git a/pkgs/development/python-modules/pims/default.nix b/pkgs/development/python-modules/pims/default.nix index d331bf372bbc..d11cebd4e785 100644 --- a/pkgs/development/python-modules/pims/default.nix +++ b/pkgs/development/python-modules/pims/default.nix @@ -1,34 +1,52 @@ { lib , buildPythonPackage -, fetchPypi -, slicerator -, scikitimage -, six +, fetchFromGitHub +, imageio , numpy -, tifffile -, nose +, pytestCheckHook +, pythonOlder +, scikitimage +, slicerator }: buildPythonPackage rec { + pname = "pims"; version = "0.6.0"; - pname = "PIMS"; + format = "setuptools"; - src = fetchPypi { - inherit pname version; - sha256 = "sha256-EQJ0LWQsi4rMcQ011QK11whe4SiMNhg3PvjEcgMLxoM="; + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "soft-matter"; + repo = pname; + rev = "v${version}"; + hash = "sha256-F4UWbD9fOfvaZwYcY1l7XOzVKZyqqTGTqVJoNPo1Ozg="; }; - checkInputs = [ nose ]; - propagatedBuildInputs = [ slicerator six numpy tifffile scikitimage ]; + propagatedBuildInputs = [ + slicerator + imageio + numpy + ]; - # not everything packaged with pypi release - doCheck = false; - pythonImportsCheck = [ "pims" ]; + checkInputs = [ + pytestCheckHook + scikitimage + ]; + + pythonImportsCheck = [ + "pims" + ]; + + disabledTests = [ + # NotImplementedError: Do not know how to deal with infinite readers + "TestVideo_ImageIO" + ]; meta = with lib; { - homepage = "https://github.com/soft-matter/pims"; description = "Python Image Sequence: Load video and sequential images in many formats with a simple, consistent interface"; - license = licenses.bsdOriginal; - maintainers = [ maintainers.costrouc ]; + homepage = "https://github.com/soft-matter/pims"; + license = licenses.bsd3; + maintainers = with maintainers; [ costrouc ]; }; } From 12082b1f9446284b42160c823060831ab473e01a Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 2 May 2022 21:18:38 +0200 Subject: [PATCH 40/56] python310Packages.gensim: remove whitespace --- pkgs/development/python-modules/gensim/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/gensim/default.nix b/pkgs/development/python-modules/gensim/default.nix index 06d645e13c6e..3a6fc0d254a9 100644 --- a/pkgs/development/python-modules/gensim/default.nix +++ b/pkgs/development/python-modules/gensim/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { hash = "sha256-mV69KXCjHUfBAKqsECEvR+K/EuKwZTbTiIPJUf807vE="; }; - nativeBuildInputs = [ + nativeBuildInputs = [ cython ]; From fc00305708b4806837cb2ceb646a1b488158d87f Mon Sep 17 00:00:00 2001 From: Austin Butler Date: Mon, 2 May 2022 12:30:00 -0700 Subject: [PATCH 41/56] pulumi-bin: 3.30.0 -> 3.31.0 --- pkgs/tools/admin/pulumi/data.nix | 146 +++++++++++++++--------------- pkgs/tools/admin/pulumi/update.sh | 6 +- 2 files changed, 77 insertions(+), 75 deletions(-) diff --git a/pkgs/tools/admin/pulumi/data.nix b/pkgs/tools/admin/pulumi/data.nix index b21151d9b588..29f9cbe0f3fc 100644 --- a/pkgs/tools/admin/pulumi/data.nix +++ b/pkgs/tools/admin/pulumi/data.nix @@ -1,12 +1,12 @@ # DO NOT EDIT! This file is generated automatically by update.sh { }: { - version = "3.30.0"; + version = "3.31.0"; pulumiPkgs = { x86_64-linux = [ { - url = "https://get.pulumi.com/releases/sdk/pulumi-v3.30.0-linux-x64.tar.gz"; - sha256 = "1js63rdmim5dq40fi6vwz982bc2604c0y0hmyj4mc5ag114lfz5w"; + url = "https://get.pulumi.com/releases/sdk/pulumi-v3.31.0-linux-x64.tar.gz"; + sha256 = "195jqrgax3sy9bz9i36d60x5y3j47bp43453yhs2zdcllh29jfn2"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v4.5.1-linux-amd64.tar.gz"; @@ -29,21 +29,21 @@ sha256 = "1x1fvnxhnhhv9fhqp4syhqcybjqpa2rq8d9nb8yvm9rxgcjllr0n"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v5.2.0-linux-amd64.tar.gz"; - sha256 = "0fwj6xdfvh0ysa58pzx37i4ysdf3idhp84d0lfwkbj4wvm6c15ga"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v5.3.0-linux-amd64.tar.gz"; + sha256 = "0srdq0blsm5p10kxds64ybh0pmy7n6v4sdd2s0555gc6w9l1ir40"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v5.20.0-linux-amd64.tar.gz"; - sha256 = "1113nqv4hg8fp5algq3jjn0l6sl56vmlbgxpfm8211m6z99kpjyx"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v5.3.0-linux-amd64.tar.gz"; + sha256 = "1mla2lc639w5shlih3nsf6hp696h7n592bwbhn9hl3xlpxvmwhdz"; + } + { + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v5.21.0-linux-amd64.tar.gz"; + sha256 = "06sp11azls8agqcrww3pgk19232ngbd19v9czp55321xpmgs0d6h"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuredevops-v2.4.0-linux-amd64.tar.gz"; sha256 = "1z8f287mm2mqfa76021fp5a1bj9045iwxcy8xs1ygh48b1890j49"; } - { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v5.2.0-linux-amd64.tar.gz"; - sha256 = "1mqp79h915zwdmvsqs82pnqbs3qv4nbh65b4ismdvgim667ykydy"; - } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v4.6.0-linux-amd64.tar.gz"; sha256 = "0hbrjydkw32xfks636pcfh00w0crn9ivhk0nw0a62812gvdafm9f"; @@ -73,8 +73,8 @@ sha256 = "0n1xqsfsqi773lwg9xbvglrd4pfb060fq8llxf06qj8h2imlxx34"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v6.20.0-linux-amd64.tar.gz"; - sha256 = "1q39n02cgp69jjl44xfxn13lcvmcqdb5szpk3d8cybp4kndsklf2"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v6.21.0-linux-amd64.tar.gz"; + sha256 = "18m3c22lgh1byj3va8mxv8dk6ivaphmf4azqz8ndvva7jmiqayyb"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v4.11.0-linux-amd64.tar.gz"; @@ -93,8 +93,8 @@ sha256 = "1gfiiwgb51ylwns3mqgnbgm2knrdzvy9r9v23yx0z03ba189d3m9"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v3.18.2-linux-amd64.tar.gz"; - sha256 = "13pwyqfj8mlvwd2s7marfhbp4jsb7ym9qzf02bl3aw99ngzzybsl"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v3.18.3-linux-amd64.tar.gz"; + sha256 = "1bs8bdkaa6qrrzddppar7yzcn3ml9rfvdmd72fcgvz1hw5vp7gzn"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v3.7.1-linux-amd64.tar.gz"; @@ -117,8 +117,8 @@ sha256 = "156wmbxm8c15lzqj2mx4mm14p569skfddfbq9rjyjlvxljklx2fd"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v4.4.2-linux-amd64.tar.gz"; - sha256 = "0agf96ji7mzkf4k4axm1v3psm5wkml41714dz88rn0csq0b31ca9"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v4.5.0-linux-amd64.tar.gz"; + sha256 = "0fs68z18lmhl46dl45fnavhycysfbfkparvq9irhcc679icwn5id"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-snowflake-v0.7.0-linux-amd64.tar.gz"; @@ -137,8 +137,8 @@ sha256 = "0yhsidz5mi6xznmrkvlg1jxyykhg3kccqd4fxg9zj9yv4l8ih2rw"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-tls-v4.2.2-linux-amd64.tar.gz"; - sha256 = "1x30qyrjrhn4gglcz2gc1h6n8px1v198fpsjf2wmf3v13pb15ix8"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-tls-v4.3.0-linux-amd64.tar.gz"; + sha256 = "14kgn1xz3i5lh096chd1bqac0391g13zma0nkraynnaqziqw5xgf"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vault-v5.4.1-linux-amd64.tar.gz"; @@ -163,8 +163,8 @@ ]; x86_64-darwin = [ { - url = "https://get.pulumi.com/releases/sdk/pulumi-v3.30.0-darwin-x64.tar.gz"; - sha256 = "0hbdcn5aby9a9nz3jb1p8rr7r35mv7hxdbb8lsqph70bzavw5bzi"; + url = "https://get.pulumi.com/releases/sdk/pulumi-v3.31.0-darwin-x64.tar.gz"; + sha256 = "1n1c05dpv1xhj7wsy4vxh31mzppmiz1qvjz9vhjnpjhcp9r949gr"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v4.5.1-darwin-amd64.tar.gz"; @@ -187,21 +187,21 @@ sha256 = "15a89ydv8yp71aamd9kciz9yggxza5njdikch5pvmd24jvar03gm"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v5.2.0-darwin-amd64.tar.gz"; - sha256 = "1jqqycasnk2i8w16qf52yya0p35ilfmabpd6alfgmpkk6ag7asa5"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v5.3.0-darwin-amd64.tar.gz"; + sha256 = "1qqbqjr0yh5ipyj074a86hjga126dib9x0c3rp40x7q03avsii3g"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v5.20.0-darwin-amd64.tar.gz"; - sha256 = "0lx3sfdck18ppmd76ijmih51adm9i2rc2ai564psqx41261zpjyr"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v5.3.0-darwin-amd64.tar.gz"; + sha256 = "0pig9hcmhig7ygx43fj0jjpv1js9kgdryhak62sfdvbsvcaqzp44"; + } + { + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v5.21.0-darwin-amd64.tar.gz"; + sha256 = "18b63y3wiw99wmkna5zv8k7bkrnnzm9nv4k14f93lg22jcmnhrkc"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuredevops-v2.4.0-darwin-amd64.tar.gz"; sha256 = "1shc7m4xlsmcjnrlbi2jyvmnvf9bg1cs6knfkl82jfs65ya5iidf"; } - { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v5.2.0-darwin-amd64.tar.gz"; - sha256 = "0xsk8d982w2zqvxfyqk1s3nilbsiqwnn3bwxm6d6zvhbi9ym63p7"; - } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v4.6.0-darwin-amd64.tar.gz"; sha256 = "11g07qp5b4p7ak5lrc1jaxlngfappba56lk9z8c6rlfs6ajkrfmq"; @@ -231,8 +231,8 @@ sha256 = "0i3aysdy7i13fx2a2kpnvd3qpn7vmc2mbln718kks3mikiz26aii"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v6.20.0-darwin-amd64.tar.gz"; - sha256 = "0rgqihk76hwyps1krhzg4an280ds9rjyq2pzhk1gbvljflplri4w"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v6.21.0-darwin-amd64.tar.gz"; + sha256 = "1zqbxqyv4x1fsyrdjpy2ham5fjs1yzjly0i3jpqrrkxfxw68z7an"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v4.11.0-darwin-amd64.tar.gz"; @@ -251,8 +251,8 @@ sha256 = "11r73jfqkc0wgdf66zp6pmgq5packlm4dkjp12a00z6l2s4f0w4h"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v3.18.2-darwin-amd64.tar.gz"; - sha256 = "041h4qsgzz5qd74q3lzcafqn3332gps4cf2i18x9pbnwvh7my69a"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v3.18.3-darwin-amd64.tar.gz"; + sha256 = "0ffnl6mbh9wpfb384zbv5v1sss4vvn0hqrcsy6v585984v1pays2"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v3.7.1-darwin-amd64.tar.gz"; @@ -275,8 +275,8 @@ sha256 = "0zjha6vv6j386h2gfhvwicpqz53v13v7zdfl6bydjzh3mw2x7bcg"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v4.4.2-darwin-amd64.tar.gz"; - sha256 = "1wmvmhxnjp32kp43fhjp8w9nrb0biki63w23l4zjxsdk7njply7c"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v4.5.0-darwin-amd64.tar.gz"; + sha256 = "1fnv2d4b458blx5k2s861lj8zc0fcxkw5jfjcm25nhdc7694v04w"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-snowflake-v0.7.0-darwin-amd64.tar.gz"; @@ -295,8 +295,8 @@ sha256 = "1n6w6da58crv2dyi0s7pjzjk3y85qlz6qaa77r0lm58f8wcj4a9d"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-tls-v4.2.2-darwin-amd64.tar.gz"; - sha256 = "1shfz3qz92plxsn31kqsvzk6sibgbglq66j34w5aj98g2g5891f4"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-tls-v4.3.0-darwin-amd64.tar.gz"; + sha256 = "0whh7br959dc4hz47iskgkcxf4d6zg9lv9jvx1b9lyplra7iwyv0"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vault-v5.4.1-darwin-amd64.tar.gz"; @@ -321,8 +321,8 @@ ]; aarch64-linux = [ { - url = "https://get.pulumi.com/releases/sdk/pulumi-v3.30.0-linux-arm64.tar.gz"; - sha256 = "1d7a4r0wyig5fbbs9d6jal2ria44ajca0441szsf1rd5ds29fvj3"; + url = "https://get.pulumi.com/releases/sdk/pulumi-v3.31.0-linux-arm64.tar.gz"; + sha256 = "1p3c7ks1q6i9frz8ljjf7jn00sr6bgqm53hxxwxkim7hkr614ndp"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v4.5.1-linux-arm64.tar.gz"; @@ -345,21 +345,21 @@ sha256 = "0j5wa27zhqf4vvpxgs4cmay8n3a74jsif4sr9x60mhkrhr0s117k"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v5.2.0-linux-arm64.tar.gz"; - sha256 = "1i4rbjaabqwhgfrsi75i8rr5imrn3lifkrgng1amyf279svsrc3q"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v5.3.0-linux-arm64.tar.gz"; + sha256 = "051lksfn7na30y6r7qn24wg222kf4bsvd26ga3y7i2xh00nh82kp"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v5.20.0-linux-arm64.tar.gz"; - sha256 = "15fszcgdnqnwjd1676sgrnlk45791927xagg22j5vf588v897ikj"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v5.3.0-linux-arm64.tar.gz"; + sha256 = "0g41dc6q42rr81167n4319llznjvb9i6zgfs5hrlxgz622grmax0"; + } + { + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v5.21.0-linux-arm64.tar.gz"; + sha256 = "1wyryxfmahcr668cp8kqc7l1spa6c1pzhxkwscd8payar78rswls"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuredevops-v2.4.0-linux-arm64.tar.gz"; sha256 = "0w55pk3ham08lrg3vq0hg3p23qipz21ln01g61xd0cpl79aysbq4"; } - { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v5.2.0-linux-arm64.tar.gz"; - sha256 = "0faxw096gf86z1bcl7g613hmnnabpcav9kzmc0bgdl4jja3l9flp"; - } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v4.6.0-linux-arm64.tar.gz"; sha256 = "1b1w886m6glpq49baj6zhyb2rcyi4y0kh4sl19ni3afmn9bw6xn3"; @@ -389,8 +389,8 @@ sha256 = "0qpan6zvny2h2ckigwnf4dhsgmnywam1m4d2jp0nj9pm3628pldv"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v6.20.0-linux-arm64.tar.gz"; - sha256 = "0rz1y61gg728l70rsk9mnd5qkdp3akxfdcfcmakabzs1axycvrzp"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v6.21.0-linux-arm64.tar.gz"; + sha256 = "0zwlr58wyd9aly58shffr24vsbna8bj2igl8l0j8gsf2g310n513"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v4.11.0-linux-arm64.tar.gz"; @@ -409,8 +409,8 @@ sha256 = "1vrz3pm14i5zdmk3yibny2sghxk8kzwb2qi77mjbiyfhbvciy97q"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v3.18.2-linux-arm64.tar.gz"; - sha256 = "0k46bm706i76svmxb03w3vb7jw3j9gxknx1y5fv6drnrmbzxgazq"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v3.18.3-linux-arm64.tar.gz"; + sha256 = "1ydmpcf13yj8jiw72nzzvnzpg3qwnwfr8j2qhr2jdwp1wxw46658"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v3.7.1-linux-arm64.tar.gz"; @@ -433,8 +433,8 @@ sha256 = "11y6vbmhrjqdlgzg9px1sm2p058v6mvk69gzhy2ix1c1a2sh6c56"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v4.4.2-linux-arm64.tar.gz"; - sha256 = "1x8v39icapr8iakp9yd50md9dyvj63z7yj93cl3b07qlwr9lcvmv"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v4.5.0-linux-arm64.tar.gz"; + sha256 = "16wshr4q9wfp7gi09n2c2ckvybg28adw429mghzmcs13aws1cycp"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-snowflake-v0.7.0-linux-arm64.tar.gz"; @@ -453,8 +453,8 @@ sha256 = "0zkmkg9bivf5hlcbdj2aqyszpsqk7x8ag99z0x2yd00v72x2qcb5"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-tls-v4.2.2-linux-arm64.tar.gz"; - sha256 = "1km5fhlic0vidqijx8bfjr0h1w0wwl9zk60ydz86kdxpby4b2flb"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-tls-v4.3.0-linux-arm64.tar.gz"; + sha256 = "06djcfard6yq6qd98gbsnkry0jv3nnlgmwr90d818vbf923z0b1h"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vault-v5.4.1-linux-arm64.tar.gz"; @@ -479,8 +479,8 @@ ]; aarch64-darwin = [ { - url = "https://get.pulumi.com/releases/sdk/pulumi-v3.30.0-darwin-arm64.tar.gz"; - sha256 = "10f2mamxg0h8lm4zf38j3a43s5d8r52f6lp6lrg0j705356w49bn"; + url = "https://get.pulumi.com/releases/sdk/pulumi-v3.31.0-darwin-arm64.tar.gz"; + sha256 = "0ixqqvzigq9l8xr2rcdf1ln7a3xhf9f52qz0zkabr8kq7l11vz3v"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v4.5.1-darwin-arm64.tar.gz"; @@ -503,21 +503,21 @@ sha256 = "1qx9717a5qajn3dp4i0gswd2pb80dq98igfad9nbz1f9sbbax2dv"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v5.2.0-darwin-arm64.tar.gz"; - sha256 = "1sl0d642nb6xpga8izgzbl9h94faynjjrjygccc7ccnrfdh4i0dv"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v5.3.0-darwin-arm64.tar.gz"; + sha256 = "0miqrbsivw7r4sw9q25lkn9z8fxq00sdx0l88agvzjp6rgsggbsl"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v5.20.0-darwin-arm64.tar.gz"; - sha256 = "0dwwwf7m7592nfk4lyc2vyh3ffqf6yfwr948b3padml89s2bmafx"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v5.3.0-darwin-arm64.tar.gz"; + sha256 = "0nxmcssbsn2yqbndaz50xj7jmd7ynjak13yicmli0l7jcrw7ksyp"; + } + { + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v5.21.0-darwin-arm64.tar.gz"; + sha256 = "1a7psd9l3rpf6sfil3wjc55mfdz856h5ixnsbjkpjy9zfblv42nv"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuredevops-v2.4.0-darwin-arm64.tar.gz"; sha256 = "0ivwpfhknhyidpafm2347g1pair7vk055ajhhyg631vizx53hrr9"; } - { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v5.2.0-darwin-arm64.tar.gz"; - sha256 = "09a6nxg66lv82zsis9axnch9slka136nsx43c2sqzmr5x5n11qww"; - } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v4.6.0-darwin-arm64.tar.gz"; sha256 = "1i7n2yvvsijhhxrdd6i9vvrlmrn382qyrs258kbrza5zckxshdwq"; @@ -547,8 +547,8 @@ sha256 = "0jj35mj57sivi5qsbwv8qm2jginppi192qlx6ashvgm352gia9r1"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v6.20.0-darwin-arm64.tar.gz"; - sha256 = "0ag3m8nnhni98cwaffj30ir8s94b8xvrjsbhn32lin1lnqwm1114"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v6.21.0-darwin-arm64.tar.gz"; + sha256 = "0k3cyflqnf5n72lg02my28mmclacrnxpyjkakl4gj8qknsj7q94r"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v4.11.0-darwin-arm64.tar.gz"; @@ -567,8 +567,8 @@ sha256 = "058f1j40ar4xh860c3qrm0qaagm69fdmbw14avvrhsmw245cyyzc"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v3.18.2-darwin-arm64.tar.gz"; - sha256 = "0scmn5cx23g5ap31x93ybimyyx3sqwyz429881px2qdl3k4m75vw"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v3.18.3-darwin-arm64.tar.gz"; + sha256 = "1smhffxxr9kfpx1czd5c2sx4srgnp2yafrqv7r4y7xqdxi92x2k0"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v3.7.1-darwin-arm64.tar.gz"; @@ -591,8 +591,8 @@ sha256 = "14qp5vlmny68hjca1xykc06z2f740q1flkn9d7n2k6knzp1db9xq"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v4.4.2-darwin-arm64.tar.gz"; - sha256 = "1rbig2n5x2lzxpscnja0ya9a68z3jk0qz2zwdnzi66xy7i3zd39l"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v4.5.0-darwin-arm64.tar.gz"; + sha256 = "1m6rbisrfh6im9l9c5kfmi0fqp1ndr8wayc33ay18yikrnpfiibj"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-snowflake-v0.7.0-darwin-arm64.tar.gz"; @@ -611,8 +611,8 @@ sha256 = "1vbbca4z6z92yk2y6g15s0cyvs5n6vx84h30ldnn4mn3gdfdi7gg"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-tls-v4.2.2-darwin-arm64.tar.gz"; - sha256 = "1ln8qizgisnf1z98vyflid99d5pl1zryrj0hg995d1lf2r0dy35g"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-tls-v4.3.0-darwin-arm64.tar.gz"; + sha256 = "16rnbbzx6fsck769sqghb9gqkkpl6vwbpczm8wrfa5ya90743mcm"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vault-v5.4.1-darwin-arm64.tar.gz"; diff --git a/pkgs/tools/admin/pulumi/update.sh b/pkgs/tools/admin/pulumi/update.sh index 671a9875a6f1..fadc64cf1dfe 100755 --- a/pkgs/tools/admin/pulumi/update.sh +++ b/pkgs/tools/admin/pulumi/update.sh @@ -8,9 +8,11 @@ if [ -z "${GITHUB_TOKEN}" ]; then exit 1 fi +SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd ) + # Version of Pulumi from # https://www.pulumi.com/docs/get-started/install/versions/ -VERSION="3.30.0" +VERSION="3.31.0" # An array of plugin names. The respective repository inside Pulumi's # Github organization is called pulumi-$name by convention. @@ -157,4 +159,4 @@ EOF echo " };" echo "}" -} > data.nix +} > "${SCRIPT_DIR}/data.nix" From e9452b3b3ed9b295e1cede48f6549bb28c1d4773 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Mon, 2 May 2022 05:36:53 +0000 Subject: [PATCH 42/56] python3Packages.preprocess-cancellation: fix build --- .../preprocess-cancellation/default.nix | 42 ++++++++++++++++--- .../preprocess-cancellation/pep-621.patch | 20 +++++++++ 2 files changed, 56 insertions(+), 6 deletions(-) create mode 100644 pkgs/development/python-modules/preprocess-cancellation/pep-621.patch diff --git a/pkgs/development/python-modules/preprocess-cancellation/default.nix b/pkgs/development/python-modules/preprocess-cancellation/default.nix index d671cb4d66eb..44a54810e443 100644 --- a/pkgs/development/python-modules/preprocess-cancellation/default.nix +++ b/pkgs/development/python-modules/preprocess-cancellation/default.nix @@ -1,6 +1,11 @@ -{ lib, fetchFromGitHub, buildPythonPackage, pythonOlder, poetry-core -, pytestCheckHook, pytest-cov -, shapely }: +{ lib +, buildPythonPackage +, pythonOlder +, fetchFromGitHub +, poetry-core +, shapely +, pytestCheckHook +}: buildPythonPackage rec { pname = "preprocess-cancellation"; @@ -16,11 +21,36 @@ buildPythonPackage rec { hash = "sha256-mn3/etXA5dkL+IsyxwD4/XjU/t4/roYFVyqQxlLOoOI="; }; - nativeBuildInputs = [ poetry-core ]; + patches = [ + ./pep-621.patch + ]; - propagatedBuildInputs = [ shapely ]; + postPatch = '' + sed -i "/^addopts/d" pyproject.toml - checkInputs = [ pytestCheckHook pytest-cov ]; + # setuptools 61 compatibility + # error: Multiple top-level packages discovered in a flat-layout: ['STLs', 'GCode']. + mkdir tests + mv GCode STLs test_* tests + substituteInPlace tests/test_preprocessor.py \ + --replace "./GCode" "./tests/GCode" + substituteInPlace tests/test_preprocessor_with_shapely.py \ + --replace "./GCode" "./tests/GCode" + ''; + + nativeBuildInputs = [ + poetry-core + ]; + + propagatedBuildInputs = [ + shapely + ]; + + checkInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ "preprocess_cancellation" ]; meta = with lib; { description = "Klipper GCode Preprocessor for Object Cancellation"; diff --git a/pkgs/development/python-modules/preprocess-cancellation/pep-621.patch b/pkgs/development/python-modules/preprocess-cancellation/pep-621.patch new file mode 100644 index 000000000000..48d8db33d465 --- /dev/null +++ b/pkgs/development/python-modules/preprocess-cancellation/pep-621.patch @@ -0,0 +1,20 @@ +diff --git a/pyproject.toml b/pyproject.toml +index da1376e..88298a7 100644 +--- a/pyproject.toml ++++ b/pyproject.toml +@@ -1,11 +1,11 @@ +-[tool.poetry] ++[project] + name = "preprocess_cancellation" + version = "0.2.0" + description = "GCode processor to add klipper cancel-object markers" + readme = "README.md" +-authors = ["Franklyn Tackitt "] +-repository = "https://github.com/kageurufu/cancelobject-preprocessor" +-license = "GPL-3.0-only" ++authors = [ { name = "Franklyn Tackitt", email = "im@frank.af" } ] ++urls.repository = "https://github.com/kageurufu/cancelobject-preprocessor" ++license.text = "GPL-3.0-only" + + [tool.poetry.urls] + "Bug Tracker" = "https://github.com/kageurufu/cancelobject-preprocessor/issues" From a040d8f34a07551866e5844de7422b7358ba7e01 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Mon, 2 May 2022 19:53:59 +0000 Subject: [PATCH 43/56] python3Packages.pyhiveapi: 0.5.1 -> 0.5.3 --- pkgs/development/python-modules/pyhiveapi/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyhiveapi/default.nix b/pkgs/development/python-modules/pyhiveapi/default.nix index 0218b77e116d..32975651e1fa 100644 --- a/pkgs/development/python-modules/pyhiveapi/default.nix +++ b/pkgs/development/python-modules/pyhiveapi/default.nix @@ -2,6 +2,7 @@ , buildPythonPackage , pythonOlder , fetchFromGitHub +, setuptools , unasync , boto3 , botocore @@ -13,7 +14,7 @@ buildPythonPackage rec { pname = "pyhiveapi"; - version = "0.5.1"; + version = "0.5.3"; format = "pyproject"; @@ -23,7 +24,7 @@ buildPythonPackage rec { owner = "Pyhass"; repo = "Pyhiveapi"; rev = "v${version}"; - hash = "sha256-/M1OjApc0l0EzNI4hs4KO6woCOmTPveTFCyj5MjM5EE="; + hash = "sha256-QBn+yKZN461npdhGngTnFeewE40dPZ+5TkUf5Xacajk="; }; postPatch = '' @@ -32,6 +33,7 @@ buildPythonPackage rec { ''; nativeBuildInputs = [ + setuptools unasync ]; From 2a0b704f16f1984e65c661345f267e72014a1d33 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 2 May 2022 21:57:08 +0200 Subject: [PATCH 44/56] python310Packages.pims: ignore DeprecationWarning --- pkgs/development/python-modules/pims/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/python-modules/pims/default.nix b/pkgs/development/python-modules/pims/default.nix index d11cebd4e785..85a867ec5118 100644 --- a/pkgs/development/python-modules/pims/default.nix +++ b/pkgs/development/python-modules/pims/default.nix @@ -38,6 +38,11 @@ buildPythonPackage rec { "pims" ]; + pytestFlagsArray = [ + "-W" + "ignore::DeprecationWarning" + ]; + disabledTests = [ # NotImplementedError: Do not know how to deal with infinite readers "TestVideo_ImageIO" From 699455022496a9289ae79634eb3315d4ee14eff4 Mon Sep 17 00:00:00 2001 From: Aaron Jheng Date: Mon, 2 May 2022 02:58:56 +0000 Subject: [PATCH 45/56] hjson-go: 3.1.1 -> 3.2.0 --- pkgs/development/tools/hjson-go/default.nix | 26 +++++++++++---------- 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/pkgs/development/tools/hjson-go/default.nix b/pkgs/development/tools/hjson-go/default.nix index 3b2dc5015216..1700bae1a480 100644 --- a/pkgs/development/tools/hjson-go/default.nix +++ b/pkgs/development/tools/hjson-go/default.nix @@ -1,23 +1,25 @@ -{ lib, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: -buildGoPackage rec { +buildGoModule rec { pname = "hjson-go"; - version = "3.1.1"; + version = "3.2.0"; src = fetchFromGitHub { owner = "hjson"; repo = pname; rev = "v${version}"; - sha256 = "sha256-yU1VkxwQ12CjzITR9X6LLaOfiteN+807rfB/tWcRR1c="; + sha256 = "sha256-plsiHxjrZXcnaqN8Frs+VuGwV7JOj8UwB0iibp3ApAk="; }; - goPackagePath = "github.com/hjson/hjson-go"; + vendorSha256 = "sha256-pQpattmS9VmO3ZIQUFn66az8GSmB4IvYhTTCFn6SUmo="; - meta = with lib; - src.meta // { - description = "Utility to convert JSON to and from HJSON"; - maintainers = with maintainers; [ ehmry ]; - mainProgram = "hjson-cli"; - license = licenses.mit; - }; + ldflags = [ "-s" "-w" ]; + + meta = with lib; { + description = "Utility to convert JSON to and from HJSON"; + homepage = "https://hjson.github.io/"; + maintainers = with maintainers; [ ehmry ]; + license = licenses.mit; + mainProgram = "hjson-cli"; + }; } From fddfaa3b72bd4f13655ac7aba1500c14ba9f0456 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Mon, 2 May 2022 22:15:56 +0200 Subject: [PATCH 46/56] firefox: remove unused option --- pkgs/applications/networking/browsers/firefox/common.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/applications/networking/browsers/firefox/common.nix b/pkgs/applications/networking/browsers/firefox/common.nix index e43251be80cc..85190f038994 100644 --- a/pkgs/applications/networking/browsers/firefox/common.nix +++ b/pkgs/applications/networking/browsers/firefox/common.nix @@ -112,7 +112,6 @@ ## other , crashreporterSupport ? false -, safeBrowsingSupport ? false # As stated by Sylvestre Ledru (@sylvestre) on Nov 22, 2017 at # https://github.com/NixOS/nixpkgs/issues/31843#issuecomment-346372756 we From 1fddd7401aa6667dd19780a3d041e9a7ea673c31 Mon Sep 17 00:00:00 2001 From: Sandro Date: Mon, 2 May 2022 22:43:07 +0200 Subject: [PATCH 47/56] htop: remove linux only hint from description because it also works on darwin --- pkgs/tools/system/htop/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/system/htop/default.nix b/pkgs/tools/system/htop/default.nix index 823d20630eb3..47ebee52fe16 100644 --- a/pkgs/tools/system/htop/default.nix +++ b/pkgs/tools/system/htop/default.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - description = "An interactive process viewer for Linux"; + description = "An interactive process viewer"; homepage = "https://htop.dev"; license = licenses.gpl2Only; platforms = platforms.all; From a7ca41f1ff24131c1386a20d5cfa2ce2591b17a1 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 2 May 2022 23:48:19 +0200 Subject: [PATCH 48/56] python310Packages.secretstorage: 3.3.1 -> 3.3.2 --- .../python-modules/secretstorage/default.nix | 23 ++++++++++++++----- 1 file changed, 17 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/secretstorage/default.nix b/pkgs/development/python-modules/secretstorage/default.nix index 5b7b7ea27972..a9f336d18df9 100644 --- a/pkgs/development/python-modules/secretstorage/default.nix +++ b/pkgs/development/python-modules/secretstorage/default.nix @@ -1,15 +1,22 @@ -{ lib, fetchPypi, buildPythonPackage, pythonOlder, cryptography, jeepney }: +{ lib +, buildPythonPackage +, cryptography +, fetchPypi +, jeepney +, pythonOlder +}: buildPythonPackage rec { pname = "secretstorage"; - version = "3.3.1"; + version = "3.3.2"; + format = "setuptools"; - disabled = pythonOlder "3.5"; + disabled = pythonOlder "3.7"; src = fetchPypi { pname = "SecretStorage"; inherit version; - sha256 = "15ginv4gzxrx77n7517xnvf2jcpqc6ran12s951hc85zlr8nqrpx"; + hash = "sha256-Co65ZFsyCIHCIugnwm9M/PVTY+izdKAhmB74hmV6kS8="; }; propagatedBuildInputs = [ @@ -17,12 +24,16 @@ buildPythonPackage rec { jeepney ]; - # Needs a D-Bus Sesison + # Needs a D-Bus session doCheck = false; + pythonImportsCheck = [ + "secretstorage" + ]; + meta = with lib; { - homepage = "https://github.com/mitya57/secretstorage"; description = "Python bindings to FreeDesktop.org Secret Service API"; + homepage = "https://github.com/mitya57/secretstorage"; license = licenses.bsd3; maintainers = with maintainers; [ teto ]; }; From 494ad97836e36dd6a05fa525323622984e087297 Mon Sep 17 00:00:00 2001 From: Leix b Date: Tue, 3 May 2022 00:38:59 +0200 Subject: [PATCH 49/56] gof5: init at 0.1.4 (#169422) Co-authored-by: Sandro --- pkgs/tools/networking/gof5/default.nix | 30 ++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 32 insertions(+) create mode 100644 pkgs/tools/networking/gof5/default.nix diff --git a/pkgs/tools/networking/gof5/default.nix b/pkgs/tools/networking/gof5/default.nix new file mode 100644 index 000000000000..9b437ee49ee6 --- /dev/null +++ b/pkgs/tools/networking/gof5/default.nix @@ -0,0 +1,30 @@ +{ lib +, fetchFromGitHub +, buildGoModule +}: + +buildGoModule rec { + pname = "gof5"; + version = "0.1.4"; + + src = fetchFromGitHub { + owner = "kayrus"; + repo = pname; + rev = "v${version}"; + sha256 = "10qh7rj8s540ghjdvymly53vny3n0qd0z0ixy24n026jjhgjvnpl"; + }; + + vendorSha256 = null; + + # The tests are broken and apparently you need to uncomment some lines in the + # code in order for it to work. + # See: https://github.com/kayrus/gof5/blob/674485bdf5a0eb2ab57879a32a2cb4bab8d5d44c/pkg/client/http.go#L172-L174 + doCheck = false; + + meta = with lib; { + description = "Open Source F5 BIG-IP VPN client"; + homepage = "https://github.com/kayrus/gof5"; + license = licenses.asl20; + maintainers = with maintainers; [ leixb ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d6c5bbf7e377..5fd9b47dcfbc 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1137,6 +1137,8 @@ with pkgs; gobgp = callPackage ../tools/networking/gobgp { }; + gof5 = callPackage ../tools/networking/gof5 { }; + goflow = callPackage ../tools/networking/goflow { }; gofu = callPackage ../applications/misc/gofu { }; From 1df86fce588d2229a8bc19ea340e09253c0ad09f Mon Sep 17 00:00:00 2001 From: Alex Martens Date: Sun, 1 May 2022 10:57:58 -0700 Subject: [PATCH 50/56] saleae-logic-2: 2.3.50 -> 2.3.51 --- pkgs/development/tools/misc/saleae-logic-2/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/misc/saleae-logic-2/default.nix b/pkgs/development/tools/misc/saleae-logic-2/default.nix index f90f6b067b7e..c3349661c559 100644 --- a/pkgs/development/tools/misc/saleae-logic-2/default.nix +++ b/pkgs/development/tools/misc/saleae-logic-2/default.nix @@ -1,10 +1,10 @@ { lib, fetchurl, makeDesktopItem, appimageTools, gtk3 }: let name = "saleae-logic-2"; - version = "2.3.50"; + version = "2.3.51"; src = fetchurl { url = "https://downloads.saleae.com/logic2/Logic-${version}-master.AppImage"; - sha256 = "sha256-jkdFdgiSP2ssrUajl85FA4E21Qi6BUgrjKFdlBYyG7c="; + sha256 = "sha256-Z5GPA1cJbQJOjntWXe1uF26e7nJ99+ANoCP57Y/OO5A="; }; desktopItem = makeDesktopItem { inherit name; From 6c69577b23bca5431f6849edc9768b7e0d9d4001 Mon Sep 17 00:00:00 2001 From: Zhaofeng Li Date: Wed, 27 Apr 2022 17:45:06 -0700 Subject: [PATCH 51/56] colmena: 0.2.2 -> 0.3.0 --- pkgs/tools/admin/colmena/default.nix | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/admin/colmena/default.nix b/pkgs/tools/admin/colmena/default.nix index 8d7982060de6..c0ed0e60f1f2 100644 --- a/pkgs/tools/admin/colmena/default.nix +++ b/pkgs/tools/admin/colmena/default.nix @@ -1,20 +1,25 @@ -{ stdenv, lib, rustPlatform, fetchFromGitHub, installShellFiles, colmena, testers }: +{ stdenv, lib, rustPlatform, fetchFromGitHub, installShellFiles, nix-eval-jobs +, colmena, testers }: rustPlatform.buildRustPackage rec { pname = "colmena"; - version = "0.2.2"; + version = "0.3.0"; src = fetchFromGitHub { owner = "zhaofengli"; repo = "colmena"; rev = "v${version}"; - sha256 = "sha256-VsqFiqZUjGpDZfw6ws1rvqm/NGUfFBXHa0N8ZkBaMh8="; + sha256 = "sha256-aGpMiY9pS2616AfAVWA87tULKatDYF2kCKxwYstK8V0="; }; - cargoSha256 = "sha256-NVvPh0+53YIm5Kb/lNyXb7M3bbADBVdsTaPptyb37lw="; + cargoSha256 = "sha256-ckCArDFjVwVWWK0Ffj0AYe411b9xU33CBc1zeCh2kns="; nativeBuildInputs = [ installShellFiles ]; + buildInputs = [ nix-eval-jobs ]; + + NIX_EVAL_JOBS = "${nix-eval-jobs}/bin/nix-eval-jobs"; + postInstall = lib.optionalString (stdenv.hostPlatform == stdenv.buildPlatform) '' installShellCompletion --cmd colmena \ --bash <($out/bin/colmena gen-completions bash) \ @@ -37,6 +42,6 @@ rustPlatform.buildRustPackage rec { homepage = "https://zhaofengli.github.io/colmena/${passthru.apiVersion}"; license = licenses.mit; maintainers = with maintainers; [ zhaofengli ]; - platforms = platforms.linux; + platforms = platforms.linux ++ platforms.darwin; }; } From 4427d9cd73a3900097d651b0bc1abebc697e94dc Mon Sep 17 00:00:00 2001 From: Aaron Jheng Date: Mon, 2 May 2022 14:35:19 +0000 Subject: [PATCH 52/56] gitbatch: 2019-12-19 -> 0.6.1 --- .../git-and-tools/gitbatch/default.nix | 22 +- .../git-and-tools/gitbatch/deps.nix | 543 ------------------ 2 files changed, 12 insertions(+), 553 deletions(-) delete mode 100644 pkgs/applications/version-management/git-and-tools/gitbatch/deps.nix diff --git a/pkgs/applications/version-management/git-and-tools/gitbatch/default.nix b/pkgs/applications/version-management/git-and-tools/gitbatch/default.nix index 25f7e95d184f..75fea7bf871f 100644 --- a/pkgs/applications/version-management/git-and-tools/gitbatch/default.nix +++ b/pkgs/applications/version-management/git-and-tools/gitbatch/default.nix @@ -1,20 +1,22 @@ -{ lib, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: -buildGoPackage rec { - pname = "gitbatch-unstable"; - version = "2019-12-19"; - - goPackagePath = "github.com/isacikgoz/gitbatch"; - - goDeps = ./deps.nix; +buildGoModule rec { + pname = "gitbatch"; + version = "0.6.1"; src = fetchFromGitHub { owner = "isacikgoz"; repo = "gitbatch"; - rev = "381b0df7f86056c625c0d4d2d979733c1ee5def7"; - sha256 = "0613vfqdn3k0w7fm25rqnqdr67w9vii3i56dfslqcn1vqjfrff3q"; + rev = "v${version}"; + sha256 = "sha256-ovmdbyPRSebwmW6AW55jBgBKaNdY6w5/wrpUF2cMKw8="; }; + vendorSha256 = "sha256-wwpaJO5cXMsvqFXj+qGiIm4zg/SL4YCm2mNnG/qdilw="; + + ldflags = [ "-s" "-w" ]; + + checkFlags = [ "-short" ]; + meta = with lib; { description = "Running git UI commands"; homepage = "https://github.com/isacikgoz/gitbatch"; diff --git a/pkgs/applications/version-management/git-and-tools/gitbatch/deps.nix b/pkgs/applications/version-management/git-and-tools/gitbatch/deps.nix deleted file mode 100644 index 53784b4eacf0..000000000000 --- a/pkgs/applications/version-management/git-and-tools/gitbatch/deps.nix +++ /dev/null @@ -1,543 +0,0 @@ -# file generated from go.mod using vgo2nix (https://github.com/adisbladis/vgo2nix) -[ - { - goPackagePath = "github.com/alcortesm/tgz"; - fetch = { - type = "git"; - url = "https://github.com/alcortesm/tgz"; - rev = "9c5fe88206d7"; - sha256 = "04dcwnz2c2i4wbq2vx3g2wrdgqpncr2r1h6p1k08rdwk4bq1h8c5"; - }; - } - { - goPackagePath = "github.com/alecthomas/template"; - fetch = { - type = "git"; - url = "https://github.com/alecthomas/template"; - rev = "a0175ee3bccc"; - sha256 = "0qjgvvh26vk1cyfq9fadyhfgdj36f1iapbmr5xp6zqipldz8ffxj"; - }; - } - { - goPackagePath = "github.com/alecthomas/units"; - fetch = { - type = "git"; - url = "https://github.com/alecthomas/units"; - rev = "2efee857e7cf"; - sha256 = "1j65b91qb9sbrml9cpabfrcf07wmgzzghrl7809hjjhrmbzri5bl"; - }; - } - { - goPackagePath = "github.com/anmitsu/go-shlex"; - fetch = { - type = "git"; - url = "https://github.com/anmitsu/go-shlex"; - rev = "648efa622239"; - sha256 = "10rgdp5d106iisgz25ic8k6f44s9adh4sjh6fyxq9ccm21gw49b7"; - }; - } - { - goPackagePath = "github.com/armon/consul-api"; - fetch = { - type = "git"; - url = "https://github.com/armon/consul-api"; - rev = "eb2c6b5be1b6"; - sha256 = "1j6fdr1sg36qy4n4xjl7brq739fpm5npq98cmvklzjc9qrx98nk9"; - }; - } - { - goPackagePath = "github.com/coreos/etcd"; - fetch = { - type = "git"; - url = "https://github.com/coreos/etcd"; - rev = "v3.3.10"; - sha256 = "1x2ii1hj8jraba8rbxz6dmc03y3sjxdnzipdvg6fywnlq1f3l3wl"; - }; - } - { - goPackagePath = "github.com/coreos/go-etcd"; - fetch = { - type = "git"; - url = "https://github.com/coreos/go-etcd"; - rev = "v2.0.0"; - sha256 = "1xb34hzaa1lkbq5vkzy9vcz6gqwj7hp6cdbvyack2bf28dwn33jj"; - }; - } - { - goPackagePath = "github.com/coreos/go-semver"; - fetch = { - type = "git"; - url = "https://github.com/coreos/go-semver"; - rev = "v0.2.0"; - sha256 = "1gghi5bnqj50hfxhqc1cxmynqmh2yk9ii7ab9gsm75y5cp94ymk0"; - }; - } - { - goPackagePath = "github.com/davecgh/go-spew"; - fetch = { - type = "git"; - url = "https://github.com/davecgh/go-spew"; - rev = "v1.1.1"; - sha256 = "0hka6hmyvp701adzag2g26cxdj47g21x6jz4sc6jjz1mn59d474y"; - }; - } - { - goPackagePath = "github.com/emirpasic/gods"; - fetch = { - type = "git"; - url = "https://github.com/emirpasic/gods"; - rev = "v1.9.0"; - sha256 = "1zhkppqzy149fp561pif8d5d92jd9chl3l9z4yi5f8n60ibdmmjf"; - }; - } - { - goPackagePath = "github.com/fatih/color"; - fetch = { - type = "git"; - url = "https://github.com/fatih/color"; - rev = "v1.7.0"; - sha256 = "0v8msvg38r8d1iiq2i5r4xyfx0invhc941kjrsg5gzwvagv55inv"; - }; - } - { - goPackagePath = "github.com/flynn/go-shlex"; - fetch = { - type = "git"; - url = "https://github.com/flynn/go-shlex"; - rev = "3f9db97f8568"; - sha256 = "1j743lysygkpa2s2gii2xr32j7bxgc15zv4113b0q9jhn676ysia"; - }; - } - { - goPackagePath = "github.com/fsnotify/fsnotify"; - fetch = { - type = "git"; - url = "https://github.com/fsnotify/fsnotify"; - rev = "v1.4.7"; - sha256 = "07va9crci0ijlivbb7q57d2rz9h27zgn2fsm60spjsqpdbvyrx4g"; - }; - } - { - goPackagePath = "github.com/gliderlabs/ssh"; - fetch = { - type = "git"; - url = "https://github.com/gliderlabs/ssh"; - rev = "v0.1.1"; - sha256 = "0bylkc7yg8bxxffhchikcnzwli5n95cfmbji6v2a4mn1h5n36mdm"; - }; - } - { - goPackagePath = "github.com/google/go-cmp"; - fetch = { - type = "git"; - url = "https://github.com/google/go-cmp"; - rev = "v0.2.0"; - sha256 = "1fbv0x27k9sn8svafc0hjwsnckk864lv4yi7bvzrxvmd3d5hskds"; - }; - } - { - goPackagePath = "github.com/hashicorp/hcl"; - fetch = { - type = "git"; - url = "https://github.com/hashicorp/hcl"; - rev = "v1.0.0"; - sha256 = "0q6ml0qqs0yil76mpn4mdx4lp94id8vbv575qm60jzl1ijcl5i66"; - }; - } - { - goPackagePath = "github.com/jbenet/go-context"; - fetch = { - type = "git"; - url = "https://github.com/jbenet/go-context"; - rev = "d14ea06fba99"; - sha256 = "0q91f5549n81w3z5927n4a1mdh220bdmgl42zi3h992dcc4ls0sl"; - }; - } - { - goPackagePath = "github.com/jessevdk/go-flags"; - fetch = { - type = "git"; - url = "https://github.com/jessevdk/go-flags"; - rev = "v1.4.0"; - sha256 = "0algnnigph27spgn655zm4723yfjxjjvlf4k14z9drj3682df25a"; - }; - } - { - goPackagePath = "github.com/jroimartin/gocui"; - fetch = { - type = "git"; - url = "https://github.com/jroimartin/gocui"; - rev = "v0.4.0"; - sha256 = "1b1cbjg925l1c5v3ls8amni9716190yzf847cqs9wjnj82z8qa47"; - }; - } - { - goPackagePath = "github.com/kevinburke/ssh_config"; - fetch = { - type = "git"; - url = "https://github.com/kevinburke/ssh_config"; - rev = "81db2a75821e"; - sha256 = "0hwmv2h83aa7r6l7yqwsxdyldnlhb4gbbkc3ww9nys7impjcjnsp"; - }; - } - { - goPackagePath = "github.com/konsorten/go-windows-terminal-sequences"; - fetch = { - type = "git"; - url = "https://github.com/konsorten/go-windows-terminal-sequences"; - rev = "v1.0.1"; - sha256 = "1lchgf27n276vma6iyxa0v1xds68n2g8lih5lavqnx5x6q5pw2ip"; - }; - } - { - goPackagePath = "github.com/kr/pretty"; - fetch = { - type = "git"; - url = "https://github.com/kr/pretty"; - rev = "v0.1.0"; - sha256 = "18m4pwg2abd0j9cn5v3k2ksk9ig4vlwxmlw9rrglanziv9l967qp"; - }; - } - { - goPackagePath = "github.com/kr/pty"; - fetch = { - type = "git"; - url = "https://github.com/kr/pty"; - rev = "v1.1.1"; - sha256 = "0383f0mb9kqjvncqrfpidsf8y6ns5zlrc91c6a74xpyxjwvzl2y6"; - }; - } - { - goPackagePath = "github.com/kr/text"; - fetch = { - type = "git"; - url = "https://github.com/kr/text"; - rev = "v0.1.0"; - sha256 = "1gm5bsl01apvc84bw06hasawyqm4q84vx1pm32wr9jnd7a8vjgj1"; - }; - } - { - goPackagePath = "github.com/magiconair/properties"; - fetch = { - type = "git"; - url = "https://github.com/magiconair/properties"; - rev = "v1.8.0"; - sha256 = "1a10362wv8a8qwb818wygn2z48lgzch940hvpv81hv8gc747ajxn"; - }; - } - { - goPackagePath = "github.com/mattn/go-colorable"; - fetch = { - type = "git"; - url = "https://github.com/mattn/go-colorable"; - rev = "v0.1.1"; - sha256 = "0l640974j804c1yyjfgyxqlsivz0yrzmbql4mhcw2azryigkp08p"; - }; - } - { - goPackagePath = "github.com/mattn/go-isatty"; - fetch = { - type = "git"; - url = "https://github.com/mattn/go-isatty"; - rev = "v0.0.7"; - sha256 = "1i77aq4gf9as03m8fpfh8fq49n4z9j7548blrcsidm1xhslzk5xd"; - }; - } - { - goPackagePath = "github.com/mattn/go-runewidth"; - fetch = { - type = "git"; - url = "https://github.com/mattn/go-runewidth"; - rev = "v0.0.4"; - sha256 = "00b3ssm7wiqln3k54z2wcnxr3k3c7m1ybyhb9h8ixzbzspld0qzs"; - }; - } - { - goPackagePath = "github.com/mitchellh/go-homedir"; - fetch = { - type = "git"; - url = "https://github.com/mitchellh/go-homedir"; - rev = "v1.0.0"; - sha256 = "0f0z0aa4wivk4z1y503dmnw0k0g0g403dly8i4q263gfshs82sbq"; - }; - } - { - goPackagePath = "github.com/mitchellh/mapstructure"; - fetch = { - type = "git"; - url = "https://github.com/mitchellh/mapstructure"; - rev = "v1.1.2"; - sha256 = "03bpv28jz9zhn4947saqwi328ydj7f6g6pf1m2d4m5zdh5jlfkrr"; - }; - } - { - goPackagePath = "github.com/nsf/termbox-go"; - fetch = { - type = "git"; - url = "https://github.com/nsf/termbox-go"; - rev = "288510b9734e"; - sha256 = "0hdyisfaf8yb55h3p03p4sbq19546mp9fy28f2kn659mycmhxqk4"; - }; - } - { - goPackagePath = "github.com/pelletier/go-buffruneio"; - fetch = { - type = "git"; - url = "https://github.com/pelletier/go-buffruneio"; - rev = "v0.2.0"; - sha256 = "0l83p1gg6g5mmhmxjisrhfimhbm71lwn1r2w7d6siwwqm9q08sd2"; - }; - } - { - goPackagePath = "github.com/pelletier/go-toml"; - fetch = { - type = "git"; - url = "https://github.com/pelletier/go-toml"; - rev = "v1.2.0"; - sha256 = "1fjzpcjng60mc3a4b2ql5a00d5gah84wj740dabv9kq67mpg8fxy"; - }; - } - { - goPackagePath = "github.com/pkg/errors"; - fetch = { - type = "git"; - url = "https://github.com/pkg/errors"; - rev = "v0.8.0"; - sha256 = "001i6n71ghp2l6kdl3qq1v2vmghcz3kicv9a5wgcihrzigm75pp5"; - }; - } - { - goPackagePath = "github.com/pmezard/go-difflib"; - fetch = { - type = "git"; - url = "https://github.com/pmezard/go-difflib"; - rev = "v1.0.0"; - sha256 = "0c1cn55m4rypmscgf0rrb88pn58j3ysvc2d0432dp3c6fqg6cnzw"; - }; - } - { - goPackagePath = "github.com/sergi/go-diff"; - fetch = { - type = "git"; - url = "https://github.com/sergi/go-diff"; - rev = "v1.0.0"; - sha256 = "0swiazj8wphs2zmk1qgq75xza6m19snif94h2m6fi8dqkwqdl7c7"; - }; - } - { - goPackagePath = "github.com/sirupsen/logrus"; - fetch = { - type = "git"; - url = "https://github.com/sirupsen/logrus"; - rev = "v1.4.0"; - sha256 = "1y1qjcg19z7q9sy32rhc148kdql2aw7xkcm9d6r1blrl0mdgpx0w"; - }; - } - { - goPackagePath = "github.com/spf13/afero"; - fetch = { - type = "git"; - url = "https://github.com/spf13/afero"; - rev = "v1.1.2"; - sha256 = "0miv4faf5ihjfifb1zv6aia6f6ik7h1s4954kcb8n6ixzhx9ck6k"; - }; - } - { - goPackagePath = "github.com/spf13/cast"; - fetch = { - type = "git"; - url = "https://github.com/spf13/cast"; - rev = "v1.3.0"; - sha256 = "0xq1ffqj8y8h7dcnm0m9lfrh0ga7pssnn2c1dnr09chqbpn4bdc5"; - }; - } - { - goPackagePath = "github.com/spf13/jwalterweatherman"; - fetch = { - type = "git"; - url = "https://github.com/spf13/jwalterweatherman"; - rev = "v1.0.0"; - sha256 = "093fmmvavv84pv4q84hav7ph3fmrq87bvspjj899q0qsx37yvdr8"; - }; - } - { - goPackagePath = "github.com/spf13/pflag"; - fetch = { - type = "git"; - url = "https://github.com/spf13/pflag"; - rev = "v1.0.3"; - sha256 = "1cj3cjm7d3zk0mf1xdybh0jywkbbw7a6yr3y22x9sis31scprswd"; - }; - } - { - goPackagePath = "github.com/spf13/viper"; - fetch = { - type = "git"; - url = "https://github.com/spf13/viper"; - rev = "v1.3.2"; - sha256 = "1829hvf805kda65l59r17wvid7y0vr390s23zfhf4w7vdb4wp3zh"; - }; - } - { - goPackagePath = "github.com/src-d/gcfg"; - fetch = { - type = "git"; - url = "https://github.com/src-d/gcfg"; - rev = "v1.4.0"; - sha256 = "044j95skmyrwjw5fwjk6ka32rjgsg0ar0mfp9np19sh1acwv4x4r"; - }; - } - { - goPackagePath = "github.com/stretchr/objx"; - fetch = { - type = "git"; - url = "https://github.com/stretchr/objx"; - rev = "v0.1.1"; - sha256 = "0iph0qmpyqg4kwv8jsx6a56a7hhqq8swrazv40ycxk9rzr0s8yls"; - }; - } - { - goPackagePath = "github.com/stretchr/testify"; - fetch = { - type = "git"; - url = "https://github.com/stretchr/testify"; - rev = "v1.2.2"; - sha256 = "0dlszlshlxbmmfxj5hlwgv3r22x0y1af45gn1vd198nvvs3pnvfs"; - }; - } - { - goPackagePath = "github.com/ugorji/go"; - fetch = { - type = "git"; - url = "https://github.com/ugorji/go"; - rev = "d75b2dcb6bc8"; - sha256 = "0di1k35gpq9bp958ywranpbskx2vdwlb38s22vl9rybm3wa5g3ps"; - }; - } - { - goPackagePath = "github.com/xanzy/ssh-agent"; - fetch = { - type = "git"; - url = "https://github.com/xanzy/ssh-agent"; - rev = "v0.2.0"; - sha256 = "069nlriymqswg52ggiwi60qhwrin9nzhd2g65a7h59z2qbcvk2hy"; - }; - } - { - goPackagePath = "github.com/xordataexchange/crypt"; - fetch = { - type = "git"; - url = "https://github.com/xordataexchange/crypt"; - rev = "b2862e3d0a77"; - sha256 = "04q3856anpzl4gdfgmg7pbp9cx231nkz3ymq2xp27rnmmwhfxr8y"; - }; - } - { - goPackagePath = "golang.org/x/crypto"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/crypto"; - rev = "505ab145d0a9"; - sha256 = "1vbsvcvmjz6c00p5vf8ls533p52fx2y3gy6v4k5qrdlzl4wf0i5s"; - }; - } - { - goPackagePath = "golang.org/x/net"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/net"; - rev = "161cd47e91fd"; - sha256 = "0254ld010iijygbzykib2vags1dc0wlmcmhgh4jl8iny159lhbcv"; - }; - } - { - goPackagePath = "golang.org/x/sync"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/sync"; - rev = "e225da77a7e6"; - sha256 = "0bh3583smcfw6jw3w6lp0za93rz7hpxfdz8vhxng75b7a6vdlw4p"; - }; - } - { - goPackagePath = "golang.org/x/sys"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/sys"; - rev = "a9d3bda3a223"; - sha256 = "1w45zc13xrjzl19s1sx74r5mg3lf2z2nm13wygcdq5r5pyjlhdz9"; - }; - } - { - goPackagePath = "golang.org/x/text"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/text"; - rev = "v0.3.0"; - sha256 = "0r6x6zjzhr8ksqlpiwm5gdd7s209kwk5p4lw54xjvz10cs3qlq19"; - }; - } - { - goPackagePath = "gopkg.in/alecthomas/kingpin.v2"; - fetch = { - type = "git"; - url = "https://gopkg.in/alecthomas/kingpin.v2"; - rev = "v2.2.6"; - sha256 = "0mndnv3hdngr3bxp7yxfd47cas4prv98sqw534mx7vp38gd88n5r"; - }; - } - { - goPackagePath = "gopkg.in/check.v1"; - fetch = { - type = "git"; - url = "https://gopkg.in/check.v1"; - rev = "788fd7840127"; - sha256 = "0v3bim0j375z81zrpr5qv42knqs0y2qv2vkjiqi5axvb78slki1a"; - }; - } - { - goPackagePath = "gopkg.in/src-d/go-billy.v4"; - fetch = { - type = "git"; - url = "https://gopkg.in/src-d/go-billy.v4"; - rev = "v4.2.1"; - sha256 = "1n8nc0m2hidbrlcl643cd0bdm07pjr0qji47gbfpfj99791sv1d1"; - }; - } - { - goPackagePath = "gopkg.in/src-d/go-git-fixtures.v3"; - fetch = { - type = "git"; - url = "https://gopkg.in/src-d/go-git-fixtures.v3"; - rev = "v3.1.1"; - sha256 = "1fq3j5chck6883jbn33gwm6dxdgzsphjq97psyn81hz9bc1ili8p"; - }; - } - { - goPackagePath = "gopkg.in/src-d/go-git.v4"; - fetch = { - type = "git"; - url = "https://gopkg.in/src-d/go-git.v4"; - rev = "v4.10.0"; - sha256 = "18bx3m5ddvb20figd8pc3lgf9hn85pifc6xy72bb83lv2nxii2rx"; - }; - } - { - goPackagePath = "gopkg.in/warnings.v0"; - fetch = { - type = "git"; - url = "https://gopkg.in/warnings.v0"; - rev = "v0.1.2"; - sha256 = "1kzj50jn708cingn7a13c2wdlzs6qv89dr2h4zj8d09647vlnd81"; - }; - } - { - goPackagePath = "gopkg.in/yaml.v2"; - fetch = { - type = "git"; - url = "https://gopkg.in/yaml.v2"; - rev = "v2.2.2"; - sha256 = "01wj12jzsdqlnidpyjssmj0r4yavlqy7dwrg7adqd8dicjc4ncsa"; - }; - } -] From 738d1454fe71b7392102769a820de8809996b383 Mon Sep 17 00:00:00 2001 From: Phillip Cloud <417981+cpcloud@users.noreply.github.com> Date: Tue, 3 May 2022 01:13:34 +0200 Subject: [PATCH 53/56] gdal_2: fix build (#169738) * gdal_2: fix build * gdal_2: remove broken flag --- pkgs/development/libraries/gdal/2.4.nix | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/gdal/2.4.nix b/pkgs/development/libraries/gdal/2.4.nix index 800c7797d1c0..5d6e99e8bd7f 100644 --- a/pkgs/development/libraries/gdal/2.4.nix +++ b/pkgs/development/libraries/gdal/2.4.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, libjpeg, libtiff, zlib +{ lib, stdenv, fetchurl, fetchpatch, libjpeg, libtiff, zlib , postgresql, libmysqlclient, libgeotiff, python3Packages, proj, geos, openssl , libpng, sqlite, libspatialite, poppler, hdf4, qhull, giflib, expat , libiconv, libxml2 @@ -16,6 +16,16 @@ stdenv.mkDerivation rec { sha256 = "1n6w0m2603q9cldlz0wyscp75ci561dipc36jqbf3mjmylybv0x3"; }; + patches = [ + (fetchpatch { + url = "https://github.com/OSGeo/gdal/commit/7a18e2669a733ebe3544e4f5c735fd4d2ded5fa3.patch"; + sha256 = "sha256-rBgIxJcgRzZR1gyzDWK/Sh7MdPWeczxEYVELbYEV8JY="; + relative = "gdal"; + # this doesn't apply correctly because of line endings + excludes = [ "third_party/LercLib/Lerc2.h" ]; + }) + ]; + buildInputs = [ libjpeg libtiff libgeotiff libpng proj openssl sqlite libspatialite poppler hdf4 qhull giflib expat libxml2 proj ] ++ (with python3Packages; [ python numpy wrapPython ]) @@ -78,6 +88,5 @@ stdenv.mkDerivation rec { license = lib.licenses.mit; maintainers = [ lib.maintainers.marcweber ]; platforms = with lib.platforms; linux ++ darwin; - broken = stdenv.isLinux; #r2000.cpp:824:13: error: expected primary-expression before '}' token }; } From e4dfaba5068580ab143b0df4e1eac5517164ec35 Mon Sep 17 00:00:00 2001 From: happysalada Date: Mon, 2 May 2022 19:06:35 -0400 Subject: [PATCH 54/56] solc: disable z3 strict version check --- pkgs/development/compilers/solc/default.nix | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/development/compilers/solc/default.nix b/pkgs/development/compilers/solc/default.nix index 06aa048a260d..9ad3cf77dc4d 100644 --- a/pkgs/development/compilers/solc/default.nix +++ b/pkgs/development/compilers/solc/default.nix @@ -62,9 +62,12 @@ let cmakeFlags = [ "-DBoost_USE_STATIC_LIBS=OFF" - ] ++ lib.optionals (!z3Support) [ + + ] ++ (if z3Support then [ + "-DSTRICT_Z3_VERSION=OFF" + ] else [ "-DUSE_Z3=OFF" - ] ++ lib.optionals (!cvc4Support) [ + ]) ++ lib.optionals (!cvc4Support) [ "-DUSE_CVC4=OFF" ]; @@ -90,7 +93,7 @@ let for i in ./scripts/*.sh ./scripts/*.py ./test/*.sh ./test/*.py; do patchShebangs "$i" done - TERM=xterm ./scripts/tests.sh + TERM=xterm ./scripts/tests.sh ${if z3Support then "--no-smt" else ""} popd ''; From 114ea5a07eb9448ee64ddb20175befa7e778e41b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sun, 1 May 2022 04:35:44 +0000 Subject: [PATCH 55/56] lisgd: 0.3.3 -> 0.3.4 --- pkgs/tools/inputmethods/lisgd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/inputmethods/lisgd/default.nix b/pkgs/tools/inputmethods/lisgd/default.nix index 3592f2373b26..c525772d5d0c 100644 --- a/pkgs/tools/inputmethods/lisgd/default.nix +++ b/pkgs/tools/inputmethods/lisgd/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "lisgd"; - version = "0.3.3"; + version = "0.3.4"; src = fetchFromSourcehut { owner = "~mil"; repo = "lisgd"; rev = version; - sha256 = "sha256-zcDxR2fKsjuX+vxjhr5UcqEsiNM+zWd2SBaA6Xly3AI="; + hash = "sha256-ZzPdIwN4/G5Te51gJpbNcHVkG4Rplcaa8yHDJr58oyk="; }; inherit patches; From d770c33587d1ad73b0959c88479439c4aaa1dd90 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Wed, 27 Apr 2022 20:26:02 +0000 Subject: [PATCH 56/56] cvehound: 1.0.4 -> 1.0.9 https://github.com/evdenis/cvehound/blob/1.0.9/ChangeLog --- .../tools/analysis/cvehound/default.nix | 27 +++++++++++-------- 1 file changed, 16 insertions(+), 11 deletions(-) diff --git a/pkgs/development/tools/analysis/cvehound/default.nix b/pkgs/development/tools/analysis/cvehound/default.nix index 05073bba750d..3fe3c043c238 100644 --- a/pkgs/development/tools/analysis/cvehound/default.nix +++ b/pkgs/development/tools/analysis/cvehound/default.nix @@ -1,30 +1,34 @@ -{ lib, fetchFromGitHub, coccinelle, gnugrep, python3Packages }: +{ lib +, fetchFromGitHub +, coccinelle +, gnugrep +, python3 +}: -with python3Packages; - -buildPythonApplication rec { +python3.pkgs.buildPythonApplication rec { pname = "cvehound"; - version = "1.0.4"; + version = "1.0.9"; src = fetchFromGitHub { owner = "evdenis"; repo = "cvehound"; rev = version; - sha256 = "sha256-m8vpea02flQ8elSvGWv9FqBhsEcBzRYjcUk+dc4kb2M="; + hash = "sha256-qwQfpelY1Air3wVQ3RziM/+MNOR3jiKmLpO2w6kXZwM="; }; makeWrapperArgs = [ "--prefix PATH : ${lib.makeBinPath [ coccinelle gnugrep ]}" ]; - propagatedBuildInputs = [ - psutil + propagatedBuildInputs = with python3.pkgs; [ + lxml setuptools sympy ]; - checkInputs = [ + checkInputs = with python3.pkgs; [ GitPython + psutil pytestCheckHook ]; @@ -32,10 +36,11 @@ buildPythonApplication rec { doCheck = false; meta = with lib; { - description = "tool to check linux kernel source dump for known CVEs"; + description = "Tool to check linux kernel source dump for known CVEs"; homepage = "https://github.com/evdenis/cvehound"; + changelog = "https://github.com/evdenis/cvehound/blob/${src.rev}/ChangeLog"; # See https://github.com/evdenis/cvehound/issues/22 - license = with licenses; [ gpl2Only gpl3Only ]; + license = with licenses; [ gpl2Only gpl3Plus ]; maintainers = with maintainers; [ ambroisie ]; }; }