Merge master into staging-next

doc/languages-frameworks/coq.section.md

@@ -88,3 +88,58 @@ with lib; mkCoqDerivation {
   };
 }
 ```
+
+## Three ways of overriding Coq packages {#coq-overriding-packages}
+
+There are three distinct ways of changing a Coq package by overriding one of its values: `.override`, `overrideCoqDerivation`, and `.overrideAttrs`.  This section explains what sort of values can be overridden with each of these methods.
+
+### `.override` {#coq-override}
+
+`.override` lets you change arguments to a Coq derivation.  In the case of the `multinomials` package above, `.override` would let you override arguments like `mkCoqDerivation`, `version`, `coq`, `mathcomp`, `mathcom-finmap`, etc.
+
+For example, assuming you have a special `mathcomp` dependency you want to use, here is how you could override the `mathcomp` dependency:
+
+```nix
+multinomials.override {
+  mathcomp = my-special-mathcomp;
+}
+```
+
+In Nixpkgs, all Coq derivations take a `version` argument.  This can be overridden in order to easily use a different version:
+
+```nix
+coqPackages.multinomials.override {
+  version = "1.5.1";
+}
+```
+
+Refer to [](#coq-packages-attribute-sets-coqpackages) for all the different formats that you can potentially pass to `version`, as well as the restrictions.
+
+### `overrideCoqDerivation` {#coq-overrideCoqDerivation}
+
+The `overrideCoqDerivation` function lets you easily change arguments to `mkCoqDerivation`.  These arguments are described in [](#coq-packages-attribute-sets-coqpackages).
+
+For example, here is how you could locally add a new release of the `multinomials` library, and set the `defaultVersion` to use this release:
+
+```nix
+coqPackages.lib.overrideCoqDerivation
+  {
+    defaultVersion = "2.0";
+    release."2.0".sha256 = "1lq8x86vd3vqqh2yq6hvyagpnhfq5wmk5pg2z0xq7b7dbbbhyfkk";
+  }
+  coqPackages.multinomials
+```
+
+### `.overrideAttrs` {#coq-overrideAttrs}
+
+`.overrideAttrs` lets you override arguments to the underlying `stdenv.mkDerivation` call. Internally, `mkCoqDerivation` uses `stdenv.mkDerivation` to create derivations for Coq libraries.  You can override arguments to `stdenv.mkDerivation` with `.overrideAttrs`.
+
+For instance, here is how you could add some code to be performed in the derivation after installation is complete:
+
+```nix
+coqPackages.multinomials.overrideAttrs (oldAttrs: {
+  postInstall = oldAttrs.postInstall or "" + ''
+    echo "you can do anything you want here"
+  '';
+})
+```

maintainers/maintainer-list.nix

@@ -13263,6 +13263,12 @@
     }];
     name = "Karim Vergnes";
   };
+  thetallestjj = {
+    email = "me+nixpkgs@jeroen-jetten.com";
+    github = "thetallestjj";
+    githubId = 6579555;
+    name = "Jeroen Jetten";
+  };
   theuni = {
     email = "ct@flyingcircus.io";
     github = "ctheune";

pkgs/applications/editors/sublime/4/common.nix

@@ -2,7 +2,7 @@
 
 { fetchurl, stdenv, lib, xorg, glib, libglvnd, glibcLocales, gtk3, cairo, pango, makeWrapper, wrapGAppsHook
 , writeShellScript, common-updater-scripts, curl
-, openssl, bzip2, bash, unzip, zip
+, openssl_1_1, bzip2, bash, unzip, zip
 }:
 
 let
@@ -15,7 +15,7 @@ let
   versionUrl = "https://download.sublimetext.com/latest/${if dev then "dev" else "stable"}";
   versionFile = builtins.toString ./packages.nix;
 
-  libPath = lib.makeLibraryPath [ xorg.libX11 xorg.libXtst glib libglvnd openssl gtk3 cairo pango curl ];
+  libPath = lib.makeLibraryPath [ xorg.libX11 xorg.libXtst glib libglvnd openssl_1_1 gtk3 cairo pango curl ];
 in let
   binaryPackage = stdenv.mkDerivation rec {
     pname = "${pnameBase}-bin";
@@ -65,6 +65,9 @@ in let
     installPhase = ''
       runHook preInstall
 
+      # No need to patch these libraries, it works well with our own
+      rm libcrypto.so.1.1 libssl.so.1.1
+
       mkdir -p $out
       cp -r * $out/
 

pkgs/applications/graphics/jpegoptim/default.nix

@@ -1,14 +1,14 @@
 { lib, stdenv, fetchFromGitHub, libjpeg }:
 
 stdenv.mkDerivation rec {
-  version = "1.4.7";
+  version = "1.5.0";
   pname = "jpegoptim";
 
   src = fetchFromGitHub {
     owner = "tjko";
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-qae3OEG4CC/OGkmNdHrXFUv9CkoaB1ZJnFHX3RFoxhk=";
+    sha256 = "sha256-fTtNDjswxHv2kHU55RCzz9tdlXw+RUCSoe3qF4hQ7u4=";
   };
 
   # There are no checks, it seems.

pkgs/applications/logging/humioctl/default.nix

@@ -1,8 +1,8 @@
 { buildGoModule, fetchFromGitHub, installShellFiles, lib }:
 
 let
-  humioCtlVersion = "0.30.0";
-  sha256 = "sha256-BwpnqaUZvttGRtsZT2xcyXfMJZ7EIsKenTPF669ktQM=";
+  humioCtlVersion = "0.30.1";
+  sha256 = "sha256-w+mZi3KdBnBRII/Mi+1SN/u4dhz2vfqn3nzU6AKk4yM=";
   vendorSha256 = "sha256-70QxW2nn6PS6HZWllmQ8O39fbUcbe4c/nKAygLnD4n0=";
 in buildGoModule {
     name = "humioctl-${humioCtlVersion}";

pkgs/applications/misc/gpsprune/default.nix

@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "gpsprune";
-  version = "22";
+  version = "22.1";
 
   src = fetchurl {
     url = "https://activityworkshop.net/software/gpsprune/gpsprune_${version}.jar";
-    sha256 = "sha256-T4lzw3UupnSF+anrdZDhg68OxSJsD7M3djK7WpKXq6Q=";
+    sha256 = "sha256-Its8w+4IAPlNnOYewrTItYWw/7IcAfCK1EnAzun4ScI=";
   };
 
   dontUnpack = true;

pkgs/build-support/dotnet/build-dotnet-module/default.nix

@@ -180,12 +180,12 @@ in stdenvNoCC.mkDerivation (args // {
               ;;
       esac
 
-      deps_file="$(realpath "''${1:-$(mktemp -t "XXXXXX-${pname}-deps.nix")}")"
-      export HOME=$(mktemp -td "XXXXXX-${pname}-home")
+      deps_file="$(realpath "''${1:-$(mktemp -t "${pname}-deps-XXXXXX.nix")}")"
+      export HOME=$(mktemp -td "${pname}-home-XXXXXX")
       mkdir -p "$HOME/nuget_pkgs"
 
       store_src="${srcOnly args}"
-      src="$(mktemp -td "XXXXXX-${pname}-src")"
+      src="$(mktemp -td "${pname}-src-XXXXXX")"
       cp -rT "$store_src" "$src"
       chmod -R +w "$src"
       trap "rm -rf $src $HOME" EXIT

pkgs/build-support/dotnet/make-nuget-deps/default.nix

@@ -4,7 +4,7 @@ linkFarmFromDrvs "${name}-nuget-deps" (nugetDeps {
   fetchNuGet = { pname, version, sha256
     , url ? "https://www.nuget.org/api/v2/package/${pname}/${version}" }:
     fetchurl {
-      name = "${pname}-${version}.nupkg";
+      name = "${pname}.${version}.nupkg";
       inherit url sha256;
     };
 })

pkgs/build-support/dotnet/nuget-to-nix/nuget-to-nix.sh

@@ -30,7 +30,9 @@ while read pkg_spec; do
   pkg_sha256="$(nix-hash --type sha256 --flat --base32 "$(dirname "$pkg_spec")"/*.nupkg)"
 
   pkg_src="$(jq --raw-output '.source' "$(dirname "$pkg_spec")/.nupkg.metadata")"
-  if [[ $pkg_src != https://api.nuget.org/* ]] && [[ ! -d $pkg_src ]]; then
+  if [[ -d $pkg_src ]]; then
+      continue
+  elif [[ $pkg_src != https://api.nuget.org/* ]]; then
     pkg_source_url="${nuget_sources_cache[$pkg_src]:=$(curl -n --fail "$pkg_src" | jq --raw-output '.resources[] | select(."@type" == "PackageBaseAddress/3.0.0")."@id"')}"
     pkg_url="$pkg_source_url${pkg_name,,}/${pkg_version,,}/${pkg_name,,}.${pkg_version,,}.nupkg"
     echo "  (fetchNuGet { pname = \"$pkg_name\"; version = \"$pkg_version\"; sha256 = \"$pkg_sha256\"; url = \"$pkg_url\"; })" >> ${tmpfile}

pkgs/data/fonts/iosevka/comfy.nix

@@ -2,20 +2,25 @@
 
 let
   sets = [
+    # The compact, sans-serif set:
     "comfy"
     "comfy-fixed"
     "comfy-duo"
+    # The compact, serif set:
+    "comfy-motion"
+    "comfy-motion-fixed"
+    "comfy-motion-duo"
+    # The wide, sans-serif set:
     "comfy-wide"
     "comfy-wide-fixed"
-    "comfy-motion"
-    "comfy-motion-duo"
+    "comfy-wide-duo"
   ];
-  version = "0.4.0";
+  version = "1.0.0";
   src = fetchFromSourcehut {
     owner = "~protesilaos";
     repo = "iosevka-comfy";
     rev = version;
-    sha256 = "sha256-d3C5HNiZCd0xva6zvMP9NmvmeU4uXuaO04pbgIepwfw=";
+    sha256 = "0psbz40hicv3v3x7yq26hy6nfbzml1kha24x6a88rfrncdp6bds7";
   };
   privateBuildPlan = src.outPath + "/private-build-plans.toml";
   overrideAttrs = (attrs: {
@@ -24,8 +29,8 @@ let
     meta = with lib; {
       inherit (src.meta) homepage;
       description = ''
-        Custom build of Iosevka with a rounded style and open shapes,
-        adjusted metrics, and overrides for almost all individual glyphs
+        Customised build of the Iosevka typeface, with a consistent
+        rounded style and overrides for almost all individual glyphs
         in both roman (upright) and italic (slanted) variants.
       '';
       license = licenses.ofl;

pkgs/development/beam-modules/mix-release.nix

@@ -18,6 +18,7 @@
 , mixNixDeps ? { }
 , elixir ? inputs.elixir
 , hex ? inputs.hex.override { inherit elixir; }
+, stripDebug ? true
 , ...
 }@attrs:
 let
@@ -25,6 +26,8 @@ let
   overridable = builtins.removeAttrs attrs [ "compileFlags" "mixNixDeps" ];
 in
 assert mixNixDeps != { } -> mixFodDeps == null;
+assert stripDebug -> !enableDebugInfo;
+
 stdenv.mkDerivation (overridable // {
   # rg is used as a better grep to search for erlang references in the final release
   nativeBuildInputs = nativeBuildInputs ++ [ erlang hex elixir makeWrapper git ripgrep ];
@@ -116,6 +119,10 @@ stdenv.mkDerivation (overridable // {
         substituteInPlace "$file" --replace "${erlang}/lib/erlang" "$out"
       done
     fi
+  '' + lib.optionalString stripDebug ''
+    # strip debug symbols to avoid hardreferences to "foreign" closures actually
+    # not needed at runtime, while at the same time reduce size of BEAM files.
+    erl -noinput -eval 'lists:foreach(fun(F) -> io:format("Stripping ~p.~n", [F]), beam_lib:strip(F) end, filelib:wildcard("'"$out"'/**/*.beam"))' -s init stop
   '';
 
   # TODO investigate why the resulting closure still has

pkgs/development/compilers/dotnet/build-dotnet.nix

@@ -18,8 +18,11 @@ assert if type == "sdk" then packages != null else true;
 , openssl_1_1
 , libuuid
 , zlib
+, libkrb5
 , curl
 , lttng-ust_2_12
+, testers
+, runCommand
 }:
 
 let
@@ -37,27 +40,24 @@ let
     sdk = ".NET SDK ${version}";
   };
 in
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: rec {
   inherit pname version;
 
   # Some of these dependencies are `dlopen()`ed.
-  rpath = lib.makeLibraryPath ([
-    stdenv.cc.cc
-    zlib
-    curl
-    icu
-    libunwind
-    libuuid
-    openssl_1_1
-  ] ++ lib.optional stdenv.isLinux lttng-ust_2_12);
-
   nativeBuildInputs = [
     makeWrapper
   ] ++ lib.optional stdenv.isLinux autoPatchelfHook;
 
   buildInputs = [
     stdenv.cc.cc
-  ];
+    zlib
+    icu
+    libkrb5
+    # this must be before curl for autoPatchElf to find it
+    # curl brings in its own openssl
+    openssl_1_1
+    curl
+  ] ++ lib.optional stdenv.isLinux lttng-ust_2_12;
 
   src = fetchurl (
     srcs."${stdenv.hostPlatform.system}" or (throw
@@ -77,24 +77,30 @@ stdenv.mkDerivation rec {
     runHook postInstall
   '';
 
-  postFixup = lib.optionalString stdenv.isLinux ''
-    patchelf --set-interpreter "${stdenv.cc.bintools.dynamicLinker}" $out/dotnet
-    patchelf --set-rpath "${rpath}" $out/dotnet
-    find $out -type f -name "*.so" -exec patchelf --set-rpath '$ORIGIN:${rpath}' {} \;
-    find $out -type f \( -name "apphost" -or -name "createdump" \) -exec patchelf --set-interpreter "${stdenv.cc.bintools.dynamicLinker}" --set-rpath '$ORIGIN:${rpath}' {} \;
-
-    wrapProgram $out/bin/dotnet \
-      --prefix LD_LIBRARY_PATH : ${icu}/lib
-  '';
-
   doInstallCheck = true;
   installCheckPhase = ''
-    # Fixes cross
-    export DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=1
-
     $out/bin/dotnet --info
   '';
 
+  # Tell autoPatchelf about runtime dependencies.
+  # (postFixup phase is run before autoPatchelfHook.)
+  postFixup = lib.optionalString stdenv.isLinux ''
+    patchelf \
+      --add-needed libicui18n.so \
+      --add-needed libicuuc.so \
+      $out/shared/Microsoft.NETCore.App/*/libcoreclr.so \
+      $out/shared/Microsoft.NETCore.App/*/*System.Globalization.Native.so \
+      $out/packs/Microsoft.NETCore.App.Host.linux-x64/*/runtimes/linux-x64/native/singlefilehost
+    patchelf \
+      --add-needed libgssapi_krb5.so \
+      $out/shared/Microsoft.NETCore.App/*/*System.Net.Security.Native.so \
+      $out/packs/Microsoft.NETCore.App.Host.linux-x64/*/runtimes/linux-x64/native/singlefilehost
+    patchelf \
+      --add-needed libssl.so \
+      $out/shared/Microsoft.NETCore.App/*/*System.Security.Cryptography.Native.OpenSsl.so \
+      $out/packs/Microsoft.NETCore.App.Host.linux-x64/*/runtimes/linux-x64/native/singlefilehost
+  '';
+
   setupHook = writeText "dotnet-setup-hook" ''
     if [ ! -w "$HOME" ]; then
       export HOME=$(mktemp -d) # Dotnet expects a writable home directory for its configuration files
@@ -117,6 +123,23 @@ stdenv.mkDerivation rec {
 
     # Convert a "stdenv.hostPlatform.system" to a dotnet RID
     systemToDotnetRid = system: runtimeIdentifierMap.${system} or (throw "unsupported platform ${system}");
+
+    tests = {
+      version = testers.testVersion {
+        package = finalAttrs.finalPackage;
+      };
+
+      smoke-test = runCommand "dotnet-sdk-smoke-test" {
+        nativeBuildInputs = [ finalAttrs.finalPackage ];
+      } ''
+        HOME=$(pwd)/fake-home
+        dotnet new console
+        dotnet build
+        output="$(dotnet run)"
+        # yes, older SDKs omit the comma
+        [[ "$output" =~ Hello,?\ World! ]] && touch "$out"
+      '';
+    };
   };
 
   meta = with lib; {
@@ -125,6 +148,6 @@ stdenv.mkDerivation rec {
     license = licenses.mit;
     maintainers = with maintainers; [ kuznero mdarocha ];
     mainProgram = "dotnet";
-    platforms = builtins.attrNames srcs;
+    platforms = attrNames srcs;
   };
-}
+})

pkgs/development/python-modules/deep-chainmap/default.nix

@@ -0,0 +1,28 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+}:
+
+buildPythonPackage rec {
+  pname = "deep-chainmap";
+  version = "0.1.1";
+
+  src = fetchPypi {
+    pname = "deep_chainmap";
+    inherit version;
+    sha256 = "sha256-6K7dyB5iQzzw3lXLcU10SVsiHZ+SAXhz9DSCkYnPQAA=";
+  };
+
+  # Tests are not published to pypi
+  doCheck = false;
+
+  pythonImportsCheck = [ "deep_chainmap" ];
+
+  # See the guide for more information: https://nixos.org/nixpkgs/manual/#chap-meta
+  meta = with lib; {
+    description = "A recursive subclass of ChainMap";
+    homepage = "https://github.com/neutrinoceros/deep-chainmap";
+    license = licenses.mit;
+    maintainers = with maintainers; [ rehno-lindeque ];
+  };
+}

pkgs/development/python-modules/reportlab/darwin-m1-compat.patch

@@ -0,0 +1,13 @@
+diff --git a/setup.py b/setup.py
+index 7625074..b3aa2fc 100644
+--- a/setup.py
++++ b/setup.py
+@@ -249,7 +249,7 @@ class inc_lib_dirs:
+             aDir(L, os.path.join("/usr/lib", "python%s" % sys.version[:3], "config"))
+         elif platform == "darwin":
+             machine = sysconfig_platform.split('-')[-1]
+-            if machine=='arm64' or os.environ.get('ARCHFLAGS','')=='-arch arm64':
++            if False and machine=='arm64' or os.environ.get('ARCHFLAGS','')=='-arch arm64':
+                 #print('!!!!! detected darwin arm64 build')
+                 #probably an M1
+                 target = pjoin(

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

@@ -19,6 +19,10 @@ in buildPythonPackage rec {
     sha256 = "sha256-BPxEIPBUiBXQYj4DHIah9/PzAD5pnZr3FIdC4tcrAko=";
   };
 
+  patches = [
+    ./darwin-m1-compat.patch
+  ];
+
   checkInputs = [ glibcLocales ];
 
   buildInputs = [ ft pillow ];

pkgs/development/python-modules/simple-rlp/default.nix

@@ -5,11 +5,11 @@
 
 buildPythonPackage rec {
   pname = "simple-rlp";
-  version = "0.1.2";
+  version = "0.1.3";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "5c4a9c58f1b742f7fa8af0fe4ea6ff9fb02294ae041912f771570dfaf339d2b9";
+    sha256 = "sha256-LfHSt2nwoBd9JiMauL4W5l41RrF7sKmkkO/TUXwIKHY=";
   };
 
   pythonImportsCheck = [ "rlp" ];

pkgs/development/tools/kube-linter/default.nix

@@ -2,16 +2,16 @@
 
 buildGoModule rec {
   pname = "kube-linter";
-  version = "0.4.0";
+  version = "0.5.0";
 
   src = fetchFromGitHub {
     owner = "stackrox";
     repo = pname;
     rev = version;
-    sha256 = "XAsPbl9fqYk2nhDxRg5wyPwciwSpfigoBZ4hzdWAVgw=";
+    sha256 = "sha256-YEcEXXtCuK4Yg9EsaDFOfM+ri6iGoU7d0O6SlYYKG+U=";
   };
 
-  vendorSha256 = "sha256-0bjAIHSjw0kHrh9CzJHv1UAaBJDn6381055eOHufvCw=";
+  vendorSha256 = "sha256-UVa+0mrQ2pW/4Zmegon/IOrH4SiWhrdCc3/fs3pxGq8=";
 
   ldflags = [
     "-s" "-w" "-X golang.stackrox.io/kube-linter/internal/version.version=${version}"

pkgs/development/tools/rust/cargo-espflash/default.nix

@@ -0,0 +1,30 @@
+{ lib, rustPlatform, fetchFromGitHub, pkg-config, udev }:
+
+rustPlatform.buildRustPackage rec {
+  pname = "cargo-espflash";
+  version = "1.6.0";
+
+  src = fetchFromGitHub {
+    owner = "esp-rs";
+    repo = "espflash";
+    rev = "v${version}";
+    sha256 = "sha256-YQ621YbdEy2sS4uEYvgnQU1G9iW5SpWNObPH4BfyeF0=";
+  };
+
+  nativeBuildInputs = [
+    pkg-config
+  ];
+
+  buildInputs = [
+    udev
+  ];
+
+  cargoSha256 = "sha256-mDSNjeaEtYpEGpiIg2F+e8x/XCssNQxUx+6Cj+8XX5Q=";
+
+  meta = with lib; {
+    description = "Serial flasher utility for Espressif SoCs and modules based on esptool.py";
+    homepage = "https://github.com/esp-rs/cargo-espflash";
+    license = licenses.gpl2Only;
+    maintainers = with maintainers; [ matthiasbeyer ];
+  };
+}

pkgs/os-specific/linux/kernel/zen-kernels.nix

@@ -4,16 +4,16 @@ let
   # comments with variant added for update script
   # ./update-zen.py zen
   zenVariant = {
-    version = "5.19.8"; #zen
+    version = "5.19.9"; #zen
     suffix = "zen1"; #zen
-    sha256 = "1jqzny85gl2wc029wp96v5x48wpn6nyx6zx9xrxqw0bhrlczzgq7"; #zen
+    sha256 = "1zwy5d7wzjxpzf9v13550zvfpkxhq7gck08zv9s94hwaz9h5xna3"; #zen
     isLqx = false;
   };
   # ./update-zen.py lqx
   lqxVariant = {
-    version = "5.19.8"; #lqx
-    suffix = "lqx2"; #lqx
-    sha256 = "1k1i9fqc0d5p2kp9bwdsp0ccbdfimavx4wpxv48mcnb7b93bpln2"; #lqx
+    version = "5.19.9"; #lqx
+    suffix = "lqx1"; #lqx
+    sha256 = "0jgl5dnbdcg7p2ix4lliif7l8pqvhnbl4ndxq64yyx78r7jrbfs2"; #lqx
     isLqx = true;
   };
   zenKernelsFor = { version, suffix, sha256, isLqx }: buildLinux (args // {

pkgs/servers/dex/default.nix

@@ -2,16 +2,16 @@
 
 buildGoModule rec {
   pname = "dex";
-  version = "2.33.0";
+  version = "2.34.0";
 
   src = fetchFromGitHub {
     owner = "dexidp";
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-sl/OdwSkN4uEtuIyYtR5xjxy1z7B6rmG2Cf7xWz0Kp0=";
+    sha256 = "sha256-OML1DMIuFzoIyXtWxZW+lE/yU0B+7gx61v9CTb6MNmM=";
   };
 
-  vendorSha256 = "sha256-9zjQBgAuphtvpbs9kzFmrgto6KvNh1N4GdRDk3wIBGY=";
+  vendorSha256 = "sha256-qMkU4OQtoOYFF9vexZ+SH0E/4xo+WARIqQrbsMPm/C8=";
 
   subPackages = [
     "cmd/dex"

pkgs/servers/icingaweb2/default.nix

@@ -2,13 +2,13 @@
 
 stdenvNoCC.mkDerivation rec {
   pname = "icingaweb2";
-  version = "2.10.1";
+  version = "2.11.1";
 
   src = fetchFromGitHub {
     owner = "Icinga";
     repo = "icingaweb2";
     rev = "v${version}";
-    sha256 = "sha256-X4RaAJjhUnSALJyFYiwagN3cHyW+GyB5MPkW7l+Zv10=";
+    hash = "sha256-MRk+ZshdOUg311+FNuEM+jspYM4ZqqQLx5dRBM1KNpI=";
   };
 
   nativeBuildInputs = [ makeWrapper ];

pkgs/tools/admin/zbctl/default.nix

@@ -0,0 +1,49 @@
+{ lib
+, stdenvNoCC
+, fetchurl
+}:
+
+stdenvNoCC.mkDerivation rec {
+  pname = "zbctl";
+  version = "8.0.6";
+
+  src = if stdenvNoCC.hostPlatform.system == "x86_64-darwin" then fetchurl {
+    url = "https://github.com/camunda/zeebe/releases/download/${version}/zbctl.darwin";
+    sha256 = "17hfjrcr6lmw91jq24nbw5yz61x6larmx39lyfj6pwlz0710y13p";
+  } else if stdenvNoCC.hostPlatform.system == "x86_64-linux" then fetchurl {
+    url = "https://github.com/camunda/zeebe/releases/download/${version}/zbctl";
+    sha256 = "1xng11x7wcjvc0vipdrqyn97aa4jlgcp7g9aw4d36fw0xp9p47kp";
+  } else throw "Unsupported platform ${stdenvNoCC.hostPlatform.system}";
+
+  dontUnpack = true;
+  dontConfigure = true;
+  dontBuild = true;
+
+  installPhase = ''
+    runHook preInstall
+    mkdir -p $out/bin
+    cp $src $out/bin/zbctl
+    chmod +x $out/bin/zbctl
+    runHook postInstall
+  '';
+
+  meta = with lib; {
+    description = "The command line interface to interact with Camunda 8 and Zeebe";
+    homepage = "https://docs.camunda.io/docs/apis-clients/cli-client/";
+    downloadPage = "https://github.com/camunda/zeebe/releases";
+    changelog = "https://github.com/camunda/zeebe/releases/tag/${version}";
+    sourceProvenance = with sourceTypes; [ binaryNativeCode ];
+    license = licenses.asl20;
+    platforms = [ "x86_64-darwin" "x86_64-linux" ];
+    maintainers = with maintainers; [ thetallestjj ];
+    longDescription = ''
+      A command line interface for Camunda Platform 8 designed to create and read resources inside a Zeebe broker.
+      It can be used for regular development and maintenance tasks such as:
+      * Deploying processes
+      * Creating process instances and job workers
+      * Activating, completing, or failing jobs
+      * Updating variables and retries
+      * Viewing cluster status
+    '';
+  };
+}

pkgs/tools/graphics/agi/default.nix

@@ -38,7 +38,7 @@ stdenvNoCC.mkDerivation rec {
     cp -r lib $out
 
     for i in 16 32 48 64 96 128 256 512 1024; do
-      install -D ${src}/icon.png $out/share/icons/hicolor/$ix$i/apps/agi.png
+      install -D ${src}/icon.png $out/share/icons/hicolor/''${i}x$i/apps/agi.png
     done
 
     runHook postInstall

pkgs/tools/misc/goreleaser/default.nix

@@ -2,16 +2,16 @@
 
 buildGoModule rec {
   pname = "goreleaser";
-  version = "1.11.2";
+  version = "1.11.3";
 
   src = fetchFromGitHub {
     owner = "goreleaser";
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-Qe2Q7cFu9G0Zj/mHTnxSq57OpeNMX3yZQp8VApVtZDc=";
+    sha256 = "sha256-aWaNJVNd3CUTU6ap4sUMo2EqDDkA4iMe9xdxqaA+wl0=";
   };
 
-  vendorSha256 = "sha256-7xySEPmc24yOwUerGoARsKaGIYnIvaJFjcwNvbHG4Ls=";
+  vendorSha256 = "sha256-iUXbvwh04W8cZ4pa+OS4bRi3bCyFQ2shPzHNh6/e3Vs=";
 
   ldflags = [
     "-s"

pkgs/top-level/all-packages.nix

@@ -428,7 +428,9 @@ with pkgs;
 
   cryptowatch-desktop = callPackage ../applications/finance/cryptowatch { };
 
-  datalad = callPackage ../applications/version-management/datalad { };
+  datalad = callPackage ../applications/version-management/datalad {
+    python3 = python39;  # `boto` currently broken with Python3.10
+  };
 
   dhallDirectoryToNix = callPackage ../build-support/dhall/directory-to-nix.nix { };
 
@@ -12719,6 +12721,8 @@ with pkgs;
     autoreconfHook = buildPackages.autoreconfHook269;
   };
 
+  zbctl = callPackage ../tools/admin/zbctl { };
+
   zdelta = callPackage ../tools/compression/zdelta { };
 
   zed = callPackage ../development/tools/zed { };
@@ -14474,6 +14478,8 @@ with pkgs;
   buildRustCrateHelpers = callPackage ../build-support/rust/build-rust-crate/helpers.nix { };
   cratesIO = callPackage ../build-support/rust/crates-io.nix { };
 
+  cargo-espflash = callPackage ../development/tools/rust/cargo-espflash { };
+
   cargo-web = callPackage ../development/tools/rust/cargo-web {
     inherit (darwin.apple_sdk.frameworks) CoreServices Security;
   };
@@ -32210,7 +32216,7 @@ with pkgs;
 
   kodi-cli = callPackage ../tools/misc/kodi-cli { };
 
-  xca = libsForQt5.callPackage ../applications/misc/xca { };
+  xca = libsForQt5_openssl_1_1.callPackage ../applications/misc/xca { };
 
   xcalib = callPackage ../tools/X11/xcalib { };
 

pkgs/top-level/python-packages.nix

@@ -2341,6 +2341,8 @@ in {
 
   deemix = callPackage ../development/python-modules/deemix { };
 
+  deep-chainmap = callPackage ../development/python-modules/deep-chainmap { };
+
   deep_merge = callPackage ../development/python-modules/deep_merge { };
 
   deepdiff = callPackage ../development/python-modules/deepdiff { };