Merge staging-next into staging

pkgs/applications/networking/cluster/terraform/default.nix

···
   };
 
   terraform_1 = mkTerraform {
-    version = "1.1.2";
-    sha256 = "sha256-8M/hs4AiApe9C19VnVhWYYOkKqXbv3aREUTNfExTDww=";
+    version = "1.1.3";
+    sha256 = "sha256-dvAuzVmwnM2PQcILzw3xNacBwuRY7cZEU3nv4/DzOKE=";
     vendorSha256 = "sha256-inPNvNUcil9X0VQ/pVgZdnnmn9UCfEz7qXiuKDj8RYM=";
     patches = [ ./provider-path-0_15.patch ];
     passthru = { inherit plugins; };

pkgs/applications/version-management/gitlab/data.json

···
 {
-  "version": "14.6.0",
-  "repo_hash": "0b77nh7xq5qalzhvfmsymmkrb78lmaffk464b074wi5c8gy3f5dn",
+  "version": "14.6.1",
+  "repo_hash": "0zgznf0f7jxyznil6q3fac2rvhaa2lhlpxcnbmkg9djyx1vcm7k1",
   "yarn_hash": "1kcjbf8xn3bwac2s9i2i7dpgbkwcjh09wvgbgysm5yffpdswg6nl",
   "owner": "gitlab-org",
   "repo": "gitlab",
-  "rev": "v14.6.0-ee",
+  "rev": "v14.6.1-ee",
   "passthru": {
-    "GITALY_SERVER_VERSION": "14.6.0",
+    "GITALY_SERVER_VERSION": "14.6.1",
     "GITLAB_PAGES_VERSION": "1.49.0",
     "GITLAB_SHELL_VERSION": "13.22.1",
-    "GITLAB_WORKHORSE_VERSION": "14.6.0"
+    "GITLAB_WORKHORSE_VERSION": "14.6.1"
   }
 }

pkgs/applications/version-management/gitlab/gitaly/default.nix

···
       };
   };
 
-  version = "14.6.0";
+  version = "14.6.1";
   gitaly_package = "gitlab.com/gitlab-org/gitaly/v${lib.versions.major version}";
 in
 
···
     owner = "gitlab-org";
     repo = "gitaly";
     rev = "v${version}";
-    sha256 = "sha256-YiDZtWRb1PnCAv+UCPRQFoCA12vf3xoHoJ1i/hW+vMg=";
+    sha256 = "sha256-nbE71s+KoDC6EK26cmq+YIw9MFSQv1y6qwZAJXVXGj4=";
   };
 
   vendorSha256 = "sha256-ZLd4E3+e25Hqmd6ZyF3X6BveMEg7OF0FX9IvNBWn3v0=";

pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix

···
 buildGoModule rec {
   pname = "gitlab-workhorse";
 
-  version = "14.6.0";
+  version = "14.6.1";
 
   src = fetchFromGitLab {
     owner = data.owner;

pkgs/applications/version-management/mercurial/default.nix

···
 , which
 , sqlite
 , git
+, cacert
 , gnupg
 }:
 
···
       git
       gnupg
     ];
+    SSL_CERT_FILE = "${cacert}/etc/ssl/certs/ca-bundle.crt";  # needed for git
     checkPhase = ''
       cat << EOF > tests/blacklists/nix
       # tests enforcing "/usr/bin/env" shebangs, which are patched for nix
···
       EOF
 
       # extended timeout necessary for tests to pass on the busy CI workers
-      export HGTESTFLAGS="--blacklist blacklists/nix --timeout 600"
+      export HGTESTFLAGS="--blacklist blacklists/nix --timeout 1800"
       make check
     '';
 

pkgs/development/nim-packages/build-nim-package/default.nix

···
 
   configurePhase = if isNull configurePhase then ''
     runHook preConfigure
-    find $NIX_BUILD_TOP -name .attrs.json
+    export NIX_NIM_BUILD_INPUTS=''${pkgsHostTarget[@]} $NIX_NIM_BUILD_INPUTS
     nim_builder --phase:configure
     runHook postConfigure
   '' else

