Merge master into staging-next

nixos/modules/misc/version.nix

@@ -103,9 +103,10 @@ in
       ''
         NAME=NixOS
         ID=nixos
-        VERSION="${cfg.version} (${cfg.codeName})"
+        VERSION="${cfg.release} (${cfg.codeName})"
         VERSION_CODENAME=${toLower cfg.codeName}
-        VERSION_ID="${cfg.version}"
+        VERSION_ID="${cfg.release}"
+        BUILD_ID="${cfg.version}"
         PRETTY_NAME="NixOS ${cfg.release} (${cfg.codeName})"
         LOGO="nix-snowflake"
         HOME_URL="https://nixos.org/"

nixos/modules/module-list.nix

@@ -519,6 +519,7 @@
   ./services/misc/logkeys.nix
   ./services/misc/leaps.nix
   ./services/misc/lidarr.nix
+  ./services/misc/libreddit.nix
   ./services/misc/lifecycled.nix
   ./services/misc/mame.nix
   ./services/misc/matrix-appservice-discord.nix

nixos/modules/services/misc/libreddit.nix

@@ -0,0 +1,66 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+  let
+    cfg = config.services.libreddit;
+
+    args = concatStringsSep " " ([
+      "--port ${toString cfg.port}"
+      "--address ${cfg.address}"
+    ] ++ optional cfg.redirect "--redirect-https");
+
+in
+{
+  options = {
+    services.libreddit = {
+      enable = mkEnableOption "Private front-end for Reddit";
+
+      address = mkOption {
+        default = "0.0.0.0";
+        example = "127.0.0.1";
+        type =  types.str;
+        description = "The address to listen on";
+      };
+
+      port = mkOption {
+        default = 8080;
+        example = 8000;
+        type = types.port;
+        description = "The port to listen on";
+      };
+
+      redirect = mkOption {
+        type = types.bool;
+        default = false;
+        description = "Enable the redirecting to HTTPS";
+      };
+
+      openFirewall = mkOption {
+        type = types.bool;
+        default = false;
+        description = "Open ports in the firewall for the libreddit web interface";
+      };
+
+    };
+  };
+
+  config = mkIf cfg.enable {
+    systemd.services.libreddit = {
+        description = "Private front-end for Reddit";
+        wantedBy = [ "multi-user.target" ];
+        after = [ "network.target" ];
+        serviceConfig = {
+          DynamicUser = true;
+          ExecStart = "${pkgs.libreddit}/bin/libreddit ${args}";
+          AmbientCapabilities = lib.mkIf (cfg.port < 1024) [ "CAP_NET_BIND_SERVICE" ];
+          Restart = "on-failure";
+          RestartSec = "2s";
+        };
+    };
+
+    networking.firewall = mkIf cfg.openFirewall {
+      allowedTCPPorts = [ cfg.port ];
+    };
+  };
+}

nixos/tests/all-tests.nix

@@ -223,6 +223,7 @@ in
   latestKernel.hardened = handleTest ./hardened.nix { latestKernel = true; };
   latestKernel.login = handleTest ./login.nix { latestKernel = true; };
   leaps = handleTest ./leaps.nix {};
+  libreddit = handleTest ./libreddit.nix {};
   lidarr = handleTest ./lidarr.nix {};
   libreswan = handleTest ./libreswan.nix {};
   lightdm = handleTest ./lightdm.nix {};

nixos/tests/libreddit.nix

@@ -0,0 +1,19 @@
+import ./make-test-python.nix ({ lib, ... }:
+
+with lib;
+
+{
+  name = "libreddit";
+  meta.maintainers = with maintainers; [ fab ];
+
+  nodes.machine =
+    { pkgs, ... }:
+    { services.libreddit.enable = true; };
+
+  testScript = ''
+    machine.wait_for_unit("libreddit.service")
+    machine.wait_for_open_port("8080")
+    # The service wants to get data from https://www.reddit.com
+    machine.succeed("curl http://localhost:8080/")
+  '';
+})

pkgs/applications/blockchains/chia/default.nix

@@ -72,6 +72,7 @@ python3Packages.buildPythonApplication rec {
       --replace "click==7.1.2" "click>=7.1.2" \
       --replace "clvm_rs==0.1.8" "clvm_rs>=0.1.8" \
       --replace "clvm==0.9.7" "clvm>=0.9.7" \
+      --replace "bitstring==3.1.7" "bitstring>=3.1.9" \
   '';
 
   preCheck = ''

pkgs/applications/graphics/renderdoc/default.nix

@@ -11,12 +11,11 @@ let
     rev = "renderdoc-modified-7";
     sha256 = "15r2m5kcs0id64pa2fsw58qll3jyh71jzc04wy20pgsh2326zis6";
   };
