Merge master into haskell-updates

doc/stdenv/meta.chapter.md

@@ -11,58 +11,12 @@ meta = with lib; {
   '';
   homepage = "https://www.gnu.org/software/hello/manual/";
   license = licenses.gpl3Plus;
-  maintainers = [ maintainers.eelco ];
+  maintainers = with maintainers; [ eelco ];
   platforms = platforms.all;
 };
 ```
 
-Meta-attributes are not passed to the builder of the package. Thus, a change to a meta-attribute doesn’t trigger a recompilation of the package. The value of a meta-attribute must be a string.
+Meta-attributes are not passed to the builder of the package. Thus, a change to a meta-attribute doesn’t trigger a recompilation of the package.
-
-The meta-attributes of a package can be queried from the command-line using `nix-env`:
-
-```ShellSession
-$ nix-env -qa hello --json
-{
-    "hello": {
-        "meta": {
-            "description": "A program that produces a familiar, friendly greeting",
-            "homepage": "https://www.gnu.org/software/hello/manual/",
-            "license": {
-                "fullName": "GNU General Public License version 3 or later",
-                "shortName": "GPLv3+",
-                "url": "http://www.fsf.org/licensing/licenses/gpl.html"
-            },
-            "longDescription": "GNU Hello is a program that prints \"Hello, world!\" when you run it.\nIt is fully customizable.\n",
-            "maintainers": [
-                "Ludovic Court\u00e8s <ludo@gnu.org>"
-            ],
-            "platforms": [
-                "i686-linux",
-                "x86_64-linux",
-                "armv5tel-linux",
-                "armv7l-linux",
-                "mips32-linux",
-                "x86_64-darwin",
-                "i686-cygwin",
-                "i686-freebsd13",
-                "x86_64-freebsd13",
-                "i686-openbsd",
-                "x86_64-openbsd"
-            ],
-            "position": "/home/user/dev/nixpkgs/pkgs/applications/misc/hello/default.nix:14"
-        },
-        "name": "hello-2.9",
-        "system": "x86_64-linux"
-    }
-}
-```
-
-`nix-env` knows about the `description` field specifically:
-
-```ShellSession
-$ nix-env -qa hello --description
-hello-2.3  A program that produces a familiar, friendly greeting
-```
 
 ## Standard meta-attributes {#sec-standard-meta-attributes}
 

maintainers/maintainer-list.nix

@@ -10878,6 +10878,16 @@
       fingerprint = "5D69 CF04 B7BC 2BC1 A567  9267 00BC F29B 3208 0700";
     }];
   };
+  phdcybersec = {
+    name = "Léo Lavaur";
+    email = "phdcybersec@pm.me";
+
+    github = "phdcybersec";
+    githubId = 82591009;
+    keys = [{
+      fingerprint = "7756 E88F 3C6A 47A5 C5F0  CDFB AB54 6777 F93E 20BF";
+    }];
+  };
   phfroidmont = {
     name = "Paul-Henri Froidmont";
     email = "nix.contact-j9dw4d@froidmont.org";

nixos/doc/manual/from_md/release-notes/rl-2305.section.xml

@@ -70,6 +70,46 @@
           deprecation</link>.
         </para>
       </listitem>
+      <listitem>
+        <para>
+          The
+          <link linkend="opt-services.snapserver.openFirewall">services.snapserver.openFirewall</link>
+          module option default value has been changed from
+          <literal>true</literal> to <literal>false</literal>. You will
+          need to explicitely set this option to
+          <literal>true</literal>, or configure your firewall.
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          The
+          <link linkend="opt-services.avahi.openFirewall">services.avahi.openFirewall</link>
+          module option default value has been changed from
+          <literal>true</literal> to <literal>false</literal>. You will
+          need to explicitely set this option to
+          <literal>true</literal>, or configure your firewall.
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          The
+          <link linkend="opt-services.tmate-ssh-server.openFirewall">services.tmate-ssh-server.openFirewall</link>
+          module option default value has been changed from
+          <literal>true</literal> to <literal>false</literal>. You will
+          need to explicitely set this option to
+          <literal>true</literal>, or configure your firewall.
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          The
+          <link linkend="opt-services.unifi-video.openFirewall">services.unifi-video.openFirewall</link>
+          module option default value has been changed from
+          <literal>true</literal> to <literal>false</literal>. You will
+          need to explicitely set this option to
+          <literal>true</literal>, or configure your firewall.
+        </para>
+      </listitem>
       <listitem>
         <para>
           The EC2 image module previously detected and automatically

nixos/doc/manual/release-notes/rl-2305.section.md

@@ -27,6 +27,14 @@ In addition to numerous new and upgraded packages, this release has the followin
 
 - `services.sourcehut.dispatch` and the corresponding package (`sourcehut.dispatchsrht`) have been removed due to [upstream deprecation](https://sourcehut.org/blog/2022-08-01-dispatch-deprecation-plans/).
 
+- The [services.snapserver.openFirewall](#opt-services.snapserver.openFirewall) module option default value has been changed from `true` to `false`. You will need to explicitely set this option to `true`, or configure your firewall.
+
+- The [services.avahi.openFirewall](#opt-services.avahi.openFirewall) module option default value has been changed from `true` to `false`. You will need to explicitely set this option to `true`, or configure your firewall.
+
+- The [services.tmate-ssh-server.openFirewall](#opt-services.tmate-ssh-server.openFirewall) module option default value has been changed from `true` to `false`. You will need to explicitely set this option to `true`, or configure your firewall.
+
+- The [services.unifi-video.openFirewall](#opt-services.unifi-video.openFirewall) module option default value has been changed from `true` to `false`. You will need to explicitely set this option to `true`, or configure your firewall.
+
 - The EC2 image module previously detected and automatically mounted ext3-formatted instance store devices and partitions in stage-1 (initramfs), storing `/tmp` on the first discovered device. This behaviour, which only catered to very specific use cases and could not be disabled, has been removed. Users relying on this should provide their own implementation, and probably use ext4 and perform the mount in stage-2.
 
 - The EC2 image module previously detected and activated swap-formatted instance store devices and partitions in stage-1 (initramfs). This behaviour has been removed. Users relying on this should provide their own implementation.

nixos/modules/config/no-x-libs.nix

@@ -33,6 +33,8 @@ with lib;
       ffmpeg_4 = super.ffmpeg_4.override { sdlSupport = false; vdpauSupport = false; };
       ffmpeg_5 = super.ffmpeg_5.override { sdlSupport = false; vdpauSupport = false; };
       gobject-introspection = super.gobject-introspection.override { x11Support = false; };
+      imagemagick = super.imagemagick.override { libX11Support = false; libXtSupport = false; };
+      imagemagickBig = super.imagemagickBig.override { libX11Support = false; libXtSupport = false; };
       libva = super.libva-minimal;
       networkmanager-fortisslvpn = super.networkmanager-fortisslvpn.override { withGnome = false; };
       networkmanager-iodine = super.networkmanager-iodine.override { withGnome = false; };
@@ -42,6 +44,7 @@ with lib;
       networkmanager-sstp = super.networkmanager-vpnc.override { withGnome = false; };
       networkmanager-vpnc = super.networkmanager-vpnc.override { withGnome = false; };
       qemu = super.qemu.override { gtkSupport = false; spiceSupport = false; sdlSupport = false; };
+      zbar = super.zbar.override { enableVideo = false; withXorg = false; };
     }));
   };
 }

nixos/modules/installer/cd-dvd/channel.nix

@@ -6,6 +6,12 @@
 with lib;
 
 let
+  # This is copied into the installer image, so it's important that it is filtered
+  # to avoid including a large .git directory.
+  # We also want the source name to be normalised to "source" to avoid depending on the
+  # location of nixpkgs.
+  # In the future we might want to expose the ISO image from the flake and use
+  # `self.outPath` directly instead.
   nixpkgs = lib.cleanSource pkgs.path;
 
   # We need a copy of the Nix expressions for Nixpkgs and NixOS on the
@@ -31,7 +37,14 @@ let
 in
 
 {
-  nix.registry.nixpkgs.flake.outPath = builtins.path { name = "source"; path = pkgs.path; };
+  # Pin the nixpkgs flake in the installer to our cleaned up nixpkgs source.
+  # FIXME: this might be surprising and is really only needed for offline installations,
+  # see discussion in https://github.com/NixOS/nixpkgs/pull/204178#issuecomment-1336289021
+  nix.registry.nixpkgs.to = {
+    type = "path";
+    path = nixpkgs;
+  };
+
   # Provide the NixOS/Nixpkgs sources in /etc/nixos.  This is required
   # for nixos-install.
   boot.postBootCommands = mkAfter

nixos/modules/services/audio/snapserver.nix

@@ -101,9 +101,7 @@ in {
 
       openFirewall = mkOption {
         type = types.bool;
-        # Make the behavior consistent with other services. Set the default to
+        default = false;
-        # false and remove the accompanying warning after NixOS 22.05 is released.
-        default = true;
         description = lib.mdDoc ''
           Whether to automatically open the specified ports in the firewall.
         '';
@@ -279,12 +277,7 @@ in {
       # https://github.com/badaix/snapcast/blob/98ac8b2fb7305084376607b59173ce4097c620d8/server/streamreader/stream_manager.cpp#L85
       filter (w: w != "") (mapAttrsToList (k: v: if v.type == "spotify" then ''
         services.snapserver.streams.${k}.type = "spotify" is deprecated, use services.snapserver.streams.${k}.type = "librespot" instead.
-      '' else "") cfg.streams)
+      '' else "") cfg.streams);
-      # Remove this warning after NixOS 22.05 is released.
-      ++ optional (options.services.snapserver.openFirewall.highestPrio >= (mkOptionDefault null).priority) ''
-        services.snapserver.openFirewall will no longer default to true starting with NixOS 22.11.
-        Enable it explicitly if you need to control Snapserver remotely.
-      '';
 
     systemd.services.snapserver = {
       after = [ "network.target" ];

nixos/modules/services/mail/mailman.nix

@@ -443,7 +443,7 @@ in {
       virtualHosts = lib.genAttrs cfg.webHosts (webHost: {
         locations = {
           ${cfg.serve.virtualRoot}.extraConfig = "uwsgi_pass unix:/run/mailman-web.socket;";
-          "${cfg.serve.virtualRoot}/static/".alias = webSettings.STATIC_ROOT + "/";
+          "${removeSuffix "/" cfg.serve.virtualRoot}/static/".alias = webSettings.STATIC_ROOT + "/";
         };
       });
     };

nixos/modules/services/networking/avahi-daemon.nix

@@ -103,7 +103,7 @@ in
 
     openFirewall = mkOption {
       type = types.bool;
-      default = true;
+      default = false;
       description = lib.mdDoc ''
         Whether to open the firewall for UDP port 5353.
       '';

nixos/modules/services/networking/tmate-ssh-server.nix

@@ -44,7 +44,7 @@ in
 
     openFirewall = mkOption {
       type = types.bool;
-      default = true;
+      default = false;
       description = mdDoc "Whether to automatically open the specified ports in the firewall.";
     };
 

nixos/modules/services/video/unifi-video.nix

@@ -148,7 +148,7 @@ in
 
     openFirewall = mkOption {
       type = types.bool;
-      default = true;
+      default = false;
       description = lib.mdDoc ''
         Whether or not to open the required ports on the firewall.
       '';

nixos/modules/system/boot/networkd.nix

@@ -1902,6 +1902,20 @@ in
     };
 
     systemd.network.wait-online = {
+      enable = mkOption {
+        type = types.bool;
+        default = true;
+        example = false;
+        description = lib.mdDoc ''
+          Whether to enable the systemd-networkd-wait-online service.
+
+          systemd-networkd-wait-online can timeout and fail if there are no network interfaces
+          available for it to manage. When systemd-networkd is enabled but a different service is
+          responsible for managing the system's internet connection (for example, NetworkManager or
+          connman are used to manage WiFi connections), this service is unnecessary and can be
+          disabled.
+        '';
+      };
       anyInterface = mkOption {
         description = lib.mdDoc ''
           Whether to consider the network online when any interface is online, as opposed to all of them.
@@ -1983,6 +1997,7 @@ in
       };
 
       systemd.services.systemd-networkd-wait-online = {
+        inherit (cfg.wait-online) enable;
         wantedBy = [ "network-online.target" ];
         serviceConfig.ExecStart = [
           ""

nixos/tests/bazarr.nix

@@ -17,9 +17,6 @@ in
         listenPort = port;
       };
       nixpkgs.config.allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) ["unrar"];
-      # Workaround for https://github.com/morpheus65535/bazarr/issues/1983
-      # ("Crash when running without timezone info").
-      time.timeZone = "UTC";
     };
 
   testScript = ''

pkgs/applications/editors/jetbrains/default.nix

@@ -252,7 +252,9 @@ let
     }).overrideAttrs (attrs: {
       postPatch = lib.optionalString (!stdenv.isDarwin) (attrs.postPatch + ''
         interp="$(cat $NIX_CC/nix-support/dynamic-linker)"
-        patchelf --set-interpreter $interp lib/ReSharperHost/linux-x64/Rider.Backend
+        patchelf --set-interpreter $interp \
+          lib/ReSharperHost/linux-x64/Rider.Backend \
+          plugins/dotCommon/DotFiles/linux-x64/JetBrains.Profiler.PdbServer
 
         rm -rf lib/ReSharperHost/linux-x64/dotnet
         ln -s ${dotnet-sdk_6} lib/ReSharperHost/linux-x64/dotnet

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

@@ -1,40 +1,34 @@
-{ rustPlatform
+{ lib
-, runCommand
+, rustPlatform
-, lib
+, clangStdenv
 , fetchFromGitHub
+, linkFarm
 , fetchgit
-, fetchurl
+, runCommand
+, gn
+, ninja
 , makeWrapper
 , pkg-config
-, python2
 , python3
-, openssl
+, removeReferencesTo
+, xcbuild
 , SDL2
 , fontconfig
-, freetype
+, xorg
-, ninja
+, stdenv
-, gn
+, darwin
-, llvmPackages
-, makeFontsConf
 , libglvnd
 , libxkbcommon
-, stdenv
 , enableWayland ? stdenv.isLinux
 , wayland
-, xorg
-, xcbuild
-, Security
-, ApplicationServices
-, AppKit
-, Carbon
-, removeReferencesTo
 }:
-rustPlatform.buildRustPackage rec {
+
+rustPlatform.buildRustPackage.override { stdenv = clangStdenv; } rec {
   pname = "neovide";
   version = "0.10.3";
 
   src = fetchFromGitHub {
-    owner = "Kethku";
+    owner = "neovide";
     repo = "neovide";
     rev = version;
     sha256 = "sha256-CcBiCcfOJzuq0DnokTUHpMdo7Ry29ugQ+N7Hk0R+cQE=";
@@ -52,35 +46,24 @@ rustPlatform.buildRustPackage rec {
         sha256 = "sha256-w5dw/lGm40gKkHPR1ji/L82Oa808Kuh8qaCeiqBLkLw=";
       };
       # The externals for skia are taken from skia/DEPS
-      externals = lib.mapAttrs (n: fetchgit) (lib.importJSON ./skia-externals.json);
+      externals = linkFarm "skia-externals" (lib.mapAttrsToList
+        (name: value: { inherit name; path = fetchgit value; })
+        (lib.importJSON ./skia-externals.json));
     in
-      runCommand "source" {} (
+    runCommand "source" { } ''
-        ''
       cp -R ${repo} $out
       chmod -R +w $out
+      ln -s ${externals} $out/third_party/externals
+    ''
+  ;
 
-          mkdir -p $out/third_party/externals
-          cd $out/third_party/externals
-        '' + (builtins.concatStringsSep "\n" (lib.mapAttrsToList (name: value: "cp -ra ${value} ${name}") externals))
-      );
-
-  SKIA_NINJA_COMMAND = "${ninja}/bin/ninja";
   SKIA_GN_COMMAND = "${gn}/bin/gn";
-  LIBCLANG_PATH = "${llvmPackages.libclang.lib}/lib";
+  SKIA_NINJA_COMMAND = "${ninja}/bin/ninja";
-
-  preConfigure = ''
-    unset CC CXX
-  '';
-
-  # test needs a valid fontconfig file
-  FONTCONFIG_FILE = makeFontsConf { fontDirectories = [ ]; };
 
   nativeBuildInputs = [
-    pkg-config
     makeWrapper
-    python2 # skia-bindings
+    pkg-config
-    python3 # rust-xcb
+    python3 # skia
-    llvmPackages.clang # skia
     removeReferencesTo
   ] ++ lib.optionals stdenv.isDarwin [ xcbuild ];
 
@@ -91,21 +74,12 @@ rustPlatform.buildRustPackage rec {
   doCheck = false;
 
   buildInputs = [
-    openssl
     SDL2
-    (fontconfig.overrideAttrs (old: {
+    fontconfig
-      propagatedBuildInputs = [
+    rustPlatform.bindgenHook
-        # skia is not compatible with freetype 2.11.0
+  ] ++ lib.optionals stdenv.isDarwin [
-        (freetype.overrideAttrs (old: rec {
+    darwin.apple_sdk.frameworks.AppKit
-          version = "2.10.4";
-          src = fetchurl {
-            url = "mirror://savannah/${old.pname}/${old.pname}-${version}.tar.xz";
-            sha256 = "112pyy215chg7f7fmp2l9374chhhpihbh8wgpj5nj6avj3c59a46";
-          };
-        }))
   ];
-    }))
-  ] ++ lib.optionals stdenv.isDarwin [ Security ApplicationServices Carbon AppKit ];
 
   postFixup = let
     libPath = lib.makeLibraryPath ([
@@ -138,10 +112,9 @@ rustPlatform.buildRustPackage rec {
 
   meta = with lib; {
     description = "This is a simple graphical user interface for Neovim.";
-    homepage = "https://github.com/Kethku/neovide";
+    homepage = "https://github.com/neovide/neovide";
+    changelog = "https://github.com/neovide/neovide/releases/tag/${version}";
     license = with licenses; [ mit ];
     maintainers = with maintainers; [ ck3d ];
-    platforms = platforms.all;
-    mainProgram = "neovide";
   };
 }

pkgs/applications/graphics/freecad/default.nix

@@ -48,13 +48,13 @@
 
 mkDerivation rec {
   pname = "freecad";
-  version = "0.20.1";
+  version = "0.20.2";
 
   src = fetchFromGitHub {
     owner = "FreeCAD";
     repo = "FreeCAD";
     rev = version;
-    hash = "sha256-r2lhFv4ReASteoVxwwiW9TdSckpaju6QE8UegxeY4rE=";
+    hash = "sha256-v8hanhy0UE0o+XqqIH3ZUtVom3q0KGELcfXFRSDr0TA=";
   };
 
   nativeBuildInputs = [

pkgs/applications/misc/eureka-ideas/default.nix

@@ -30,7 +30,7 @@ rustPlatform.buildRustPackage rec {
     Security
   ];
 
-  dontUseCargoParallelTests = true;
+  useNextest = true;
 
   meta = with lib; {
     description = "CLI tool to input and store your ideas without leaving the terminal";

pkgs/applications/misc/obsidian/default.nix

@@ -51,7 +51,8 @@ let
       runHook preInstall
       mkdir -p $out/bin
       makeWrapper ${electron_18}/bin/electron $out/bin/obsidian \
-        --add-flags $out/share/obsidian/app.asar
+        --add-flags $out/share/obsidian/app.asar \
+        --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform=wayland}}"
       install -m 444 -D resources/app.asar $out/share/obsidian/app.asar
       install -m 444 -D resources/obsidian.asar $out/share/obsidian/obsidian.asar
       install -m 444 -D "${desktopItem}/share/applications/"* \

pkgs/applications/misc/organicmaps/default.nix

@@ -19,13 +19,13 @@
 
 mkDerivation rec {
   pname = "organicmaps";
-  version = "2022.11.02-2";
+  version = "2022.11.24-3";
 
   src = fetchFromGitHub {
     owner = "organicmaps";
     repo = "organicmaps";
     rev = "${version}-android";
-    sha256 = "sha256-E/lJDw1QMPT0QcaTOxEyJL4hmEFkq21vQkgZbssszJg=";
+    sha256 = "sha256-4RW7/sCtOXxA8n0Jx4ksNGRg7r8ErujmyzbnA1pi6ng=";
     fetchSubmodules = true;
   };
 

pkgs/applications/networking/browsers/castor/default.nix

@@ -40,8 +40,7 @@ rustPlatform.buildRustPackage rec {
 
   postInstall = "make PREFIX=$out copy-data";
 
-  # Sometimes tests fail when run in parallel
+  useNextest = true;
-  dontUseCargoParallelThreads = true;
 
   meta = with lib; {
     description = "A graphical client for plain-text protocols written in Rust with GTK. It currently supports the Gemini, Gopher and Finger protocols";

pkgs/applications/networking/cluster/terraform-providers/providers.json

@@ -616,11 +616,11 @@
     "vendorHash": "sha256-cLp8w0UcO9Hork/GTLOGCcSvfaYEIKl5so3/0ELm79Y="
   },
   "keycloak": {
-    "hash": "sha256-1yV3w3hhZf113XMxvpRvr3ADaRcuCl7BCIa5SIZPcCs=",
+    "hash": "sha256-DW80CkmeQKJ4tEBrLsdks+mXweL8K1pVu3yQKGAvZOs=",
     "homepage": "https://registry.terraform.io/providers/mrparkers/keycloak",
     "owner": "mrparkers",
     "repo": "terraform-provider-keycloak",
-    "rev": "v4.0.1",
+    "rev": "v4.1.0",
     "spdx": "MIT",
     "vendorHash": "sha256-nDvnLEOtXkUJFY22pKogOzkWrj4qjyQbdlJ5pa/xnK8="
   },

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

@@ -61,13 +61,13 @@
 }:
 
 stdenv.mkDerivation rec {
-  version = "5.14.14";
+  version = "5.18.11";
   pname = "feishu";
-  packageHash = "2844ab12b34f"; # A hash value used in the download url
+  packageHash = "9d89b152d581"; # A hash value used in the download url
 
   src = fetchurl {
     url = "https://sf3-cn.feishucdn.com/obj/ee-appcenter/${packageHash}/Feishu-linux_x64-${version}.deb";
-    sha256 = "c0ca999edc10d8ada08c46b33b15d7db0ced264248abd3ebfdb895d8457e1bec";
+    hash = "sha256-93LEybYePIEbmE8mjRL95haMuBuY0xH6/8fhwF7/ctM=";
   };
 
   nativeBuildInputs = [

pkgs/applications/networking/mailreaders/mailspring/default.nix

@@ -17,6 +17,7 @@
 , xorg
 , mesa
 , libdrm
+, libappindicator
 }:
 
 stdenv.mkDerivation rec {
@@ -55,6 +56,7 @@ stdenv.mkDerivation rec {
     coreutils
     openssl
     (lib.getLib udev)
+    libappindicator
   ];
 
   unpackPhase = ''

pkgs/applications/networking/p2p/freenet/default.nix

@@ -1,15 +1,7 @@
-{ lib, stdenv, fetchurl, jdk, bash, coreutils, substituteAll, nixosTests }:
+{ lib, stdenv, fetchurl, jdk, bash, coreutils, substituteAll, nixosTests, jna }:
 
 let
   version = "build01494";
-  jna = fetchurl {
-    url = "https://github.com/freenet/fred/releases/download/${version}/jna-4.5.2.jar";
-    sha256 = "sha256-DI63rPZyYWVteQBRkd66ujtr9d1gpDc1okVCk4Hb7P8=";
-  };
-  jna_platform = fetchurl {
-    url = "https://github.com/freenet/fred/releases/download/${version}/jna-platform-4.5.2.jar";
-    sha256 = "sha256-8dAMFn2JIcbiPGJu+fHDrgvkc8lcaP+gErx65VqH4tY=";
-  };
   freenet_ext = fetchurl {
     url = "https://github.com/freenet/fred/releases/download/${version}/freenet-ext.jar";
     sha256 = "sha256-MvKz1r7t9UE36i+aPr72dmbXafCWawjNF/19tZuk158=";
@@ -38,8 +30,8 @@ let
       mkdir -p $out/share/freenet
       ln -s ${bcprov} $out/share/freenet/bcprov.jar
       ln -s ${freenet_ext} $out/share/freenet/freenet-ext.jar
-      ln -s ${jna_platform} $out/share/freenet/jna_platform.jar
+      ln -s ${jna}/share/java/jna-platform.jar $out/share/freenet/jna_platform.jar
-      ln -s ${jna} $out/share/freenet/jna.jar
+      ln -s ${jna}/share/java/jna.jar $out/share/freenet/jna.jar
       ln -s $src $out/share/freenet/freenet.jar
     '';
   };
@@ -71,5 +63,6 @@ in stdenv.mkDerivation {
     license = lib.licenses.gpl2Plus;
     maintainers = with lib.maintainers; [ nagy ];
     platforms = with lib.platforms; linux;
+    changelog = "https://github.com/freenet/fred/blob/build${version}/NEWS.md";
   };
 }

pkgs/applications/networking/sniffnet/default.nix

@@ -0,0 +1,51 @@
+{ lib
+, rustPlatform
+, fetchCrate
+, pkg-config
+, libpcap
+, stdenv
+, fontconfig
+, libGL
+, xorg
+, darwin
+}:
+
+rustPlatform.buildRustPackage rec {
+  pname = "sniffnet";
+  version = "1.0.1";
+
+  src = fetchCrate {
+    inherit pname version;
+    sha256 = "sha256-8K774j04BOEuJjnFYjaSctPwBrKYYKqjFS2+PyxJ2FM=";
+  };
+
+  cargoSha256 = "sha256-096i4wDdoJCICd0L2QNY+7cKHQnijK22zj4XaQNuko8=";
+
+  nativeBuildInputs = [ pkg-config ];
+
+  buildInputs = [
+    libpcap
+  ] ++ lib.optionals stdenv.isLinux [
+    fontconfig
+    libGL
+    xorg.libX11
+    xorg.libXcursor
+    xorg.libXi
+    xorg.libXrandr
+  ] ++ lib.optionals stdenv.isDarwin [
+    darwin.apple_sdk.frameworks.AppKit
+  ];
+
+  postFixup = lib.optionalString stdenv.isLinux ''
+    patchelf $out/bin/sniffnet \
+      --add-rpath ${lib.makeLibraryPath [ libGL xorg.libX11 ]}
+  '';
+
+  meta = with lib; {
+    description = "Cross-platform application to monitor your network traffic with ease";
+    homepage = "https://github.com/gyulyvgc/sniffnet";
+    changelog = "https://github.com/gyulyvgc/sniffnet/blob/main/CHANGELOG.md";
+    license = with licenses; [ mit /* or */ asl20 ];
+    maintainers = with maintainers; [ figsoda ];
+  };
+}

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

@@ -52,6 +52,7 @@ let
    "8.15.1".sha256     = "sha256:1janvmnk3czimp0j5qmnfwx6509vhpjc2q7lcza1bc6dm6kn8n42";
    "8.15.2".sha256     = "sha256:0qibbvzrhsvs6w3zpkhyclndp29jnr6bs9i5skjlpp431jdjjfqd";
    "8.16.0".sha256   = "sha256-3V6kL9j2rn5FHBxq1mtmWWTZS9X5cAyvtUsS6DaM+is=";
+   "8.16.1".sha256   = "sha256-n7830+zfZeyYHEOGdUo57bH6bb2/SZs8zv8xJhV+iAc=";
   };
   releaseRev = v: "V${v}";
   fetched = import ../../../../build-support/coq/meta-fetch/default.nix

pkgs/build-support/rust/default-crate-overrides.nix

@@ -28,6 +28,7 @@
 , rdkafka
 , udev
 , libevdev
+, alsa-lib
 , ...
 }:
 
@@ -35,6 +36,11 @@ let
   inherit (darwin.apple_sdk.frameworks) CoreFoundation Security;
 in
 {
+  alsa-sys = attrs: {
+    nativeBuildInputs = [ pkg-config ];
+    buildInputs = [ alsa-lib ];
+  };
+
   cairo-rs = attrs: {
     buildInputs = [ cairo ];
   };

pkgs/build-support/rust/fetchcrate.nix

@@ -1,38 +1,15 @@
-{ lib, fetchurl, unzip }:
+{ lib, fetchzip }:
 
 { crateName ? args.pname
 , pname ? null
 , version
-, sha256
+, ...
-, ... } @ args:
+} @ args:
 
 assert pname == null || pname == crateName;
 
-lib.overrideDerivation (fetchurl ({
+fetchzip ({
-
   name = "${crateName}-${version}.tar.gz";
   url = "https://crates.io/api/v1/crates/${crateName}/${version}/download";
-  recursiveHash = true;
+  extension = "tar.gz";
-
+} // removeAttrs args [ "crateName" "pname" "version" ])
-  downloadToTemp = true;
-
-  postFetch =
-    ''
-      export PATH=${unzip}/bin:$PATH
-
-      unpackDir="$TMPDIR/unpack"
-      mkdir "$unpackDir"
-      cd "$unpackDir"
-
-      renamed="$TMPDIR/${crateName}-${version}.tar.gz"
-      mv "$downloadedFile" "$renamed"
-      unpackFile "$renamed"
-      fn=$(cd "$unpackDir" && echo *)
-      if [ -f "$unpackDir/$fn" ]; then
-        mkdir $out
-      fi
-      mv "$unpackDir/$fn" "$out"
-    '';
-} // removeAttrs args [ "crateName" "pname" "version" ]))
-# Hackety-hack: we actually need unzip hooks, too
-(x: {nativeBuildInputs = x.nativeBuildInputs++ [unzip];})

pkgs/data/misc/spdx-license-list-data/default.nix

@@ -2,13 +2,13 @@
 
 stdenvNoCC.mkDerivation rec {
   pname = "spdx-license-list-data";
-  version = "3.18";
+  version = "3.19";
 
   src = fetchFromGitHub {
     owner = "spdx";
     repo = "license-list-data";
     rev = "v${version}";
-    hash = "sha256-iXuGJzURcRyiq2rVP5jabOmFByF0YuiZg4HPCM6mk3A=";
+    hash = "sha256-qT9Q6Mntnt9lOhYmGFJlkDyAHQ0CGQpWr1rLF08FGeg=";
   };
 
   # List of file formats to package.

pkgs/development/compilers/edk2/default.nix

@@ -34,7 +34,7 @@ buildType = if stdenv.isDarwin then
 
 edk2 = buildStdenv.mkDerivation {
   pname = "edk2";
-  version = "202205";
+  version = "202211";
 
   patches = [
     # pass targetPrefix as an env var
@@ -50,7 +50,7 @@ edk2 = buildStdenv.mkDerivation {
     repo = "edk2";
     rev = "edk2-stable${edk2.version}";
     fetchSubmodules = true;
-    sha256 = "sha256-5V3gXZoePxRVL0miV/ku/HILT7d06E8UI28XRx8vZjA=";
+    sha256 = "sha256-0jE73xPyenAcgJ1mS35oTc5cYw7jJvVYxhPdhTWpKA0=";
   };
 
   nativeBuildInputs = [ pythonEnv ];

pkgs/development/compilers/ocaml/5.0.nix

@@ -1,9 +1,9 @@
 import ./generic.nix {
   major_version = "5";
   minor_version = "0";
-  patch_version = "0-beta1";
+  patch_version = "0-beta2";
   src = fetchTarball {
-    url = "https://caml.inria.fr/pub/distrib/ocaml-5.0/ocaml-5.0.0~beta1.tar.xz";
+    url = "https://caml.inria.fr/pub/distrib/ocaml-5.0/ocaml-5.0.0~beta2.tar.xz";
-    sha256 = "sha256:1kwb53ra5qbwiiyrx5da7l5mqkjf0fr3rqgkrm3wr83l25scimj4";
+    sha256 = "sha256:1r76a3wadidca9306wkkcxdh5l0rk93pc6xmbs46cc1jfm6pgwas";
   };
 }

pkgs/development/compilers/rml/default.nix

@@ -0,0 +1,36 @@
+{ lib
+, stdenv
+, fetchFromGitHub
+, ocamlPackages
+}:
+
+stdenv.mkDerivation rec {
+  pname = "rml";
+  version = "1.09.07";
+
+  src = fetchFromGitHub {
+    owner = "reactiveml";
+    repo = pname;
+    rev = "${pname}-${version}-2021-07-26";
+    hash = "sha256-UFqXQBeIQMSV4O439j9s06p1hh7xA98Tu79FsjK9PIY=";
+  };
+
+  nativeBuildInputs = with ocamlPackages; [
+    ocaml
+  ];
+
+  buildInputs = with ocamlPackages; [
+    num
+  ];
+
+  configureFlags = [ "--prefix" "${placeholder "out"}" ];
+
+  dontAddPrefix = true;
+
+  meta = with lib; {
+    description = "ReactiveML: a programming language for implementing interactive systems";
+    homepage = "https://rml.lri.fr";
+    license = with licenses; [ qpl lgpl21Plus ];
+    maintainers = with maintainers; [ wegank ];
+  };
+}

pkgs/development/compilers/scryer-prolog/cargo.patch

@@ -1,66 +1,24 @@
 diff --git a/Cargo.lock b/Cargo.lock
-index 4d699f11..1eb894fc 100644
+index 05e54911..3a567165 100644
 --- a/Cargo.lock
 +++ b/Cargo.lock
-@@ -875,15 +875,6 @@ version = "0.1.4"
+@@ -1826,6 +1826,7 @@ dependencies = [
- source = "registry+https://github.com/rust-lang/crates.io-index"
+  "futures",
- checksum = "28988d872ab76095a6e6ac88d99b54fd267702734fd7ffe610ca27f533ddb95a"
- 
--[[package]]
--name = "openssl-src"
--version = "300.0.2+3.0.0"
--source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "14a760a11390b1a5daf72074d4f6ff1a6e772534ae191f999f57e9ee8146d1fb"
--dependencies = [
-- "cc",
--]
--
- [[package]]
- name = "openssl-sys"
- version = "0.9.70"
-@@ -893,7 +884,6 @@ dependencies = [
-  "autocfg 1.0.1",
-  "cc",
-  "libc",
-- "openssl-src",
-  "pkg-config",
-  "vcpkg",
- ]
-@@ -1432,6 +1422,7 @@ dependencies = [
-  "divrem",
   "fxhash",
   "git-version",
 + "gmp-mpfr-sys",
   "hostname",
-  "indexmap",
+  "hyper",
-  "instructions-template",
+  "hyper-tls",
 diff --git a/Cargo.toml b/Cargo.toml
-index 8e81a947..d21a8d49 100644
+index 6e42de23..a50e3d47 100644
 --- a/Cargo.toml
 +++ b/Cargo.toml
-@@ -55,7 +55,7 @@ ring = "0.16.13"
+@@ -63,6 +63,7 @@ hyper = { version = "0.14", features = ["full"] }
- ripemd160 = "0.8.0"
+ hyper-tls = "0.5.0"
- sha3 = "0.8.2"
+ tokio = { version = "1", features = ["full"] }
- blake2 = "0.8.1"
+ futures = "0.3"
--openssl = { version = "0.10.29", features = ["vendored"] }
++gmp-mpfr-sys = { version = "1.4.10", features = ["use-system-libs"] }
-+openssl = { version = "0.10.29" }
- native-tls = "0.2.4"
- chrono = "0.4.11"
- select = "0.4.3"
-@@ -66,10 +66,14 @@ sodiumoxide = "0.2.6"
- static_assertions = "1.1.0"
- slice-deque = "0.3.0"
  
-+[dependencies.gmp-mpfr-sys]
-+version = "1.4"
-+features = ["use-system-libs"]
-+
  [dev-dependencies]
  assert_cmd = "1.0.3"
- predicates-core = "1.0.2"
- serial_test = "0.5.1"
- 
- [profile.release]
--debug = true
-\ No newline at end of file
-+debug = true

pkgs/development/compilers/scryer-prolog/default.nix

@@ -1,7 +1,6 @@
 { stdenv
 , lib
 , fetchFromGitHub
-, fetchpatch
 , rustPlatform
 , rustfmt
 , gmp
@@ -13,30 +12,21 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "scryer-prolog";
-  version = "0.9.0";
+  version = "0.9.1";
 
   src = fetchFromGitHub {
     owner = "mthom";
     repo = "scryer-prolog";
     rev = "v${version}";
-    sha256 = "3NHpEg6QaUaqbBCq8uM5hFcqS24q4XrOnKjMmn8Z1Dg=";
+    sha256 = "bDLVOXX9nv6Guu5czRFkviJf7dBiaqt5O8SLUJlcBZo=";
   };
 
   cargoPatches = [
     # Use system openssl, gmp, mpc and mpfr.
     ./cargo.patch
-
-    ./fix-tests.patch
-
-    # Avoid testing failing with "couldn't save history"
-    (fetchpatch {
-      name = "fix-tests-1";
-      url = "https://patch-diff.githubusercontent.com/raw/mthom/scryer-prolog/pull/1342.patch";
-      sha256 = "2N0AOkFuf+H/aUn2QTXgmqjmvShTxHxB6kNuNdNoVRI=";
-    })
   ];
 
-  cargoSha256 = "nqAHVXAmTW9mdE2L2yhpOTz16JbYgQUmCgiFq9pBzUU=";
+  cargoSha256 = "A6HtvxGTjJliDMUSGkQKB13FRyfBU4EPvrlZ97ic0Ic=";
 
   nativeBuildInputs = [ pkg-config rustfmt];
   buildInputs = [ openssl gmp libmpc mpfr ];

pkgs/development/compilers/scryer-prolog/fix-tests.patch

@@ -1,29 +0,0 @@
-diff --git a/tests/scryer/src_tests.rs b/tests/scryer/src_tests.rs
-index b0b9efb5..8fddd842 100644
---- a/tests/scryer/src_tests.rs
-+++ b/tests/scryer/src_tests.rs
-@@ -46,24 +46,6 @@ fn rules() {
-     load_module_test("src/tests/rules.pl", "");
- }
- 
--#[serial]
--#[test]
--fn setup_call_cleanup_load() {
--    load_module_test(
--        "src/tests/setup_call_cleanup.pl",
--        "1+21+31+2>_17737+_177381+_158071+2>41+2>_177381+2>31+2>31+2>4ba"
--    );
--}
--
--#[test]
--fn setup_call_cleanup_process() {
--    run_top_level_test_with_args(
--        &["src/tests/setup_call_cleanup.pl", "-f", "-g", "halt"],
--        "",
--        "1+21+31+2>_19590+_195911+_176601+2>41+2>_195911+2>31+2>31+2>4ba"
--    );
--}
--
- #[serial]
- #[test]
- fn clpz_load() {

pkgs/development/coq-modules/VST/default.nix

@@ -39,7 +39,7 @@ mkCoqDerivation {
   preConfigure = ''
     patchShebangs util
     substituteInPlace Makefile \
-      --replace 'COQVERSION= ' 'COQVERSION= 8.16.0 or-else 8.15.2 or-else 8.15.1 or-else '\
+      --replace 'COQVERSION= ' 'COQVERSION= 8.16.1 or-else 8.16.0 or-else 8.15.2 or-else 8.15.1 or-else '\
       --replace 'FLOYD_FILES=' 'FLOYD_FILES= ${toString extra_floyd_files}'
   '';
 

pkgs/development/coq-modules/compcert/default.nix

@@ -145,6 +145,11 @@ compcert.overrideAttrs (o:
             url = "https://github.com/AbsInt/CompCert/commit/34be08a23d18d56f2dde24fd24b6dbe3bcb01ec3.patch";
             sha256 = "sha256-a5YnftGVadVypEqrOYRRxI7YtGOEWyKnO4GqakFhvzI=";
           })
+          # Support for Coq 8.16.1
+          (fetchpatch {
+            url = "https://github.com/AbsInt/CompCert/commit/35531503b3493cb9b0ec8a8585e84928c85b4af9.patch";
+            hash = "sha256-DvtYi/eiPUe8tA0EFTcCjJA0JjtVKceUsX4ZDM0pWkE=";
+          })
         ];
       }
     ] [];

pkgs/development/interpreters/luau/default.nix

@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "luau";
-  version = "0.554";
+  version = "0.555";
 
   src = fetchFromGitHub {
     owner = "Roblox";
     repo = "luau";
     rev = version;
-    sha256 = "sha256-BgCeLvMwMPsXIopSO2OH50SPqwZ4Ehqmog+3DydJ3vU=";
+    sha256 = "sha256-p3BTtjTmg8sS0gOugPCO1oqqboppcXa0wLHmRqmf3AA=";
   };
 
   nativeBuildInputs = [ cmake ];

pkgs/development/java-modules/jna/default.nix

@@ -0,0 +1,37 @@
+{ stdenv, lib, fetchFromGitHub, ant, jdk8 }:
+
+stdenv.mkDerivation rec {
+  pname = "jna";
+  version = "4.5.2";
+
+  src = fetchFromGitHub {
+    owner = "java-native-access";
+    repo = pname;
+    rev = version;
+    hash = "sha256-FJXYej49soHPa+kAUeLZYzbw+NnFoag2LdKrTihPWvE=";
+  };
+
+  nativeBuildInputs = [ ant jdk8 ];
+
+  buildPhase = ''
+    runHook preBuild
+    rm -r dist # remove prebuilt files
+    ant dist
+    runHook postBuild
+  '';
+
+  installPhase = ''
+    runHook preInstall
+    install -Dm444 -t $out/share/java dist/jna{,-platform}.jar
+    runHook postInstall
+  '';
+
+  meta = with lib; {
+    inherit (src.meta) homepage;
+    description = "Java Native Access";
+    license = with licenses; [ lgpl21 asl20 ];
+    maintainers = with maintainers; [ nagy ];
+    platforms = platforms.linux;
+    changelog = "https://github.com/java-native-access/jna/blob/${version}/CHANGES.md";
+  };
+}

pkgs/development/libraries/jemalloc/default.nix

@@ -28,9 +28,9 @@ stdenv.mkDerivation rec {
     })
   ];
 
+  configureFlags =
     # see the comment on stripPrefix
-  configureFlags = []
+    lib.optional stripPrefix "--with-jemalloc-prefix="
-    ++ lib.optional stripPrefix "--with-jemalloc-prefix="
     ++ lib.optional disableInitExecTls "--disable-initial-exec-tls"
     # jemalloc is unable to correctly detect transparent hugepage support on
     # ARM (https://github.com/jemalloc/jemalloc/issues/526), and the default
@@ -54,7 +54,7 @@ stdenv.mkDerivation rec {
   enableParallelBuilding = true;
 
   meta = with lib; {
-    homepage = "http://jemalloc.net";
+    homepage = "https://jemalloc.net/";
     description = "General purpose malloc(3) implementation";
     longDescription = ''
       malloc(3)-compatible memory allocator that emphasizes fragmentation

pkgs/development/libraries/qt-6/default.nix

@@ -23,6 +23,7 @@
 , gtk3
 , dconf
 , libglvnd
+, darwin
 , buildPackages
 
   # options
@@ -43,7 +44,7 @@ let
 
   addPackages = self: with self;
     let
-      callPackage = self.newScope { inherit qtModule srcs; };
+      callPackage = self.newScope ({ inherit qtModule stdenv srcs; });
     in
     {
 
@@ -53,9 +54,16 @@ let
         withGtk3 = true;
         inherit (srcs.qtbase) src version;
         inherit bison cups harfbuzz libGL dconf gtk3 developerBuild cmake;
+        inherit (darwin.apple_sdk_11_0.frameworks) AGL AVFoundation AppKit GSS MetalKit;
         patches = [
           ./patches/qtbase-qmake-pkg-config.patch
           ./patches/qtbase-tzdir.patch
+          # Remove symlink check causing build to bail out and fail.
+          # https://gitlab.kitware.com/cmake/cmake/-/issues/23251
+          (fetchpatch {
+            url = "https://github.com/Homebrew/formula-patches/raw/c363f0edf9e90598d54bc3f4f1bacf95abbda282/qt/qt_internal_check_if_path_has_symlinks.patch";
+            sha256 = "sha256-Gv2L8ymZSbJxcmUijKlT2NnkIB3bVH9D7YSsDX2noTU=";
+          })
         ];
       };
       env = callPackage ./qt-env.nix {};
@@ -90,7 +98,9 @@ let
       qt3d = callPackage ./modules/qt3d.nix { };
       qt5compat = callPackage ./modules/qt5compat.nix { };
       qtcharts = callPackage ./modules/qtcharts.nix { };
-      qtconnectivity = callPackage ./modules/qtconnectivity.nix { };
+      qtconnectivity = callPackage ./modules/qtconnectivity.nix {
+        inherit (darwin.apple_sdk_11_0.frameworks) PCSC;
+      };
       qtdatavis3d = callPackage ./modules/qtdatavis3d.nix { };
       qtdeclarative = callPackage ./modules/qtdeclarative.nix { };
       qtdoc = callPackage ./modules/qtdoc.nix { };
@@ -100,6 +110,7 @@ let
       qtlottie = callPackage ./modules/qtlottie.nix { };
       qtmultimedia = callPackage ./modules/qtmultimedia.nix {
         inherit gstreamer gst-plugins-base gst-plugins-good gst-libav gst-vaapi;
+        inherit (darwin.apple_sdk_11_0.frameworks) VideoToolbox;
       };
       qtnetworkauth = callPackage ./modules/qtnetworkauth.nix { };
       qtpositioning = callPackage ./modules/qtpositioning.nix { };
@@ -107,7 +118,9 @@ let
       qtserialbus = callPackage ./modules/qtserialbus.nix { };
       qtserialport = callPackage ./modules/qtserialport.nix { };
       qtshadertools = callPackage ./modules/qtshadertools.nix { };
-      qtspeech = callPackage ./modules/qtspeech.nix { };
+      qtspeech = callPackage ./modules/qtspeech.nix {
+        inherit (darwin.apple_sdk_11_0.frameworks) Cocoa;
+      };
       qtquick3d = callPackage ./modules/qtquick3d.nix { };
       qtquick3dphysics = callPackage ./modules/qtquick3dphysics.nix { };
       qtquicktimeline = callPackage ./modules/qtquicktimeline.nix { };
@@ -121,7 +134,9 @@ let
       qtwebchannel = callPackage ./modules/qtwebchannel.nix { };
       qtwebengine = callPackage ./modules/qtwebengine.nix { };
       qtwebsockets = callPackage ./modules/qtwebsockets.nix { };
-      qtwebview = callPackage ./modules/qtwebview.nix { };
+      qtwebview = callPackage ./modules/qtwebview.nix {
+        inherit (darwin.apple_sdk_11_0.frameworks) WebKit;
+      };
 
       wrapQtAppsHook = makeSetupHook {
           deps = [ buildPackages.makeWrapper ];

pkgs/development/libraries/qt-6/modules/qtbase.nix

@@ -71,6 +71,13 @@
 , at-spi2-core
 , unixODBC
 , unixODBCDrivers
+  # darwin
+, xcbuild
+, AGL
+, AVFoundation
+, AppKit
+, GSS
+, MetalKit
   # optional dependencies
 , cups
 , libmysqlclient
@@ -79,7 +86,7 @@
 , dconf
 , gtk3
   # options
-, libGLSupported ? true
+, libGLSupported ? stdenv.isLinux
 , libGL
 , debug ? false
 , developerBuild ? false
@@ -111,13 +118,20 @@ stdenv.mkDerivation rec {
     pcre2
     pcre
     libproxy
-    xlibsWrapper
     zstd
     double-conversion
-    util-linux
-    systemd
     libb2
     md4c
+    dbus
+    glib
+    # unixODBC drivers
+    unixODBCDrivers.psql
+    unixODBCDrivers.sqlite
+    unixODBCDrivers.mariadb
+  ] ++ lib.optionals stdenv.isLinux [
+    xlibsWrapper
+    util-linux
+    systemd
     mtdev
     lksctp-tools
     libselinux
@@ -129,8 +143,6 @@ stdenv.mkDerivation rec {
     libdrm
     libdatrie
     valgrind
-    dbus
-    glib
     udev
     # Text rendering
     fontconfig
@@ -152,16 +164,21 @@ stdenv.mkDerivation rec {
     xorg.libXtst
     xorg.xcbutilcursor
     libepoxy
-  ] ++ (with unixODBCDrivers; [
+  ] ++ lib.optionals stdenv.isDarwin [
-    psql
+    AGL
-    sqlite
+    AVFoundation
-    mariadb
+    AppKit
-  ]) ++ lib.optional libGLSupported libGL;
+    GSS
+    MetalKit
+  ] ++ lib.optional libGLSupported libGL;
 
   buildInputs = [
     python3
     at-spi2-core
+  ] ++ lib.optionals (!stdenv.isDarwin) [
     libinput
+  ] ++ lib.optionals (stdenv.isDarwin && stdenv.isx86_64) [
+    AppKit
   ]
   ++ lib.optional withGtk3 gtk3
   ++ lib.optional developerBuild gdb
@@ -180,6 +197,8 @@ stdenv.mkDerivation rec {
   # https://bugreports.qt.io/browse/QTBUG-97568
   postPatch = ''
     substituteInPlace src/corelib/CMakeLists.txt --replace /bin/ls ${coreutils}/bin/ls
+  '' + lib.optionalString stdenv.isDarwin ''
+    substituteInPlace cmake/QtAutoDetect.cmake --replace "/usr/bin/xcrun" "${xcbuild}/bin/xcrun"
   '';
 
   fix_qt_builtin_paths = ../hooks/fix-qt-builtin-paths.sh;
@@ -197,14 +216,23 @@ stdenv.mkDerivation rec {
   cmakeFlags = [
     "-DINSTALL_PLUGINSDIR=${qtPluginPrefix}"
     "-DINSTALL_QMLDIR=${qtQmlPrefix}"
-    "-DQT_FEATURE_journald=ON"
-    "-DQT_FEATURE_sctp=ON"
     "-DQT_FEATURE_libproxy=ON"
     "-DQT_FEATURE_system_sqlite=ON"
-    "-DQT_FEATURE_vulkan=ON"
     "-DQT_FEATURE_openssl_linked=ON"
+  ] ++ lib.optionals (!stdenv.isDarwin) [
+    "-DQT_FEATURE_sctp=ON"
+    "-DQT_FEATURE_journald=ON"
+    "-DQT_FEATURE_vulkan=ON"
+  ] ++ lib.optionals stdenv.isDarwin [
+    # build as a set of dynamic libraries
+    "-DFEATURE_framework=OFF"
   ];
 
+  NIX_LDFLAGS = toString (lib.optionals stdenv.isDarwin [
+    # Undefined symbols for architecture arm64: "___gss_c_nt_hostbased_service_oid_desc"
+    "-framework GSS"
+  ]);
+
   outputs = [ "out" "dev" ];
 
   postInstall = ''
@@ -259,6 +287,6 @@ stdenv.mkDerivation rec {
     description = "A cross-platform application framework for C++";
     license = with licenses; [ fdl13Plus gpl2Plus lgpl21Plus lgpl3Plus ];
     maintainers = with maintainers; [ milahu nickcao LunNova ];
-    platforms = platforms.linux;
+    platforms = platforms.unix;
   };
 }

pkgs/development/libraries/qt-6/modules/qtconnectivity.nix

@@ -5,11 +5,13 @@
 , qtdeclarative
 , bluez
 , pkg-config
+, PCSC
 }:
 
 qtModule {
   pname = "qtconnectivity";
   qtInputs = [ qtbase qtdeclarative ];
-  buildInputs = [ bluez ];
   nativeBuildInputs = [ pkg-config ];
+  buildInputs = lib.optionals stdenv.isLinux [ bluez ];
+  propagatedBuildInputs = lib.optionals stdenv.isDarwin [ PCSC ];
 }

pkgs/development/libraries/qt-6/modules/qtmultimedia.nix

@@ -17,12 +17,21 @@
 , elfutils
 , libunwind
 , orc
+, VideoToolbox
 }:
 
 qtModule {
   pname = "qtmultimedia";
   qtInputs = [ qtbase qtdeclarative qtsvg qtshadertools ];
   nativeBuildInputs = [ pkg-config ];
-  buildInputs = [ libpulseaudio elfutils libunwind alsa-lib wayland orc ];
+  buildInputs = [ libunwind orc ]
-  propagatedBuildInputs = [ gstreamer gst-plugins-base gst-plugins-good gst-libav gst-vaapi ];
+    ++ lib.optionals stdenv.isLinux [ libpulseaudio elfutils alsa-lib wayland ];
+  propagatedBuildInputs = [ gstreamer gst-plugins-base gst-plugins-good gst-libav ]
+    ++ lib.optionals stdenv.isLinux [ gst-vaapi ]
+    ++ lib.optionals stdenv.isDarwin [ VideoToolbox ];
+
+  NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin
+    "-include AudioToolbox/AudioToolbox.h";
+  NIX_LDFLAGS = lib.optionalString stdenv.isDarwin
+    "-framework AudioToolbox";
 }

pkgs/development/libraries/qt-6/modules/qtquick3dphysics.nix

@@ -1,4 +1,6 @@
 { qtModule
+, lib
+, stdenv
 , qtbase
 , qtquick3d
 }:
@@ -6,4 +8,6 @@
 qtModule {
   pname = "qtquick3dphysics";
   qtInputs = [ qtbase qtquick3d ];
+  NIX_CFLAGS_COMPILE = lib.optionalString (stdenv.isDarwin && stdenv.isx86_64)
+    "-faligned-allocation";
 }

pkgs/development/libraries/qt-6/modules/qtserialport.nix

@@ -10,5 +10,5 @@ qtModule {
   pname = "qtserialport";
   qtInputs = [ qtbase ];
   nativeBuildInputs = [ pkg-config ];
-  propagatedBuildInputs = [ udev ];
+  propagatedBuildInputs = lib.optionals stdenv.isLinux [ udev ];
 }

pkgs/development/libraries/qt-6/modules/qtspeech.nix

@@ -1,15 +1,19 @@
 { qtModule
+, lib
+, stdenv
 , qtbase
 , qtmultimedia
 , pkg-config
 , flite
 , alsa-lib
 , speechd
+, Cocoa
 }:
 
 qtModule {
   pname = "qtspeech";
   qtInputs = [ qtbase qtmultimedia ];
   nativeBuildInputs = [ pkg-config ];
-  buildInputs = [ flite alsa-lib speechd ];
+  buildInputs = lib.optionals stdenv.isLinux [ flite alsa-lib speechd ];
+  propagatedBuildInputs = lib.optionals stdenv.isDarwin [ Cocoa ];
 }

pkgs/development/libraries/qt-6/modules/qttools.nix

@@ -3,12 +3,14 @@
 , lib
 , qtbase
 , qtdeclarative
+, cups
 , substituteAll
 }:
 
 qtModule {
   pname = "qttools";
   qtInputs = [ qtbase qtdeclarative ];
+  propagatedBuildInputs = lib.optionals stdenv.isDarwin [ cups ];
   patches = [
     ../patches/qttools-paths.patch
   ];

pkgs/development/libraries/qt-6/modules/qtwebview.nix

@@ -3,9 +3,12 @@
 , qtModule
 , qtdeclarative
 , qtwebengine
+, WebKit
 }:
 
 qtModule {
   pname = "qtwebview";
-  qtInputs = [ qtdeclarative qtwebengine ];
+  qtInputs = [ qtdeclarative ]
+    ++ lib.optionals (!stdenv.isDarwin) [ qtwebengine ];
+  propagatedBuildInputs = lib.optionals stdenv.isDarwin [ WebKit ];
 }

pkgs/development/libraries/qt-6/qtModule.nix

@@ -83,6 +83,6 @@ stdenv.mkDerivation (args // {
     description = "A cross-platform application framework for C++";
     license = with licenses; [ fdl13Plus gpl2Plus lgpl21Plus lgpl3Plus ];
     maintainers = with maintainers; [ milahu nickcao ];
-    platforms = platforms.linux;
+    platforms = platforms.unix;
   } // (args.meta or { });
 })

pkgs/development/libraries/qtpbfimageplugin/default.nix

@@ -23,9 +23,16 @@ stdenv.mkDerivation rec {
   '' + lib.optionalString stdenv.isDarwin ''
     # Fix darwin build
     substituteInPlace pbfplugin.pro \
+      --replace '$$PROTOBUF/include' '${protobuf}/include' \
       --replace '$$PROTOBUF/lib/libprotobuf-lite.a' '${protobuf}/lib/libprotobuf-lite.dylib'
   '';
 
+  # error: 'path' is unavailable: introduced in macOS 10.15
+  qmakeFlags = lib.optionals stdenv.isDarwin [
+    "CONFIG+=c++17"
+    "QMAKE_MACOSX_DEPLOYMENT_TARGET=10.15"
+  ];
+
   meta = with lib; {
     description = "Qt image plugin for displaying Mapbox vector tiles";
     longDescription = ''

pkgs/development/libraries/speechd/default.nix

@@ -39,7 +39,7 @@ in stdenv.mkDerivation rec {
       src = ./fix-paths.patch;
       utillinux = util-linux;
     })
-  ] ++ lib.optionals espeak.mbrolaSupport [
+  ] ++ lib.optionals (withEspeak && espeak.mbrolaSupport) [
     # Replace FHS paths.
     (substituteAll {
       src = ./fix-mbrola-paths.patch;

pkgs/development/libraries/unixODBCDrivers/default.nix

@@ -20,11 +20,10 @@
     };
 
     meta = with lib; {
-      broken = stdenv.isDarwin;
       description = "Official PostgreSQL ODBC Driver";
       homepage = "https://odbc.postgresql.org/";
       license = licenses.lgpl2;
-      platforms = platforms.linux;
+      platforms = platforms.unix;
     };
   };
 
@@ -47,7 +46,9 @@
 
     preConfigure = ''
       # we don't want to build a .pkg
-      sed -i 's/ADD_SUBDIRECTORY(osxinstall)//g' CMakeLists.txt
+      substituteInPlace CMakeLists.txt \
+        --replace "IF(APPLE)" "IF(0)" \
+        --replace "CMAKE_SYSTEM_NAME MATCHES AIX" "APPLE"
     '';
 
     cmakeFlags = [
@@ -62,7 +63,6 @@
     };
 
     meta = with lib; {
-      broken = stdenv.isDarwin;
       description = "MariaDB ODBC database driver";
       homepage = "https://downloads.mariadb.org/connector-odbc/";
       license = licenses.gpl2;
@@ -126,11 +126,10 @@
     };
 
     meta = with lib; {
-      broken = stdenv.isDarwin;
       description = "ODBC driver for SQLite";
       homepage = "http://www.ch-werner.de/sqliteodbc";
       license = licenses.bsd2;
-      platforms = platforms.linux;
+      platforms = platforms.unix;
       maintainers = with maintainers; [ vlstill ];
     };
   };

pkgs/development/libraries/xercesc/default.nix

@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "xerces-c";
-  version = "3.2.3";
+  version = "3.2.4";
 
   src = fetchurl {
     url = "mirror://apache/xerces/c/3/sources/${pname}-${version}.tar.gz";
-    sha256 = "0zicsydx6s7carwr7q0csgkg1xncibd6lfp5chg2v2gvn54zr5pv";
+    sha256 = "sha256-PY7Bx/lOOP7g5Mpa0eHZ2yPL86ELumJva0r6Le2v5as=";
   };
 
   # Disable SSE2 extensions on platforms for which they are not enabled by default

pkgs/development/misc/resholve/default.nix

@@ -1,12 +1,12 @@
 { lib
+, stdenv
 , pkgsBuildHost
-, system
 , ...
 }:
 
 let
   pkgs = import ../../../.. {
-    inherit system;
+    inherit (stdenv.hostPlatform) system;
     # Allow python27 with known security issues only for resholve,
     # see issue #201859 for the reasoning
     # In resholve case this should not be a security issue,

pkgs/development/node-packages/node-packages.json

@@ -1,6 +1,5 @@
 [
   "@angular/cli"
-, "@ansible/ansible-language-server"
 , "@antfu/ni"
 , "@antora/cli"
 , "@antora/site-generator-default"

pkgs/development/ocaml-modules/gen/default.nix

@@ -1,31 +1,30 @@
-{ stdenv, lib, fetchFromGitHub, ocaml, findlib, ocamlbuild, qtest, ounit }:
+{ lib, buildDunePackage, fetchFromGitHub, ocaml
+, dune-configurator
+, seq
+, qcheck, ounit2
+}:
 
-stdenv.mkDerivation rec {
+buildDunePackage rec {
-  version = "0.5";
+  version = "1.0";
-  pname = "ocaml${ocaml.version}-gen";
+  pname = "gen";
+  minimalOCamlVersion = "4.03";
 
   src = fetchFromGitHub {
     owner = "c-cube";
     repo = "gen";
-    rev = version;
+    rev = "v${version}";
-    sha256 = "14b8vg914nb0yp1hgxzm29bg692m0gqncjj43b599s98s1cwl92h";
+    hash = "sha256-YWoVcl2TQoMIgU1LoKL16ia31zJjwAMwuphtSXnhtvw=";
   };
 
-  nativeBuildInputs = [ ocaml findlib ocamlbuild ];
+  buildInputs = [ dune-configurator ];
-  buildInputs = lib.optionals doCheck [ qtest ounit ];
+  propagatedBuildInputs = [ seq ];
-  strictDeps = true;
+  checkInputs = [ qcheck ounit2 ];
-
-  configureFlags = lib.optional doCheck "--enable-tests";
 
   doCheck = lib.versionAtLeast ocaml.version "4.08";
-  checkTarget = "test";
-
-  createFindlibDestdir = true;
 
   meta = {
     homepage = "https://github.com/c-cube/gen";
     description = "Simple, efficient iterators for OCaml";
     license = lib.licenses.bsd3;
-    inherit (ocaml.meta) platforms;
   };
 }

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

@@ -12,7 +12,7 @@
 
 buildPythonPackage rec {
   pname = "adlfs";
-  version = "2022.10.0";
+  version = "2022.11.2";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
@@ -20,8 +20,8 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "fsspec";
     repo = pname;
-    rev = version;
+    rev = "refs/tags/${version}";
-    hash = "sha256-h/xcqb7G4uj4WNVE8is/s2LQ2NfzP1negh15G8B9YCs=";
+    hash = "sha256-S6dJK5ZhDCSwM/14sTrXNJ/+dDe9OeDRemsnuoe4IW0=";
   };
 
   propagatedBuildInputs = [
@@ -43,6 +43,7 @@ buildPythonPackage rec {
   meta = with lib; {
     description = "Filesystem interface to Azure-Datalake Gen1 and Gen2 Storage";
     homepage = "https://github.com/fsspec/adlfs";
+    changelog = "https://github.com/fsspec/adlfs/blob/${version}/CHANGELOG.md";
     license = licenses.bsd3;
     maintainers = with maintainers; [ fab ];
   };

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

@@ -12,7 +12,7 @@
 
 buildPythonPackage rec {
   pname = "aioesphomeapi";
-  version = "13.0.0";
+  version = "13.0.1";
   format = "setuptools";
 
   disabled = pythonOlder "3.9";
@@ -21,7 +21,7 @@ buildPythonPackage rec {
     owner = "esphome";
     repo = pname;
     rev = "refs/tags/v${version}";
-    hash = "sha256-u+RaQcEfljgjK+7vMJj60WkvjozzRM5Z1Yaf4NkrF+U=";
+    hash = "sha256-33iaM5+5OV9TAk3SAZWzJfwQbeDSPQiVLBPAAOyyFm0=";
   };
 
   postPatch = ''

pkgs/development/python-modules/ale-py/cmake-pybind11.patch

@@ -0,0 +1,18 @@
+diff --git a/src/python/CMakeLists.txt b/src/python/CMakeLists.txt
+index 911e280..d484943 100644
+--- a/src/python/CMakeLists.txt
++++ b/src/python/CMakeLists.txt
+@@ -1,12 +1,6 @@
+ find_package(Python3 COMPONENTS Interpreter Development.Module REQUIRED)
+ 
+-include(FetchContent)
+-FetchContent_Declare(
+-    pybind11
+-    GIT_REPOSITORY https://github.com/pybind/pybind11
+-    GIT_TAG v2.10.0)
+-FetchContent_MakeAvailable(pybind11)
+-
++find_package(pybind11 REQUIRED)
+ add_library(ale-py MODULE ale_python_interface.cpp)
+ # Depend on the ALE and pybind11 module
+ target_link_libraries(ale-py PUBLIC ale ale-lib)

pkgs/development/python-modules/ale-py/default.nix

@@ -0,0 +1,83 @@
+{ buildPythonPackage
+, SDL2
+, cmake
+, fetchFromGitHub
+, git
+, gym
+, importlib-metadata
+, importlib-resources
+, lib
+, ninja
+, numpy
+, pybind11
+, pytestCheckHook
+, python
+, pythonOlder
+, setuptools
+, stdenv
+, typing-extensions
+, wheel
+, zlib
+}:
+
+buildPythonPackage rec {
+  pname = "ale-py";
+  version = "0.8.0";
+  format = "pyproject";
+
+  src = fetchFromGitHub {
+    owner = "mgbellemare";
+    repo = "Arcade-Learning-Environment";
+    rev = "v${version}";
+    sha256 = "sha256-OPAtCc2RapK1lALTKHd95bkigxcZ9bcONu32I/91HIg=";
+  };
+
+  patches = [
+    # don't download pybind11, use local pybind11
+    ./cmake-pybind11.patch
+  ];
+
+  nativeBuildInputs = [
+    cmake
+    setuptools
+    wheel
+    pybind11
+  ];
+
+  buildInputs = [
+    zlib
+    SDL2
+  ];
+
+  propagatedBuildInputs = [
+    typing-extensions
+    importlib-resources
+    numpy
+  ] ++ lib.optionals (pythonOlder "3.10") [
+    importlib-metadata
+  ];
+
+  checkInputs = [
+    pytestCheckHook
+    gym
+  ];
+
+  postPatch = ''
+    substituteInPlace pyproject.toml \
+      --replace 'dynamic = ["version"]' 'version = "${version}"'
+    substituteInPlace setup.py \
+      --replace 'subprocess.check_output(["git", "rev-parse", "--short", "HEAD"], cwd=here)' 'b"${src.rev}"'
+  '';
+
+  dontUseCmakeConfigure = true;
+
+  pythonImportsCheck = [ "ale_py" ];
+
+  meta = with lib; {
+    description = "a simple framework that allows researchers and hobbyists to develop AI agents for Atari 2600 games";
+    homepage = "https://github.com/mgbellemare/Arcade-Learning-Environment";
+    license = licenses.gpl2;
+    maintainers = with maintainers; [ billhuang ];
+    broken = stdenv.isDarwin; # fails to link with missing library
+  };
+}

pkgs/development/python-modules/aliyun-python-sdk-cdn/default.nix

@@ -7,14 +7,14 @@
 
 buildPythonPackage rec {
   pname = "aliyun-python-sdk-cdn";
-  version = "3.7.7";
+  version = "3.7.8";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-Rqz4V6QunddSFeMyROROOL5T4MFPWK1gTorPpNWO8oQ=";
+    hash = "sha256-alZBTwrImneGNXRWCJy/EhDKWT3/sy4j6BB5fOML8ZA=";
   };
 
   propagatedBuildInputs = [
@@ -31,6 +31,7 @@ buildPythonPackage rec {
   meta = with lib; {
     description = "CDN module of Aliyun Python SDK";
     homepage = "https://github.com/aliyun/aliyun-openapi-python-sdk";
+    changelog = "https://github.com/aliyun/aliyun-openapi-python-sdk/blob/master/aliyun-python-sdk-cdn/ChangeLog.txt";
     license = licenses.asl20;
     maintainers = with maintainers; [ fab ];
   };

pkgs/development/python-modules/aliyun-python-sdk-config/default.nix

@@ -7,14 +7,14 @@
 
 buildPythonPackage rec {
   pname = "aliyun-python-sdk-config";
-  version = "2.2.1";
+  version = "2.2.2";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-Me5z68cOfLt8PDHaZ1b/F/KG5mtYAW3LXmNd+0epha8=";
+    hash = "sha256-cX3DqY8n0UEq9F1xOQI3IQi2Rc4cutcT0y3xc5G9dcg=";
   };
 
   propagatedBuildInputs = [
@@ -31,6 +31,7 @@ buildPythonPackage rec {
   meta = with lib; {
     description = "Configuration module of Aliyun Python SDK";
     homepage = "https://github.com/aliyun/aliyun-openapi-python-sdk";
+    changelog = "https://github.com/aliyun/aliyun-openapi-python-sdk/blob/master/aliyun-python-sdk-config/ChangeLog.txt";
     license = licenses.asl20;
     maintainers = with maintainers; [ fab ];
   };

pkgs/development/python-modules/aliyun-python-sdk-core/default.nix

@@ -40,6 +40,7 @@ buildPythonPackage rec {
   meta = with lib; {
     description = "Core module of Aliyun Python SDK";
     homepage = "https://github.com/aliyun/aliyun-openapi-python-sdk";
+    changelog = "https://github.com/aliyun/aliyun-openapi-python-sdk/blob/master/aliyun-python-sdk-core/ChangeLog.txt";
     license = licenses.asl20;
     maintainers = with maintainers; [ fab ];
   };

pkgs/development/python-modules/aliyun-python-sdk-dbfs/default.nix

@@ -31,6 +31,7 @@ buildPythonPackage rec {
   meta = with lib; {
     description = "DBFS module of Aliyun Python SDK";
     homepage = "https://github.com/aliyun/aliyun-openapi-python-sdk";
+    changelog = "https://github.com/aliyun/aliyun-openapi-python-sdk/blob/master/aliyun-python-sdk-dbfs/ChangeLog.txt";
     license = licenses.asl20;
     maintainers = with maintainers; [ fab ];
   };

pkgs/development/python-modules/aliyun-python-sdk-iot/default.nix

@@ -7,14 +7,14 @@
 
 buildPythonPackage rec {
   pname = "aliyun-python-sdk-iot";
-  version = "8.45.0";
+  version = "8.47.0";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-9vLc+Rp81P28lCs6KM8Dmt97lPlhnWd6hqZZDTdQEGk=";
+    hash = "sha256-4NcobMGamIhBnACEQJ9Kvdvj9k4XjJx/Urx38nslAa8=";
   };
 
   propagatedBuildInputs = [
@@ -31,6 +31,7 @@ buildPythonPackage rec {
   meta = with lib; {
     description = "IoT module of Aliyun Python SDK";
     homepage = "https://github.com/aliyun/aliyun-openapi-python-sdk";
+    changelog = "https://github.com/aliyun/aliyun-openapi-python-sdk/blob/master/aliyun-python-sdk-iot/ChangeLog.txt";
     license = licenses.asl20;
     maintainers = with maintainers; [ fab ];
   };

pkgs/development/python-modules/aliyun-python-sdk-kms/default.nix

@@ -31,6 +31,7 @@ buildPythonPackage rec {
   meta = with lib; {
     description = "KMS module of Aliyun Python SDK";
     homepage = "https://github.com/aliyun/aliyun-openapi-python-sdk";
+    changelog = "https://github.com/aliyun/aliyun-openapi-python-sdk/blob/master/aliyun-python-sdk-kms/ChangeLog.txt";
     license = licenses.asl20;
     maintainers = with maintainers; [ fab ];
   };

pkgs/development/python-modules/aliyun-python-sdk-sts/default.nix

@@ -31,6 +31,7 @@ buildPythonPackage rec {
   meta = with lib; {
     description = "STS module of Aliyun Python SDK";
     homepage = "https://github.com/aliyun/aliyun-openapi-python-sdk";
+    changelog = "https://github.com/aliyun/aliyun-openapi-python-sdk/blob/master/aliyun-python-sdk-sts/ChangeLog.txt";
     license = licenses.asl20;
     maintainers = with maintainers; [ fab ];
   };

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

@@ -10,7 +10,7 @@
 
 buildPythonPackage rec {
   pname = "boschshcpy";
-  version = "0.2.37";
+  version = "0.2.38";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
@@ -19,7 +19,7 @@ buildPythonPackage rec {
     owner = "tschamm";
     repo = pname;
     rev = version;
-    sha256 = "sha256-ax1tdqxY4VPuNdH9lJKh5Izmu03XALJ93x5zmSCbeJk=";
+    sha256 = "sha256-PDS68JJsnKO2MVlNxvhlDEGuK7zlsGhCRVOLZ/TSlTM=";
   };
 
   propagatedBuildInputs = [

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

@@ -1,8 +1,35 @@
-{ stdenv, lib, buildPythonPackage, fetchPypi, makeWrapper, isPy3k
+{ lib
-, python, twisted, jinja2, msgpack, zope_interface, sqlalchemy, alembic
+, stdenv
-, python-dateutil, txaio, autobahn, pyjwt, pyyaml, treq, txrequests, pypugjs
+, buildPythonPackage
-, boto3, moto, mock, lz4, setuptoolsTrial
+, fetchPypi
-, buildbot-worker, buildbot-pkg, buildbot-plugins, parameterized, git, openssh
+, makeWrapper
+, pythonOlder
+, python
+, twisted
+, jinja2
+, msgpack
+, zope_interface
+, sqlalchemy
+, alembic
+, python-dateutil
+, txaio
+, autobahn
+, pyjwt
+, pyyaml
+, treq
+, txrequests
+, pypugjs
+, boto3
+, moto
+, mock
+, lz4
+, setuptoolsTrial
+, buildbot-worker
+, buildbot-pkg
+, buildbot-plugins
+, parameterized
+, git
+, openssh
 , glibcLocales
 , nixosTests
 }:
@@ -17,7 +44,10 @@ let
     dontBuild = true;
     doCheck = false;
 
-    nativeBuildInputs = [ makeWrapper ];
+    nativeBuildInputs = [
+      makeWrapper
+    ];
+
     propagatedBuildInputs = plugins ++ package.propagatedBuildInputs;
 
     installPhase = ''
@@ -33,11 +63,14 @@ let
 
   package = buildPythonPackage rec {
     pname = "buildbot";
-    version = "3.6.1";
+    version = "3.7.0";
+    format = "setuptools";
+
+    disabled = pythonOlder "3.7";
 
     src = fetchPypi {
       inherit pname version;
-      sha256 = "sha256-ByJPkI0AHis+Ey1lSuMly4M6W4s/xes4eG0gPPJ3fZA=";
+      hash = "sha256-YMLT1SP6NenJIUVTvr58GVrtNXHw+bhfgMpZu3revG4=";
     };
 
     propagatedBuildInputs = [
@@ -96,8 +129,6 @@ let
       rm buildbot/test/integration/test_graphql.py
     '';
 
-    disabled = !isPy3k;
-
     passthru = {
       inherit withPlugins;
       tests.buildbot = nixosTests.buildbot;
@@ -105,11 +136,12 @@ let
     };
 
     meta = with lib; {
-      broken = stdenv.isDarwin;
-      homepage = "https://buildbot.net/";
       description = "An open-source continuous integration framework for automating software build, test, and release processes";
+      homepage = "https://buildbot.net/";
+      changelog = "https://github.com/buildbot/buildbot/releases/tag/v${version}";
       maintainers = with maintainers; [ ryansydnor lopsided98 ];
-      license = licenses.gpl2;
+      license = licenses.gpl2Only;
+      broken = stdenv.isDarwin;
     };
   };
 in package

pkgs/development/python-modules/buildbot/pkg.nix

@@ -6,7 +6,7 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-YmAO8o25uVk1KlyzFg79025KyiopXxWZVpfrvI0H8c4=";
+    sha256 = "sha256-4BXCOLW5e7RuZEzyD+oRmS2I4oT2W3oTcH4ZPxwKKvU=";
   };
 
   postPatch = ''

pkgs/development/python-modules/buildbot/plugins.nix

@@ -7,7 +7,7 @@
 
     src = fetchPypi {
       inherit pname version;
-      sha256 = "sha256-MXCLaFXmZCzLp3nuzK2PW4aa1CC5JOXkvvswAbMwkXI=";
+      sha256 = "sha256-t4xHfox6h5PY4+phdCQbClHd77+WfpUWErMZCEcMxu0=";
     };
 
     # Remove unneccessary circular dependency on buildbot
@@ -34,7 +34,7 @@
 
     src = fetchPypi {
       inherit pname version;
-      sha256 = "sha256-U89IyfhgIjrf6XH5pFod89zDE9Ln817AHMBCRTPw4tQ=";
+      sha256 = "sha256-JySn7QO+SgoXjVeV4wYwc9twr0Q2c/wsEspqeq038+k=";
     };
 
     buildInputs = [ buildbot-pkg ];
@@ -56,7 +56,7 @@
 
     src = fetchPypi {
       inherit pname version;
-      sha256 = "sha256-vbf4mMbgCePXlPwQQWeC7knBP1WZhhhEggy1ULNESG8=";
+      sha256 = "sha256-935eeF2kpT68lK/UMg8MZQOYEj7D8FaT9iSs/lNahYA=";
     };
 
     buildInputs = [ buildbot-pkg ];
@@ -78,7 +78,7 @@
 
     src = fetchPypi {
       inherit pname version;
-      sha256 = "sha256-haLbaeE1aKhHRT5UsKABBeNBRRvt7bVKalT3doQU7SI=";
+      sha256 = "sha256-3pHSiVoOZj2iCGfiz+tMWWMPHSBH5Ggp6e3+a8topsg=";
     };
 
     buildInputs = [ buildbot-pkg ];
@@ -100,7 +100,7 @@
 
     src = fetchPypi {
       inherit pname version;
-      sha256 = "sha256-zarpv8kwJMFwfZYA+EqEc7636tKud9wXfAbrlZM4bB4=";
+      sha256 = "sha256-5Qr1FeYIJG/qaFaTB7ScFN9uca+joHKE6FlfKwhubfo=";
     };
 
     buildInputs = [ buildbot-pkg ];

pkgs/development/python-modules/buildbot/worker.nix

@@ -28,7 +28,7 @@ buildPythonPackage (rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-13I7sttnxO6vORFZzpOKmXu3PfwOpSGmXqvozrhzIm0=";
+    sha256 = "sha256-Lc+FNrfXLfeEnDqNBs9R96jtoFEOCG2vLRWGKip/+VM=";
   };
 
   postPatch = ''

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

@@ -31,7 +31,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "poets-ai";
     repo = pname;
-    rev = version;
+    rev = "refs/tags/${version}";
     hash = "sha256-FZmLriYhsX+zyQKCtCjbOy6MH+AvjzHRNUyaDSXGlLI=";
   };
 
@@ -73,9 +73,9 @@ buildPythonPackage rec {
 
   checkInputs = [
     pytestCheckHook
-    torch
     sh
     tensorflow
+    torch
   ];
 
   disabledTests = [
@@ -89,6 +89,7 @@ buildPythonPackage rec {
   meta = with lib; {
     description = "Neural Networks framework based on Jax inspired by Keras and Haiku";
     homepage = "https://github.com/poets-ai/elegy";
+    changelog = "https://github.com/poets-ai/elegy/releases/tag/${version}";
     license = licenses.asl20;
     maintainers = with maintainers; [ ndl ];
   };

pkgs/development/python-modules/elmax-api/default.nix

@@ -9,7 +9,7 @@
 
 buildPythonPackage rec {
   pname = "elmax-api";
-  version = "0.0.2";
+  version = "0.0.3";
   format = "setuptools";
 
   disabled = pythonOlder "3.8";
@@ -17,8 +17,8 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "albertogeniola";
     repo = pname;
-    rev = "v${version}";
+    rev = "refs/tags/v${version}";
-    sha256 = "sha256-YUnLi8+ibUgWoMFMgZPSPbpr286bnWBefxjOV7JfCuY=";
+    hash = "sha256-ZqPDnIiFzxS6nU19bfEgnqEsuz7oI+Z4ac6br6Gr4Vk=";
   };
 
   propagatedBuildInputs = [
@@ -37,6 +37,7 @@ buildPythonPackage rec {
   meta = with lib; {
     description = "Python library for interacting with the Elmax cloud";
     homepage = "https://github.com/albertogeniola/elmax-api";
+    changelog = "https://github.com/albertogeniola/elmax-api/releases/tag/v${version}";
     license = with licenses; [ asl20 ];
     maintainers = with maintainers; [ fab ];
   };

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

@@ -16,7 +16,7 @@
 
 buildPythonPackage rec {
   pname = "fakeredis";
-  version = "2.1.0";
+  version = "2.2.0";
   format = "pyproject";
 
   disabled = pythonOlder "3.7";
@@ -25,7 +25,7 @@ buildPythonPackage rec {
     owner = "dsoftwareinc";
     repo = "fakeredis-py";
     rev = "refs/tags/v${version}";
-    hash = "sha256-d+colAAESTt2YME8URX3e/l6GsC1l0vzg3wY/NQPkDk=";
+    hash = "sha256-W24DMVp3E6SYaVTUYCRDm/tLaGcjDqecO3rN1RO/J84=";
   };
 
   nativeBuildInputs = [

pkgs/development/python-modules/invisible-watermark/default.nix

@@ -3,7 +3,7 @@
 , pythonOlder
 , fetchFromGitHub
 , opencv4
-, pytorch
+, torch
 , onnx
 , onnxruntime
 , pillow
@@ -14,6 +14,7 @@
 buildPythonPackage rec {
   pname = "invisible-watermark";
   version = "0.1.5";
+  format = "setuptools";
   disabled = pythonOlder "3.6";
 
   src = fetchFromGitHub {
@@ -25,7 +26,7 @@ buildPythonPackage rec {
 
   propagatedBuildInputs = [
     opencv4
-    pytorch
+    torch
     onnx
     onnxruntime
     pillow

pkgs/development/python-modules/mapbox-earcut/default.nix

@@ -6,29 +6,43 @@
 , pybind11
 , pytestCheckHook
 , setuptools
+, pythonOlder
 }:
 
 buildPythonPackage rec {
   pname = "mapbox-earcut";
-  version = "1.0.0";
+  version = "1.0.1";
+  format = "setuptools";
+
+  disabled = pythonOlder "3.7";
 
   src = fetchFromGitHub {
     owner = "skogler";
     repo = "mapbox_earcut_python";
-    rev = "v${version}";
+    rev = "refs/tags/v${version}";
-    sha256 = "m4q2qTL55fkdi3hm75C3/XV9SUQkpJS+B5SEgpPEctk=";
+    hash = "sha256-+Vxvo++bkoCsJFmt/u1eaqhgpz8Uddz06iIi66ju+MQ=";
   };
 
-  nativeBuildInputs = [ setuptools pybind11 ];
+  nativeBuildInputs = [
+    setuptools
+    pybind11
+  ];
 
-  propagatedBuildInputs = [ numpy ];
+  propagatedBuildInputs = [
+    numpy
+  ];
 
-  checkInputs = [ pytestCheckHook ];
+  checkInputs = [
+    pytestCheckHook
+  ];
 
-  pythonImportsCheck = [ "mapbox_earcut" ];
+  pythonImportsCheck = [
+    "mapbox_earcut"
+  ];
 
   meta = with lib; {
     homepage = "https://github.com/skogler/mapbox_earcut_python";
+    changelog = "https://github.com/skogler/mapbox_earcut_python/releases/tag/v${version}";
     license = licenses.isc;
     description = "Mapbox-earcut fast triangulation of 2D-polygons";
     longDescription = ''

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

@@ -11,7 +11,7 @@
 
 buildPythonPackage rec {
   pname = "oauthlib";
-  version = "3.2.1";
+  version = "3.2.2";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
@@ -20,7 +20,7 @@ buildPythonPackage rec {
     owner = pname;
     repo = pname;
     rev = "v${version}";
-    hash = "sha256-9Du0REnN7AkvMmejXsWc7Uy+YF8MYeLK+QnYHbrPhPA=";
+    hash = "sha256-KADS1pEaLYi86LEt2VVuz8FVTBANzxC8EeQLgGMxuBU=";
   };
 
   propagatedBuildInputs = [

pkgs/development/python-modules/pyqt/6.x.nix

@@ -1,4 +1,5 @@
 { lib
+, stdenv
 , buildPythonPackage
 , isPy27
 , fetchPypi
@@ -134,5 +135,7 @@ buildPythonPackage rec {
     license = licenses.gpl3Only;
     platforms = platforms.mesaPlatforms;
     maintainers = with maintainers; [ LunNova ];
+    # python3Packages.pyqt-builder needs to be patched
+    broken = stdenv.isDarwin;
   };
 }

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

@@ -9,7 +9,7 @@
 
 buildPythonPackage rec {
   pname = "pyswitchbot";
-  version = "0.20.8";
+  version = "0.22.0";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
@@ -18,7 +18,7 @@ buildPythonPackage rec {
     owner = "Danielhiversen";
     repo = "pySwitchbot";
     rev = "refs/tags/${version}";
-    hash = "sha256-fSuWpxao56WSfgW3ZEhcyfWuVG9ebLVfBHK1GN1Nffk=";
+    hash = "sha256-/FECjJ/iVx4CTtOgxpPBF0lZCctghmD4qUrQQYwmAkQ=";
   };
 
   propagatedBuildInputs = [

pkgs/development/python-modules/sentry-sdk/default.nix

@@ -40,7 +40,7 @@
 
 buildPythonPackage rec {
   pname = "sentry-sdk";
-  version = "1.11.0";
+  version = "1.11.1";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
@@ -49,7 +49,7 @@ buildPythonPackage rec {
     owner = "getsentry";
     repo = "sentry-python";
     rev = "refs/tags/${version}";
-    hash = "sha256-PObYXwWYQ7cC//W3c+n/qceu2ShjFqMGAaLyNflwcL4=";
+    hash = "sha256-2AAi9BrF15TDiv9v2d/UF9JPgJheet33k+7iHqPlw5g=";
   };
 
   propagatedBuildInputs = [

pkgs/development/python-modules/slack-sdk/default.nix

@@ -21,7 +21,7 @@
 
 buildPythonPackage rec {
   pname = "slack-sdk";
-  version = "3.19.4";
+  version = "3.19.5";
   format = "setuptools";
 
   disabled = pythonOlder "3.6";
@@ -30,7 +30,7 @@ buildPythonPackage rec {
     owner = "slackapi";
     repo = "python-slack-sdk";
     rev = "refs/tags/v${version}";
-    hash = "sha256-cSPua601vQRJ431Sh02CLFtNb7pqbrkJ5ned/NjKM4s=";
+    hash = "sha256-/DVcnfHjvmRreHSlZbzxz6pbqytEUdqbaGbQVxIW4Qk=";
   };
 
   propagatedBuildInputs = [

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

@@ -15,16 +15,16 @@
 
 buildPythonPackage rec {
   pname = "slowapi";
-  version = "0.1.6";
+  version = "0.1.7";
   format = "pyproject";
 
-  disabled = pythonOlder "3.6";
+  disabled = pythonOlder "3.7";
 
   src = fetchFromGitHub {
     owner = "laurentS";
     repo = pname;
-    rev = "v${version}";
+    rev = "refs/tags/v${version}";
-    sha256 = "sha256-3ZkQnroHMCHuTPH/cvi/iWndvdyQ/ZJQ2Qtu1CZyeGg=";
+    hash = "sha256-IAB7JW8iVb5M610GVK0POXlSiya22KzNgr26BNvPC4Q=";
   };
 
   nativeBuildInputs = [
@@ -65,6 +65,7 @@ buildPythonPackage rec {
   meta = with lib; {
     description = "Python library for API rate limiting";
     homepage = "https://github.com/laurentS/slowapi";
+    changelog = "https://github.com/laurentS/slowapi/blob/v${version}/CHANGELOG.md";
     license = with licenses; [ mit ];
     maintainers = with maintainers; [ fab ];
   };

pkgs/development/python-modules/sphinxext-opengraph/default.nix

@@ -4,19 +4,26 @@
 , sphinx
 , pytestCheckHook
 , beautifulsoup4
+, setuptools-scm
 }:
 
 buildPythonPackage rec {
   pname = "sphinxext-opengraph";
-  version = "0.6.3";
+  version = "0.7.3";
 
   src = fetchFromGitHub {
     owner = "wpilibsuite";
     repo = "sphinxext-opengraph";
     rev = "v${version}";
-    sha256 = "sha256-YR6TlsmND5IhLdbPbmtVhRN2vSZfx70g2a6Yn6y6L/M=";
+    hash = "sha256-KzbtuDTMXsp9yf3hiiG6VzpUbSEm3bOtujApsG37H14=";
   };
 
+  SETUPTOOLS_SCM_PRETEND_VERSION = version;
+
+  nativeBuildInputs = [
+    setuptools-scm
+  ];
+
   propagatedBuildInputs = [
     sphinx
   ];

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

@@ -15,7 +15,7 @@
 
 buildPythonPackage rec {
   pname = "teslajsonpy";
-  version = "3.4.0";
+  version = "3.4.1";
   format = "pyproject";
 
   disabled = pythonOlder "3.7";
@@ -24,7 +24,7 @@ buildPythonPackage rec {
     owner = "zabuldon";
     repo = pname;
     rev = "refs/tags/v${version}";
-    hash = "sha256-R3/Oh1sQCTPooL6+wNz2KD9NlxxshslT4DgSkga0x8k=";
+    hash = "sha256-RPCzxcuD57ma306GLYsxxvvvZ0e8RTd/KxOeMSaQQQQ=";
   };
 
   nativeBuildInputs = [

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

@@ -10,7 +10,7 @@
 
 buildPythonPackage rec {
   pname = "ttls";
-  version = "1.4.3";
+  version = "1.5.1";
   format = "pyproject";
 
   disabled = pythonOlder "3.8";
@@ -18,8 +18,8 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "jschlyter";
     repo = pname;
-    rev = "v${version}";
+    rev = "refs/tags/v${version}";
-    hash = "sha256-lBmkfB7HXB+1xLbfOl4wVtsOVfKhztoDBqzV8i6bFAg=";
+    hash = "sha256-Oh70mLwTaJ2+uQDr2t6wAgskW5L06mZxtD/8dE01YA0=";
   };
 
   nativeBuildInputs = [
@@ -42,6 +42,7 @@ buildPythonPackage rec {
   meta = with lib; {
     description = "Module to interact with Twinkly LEDs";
     homepage = "https://github.com/jschlyter/ttls";
+    changelog = "https://github.com/jschlyter/ttls/blob/v${version}/CHANGES.md";
     license = licenses.mit;
     maintainers = with maintainers; [ fab ];
   };

pkgs/development/python-modules/ttp-templates/default.nix

@@ -7,7 +7,7 @@
 
 buildPythonPackage rec {
   pname = "ttp-templates";
-  version = "0.3.1";
+  version = "0.3.2";
   format = "pyproject";
 
   disabled = pythonOlder "3.7";
@@ -16,7 +16,7 @@ buildPythonPackage rec {
     owner = "dmulyalin";
     repo = "ttp_templates";
     rev = "refs/tags/${version}";
-    hash = "sha256-35Ej76E9qy5EY41Jt2GDCldyXq7IkdqKxVFrBOJh9nE=";
+    hash = "sha256-Bm9//hahM1sP/XDUDR7JcGWz0qF8ovkWZU5x/qj0UZg=";
   };
 
   nativeBuildInputs = [
@@ -34,6 +34,7 @@ buildPythonPackage rec {
   meta = with lib; {
     description = "Template Text Parser Templates collections";
     homepage = "https://github.com/dmulyalin/ttp_templates";
+    changelog = "https://github.com/dmulyalin/ttp_templates/releases/tag/${version}";
     license = licenses.mit;
     maintainers = with maintainers; [ fab ];
   };

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

@@ -14,7 +14,7 @@
 
 buildPythonPackage rec {
   pname = "twilio";
-  version = "7.15.3";
+  version = "7.15.4";
   format = "setuptools";
 
   disabled = pythonOlder "3.6";
@@ -23,7 +23,7 @@ buildPythonPackage rec {
     owner = "twilio";
     repo = "twilio-python";
     rev = "refs/tags/${version}";
-    hash = "sha256-c1UNqp8eYK9tkogpcDtTOTHa5ME+yOkop2UccXwOAqM=";
+    hash = "sha256-V7JLFesMj0W6k9+svgIBAfemDWiyi7DGdFLBk4/wd+8=";
   };
 
   propagatedBuildInputs = [
@@ -53,6 +53,7 @@ buildPythonPackage rec {
   meta = with lib; {
     description = "Twilio API client and TwiML generator";
     homepage = "https://github.com/twilio/twilio-python/";
+    changelog = "https://github.com/twilio/twilio-python/blob/${version}/CHANGES.md";
     license = licenses.mit;
     maintainers = with maintainers; [ fab ];
   };

pkgs/development/python-modules/websocket-client/default.nix

@@ -4,29 +4,31 @@
 , pythonOlder
 , pytestCheckHook
 , python-socks
-, six
 }:
 
 buildPythonPackage rec {
   pname = "websocket-client";
-  version = "1.4.1";
+  version = "1.4.2";
-  disabled = pythonOlder "3.6";
+  format = "setuptools";
+
+  disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-+WEetlyCQaZ/s3O+8ECzz4rTd6n2VGoStiC2UR6Oqe8=";
+    hash = "sha256-1uj5DKji3U6AJ8RWGt65RWtUBEMS26ZV58rmUs65rlk=";
   };
 
   propagatedBuildInputs = [
     python-socks
-    six
    ];
 
   checkInputs = [
     pytestCheckHook
   ];
 
-  pythonImportsCheck = [ "websocket" ];
+  pythonImportsCheck = [
+    "websocket"
+  ];
 
   meta = with lib; {
     description = "Websocket client for Python";

pkgs/development/python-modules/weconnect-mqtt/default.nix

@@ -10,7 +10,7 @@
 
 buildPythonPackage rec {
   pname = "weconnect-mqtt";
-  version = "0.40.3";
+  version = "0.41.1";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
@@ -19,7 +19,7 @@ buildPythonPackage rec {
     owner = "tillsteinbach";
     repo = "WeConnect-mqtt";
     rev = "refs/tags/v${version}";
-    hash = "sha256-kV4BWQ4XfB2QjXY5b46+pxt3rhyo1glKRYO2mMJNhJM=";
+    hash = "sha256-RYxfz5uBWV1HLbcIK1N/glJv2w0nfPLBPyM2b7HuDIY=";
   };
 
   propagatedBuildInputs = [
@@ -47,6 +47,7 @@ buildPythonPackage rec {
   meta = with lib; {
     description = "Python client that publishes data from Volkswagen WeConnect";
     homepage = "https://github.com/tillsteinbach/WeConnect-mqtt";
+    changelog = "https://github.com/tillsteinbach/WeConnect-mqtt/releases/tag/v${version}";
     license = with licenses; [ mit ];
     maintainers = with maintainers; [ fab ];
   };

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

@@ -12,7 +12,7 @@
 
 buildPythonPackage rec {
   pname = "weconnect";
-  version = "0.48.3";
+  version = "0.50.1";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
@@ -21,7 +21,7 @@ buildPythonPackage rec {
     owner = "tillsteinbach";
     repo = "WeConnect-python";
     rev = "refs/tags/v${version}";
-    hash = "sha256-GXTjG/3Gk58C6TxKrgtblUZI+xf7Te9OA8HnDvNEIvA=";
+    hash = "sha256-KYGNtUJXpY1UrRbUxr71EHxLCR6WixTAk+ybkfqB3Ps=";
   };
 
   propagatedBuildInputs = [
@@ -48,7 +48,7 @@ buildPythonPackage rec {
       --replace "setup_requires=SETUP_REQUIRED," "setup_requires=[]," \
       --replace "tests_require=TEST_REQUIRED," "tests_require=[],"
     substituteInPlace image_extra_requirements.txt \
-      --replace "pillow~=9.2.0" "pillow"
+      --replace "pillow~=9.3.0" "pillow"
     substituteInPlace pytest.ini \
       --replace "--cov=weconnect --cov-config=.coveragerc --cov-report html" "" \
       --replace "pytest-cov" ""
@@ -61,6 +61,7 @@ buildPythonPackage rec {
   meta = with lib; {
     description = "Python client for the Volkswagen WeConnect Services";
     homepage = "https://github.com/tillsteinbach/WeConnect-python";
+    changelog = "https://github.com/tillsteinbach/WeConnect-python/releases/tag/v${version}";
     license = with licenses; [ mit ];
     maintainers = with maintainers; [ fab ];
   };

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

@@ -7,14 +7,14 @@
 
 buildPythonPackage rec {
   pname = "winacl";
-  version = "0.1.5";
+  version = "0.1.6";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-8/dLFbzn7ARuJ27MA8LSMCykBdEntYQXuOyj/yqjaWE=";
+    hash = "sha256-GAw3Vgej9v8gSIpMaN2pbOptWsqTvC0Kph70yfj2LDQ=";
   };
 
   propagatedBuildInputs = [
@@ -36,6 +36,7 @@ buildPythonPackage rec {
   meta = with lib; {
     description = "Python module for ACL/ACE/Security descriptor manipulation";
     homepage = "https://github.com/skelsec/winacl";
+    changelog = "https://github.com/skelsec/winacl/releases/tag/${version}";
     license = with licenses; [ mit ];
     maintainers = with maintainers; [ fab ];
   };

pkgs/development/tools/ansible-language-server/default.nix

@@ -0,0 +1,43 @@
+{ lib
+, buildNpmPackage
+, fetchFromGitHub
+}:
+
+buildNpmPackage rec {
+  pname = "ansible-language-server";
+  version = "1.0.2-next.0";
+
+  src = fetchFromGitHub {
+    owner = "ansible";
+    repo = pname;
+    rev = "refs/tags/v${version}";
+    hash = "sha256-E4xWwqXl5n/eChJ8JM32K2gTYE/F8Y76J3Sll++48Uo=";
+  };
+
+  npmDepsHash = "sha256-8FP6hF85w1Zbhiwi2V350ZWFAykAfvsXRGL8bvGk1XE=";
+  npmBuildScript = "compile";
+
+  # We remove the prepare and prepack scripts because they run the
+  # build script, and therefore are redundant.
+  #
+  # Additionally, the prepack script runs npm ci in addition to the
+  # build script. Directly before npm pack is run, we make npm unaware
+  # of the dependency cache, causing the npm ci invocation to fail,
+  # wiping out node_modules, which causes a mysterious error stating that tsc isn't installed.
+  postPatch = ''
+    sed -i '/"prepare"/d' package.json
+    sed -i '/"prepack"/d' package.json
+  '';
+
+  passthru.updateScript = {
+    attrPath = pname;
+  };
+
+  meta = with lib; {
+    changelog = "https://github.com/ansible/ansible-language-server/releases/tag/v${version}";
+    description = "Ansible Language Server";
+    homepage = "https://github.com/ansible/ansible-language-server";
+    license = licenses.mit;
+    maintainers = with maintainers; [ hexa ];
+  };
+}

pkgs/development/tools/appthreat-depscan/default.nix

@@ -5,13 +5,13 @@
 
 python3.pkgs.buildPythonApplication rec {
   pname = "appthreat-depscan";
-  version = "3.2.3";
+  version = "3.2.7";
 
   src = fetchFromGitHub {
     owner = "AppThreat";
     repo = "dep-scan";
     rev = "refs/tags/v${version}";
-    hash = "sha256-VWFYgRIpEmOpOonazoRF0wPUfAiOu90gxm22M6Wkvgo=";
+    hash = "sha256-nHKEELQzcMKvxAC+u4lPBglsMwyzRpiQF3O+felHTbk=";
   };
 
   propagatedBuildInputs = with python3.pkgs; [

pkgs/development/tools/esbuild/default.nix

@@ -2,13 +2,13 @@
 
 buildGoModule rec {
   pname = "esbuild";
-  version = "0.15.16";
+  version = "0.15.18";
 
   src = fetchFromGitHub {
     owner = "evanw";
     repo = "esbuild";
     rev = "v${version}";
-    sha256 = "sha256-m23K1BH1Cw452GN14G9rmFi0a+sGnPwIdSyWXqTqiKw=";
+    sha256 = "sha256-b9R1ML+pgRg9j2yrkQmBulPuLHYLUQvW+WTyR/Cq6zE=";
   };
 
   vendorSha256 = "sha256-+BfxCyg0KkDQpHt/wycy/8CTG6YBA/VJvJFhhzUnSiQ=";
@@ -20,6 +20,7 @@ buildGoModule rec {
   meta = with lib; {
     description = "An extremely fast JavaScript bundler";
     homepage = "https://esbuild.github.io";
+    changelog = "https://github.com/evanw/esbuild/blob/v${version}/CHANGELOG.md";
     license = licenses.mit;
     maintainers = with maintainers; [ lucus16 marsam ];
   };

pkgs/development/tools/metal-cli/default.nix

@@ -1,24 +1,31 @@
-{ lib, buildGoModule, fetchFromGitHub, installShellFiles }:
+{ lib
+, buildGoModule
+, fetchFromGitHub
+, installShellFiles
+}:
 
 buildGoModule rec {
   pname = "metal-cli";
-  version = "0.11.0";
+  version = "0.12.0";
 
   src = fetchFromGitHub {
     owner = "equinix";
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-tbnG/MF83cAnsG2LOqdQSGF2XT+UWSzIpxVbkolzEQQ=";
+    hash = "sha256-oPMojw6CGncBJ8PZOTrzvQu2gRs1cw1Jwi38eOZggI8=";
   };
 
-  vendorSha256 = "sha256-drsNZXLNUWICLI8D+IvJE4X8GmWrP9U3dmpf9HnKCWw=";
+  vendorHash = "sha256-drsNZXLNUWICLI8D+IvJE4X8GmWrP9U3dmpf9HnKCWw=";
 
   ldflags = [
-    "-s" "-w"
+    "-s"
+    "-w"
     "-X github.com/equinix/metal-cli/cmd.Version=${version}"
   ];
 
-  nativeBuildInputs = [ installShellFiles ];
+  nativeBuildInputs = [
+    installShellFiles
+  ];
 
   postInstall = ''
     installShellCompletion --cmd metal \
@@ -30,6 +37,7 @@ buildGoModule rec {
   doCheck = false;
 
   doInstallCheck = true;
+
   installCheckPhase = ''
       $out/bin/metal --version | grep ${version}
   '';
@@ -37,6 +45,7 @@ buildGoModule rec {
   meta = with lib; {
     description = "Official Equinix Metal CLI";
     homepage = "https://github.com/equinix/metal-cli/";
+    changelog = "https://github.com/equinix/metal-cli/releases/tag/v${version}";
     license = licenses.mit;
     maintainers = with maintainers; [ Br1ght0ne nshalman ];
     mainProgram = "metal";

pkgs/development/tools/misc/patsh/default.nix

@@ -1,30 +1,44 @@
 { lib
+, runCommand
 , rustPlatform
 , fetchFromGitHub
 , stdenv
-, runCommand
+, coreutils
-, tree-sitter
 }:
 
+let
+  # copied from flake.nix
+  # tests require extra setup with nix
+  custom = runCommand "custom" { } ''
+    mkdir -p $out/bin
+    touch $out/bin/{'foo$','foo"`'}
+    chmod +x $out/bin/{'foo$','foo"`'}
+  '';
+in
+
 rustPlatform.buildRustPackage rec {
   pname = "patsh";
-  version = "0.1.3";
+  version = "0.2.0";
 
   src = fetchFromGitHub {
     owner = "nix-community";
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-KmQVZwZC7KHlzNnL2IKQ76wHUDNUZKz/aFaY4ujvBo4=";
+    sha256 = "sha256-7HXJspebluQeejKYmVA7sy/F3dtU1gc4eAbKiPexMMA=";
   };
 
-  cargoSha256 = "sha256-vozQKBxAVELdqTnqBpgHX0Wyk18EZAtpiRsKjwz8xKE=";
+  cargoSha256 = "sha256-R6ScpLYbEJAu7+CyJsMdljtXq7wsMojHK5O1lH+E/E8=";
 
-  # tests fail on darwin due to rpath issues
+  checkInputs = [ custom ];
-  doCheck = !stdenv.isDarwin;
 
-  TREE_SITTER_BASH = runCommand "tree-sitter-bash" { } ''
+  # see comment on `custom`
-    mkdir $out
+  postPatch = ''
-    ln -s ${tree-sitter.builtGrammars.tree-sitter-bash}/parser $out/libtree-sitter-bash.a
+    for file in tests/fixtures/*-expected.sh; do
+      substituteInPlace $file \
+        --subst-var-by cc ${stdenv.cc} \
+        --subst-var-by coreutils ${coreutils} \
+        --subst-var-by custom ${custom}
+    done
   '';
 
   meta = with lib; {

pkgs/development/tools/nap/default.nix

@@ -0,0 +1,24 @@
+{ lib, buildGoModule, fetchFromGitHub, callPackage }:
+
+buildGoModule rec {
+  pname = "nap";
+  version = "0.1.1";
+
+  src = fetchFromGitHub {
+    owner = "maaslalani";
+    repo = pname;
+    rev = "v${version}";
+    sha256 = "0b3sz8zp1nwcjl02b3lli5yjc7vfay1ig6fs8bgxwz22imfx076p";
+  };
+
+  vendorSha256 = "sha256-puCqql77kvdWTcwp8z6LExBt/HbNRNe0f+wtM0kLoWM=";
+
+  excludedPackages = ".nap";
+
+  meta = {
+    description = "Code snippets in your terminal 🛌";
+    homepage = "https://github.com/maaslalani/nap";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ phdcybersec maaslalani ];
+  };
+}