pkgs/development/nim-packages/bumpy/default.nix

···
-{ fetchNimble }:
+{ lib, buildNimPackage, fetchFromGitHub, vmath }:
 
-fetchNimble {
+buildNimPackage rec {
   pname = "bumpy";
   version = "1.0.3";
-  hash = "sha256-mDmDlhOGoYYjKgF5j808oT2NqRlfcOdLSDE3WtdJFQ0=";
+
+  src = fetchFromGitHub {
+    owner = "treeform";
+    repo = pname;
+    rev = version;
+    hash = "sha256-mDmDlhOGoYYjKgF5j808oT2NqRlfcOdLSDE3WtdJFQ0=";
+  };
+
+  propagatedBuildInputs = [ vmath ];
+
+  doCheck = true;
+
+  meta = with lib;
+    src.meta // {
+      description = "2d collision library";
+      license = [ licenses.mit ];
+      maintainers = [ maintainers.ehmry ];
+    };
 }

pkgs/development/nim-packages/flatty/default.nix

···
-{ fetchNimble }:
+{ lib, buildNimPackage, fetchFromGitHub }:
 
-fetchNimble {
+buildNimPackage rec {
   pname = "flatty";
   version = "0.2.3";
-  hash = "sha256-1tPLtnlGtE4SF5/ti/2svvYHpEy/0Za5N4YAOHFOyjA=";
+
+  src = fetchFromGitHub {
+    owner = "treeform";
+    repo = pname;
+    rev = version;
+    hash = "sha256-1tPLtnlGtE4SF5/ti/2svvYHpEy/0Za5N4YAOHFOyjA=";
+  };
+
+  doCheck = true;
+
+  meta = with lib;
+    src.meta // {
+      description = "Tools and serializer for plain flat binary files";
+      license = [ licenses.mit ];
+      maintainers = [ maintainers.ehmry ];
+    };
 }

pkgs/development/nim-packages/nim_builder/nim_builder.nim

···
   for def in getEnv("nimDefines").split:
     if def != "":
       switch("define", def)
