Merge staging-next into staging

nixos/modules/services/development/jupyter/default.nix

@@ -143,6 +143,9 @@ in {
             language = "python";
             logo32 = "''${env.sitePackages}/ipykernel/resources/logo-32x32.png";
             logo64 = "''${env.sitePackages}/ipykernel/resources/logo-64x64.png";
+            extraPaths = {
+              "cool.txt" = pkgs.writeText "cool" "cool content";
+            };
           };
         }
       '';

nixos/modules/services/development/jupyter/kernel-options.nix

@@ -56,5 +56,14 @@ with lib;
         Path to 64x64 logo png.
       '';
     };
+
+    extraPaths = mkOption {
+      type = types.attrsOf types.path;
+      default = { };
+      example = literalExpression ''"{ examples = ''${env.sitePack}/IRkernel/kernelspec/kernel.js"; }'';
+      description = ''
+        Extra paths to link in kernel directory
+      '';
+    };
   };
 }

nixos/modules/services/misc/dictd.nix

@@ -45,6 +45,10 @@ in
     # get the command line client on system path to make some use of the service
     environment.systemPackages = [ pkgs.dict ];
 
+    environment.etc."dict.conf".text = ''
+      server localhost
+    '';
+
     users.users.dictd =
       { group = "dictd";
         description = "DICT.org dictd server";

pkgs/applications/blockchains/bitcoin/default.nix

@@ -74,6 +74,10 @@ stdenv.mkDerivation rec {
     "--with-qt-bindir=${qtbase.dev}/bin:${qttools.dev}/bin"
   ];
 
+  # fix "Killed: 9  test/test_bitcoin"
+  # https://github.com/NixOS/nixpkgs/issues/179474
+  hardeningDisable = lib.optionals (stdenv.isAarch64 && stdenv.isDarwin) [ "stackprotector" ];
+
   checkInputs = [ python3 ];
 
   doCheck = true;

pkgs/applications/editors/jupyter/kernel.nix

@@ -39,26 +39,22 @@ in
 
       ${concatStringsSep "\n" (mapAttrsToList (kernelName: unfilteredKernel:
         let
-          allowedKernelKeys = ["argv" "displayName" "language" "interruptMode" "env" "metadata" "logo32" "logo64"];
+          allowedKernelKeys = ["argv" "displayName" "language" "interruptMode" "env" "metadata" "logo32" "logo64" "extraPaths"];
           kernel = filterAttrs (n: v: (any (x: x == n) allowedKernelKeys)) unfilteredKernel;
           config = builtins.toJSON (
             kernel
             // {display_name = if (kernel.displayName != "") then kernel.displayName else kernelName;}
             // (optionalAttrs (kernel ? interruptMode) { interrupt_mode = kernel.interruptMode; })
           );
-          logo32 =
+          extraPaths = kernel.extraPaths or {}
-            if (kernel.logo32 != null)
+            // lib.optionalAttrs (kernel.logo32 != null) { "logo-32x32.png" = kernel.logo32; }
-            then "ln -s ${kernel.logo32} 'kernels/${kernelName}/logo-32x32.png';"
+            // lib.optionalAttrs (kernel.logo64 != null) { "logo-64x64.png" = kernel.logo64; }
-            else "";
+          ;
-          logo64 =
+          linkExtraPaths = lib.mapAttrsToList (name: value: "ln -s ${value} 'kernels/${kernelName}/${name}';") extraPaths;
-            if (kernel.logo64 != null)
-            then "ln -s ${kernel.logo64} 'kernels/${kernelName}/logo-64x64.png';"
-            else "";
         in ''
           mkdir 'kernels/${kernelName}';
           echo '${config}' > 'kernels/${kernelName}/kernel.json';
-          ${logo32}
+          ${lib.concatStringsSep "\n" linkExtraPaths}
-          ${logo64}
         '') definitions)}
 
       mkdir $out

pkgs/applications/editors/neovim/neovide/default.nix

@@ -25,16 +25,16 @@
 }:
 rustPlatform.buildRustPackage rec {
   pname = "neovide";
-  version = "0.8.0";
+  version = "0.9.0";
 
   src = fetchFromGitHub {
     owner = "Kethku";
     repo = "neovide";
     rev = version;
-    sha256 = "sha256-pbniOWjEw1Z+PoXqbbFOUkW5Ii1UDOMoZpAvVF1uNEg=";
+    sha256 = "sha256-2fN05o8Zo1MGdIYUcsCgkiW/kG6DkY8uTnpw2XrKxrI=";
   };
 
-  cargoSha256 = "sha256-7o7uJXH68pvfuiG1eSNmbPx8OO8QJjCe+oEFl38bFm4=";
+  cargoSha256 = "sha256-eATUyczkcwHI8Y7Gl2ts4dRgiFUAL8yrWDNe4JzserE=";
 
   SKIA_SOURCE_DIR =
     let
@@ -42,8 +42,8 @@ rustPlatform.buildRustPackage rec {
         owner = "rust-skia";
         repo = "skia";
         # see rust-skia:skia-bindings/Cargo.toml#package.metadata skia
-        rev = "m93-0.42.0";
+        rev = "m100-0.48.7";
-        sha256 = "sha256-F1DWLm7bdKnuCu5tMMekxSyaGq8gPRNtZwcRVXJxjZQ=";
+        sha256 = "sha256-roZUv5YoLolRi0iWAB+5WlCFV+8GdzNzS+JINnEHaMs=";
       };
       # The externals for skia are taken from skia/DEPS
       externals = lib.mapAttrs (n: fetchgit) (lib.importJSON ./skia-externals.json);

pkgs/applications/editors/neovim/neovide/skia-externals.json

@@ -6,8 +6,8 @@
   },
   "libjpeg-turbo": {
     "url": "https://chromium.googlesource.com/chromium/deps/libjpeg_turbo.git",
-    "rev": "24e310554f07c0fdb8ee52e3e708e4f3e9eb6e20",
+    "rev": "02959c3ee17abacfd1339ec22ea93301292ffd56",
-    "sha256": "sha256-bhbUnA36rKYLJSLpElmXJqccXQDjjbMcNMsVM4Eekrs="
+    "sha256": "sha256-gs8JUT8AoKL+9vlmz3evq61+h2QxNcWqOHN4elb2Grc="
   },
   "icu": {
     "url": "https://chromium.googlesource.com/chromium/deps/icu.git",
@@ -21,8 +21,8 @@
   },
   "harfbuzz": {
     "url": "https://chromium.googlesource.com/external/github.com/harfbuzz/harfbuzz.git",
-    "rev": "3a74ee528255cc027d84b204a87b5c25e47bff79",
+    "rev": "a8b7f1880412c7f0c9ecdada0a4935011816c7dc",
-    "sha256": "sha256-/4UdoUj0bxj6+EfNE8ofjtWOn2VkseEfvdFah5rwwBM="
+    "sha256": "sha256-TQdgg0G8Dk10tg2MLv405nG8DAaPm7JiZjiZ6tOSGW4="
   },
   "libpng": {
     "url": "https://skia.googlesource.com/third_party/libpng.git",

pkgs/applications/graphics/ocrfeeder/default.nix

@@ -48,6 +48,11 @@ stdenv.mkDerivation rec {
       pygobject3
     ]))
   ];
