Merge master into staging-next

nixos/modules/system/boot/loader/systemd-boot/systemd-boot-builder.py

···
     else:
         return []
 
-def should_update(v_from: str, v_to: str) -> bool:
-    # see https://github.com/systemd/systemd/blob/main/src/boot/bootctl.c compare_product function
-
-    len_from = len(v_from)
-    len_to = len(v_to)
-
-    if len_from < len_to:
-        return False
-
-    if len_from > len_to:
-        return True
-
-    return v_from < v_to
-
-
 def main() -> None:
     parser = argparse.ArgumentParser(description='Update NixOS-related systemd-boot files')
     parser.add_argument('default_config', metavar='DEFAULT-CONFIG', help='The default NixOS config to boot')
···
         installed_version = installed_match.group(1)
         available_version = available_match.group(1)
 
-        if should_update(installed_version, available_version):
+        if installed_version < available_version:
             print("updating systemd-boot from %s to %s" % (installed_version, available_version))
             subprocess.check_call(["@systemd@/bin/bootctl", "--path=@efiSysMountPoint@", "update"])
         else:

pkgs/applications/misc/dbeaver/default.nix

···
   inherit maven; # use overridden maven version (see dbeaver's entry in all-packages.nix)
 }) rec {
   pname = "dbeaver";
-  version = "22.0.2"; # When updating also update mvnSha256
+  version = "22.0.5"; # When updating also update mvnSha256
 
   src = fetchFromGitHub {
     owner = "dbeaver";
     repo = "dbeaver";
     rev = version;
-    sha256 = "sha256-3tIxHw4734ggIUDjZO2EGIMbyPNP3yvy9QgnMLw+/fc=";
+    sha256 = "sha256-P+t1wtMTVKbfEXCFuz8zPNy3z4YysJRyOvTxiDFlp2c=";
   };
 
-  mvnSha256 = "os3eb+In8XreHwdZMacXafIVgOAeSSfCIkO5pwaO6MI=";
+  mvnSha256 = "veclFlzLhTU+nT360qxRNut+yEi2dfTBxdQASyRMqhI=";
   mvnParameters = "-P desktop,all-platforms";
 
   nativeBuildInputs = [

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

···
 
 stdenv.mkDerivation rec {
   pname = "kubernetes";
-  version = "1.23.5";
+  version = "1.23.7";
 
   src = fetchFromGitHub {
     owner = "kubernetes";
     repo = "kubernetes";
     rev = "v${version}";
-    sha256 = "sha256-LhJ3gThcsWnawSOmHSzWOG8tfODIPo4dJTMeLKmvMdM=";
+    sha256 = "sha256-YHlcopB47HVLO/4QI8HxjMBzCpcHVnlAz3EOmZI+EG8=";
   };
 
   nativeBuildInputs = [ makeWrapper which go rsync installShellFiles ];

pkgs/applications/networking/instant-messengers/gurk-rs/default.nix

···
 
 rustPlatform.buildRustPackage rec {
   pname = "gurk-rs";
-  version = "0.2.3";
+  version = "0.2.4";
 
   src = fetchFromGitHub {
     owner = "boxdot";
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-Mko5udM8BY50uUwn7xESxB+s0MEO1kAJX4Dt/DnEEa4=";
+    sha256 = "sha256-WZUoUvu7GaiBOaRAOGRCXrLe6u3DRbI6CDTAf5jryGc=";
   };
 
-  cargoHash = "sha256-pYMMgBvLsqkj2peouDQK1vn97ByUjtdCrkbzuZZLXrY=";
+  cargoHash = "sha256-81ZW61JX40W0D/cmYogR3RJH2dvEKW1K7sIsl2io/7E=";
   buildInputs = [ protobuf ];
 
   PROTOC = "${protobuf}/bin/protoc";

pkgs/applications/office/ledger/default.nix

···
   '';
 
   meta = with lib; {
-    broken = (stdenv.isLinux && stdenv.isAarch64) || stdenv.isDarwin;
     homepage = "https://ledger-cli.org/";
     description = "A double-entry accounting system with a command-line reporting interface";
     license = licenses.bsd3;

pkgs/applications/science/logic/cvc4/default.nix

···
   };
 
   nativeBuildInputs = [ pkg-config cmake ];
-  buildInputs = [ gmp git python3.pkgs.toml cln readline swig libantlr3c antlr3_4 boost jdk python3 ];
+  buildInputs = [ gmp git python3.pkgs.toml readline swig libantlr3c antlr3_4 boost jdk python3 ]
+    ++ lib.optionals (!stdenv.isDarwin) [ cln ];
   configureFlags = [
     "--enable-language-bindings=c,c++,java"
     "--enable-gpl"
-    "--with-cln"
     "--with-readline"
     "--with-boost=${boost.dev}"
-  ];
+  ] ++ lib.optionals (!stdenv.isDarwin) [ "--with-cln" ];
 
   prePatch = ''
     patch -p1 -i ${./minisat-fenv.patch} -d src/prop/minisat

pkgs/applications/science/logic/lean2/default.nix

···
+{ lib, stdenv, fetchpatch, fetchFromGitHub, cmake, gmp, mpfr, python3
+, jemalloc, ninja, makeWrapper }:
+
+stdenv.mkDerivation {
+  pname = "lean2";
+  version = "2018-10-01";
+
+  src = fetchFromGitHub {
+    owner  = "leanprover";
+    repo   = "lean2";
+    rev    = "8072fdf9a0b31abb9d43ab894d7a858639e20ed7";
+    sha256 = "12bscgihdgvaq5xi0hqf5r4w386zxm3nkx1n150lv5smhg8ga3gg";
+  };
+
+  patches = [
+    # https://github.com/leanprover/lean2/pull/13
+    (fetchpatch {
+      name = "lean2-fix-compilation-error.patch";
+      url = "https://github.com/collares/lean2/commit/09b316ce75fd330b3b140d138bcdae2b0e909234.patch";
+      sha256 = "060mvqn9y8lsn4l20q9rhamkymzsgh0r1vzkjw78gnj8kjw67jl5";
+    })
+  ];
+  nativeBuildInputs = [ cmake makeWrapper ninja ];
+  buildInputs = [ gmp mpfr python3 jemalloc ];
+
+  preConfigure = ''
+    patchShebangs bin/leantags
+    cd src
+  '';
+
+  cmakeFlags = [ "-GNinja" ];
+
+  postInstall = ''
+    wrapProgram $out/bin/linja --prefix PATH : $out/bin:${ninja}/bin
+  '';
+
+  meta = with lib; {
+    description = "Automatic and interactive theorem prover (version with HoTT support)";
+    homepage    = "http://leanprover.github.io";
+    license     = licenses.asl20;
+    platforms   = platforms.unix;
+    maintainers = with maintainers; [ thoughtpolice gebner ];
+    broken      = stdenv.isAarch64;
+    mainProgram = "lean";
+  };
+}

pkgs/applications/version-management/git-and-tools/grv/default.nix

···
-{ lib, buildGoPackage, fetchFromGitHub, curl, ncurses, pkg-config, readline
-, cmake }:
-let
-  version = "0.3.2";
-in
-buildGoPackage {
-  pname = "grv";
-  inherit version;
-
-  buildInputs = [ ncurses readline curl ];
-  nativeBuildInputs = [ pkg-config cmake ];
-
-  goPackagePath = "github.com/rgburke/grv";
-
-  src = fetchFromGitHub {
-    owner = "rgburke";
-    repo = "grv";
-    rev = "v${version}";
-    sha256 = "0bpjsk35rlp56z8149z890adnhmxyh743vsls3q86j4682b83kyf";
-    fetchSubmodules = true;
-  };
-
-  postPatch = ''
-    rm util/update_latest_release.go
-  '';
-
-  postConfigure = ''
-    cd $NIX_BUILD_TOP/go/src/$goPackagePath
-  '';
-
-  buildPhase = ''
-    runHook preBuild
-    make build-only
-    runHook postBuild
-  '';
-
-  installPhase = ''
-    runHook preInstall
-    install -D grv $out/bin/grv
-    runHook postInstall
-  '';
-
-  meta = with lib; {
-    description = "GRV is a terminal interface for viewing Git repositories";
-    homepage = "https://github.com/rgburke/grv";
-    license = licenses.gpl3;
-    platforms = platforms.unix;
-    maintainers = with maintainers; [ ];
-  };
-}

pkgs/applications/virtualization/cri-o/default.nix

···
 
 buildGoModule rec {
   pname = "cri-o";
-  version = "1.23.2";
+  version = "1.24.0";
 
   src = fetchFromGitHub {
     owner = "cri-o";
     repo = "cri-o";
     rev = "v${version}";
-    sha256 = "sha256-sjeYWBcal6RtoUZd6orQ+237Fz80vQKx5vocFMq4l7U=";
+    sha256 = "sha256-LbLBG8nvEgSF5KAeAYnp7dM9cbqF078QpVai1iDx63U=";
   };
   vendorSha256 = null;
 

pkgs/desktops/gnome/core/gnome-settings-daemon/default.nix

···
 
 stdenv.mkDerivation rec {
   pname = "gnome-settings-daemon";
-  version = "42.1";
+  version = "42.2";
 
   src = fetchurl {
     url = "mirror://gnome/sources/gnome-settings-daemon/${lib.versions.major version}/${pname}-${version}.tar.xz";
-    sha256 = "7WWFGuVK3NWKJMhoN9Yk/GoUvYSrIulN9Ao6TP0Z/9s=";
+    sha256 = "nESXFKqOwSccDbUTffNFgZWUPwXM0KyJNdkzl3cLqwA=";
   };
 
   patches = [

pkgs/development/compilers/koka/default.nix

···
 , parsec, process, regex-compat, text, time }:
 
 let
-  version = "2.3.8";
+  version = "2.4.0";
   src = fetchFromGitHub {
     owner = "koka-lang";
     repo = "koka";
     rev = "v${version}";
-    sha256 = "sha256-4a9UwtiWq9eFpNHpcrlhYUwzXcr1EXFMjBmDFYP933U=";
+    sha256 = "sha256-+evs5g0qrplUMr8zC51GvUx2JXQBYJb39IaI4rC6CSA=";
     fetchSubmodules = true;
   };
   kklib = stdenv.mkDerivation {

pkgs/development/interpreters/python/cpython/default.nix

···
 
 assert bluezSupport -> bluez != null;
 
-assert lib.assertMsg (enableOptimizations -> (!stdenv.cc.isClang))
-  "Optimizations with clang are not supported. configure: error: llvm-profdata is required for a --enable-optimizations build but could not be found.";
-
 assert lib.assertMsg (reproducibleBuild -> stripBytecode)
   "Deterministic builds require stripping bytecode.";
 
···
   ] ++ optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
     buildPackages.stdenv.cc
     pythonForBuild
-  ] ++ optionals (stdenv.cc.isClang && enableLTO) [
+  ] ++ optionals (stdenv.cc.isClang && (enableLTO || enableOptimizations)) [
     stdenv.cc.cc.libllvm.out
   ];
 

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

···
 
 buildPythonPackage rec {
   pname = "ailment";
-  version = "9.2.5";
+  version = "9.2.6";
   format = "pyproject";
 
   disabled = pythonOlder "3.6";
···
     owner = "angr";
     repo = pname;
     rev = "v${version}";
-    hash = "sha256-eETl1AMDdY55okPUVDv7L2zZMtDfA4dRi11z37xAM58=";
+    hash = "sha256-SymOCHKIr0SOi4OM+OONA7+A2nV4JMA467OkoqDhZ+M=";
   };
 
   propagatedBuildInputs = [

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

···
 
 buildPythonPackage rec {
   pname = "angr";
-  version = "9.2.5";
+  version = "9.2.6";
   format = "pyproject";
 
   disabled = pythonOlder "3.6";
···
     owner = pname;
     repo = pname;
     rev = "v${version}";
-    hash = "sha256-uXH/7Qfs4VxG53819TG/Y2M0taIcE4uC06rdfBe22O0=";
+    hash = "sha256-qXzkrfF8FkALkEaFLSmaadovwLc2DkXXJivdrT6srTc=";
   };
 
   propagatedBuildInputs = [

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

···
 
 buildPythonPackage rec {
   pname = "angrop";
-  version = "9.2.5";
+  version = "9.2.6";
   format = "pyproject";
 
   disabled = pythonOlder "3.6";
···
     owner = "angr";
     repo = pname;
     rev = "v${version}";
-    hash = "sha256-APm7+V0eLvgnPRzojQsfDPleEfrIssbgeUh5eugKiLM=";
+    hash = "sha256-qaDAicmYZxLPTl17il61ij01prRv2H4xxe07Xg4KWhI=";
   };
 
   propagatedBuildInputs = [

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

···
 
 buildPythonPackage rec {
   pname = "archinfo";
-  version = "9.2.5";
+  version = "9.2.6";
   format = "pyproject";
 
   disabled = pythonOlder "3.6";
···
     owner = "angr";
     repo = pname;
     rev = "v${version}";
-    hash = "sha256-U++Ly+UwY2CiyKdHpPWRpURqxVv4dgVylZD7ERVzUCA=";
+    hash = "sha256-yMUcuZ9v1dVbh/t456fpMu8tDFWIdh55LZh7FLkz9GM=";
   };
 
   checkInputs = [

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

···
     "strictoverflow"
   ];
 
+  postPatch = ''
+    substituteInPlace setup.py \
+      --replace "extra_link_args += ['-Wl,-fatal_warnings']" ""
+  '';
+
   # gcc <10 is not supported, LLVM on darwin is just fine
   nativeBuildInputs = [
     cmake
···
   doCheck = false;
 
   meta = with lib; {
-    broken = stdenv.isDarwin;
     homepage = "https://github.com/awslabs/aws-crt-python";
     description = "Python bindings for the AWS Common Runtime";
     license = licenses.asl20;

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

···
 
 buildPythonPackage rec {
   pname = "claripy";
-  version = "9.2.5";
+  version = "9.2.6";
   format = "pyproject";
 
   disabled = pythonOlder "3.6";
···
     owner = "angr";
     repo = pname;
     rev = "v${version}";
-    hash = "sha256-o5aNHYysIpccWhf09xuJ1WT2Hac4OPyztnKqPne1Vng=";
+    hash = "sha256-mBpAwKUclwvgOeGD6BvPUKZHdjngfvuHdtKY3nx7jzM=";
   };
 
   propagatedBuildInputs = [

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

···
 
 let
   # The binaries are following the argr projects release cycle
-  version = "9.2.5";
+  version = "9.2.6";
 
   # Binary files from https://github.com/angr/binaries (only used for testing and only here)
   binaries = fetchFromGitHub {
···
     owner = "angr";
     repo = pname;
     rev = "v${version}";
-    hash = "sha256-tBiabSbi4LKXA1Ou7MURRG2eGq1m1TutaHba+hq6DhQ=";
+    hash = "sha256-GOrjT5CM+yzboOTgkVriuf1UpNDVhDgGpS8vp4D39W0=";
   };
 
   propagatedBuildInputs = [

pkgs/development/python-modules/mypy-boto3-s3/default.nix

···
 
 buildPythonPackage rec {
   pname = "mypy-boto3-s3";
-  version = "1.23.0.post1";
+  version = "1.24.0";
   format = "setuptools";
 
   disabled = pythonOlder "3.6";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-eF0ChMOqisXsMWLlKCAWGMrTUe4sGfZxWo5uc/ZKAQk=";
+    hash = "sha256-ITZItcLZ/Im/tWptkKXGc+H1lT4m1mIlljTP/w+6pNo=";
   };
 
   propagatedBuildInputs = [

pkgs/development/python-modules/onvif-zeep-async/default.nix

···
 
 buildPythonPackage rec {
   pname = "onvif-zeep-async";
-  version = "1.2.0";
+  version = "1.2.1";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-O4H6oL9cFvgX6whoESA7eRI6+VoT1ncRk/tehQT1WcM=";
+    hash = "sha256-bRPqbuBrC4Q0gdQGb2KAy1pTHce42WvM7gjvAspH4WE=";
   };
 
   propagatedBuildInputs = [

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

···
 
 buildPythonPackage rec {
   pname = "plaid-python";
-  version = "9.4.0";
+  version = "9.5.0";
   format = "setuptools";
 
   disabled = pythonOlder "3.6";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-Md4vzAirCm5fjcTAeiLIQwH0MAP47r2AT8O5yigGqv8=";
+    hash = "sha256-gjYlr2rp2xRMcFKbA4Y/Pb7YYOUR4LTzMtVoG1iMlx0=";
   };
 
   propagatedBuildInputs = [

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

···
 
 buildPythonPackage rec {
   pname = "pycfmodel";
-  version = "0.20.0";
+  version = "0.20.1";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
···
     owner = "Skyscanner";
     repo = pname;
     rev = "refs/tags/${version}";
-    hash = "sha256-c6RbglmG/A1fVOLmJLRsyMy9EgEIzpXnIe9Co/OLMSg=";
+    hash = "sha256-syEE03lcOt6tTD88+BJ8nHCkamKn+BX/rZU9TOsxATc=";
   };
 
   propagatedBuildInputs = [

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

···
 
 buildPythonPackage rec {
   pname = "pyoverkiz";
-  version = "1.4.0";
+  version = "1.4.1";
   format = "pyproject";
 
   disabled = pythonOlder "3.7";
···
   src = fetchFromGitHub {
     owner = "iMicknl";
     repo = "python-overkiz-api";
-    rev = "v${version}";
-    hash = "sha256-uaeSyRtnokUJ3jWTioVMuo+T3jFoH+SYTBT3HPCPjm8=";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-PVRNfpV6LwZNzSQaDJnDztNUdzosa2yIdXRLXpPMVW4=";
   };
 
   nativeBuildInputs = [

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

···
 
 buildPythonPackage rec {
   pname = "pyvex";
-  version = "9.2.5";
+  version = "9.2.6";
   format = "pyproject";
 
   disabled = pythonOlder "3.6";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-zQbIhl5MW/RYXV5EgL2Q7eKEwHNXVe+p6LPmIDbokwc=";
+    hash = "sha256-I2ZQJ/CDvNq5uJoLT9SHDGzeuI32YUy/6fMSNR9WM8I=";
   };
 
   propagatedBuildInputs = [

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

···
 
 buildPythonPackage rec {
   pname = "scmrepo";
-  version = "0.0.22";
+  version = "0.0.23";
   format = "pyproject";
 
   disabled = pythonOlder "3.7";
···
     owner = "iterative";
     repo = pname;
     rev = "refs/tags/${version}";
-    hash = "sha256-hV0BusvuJUEGfmue7OHR3YYmpBcFTgbQE7UuHmTUBo0=";
+    hash = "sha256-Yg08twcxXKtDlkOxmD5eafeaeij4zX/3XQQQN948xxs=";
   };
 
   propagatedBuildInputs = [

pkgs/development/python-modules/zha-quirks/default.nix

···
 
 buildPythonPackage rec {
   pname = "zha-quirks";
-  version = "0.0.73";
+  version = "0.0.75";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
···
     owner = "zigpy";
     repo = "zha-device-handlers";
     rev = "refs/tags/${version}";
-    hash = "sha256-vC1kkh9t2fWmSqmKQz9ON8Y+tBFhTxrprLNzOldQR+A=";
+    hash = "sha256-iwNXyoA85NcgrxqAPydTA3FAW+weE2pdPyijEV4PbSA=";
   };
 
   propagatedBuildInputs = [

pkgs/development/tools/kexpand/default.nix

···
-{ buildGoPackage, fetchFromGitHub }:
-
-buildGoPackage {
-  pname = "kexpand";
-  version = "unstable-2017-05-12";
-
-  goPackagePath = "github.com/kopeio/kexpand";
-
-  subPackages = [ "." ];
-
-  src = fetchFromGitHub {
-    owner = "kopeio";
-    repo = "kexpand";
-    rev = "c508a43a4e84410dfd30827603e902148c5c1f3c";
-    sha256 = "0946h74lsqnr1106j7i2w2a5jg2bbk831d7prlws4bb2kigfm38p";
-  };
-}

pkgs/development/tools/misc/universal-ctags/default.nix

···
 
 stdenv.mkDerivation rec {
   pname = "universal-ctags";
-  version = "5.9.20220220.0";
+  version = "5.9.20220529.0";
 
   src = fetchFromGitHub {
     owner = "universal-ctags";
     repo = "ctags";
     rev = "p${version}";
-    sha256 = "1118iq33snxyw1jk8nwvsl08f3zdainksh0yiapzvg0y5906jjjd";
+    sha256 = "sha256-Lu4eYMA5Uf/A8r11W6v7xTAnj0gtCjKQ4aX5IbV0dbo=";
   };
 
   depsBuildBuild = [ buildPackages.stdenv.cc ];
···
     platforms = platforms.unix;
     # universal-ctags is preferred over emacs's ctags
     priority = 1;
+    mainProgram = "ctags";
     maintainers = [ maintainers.mimame ];
   };
 }

pkgs/development/tools/rust/svd2rust/default.nix

···
 
 rustPlatform.buildRustPackage rec {
   pname = "svd2rust";
-  version = "0.21.0";
+  version = "0.24.0";
 
   src = fetchCrate {
     inherit pname version;
-    sha256 = "0mxzbbxrg1jysxpjqcvgwwmh8qf0lyf64fl1gxxp0whph0x279qj";
+    sha256 = "sha256-P0s2mrfYA7DUThvje0LH3Pq0Os6UZJrrnjnzAm8UlDQ=";
   };
 
-  cargoSha256 = "0kvya6swx1nsxxlhn2w8x4dhl4j3v56jxqr2h259cx6lzv3xjhin";
+  cargoSha256 = "sha256-TDgd8RG97ROeAQJ1uDF2m+yIa8US7zFz+5qrQtFbazE=";
 
   buildInputs = lib.optional stdenv.isDarwin libiconv;
 
···
     homepage = "https://github.com/rust-embedded/svd2rust";
     changelog = "https://github.com/rust-embedded/svd2rust/blob/v${version}/CHANGELOG.md";
     license = with licenses; [ mit asl20 ];
-    maintainers = with maintainers; [ ];
+    maintainers = with maintainers; [ newam ];
   };
 }

pkgs/tools/filesystems/httm/default.nix

···
 
 rustPlatform.buildRustPackage rec {
   pname = "httm";
-  version = "0.10.12";
+  version = "0.10.15";
 
   src = fetchFromGitHub {
     owner = "kimono-koans";
     repo = pname;
     rev = version;
-    sha256 = "Q69XltTdJgRLCwjt+oLSUWexO3MGd2HB11dN/edRGes=";
+    sha256 = "u18dIw4At78OSeWCDHJIjzDbaxpiSs3g+bf2WClFkuY=";
   };
 
-  cargoSha256 = "2nQE/5SPAaih4TunHgZHcYKPoAaA+4KDLxxcK0RLUgw=";
+  cargoSha256 = "mLFponkRIEWePpSyhQK1IG/rnJ0qpDwrS7vwAoP1ro0=";
 
   nativeBuildInputs = [ installShellFiles ];
 

pkgs/tools/misc/archi/default.nix

···
     homepage = "https://www.archimatetool.com/";
     license = licenses.mit;
     platforms = platforms.linux ++ platforms.darwin;
-    maintainers = with maintainers; [ earldouglas SuperSandro2000 ];
+    maintainers = with maintainers; [ earldouglas ];
   };
 }

pkgs/tools/misc/ntfy-sh/default.nix

···
 
 buildGoModule rec {
   pname = "ntfy-sh";
-  version = "1.22.0";
+  version = "1.24.0";
 
   src = fetchFromGitHub {
     owner = "binwiederhier";
     repo = "ntfy";
     rev = "v${version}";
-    sha256 = "sha256-30j62GaO5SXG78c6vMpLZ+ixy1zesjXoX3L9Et/7uhU=";
+    sha256 = "sha256-Jw+8rgbevtk1Mzy/g+DryAk7a/RbQXpEtwPlqJRD/UM=";
   };
 
-  vendorSha256 = "sha256-Sx6l5GJ72A0SHEHyVtlte8Ed9fuJzZAkJzC0zpCbvK8=";
+  vendorSha256 = "sha256-MdbC+Hv8jSImg0d2HMeAmUdWLQT8+zSe+0mkIwHIJXM=";
 
   doCheck = false;
 
   preBuild = ''
-    make server-deps-static-sites
+    make cli-deps-static-sites
   '';
 
   meta = with lib; {

pkgs/tools/system/netdata/default.nix

···
     # Therefore we put it into `/run/netdata`, which is owned
     # by netdata only.
     ./ipc-socket-in-run.patch
+
+    # Avoid build-only inputs in closure leaked by configure command:
+    #   https://github.com/NixOS/nixpkgs/issues/175693#issuecomment-1143344162
+    ./skip-CONFIGURE_COMMAND.patch
   ];
 
   NIX_CFLAGS_COMPILE = optionalString withDebug "-O1 -ggdb -DNETDATA_INTERNAL_CHECKS=1";

pkgs/tools/system/netdata/skip-CONFIGURE_COMMAND.patch

···
+Shrink closure size by avoiding paths embedded from configure call.
+
+https://github.com/NixOS/nixpkgs/issues/175693
+--- a/daemon/buildinfo.c
++++ b/daemon/buildinfo.c
+@@ -248,7 +248,9 @@ void print_build_info(void) {
+     char *prebuilt_distro = NULL;
+     get_install_type(&install_type, &prebuilt_arch, &prebuilt_distro);
+ 
+-    printf("Configure options: %s\n", CONFIGURE_COMMAND);
++    // To minimize closure size do not persist configure options
++    // with build-time inputs.
++    printf("Configure options: REMOVED\n");
+ 
+     if (install_type == NULL) {
+         printf("Install type: unknown\n");

pkgs/top-level/aliases.nix

···
   gr-nacl = gnuradio3_7.pkgs.nacl; # Added 2019-05-27, changed 2020-10-16
   gr-osmosdr = gnuradio3_7.pkgs.osmosdr; # Added 2019-05-27, changed 2020-10-16
   gr-rds = gnuradio3_7.pkgs.rds; # Added 2019-05-27, changed 2020-10-16
+  grv = "grv has been dropped due to the lack of maintanence from upstream since 2019"; # Added 2022-06-01
   gsettings_desktop_schemas = throw "'gsettings_desktop_schemas' has been renamed to/replaced by 'gsettings-desktop-schemas'"; # Converted to throw 2022-02-22
   gtk_doc = throw "'gtk_doc' has been renamed to/replaced by 'gtk-doc'"; # Converted to throw 2022-02-22
   gtklick = throw "gtklick has been removed from nixpkgs as the project is stuck on python2"; # Added 2022-01-01
···
   keepnote = throw "keepnote has been removed from nixpkgs, as it is stuck on python2"; # Added 2022-01-01
   kerberos = libkrb5; # moved from top-level 2021-03-14
   kexectools = kexec-tools; # Added 2021-09-03
+  kexpand = "kexpand awless has been dropped due to the lack of maintanence from upstream since 2017"; # Added 2022-06-01
   keybase-go = throw "'keybase-go' has been renamed to/replaced by 'keybase'"; # Converted to throw 2022-02-22
   keysmith = libsForQt5.plasmaMobileGear.keysmith; # Added 2021-07-14
   kgx = gnome-console; # Added 2022-02-19

pkgs/top-level/all-packages.nix

···
     stdenv = overrideCC stdenv buildPackages.pkgsi686Linux.gcc6;
   } // (config.grub or {}));
 
-  grv = callPackage ../applications/version-management/git-and-tools/grv { };
-
   trustedGrub = pkgsi686Linux.callPackage ../tools/misc/grub/trusted.nix { };
 
   trustedGrub-for-HP = pkgsi686Linux.callPackage ../tools/misc/grub/trusted.nix { for_HP_laptop = true; };
···
   kexec-tools = callPackage ../os-specific/linux/kexec-tools { };
 
   keepkey_agent = with python3Packages; toPythonApplication keepkey_agent;
-
-  kexpand = callPackage ../development/tools/kexpand { };
 
   kent = callPackage ../applications/science/biology/kent { };
 
···
   bench = haskell.lib.compose.justStaticExecutables haskellPackages.bench;
 
   cri-o = callPackage ../applications/virtualization/cri-o/wrapper.nix { };
-  cri-o-unwrapped = callPackage ../applications/virtualization/cri-o { };
+  cri-o-unwrapped = callPackage ../applications/virtualization/cri-o { buildGoModule = buildGo118Module; };
 
   confd = callPackage ../tools/system/confd { };
 
···
   keymapviz = callPackage ../tools/misc/keymapviz { };
 
   lean = callPackage ../applications/science/logic/lean {};
+  lean2 = callPackage ../applications/science/logic/lean2 {};
   lean3 = lean;
   elan = callPackage ../applications/science/logic/elan {};
   mathlibtools = with python3Packages; toPythonApplication mathlibtools;

pkgs/top-level/python-packages.nix

···
 
   ledger = (toPythonModule (pkgs.ledger.override {
     usePython = true;
+    boost = pkgs.boost179; # Current default boost (1.77) doesn’t work with Python 3.10.
     python3 = python;
   })).py;