-  for input in getEnv("buildInputs").split:
+  for input in getEnv("NIX_NIM_BUILD_INPUTS").split:
     if input != "":
       for nimbleFile in walkFiles(input / "*.nimble"):
         let inputSrc = normalizedPath(

pkgs/development/nim-packages/pixie/default.nix

···
-{ fetchNimble }:
+{ lib, buildNimPackage, fetchFromGitHub, bumpy, chroma, flatty, nimsimd, vmath
+, zippy }:
 
-fetchNimble {
+buildNimPackage rec {
   pname = "pixie";
-  version = "1.1.3";
-  hash = "sha256-xKIejVxOd19mblL1ZwpJH91dgKQS5g8U08EL8lGGelA=";
+  version = "3.1.2";
+
+  src = fetchFromGitHub {
+    owner = "treeform";
+    repo = pname;
+    rev = version;
+    hash = "sha256-rF72ybfsipBHgQmH0e6DBn1e7WWY6dGn9yp1qvLIS3A=";
+  };
+
+  propagatedBuildInputs = [ bumpy chroma flatty nimsimd vmath zippy ];
+
+  doCheck = true;
+
+  meta = with lib;
+    src.meta // {
+      description = "Full-featured 2d graphics library for Nim";
+      license = [ licenses.mit ];
+      maintainers = [ maintainers.ehmry ];
+    };
 }

pkgs/development/nim-packages/typography/default.nix

···
-{ fetchNimble }:
-
-fetchNimble {
-  pname = "typography";
-  version = "0.7.9";
-  hash = "sha256-IYjw3PCp5XzVed2fGGCt9Hb60cxFeF0BUZ7L5PedTLU=";
-}

pkgs/development/nim-packages/vmath/default.nix

···
-{ fetchNimble }:
+{ lib, buildNimPackage, fetchFromGitHub }:
 
-fetchNimble {
+buildNimPackage rec {
   pname = "vmath";
-  version = "1.0.3";
-  hash = "sha256-zzSKXjuTZ46HTFUs0N47mxEKTKIdS3dwr+60sQYSdn0=";
+  version = "1.1.1";
+
+  src = fetchFromGitHub {
+    owner = "treeform";
+    repo = pname;
+    rev = version;
+    hash = "sha256-/v0lQIOMogTxFRtbssziW4W6VhMDepM6Si8igLgcx30=";
+  };
+
+  doCheck = true;
+
+  meta = with lib;
+    src.meta // {
+      description = "Math vector library for graphical things";
+      license = [ licenses.mit ];
+      maintainers = [ maintainers.ehmry ];
+    };
 }

pkgs/development/nim-packages/zippy/default.nix

···
-{ fetchNimble }:
+{ lib, buildNimPackage, fetchFromGitHub, unzip }:
 
-fetchNimble {
+buildNimPackage rec {
   pname = "zippy";
   version = "0.7.3";
-  hash = "sha256-w64ENRyP3mNTtESSt7CDDxUkjYSfziNVVedkO4HIuJ8=";
+
+  nativeBuildInputs = [ unzip ];
+
+  src = fetchFromGitHub {
+    owner = "guzba";
+    repo = pname;
+    rev = version;
+    hash = "sha256-w64ENRyP3mNTtESSt7CDDxUkjYSfziNVVedkO4HIuJ8=";
+  };
+
+  doCheck = true;
+
+  meta = with lib;
+    src.meta // {
+      description = "Pure Nim implementation of deflate, zlib, gzip and zip";
+      license = [ licenses.mit ];
+      maintainers = [ maintainers.ehmry ];
+    };
 }

pkgs/development/python-modules/algebraic-data-types/default.nix

···
-{ lib, buildPythonPackage, fetchFromGitHub, pythonOlder, hypothesis, mypy }:
+{ lib
+, buildPythonPackage
+, fetchFromGitHub
+, pythonOlder
+, hypothesis
+, mypy
+, pytestCheckHook
+}:
 
 buildPythonPackage rec {
   pname = "algebraic-data-types";
-  version = "0.1.1";
+  version = "0.2.1";
+  format = "setuptools";
+
+  disabled = pythonOlder "3.7";
 
   src = fetchFromGitHub {
     owner = "jspahrsummers";
     repo = "adt";
     rev = "v" + version;
-    sha256 = "1py94jsgh6wch59n9dxnwvk74psbpa1679zfmripa1qfc2218kqi";
+    hash = "sha256-RHLI5rmFxklzG9dyYgYfSS/srCjcxNpzNcK/RPNJBPE=";
   };
 
-  disabled = pythonOlder "3.6";
-
   checkInputs = [
+    pytestCheckHook
     hypothesis
     mypy
   ];
 
+  disabledTestPaths = [
+    # AttributeError: module 'mypy.types' has no attribute 'TypeVarDef'
+    "tests/test_mypy_plugin.py"
+  ];
+
+  pythonImportsCheck = [
+    "adt"
+  ];
+
   meta = with lib; {
     description = "Algebraic data types for Python";
     homepage = "https://github.com/jspahrsummers/adt";
     license = licenses.mit;
     maintainers = with maintainers; [ uri-canva ];
-    platforms = platforms.unix;
   };
 }

pkgs/development/python-modules/azure-mgmt-consumption/default.nix

···
 
 buildPythonPackage rec {
   pname = "azure-mgmt-consumption";
-  version = "8.0.0";
+  version = "9.0.0";
 
   src = fetchPypi {
     inherit pname version;
     extension = "zip";
-    sha256 = "b4cc167648634f864394066d5621afc137c1be795ee76f7539125f9538a2bf37";
+    sha256 = "76f9566390721226add96c9d3020ab986d3e5fd81e3143c098f57262c6ce4a51";
   };
 
   propagatedBuildInputs = [

pkgs/development/python-modules/blocksat-cli/default.nix

···
 
 buildPythonPackage rec {
   pname = "blocksat-cli";
-  version = "0.4.1";
+  version = "0.4.2";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "96ec5e548dcdb71ada75727d76b34006fe5f6818bd89cf982e15616d41889603";
+    sha256 = "sha256-hz5BGE+gqOrPiXvmeOTOecm2RUrTvM/xxvV3cnO2QSc=";
   };
 
   propagatedBuildInputs = [

pkgs/development/python-modules/google-cloud-spanner/default.nix

···
 
 buildPythonPackage rec {
   pname = "google-cloud-spanner";
-  version = "3.12.0";
+  version = "3.12.1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "8f1390c3776fcfce71e1ef024d9ccde52c16d1cd728bc587c24065d6e4d21933";
+    sha256 = "98e53298a7c79f0af351c80e6fc0b57bc735afdec764424e459179ef04f5a40f";
   };
 
   propagatedBuildInputs = [

pkgs/development/python-modules/makefun/default.nix

···
 
 buildPythonPackage rec {
   pname = "makefun";
-  version = "1.12.1";
+  version = "1.13.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "4d0e90ca3fdbdeb6a4a0891e2da7d4b8e80386e19e6db91ce29b8aa5c876ecfe";
+    sha256 = "2c673d2b4f0ef809347513cb45e3b23a04228588af7c9ac859e99247abac516a";
   };
 
   postPatch = ''

pkgs/development/python-modules/striprtf/default.nix

···
 
 buildPythonPackage rec {
   pname = "striprtf";
-  version = "0.0.18";
+  version = "0.0.19";
+  format = "setuptools";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "6bb2dc8a59f3128662f958d647c5e6755f9ad8053f216c88e68514df204926d2";
+    sha256 = "b7f15e11306e466dbe91665409233a06d9fdb4ee156489a3d879579891b04c25";
   };
+
+  pythonImportsCheck = [
+    "striprtf"
+  ];
 
   meta = with lib; {
     homepage = "https://github.com/joshy/striprtf";

pkgs/development/tools/build-managers/bazel/bazel_4/default.nix

···
     unzip
     which
     zip
+    python3.pkgs.absl-py   # Needed to build fish completion
   ] ++ lib.optionals (stdenv.isDarwin) [ cctools libcxx CoreFoundation CoreServices Foundation ];
 
   # Bazel makes extensive use of symlinks in the WORKSPACE.
···
     shopt -s dotglob extglob
     mv !(bazel_src) bazel_src
   '';
-  # Needed to build fish completion
-  propagatedBuildInputs = [ python3.pkgs.absl-py ];
   buildPhase = ''
     runHook preBuild
 

pkgs/tools/archivers/7zz/default.nix

···
 { stdenv, lib, fetchurl, p7zip }:
 
-# https://sourceforge.net/p/sevenzip/discussion/45797/thread/7fe6c21efa/
 stdenv.mkDerivation rec {
   pname = "7zz";
-  version = "21.04";
+  version = "21.07";
 
   src = fetchurl {
-    url = "https://7-zip.org/a/7z${lib.replaceStrings ["." ] [""] version}-src.7z";
-    sha256 = "sha256-XmuEyIJAJQM0ZbgrW02lQ2rp4KFDBjLXKRaTfY+VCOg=";
+    url = "https://7-zip.org/a/7z${lib.replaceStrings [ "." ] [ "" ] version}-src.7z";
+    sha256 = "sha256-0QdNVvQVqrmdmeWXp7ZtxFXbpjSa6KTInfdkdbahKEw=";
   };
 
   sourceRoot = "CPP/7zip/Bundles/Alone2";
···
   # to build with the optimized assembler but that doesn't support building with
   # GCC: https://github.com/nidud/asmc/issues/8
   makefile = "../../cmpl_gcc.mak"; # "../../cmpl_gcc_x64.mak";
-
-  NIX_CFLAGS_COMPILE = [ "-Wno-error=maybe-uninitialized" ];
 
   nativeBuildInputs = [ p7zip ];
 

pkgs/tools/misc/fd/default.nix

···
 
 rustPlatform.buildRustPackage rec {
   pname = "fd";
-  version = "8.3.0";
+  version = "8.3.1";
 
   src = fetchFromGitHub {
     owner = "sharkdp";
     repo = "fd";
     rev = "v${version}";
-    sha256 = "sha256-MSkQYsBZkQOFkOnjGY+VuifUZnzloSysAO/hsp+fy1A=";
+    sha256 = "sha256-1Fxkd37KoFkUYYeFTaCAtndCa00lZB2KptsKIwpIt2o=";
   };
 
-  cargoSha256 = "sha256-nwgAgyVaxs1ebu9ndUN3FlFiycyEbRgvUhZ8iGmrVhQ=";
+  cargoSha256 = "sha256-qymlTuFnYMbldNDGVDpkLCC0QQK1il/LAXcIil5koCo=";
 
   nativeBuildInputs = [ installShellFiles ];
 

pkgs/tools/networking/termscp/default.nix

···
 
 rustPlatform.buildRustPackage rec {
   pname = "termscp";
-  version = "0.7.0";
+  version = "0.8.0";
 
   src = fetchFromGitHub {
     owner = "veeso";
     repo = pname;
     rev = "v${version}";
-    sha256 = "131kij6pnw9r0p2a28g00z85dh758h4rm9ic09qmp61cq7dphkc1";
+    sha256 = "sha256-fVZDpzgcpMWOoUtoq7go/NFWfoR1aONuRtTba0sqPZk=";
   };
 
-  cargoSha256 = "1k2vwmfy6dczgs3bz8k4j24cc8l7l9fdh3ymp79ril4rp1v6kfp2";
+  cargoSha256 = "sha256-iLm73dWF9z/obtAXe5dZlvJcxU6hB5N0vaSc/HLuTuQ=";
 
   nativeBuildInputs = [
     pkg-config

pkgs/tools/security/bypass403/default.nix

···
     homepage = "https://github.com/drsigned/bypass403";
     license = with licenses; [ mit ];
     maintainers = with maintainers; [ fab ];
+
+    # https://github.com/drsigned/bypass403 no longer exists
+    broken = true;
   };
 }

pkgs/tools/security/kubescape/default.nix

···
 
 buildGoModule rec {
   pname = "kubescape";
-  version = "1.0.137";
+  version = "1.0.138";
 
   src = fetchFromGitHub {
     owner = "armosec";
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-2VjC5icIKF7VO7Tli/mk/gXbIzZxkFm7Aigwl+BVQ6g=";
+    sha256 = "sha256-/Rp4eNlvlONiH3F6Zv9GDUF26tmSuhFGUL1MoKOFSEc=";
   };
 
   nativeBuildInputs = [

pkgs/tools/security/pinentry/default.nix

···
 , ncurses, gtk2, gcr, libcap, libsecret
 , enabledFlavors ? [ "curses" "tty" "gtk2" "emacs" ]
   ++ lib.optionals stdenv.isLinux [ "gnome3" ]
-  ++ lib.optionals (stdenv.hostPlatform.system != "aarch64-darwin") [ "qt" ]
+  ++ lib.optionals (!stdenv.isDarwin) [ "qt" ]
 }:
 
 with lib;

pkgs/tools/text/hottext/default.nix

···
   };
 
   buildInputs = with nimPackages; [
-    bumpy
-    chroma
-    flatty
-    nimsimd
     pixie
     sdl2
-    typography
-    vmath
-    zippy
   ];
 
   HOTTEXT_FONT_PATH = "${gentium}/share/fonts/truetype/GentiumPlus-Regular.ttf";
···
   '';
 
   meta = with lib; {
+    broken = true; # Needs to be updated to latest Pixie API.
     description = "Simple RSVP speed-reading utility";
     license = licenses.unlicense;
     homepage = "https://git.sr.ht/~ehmry/hottext";

pkgs/top-level/nim-packages.nix

···
 
     tempfile = callPackage ../development/nim-packages/tempfile { };
 
-    typography = callPackage ../development/nim-packages/typography { };
-
     ui = callPackage ../development/nim-packages/ui { inherit (pkgs) libui; };
 
     unicodedb = callPackage ../development/nim-packages/unicodedb { };