+  patches = [
+    # Compiles, but doesn't launch without this, see:
+    # https://gitlab.gnome.org/GNOME/ocrfeeder/-/issues/83
+    ./fix-launch.diff
+  ];
 
   enginesPath = lib.makeBinPath ([
     tesseract4
@@ -64,7 +69,5 @@ stdenv.mkDerivation rec {
     maintainers = with maintainers; [ doronbehar ];
     license = licenses.gpl3Plus;
     platforms = platforms.linux;
-    # Compiles, but doesn't launch, see: https://gitlab.gnome.org/GNOME/ocrfeeder/-/issues/83
-    broken = true;
   };
 }

pkgs/applications/graphics/ocrfeeder/fix-launch.diff

@@ -0,0 +1,13 @@
+diff --git i/src/ocrfeeder/studio/studioBuilder.py w/src/ocrfeeder/studio/studioBuilder.py
+index 7a2ccdc..7af19d9 100644
+--- i/src/ocrfeeder/studio/studioBuilder.py
++++ w/src/ocrfeeder/studio/studioBuilder.py
+@@ -144,7 +144,7 @@ class Studio:
+         if not self.ocr_engines:
+             engines = self.configuration_manager.getEnginesInSystem()
+             if engines:
+-                add_engines_dialog = widgetPresenter.SystemEnginesDialog(engines)
++                add_engines_dialog = widgetPresenter.SystemEnginesDialog(self.main_window, engines)
+                 response = add_engines_dialog.run()
+                 if response == Gtk.ResponseType.ACCEPT:
+                     for engine in add_engines_dialog.getChosenEngines():

pkgs/applications/networking/instant-messengers/bluejeans/default.nix

@@ -44,11 +44,11 @@ in
 
 stdenv.mkDerivation rec {
   pname = "bluejeans";
-  version = "2.27.0.130";
+  version = "2.29.1.3";
 
   src = fetchurl {
     url = "https://swdl.bluejeans.com/desktop-app/linux/${getFirst 3 version}/BlueJeans_${version}.rpm";
-    sha256 = "sha256-J0BGL03k1NAJLLEUOfvKjZEsBlupeHJR2Bp3c0ANBwg=";
+    sha256 = "sha256-vWViSJXRPZ4B40LNnoKRZNbxB1YKnaW2ay6GCjnFLGY=";
   };
 
   nativeBuildInputs = [ rpmextract makeWrapper ];

pkgs/applications/networking/instant-messengers/zoom-us/arm64-darwin-sha.nix

@@ -0,0 +1 @@
+"0cwplzza8vv4nzxf35i2p4gfnna4dpgp0ddqbpdxl8cxrikq5rji"

pkgs/applications/networking/instant-messengers/zoom-us/arm64-darwin-version.nix

@@ -0,0 +1 @@
+"5.11.1.8356"

pkgs/applications/networking/instant-messengers/zoom-us/default.nix

@@ -1,6 +1,7 @@
 { stdenv
 , lib
 , fetchurl
+, pipewire
 , makeWrapper
 , xar
 , cpio
@@ -44,23 +45,23 @@ let
 
   # Zoom versions are released at different times for each platform
   version = {
-    aarch64-darwin = "5.10.4.6592";
+    aarch64-darwin =import ./arm64-darwin-version.nix;
-    x86_64-darwin = "5.10.4.6592";
+    x86_64-darwin = import ./x86_64-darwin-version.nix;
-    x86_64-linux = "5.10.6.3192";
+    x86_64-linux = import ./x86_64-linux-version.nix;
    }.${system} or throwSystem;
 
   srcs = {
     aarch64-darwin = fetchurl {
-       url = "https://zoom.us/client/${version}/Zoom.pkg?archType=arm64";
+      url = "https://zoom.us/client/${version}/Zoom.pkg?archType=arm64";
-       sha256 = "0jg5f9hvb67hhfnifpx5fzz65fcijldy1znlia6pqflxwci3m5rq";
+      sha256 = import ./arm64-darwin-sha.nix;
     };
     x86_64-darwin = fetchurl {
       url = "https://zoom.us/client/${version}/Zoom.pkg";
-      sha256 = "1p83691bid8kz5mw09x6l9zvjglfszi5vbhfmbbpiqhiqcxlfz83";
+      sha256 = import ./x86_64-darwin-sha.nix;
     };
     x86_64-linux = fetchurl {
       url = "https://zoom.us/client/${version}/zoom_x86_64.pkg.tar.xz";
-      sha256 = "8QIkF5+875VFoGK6T0CROsqML6bJDG934c1gkuz8Klk=";
+      sha256 = import ./x86_64-linux-sha.nix;
     };
   };
 
@@ -76,6 +77,7 @@ let
     expat
     libdrm
     libGL
+    pipewire
     fontconfig
     freetype
     gtk3

pkgs/applications/networking/instant-messengers/zoom-us/update.sh

@@ -1,10 +1,30 @@
 #!/usr/bin/env nix-shell
-#!nix-shell -i bash -p curl pup common-updater-scripts
+#!nix-shell -i bash -p curl pup
 
 set -eu -o pipefail
 
-version="$(curl -Ls https://zoom.us/download\?os\=linux | \
+dirname="$(dirname "$0")"
-  pup '.linux-ver-text text{}' | \
-  awk -F'[ ().]' '{printf $2"."$3"."$4"."$6"\n"}')"
 
-update-source-version zoom-us "$version"
+uname="$(uname)"
+
+if [[ "$uname" == "Linux" ]]; then
+    version="$(curl -Ls https://zoom.us/download\?os\=linux | \
+      pup '.linux-ver-text text{}' | \
+      awk -F'[ ().]' '{printf $2"."$3"."$4"."$6"\n"}')"
+    printf '"%s"\n' ${version} > $dirname/x86_64-linux-version.nix
+    printf '"%s"\n' \
+        $(nix-prefetch-url https://zoom.us/client/${version}/zoom_x86_64.pkg.tar.xz) > \
+        $dirname/x86_64-linux-sha.nix
+elif [[ $uname == "Darwin" ]]; then
+    # The 1st line might be empty
+    # 2nd line is the version of the conference room application
+    version="$(curl -Ls https://zoom.us/download\?os\=mac | \
+      pup '.ver text{}' | \
+      sed '/^$/d' |\
+      head -1 | \
+      awk -F'[ ().]' '{printf $2"."$3"."$4"."$6"\n"}')"
+    printf '"%s"\n' ${version} > "$dirname/$(uname -m)-darwin-version.nix"
+    printf '"%s"\n' \
+        $(nix-prefetch-url "https://zoom.us/client/${version}/Zoom.pkg?archType=$(uname -m)") > \
+        "$dirname/$(uname -m)-darwin-sha.nix"
+fi

pkgs/applications/networking/instant-messengers/zoom-us/x86_64-darwin-sha.nix

@@ -0,0 +1 @@
+"12s4z80n1qk1vcp5vppabj6fxanm4q7pjj7mggalmjbj6984fsza"

pkgs/applications/networking/instant-messengers/zoom-us/x86_64-darwin-version.nix

@@ -0,0 +1 @@
+"5.11.1.8356"

pkgs/applications/networking/instant-messengers/zoom-us/x86_64-linux-sha.nix

@@ -0,0 +1 @@
+"1ir5akl4vrzb0b5s37s2viqisvf4sylw8rfnfj434h1q0gqz79sc"

pkgs/applications/networking/instant-messengers/zoom-us/x86_64-linux-version.nix

@@ -0,0 +1 @@
+"5.11.1.3595"

pkgs/applications/science/math/sage/default.nix

@@ -9,7 +9,7 @@
 # is always preferred, see `sage-src.nix` for that.
 
 let
-  inherit (pkgs) symlinkJoin callPackage nodePackages;
+  inherit (pkgs) symlinkJoin callPackage nodePackages lib;
 
   python3 = pkgs.python3.override {
     packageOverrides = self: super: {
@@ -46,7 +46,7 @@ let
     # just one 16x16 logo is available
     logo32 = "${sage-src}/src/doc/common/themes/sage/static/sageicon.png";
     logo64 = "${sage-src}/src/doc/common/themes/sage/static/sageicon.png";
-  };
+  } // lib.optionalAttrs withDoc { extraPaths = { "doc" = "${sagedoc}/share/doc/sage/html/en"; }; };
 
   jupyter-kernel-specs = pkgs.jupyter-kernel.create {
     definitions = pkgs.jupyter-kernel.default // {
@@ -113,6 +113,7 @@ let
     tkinter # optional, as a matplotlib backend (use with `%matplotlib tk`)
     scipy
     ipywidgets
+    notebook # for "sage -n"
     rpy2
     sphinx
     pillow

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

@@ -2,13 +2,13 @@
 
 buildGoModule rec {
   pname = "lefthook";
-  version = "1.0.0";
+  version = "1.0.4";
 
   src = fetchFromGitHub {
     rev = "v${version}";
     owner = "evilmartians";
     repo = "lefthook";
-    sha256 = "sha256-UpMzqp4NVvj/Y3OdtI5nGhJHgPIfSlopmyv7jDDpWdM=";
+    sha256 = "sha256-uaIZrxfzV2WPvnAPm6Q67yKx1EVmSMcChSxZG/Huw48=";
   };
 
   vendorSha256 = "sha256-LCBQyVSkUywceIlioYRNuRc6FrbPKuhgfw5OocR3NvI=";

pkgs/data/fonts/pretendard/default.nix

@@ -1,7 +1,7 @@
 { lib, fetchzip }:
 
 let
-  version = "1.3.0";
+  version = "1.3.3";
 
   mkPretendard = { pname, typeface, sha256 }:
     fetchzip {
@@ -10,9 +10,12 @@ let
       url = "https://github.com/orioncactus/pretendard/releases/download/v${version}/${typeface}-${version}.zip";
       inherit sha256;
 
+      stripRoot = false;
+
       postFetch = ''
-        mkdir -p $out/share/fonts/opentype
+        mkdir -p $out/share/fonts/
-        unzip -j $downloadedFile "*.otf" -d $out/share/fonts/opentype
+        install -Dm644 $out/public/static/*.otf -t $out/share/fonts/opentype
+        rm -rf $out/{public,web,LICENSE.txt}
       '';
 
       meta = with lib; {
@@ -29,18 +32,18 @@ in
   pretendard = mkPretendard {
     pname = "pretendard";
     typeface = "Pretendard";
-    sha256 = "sha256-4DM8PZjxW93sgQChs+qu5Svo+iGlFnpglu6acYMCkSQ=";
+    sha256 = "sha256-lRHRdCAg3i3+3Y6j0dCXUgwLdeS/VeI6KNkbDKchNEY=";
   };
 
   pretendard-jp = mkPretendard {
     pname = "pretendard-jp";
     typeface = "PretendardJP";
-    sha256 = "sha256-3OOUUDiurCpIGNIVjrr2KW0CB3fCXt11P+13teK5kOQ=";
+    sha256 = "sha256-VgGt/WoaaJJDAzw+gUQVgTQ+q34bdAaKUB4cA9eU0dQ=";
   };
 
   pretendard-std = mkPretendard {
     pname = "pretendard-std";
     typeface = "PretendardStd";
-    sha256 = "sha256-iVAPdA6qAiE7pseaB0NKPJBPNGdw/nT6PzXIsLajJH4=";
+    sha256 = "sha256-FOlZrr6CHPfUm9Q+Yoi0HLQUI7cAhQYq6P6sJGXBIWg=";
   };
 }

pkgs/desktops/gnome/core/gnome-control-center/default.nix

@@ -63,11 +63,11 @@
 
 stdenv.mkDerivation rec {
   pname = "gnome-control-center";
-  version = "42.2";
+  version = "42.3";
 
   src = fetchurl {
     url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz";
-    sha256 = "sha256-eLolewn73cBYh5F00Tg3p5zVnpWoSQEX5Myi5SLJ6wA=";
+    sha256 = "sha256-zgrjZQ3ir368sKfh/JkS7dtu/40lfz/lD/iynBk0HH4=";
   };
 
   patches = [

pkgs/desktops/gnome/core/gnome-software/default.nix

@@ -42,11 +42,11 @@ in
 
 stdenv.mkDerivation rec {
   pname = "gnome-software";
-  version = "42.2";
+  version = "42.3";
 
   src = fetchurl {
     url = "mirror://gnome/sources/gnome-software/${lib.versions.major version}/${pname}-${version}.tar.xz";
-    sha256 = "6ENJYyp/XQhmzlwMVi5f6oQRoF8ickRBzZqCQgRiMiQ=";
+    sha256 = "OM9whWmj12TU0NLt7KqG9Og57CK5ZvQf2tVleKDdM8A=";
   };
 
   patches = [

pkgs/development/compilers/blueprint/default.nix

@@ -9,14 +9,14 @@
 
 stdenv.mkDerivation rec {
   pname = "blueprint-compiler";
-  version = "unstable-2022-05-27";
+  version = "0.2.0";
 
   src = fetchFromGitLab {
     domain = "gitlab.gnome.org";
     owner = "jwestman";
     repo = pname;
-    rev = "cebd9ecadc53790cd547392899589dd5de0ac552";
+    rev = "v${version}";
-    sha256 = "sha256-mNR0ooJSRBIXy2E4avXYEdO1aSST+j41TsVg8+kitwo=";
+    sha256 = "sha256-LXZ6n1oCbPa0taVbUZf52mGECrzXIcF8EaMVJ30rMtc=";
   };
 
   # Requires pythonfuzz, which I've found difficult to package
@@ -25,7 +25,6 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [
     meson
     ninja
-    python3.pkgs.wrapPython
   ];
 
   buildInputs = [
@@ -37,10 +36,6 @@ stdenv.mkDerivation rec {
     gobject-introspection
   ];
 
-  postFixup = ''
-    wrapPythonPrograms
-  '';
-
   meta = with lib; {
     description = "A markup language for GTK user interface files";
     homepage = "https://gitlab.gnome.org/jwestman/blueprint-compiler";

pkgs/development/libraries/amtk/default.nix

@@ -15,13 +15,13 @@
 
 stdenv.mkDerivation rec {
   pname = "amtk";
-  version = "5.4.1";
+  version = "5.5.1";
 
   outputs = [ "out" "dev" "devdoc" ];
 
   src = fetchurl {
     url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "frq8QpsO67KzI2DJv9vjaOSJs1w83AhqhWz8mzpGanI=";
+    sha256 = "7Ilt0BfiwUNoUuXmCXD80IML0SFI1XzBvcDZOCa925w=";
   };
 
   nativeBuildInputs = [

pkgs/development/libraries/duckdb/default.nix

@@ -33,6 +33,11 @@ stdenv.mkDerivation rec {
       url = "https://github.com/duckdb/duckdb/commit/82e13a4bb9f0683af6c52468af2fb903cce4286d.patch";
       sha256 = "sha256-m0Bs0DOJQtkadbKZKk88NHyBFJkjxXUsiWYciuRIJLU=";
     })
+    (fetchpatch {
+      name = "fix-list-type-metadata.patch";
+      url = "https://github.com/duckdb/duckdb/commit/26d123fdc57273903573c72b1ddafc52f365e378.patch";
+      sha256 = "sha256-ttqs5EjeSLhZQOXc43Y5/N5IYSESQTD1FZWV1uJ15Fo=";
+    })
   ];
 
   postPatch = ''

pkgs/development/libraries/glib-networking/default.nix

@@ -18,13 +18,13 @@
 
 stdenv.mkDerivation rec {
   pname = "glib-networking";
-  version = "2.72.0";
+  version = "2.72.1";
 
   outputs = [ "out" "installedTests" ];
 
   src = fetchurl {
     url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "EAquuzaShQQd5S2kIra3FnidXk11SaOnG6WHuTLggjs=";
+    sha256 = "b8G+3IBiSE3IoCBJZZle8jZ8PbXJNAWP8WB+WiTZWnQ=";
   };
 
   patches = [

pkgs/development/libraries/libdeltachat/default.nix

@@ -17,13 +17,13 @@
 
 stdenv.mkDerivation rec {
   pname = "libdeltachat";
-  version = "1.86.0";
+  version = "1.87.0";
 
   src = fetchFromGitHub {
     owner = "deltachat";
     repo = "deltachat-core-rust";
     rev = version;
-    hash = "sha256-VLS93Ffeit2rVmXxYkXcnf8eDA3DC2/wKYZTh56QCk0=";
+    hash = "sha256-iRGLNMGs5WawzcqQb5AQTuD4NCJoBUSHfFUXXvm5+jE=";
   };
 
   patches = [
@@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
   cargoDeps = rustPlatform.fetchCargoTarball {
     inherit src;
     name = "${pname}-${version}";
-    hash = "sha256-4rpoDQ3o0WdWg/TmazTI+J0hL/MxwHcNMXWMq7GE7Tk=";
+    hash = "sha256-bmtm+cvjBIlZVRq/vjHd5Sl4FXJHP3cPp4+bWY5SKus=";
   };
 
   nativeBuildInputs = [

pkgs/development/libraries/rapidfuzz-cpp/default.nix

@@ -7,13 +7,13 @@
 
 stdenv.mkDerivation rec {
   pname = "rapidfuzz-cpp";
-  version = "1.0.3";
+  version = "1.0.4";
 
   src = fetchFromGitHub {
     owner = "maxbachmann";
     repo = "rapidfuzz-cpp";
     rev = "v${version}";
-    hash = "sha256-8SJU+ERFRGkbGBmGJa5Ypetc3LPeytg5pR4S29RkvR8=";
+    hash = "sha256-ocR88dgRo7dF7scATv8kPYmcK3R6a8DcoJfNHq1hZnM=";
   };
 
   patches = [

pkgs/development/node-packages/overrides.nix

@@ -350,7 +350,7 @@ final: prev: {
 
     src = fetchurl {
       url = "https://registry.npmjs.org/prisma/-/prisma-${version}.tgz";
-      sha512 = "sha512-MLO3JUGJpe5+EVisA/i47+zlyF8Ug0ivvGYG4B9oSXQcPiUHB1ccmnpxqR7o0Up5SQgmxkBiEU//HgR6UuIKOw==";
+      sha512 = "sha512-Dtsar03XpCBkcEb2ooGWO/WcgblDTLzGhPcustbehwlFXuTMliMDRzXsfygsgYwQoZnAUKRd1rhpvBNEUziOVw==";
     };
     postInstall = with pkgs; ''
       wrapProgram "$out/bin/prisma" \

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

@@ -19,14 +19,14 @@
 
 buildPythonPackage rec {
   pname = "boxx";
-  version = "0.10.4";
+  version = "0.10.5";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-HnEXvge1R2GAcrP+2yEecwIlT95/oKrWiK+TB9+CRxs=";
+    hash = "sha256-6qO/aPegHk+1PAu8qzIkC3fULh2WjgJcqNui+XEaLQw=";
   };
 
   propagatedBuildInputs = [

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

@@ -1,5 +1,6 @@
 { lib
 , buildPythonPackage
+, fetchpatch
 , duckdb
 , google-cloud-storage
 , mypy
@@ -13,10 +14,12 @@
 
 buildPythonPackage rec {
   pname = "duckdb";
-  inherit (duckdb) version src;
+  inherit (duckdb) version src patches;
   format = "setuptools";
 
-  sourceRoot = "source/tools/pythonpkg";
+  preConfigure = ''
+    cd tools/pythonpkg
+  '';
 
   SETUPTOOLS_SCM_PRETEND_VERSION = version;
 
@@ -45,6 +48,6 @@ buildPythonPackage rec {
     description = "Python binding for DuckDB";
     homepage = "https://duckdb.org/";
     license = licenses.mit;
-    maintainers = with maintainers; [ costrouc ];
+    maintainers = with maintainers; [ costrouc cpcloud ];
   };
 }

pkgs/development/python-modules/env-canada/default.nix

@@ -14,7 +14,7 @@
 
 buildPythonPackage rec {
   pname = "env-canada";
-  version = "0.5.23";
+  version = "0.5.24";
   format = "setuptools";
 
   disabled = pythonOlder "3.8";
@@ -23,7 +23,7 @@ buildPythonPackage rec {
     owner = "michaeldavie";
     repo = "env_canada";
     rev = "refs/tags/v${version}";
-    sha256 = "sha256-ksQQ3jujfu2XR0ZaR5fc8GNYDL8Tos+8U4OHS1mMyRY=";
+    sha256 = "sha256-R6X4TY0yrfSj30FXHmHHK6QBHAT3pb+UXjjZ3SW1SP8=";
   };
 
   propagatedBuildInputs = [

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

@@ -15,7 +15,7 @@
 
 buildPythonPackage rec {
   pname = "jarowinkler";
-  version = "1.0.4";
+  version = "1.0.5";
 
   disabled = pythonOlder "3.6";
 
@@ -25,7 +25,7 @@ buildPythonPackage rec {
     owner = "maxbachmann";
     repo = "JaroWinkler";
     rev = "v${version}";
-    hash = "sha256-2bhKl7l3ByfrtkXnXifQd/AhWVFGSMzULkzJftd1mVE=";
+    hash = "sha256-5LWJeNfQ0d8wiqjIha+CCcmBf+GU36VTYFqRlg4+6qA=";
   };
 
   nativeBuildInputs = [

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

@@ -20,7 +20,7 @@
 
 buildPythonPackage rec {
   pname = "rapidfuzz";
-  version = "2.0.15";
+  version = "2.1.0";
 
   disabled = pythonOlder "3.6";
 
@@ -30,7 +30,7 @@ buildPythonPackage rec {
     owner = "maxbachmann";
     repo = "RapidFuzz";
     rev = "v${version}";
-    hash = "sha256-wn77gA6UCgsdDf3FZgjrA5gSWpWJg3YoUhx88X7aVcM=";
+    hash = "sha256-bvuT31qxYj/agEtPIJf/6YAOe6CGpEmaKpfNocw4wYQ=";
   };
 
   nativeBuildInputs = [

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

@@ -7,28 +7,41 @@
 , requests
 , packaging
 , dparse
+, ruamel-yaml
 , pytestCheckHook
 }:
 
 buildPythonPackage rec {
   pname = "safety";
-  version = "1.10.3";
+  version = "2.0.0";
 
-  disabled = pythonOlder "3.5";
+  disabled = pythonOlder "3.6";
 
-  format = "setuptools";
+  format = "pyproject";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-MOOU0CogrEm39lKS0Z04+pJ6j5WCzf060a27xmxkGtU=";
+    sha256 = "d739d00a9e4203cfaba34540c822a73ca1d327159ed7776b3dce09391f81c35d";
   };
 
+  postPatch = ''
+    substituteInPlace safety/safety.py \
+      --replace "telemetry=True" "telemetry=False"
+    substituteInPlace safety/cli.py \
+      --replace "telemetry', default=True" "telemetry', default=False"
+  '';
+
+  nativeBuildInputs = [
+    setuptools
+  ];
+
   propagatedBuildInputs = [
     setuptools
     click
     requests
     packaging
     dparse
+    ruamel-yaml
   ];
 
   checkInputs = [
@@ -37,6 +50,7 @@ buildPythonPackage rec {
 
   # Disable tests depending on online services
   disabledTests = [
+    "test_announcements_if_is_not_tty"
     "test_check_live"
     "test_check_live_cached"
   ];
@@ -48,6 +62,7 @@ buildPythonPackage rec {
   meta = with lib; {
     description = "Checks installed dependencies for known vulnerabilities";
     homepage = "https://github.com/pyupio/safety";
+    changelog = "https://github.com/pyupio/safety/blob/${version}/CHANGELOG.md";
     license = licenses.mit;
     maintainers = with maintainers; [ thomasdesr dotlambda ];
   };

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

@@ -1,20 +1,29 @@
 { lib
 , buildPythonPackage
+, isPy27
 , fetchFromGitHub
 , selenium
+, cssselect
+, django
 , flask
+, lxml
 , pytestCheckHook
+, zope-testbrowser
 }:
 
 buildPythonPackage rec {
   pname = "splinter";
-  version = "0.17.0";
+  version = "0.18.0";
+
+  disabled = isPy27;
+
+  format = "setuptools";
 
   src = fetchFromGitHub {
     owner = "cobrateam";
     repo = "splinter";
     rev = version;
-    hash = "sha256-7QhFz/qBh2ECyeyvjCyqOYy/YrUK7KVX13VC/gem5BQ=";
+    hash = "sha256-kJ5S/fBesaxTbxCQ0yBR30+CfCV6U5jgbfDZA7eF6ac=";
   };
 
   propagatedBuildInputs = [
@@ -22,27 +31,35 @@ buildPythonPackage rec {
   ];
 
   checkInputs = [
+    cssselect
+    django
     flask
+    lxml
     pytestCheckHook
+    zope-testbrowser
   ];
 
   disabledTests = [
     # driver is present and fails with a different error during loading
+    "test_browser_local_driver_not_present"
     "test_local_driver_not_present"
   ];
 
   disabledTestPaths = [
     "samples"
-    # TODO: requires optional dependencies which should be defined in passthru.optional-dependencies.$name
+    # We run neither Chromium nor Firefox nor ...
-    "tests/test_djangoclient.py"
+    "tests/test_async_finder.py"
-    "tests/test_flaskclient.py"
+    "tests/test_html_snapshot.py"
+    "tests/test_iframes.py"
+    "tests/test_mouse_interaction.py"
     "tests/test_popups.py"
+    "tests/test_screenshot.py"
+    "tests/test_shadow_root.py"
     "tests/test_webdriver.py"
     "tests/test_webdriver_chrome.py"
     "tests/test_webdriver_edge_chromium.py"
     "tests/test_webdriver_firefox.py"
     "tests/test_webdriver_remote.py"
-    "tests/test_zopetestbrowser.py"
   ];
 
   pythonImportsCheck = [ "splinter" ];

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

@@ -7,14 +7,14 @@
 
 buildPythonPackage rec {
   pname = "stripe";
-  version = "3.4.0";
+  version = "3.5.0";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-XcN979nWXgUwItq8tlnnNisFinr3QEfuWFGKKQenYfI=";
+    hash = "sha256-CPdMrmYZ1KfXj4Fi/3K8PpyRP1PsluzV3cfYI8Lnnd0=";
   };
 
   propagatedBuildInputs = [

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

@@ -28,11 +28,11 @@
 
 buildPythonApplication rec {
   pname = "tempest";
-  version = "31.0.0";
+  version = "31.1.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-g/fpVDGa2TFAzMVvC/370bStPJvhWSZ2tkbmP54nzc4=";
+    sha256 = "sha256-EaDFnIxaAGBDViAVzMjZev3jXmb3NIlMlcg4BiwoAq4=";
   };
 
   propagatedBuildInputs = [

pkgs/development/python-modules/ua-parser/default.nix

@@ -7,7 +7,7 @@
 
 buildPythonPackage rec {
   pname = "ua-parser";
-  version = "0.10.0";
+  version = "0.15.0";
 
   format = "setuptools";
 
@@ -16,13 +16,18 @@ buildPythonPackage rec {
     repo = "uap-python";
     rev = version;
     fetchSubmodules = true;
-    hash = "sha256-kaTAfUtHj2vH7i7eIU61efuB4/XVHoc/z6o3ny+sgrQ=";
+    hash = "sha256-CwwVaToy5se5dZ4m1EHn8qgvprK82/Sgpos4lHedIUc=";
   };
 
   patches = [
     ./dont-fetch-submodule.patch
   ];
 
+  postPatch = ''
+    substituteInPlace setup.py \
+      --replace "pyyaml ~= 5.4.0" pyyaml
+  '';
+
   nativeBuildInputs = [
     pyyaml
   ];

pkgs/development/python-modules/zope-cachedescriptors/default.nix

@@ -0,0 +1,40 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, setuptools
+, pytestCheckHook
+}:
+
+buildPythonPackage rec {
+  pname = "zope-cachedescriptors";
+  version = "4.3.1";
+
+  format = "setuptools";
+
+  src = fetchPypi {
+    pname = "zope.cachedescriptors";
+    inherit version;
+    sha256 = "1f4d1a702f2ea3d177a1ffb404235551bb85560100ec88e6c98691734b1d194a";
+  };
+
+  propagatedBuildInputs = [
+    setuptools
+  ];
+
+  checkInputs = [
+    pytestCheckHook
+  ];
+
+  pytestFlagsArray = [
+    "src/zope/cachedescriptors/tests.py"
+  ];
+
+  pythonImportsCheck = [ "zope.cachedescriptors" ];
+
+  meta = {
+    description = "Method and property caching decorators";
+    homepage = "https://github.com/zopefoundation/zope.cachedescriptors";
+    license = lib.licenses.zpl21;
+    maintainers = with lib.maintainers; [ dotlambda ];
+  };
+}

pkgs/development/python-modules/zope-testbrowser/default.nix

@@ -0,0 +1,75 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, setuptools
+, zope_interface
+, zope_schema
+, zope-cachedescriptors
+, pytz
+, webtest
+, beautifulsoup4
+, soupsieve
+, wsgiproxy2
+, six
+, mock
+, zope_testing
+, zope_testrunner
+, python
+}:
+
+buildPythonPackage rec {
+  pname = "zope-testbrowser";
+  version = "5.6.1";
+
+  format = "setuptools";
+
+  src = fetchPypi {
+    pname = "zope.testbrowser";
+    inherit version;
+    sha256 = "035bf63d9f7244e885786c3327448a7d9fff521dba596429698b8474961b05e7";
+  };
+
+  postPatch = ''
+    # remove test that requires network access
+    substituteInPlace src/zope/testbrowser/tests/test_doctests.py \
+      --replace "suite.addTests(wire)" ""
+  '';
+
+  propagatedBuildInputs = [
+    setuptools
+    zope_interface
+    zope_schema
+    zope-cachedescriptors
+    pytz
+    webtest
+    beautifulsoup4
+    soupsieve
+    wsgiproxy2
+    six
+  ];
+
+  checkInputs = [
+    mock
+    zope_testing
+    zope_testrunner
+  ];
+
+  checkPhase = ''
+    ${python.interpreter} -m zope.testrunner --test-path=src
+  '';
+
+  pythonImportsCheck = [
+    "zope.testbrowser"
+    "zope.testbrowser.browser"
+    "zope.testbrowser.interfaces"
+    "zope.testbrowser.testing"
+    "zope.testbrowser.wsgi"
+  ];
+
+  meta = {
+    description = "Programmable browser for functional black-box tests";
+    homepage = "https://github.com/zopefoundation/zope.testbrowser";
+    license = lib.licenses.zpl21;
+    maintainers = with lib.maintainers; [ dotlambda ];
+  };
+}

pkgs/development/tools/analysis/rizin/cutter.nix

@@ -11,13 +11,13 @@
 
 mkDerivation rec {
   pname = "cutter";
-  version = "2.0.5";
+  version = "2.1.0";
 
   src = fetchFromGitHub {
     owner = "rizinorg";
     repo = "cutter";
     rev = "v${version}";
-    sha256 = "sha256-ljws9S7ZxZK/Ou8jgGSoR++vtzFTEBywHMhCC/UOLEs=";
+    sha256 = "sha256-JfJQuEUeLXCjzm4d0ZNHRVazF0Bk6fVAsNvBb+okoXs=";
     fetchSubmodules = true;
   };
 

pkgs/development/tools/analysis/rizin/default.nix

@@ -23,11 +23,11 @@
 
 stdenv.mkDerivation rec {
   pname = "rizin";
-  version = "0.3.4";
+  version = "0.4.0";
 
   src = fetchurl {
     url = "https://github.com/rizinorg/rizin/releases/download/v${version}/rizin-src-v${version}.tar.xz";
-    sha256 = "sha256-7qSbOWOHwJ0ZcFqrAqYXzbFWgvymfxAf8rJ+75SnEOk=";
+    sha256 = "sha256-CeuoaE/oE89Cpxa1mobT1lr84BPX6LJ14UXoSdM2a1o=";
   };
 
   mesonFlags = [

pkgs/development/tools/aws-sam-cli/default.nix

@@ -48,6 +48,7 @@ python3.pkgs.buildPythonApplication rec {
     substituteInPlace requirements/base.txt \
       --replace "aws_lambda_builders==" "aws-lambda-builders #" \
       --replace "click~=7.1" "click~=8.1" \
+      --replace "cookiecutter~=1.7.2" "cookiecutter>=1.7.2" \
       --replace "dateparser~=1.0" "dateparser>=0.7" \
       --replace "docker~=4.2.0" "docker>=4.2.0" \
       --replace "Flask~=1.1.2" "Flask~=2.0" \

pkgs/development/tools/database/prisma-engines/default.nix

@@ -13,19 +13,19 @@
 # function correctly.
 rustPlatform.buildRustPackage rec {
   pname = "prisma-engines";
-  version = "3.15.1";
+  version = "4.0.0";
 
   src = fetchFromGitHub {
     owner = "prisma";
     repo = "prisma-engines";
     rev = version;
-    sha256 = "sha256-p636B8NUu/XncHLTQTiAYfvBaMbiopLVRwGrFf45BW8=";
+    sha256 = "sha256-TlKjAfpygQq2c77d6ZoMIBtWC0bAiMiKygFkh5GrBBc=";
   };
 
   # Use system openssl.
   OPENSSL_NO_VENDOR = 1;
 
-  cargoSha256 = "sha256-miDdP4kokRwhR9tif6llI1PI+F4O6tC4pAWucRRyLNQ=";
+  cargoSha256 = "sha256-//Kis4lDi3SxeptCCnLi/GWPj+Kyay2pQbILYnlEkXE=";
 
   nativeBuildInputs = [ pkg-config ];
 

pkgs/development/tools/go-langserver/default.nix

@@ -1,24 +0,0 @@
-{ lib, buildGoPackage, fetchFromGitHub }:
-
-buildGoPackage rec {
-  pname = "go-langserver";
-  version = "2.0.0";
-
-  goPackagePath = "github.com/sourcegraph/go-langserver";
-  subPackages = [ "." ];
-
-  src = fetchFromGitHub {
-    rev = "v${version}";
-    owner = "sourcegraph";
-    repo = "go-langserver";
-    sha256 = "1wv7xf81s3qi8xydxjkkp8vacdzrq8sbj04346fz73nsn85z0sgp";
-  };
-
-  meta = with lib; {
-    description = "A Go language server protocol server";
-    homepage = "https://github.com/sourcegraph/go-langserver";
-    license = licenses.mit;
-    maintainers = with maintainers; [ johnchildren ];
-    platforms = platforms.unix;
-  };
-}

pkgs/development/tools/gosca/default.nix

@@ -1,34 +0,0 @@
-{ lib
-, buildGoModule
-, fetchFromGitHub
-, gosca
-, testers
-}:
-
-buildGoModule rec {
-  pname = "gosca";
-  version = "0.4.2";
-
-  src = fetchFromGitHub {
-    owner = "TARI0510";
-    repo = pname;
-    rev = "v${version}";
-    hash = "sha256-mjQSYkcLl9X3IPv0liX26hvystsQOSVXvovKp4VekAY=";
-  };
-
-  vendorSha256 = "sha256-0EqMW4aNYPZEuk+mxmLTuenGdam56YneEad8lodVeBo=";
-
-  passthru.tests.version = testers.testVersion {
-    package = gosca;
-    command = "gosca -v";
-    version = "GoSCA_v${version}";
-  };
-
-  meta = with lib; {
-    description = "Golang dependence security checker";
-    homepage = "https://github.com/TARI0510/gosca";
-    changelog = "https://github.com/TARI0510/gosca/releases/tag/v${version}";
-    license = licenses.mit;
-    maintainers = with maintainers; [ fab ];
-  };
-}

pkgs/development/tools/revive/default.nix

@@ -0,0 +1,53 @@
+{ buildGoModule, fetchFromGitHub, lib }:
+
+buildGoModule rec {
+  pname = "revive";
+  version = "1.2.1";
+
+  src = fetchFromGitHub {
+    owner = "mgechev";
+    repo = pname;
+    rev = "v${version}";
+    sha256 = "sha256-xZakVuw+QKzFh6wsnZbltLEEwyb9WcMvVWEzKnS9aWc=";
+    # 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;
+    postFetch = ''
+      date -u -d "@$(git -C $out log -1 --pretty=%ct)" "+%Y-%m-%d %H:%M UTC" > $out/DATE
+      git -C $out rev-parse HEAD > $out/COMMIT
+      rm -rf $out/.git
+    '';
+  };
+  vendorSha256 = "sha256-Fpl5i+qMvJ/CDh8X0gps9C/BxF7/Uvln+3DpVOXE0WQ=";
+
+  ldflags = [
+    "-s"
+    "-w"
+    "-X github.com/mgechev/revive/cli.version=${version}"
+    "-X github.com/mgechev/revive/cli.builtBy=nix"
+  ];
+
+  # ldflags based on metadata from git and source
+  preBuild = ''
+    ldflags+=" -X github.com/mgechev/revive/cli.commit=$(cat COMMIT)"
+    ldflags+=" -X 'github.com/mgechev/revive/cli.date=$(cat DATE)'"
+  '';
+
+  # The following tests fail when built by nix:
+  #
+  # $ nix log /nix/store/build-revive.1.2.1.drv | grep FAIL
+  #
+  # --- FAIL: TestAll (0.01s)
+  # --- FAIL: TestTimeEqual (0.00s)
+  # --- FAIL: TestTimeNaming (0.00s)
+  # --- FAIL: TestUnhandledError (0.00s)
+  # --- FAIL: TestUnhandledErrorWithBlacklist (0.00s)
+  doCheck = false;
+
+  meta = with lib; {
+    description = "Fast, configurable, extensible, flexible, and beautiful linter for Go";
+    homepage = "https://revive.run";
+    license = licenses.mit;
+    maintainers = with maintainers; [ maaslalani ];
+  };
+}

pkgs/servers/mail/exim/default.nix

@@ -1,4 +1,4 @@
-{ coreutils, db, fetchurl, openssl, pcre, perl, pkg-config, lib, stdenv
+{ coreutils, db, fetchurl, openssl, pcre2, perl, pkg-config, lib, stdenv
 , enableLDAP ? false, openldap
 , enableMySQL ? false, libmysqlclient, zlib
 , enableAuthDovecot ? false, dovecot
@@ -10,15 +10,15 @@
 
 stdenv.mkDerivation rec {
   pname = "exim";
-  version = "4.95";
+  version = "4.96";
 
   src = fetchurl {
     url = "https://ftp.exim.org/pub/exim/exim4/${pname}-${version}.tar.xz";
-    sha256 = "0rzi0kc3qiiaw8vnv5qrpwdvvh4sr5chns026xy99spjzx9vd76c";
+    hash = "sha256-KZpWknsus0d9qv08W9oCvGflxOWJinrq8nQIdSeM8aM=";
   };
 
   nativeBuildInputs = [ pkg-config ];
-  buildInputs = [ coreutils db openssl perl pcre ]
+  buildInputs = [ coreutils db openssl perl pcre2 ]
     ++ lib.optional enableLDAP openldap
     ++ lib.optionals enableMySQL [ libmysqlclient zlib ]
     ++ lib.optional enableAuthDovecot dovecot

pkgs/tools/misc/audible-cli/default.nix

@@ -2,21 +2,21 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "audible-cli";
-  version = "0.1.3";
+  version = "0.2.0";
 
   src = fetchFromGitHub {
     owner = "mkb79";
     repo = pname;
     rev = "v${version}";
-    sha256 = "0i71vwq2bhndndb0mlx21bc5jkv75cr60max5iaxk23agg3xpgwv";
+    sha256 = "1dalil8aaywdshf48d45ap4mgzxbyzhklr8nga7qhpwi22w84cgz";
   };
 
-  propagatedBuildInputs = with python3Packages; [ aiofiles audible click httpx pillow tabulate toml tqdm packaging setuptools ];
+  propagatedBuildInputs = with python3Packages; [ aiofiles audible click httpx pillow tabulate toml tqdm packaging setuptools questionary ];
 
   postPatch = ''
     substituteInPlace setup.py \
-      --replace "httpx==0.20.*" "httpx" \
+      --replace "httpx>=0.20.0,<0.24.0" "httpx" \
-      --replace "audible==0.7.2" "audible"
+      --replace "audible>=0.8.2" "audible"
   '';
 
   meta = with lib; {

pkgs/tools/misc/lesspipe/default.nix

@@ -1,34 +1,37 @@
-{ lib, stdenv, fetchFromGitHub, substituteAll, perl, file, ncurses, bash }:
+{ lib, stdenv, fetchFromGitHub, substituteAll, makeWrapper, perl, procps, file, gnused, bash }:
 
 stdenv.mkDerivation rec {
   pname = "lesspipe";
-  version = "1.85";
+  version = "2.05";
-
-  nativeBuildInputs = [ perl ];
-  buildInputs = [ perl bash ];
-  strictDeps = true;
-  preConfigure = ''
-    patchShebangs --build configure
-  '';
-  configureFlags = [ "--shell=${bash}/bin/bash" "--yes" ];
-  configurePlatforms = [];
-  dontBuild = true;
 
   src = fetchFromGitHub {
     owner = "wofr06";
     repo = "lesspipe";
-    rev = version;
+    rev = "v${version}";
-    sha256 = "1v1jdkdq1phc93gdr6mjlk98gipxrkkq4bj8kks0kfdvjgdwkdaa";
+    sha256 = "sha256-mRgOndoDpyMnlj/BIoqwpZzuth4eA6yoB2VFZOigRw4=";
   };
 
-  patches = [
+  nativeBuildInputs = [ perl makeWrapper ];
-    (substituteAll {
+  buildInputs = [ perl bash ];
-      src = ./fix-paths.patch;
+  strictDeps = true;
-      file = "${file}/bin/file";
+
-      tput = "${ncurses}/bin/tput";
+  postPatch = ''
-    })
+    patchShebangs --build configure
-    ./override-shell-detection.patch
+    substituteInPlace configure --replace '/etc/bash_completion.d' '/share/bash-completion/completions'
-  ];
+  '';
+
+  configureFlags = [ "--shell=${bash}/bin/bash" "--prefix=/" ];
+  configurePlatforms = [ ];
+
+  dontBuild = true;
+
+  installFlags = [ "DESTDIR=$(out)" ];
+
+  postInstall = ''
+    for f in lesspipe.sh lesscomplete; do
+      wrapProgram "$out/bin/$f" --prefix-each PATH : "${lib.makeBinPath [ file gnused procps ]}"
+    done
+  '';
 
   meta = with lib; {
     description = "A preprocessor for less";

pkgs/tools/misc/lesspipe/fix-paths.patch

@@ -1,22 +0,0 @@
---- a/lesspipe.sh.in
-+++ b/lesspipe.sh.in
-@@ -48,8 +48,8 @@ if [[ "$LESS_ADVANCED_PREPROCESSOR" = '' ]]; then
- fi
- 
- filecmd() {
--  file -L -s "$@"
--  file -L -s -i "$@" 2> /dev/null | sed -n 's/.*charset=/;/p' | tr a-z A-Z
-+  @file@ -L -s "$@"
-+  @file@ -L -s -i "$@" 2> /dev/null | sed -n 's/.*charset=/;/p' | tr a-z A-Z
- }
- 
- sep=:						# file name separator
-@@ -546,7 +546,7 @@ isfinal() {
- 
-   # color requires -r or -R when calling less
-   typeset COLOR
--  if [[ $(tput colors) -ge 8 && ("$LESS" = *-*r* || "$LESS" = *-*R*) ]]; then
-+  if [[ $(@tput@ colors) -ge 8 && ("$LESS" = *-*r* || "$LESS" = *-*R*) ]]; then
-     COLOR="--color=always"
-   fi
- 

pkgs/tools/misc/lesspipe/override-shell-detection.patch

@@ -1,12 +0,0 @@
---- a/configure
-+++ b/configure
-@@ -101,7 +101,8 @@
- open OUT, ">lesspipe.sh.tmp";
- my $in = 1;
- my $anyin;
--my $shell = check_shell_vers();
-+my $shell = $opt_shell;
-+print OUT "#!$shell\n";
- # ask if syntax highlighting should be included
- $ifsyntax = '';
- if ($opt_yes) {

pkgs/tools/misc/ytfzf/default.nix

@@ -2,7 +2,6 @@
 , stdenv
 , fetchFromGitHub
 , makeWrapper
-, chafa
 , coreutils
 , curl
 , dmenu
@@ -16,13 +15,13 @@
 
 stdenv.mkDerivation rec {
   pname = "ytfzf";
-  version = "2.3";
+  version = "2.4.0";
 
   src = fetchFromGitHub {
     owner = "pystardust";
     repo = "ytfzf";
     rev = "v${version}";
-    hash = "sha256-zfoICi1VChmrRHZ3dSHGTcXkVf/zirQTycFz98xj+QY=";
+    hash = "sha256-IQ6YIHcFriqLAGoB8QhvWiYkI7Aq4RL12TL3c/N+YqE=";
   };
 
   nativeBuildInputs = [ makeWrapper ];
@@ -39,7 +38,7 @@ stdenv.mkDerivation rec {
   postInstall = ''
     wrapProgram "$out/bin/ytfzf" \
       --prefix PATH : ${lib.makeBinPath [
-        chafa coreutils curl dmenu fzf gnused jq mpv ueberzug yt-dlp
+        coreutils curl dmenu fzf gnused jq mpv ueberzug yt-dlp
       ]} \
       --set YTFZF_SYSTEM_ADDON_DIR "$out/share/ytfzf/addons"
   '';

pkgs/top-level/aliases.nix

@@ -530,8 +530,10 @@ mapAliases ({
   google-gflags = gflags; # Added 2019-07-25
   google-musicmanager = throw "google-musicmanager has been removed because Google Play Music was discontinued"; # Added 2021-03-07
   google-music-scripts = throw "google-music-scripts has been removed because Google Play Music was discontinued"; # Added 2021-03-07
+  gosca = throw "gosca has been dropped due to the lack of maintanence from upstream since 2018"; # Added 2022-06-30
   gotags = throw "gotags has been dropped due to the lack of maintenance from upstream since 2018"; # Added 2022-06-03
   google-play-music-desktop-player = throw "GPMDP shows a black screen, upstream homepage is dead, use 'ytmdesktop' instead"; # Added 2022-06-16
+  go-langserver = throw "go-langserver has been replaced by gopls"; # Added 2022-06-30
   go-mk = throw "go-mk has been dropped due to the lack of maintanence from upstream since 2015"; # Added 2022-06-02
   go-pup = throw "'go-pup' has been renamed to/replaced by 'pup'"; # Converted to throw 2022-02-22
   go-repo-root = throw "go-repo-root has been dropped due to the lack of maintanence from upstream since 2014"; # Added 2022-06-02

pkgs/top-level/all-packages.nix

@@ -2584,8 +2584,6 @@ with pkgs;
     buildGoModule = buildGo118Module;
   };
 
-  gosca = callPackage ../development/tools/gosca { };
-
   gosh = callPackage ../tools/security/gosh { };
 
   gospider = callPackage ../tools/security/gospider { };
@@ -16391,6 +16389,10 @@ with pkgs;
 
   reviewdog = callPackage ../development/tools/misc/reviewdog { };
 
+  revive = callPackage ../development/tools/revive {
+    buildGoModule = buildGo118Module;
+  };
+
   rman = callPackage ../development/tools/misc/rman { };
 
   rnix-lsp = callPackage ../development/tools/rnix-lsp { };
@@ -23890,8 +23892,6 @@ with pkgs;
 
   gomodifytags = callPackage ../development/tools/gomodifytags { };
 
-  go-langserver = callPackage ../development/tools/go-langserver { };
-
   gopls = callPackage ../development/tools/gopls {
     buildGoModule = buildGo118Module;
   };

pkgs/top-level/python-packages.nix

@@ -11637,6 +11637,8 @@ in {
 
   zope_broken = callPackage ../development/python-modules/zope_broken { };
 
+  zope-cachedescriptors = callPackage ../development/python-modules/zope-cachedescriptors { };
+
   zope_component = callPackage ../development/python-modules/zope_component { };
 
   zope_configuration = callPackage ../development/python-modules/zope_configuration { };
@@ -11673,6 +11675,8 @@ in {
 
   zope_size = callPackage ../development/python-modules/zope_size { };
 
+  zope-testbrowser = callPackage ../development/python-modules/zope-testbrowser { };
+
   zope_testing = callPackage ../development/python-modules/zope_testing { };
 
   zope_testrunner = callPackage ../development/python-modules/zope_testrunner { };