-  pythonPackages = python3Packages;
   cmakeBool = b: if b then "ON" else "OFF";
 in
 mkDerivation rec {
-  version = "1.15";
   pname = "renderdoc";
+  version = "1.15";
 
   src = fetchFromGitHub {
     owner = "baldurk";
@@ -27,9 +26,9 @@ mkDerivation rec {
 
   buildInputs = [
     qtbase qtsvg xorg.libpthreadstubs xorg.libXdmcp qtx11extras vulkan-loader python3
-  ] # ++ (with pythonPackages; [pyside2 pyside2-tools shiboken2])
+  ] # ++ (with python3Packages; [pyside2 pyside2-tools shiboken2])
   # TODO: figure out how to make cmake recognise pyside2
-  ++ (lib.optional waylandSupport wayland);
+  ++ lib.optional waylandSupport wayland;
 
   nativeBuildInputs = [ cmake makeWrapper pkg-config bison pcre automake autoconf addOpenGLRunpath ];
 
@@ -75,7 +74,7 @@ mkDerivation rec {
       of any application using Vulkan, D3D11, OpenGL or D3D12 across
       Windows 7 - 10, Linux or Android.
     '';
-    maintainers = [maintainers.jansol];
+    maintainers = [ maintainers.jansol ];
-    platforms = ["i686-linux" "x86_64-linux"];
+    platforms = [ "i686-linux" "x86_64-linux" ];
   };
 }

pkgs/applications/misc/authy/default.nix

@@ -11,8 +11,8 @@ in
 
 stdenv.mkDerivation rec {
   pname = "authy";
-  version = "1.8.3";
+  version = "1.8.4";
-  rev = "5";
+  rev = "6";
 
   buildInputs = [
     alsa-lib
@@ -50,7 +50,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "https://api.snapcraft.io/api/v1/snaps/download/H8ZpNgIoPyvmkgxOWw5MSzsXK1wRZiHn_${rev}.snap";
-    sha256 = "1yfvkmy34mc1dan9am11yka88jv7a4dslsszy4kcc8vap4cjmgpn";
+    sha256 = "07h4mgp229nlvw9ifiiyzph26aa61w4x4f1xya8vw580blrk1ph9";
   };
 
   nativeBuildInputs = [ autoPatchelfHook makeWrapper squashfsTools ];

pkgs/applications/misc/xplr/default.nix

@@ -2,16 +2,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "xplr";
-  version = "0.14.4";
+  version = "0.14.5";
 
   src = fetchCrate {
     inherit pname version;
-    sha256 = "1jfclwpip4xvwkvz5g0fb3v04pdnk3ddvkdll0yr7wm0g6p44xfd";
+    sha256 = "00kgxc4pn07p335dl3d53shiyw4f4anw64qc8axz9nspdq734nj5";
   };
 
   buildInputs = lib.optional stdenv.isDarwin libiconv;
 
-  cargoSha256 = "06iwx3s7h6l9kvd17hx0ihy6zrz4jbfjmdlkyij2fs0fhvas110x";
+  cargoSha256 = "1wmc4frjllj8dgcg4yw4cigm4mhq807pmp3l3ysi70q490g24gwh";
 
   meta = with lib; {
     description = "A hackable, minimal, fast TUI file explorer";

pkgs/applications/networking/browsers/chromium/common.nix

@@ -42,7 +42,6 @@ buildFun:
 with lib;
 
 let
-  jre = jre8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731
   python2WithPackages = python2.withPackages(ps: with ps; [
     ply jinja2 setuptools
   ]);
@@ -152,7 +151,6 @@ let
       libXScrnSaver libXcursor libXtst libxshmfence libGLU libGL
       mesa # required for libgbm
       pciutils protobuf speechd libXdamage at-spi2-core
-      jre
       pipewire
       libva
       libdrm wayland mesa.drivers libxkbcommon
@@ -167,7 +165,6 @@ let
       ./patches/widevine-79.patch # For bundling Widevine (DRM), might be replaceable via bundle_widevine_cdm=true in gnFlags
       # Fix the build by adding a missing dependency (s. https://crbug.com/1197837):
       ./patches/fix-missing-atspi2-dependency.patch
-      ./patches/closure_compiler-Use-the-Java-binary-from-the-system.patch
     ] ++ lib.optionals (versionRange "91" "94.0.4583.0") [
       # Required as dependency for the next patch:
       (githubPatch {
@@ -242,9 +239,10 @@ let
       sed -i -e 's,/usr,/run/current-system/sw,' chrome/common/chrome_paths.cc
 
       patchShebangs .
-      # use our own nodejs
+      # Link to our own Node.js and Java (required during the build):
       mkdir -p third_party/node/linux/node-linux-x64/bin
       ln -s "$(command -v node)" third_party/node/linux/node-linux-x64/bin/node
+      ln -s "${jre8}/bin/java" third_party/jdk/current/bin/
 
       # Allow building against system libraries in official builds
       sed -i 's/OFFICIAL_BUILD/GOOGLE_CHROME_BUILD/' tools/generate_shim_headers/generate_shim_headers.py

pkgs/applications/networking/browsers/chromium/patches/closure_compiler-Use-the-Java-binary-from-the-system.patch

@@ -1,31 +0,0 @@
-From e031b8be0fb2a22f953c034cdf08ca9befe130d2 Mon Sep 17 00:00:00 2001
-From: Michael Weiss <dev.primeos@gmail.com>
-Date: Sun, 11 Apr 2021 18:05:12 +0200
-Subject: [PATCH] closure_compiler: Use the Java binary from the system
-
-The bundled Java binary (third_party/jdk/current/bin/java) is missing in
-the tarball and we want to use the one from the system anyway.
-This reverts part of [0].
-
-[0]: https://chromium-review.googlesource.com/c/chromium/src/+/2778794
----
- third_party/closure_compiler/compiler.py | 3 +--
- 1 file changed, 1 insertion(+), 2 deletions(-)
-
-diff --git a/third_party/closure_compiler/compiler.py b/third_party/closure_compiler/compiler.py
-index 75690ceb9749..7b9c76f74290 100755
---- a/third_party/closure_compiler/compiler.py
-+++ b/third_party/closure_compiler/compiler.py
-@@ -13,8 +13,7 @@ import subprocess
- 
- 
- _CURRENT_DIR = os.path.join(os.path.dirname(__file__))
--_JAVA_PATH = os.path.join(_CURRENT_DIR, "..", "jdk", "current", "bin", "java")
--assert os.path.isfile(_JAVA_PATH), "java only allowed in android builds"
-+_JAVA_PATH = "java"
- 
- class Compiler(object):
-   """Runs the Closure compiler on given source files to typecheck them
--- 
-2.20.1
-

pkgs/applications/networking/instant-messengers/jitsi-meet-electron/default.nix

@@ -2,13 +2,10 @@
 , fetchurl
 , appimageTools
 , makeWrapper
-, electron_13
+, electron
 , xorg
 }:
 
-let
-  electron = electron_13;
-in
 stdenv.mkDerivation rec {
   pname = "jitsi-meet-electron";
   version = "2.8.9";

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

@@ -9,16 +9,9 @@
 , withEmacs ? true
 }:
 
-with lib;
-
 stdenv.mkDerivation rec {
-  version = "0.32.2";
   pname = "notmuch";
-
+  version = "0.32.2";
-  passthru = {
-    pythonSourceRoot = "${src.name}/bindings/python";
-    inherit version;
-  };
 
   src = fetchurl {
     url = "https://notmuchmail.org/releases/notmuch-${version}.tar.xz";
@@ -30,7 +23,7 @@ stdenv.mkDerivation rec {
     doxygen                   # (optional) api docs
     pythonPackages.sphinx     # (optional) documentation -> doc/INSTALL
     texinfo                   # (optional) documentation -> doc/INSTALL
-  ] ++ optional withEmacs emacs;
+  ] ++ lib.optional withEmacs emacs;
 
   buildInputs = [
     gnupg                     # undefined dependencies
@@ -41,12 +34,11 @@ stdenv.mkDerivation rec {
   ];
 
   postPatch = ''
-    patchShebangs configure
+    patchShebangs configure test/
-    patchShebangs test/
 
     substituteInPlace lib/Makefile.local \
       --replace '-install_name $(libdir)' "-install_name $out/lib"
-  '' + optionalString withEmacs ''
+  '' + lib.optionalString withEmacs ''
     substituteInPlace emacs/notmuch-emacs-mua \
       --replace 'EMACS:-emacs' 'EMACS:-${emacs}/bin/emacs' \
       --replace 'EMACSCLIENT:-emacsclient' 'EMACSCLIENT:-${emacs}/bin/emacsclient'
@@ -56,9 +48,9 @@ stdenv.mkDerivation rec {
     "--zshcompletiondir=${placeholder "out"}/share/zsh/site-functions"
     "--bashcompletiondir=${placeholder "out"}/share/bash-completion/completions"
     "--infodir=${placeholder "info"}/share/info"
-  ] ++ optional (!withEmacs) "--without-emacs"
+  ] ++ lib.optional (!withEmacs) "--without-emacs"
-    ++ optional (withEmacs) "--emacslispdir=${placeholder "emacs"}/share/emacs/site-lisp"
+    ++ lib.optional withEmacs "--emacslispdir=${placeholder "emacs"}/share/emacs/site-lisp"
-    ++ optional (isNull ruby) "--without-ruby";
+    ++ lib.optional (isNull ruby) "--without-ruby";
 
   # Notmuch doesn't use autoconf and consequently doesn't tag --bindir and
   # friends
@@ -66,7 +58,6 @@ stdenv.mkDerivation rec {
   enableParallelBuilding = true;
   makeFlags = [ "V=1" ];
 
-
   outputs = [ "out" "man" "info" ] ++ lib.optional withEmacs "emacs";
 
   preCheck = let
@@ -78,7 +69,8 @@ stdenv.mkDerivation rec {
     mkdir -p test/test-databases
     ln -s ${test-database} test/test-databases/database-v1.tar.xz
   '';
-  doCheck = !stdenv.hostPlatform.isDarwin && (versionAtLeast gmime.version "3.0.3");
+
+  doCheck = !stdenv.hostPlatform.isDarwin && (lib.versionAtLeast gmime.version "3.0.3");
   checkTarget = "test";
   checkInputs = [
     which dtach openssl bash
@@ -93,7 +85,12 @@ stdenv.mkDerivation rec {
 
   dontGzipMan = true; # already compressed
 
-  meta = {
+  passthru = {
+    pythonSourceRoot = "${src.name}/bindings/python";
+    inherit version;
+  };
+
+  meta = with lib; {
     description = "Mail indexer";
     homepage    = "https://notmuchmail.org/";
     license     = licenses.gpl3Plus;

pkgs/data/fonts/iosevka/bin.nix

@@ -10,7 +10,7 @@ let
     (builtins.attrNames (builtins.removeAttrs variantHashes [ "iosevka" ]));
 in stdenv.mkDerivation rec {
   pname = "${name}-bin";
-  version = "8.0.2";
+  version = "9.0.1";
 
   src = fetchurl {
     url = "https://github.com/be5invis/Iosevka/releases/download/v${version}/ttc-${name}-${version}.zip";

pkgs/data/fonts/iosevka/variants.nix

@@ -1,95 +1,95 @@
 # This file was autogenerated. DO NOT EDIT!
 {
-  iosevka = "1gx0hkxch4m21yqwp8sifp6hzvn579w0jf5c2vfgp771yrilhj41";
+  iosevka = "051yyvdhb8an7v5qsv9fd70z3dqrvg1y67mr0xf4wsbfpxpd10zh";
-  iosevka-aile = "1x4gjwj1a6q8vpihvyy0bpqsw3s1b546b5yi7918yqlam31kbfyl";
+  iosevka-aile = "1f7yvybfgf1in9b0w1zqzbcla7brzdx7hh00nk7mjbpl943qjcls";
-  iosevka-curly = "11w7f2v05zgdc5ac96v3dr93a2sganw6ggpl6vdhiqiqn1asfldi";
+  iosevka-curly = "0bf294ccnp2ppzqr9xs142pgkch7vvh2p9s4dh2xmilrzrqi1qmr";
-  iosevka-curly-slab = "052cwri7fc25yn314qqnjjjw1xssjjx4nin65r11589scyxzrh97";
+  iosevka-curly-slab = "0ga30kwxd6984db4wfqzxfh6frqj3lp7745m4iqknx874p80gg3n";
-  iosevka-etoile = "0p677iagypvyfx8gyja4qv0b5g39i2mh27cik6cjm22ri6fq3n8y";
+  iosevka-etoile = "11xxq6c8ppcr2y3wdzk2hklml32ga29vxw1qdmsbnj9pqykm0ik6";
-  iosevka-slab = "05dzpd33ivsp2fjc7zdrsgad0ym8iq2lpdj5ic5ja3lkacnm7r9j";
+  iosevka-slab = "1b88f6y39d9qfpmv5lkrwnpkn5b6khj6nc2isbc49fprr7i5ycqf";
-  iosevka-ss01 = "1ln7fz9yjwgrrw069k3v65q0jp02298a4r68f7hk2l6bgj8c6dml";
+  iosevka-ss01 = "1q0l0bi19bsq76y485l6mz9nl3bs2jqkyk6ny7z77kzdz3azipg9";
-  iosevka-ss02 = "11rihmzccq0yw0r08yclspksqs0rdyrfrfkhfzv0f9fh6c5qd30q";
+  iosevka-ss02 = "1d44anwkmvvmw3z48w4p1n8pz7w0b7vwng3r087cmad8xhq1hcr1";
-  iosevka-ss03 = "1zyylszp4iykj2jyx9457jsl3m7lr2irc177m1wvvv68xg1vqjrv";
+  iosevka-ss03 = "1wihzc299f3ybw4c52xxmv2my129qbwmpr5n8z0rx939h951f9m3";
-  iosevka-ss04 = "14pay7d0a5yymwkdhs6vsmcvzh27nml3asdy86dlpix0byzm72qi";
+  iosevka-ss04 = "1xzp2bkwl70c3524n7ajvjlb3zpgz35qrjbfhfr6hp42n8gj1ygx";
-  iosevka-ss05 = "00y744phcvlbwwvk4kq05m1f8l1w7b3gk400yk3y1cmx4a4168jw";
+  iosevka-ss05 = "17y8ham2dpa8yl3x393vic550f11bcjbgqlqdhpikwgb30012znw";
-  iosevka-ss06 = "1g7pj3js22kmcnv654n6d0fdykf9jkarwbji3vzajnxqgpv03j5x";
+  iosevka-ss06 = "0bb870gxv4f1jx1mc3znk7nh6cqjywx27y1w36brzp44lg20cjkp";
-  iosevka-ss07 = "1rv1bf9vffqc99l8dhh4v9ms6pkbxxjgzf7skq02gfr27avj1lln";
+  iosevka-ss07 = "12rh1a2499dr4bbmrq79b9qrf4a27ib5l8yvk817kig0dz8fvr7h";
-  iosevka-ss08 = "0s54csx64khdyzlb7k6m9cx9cqjj9cdymsbzhksv0fdbf3cc71ns";
+  iosevka-ss08 = "1bf307b0qr657jy73gq4y1wk3fwwzhpqyvcyhwl8ayanml99yiz8";
-  iosevka-ss09 = "0zvy010ll38dlisjggmgw8k991wwcnzzvpjyqybxpxb8hk3jfxyn";
+  iosevka-ss09 = "1ydr6bjymsbpkplnxkav5v8ghnadrcghjz34gj6xb8lgk1kx5d1n";
-  iosevka-ss10 = "1b5fk4hwzqg7p1b7h9vw9nc65pl0sp5h6k41jrmpdjr0nkjhm0zl";
+  iosevka-ss10 = "0429lnsc3vg1vlr0yxpah7j7bm352ys0yhl9vclqabbmkxjr9fjz";
-  iosevka-ss11 = "1b9bpg43n0vh0bigaq6y510w7lpsf54v82nvdxl48vp225kibr52";
+  iosevka-ss11 = "0ibqd20l3aalf72cia4k7z6a20sdaflb9kdiz90h5g769x0yc10a";
-  iosevka-ss12 = "0w2ykjzjqxmp4r7yl10cpr802xpmww4nvi7nca7kj5scl30mrd4g";
+  iosevka-ss12 = "1sjgk4nfgis4qbdyj9lfa7piwdixirx92769xmdgh8b0wwg1vhyq";
-  iosevka-ss13 = "1cg59jx44yyi5y6rvdvasmq0n0vqdbcli1rxhfqgwfx1rkwnxy27";
+  iosevka-ss13 = "0sgrxgss14ar104hc12zfim1pjs9nishmf4w8pyl0yjnxdmap9qq";
-  iosevka-ss14 = "0xi6jpa8fapk72c77yljp07zdl0hdmdg9giyysllih3j2r4l1mrw";
+  iosevka-ss14 = "176a3y0sk7fw93g8c7gwxsmiid3237k2mlff3qbm1nvcyxqnsxbi";
-  iosevka-ss15 = "1qv7qh4wzkq7d5rmn19hhmv447sc8hd390nrajwk2a900vfh8xlk";
+  iosevka-ss15 = "1cb2g5aqxjbisyvy729sk70b169rvxcb0414nhrwa3jgcr807i31";
-  iosevka-ss16 = "1gkrhqn1k5y6q87p09nz1lcafmryl7l3s5aqx265y0dqfrni5rfg";
+  iosevka-ss16 = "12x58vdjchfyp0gak7r5wqfv1bc9scr0d76kmibscyrlc8ml50n0";
-  iosevka-ss17 = "18plv1f9brn8kh7b3jz2imjwash72vlzbnciam41q8i4m47m7dj7";
+  iosevka-ss17 = "1wh5vcch2wlbw9cg44lz8ic8d24r228p7kqjr11sapkcmaxd3dyk";
-  iosevka-ss18 = "177qy927siihpzaf4k4sfl9zbp2krbmlg56qzrcm2jbswlnmkyjx";
+  iosevka-ss18 = "1vzjad7r8h9k0qb744vbpqcm2l16s52sz53s1pq1jnqkhd3vmhx4";
-  sgr-iosevka = "1np4v340r33vrb92cwx68lvsk6prg2swj4a6x9iig8lbc7fjk7fy";
+  sgr-iosevka = "1cd5na66986rjygvkq4b1nlk0f449z5dlz47wlifmqa503faqydd";
-  sgr-iosevka-aile = "09fyslcr7vazfw7js27s0pd7immqd7ics4dihj54k12w8mjfj0fg";
+  sgr-iosevka-aile = "1735ircj24xv8aajs6plfj9zfmvzjzhswwswjs8ccqc66dlgk47l";
-  sgr-iosevka-curly = "1yva4sx4dgfh4274c5sdkllr2d973ifxpn5jkxp428xhpyx9aq5b";
+  sgr-iosevka-curly = "1jh9shgqldpqqmpapapagqsqlg3w3gldics9zabwnzbd6g9af8zx";
-  sgr-iosevka-curly-slab = "1vsngc45l30lmksvlnfr5b8xxnjsvpaqia4fzvx70napm5z6py4w";
+  sgr-iosevka-curly-slab = "1cyn19c2wvh4mlpgc5zvizcxxlvz1x21ag73hcmn931czlcbxy74";
-  sgr-iosevka-etoile = "033b8w59qbjg17qlbw1lsc8shwklbcvbr0m0ldk0frd08qz2kpmk";
+  sgr-iosevka-etoile = "0kb7bfpj9cdbqmc9xbyq0hnw5sm66811sn330a7z0ypis6l0w2hi";
-  sgr-iosevka-fixed = "0qyf6pmichpd4yd821k17dy0chb3rslifqm7jjhbl8kkrylf1f2c";
+  sgr-iosevka-fixed = "0lcdzlar9jgxqakb0j6ppwwdkyd4d8ih9dvav56frryikhdxyjxq";
-  sgr-iosevka-fixed-curly = "01y8zc5w7jbb7m959db63msdfhp93ckfmm4nxh8fzg6ps3zpf4dy";
+  sgr-iosevka-fixed-curly = "1rvb1yk1yy407pp4bp71zj60xyixxsji3igla8acwxhwv7rd5l66";
-  sgr-iosevka-fixed-curly-slab = "04dn2pirw771d5la702l1n8yxc46k6mlivryqlr3kd7z6c4jylca";
+  sgr-iosevka-fixed-curly-slab = "0kaifwrvy380i44p4v5h2cm9bpkdfkgdk961igc8v73yahlffyla";
-  sgr-iosevka-fixed-slab = "1fnzlwlp67mwrw8l4mpylpv2mfday5b9mcjjwc9diymg85gvmz38";
+  sgr-iosevka-fixed-slab = "0nla5hma45ys56df9p2f0wr2zc2bg8448bdxif8ssybzm3mpgyqx";
-  sgr-iosevka-fixed-ss01 = "0259mn0p6z43ks13355czbm8pnrb7d8qwfl8kfyrnb6gaj1wa0fd";
+  sgr-iosevka-fixed-ss01 = "13g13jwdis724l1c9y7xbbvg9vik52pwfz4qvzmnxhj4wfvph0zy";
-  sgr-iosevka-fixed-ss02 = "074jdv3w6461bg3iqgwxv8wfrp0ph2sgqc51y1hg7cx26nrs727x";
+  sgr-iosevka-fixed-ss02 = "08xwpi9nf4vcr3s6nq87sxsihrwdfn7325gdjbfp1pivy7r1bfzm";
-  sgr-iosevka-fixed-ss03 = "0s5f2138js5w87khv1b5wzg1h96rhv77vw652m45qhqml0ivj5i6";
+  sgr-iosevka-fixed-ss03 = "1gc6xhh388sdpqi1rdhr2kyq5j7z57vgn34fvfavs9l7m8qi5fa9";
-  sgr-iosevka-fixed-ss04 = "1mbsjgbfj8m95bb4v0dw3f30hx2kq94bz9q9xv57bs80nmyb8a9b";
+  sgr-iosevka-fixed-ss04 = "1bkbfqxkc2z0yvd5kcd5ldva4miz7bc2p29ld46cgb0c21k5wjf7";
-  sgr-iosevka-fixed-ss05 = "1zkb9q20f9yb3qp7a092kfaag9izsqxi1nljksbg8qya4iiy22fw";
+  sgr-iosevka-fixed-ss05 = "15bws3g53jzd15mhkj5dnkqqd5jqsq9ci9aiqvdd0q1vdcin28jk";
-  sgr-iosevka-fixed-ss06 = "1xkd6nrh0s7dwk326bjk1wn6sa9d3d5r54q48i6giz43fg1j5six";
+  sgr-iosevka-fixed-ss06 = "098zqg3vdlkmfaq3aqp3il9im45dvpf3kxf8fqm0x110566vbgsm";
-  sgr-iosevka-fixed-ss07 = "0vxwwy5cizq0d5dswakwbncn9jq299ppc17c7dxqjmgxwkawrd06";
+  sgr-iosevka-fixed-ss07 = "0ba135blpvwwm07fp96lzi3c0wj6f3fglp5g0fivrblgy55qz0zg";
-  sgr-iosevka-fixed-ss08 = "08asq61zv353975h9zfv0rrn0g9x5c2l542aqhvi8kbcr702a8an";
+  sgr-iosevka-fixed-ss08 = "0894yd8l1f9iymi27kv6wqp8c6s2hqvn60c860xp544vzm2w8xvc";
-  sgr-iosevka-fixed-ss09 = "1qldik6k3ycgq1w95z5l1iwr55jjgc94w3d10gncwl41agz8mav8";
+  sgr-iosevka-fixed-ss09 = "133hw6xn4nx53s5hnlsx75c740w39kdfa04azidk2ar7sln4m1yr";
-  sgr-iosevka-fixed-ss10 = "00mylfjic10aiyfrzv0inq3i18qj97f999f86szrf8mxf9na8b73";
+  sgr-iosevka-fixed-ss10 = "0rlkjp9scawvii23fs9d5pcayarkrnl3pvr4naan2pc0cvcpl83f";
-  sgr-iosevka-fixed-ss11 = "1ggnkqf8l8fdkyimcpjgrlc1sdkzdhd79zaygfzg4fhbfxvm7g9w";
+  sgr-iosevka-fixed-ss11 = "07klrb1frrzwi10fc58ws8sykzjja1nnmifrl69489g23nm1dc19";
-  sgr-iosevka-fixed-ss12 = "13lgy12crxxvlj99iy3l0ag2wc20migx9l4abz04mjjh8cgvk10b";
+  sgr-iosevka-fixed-ss12 = "0c22nc9pdmc0024im6xw6ims39qkd9zjd5kc0ndw4pq167w011pg";
-  sgr-iosevka-fixed-ss13 = "0vk7b5xg67myrw69m5gjxchsgp4af5pwspdscklb739w66v42daq";
+  sgr-iosevka-fixed-ss13 = "0lqa9q7y0hl1jwvhv5p7kbm03xgc1xba6ylhpg4yw2gsi2hkmw31";
-  sgr-iosevka-fixed-ss14 = "1dap836qgkm62p7xivdc4jmirr75m9m5w9srr1qwsc5vfly4w63j";
+  sgr-iosevka-fixed-ss14 = "0i0jd33m0dwpyj1wylfa0pqay3qhlipxrlpshgrdjfq0kl8zik9l";
-  sgr-iosevka-fixed-ss15 = "12alzyp3c8c9h89kqkiw7spwwahi89w9mcgrggizgjqzm5n6qvwc";
+  sgr-iosevka-fixed-ss15 = "0mp3qdd9042i4w2p9c2qrbzhw2rkdw49qcmmxhi0kl8nllfv9lpq";
-  sgr-iosevka-fixed-ss16 = "1h0wa3g6vrpi86qshx187c2a26kh7ccy89rxi2kxajqis8lc9c25";
+  sgr-iosevka-fixed-ss16 = "0c15z9m9kbb62d2kpmvsgxqpvcv1yhxwi70cln5s27w4i0nxggkj";
-  sgr-iosevka-fixed-ss17 = "1hlhi5fllz3sb3p25im7ymvcvhf761iafkiass2cw83l2ypbh9ph";
+  sgr-iosevka-fixed-ss17 = "17rdqagp7gxyyc2w0q0mjnbwd99v06750vb2ldcwcrq8pghyzr3v";
-  sgr-iosevka-fixed-ss18 = "0cwkbj232kb0nwvy59wjinxk6ncck5yg9594p49fx6016qxsv022";
+  sgr-iosevka-fixed-ss18 = "0ghzg6p2ds3rs6nk484gssai9435k2p648l8070v1wj07llki4np";
-  sgr-iosevka-slab = "1imc9pamhxd5pm3xv274yv2qbnsd258rxz0skq7kc5f647bfb1dn";
+  sgr-iosevka-slab = "1ndnfnap3pkxfzw2sci7ds49fs2y43ck47xiww616kr8bj8xx852";
-  sgr-iosevka-ss01 = "0j97757fj595mlr9mgc5vkqxriskxzc1cch0sk9fb2qvr0gpyjvk";
+  sgr-iosevka-ss01 = "1fvz4zhq4d3cv02y82pjrlmyvq8skvfp5l98walf62yjq2kqaak6";
-  sgr-iosevka-ss02 = "0j1i9zakq2svfp727sxhcnqhrb0962pzdc7g0bdxgvxwdhmqzqn1";
+  sgr-iosevka-ss02 = "0xd67vvi07l8xfjq4pgz6n4xjslp60gdkh5hf9clc7z4y1q9649w";
-  sgr-iosevka-ss03 = "1bz95n1xpx756sfsgyshnaqrrygvh3pmcmxjqjyc0yk5f3aawqgm";
+  sgr-iosevka-ss03 = "17nchy0izlpsi7vaqp9h3nffy0r4f3qh5gvsbxfrl0z5i23sfvif";
-  sgr-iosevka-ss04 = "11c4q2dsfkqbw1ppw2r2x932mhlr6bq8sc1hr6z7pvflx3kvdgdg";
+  sgr-iosevka-ss04 = "0hpnfci9ddqxzylpl219bv4d9nbbcv5hiknddmdlrdry2ybz7yy3";
-  sgr-iosevka-ss05 = "1jwy3wfd4yk6q4cyrry2s3hgkg0pbnn8mmr7w5wpgph4sg2lyrs4";
+  sgr-iosevka-ss05 = "1am0aqzzaqsajs8bk57rnc7r6j3qip6fcgqp4f3i3j6kfvmlvf3l";
-  sgr-iosevka-ss06 = "0b4rilasn6zkrwf6dfxgrd957r8sjkw259acp1fnsc2wjpi27krf";
+  sgr-iosevka-ss06 = "1jwmgxnhj7jninjzkn1vh557lcxxbpq6m6c0qh2wrlqan005q0xw";
-  sgr-iosevka-ss07 = "0rvprfprypd54rnjsza0z6xswx22k4mva6pq8qs8fl8kfp3b92kk";
+  sgr-iosevka-ss07 = "1ls5gbi4789fci20rsf1b4clqj703jzy5ffs78pl5rbxjfxgraqn";
-  sgr-iosevka-ss08 = "0jfq72pi9bfmldxk8rnb3hv5kq7bps4pbs15k307avadj80dy107";
+  sgr-iosevka-ss08 = "0c6ksaapnl21dnbmizihbgvkzqcww2bgfxm51sz3a0difgcwn9na";
-  sgr-iosevka-ss09 = "1rlckb7djrkv1bicrp8nkszvk5wkkyhm6f88br13prqhsfbkdfpi";
+  sgr-iosevka-ss09 = "1ibpqi67f7rhg1jcpiy28cd4k4wrk542kd84ad10i64jb47lhwqq";
-  sgr-iosevka-ss10 = "0v6jqs75s0xqplgxxk09ah7gpbajajwbyfcmifq2db4sv65bkalj";
+  sgr-iosevka-ss10 = "13wq32l0gxc53hdbj3i8j1zkfm82g8a01xjpmh68hcllpmgr4yvd";
-  sgr-iosevka-ss11 = "1avc38qc0r7ylmvmyw9lcdimsmh3xha675qzz7gxwalp1mp6d2zp";
+  sgr-iosevka-ss11 = "1mbq0cykvybl487fzp79glbwsiwq1z4xk96992pqbv106nsqh9z9";
-  sgr-iosevka-ss12 = "1y9sbvq0mdhzwkaih2gh9jg07993jzjymjgmcn52kvygyn4jc8vf";
+  sgr-iosevka-ss12 = "1rggnmmgp33dpvbvlxkkvhlqx9arbwx3nrsxml9vjvf2c7875f3r";
-  sgr-iosevka-ss13 = "1xsgm6301vfpvsp0z3n3wbv03557whrnkw0cb9vkb9hbww5sjcq6";
+  sgr-iosevka-ss13 = "1nwqlqpqlvkq5h2l3kh04r8jadr4ar4n1w98hv1rd2pmhlh6izq8";
-  sgr-iosevka-ss14 = "0fvj6amlgifnppfwgvl39vq76aww170wiici596zqvbddl8hhf0k";
+  sgr-iosevka-ss14 = "1b3hlhy1lk8wi7ny9rkbb6my8sbc7k4ypc8hn62sc6a4spvfs14q";
-  sgr-iosevka-ss15 = "1ihsw196wbkr6cmisf7yasd3cfipz17033crjhsmh6f5q85705l7";
+  sgr-iosevka-ss15 = "10b7rgff1jn4j3szrykljklisbmfs4lajii1h2lyx8vbwx1rahbp";
-  sgr-iosevka-ss16 = "1b6w69cjmaa0a29yklly9b26m5ivrn5rpygrsbzsrfadgm6h9xcb";
+  sgr-iosevka-ss16 = "0p4in5lwa3694lgz745fxsp85aypwgck6m7zgmc2dkjvvrhxxhm2";
-  sgr-iosevka-ss17 = "1zvqrpg1m5i9af80qs847lz139zj1awx6akr7m3alwpz6jm178yd";
+  sgr-iosevka-ss17 = "0j7088wnf2rvm0iad1kkkm3pryr2c4rh643mrllzr71dpbzvvxqn";
-  sgr-iosevka-ss18 = "1vw5swd09a0xplz367f26li0ksf5c54a0rf65dr62nviilvlphmx";
+  sgr-iosevka-ss18 = "1v8jrvjkakc2qks9yjwgg3b28gpgqv42d6k091a4nb8yn8ni7z1m";
-  sgr-iosevka-term = "0zc1n1ansv5r4ph9xshm8vaj96m718ypagg4v9in0a0mdgpdp6il";
+  sgr-iosevka-term = "1kwxp9a7ld9xvgf7zhims66yihlz03q6vmzz782xwx5j6rrrvh28";
-  sgr-iosevka-term-curly = "1z487mq31afz0cpc7mfpny5x1wq8vdf2c0mmzhr46bcncinwinll";
+  sgr-iosevka-term-curly = "00ahf2lfrzpdplrjdgsjxfsfp40i5p79plxz7rz0dsvj6w3xivsg";
-  sgr-iosevka-term-curly-slab = "15iw3mpy75486ybws9ya4x1bn9y00v1v40clcxjcbk276bfw121p";
+  sgr-iosevka-term-curly-slab = "0vyya2p7c89ig2qmgsai45baj69hd5l9jfabnbz7bq78s0a7al9w";
-  sgr-iosevka-term-slab = "0y6wym3knhcvw1dlrqy9h8f68rsfpwwlb2hl9kdcfrv5zmd8mngy";
+  sgr-iosevka-term-slab = "1fd2h5cnfla140fq8ydwygn156lyy3dyplkhmqvq8i1shgkj5z8i";
-  sgr-iosevka-term-ss01 = "03q1j73jwhi54hp3dfx3yj4vabmsrgiy8g5jk6lqcmqk6d42zhgq";
+  sgr-iosevka-term-ss01 = "0x19yg4w8v1i9r5l5n6azn8kqw89dmj9nv2gsxn3s603fd22yna5";
-  sgr-iosevka-term-ss02 = "10i1wb4if30zf61ridmqks7j2915yrs72plbv6wy7c4x1qdawhy1";
+  sgr-iosevka-term-ss02 = "19c5jz2an9azb1cgx9a9zhv976g3paklcyl8x7a5j9r2lxga75fm";
-  sgr-iosevka-term-ss03 = "05ywks1ikwgwxksx0jxawp2a9gaka76gknzxxxzxxvd3x7g6qh4v";
+  sgr-iosevka-term-ss03 = "0718n4x0q08v1m5sk498aw787i1m6fzrp93nqhlql61ym3l9bqvm";
-  sgr-iosevka-term-ss04 = "15n5ky9yppcb5gz1pqm77hqihc2br0v52silg2d5yaj1fp4lzjpr";
+  sgr-iosevka-term-ss04 = "139614513mn6g3rs4dzp0wkdmwiv797w157xg66vcaxp03s2syl3";
-  sgr-iosevka-term-ss05 = "05p8sc1cjj9412bnyq3xda0v8xrzgf5g6ikgkanps3glvvvlkf3m";
+  sgr-iosevka-term-ss05 = "094zly2a5y36n152q8bgf00n9pad9qsbb2pniwh1hc3n5ydx9zgj";
-  sgr-iosevka-term-ss06 = "0w6zra0hpdyl0pkm9hdv4171fcgksv1s75wmwrh50dwnlv2hlns3";
+  sgr-iosevka-term-ss06 = "1z339061q3c8rj6j35y28qacpf630fd5xjam0lqi0vzxa6dx2x64";
-  sgr-iosevka-term-ss07 = "0zg9bnrfh3kbq69v4ih8yna70hzdbkbz1x0fminp79s0j9c66fjs";
+  sgr-iosevka-term-ss07 = "0g15gbihafa30sv2xysr96b99wxq7dfib5h72vfjhp8hrg5p92kc";
-  sgr-iosevka-term-ss08 = "0sqv98xg1z5p30npg66s2z2wh139prs7960d8y06s09k0npjzlsz";
+  sgr-iosevka-term-ss08 = "17jyx4qb04s66klcw0zmnh55rdkskaifahd0v2xpf9gj5z0zbqvk";
-  sgr-iosevka-term-ss09 = "0cqw79mf969kwbz5gwif3qg0zxk7pdbncpvq24m6kdws7sry06p4";
+  sgr-iosevka-term-ss09 = "17i9wghxij2vn071hwj1zsn5pw0vgmgb7qay0fy5i6s87pjsnyi4";
-  sgr-iosevka-term-ss10 = "15vaj99l2xrlcqg7712ksjcz0nwba7nlqcfc2angmw8zy163qg23";
+  sgr-iosevka-term-ss10 = "0kgmccymijlnamb4ag4gviyg21dm2si3m1p292lym3zw7f2m8is7";
-  sgr-iosevka-term-ss11 = "0rcn1761jv9wzi1nzl7sy57msw754yxys468jkacdpskqymfrhly";
+  sgr-iosevka-term-ss11 = "1lals7p4qbl4igsvy03vqfxwbapbqizwcgyk4fwj67padyv7xhca";
-  sgr-iosevka-term-ss12 = "0l1f60gvvswnc02w8ylzsk37px0j0jv75pbc572p012x3mvkqipw";
+  sgr-iosevka-term-ss12 = "181kgmmfllhwmz37gn28b84rffiac30d1dzgvm1hm8h9p5qrpj3q";
-  sgr-iosevka-term-ss13 = "0nl7qbgas1zybi7gm6jr5rgzmk2vylh3ky8ggzlkljn9zw4mm1sn";
+  sgr-iosevka-term-ss13 = "1m5vaf22dq2a4hkfm47yy1mwm74sykmw450pxfi194s595kkxxqh";
-  sgr-iosevka-term-ss14 = "0nyvayy0xj9gv21s6yjfp9xa6g4qih8lpvsrsinic4jgjhjxxn1l";
+  sgr-iosevka-term-ss14 = "0gvxk2rsshcp35wg0vb4byrc9091lx1jq3nk4jypfrp97sz19nw7";
-  sgr-iosevka-term-ss15 = "14p7cq5rfr8f7lzi5q7q48a5rrvrd9mghkwr09a0m9fyqav2bnwh";
+  sgr-iosevka-term-ss15 = "1hbmpg4rdsm3fr3v2gvggmjqz80c6rwyjs30ql3bwzzc61cjp13f";
-  sgr-iosevka-term-ss16 = "17b88cv3ylnlybw4zlaa2y55s63p4ylrjk8y15p27knkwf0j7km3";
+  sgr-iosevka-term-ss16 = "078jcvzc2s490nbyzxa0vkvgws1a60s03xqws70yr5n8advf0px2";
-  sgr-iosevka-term-ss17 = "1fh3b47g6faswq4ppksa6kkq5l1wpkq8c523ffakmjgjw92za7qi";
+  sgr-iosevka-term-ss17 = "1yklfki4s1il1lgcax8q6sf8ivpqh40yvds97nsik412pyrncsnh";
-  sgr-iosevka-term-ss18 = "161afvra35nfvk5crri1jfnwm579wbdn6r16afzq8fr5g46ddcla";
+  sgr-iosevka-term-ss18 = "0qc2kwwl83z3czgfy3jsw1iri1gwxp1f14vz0dmdh2z9i349ayza";
 }

pkgs/development/compilers/ecl/default.nix

@@ -45,16 +45,10 @@ stdenv.mkDerivation {
 
   configureFlags = [
     (if threadSupport then "--enable-threads" else "--disable-threads")
-    "--with-gmp-prefix=${gmp.dev}"
+    "--with-gmp-prefix=${lib.getDev gmp}"
-    "--with-libffi-prefix=${libffi.dev}"
+    "--with-libffi-prefix=${lib.getDev libffi}"
-  ]
+  ] ++ lib.optional useBoehmgc "--with-libgc-prefix=${lib.getDev boehmgc}"
-  ++
+  ++ lib.optional (!noUnicode) "--enable-unicode";
-  (lib.optional useBoehmgc
-    "--with-libgc-prefix=${boehmgc.dev}")
-  ++
-  (lib.optional (! noUnicode)
-    "--enable-unicode")
-  ;
 
   hardeningDisable = [ "format" ];
 
@@ -67,13 +61,12 @@ stdenv.mkDerivation {
     wrapProgram "$out/bin/ecl" --prefix PATH ':' "${gcc}/bin" ${ldArgs}
   '';
 
-  meta = {
+  meta = with lib; {
-    inherit (s) version;
     description = "Lisp implementation aiming to be small, fast and easy to embed";
     homepage = "https://common-lisp.net/project/ecl/";
-    license = lib.licenses.mit ;
+    license = licenses.mit ;
-    maintainers = [lib.maintainers.raskin];
+    maintainers = [ maintainers.raskin ];
-    platforms = lib.platforms.unix;
+    platforms = platforms.unix;
     changelog = "https://gitlab.com/embeddable-common-lisp/ecl/-/raw/${s.version}/CHANGELOG";
   };
 }

pkgs/development/compilers/jetbrains-jdk/default.nix

@@ -2,12 +2,12 @@
 
 openjdk11.overrideAttrs (oldAttrs: rec {
   pname = "jetbrains-jdk";
-  version = "11.0.10-b1427";
+  version = "11_0_11-b1504.13";
   src = fetchFromGitHub {
     owner = "JetBrains";
     repo = "JetBrainsRuntime";
-    rev = "jb${lib.replaceStrings ["."] ["_"] version}";
+    rev = "jb${version}";
-    sha256 = "sha256-2cn+FiFfGpp7CBeQMAASVZwTm6DOFaXaWxAL/nVC2Nk=";
+    sha256 = "1xpgsgmmj5jp5qyw98hqmik6a7z3hfwmij023ij3qqymyj3nhm2i";
   };
   patches = [];
   meta = with lib; {
@@ -23,7 +23,7 @@ openjdk11.overrideAttrs (oldAttrs: rec {
      JetBrains Runtime is not a certified build of OpenJDK. Please, use at
      your own risk.
     '';
-    homepage = "https://bintray.com/jetbrains/intellij-jdk/";
+    homepage = "https://confluence.jetbrains.com/display/JBR/JetBrains+Runtime";
     inherit (openjdk11.meta) license platforms mainProgram;
     maintainers = with maintainers; [ edwtjo petabyteboy ];
   };

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

@@ -1,11 +1,11 @@
 { lib, mkCoqDerivation, coq, ssreflect, coq-ext-lib, simple-io, version ? null }:
-with lib;
+
-let recent = versions.isGe "8.7" coq.coq-version; in
+let recent = lib.versions.isGe "8.7" coq.coq-version; in
 mkCoqDerivation {
   pname = "QuickChick";
   owner = "QuickChick";
   inherit version;
-  defaultVersion = with versions; switch [ coq.coq-version ssreflect.version ] [
+  defaultVersion = with lib; with versions; lib.switch [ coq.coq-version ssreflect.version ] [
       { cases = [ "8.13" pred.true  ]; out = "1.5.0"; }
       { cases = [ "8.12" pred.true  ]; out = "1.4.0"; }
       { cases = [ "8.11" pred.true  ]; out = "1.3.2"; }
@@ -30,19 +30,19 @@ mkCoqDerivation {
   release."20170512".sha256 = "033ch10i5wmqyw8j6wnr0dlbnibgfpr1vr0c07q3yj6h23xkmqpg";
   releaseRev = v: "v${v}";
 
-  preConfigure = optionalString recent
+  preConfigure = lib.optionalString recent
     "substituteInPlace Makefile --replace quickChickTool.byte quickChickTool.native";
 
   mlPlugin = true;
-  extraBuildInputs = optional recent coq.ocamlPackages.num;
+  extraBuildInputs = lib.optional recent coq.ocamlPackages.num;
   propagatedBuildInputs = [ ssreflect ]
-    ++ optionals recent [ coq-ext-lib simple-io ]
+    ++ lib.optionals recent [ coq-ext-lib simple-io ]
-    ++ optional  recent coq.ocamlPackages.ocamlbuild;
+    ++ lib.optional recent coq.ocamlPackages.ocamlbuild;
   extraInstallFlags = [ "-f Makefile.coq" ];
 
   enableParallelBuilding = false;
 
-  meta = {
+  meta = with lib; {
     description = "Randomized property-based testing plugin for Coq; a clone of Haskell QuickCheck";
     maintainers = with maintainers; [ jwiegley ];
   };

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

@@ -1,11 +1,11 @@
 { lib, mkCoqDerivation, which, autoconf, coq, coquelicot, flocq, bignums ? null, gnuplot_qt, version ? null }:
 
-with lib; mkCoqDerivation rec {
+mkCoqDerivation rec {
   pname = "interval";
   owner = "coqinterval";
   domain = "gitlab.inria.fr";
   inherit version;
-  defaultVersion = with versions; switch coq.coq-version [
+  defaultVersion = with lib.versions; lib.switch coq.coq-version [
     { case = isGe "8.8" ;        out = "4.3.0"; }
     { case = range "8.8" "8.12"; out = "4.0.0"; }
     { case = range "8.7" "8.11"; out = "3.4.2"; }
@@ -21,7 +21,7 @@ with lib; mkCoqDerivation rec {
 
   nativeBuildInputs = [ which autoconf ];
   propagatedBuildInputs = [ bignums coquelicot flocq ]
-    ++ lib.optionals (versions.isGe "4.2.0" defaultVersion) [ gnuplot_qt ];
+    ++ lib.optionals (lib.versions.isGe "4.2.0" defaultVersion) [ gnuplot_qt ];
   useMelquiondRemake.logpath = "Interval";
   mlPlugin = true;
   enableParallelBuilding = true;

pkgs/development/libraries/grpc/default.nix

@@ -1,10 +1,12 @@
-{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake, zlib, c-ares, pkg-config, re2, openssl, protobuf
+{ lib, stdenv, fetchFromGitHub, fetchpatch, buildPackages
+, cmake, zlib, c-ares, pkg-config, re2, openssl, protobuf, grpc
 , abseil-cpp, libnsl
 }:
 
 stdenv.mkDerivation rec {
-  version = "1.39.0"; # N.B: if you change this, change pythonPackages.grpcio-tools to a matching version too
   pname = "grpc";
+  version = "1.39.0"; # N.B: if you change this, change pythonPackages.grpcio-tools to a matching version too
+
   src = fetchFromGitHub {
     owner = "grpc";
     repo = "grpc";
@@ -12,6 +14,7 @@ stdenv.mkDerivation rec {
     sha256 = "1wa7n7mf20fnvxqw093kr7a4c7vilcmx9yl3hicnyfcd663jgqvd";
     fetchSubmodules = true;
   };
+
   patches = [
     # Fix build on armv6l (https://github.com/grpc/grpc/pull/21341)
     (fetchpatch {
@@ -20,22 +23,25 @@ stdenv.mkDerivation rec {
     })
   ];
 
-  nativeBuildInputs = [ cmake pkg-config ];
+  nativeBuildInputs = [ cmake pkg-config ]
+    ++ lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) grpc;
   propagatedBuildInputs = [ c-ares re2 zlib abseil-cpp ];
   buildInputs = [ c-ares.cmake-config openssl protobuf ]
     ++ lib.optionals stdenv.isLinux [ libnsl ];
 
-  cmakeFlags =
+  cmakeFlags = [
-    [ "-DgRPC_ZLIB_PROVIDER=package"
+    "-DgRPC_ZLIB_PROVIDER=package"
-      "-DgRPC_CARES_PROVIDER=package"
+    "-DgRPC_CARES_PROVIDER=package"
-      "-DgRPC_RE2_PROVIDER=package"
+    "-DgRPC_RE2_PROVIDER=package"
-      "-DgRPC_SSL_PROVIDER=package"
+    "-DgRPC_SSL_PROVIDER=package"
-      "-DgRPC_PROTOBUF_PROVIDER=package"
+    "-DgRPC_PROTOBUF_PROVIDER=package"
-      "-DgRPC_ABSL_PROVIDER=package"
+    "-DgRPC_ABSL_PROVIDER=package"
-      "-DBUILD_SHARED_LIBS=ON"
+    "-DBUILD_SHARED_LIBS=ON"
-      "-DCMAKE_SKIP_BUILD_RPATH=OFF"
+    "-DCMAKE_SKIP_BUILD_RPATH=OFF"
-      "-DCMAKE_CXX_STANDARD=17"
+    "-DCMAKE_CXX_STANDARD=17"
-    ];
+  ] ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
+    "-D_gRPC_PROTOBUF_PROTOC_EXECUTABLE=${buildPackages.protobuf}/bin/protoc"
+  ];
 
   # CMake creates a build directory by default, this conflicts with the
   # basel BUILD file on case-insensitive filesystems.
@@ -54,7 +60,7 @@ stdenv.mkDerivation rec {
   meta = with lib; {
     description = "The C based gRPC (C++, Python, Ruby, Objective-C, PHP, C#)";
     license = licenses.asl20;
-    maintainers = [ maintainers.lnl7 maintainers.marsam ];
+    maintainers = with maintainers; [ lnl7 marsam ];
     homepage = "https://grpc.io/";
     platforms = platforms.all;
     changelog = "https://github.com/grpc/grpc/releases/tag/v${version}";

pkgs/development/libraries/pcl/default.nix

@@ -1,7 +1,6 @@
 { lib
 , stdenv
 , fetchFromGitHub
-, fetchpatch
 , wrapQtAppsHook
 , cmake
 , qhull
@@ -18,28 +17,20 @@
 , Cocoa
 , AGL
 , OpenGL
+, withCuda ? false, cudatoolkit
 }:
 
 stdenv.mkDerivation rec {
   pname = "pcl";
-  version = "1.11.1";
+  version = "1.12.0";
 
   src = fetchFromGitHub {
     owner = "PointCloudLibrary";
     repo = "pcl";
     rev = "${pname}-${version}";
-    sha256 = "1cli2rxqsk6nxp36p5mgvvahjz8hm4fb68yi8cf9nw4ygbcvcwb1";
+    sha256 = "0jhvciaw43y6iqqk7hyxnfhn1b4bsw5fpy04s01r5pkcsjjbdbqc";
   };
 
-  patches = [
-    # Support newer QHull versions (2020.2)
-    # Backport of https://github.com/PointCloudLibrary/pcl/pull/4540
-    (fetchpatch {
-      url = "https://raw.githubusercontent.com/conda-forge/pcl-feedstock/0b1eff402994a3fb891b44659c261e7e85c8d915/recipe/4540.patch";
-      sha256 = "0hhvw6ajigzrarn95aicni73zd3sdgnb8rc3wgjrrg19xs84z138";
-    })
-  ];
-
   nativeBuildInputs = [ pkg-config cmake wrapQtAppsHook ];
   buildInputs = [
     qhull
@@ -53,11 +44,12 @@ stdenv.mkDerivation rec {
     qtbase
     libXt
   ]
-  ++ lib.optionals stdenv.isDarwin [ Cocoa AGL ];
+  ++ lib.optionals stdenv.isDarwin [ Cocoa AGL ]
+  ++ lib.optionals withCuda [ cudatoolkit ];
 
   cmakeFlags = lib.optionals stdenv.isDarwin [
     "-DOPENGL_INCLUDE_DIR=${OpenGL}/Library/Frameworks"
-  ];
+  ] ++ lib.optionals withCuda [ "-DWITH_CUDA=true" ];
 
   meta = {
     homepage = "https://pointclouds.org/";

pkgs/development/libraries/zchunk/default.nix

@@ -31,12 +31,7 @@ stdenv.mkDerivation rec {
     zstd
   ] ++ lib.optional stdenv.isDarwin argp-standalone;
 
-
+  outputs = [ "out" "lib" "dev" ];
-  outputs = [
-    "out"
-    "lib"
-    "dev"
-  ];
 
   meta = with lib; {
     homepage = "https://github.com/zchunk/zchunk";

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

@@ -165,6 +165,7 @@
 , "mirakurun"
 , "mocha"
 , "multi-file-swagger"
+, "musescore-downloader"
 , "neovim"
 , "netlify-cli"
 , "nijs"

pkgs/development/php-packages/box/default.nix

@@ -11,7 +11,8 @@ mkDerivation {
     sha256 = "1zmxdadrv0i2l8cz7xb38gnfmfyljpsaz2nnkjzqzksdmncbgd18";
   };
 
-  phases = [ "installPhase" ];
+  dontUnpack = true;
+
   nativeBuildInputs = [ makeWrapper ];
 
   installPhase = ''

pkgs/development/php-packages/php-cs-fixer/default.nix

@@ -11,7 +11,8 @@ mkDerivation {
     sha256 = "141rkcr0wbsqnc4s5vg4bk4dmxwigwxa3j0vi5c42b5k1lq3sgwr";
   };
 
-  phases = [ "installPhase" ];
+  dontUnpack = true;
+
   nativeBuildInputs = [ makeWrapper ];
 
   installPhase = ''

pkgs/development/php-packages/phpcbf/default.nix

@@ -11,7 +11,8 @@ mkDerivation {
     sha256 = "04wb1imm4934mpy2hxcmqh4cn7md1vwmfii39p6mby809325b5z1";
   };
 
-  phases = [ "installPhase" ];
+  dontUnpack = true;
+
   nativeBuildInputs = [ makeWrapper ];
 
   installPhase = ''

pkgs/development/php-packages/phpcs/default.nix

@@ -11,7 +11,8 @@ mkDerivation {
     sha256 = "0sdi78hrwd3r5p1b38qmp89m41kfszh2qn4n5zhq2dmhsjdhjziz";
   };
 
-  phases = [ "installPhase" ];
+  dontUnpack = true;
+
   nativeBuildInputs = [ makeWrapper ];
 
   installPhase = ''

pkgs/development/php-packages/phpmd/default.nix

@@ -11,7 +11,8 @@ mkDerivation {
     sha256 = "1i8qgzxniw5d8zjpypalm384y7qfczapfq70xmg129laq6xiqlqb";
   };
 
-  phases = [ "installPhase" ];
+  dontUnpack = true;
+
   nativeBuildInputs = [ makeWrapper ];
 
   installPhase = ''

pkgs/development/php-packages/phpstan/default.nix

@@ -11,7 +11,8 @@ mkDerivation {
     sha256 = "0f8858w9b421s3dfz8a56g0mik4zyi1lp88lijw4zs2d94dcdl9s";
   };
 
-  phases = [ "installPhase" ];
+  dontUnpack = true;
+
   nativeBuildInputs = [ makeWrapper ];
 
   installPhase = ''

pkgs/development/php-packages/psalm/default.nix

@@ -11,7 +11,8 @@ mkDerivation {
     sha256 = "0d8gxkpm4rc00a8br5wzjpglkwx95kr15s4z3cvxyf6iik1j5r47";
   };
 
-  phases = [ "installPhase" ];
+  dontUnpack = true;
+
   nativeBuildInputs = [ makeWrapper ];
 
   installPhase = ''

pkgs/development/php-packages/psysh/default.nix

@@ -11,7 +11,8 @@ mkDerivation {
     sha256 = "sha256-6opSBKR5eI5HlaJy4A94JrxYfUtCCNVlyntmLZbWfOE=";
   };
 
-  phases = [ "installPhase" ];
+  dontUnpack = true;
+
   nativeBuildInputs = [ makeWrapper ];
 
   installPhase = ''

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

@@ -6,13 +6,13 @@
 
 buildPythonPackage rec {
   pname = "emoji";
-  version = "1.4.1";
+  version = "1.4.2";
 
   src = fetchFromGitHub {
     owner = "carpedm20";
     repo = pname;
     rev = "v.${version}";
-    sha256 = "0gakvh8hfmfdjyp46bl18b2zm3grm3k5shiqrpzqlipbaxb7ifrk";
+    sha256 = "072m0l1wcbz1jiyc2x5dx0b4ks5zri7m5lhjjy9sgq4qwlqsnr5n";
   };
 
   checkInputs = [

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

@@ -0,0 +1,40 @@
+{ lib, buildPythonPackage, fetchFromSourcehut, pythonOlder
+, cmake, cython, alure2, typing-extensions
+}:
+
+buildPythonPackage rec {
+  pname = "palace";
+  version = "0.2.5";
+  disabled = pythonOlder "3.6";
+
+  src = fetchFromSourcehut {
+    owner = "~cnx";
+    repo = pname;
+    rev = version;
+    sha256 = "1z0m35y4v1bg6vz680pwdicm9ssryl0q6dm9hfpb8hnifmridpcj";
+  };
+
+  # Nix uses Release CMake configuration instead of what is assumed by palace.
+  postPatch = ''
+    substituteInPlace CMakeLists.txt \
+      --replace IMPORTED_LOCATION_NOCONFIG IMPORTED_LOCATION_RELEASE
+  '';
+
+  dontUseCmakeConfigure = true;
+
+  nativeBuildInputs = [ cmake ];
+  buildInputs = [ cython ];
+  propagatedBuildInputs = [ alure2 ] ++ lib.optionals (pythonOlder "3.8") [
+    typing-extensions
+  ];
+
+  doCheck = false; # FIXME: tests need an audio device
+  pythonImportsCheck = [ "palace" ];
+
+  meta = with lib; {
+    description = "Pythonic Audio Library and Codecs Environment";
+    homepage = "https://mcsinyx.gitlab.io/palace";
+    license = licenses.lgpl3Plus;
+    maintainers = [ maintainers.McSinyx ];
+  };
+}

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

@@ -7,7 +7,7 @@
 
 buildPythonPackage rec {
   pname = "pytube";
-  version = "10.9.0";
+  version = "10.9.3";
 
   disabled = pythonOlder "3.6";
 
@@ -15,7 +15,7 @@ buildPythonPackage rec {
     owner = "pytube";
     repo = "pytube";
     rev = "v${version}";
-    sha256 = "sha256-9kKazy0Fg3YcNIkzgVFQ46Ipn3Dngfnh5DjwRP/fZGg=";
+    sha256 = "sha256-x4u68O9dNhDZ+1Q+S4ou6zPqoR2/Yn5lcKgR2kyM/uo=";
   };
 
   checkInputs = [

pkgs/development/python-modules/types-requests/default.nix

@@ -5,11 +5,11 @@
 
 buildPythonPackage rec {
   pname = "types-requests";
-  version = "2.25.0";
+  version = "2.25.1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "022q31fgiyq6zfjv4pbpg10hh9m7x91wqfc6bdyin50hf980q3gf";
+    sha256 = "0vyr1vgg03a1gkjcz59iwqc1q9mx4ij7slslsp08z2h8fbhlwl9d";
   };
 
   # Modules doesn't have tests

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

@@ -1,12 +1,12 @@
 { lib, stdenv, fetchurl, makeWrapper, jre }:
 
 stdenv.mkDerivation rec {
-  version = "8.44";
+  version = "8.45";
   pname = "checkstyle";
 
   src = fetchurl {
     url = "https://github.com/checkstyle/checkstyle/releases/download/checkstyle-${version}/checkstyle-${version}-all.jar";
-    sha256 = "sha256-tXTU5A4mKQ0DDWCE3VUXB3fbanHyFNSIcTMJ3NRlj6A=";
+    sha256 = "sha256-XFeufPaMz5rk+Ym0zXFCitoi9+mDs/PZUByIeZrj538=";
   };
 
   nativeBuildInputs = [ makeWrapper ];

pkgs/development/tools/bacon/default.nix

@@ -2,16 +2,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "bacon";
-  version = "1.1.6";
+  version = "1.1.8";
 
   src = fetchFromGitHub {
     owner = "Canop";
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-0/fQhBHkoI/0PhuUDLGfyjytgEEJWSr1P67Rh0vGDnA=";
+    sha256 = "sha256-VM+suU3PLxGWXVIH26hbXFIfvRuJicLJX8D8fo1mZCM=";
   };
 
-  cargoSha256 = "sha256-O1jJXnvPLxJmcnf3qpdcpdrogQ7FtjHF8uUxQRWLDyg=";
+  cargoSha256 = "sha256-FgqYKmCEBbyv6+2GD5NwEvRz3582IZtkuVPaAT77bvY=";
 
   buildInputs = lib.optional stdenv.isDarwin CoreServices;
 

pkgs/development/tools/ocaml/dune-release/default.nix

@@ -41,7 +41,7 @@ in buildDunePackage rec {
 
   preCheck = ''
     # it fails when it tries to reference "./make_check_deterministic.exe"
-    rm -fr tests/bin/check
+    rm -r tests/bin/check
   '';
 
   # tool specific env vars have been deprecated, use PATH

pkgs/development/tools/protoc-gen-grpc-web/default.nix

@@ -0,0 +1,40 @@
+{ lib, stdenv, fetchFromGitHub, fetchpatch, protobuf }:
+
+stdenv.mkDerivation rec {
+  pname = "protoc-gen-grpc-web";
+  version = "1.2.1";
+
+  src = fetchFromGitHub {
+    owner = "grpc";
+    repo = "grpc-web";
+    rev = version;
+    sha256 = "sha256-NBENyc01O8NPo84z1CeZ7YvFvVGY2GSlcdxacRrQALw=";
+  };
+
+  sourceRoot = "source/javascript/net/grpc/web";
+
+  # remove once PR merged
+  # https://github.com/grpc/grpc-web/pull/1107
+  patches = [
+    (fetchpatch {
+      name = "add-prefix.patch";
+      url = "https://github.com/06kellyjac/grpc-web/commit/b0803be1080fc635a8d5b88da971835a888a0c77.patch";
+      stripLen = 4;
+      sha256 = "sha256-Rw9Z7F8cYrc/UIGUN6yXOus4v+Qn9Yf1Nc301TFx85A=";
+    })
+  ];
+
+  strictDeps = true;
+  nativeBuildInputs = [ protobuf ];
+  buildInputs = [ protobuf ];
+
+  makeFlags = [ "PREFIX=$(out)" ];
+
+  meta = with lib; {
+    homepage = "https://github.com/grpc/grpc-web";
+    changelog = "https://github.com/grpc/grpc-web/blob/${version}/CHANGELOG.md";
+    description = "gRPC web support for Google's protocol buffers";
+    license = licenses.asl20;
+    maintainers = with maintainers; [ jk ];
+  };
+}

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

@@ -0,0 +1,25 @@
+{ fetchCrate, lib, openssl, pkg-config, rustPlatform, stdenv, Security }:
+
+rustPlatform.buildRustPackage rec {
+  pname = "taplo-cli";
+  version = "0.4.0";
+
+  src = fetchCrate {
+    inherit pname version;
+    sha256 = "0hh9l83z7qymakyf7ka756gwxpzirgdhf6kpzh89bcmpdfz70005";
+  };
+
+  cargoSha256 = "0bkpcnbrrfv07czs1gy8r9q1cp6fdfz2vmlfk9lsg3iapvyi5s1c";
+
+  nativeBuildInputs = lib.optional stdenv.isLinux pkg-config;
+
+  buildInputs = lib.optional stdenv.isLinux openssl
+    ++ lib.optional stdenv.isDarwin Security;
+
+  meta = with lib; {
+    description = "A TOML toolkit written in Rust";
+    homepage = "https://taplo.tamasfe.dev";
+    license = licenses.mit;
+    maintainers = with maintainers; [ figsoda ];
+  };
+}

pkgs/development/tools/taplo-lsp/default.nix

@@ -0,0 +1,28 @@
+{ fetchCrate, lib, openssl, pkg-config, rustPlatform, stdenv, Security }:
+
+rustPlatform.buildRustPackage rec {
+  pname = "taplo-lsp";
+  version = "0.2.4";
+
+  src = fetchCrate {
+    inherit pname version;
+    sha256 = "1a5v0x60iicv9snsr0a3lqbziyh38iqhiw11s2lqnr6l1hmp69jy";
+  };
+
+  cargoSha256 = "0ak70cwxcviv86b4zrcgqaxhdm6fxsji03mnacvp4pwlwv84ikkc";
+
+  # excludes test_tcp since it fails
+  cargoTestFlags = [ "test_stdio" ];
+
+  nativeBuildInputs = lib.optional stdenv.isLinux pkg-config;
+
+  buildInputs = lib.optional stdenv.isLinux openssl
+    ++ lib.optional stdenv.isDarwin Security;
+
+  meta = with lib; {
+    description = "A TOML toolkit written in Rust";
+    homepage = "https://taplo.tamasfe.dev";
+    license = licenses.mit;
+    maintainers = with maintainers; [ figsoda ];
+  };
+}

pkgs/misc/cups/drivers/estudio/default.nix

@@ -11,10 +11,6 @@ stdenv.mkDerivation {
 
   buildInputs = [ perl ];
 
-  phases = [ "unpackPhase"
-             "patchPhase"
-             "installPhase" ];
-
   patchPhase = ''
     patchShebangs lib/
     gunzip                share/cups/model/Toshiba/TOSHIBA_ColorMFP_CUPS.gz

pkgs/misc/cups/drivers/mfcl2700dncupswrapper/default.nix

@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ dpkg makeWrapper ];
 
-  phases = [ "installPhase" ];
+  dontUnpack = true;
 
   installPhase = ''
     dpkg-deb -x $src $out

pkgs/misc/cups/drivers/mfcl2700dnlpr/default.nix

@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ dpkg makeWrapper ];
 
-  phases = [ "installPhase" ];
+  dontUnpack = true;
 
   installPhase = ''
     dpkg-deb -x $src $out

pkgs/misc/cups/drivers/mfcl2720dwcupswrapper/default.nix

@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ dpkg makeWrapper ];
 
-  phases = [ "installPhase" ];
+  dontUnpack = true;
 
   installPhase = ''
     dpkg-deb -x $src $out

pkgs/misc/cups/drivers/mfcl2720dwlpr/default.nix

@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ dpkg makeWrapper ];
 
-  phases = [ "installPhase" ];
+  dontUnpack = true;
 
   installPhase = ''
     dpkg-deb -x $src $out

pkgs/misc/cups/drivers/mfcl8690cdwcupswrapper/default.nix

@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ dpkg makeWrapper ];
 
-  phases = [ "installPhase" ];
+  dontUnpack = true;
 
   installPhase = ''
     dpkg-deb -x $src $out

pkgs/misc/cups/drivers/mfcl8690cdwlpr/default.nix

@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ dpkg makeWrapper ];
 
-  phases = [ "installPhase" ];
+  dontUnpack = true;
 
   installPhase = ''
     dpkg-deb -x $src $out

pkgs/misc/cups/drivers/splix/default.nix

@@ -10,8 +10,6 @@ let
       sha256 = "1156flics5m9m7a4hdmcc2nphbdyary6dfmbcrmsp9xb7ivsypdl";
     };
 
-    phases = [ "unpackPhase" "installPhase" ];
-
     installPhase = ''
       mkdir -p $out/share/cups/profiles/samsung
       cp * $out/share/cups/profiles/samsung/

pkgs/misc/emulators/mgba/default.nix

@@ -9,6 +9,7 @@
 , libedit
 , libelf
 , libzip
+, copyDesktopItems
 , makeDesktopItem
 , minizip
 , pkg-config
@@ -48,8 +49,8 @@ stdenv.mkDerivation rec {
     qttools
   ];
 
-  postInstall = let
+  desktopItems = [
-    desktopItem = makeDesktopItem {
+    (makeDesktopItem {
       name = "mgba";
       exec = "mgba-qt";
       icon = "mgba";
@@ -58,11 +59,8 @@ stdenv.mkDerivation rec {
       genericName = "Game Boy Advance Emulator";
       categories = "Game;Emulator;";
       startupNotify = "false";
-    };
+    })
-  in
+  ];
-    ''
-      cp -r ${desktopItem}/share/applications $out/share
-    '';
 
   meta = with lib; {
     homepage = "https://mgba.io";

pkgs/misc/lilypond/fonts.nix

@@ -13,8 +13,6 @@ let
         repo = fontName;
       };
 
-      phases = [ "unpackPhase" "installPhase" ];
-
       installPhase = ''
         local fontsdir="$out/share/lilypond/${lilypond.version}/fonts"
 

pkgs/servers/bazarr/default.nix

@@ -1,25 +1,28 @@
-{ stdenv, lib, fetchurl, makeWrapper, python3, unrar, ffmpeg, nixosTests }:
+{ stdenv, lib, fetchurl, makeWrapper, unzip, python3, unrar, ffmpeg, nixosTests }:
 
 stdenv.mkDerivation rec {
   pname = "bazarr";
   version = "0.9.6";
 
+  sourceRoot = ".";
+
   src = fetchurl {
-    url = "https://github.com/morpheus65535/bazarr/archive/v${version}.tar.gz";
+    url = "https://github.com/morpheus65535/bazarr/releases/download/v${version}/bazarr.zip";
-    sha256 = "sha256-aO9PIE/YlSIGEcntDCdxIYuuvV5jG266ldhC2QfT+e4=";
+    sha256 = "sha256-ZSQzDlObnv5DEra2+YgXhox583KPyGIjia0SJyTUPWo=";
   };
 
-  nativeBuildInputs = [ makeWrapper ];
+  nativeBuildInputs = [ unzip makeWrapper ];
 
   installPhase = ''
-    mkdir -p $out/src
+    mkdir -p $out/{bin,share/${pname}-${version}}
-    cp -r * $out/src
+    cp -r * $out/share/${pname}-${version}
-
+    makeWrapper "${
-    mkdir -p $out/bin
+      (python3.withPackages
-    makeWrapper "${(python3.withPackages (ps: [ps.lxml ps.numpy])).interpreter}" \
+        (ps: [ ps.lxml ps.numpy ps.gevent ps.gevent-websocket ])).interpreter
+    }" \
       $out/bin/bazarr \
-      --add-flags "$out/src/bazarr.py" \
+      --add-flags "$out/share/${pname}-${version}/bazarr.py" \
-      --suffix PATH : ${lib.makeBinPath [ unrar ffmpeg ]} \
+      --suffix PATH : ${lib.makeBinPath [ unrar ffmpeg ]}
   '';
 
   passthru.tests = {

pkgs/servers/dns/knot-dns/default.nix

@@ -1,5 +1,5 @@
 { lib, stdenv, fetchurl, pkg-config, gnutls, liburcu, lmdb, libcap_ng, libidn2, libunistring
-, systemd, nettle, libedit, zlib, libiconv, libintl, libmaxminddb, libbpf, nghttp2
+, systemd, nettle, libedit, zlib, libiconv, libintl, libmaxminddb, libbpf, nghttp2, libmnl
 , autoreconfHook, nixosTests
 }:
 
@@ -7,11 +7,11 @@ let inherit (lib) optional optionals; in
 
 stdenv.mkDerivation rec {
   pname = "knot-dns";
-  version = "3.0.8";
+  version = "3.1.0";
 
   src = fetchurl {
     url = "https://secure.nic.cz/files/knot-dns/knot-${version}.tar.xz";
-    sha256 = "df723949c19ebecf9a7118894c3127e292eb09dc7274b5ce9b527409f42edfb0";
+    sha256 = "54323712e3cbc3d4c70a15777818fd2ff0de30cebb6c22e2946372b15b2653ed";
   };
 
   outputs = [ "bin" "out" "dev" ];
@@ -36,6 +36,7 @@ stdenv.mkDerivation rec {
     libiconv lmdb libintl
     nghttp2 # DoH support in kdig
     libmaxminddb # optional for geoip module (it's tiny)
+    libmnl # required for knot >= 3.1
     # without sphinx &al. for developer documentation
     # TODO: add dnstap support?
   ]

pkgs/servers/headscale/default.nix

@@ -2,16 +2,16 @@
 
 buildGoModule rec {
   pname = "headscale";
-  version = "0.3.4";
+  version = "0.3.6";
 
   src = fetchFromGitHub {
     owner = "juanfont";
     repo = "headscale";
     rev = "v${version}";
-    sha256 = "sha256-O8PJrowP9iDK4sQXHNi1eo44X/tRc7nyKZgJUB6fKC4=";
+    sha256 = "sha256-cjaA62YRfZSbXwbW1pz51hc/opCLsN26GxWnBcVTvyE=";
   };
 
-  vendorSha256 = "sha256-0Lqr/tWk31S01vi21sG2gtlGouOhecL4u8ScKG0nWLo=";
+  vendorSha256 = "sha256-3cGvp9hnajNJtvDn4K6fkCzLYrEFXQk9ZhQ4n+WnQEo=";
 
   # Ldflags are same as build target in the project's Makefile
   # https://github.com/juanfont/headscale/blob/main/Makefile

pkgs/servers/libreddit/default.nix

@@ -0,0 +1,40 @@
+{ lib
+, stdenv
+, nixosTests
+, rustPlatform
+, fetchFromGitHub
+, Security
+}:
+
+rustPlatform.buildRustPackage rec {
+  pname = "libreddit";
+  version = "0.10.1";
+
+  src = fetchFromGitHub {
+    owner = "spikecodes";
+    repo = pname;
+    rev = "v${version}";
+    sha256 = "0f5xla6fgq4l9g95gwwvfxksaxj4zpayrsjacf53akjpxaqvqxdj";
+  };
+
+  cargoSha256 = "039k6kncdgy6q2lbcssj5dm9npk0yss5m081ps4nmdj2vjrkphf0";
+
+  buildInputs = lib.optional stdenv.isDarwin Security;
+
+  cargoPatches = [
+    # Patch file to add/update Cargo.lock in the source code
+    # https://github.com/spikecodes/libreddit/issues/191
+    ./add-Cargo.lock.patch
+  ];
+
+  passthru.tests = {
+    inherit (nixosTests) libreddit;
+  };
+
+  meta = with lib; {
+    description = "Private front-end for Reddit";
+    homepage = "https://github.com/spikecodes/libreddit";
+    license = with licenses; [ agpl3Only ];
+    maintainers = with maintainers; [ fab ];
+  };
+}

pkgs/servers/misc/gobgpd/default.nix

@@ -2,13 +2,13 @@
 
 buildGoModule rec {
   pname = "gobgpd";
-  version = "2.29.0";
+  version = "2.30.0";
 
   src = fetchFromGitHub {
     owner = "osrg";
     repo = "gobgp";
     rev = "v${version}";
-    sha256 = "sha256-DhSIf8fAG2Zf0mwJ/iMgQU5sugHK2jJ6WJPbFbA/mhM=";
+    sha256 = "sha256-YerInFAUHFGEU0XSYeqKly9EiCq/uSjtMLnzI/ekSJ4=";
   };
 
   vendorSha256 = "sha256-PWm7XnO6LPaU8g8ymmqRkQv2KSX9kLv9RVaa000mrTY=";

pkgs/servers/openafs/1.8/module.nix

@@ -1,5 +1,5 @@
 { lib, stdenv, fetchurl, which, autoconf, automake, flex, bison
-, kernel, glibc, perl, libtool_2, libkrb5, fetchpatch }:
+, kernel, glibc, perl, libtool_2, libkrb5 }:
 
 with (import ./srcs.nix {
   inherit fetchurl;
@@ -55,7 +55,7 @@ in stdenv.mkDerivation {
     homepage = "https://www.openafs.org";
     license = licenses.ipl10;
     platforms = platforms.linux;
-    maintainers = [ maintainers.maggesi maintainers.spacefrogg ];
+    maintainers = with maintainers; [ maggesi spacefrogg ];
     broken = versionOlder kernel.version "3.18" || kernel.isHardened;
   };
 }

pkgs/tools/X11/keynav/default.nix

@@ -1,5 +1,18 @@
-{ lib, stdenv, fetchFromGitHub, pkg-config, libX11, xorgproto, libXtst, libXi, libXext
+{ lib
-, libXinerama, libXrandr, glib, cairo, xdotool }:
+, stdenv
+, fetchFromGitHub
+, pkg-config
+, libX11
+, xorgproto
+, libXtst
+, libXi
+, libXext
+, libXinerama
+, libXrandr
+, glib
+, cairo
+, xdotool
+}:
 
 let release = "20180821"; in
 stdenv.mkDerivation {
@@ -14,21 +27,30 @@ stdenv.mkDerivation {
   };
 
   nativeBuildInputs = [ pkg-config ];
-  buildInputs = [ libX11 xorgproto libXtst libXi libXext libXinerama libXrandr
+  buildInputs = [
-                  glib cairo xdotool ];
+    libX11
+    xorgproto
+    libXtst
+    libXi
+    libXext
+    libXinerama
+    libXrandr
+    glib
+    cairo
+    xdotool
+  ];
 
-  patchPhase = ''
+  postPatch = ''
     echo >>VERSION MAJOR=0
     echo >>VERSION RELEASE=${release}
     echo >>VERSION REVISION=0
   '';
 
-  installPhase =
+  installPhase = ''
-    ''
+    mkdir -p $out/bin $out/share/keynav/doc
-      mkdir -p $out/bin $out/share/keynav/doc
+    cp keynav $out/bin
-      cp keynav $out/bin
+    cp keynavrc $out/share/keynav/doc
-      cp keynavrc $out/share/keynav/doc
+  '';
-    '';
 
   meta = with lib; {
     description = "Generate X11 mouse clicks from keyboard";

pkgs/tools/audio/spotdl/default.nix

@@ -6,13 +6,13 @@
 
 python3.pkgs.buildPythonApplication rec {
   pname = "spotdl";
-  version = "3.6.3";
+  version = "3.7.2";
 
   src = fetchFromGitHub {
     owner = "spotDL";
     repo = "spotify-downloader";
     rev = "v${version}";
-    sha256 = "sha256-Ok8DOw+Joy35IqN7sNOQcUWYJS8tqBeQ5/I8fUSly7Q=";
+    sha256 = "sha256-ftSnlruSv+RtvjTpZPYg9Z2EK4th8NbDhVlG2eIc87s=";
   };
 
   propagatedBuildInputs = with python3.pkgs; [
@@ -26,6 +26,7 @@ python3.pkgs.buildPythonApplication rec {
     beautifulsoup4
     requests
     unidecode
+    youtube-dl
   ];
 
   checkInputs = with python3.pkgs; [

pkgs/tools/backup/bupstash/default.nix

@@ -1,16 +1,16 @@
 { lib, fetchFromGitHub, installShellFiles, rustPlatform, ronn, pkg-config, libsodium }:
 rustPlatform.buildRustPackage rec {
   pname = "bupstash";
-  version = "0.9.1";
+  version = "0.10.0";
 
   src = fetchFromGitHub {
     owner = "andrewchambers";
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-DzRGhdUxfBW6iazpCHlQ9J8IL10FVxhac8kx6yBSGNk=";
+    sha256 = "sha256-0vDty8JPUOt7mmBzQ9t1lnUyExBYW4hPmzvvhLSZhcs=";
   };
 
-  cargoSha256 = "sha256-IKk4VsO/oH4nC6F1W+JA3Agl7oXXNJ7zpP2PYpPLREU=";
+  cargoSha256 = "sha256-8W6uNLHCiCHB6mYyGnixiaHj1IyTnqjd8NaQG18W/uM=";
 
   nativeBuildInputs = [ ronn pkg-config installShellFiles ];
   buildInputs = [ libsodium ];

pkgs/tools/misc/chezmoi/default.nix

@@ -2,16 +2,16 @@
 
 buildGoModule rec {
   pname = "chezmoi";
-  version = "2.1.2";
+  version = "2.1.3";
 
   src = fetchFromGitHub {
     owner = "twpayne";
     repo = "chezmoi";
     rev = "v${version}";
-    sha256 = "sha256-EStR/tmbu95tptB7h3rHxoro87jlhu3i0XwRQNbIBvA=";
+    sha256 = "sha256-F4ad2P4NF7MSp6Lttk9hjAixiMTG/vtMe7YItmXdc4w=";
   };
 
-  vendorSha256 = "sha256-Geeo/tqF+VJamIzgU1qz0iEjTKE8jwFQLGXPBuN9eN8=";
+  vendorSha256 = "sha256-S/aP+oBH+bChoTLqqcB0aDzR7xtg9/qBqxxcLCwAbqY=";
 
   doCheck = false;
 

pkgs/tools/misc/disfetch/default.nix

@@ -4,13 +4,13 @@
 
 stdenv.mkDerivation rec {
   pname = "disfetch";
-  version = "2.2";
+  version = "2.7";
 
   src = fetchFromGitHub {
     owner = "llathasa-veleth";
     repo = "disfetch";
     rev = version;
-    sha256 = "sha256-93nh1MDE2YO53lH2jDdKxgHh6v2KkAFo2Oyg+6ZpD+M=";
+    sha256 = "sha256-9VPyH7tJEOKCB95VtoIZJ6pL2hEiKTXrp9C7HBD+oxc=";
   };
 
   dontBuild = true;

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

@@ -0,0 +1,34 @@
+{ lib, python3Packages, fetchFromGitHub }:
+
+python3Packages.buildPythonPackage rec {
+  pname = "ntfy-webpush";
+  version = "0.1.3";
+
+  src = fetchFromGitHub {
+    owner = "dschep";
+    repo = "ntfy-webpush";
+    rev = "v${version}";
+    sha256 = "1dxlvq3glf8yjkn1hdk89rx1s4fi9ygg46yn866a9v7a5a83zx2n";
+  };
+
+  postPatch = ''
+    # break dependency loop
+    substituteInPlace setup.py \
+      --replace "'ntfy', " ""
+  '';
+
+  propagatedBuildInputs = with python3Packages; [
+    pywebpush
+    py-vapid
+  ];
+
+  # no tests, just a script
+  doCheck = false;
+
+  meta = with lib; {
+    description = "cloudbell webpush notification support for ntfy";
+    homepage = "https://dschep.github.io/ntfy-webpush/";
+    license = licenses.mit;
+    maintainers = with maintainers; [ SuperSandro2000 ];
+  };
+}

pkgs/tools/misc/ntfy/default.nix

@@ -22,6 +22,7 @@ python3Packages.buildPythonApplication rec {
     psutil
     matrix-client
     dbus-python
+    ntfy-webpush
   ];
 
   checkPhase = ''

pkgs/tools/misc/tfk8s/default.nix

@@ -2,14 +2,14 @@
 
 buildGoModule rec {
   pname = "tfk8s";
-  version = "0.1.5";
+  version = "0.1.6";
   tag = "v${version}";
 
   src = fetchFromGitHub {
     owner = "jrhouston";
     repo = "tfk8s";
     rev = tag;
-    sha256 = "sha256-T0zM2JOmzk8YyS3+De6yGwiwLgyb6Rwy6hT9b44wNxQ=";
+    sha256 = "sha256-pjgacKyOAlaFqHCKcLmjTl/uWpjMzkHH0UcaIEb+IZI=";
   };
 
   vendorSha256 = "sha256-eLPmghs05pMMtys97Ja7YGdVMZmMmiaFeMwzaWNxW0I=";

pkgs/tools/networking/ghostunnel/default.nix

@@ -1,8 +1,7 @@
-{
+{ buildGoModule
-  buildGoModule,
+, fetchFromGitHub
-  fetchFromGitHub,
+, lib
-  lib,
+, nixosTests
-  nixosTests,
 }:
 
 buildGoModule rec {
@@ -27,13 +26,15 @@ buildGoModule rec {
     mv $sourceRoot/certstore $sourceRoot/vendor/ghostunnel/
   '';
 
+  passthru.tests = {
+    nixos = nixosTests.ghostunnel;
+    podman = nixosTests.podman-tls-ghostunnel;
+  };
+
   meta = with lib; {
     description = "A simple TLS proxy with mutual authentication support for securing non-TLS backend applications";
     homepage = "https://github.com/ghostunnel/ghostunnel#readme";
     license = licenses.asl20;
     maintainers = with maintainers; [ roberth ];
   };
-
-  passthru.tests.nixos = nixosTests.ghostunnel;
-  passthru.tests.podman = nixosTests.podman-tls-ghostunnel;
 }

pkgs/tools/networking/p2p/azureus/builder.sh

@@ -1,19 +0,0 @@
-source $stdenv/setup
-
-mkdir -p $out/jars
-cp $src $out/jars/azureus.jar
-
-mkdir -p $out/bin
-cat > $out/bin/azureus <<EOF
-#! $SHELL -e
-azureusHome=$out
-if test -n "\$HOME"; then
-    azureusHome=\$HOME/.Azureus
-fi
-exec $jdk/bin/java -Xms16m -Xmx128m \
-  -cp $out/jars/azureus.jar:$swt/jars/swt.jar \
-  -Djava.library.path=$swt/lib \
-  -Dazureus.install.path=\$azureusHome \
-  org.gudy.azureus2.ui.swt.Main
-EOF
-chmod +x $out/bin/azureus

pkgs/tools/networking/p2p/azureus/default.nix

@@ -1,16 +0,0 @@
-{lib, stdenv, fetchurl, jdk, swt}:
-
-stdenv.mkDerivation {
-  name = "azureus-2.3.0.6";
-  builder = ./builder.sh;
-  src = fetchurl {
-    url = "http://tarballs.nixos.org/Azureus2.3.0.6.jar";
-    sha256 = "1hwrh3n0b0jbpsdk15zrs7pw175418phhmg6pn4xi1bvilxq1wrd";
-  };
-
-  inherit jdk swt;
-
-  meta = {
-    platforms = lib.platforms.linux;
-  };
-}

pkgs/tools/networking/p2p/tahoe-lafs/default.nix

@@ -6,9 +6,8 @@
 # some loss of functionality because of it.
 
 python3Packages.buildPythonApplication rec {
-  version = "2021-07-09";
   pname = "tahoe-lafs";
-  namePrefix = "";
+  version = "unstable-2021-07-09";
 
   src = fetchFromGitHub {
     owner = "tahoe-lafs";
@@ -84,7 +83,7 @@ python3Packages.buildPythonApplication rec {
     trial --rterrors allmydata
   '';
 
-  meta = {
+  meta = with lib; {
     description = "Tahoe-LAFS, a decentralized, fault-tolerant, distributed storage system";
     longDescription = ''
       Tahoe-LAFS is a secure, decentralized, fault-tolerant filesystem.
@@ -92,9 +91,9 @@ python3Packages.buildPythonApplication rec {
       such a way that it remains available even when some of the peers
       are unavailable, malfunctioning, or malicious.
     '';
-    homepage = "http://tahoe-lafs.org/";
+    homepage = "https://tahoe-lafs.org/";
-    license = [ lib.licenses.gpl2Plus /* or */ "TGPPLv1+" ];
+    license = [ licenses.gpl2Plus /* or */ "TGPPLv1+" ];
     maintainers = with lib.maintainers; [ MostAwesomeDude ];
-    platforms = lib.platforms.gnu ++ lib.platforms.linux;
+    platforms = platforms.gnu ++ platforms.linux;
   };
 }

pkgs/top-level/aliases.nix

@@ -70,6 +70,7 @@ mapAliases ({
   aucdtect = throw "aucdtect: Upstream no longer provides download urls."; # added 2020-12-26
   avldrums-lv2 = x42-avldrums; # added 2020-03-29
   avxsynth = throw "avxsynth was removed because it was broken"; # added 2021-05-18
+  azureus = throw "azureus is now known as vuze and the version in nixpkgs was really outdated"; # added 2021-08-02
   badtouch = authoscope; # Project was renamed, added 20210626
   bar-xft = lemonbar-xft;  # added 2015-01-16
   bashCompletion = bash-completion; # Added 2016-09-28

pkgs/top-level/all-packages.nix

@@ -317,6 +317,8 @@ in
 
   protoc-gen-go-grpc = callPackage ../development/tools/protoc-gen-go-grpc { };
 
+  protoc-gen-grpc-web = callPackage ../development/tools/protoc-gen-grpc-web { };
+
   protoc-gen-twirp = callPackage ../development/tools/protoc-gen-twirp { };
 
   protoc-gen-twirp_php = callPackage ../development/tools/protoc-gen-twirp_php { };
@@ -1866,11 +1868,6 @@ in
     inherit (darwin.apple_sdk.frameworks) IOKit;
   };
 
-  azureus = callPackage ../tools/networking/p2p/azureus {
-    jdk = jdk8;
-    swt = swt_jdk8;
-  };
-
   b3sum = callPackage ../tools/security/b3sum {};
 
   backblaze-b2 = callPackage ../development/tools/backblaze-b2 { };
@@ -6859,6 +6856,10 @@ in
 
   libzmf = callPackage ../development/libraries/libzmf {};
 
+  libreddit = callPackage ../servers/libreddit {
+    inherit (darwin.apple_sdk.frameworks) Security;
+  };
+
   librespeed-cli = callPackage ../tools/misc/librespeed-cli { };
 
   libreswan = callPackage ../tools/networking/libreswan { };
@@ -14417,6 +14418,14 @@ in
     stdenv = gccStdenv;
   };
 
+  taplo-cli = callPackage ../development/tools/taplo-cli {
+    inherit (darwin.apple_sdk.frameworks) Security;
+  };
+
+  taplo-lsp = callPackage ../development/tools/taplo-lsp {
+    inherit (darwin.apple_sdk.frameworks) Security;
+  };
+
   tcptrack = callPackage ../development/tools/misc/tcptrack { };
 
   teensyduino = arduino-core.override { withGui = true; withTeensyduino = true; };
@@ -32573,7 +32582,9 @@ in
 
   btcdeb = callPackage ../applications/blockchains/btcdeb { };
 
-  jitsi-meet-electron = callPackage ../applications/networking/instant-messengers/jitsi-meet-electron { };
+  jitsi-meet-electron = callPackage ../applications/networking/instant-messengers/jitsi-meet-electron {
+    electron = electron_13;
+  };
 
   zenstates = callPackage ../os-specific/linux/zenstates {};
 

pkgs/top-level/python-packages.nix

@@ -4901,6 +4901,8 @@ in {
 
   nsapi = callPackage ../development/python-modules/nsapi { };
 
+  ntfy-webpush = callPackage ../tools/misc/ntfy-webpush { };
+
   ntc-templates = callPackage ../development/python-modules/ntc-templates { };
 
   ntlm-auth = callPackage ../development/python-modules/ntlm-auth { };
@@ -5091,6 +5093,8 @@ in {
 
   paho-mqtt = callPackage ../development/python-modules/paho-mqtt { };
 
+  palace = callPackage ../development/python-modules/palace { };
+
   palettable = callPackage ../development/python-modules/palettable { };
 
   pamela = callPackage ../development/python-modules/pamela { };