Merge master into staging-next

maintainers/maintainer-list.nix

···
     githubId = 3705333;
     name = "Dmitry V.";
   };
+  yayayayaka = {
+    email = "[e-mail]";
+    github = "yayayayaka";
+    githubId = 73759599;
+    name = "Lara A.";
+  };
   yegortimoshenko = {
     email = "[e-mail]";
     github = "yegortimoshenko";

maintainers/scripts/haskell/upload-nixos-package-list-to-hackage.sh

···
 # ~/.cabal/config file.
 
 # e.g. username: maralorn
-#      password-command: pass hackage.haskell.org (this can be any command, but not an arbitrary shell expression.)
+#      password-command: pass hackage.haskell.org (this can be any command, but not an arbitrary shell expression. Like cabal we only read the first output line and ignore the rest.)
 # Those fields are specified under `upload` on the `cabal` man page.
 
 package_list="$(nix-build -A haskell.package-list)/nixos-hackage-packages.csv"
 username=$(grep "^username:" ~/.cabal/config | sed "s/^username: //")
 password_command=$(grep "^password-command:" ~/.cabal/config | sed "s/^password-command: //")
-curl -u "$username:$($password_command)" --digest -H "Content-type: text/csv" -T "$package_list" http://hackage.haskell.org/distro/NixOS/packages.csv
+curl -u "$username:$($password_command | head -n1)" --digest -H "Content-type: text/csv" -T "$package_list" http://hackage.haskell.org/distro/NixOS/packages.csv

pkgs/applications/audio/easyeffects/default.nix

···
 
 stdenv.mkDerivation rec {
   pname = "easyeffects";
-  version = "6.0.0";
+  version = "6.0.3";
 
   src = fetchFromGitHub {
     owner = "wwmm";
     repo = "easyeffects";
     rev = "v${version}";
-    hash = "sha256:1m3jamnhgpx3z51nfc8xg7adhf5x7dirvw0wf129hzxx4fjl7rch";
+    sha256 = "sha256-GzqPC/m/HMthLMamhJ4EXX6fxZYscdX1QmXgqHOPEcg=";
   };
 
   nativeBuildInputs = [

pkgs/applications/misc/archiver/default.nix

···
   meta = with lib; {
     description = "Easily create & extract archives, and compress & decompress files of various formats";
     homepage = "https://github.com/mholt/archiver";
+    mainProgram = "arc";
     license = licenses.mit;
     maintainers = with maintainers; [ kalbasit ];
   };

pkgs/applications/misc/free42/default.nix

···
 
 stdenv.mkDerivation rec {
   pname = "free42";
-  version = "3.0.5";
+  version = "3.0.6";
 
   src = fetchFromGitHub {
     owner = "thomasokken";
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-ytRPIBE8KcuM+pyfdKt/b+Vi03x8nowdgZjSt8EddSc=";
+    sha256 = "sha256-PIHokB7GlGtx1A0IqFX9+HA/Vab1CDpVS/qhk/y8Nzk=";
   };
 
   nativeBuildInputs = [ copyDesktopItems pkg-config ];

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

···
 
 stdenv.mkDerivation rec {
   pname = "brave";
-  version = "1.27.108";
+  version = "1.27.109";
 
   src = fetchurl {
     url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_amd64.deb";
-    sha256 = "Lz6rNTRoxt/UQFMQ9vurFhXWUshLDfWMxFON4nXfIiY=";
+    sha256 = "RJCGaezucb3LJC1KLG/7vPIF3diVgSTsnylXEN1BaRU=";
   };
 
   dontConfigure = true;

pkgs/applications/networking/cloudflared/default.nix

···
 
 buildGoModule rec {
   pname = "cloudflared";
-  version = "2021.7.3";
+  version = "2021.7.4";
 
   src = fetchFromGitHub {
     owner  = "cloudflare";
     repo   = "cloudflared";
     rev    = version;
-    sha256 = "sha256-p9FNH5obQfEQZRoOr35ORH+6dwbcNgSXjARF9WA7t9E=";
+    sha256 = "sha256-3HK7QLUhU6MUayRYec4LP2BfbwEsvtjtCf++o1cQsQw=";
   };
 
   vendorSha256 = null;

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

···
 
 buildGoModule rec {
   pname = "kubelogin";
-  version = "0.0.9";
+  version = "0.0.10";
 
   src = fetchFromGitHub {
     owner = "Azure";
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-0+4hrC7A60dbf+1uvTVU2JRynvA3O/lXfgcra1fV9bI=";
+    sha256 = "sha256-YLYyU3k3I74ZuczFZBwcJoJSfCR4B9Z1EbFupA+xkiE=";
   };
 
-  vendorSha256 = "sha256-erGqCpWlAQanY1ghpNVRhzUEIXv3lCiBGRs888MmHN8=";
+  vendorSha256 = "sha256-vJfTf9gD/qrsPAfJeMYLjGa90mYLOshgDehv2Fcl6xM=";
 
   buildFlagsArray = ''
     -ldflags=

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

···
 
 buildGoModule rec {
   pname = "kuttl";
-  version = "0.9.0";
+  version = "0.11.0";
   cli = "kubectl-kuttl";
 
   src = fetchFromGitHub {
     owner  = "kudobuilder";
     repo   = "kuttl";
     rev    = "v${version}";
-    sha256 = "sha256:1cji0py2340mvcpplwq3licdkzjx7q5f27fdjjxvbhrgksnyw6hs";
+    sha256 = "sha256-42acx1UcvuzDZX2A33zExhhdNqWGkN0i6FR/Kx76WVM=";
   };
 
-  vendorSha256 = "sha256:1shra42ifa2knxp58fj5hn074jg89f3nqdqk4rqbp3ybir84ahsd";
+  vendorSha256 = "sha256-TUNFUI7Lj7twJhM3bIdL6ElygIVFOlRut1MoFwVRGeo=";
 
   subPackages = [ "cmd/kubectl-kuttl" ];
 

pkgs/applications/networking/ftp/filezilla/default.nix

···
 
 stdenv.mkDerivation rec {
   pname = "filezilla";
-  version = "3.53.1";
+  version = "3.55.0";
 
   src = fetchurl {
     url = "https://download.filezilla-project.org/client/FileZilla_${version}_src.tar.bz2";
-    sha256 = "sha256-ZWh08ursVGcscvQepeoUnFAZfFDeXWdIu0HXIr/D93k=";
+    sha256 = "sha256-rnDrQYDRNr4pu61vzdGI5JfiBfxBbqPkE9znzYyrnII=";
   };
 
   # https://www.linuxquestions.org/questions/slackware-14/trouble-building-filezilla-3-47-2-1-current-4175671182/#post6099769

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

···
 , fetchurl
 , appimageTools
 , makeWrapper
-, electron_12
+, electron_13
 , xorg
 }:
 
 let
-  electron = electron_12;
+  electron = electron_13;
 in
 stdenv.mkDerivation rec {
   pname = "jitsi-meet-electron";
-  version = "2.8.8";
+  version = "2.8.9";
 
   src = fetchurl {
     url = "https://github.com/jitsi/jitsi-meet-electron/releases/download/v${version}/jitsi-meet-x86_64.AppImage";
-    sha256 = "sha256-ORj0xSFzdyOVuybaDyTrawsVkJymKEHLbFxGUgzXNWY=";
+    sha256 = "sha256-PsMP0bDxlXAkRu3BgaUWcqnTfUKOGB81oHT94Xi8t8E=";
     name = "${pname}-${version}.AppImage";
   };
 

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

···
 
 mkDerivation rec {
   pname = "ripcord";
-  version = "0.4.28";
+  version = "0.4.29";
 
   src = let
     appimage = fetchurl {
       url = "https://cancel.fm/dl/Ripcord-${version}-x86_64.AppImage";
-      sha256 = "0bczqp4kny7jlp06f4bh1xg0x17g8980dj6pk4waqc7qk88i6sfv";
+      sha256 = "sha256-4yDLPEBDsPKWtLwdpmSyl3b5XCwLAr2/EVtNRrFmmJk=";
       name = "${pname}-${version}.AppImage";
     };
   in appimageTools.extract {

pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix

···
-{ mkDerivation, lib, fetchFromGitHub, callPackage, fetchpatch
+{ mkDerivation, lib, fetchFromGitHub, callPackage
 , pkg-config, cmake, ninja, python3, wrapGAppsHook, wrapQtAppsHook
 , extra-cmake-modules
 , qtbase, qtimageformats, gtk3, libsForQt5, lz4, xxHash
···
   tg_owt = callPackage ./tg_owt.nix {};
 in mkDerivation rec {
   pname = "telegram-desktop";
-  version = "2.8.11";
+  version = "2.9.0";
   # Note: Update via pkgs/applications/networking/instant-messengers/telegram/tdesktop/update.py
 
   # Telegram-Desktop with submodules
···
     repo = "tdesktop";
     rev = "v${version}";
     fetchSubmodules = true;
-    sha256 = "020ycgb77vx7rza590i3csrvq1zgm15rvpxqqcp0xkb4yh71i3hb";
+    sha256 = "0964as7rkjq1px6z15z6kmkiz4zw69wmm3namwn940bsja123qls";
   };
-
-  patches = [(fetchpatch {
-    # ref: https://github.com/desktop-app/lib_webview/pull/9
-    url = "https://github.com/desktop-app/lib_webview/commit/75e924934eee8624020befbef1f3cb5b865d3b86.patch";
-    sha256 = "sha256-rN4FVK4KT+xNf9IVdcpbxMqT0+t3SINJPRRQPyMiDP0=";
-    stripLen = 1;
-    extraPrefix = "Telegram/lib_webview/";
-  })];
 
   postPatch = ''
     substituteInPlace Telegram/CMakeLists.txt \

pkgs/applications/radio/chirp/default.nix

···
 }:
 python2.pkgs.buildPythonApplication rec {
   pname = "chirp-daily";
-  version = "20200807";
+  version = "20210724";
 
   src = fetchurl {
     url = "https://trac.chirp.danplanet.com/chirp_daily/daily-${version}/${pname}-${version}.tar.gz";
-    sha256 = "60b682793698e6427ad485546eae3a044b8290a220f190633158a2fb0e942fa0";
+    sha256 = "0wddzls7r0l5b8vvljnmrj5lmmp7zkzl4h73pyigyf9nbhaklybb";
   };
 
   propagatedBuildInputs = with python2.pkgs; [

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

···
 
 stdenv.mkDerivation rec {
   pname = "libpoly";
-  version = "0.1.9";
+  version = "0.1.10";
 
   src = fetchFromGitHub {
     owner = "SRI-CSL";
     repo = "libpoly";
     # they've pushed to the release branch, use explicit tag
     rev = "refs/tags/v${version}";
-    sha256 = "sha256-E2lHo8Bt4ujoGQ623fjkQbqRnDYJYilXdRt4lnF4wJk=";
+    sha256 = "sha256-22Y4L5NFnCzKwZt0A/ChMuGPU4Dk1Qyke6mdvfN063w=";
   };
 
   # https://github.com/SRI-CSL/libpoly/pull/52

pkgs/applications/version-management/git-and-tools/diff-so-fancy/default.nix

···
 
 stdenv.mkDerivation rec {
   pname = "diff-so-fancy";
-  version = "1.4.2";
+  version = "1.4.3";
 
   src = fetchFromGitHub {
     owner = "so-fancy";
     repo = "diff-so-fancy";
     rev = "v${version}";
-    sha256 = "sha256-1kBarsRiuB8fv7VLlWfpotPfHeMrfmIXHXTFu8TzC2A=";
+    sha256 = "sha256-/xdBvq2u1s5/yzjwr3MLxpaD1CNktcPijXJTKW3Bc4c=";
   };
 
   nativeBuildInputs = [

pkgs/applications/version-management/gitkraken/default.nix

···
 in
 stdenv.mkDerivation rec {
   pname = "gitkraken";
-  version = "7.7.0";
+  version = "7.7.1";
 
   src = fetchzip {
     url = "https://release.axocdn.com/linux/GitKraken-v${version}.tar.gz";
-    sha256 = "0zb94ipi777qkznxpgb7ah31mx9b63713k92vhxhz4glna59lvk3";
+    sha256 = "sha256-nFXj40PfHctymBcZoiJNzkvAsFnABD300/aUqNpUn2c=";
   };
 
   dontBuild = true;

pkgs/applications/virtualization/containerd/default.nix

···
 
 buildGoModule rec {
   pname = "containerd";
-  version = "1.5.4";
+  version = "1.5.5";
 
   outputs = [ "out" "man" ];
 
···
     owner = "containerd";
     repo = "containerd";
     rev = "v${version}";
-    sha256 = "sha256-VV1cxA8tDRiPDxKV8OGu3T7sgutmyL+VPNqTeFcVjJA=";
+    sha256 = "sha256-6mDTTXHpXBcKOcT+VrGgt6HJzvTeKgJ0ItJ+IjCTJxk=";
   };
 
   vendorSha256 = null;
···
   BUILDTAGS = lib.optionals (btrfs-progs == null) [ "no_btrfs" ];
 
   buildPhase = ''
+    runHook preBuild
     patchShebangs .
     make binaries man $buildFlags
+    runHook postBuild
   '';
 
   installPhase = ''
+    runHook preInstall
     install -Dm555 bin/* -t $out/bin
     installManPage man/*.[1-9]
     installShellCompletion --bash contrib/autocomplete/ctr
     installShellCompletion --zsh --name _ctr contrib/autocomplete/zsh_autocomplete
+    runHook postInstall
   '';
 
   passthru.tests = { inherit (nixosTests) docker; };

pkgs/applications/window-managers/i3/status-rust.nix

···
 
 rustPlatform.buildRustPackage rec {
   pname = "i3status-rust";
-  version = "0.20.2";
+  version = "0.20.3";
 
   src = fetchFromGitHub {
     owner = "greshake";
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-9PXvQrh0gmn/G+b7sbQffQkPnUKu1eVrvUoJlRBsOEM=";
+    sha256 = "sha256-JNTTSVWGPqJT9xShF1bgwTGtlp37Ocsdovow8F4EH3g=";
   };
 
-  cargoSha256 = "sha256-6orDR2Ml1Fy20uT47EDkEk0rGFxO0djHZsFiqlS1Tk8=";
+  cargoSha256 = "sha256-sm7Iorux2GKja0qzw2wM4sdsRwijtezIlef5vh1Nt54=";
 
   nativeBuildInputs = [ pkg-config makeWrapper ];
 

pkgs/data/fonts/iosevka/bin.nix

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

pkgs/data/fonts/iosevka/variants.nix

···
 # This file was autogenerated. DO NOT EDIT!
 {
-  iosevka = "10aa8bsykkfi3aplw4j7smj0brcbni3jxqzjbpsbv5b15wzvkm7y";
-  iosevka-aile = "0pa79n41xha9rdj4vzz8cpmdhf0h4fjyphjl12i9qxh5znjr4yyz";
-  iosevka-curly = "0shk75qdm5acfbxdvv985gnhaz3dys8wpshiis6y2raz8sam48qg";
-  iosevka-curly-slab = "0z297s1bl2rrrmr3a4cds4cx4cw69p2y05jv999bkw9vrd6a5ij9";
-  iosevka-etoile = "05h62ybd6b54b51h6m6dq3phvrw4jfcc6cyp1x44shj4az2ia17w";
-  iosevka-slab = "07rp7rp3rjzzn6vnx3zbfizd924xhl702kcyq9qlif9g285l85nl";
-  iosevka-ss01 = "1rvshgyhcq2cay9dssap9mhinhljn92adrbf8lbkaabf3fcyd19h";
-  iosevka-ss02 = "0bscxfjhm1is7b7amr5jjj5wpxm1yps4cns47r4w26a0ad4lzf6b";
-  iosevka-ss03 = "1l4mzv1w7wkjs4629hrj7svd3wwhjfvby0qsbq2fr71ngz4gdvva";
-  iosevka-ss04 = "0mj5l316bji6mazgkzi5vigbfbgfnif0llmgacg0l5qayzaafqb1";
-  iosevka-ss05 = "1gfc7b05fvf1m5vhlvbzxzim8qfcqf16dg8qmzdv625dk1mg2llf";
-  iosevka-ss06 = "1n3mfn8h9gmf7ymc6f5ky5n70nn0nb2l8grj26hm9047cvbxcjqm";
-  iosevka-ss07 = "0bffazcb6k7qd3c3fxg426mcgjzc5xncv8nsiz71frhi9crplprv";
-  iosevka-ss08 = "1kv6v7n2qbgl185kfh401mjvs2iim6l3cw9zzghhfx6qv7xy0dcd";
-  iosevka-ss09 = "0da9kcsxk4vllnxjlslm394lr3bhdsw4a2mi95szplipbf748jcp";
-  iosevka-ss10 = "0935y7m603n3rfv38gmja7jhjmc6xrcx61psb3sznp7mlmi0dn7x";
-  iosevka-ss11 = "1hh0b8qaas4bxz0sa8zi5sr4rmqrpgxfzaq53fsmxy7pzjkhjz09";
-  iosevka-ss12 = "118ibl1i7981kjvf8g0rqrckh2chnxvyivk5wwmxhkw43x06ffjf";
-  iosevka-ss13 = "1licqy5dy5z4s91yh086i0m362lavaqq6zr13715zaqh7ard7hva";
-  iosevka-ss14 = "0y1f5hva9kpj9l3a56n6vbr8zbydd9c0knvsbpg68lcgmybfc97m";
-  iosevka-ss15 = "11pm6frf74y27ym4kmh98pn2cqlab6msj0cxpah36ckpzkm5zdqq";
-  iosevka-ss16 = "0z77549ydrbdhw96gc1zl3sg4s16cq7l56pwkfk9ificm1rwf1nm";
-  iosevka-ss17 = "0zm34lfgrlcb97a8dx1g056qy6rr7722b1k6hm9dp676mi5va2cw";
-  iosevka-ss18 = "0jmz975gny6fc7vf5cn8a4bl0y8pzdwlvfh0km9x7ijp711pw42p";
+  iosevka = "1gx0hkxch4m21yqwp8sifp6hzvn579w0jf5c2vfgp771yrilhj41";
+  iosevka-aile = "1x4gjwj1a6q8vpihvyy0bpqsw3s1b546b5yi7918yqlam31kbfyl";
+  iosevka-curly = "11w7f2v05zgdc5ac96v3dr93a2sganw6ggpl6vdhiqiqn1asfldi";
+  iosevka-curly-slab = "052cwri7fc25yn314qqnjjjw1xssjjx4nin65r11589scyxzrh97";
+  iosevka-etoile = "0p677iagypvyfx8gyja4qv0b5g39i2mh27cik6cjm22ri6fq3n8y";
+  iosevka-slab = "05dzpd33ivsp2fjc7zdrsgad0ym8iq2lpdj5ic5ja3lkacnm7r9j";
+  iosevka-ss01 = "1ln7fz9yjwgrrw069k3v65q0jp02298a4r68f7hk2l6bgj8c6dml";
+  iosevka-ss02 = "11rihmzccq0yw0r08yclspksqs0rdyrfrfkhfzv0f9fh6c5qd30q";
+  iosevka-ss03 = "1zyylszp4iykj2jyx9457jsl3m7lr2irc177m1wvvv68xg1vqjrv";
+  iosevka-ss04 = "14pay7d0a5yymwkdhs6vsmcvzh27nml3asdy86dlpix0byzm72qi";
+  iosevka-ss05 = "00y744phcvlbwwvk4kq05m1f8l1w7b3gk400yk3y1cmx4a4168jw";
+  iosevka-ss06 = "1g7pj3js22kmcnv654n6d0fdykf9jkarwbji3vzajnxqgpv03j5x";
+  iosevka-ss07 = "1rv1bf9vffqc99l8dhh4v9ms6pkbxxjgzf7skq02gfr27avj1lln";
+  iosevka-ss08 = "0s54csx64khdyzlb7k6m9cx9cqjj9cdymsbzhksv0fdbf3cc71ns";
+  iosevka-ss09 = "0zvy010ll38dlisjggmgw8k991wwcnzzvpjyqybxpxb8hk3jfxyn";
+  iosevka-ss10 = "1b5fk4hwzqg7p1b7h9vw9nc65pl0sp5h6k41jrmpdjr0nkjhm0zl";
+  iosevka-ss11 = "1b9bpg43n0vh0bigaq6y510w7lpsf54v82nvdxl48vp225kibr52";
+  iosevka-ss12 = "0w2ykjzjqxmp4r7yl10cpr802xpmww4nvi7nca7kj5scl30mrd4g";
+  iosevka-ss13 = "1cg59jx44yyi5y6rvdvasmq0n0vqdbcli1rxhfqgwfx1rkwnxy27";
+  iosevka-ss14 = "0xi6jpa8fapk72c77yljp07zdl0hdmdg9giyysllih3j2r4l1mrw";
+  iosevka-ss15 = "1qv7qh4wzkq7d5rmn19hhmv447sc8hd390nrajwk2a900vfh8xlk";
+  iosevka-ss16 = "1gkrhqn1k5y6q87p09nz1lcafmryl7l3s5aqx265y0dqfrni5rfg";
+  iosevka-ss17 = "18plv1f9brn8kh7b3jz2imjwash72vlzbnciam41q8i4m47m7dj7";
+  iosevka-ss18 = "177qy927siihpzaf4k4sfl9zbp2krbmlg56qzrcm2jbswlnmkyjx";
+  sgr-iosevka = "1np4v340r33vrb92cwx68lvsk6prg2swj4a6x9iig8lbc7fjk7fy";
+  sgr-iosevka-aile = "09fyslcr7vazfw7js27s0pd7immqd7ics4dihj54k12w8mjfj0fg";
+  sgr-iosevka-curly = "1yva4sx4dgfh4274c5sdkllr2d973ifxpn5jkxp428xhpyx9aq5b";
+  sgr-iosevka-curly-slab = "1vsngc45l30lmksvlnfr5b8xxnjsvpaqia4fzvx70napm5z6py4w";
+  sgr-iosevka-etoile = "033b8w59qbjg17qlbw1lsc8shwklbcvbr0m0ldk0frd08qz2kpmk";
+  sgr-iosevka-fixed = "0qyf6pmichpd4yd821k17dy0chb3rslifqm7jjhbl8kkrylf1f2c";
+  sgr-iosevka-fixed-curly = "01y8zc5w7jbb7m959db63msdfhp93ckfmm4nxh8fzg6ps3zpf4dy";
+  sgr-iosevka-fixed-curly-slab = "04dn2pirw771d5la702l1n8yxc46k6mlivryqlr3kd7z6c4jylca";
+  sgr-iosevka-fixed-slab = "1fnzlwlp67mwrw8l4mpylpv2mfday5b9mcjjwc9diymg85gvmz38";
+  sgr-iosevka-fixed-ss01 = "0259mn0p6z43ks13355czbm8pnrb7d8qwfl8kfyrnb6gaj1wa0fd";
+  sgr-iosevka-fixed-ss02 = "074jdv3w6461bg3iqgwxv8wfrp0ph2sgqc51y1hg7cx26nrs727x";
+  sgr-iosevka-fixed-ss03 = "0s5f2138js5w87khv1b5wzg1h96rhv77vw652m45qhqml0ivj5i6";
+  sgr-iosevka-fixed-ss04 = "1mbsjgbfj8m95bb4v0dw3f30hx2kq94bz9q9xv57bs80nmyb8a9b";
+  sgr-iosevka-fixed-ss05 = "1zkb9q20f9yb3qp7a092kfaag9izsqxi1nljksbg8qya4iiy22fw";
+  sgr-iosevka-fixed-ss06 = "1xkd6nrh0s7dwk326bjk1wn6sa9d3d5r54q48i6giz43fg1j5six";
+  sgr-iosevka-fixed-ss07 = "0vxwwy5cizq0d5dswakwbncn9jq299ppc17c7dxqjmgxwkawrd06";
+  sgr-iosevka-fixed-ss08 = "08asq61zv353975h9zfv0rrn0g9x5c2l542aqhvi8kbcr702a8an";
+  sgr-iosevka-fixed-ss09 = "1qldik6k3ycgq1w95z5l1iwr55jjgc94w3d10gncwl41agz8mav8";
+  sgr-iosevka-fixed-ss10 = "00mylfjic10aiyfrzv0inq3i18qj97f999f86szrf8mxf9na8b73";
+  sgr-iosevka-fixed-ss11 = "1ggnkqf8l8fdkyimcpjgrlc1sdkzdhd79zaygfzg4fhbfxvm7g9w";
+  sgr-iosevka-fixed-ss12 = "13lgy12crxxvlj99iy3l0ag2wc20migx9l4abz04mjjh8cgvk10b";
+  sgr-iosevka-fixed-ss13 = "0vk7b5xg67myrw69m5gjxchsgp4af5pwspdscklb739w66v42daq";
+  sgr-iosevka-fixed-ss14 = "1dap836qgkm62p7xivdc4jmirr75m9m5w9srr1qwsc5vfly4w63j";
+  sgr-iosevka-fixed-ss15 = "12alzyp3c8c9h89kqkiw7spwwahi89w9mcgrggizgjqzm5n6qvwc";
+  sgr-iosevka-fixed-ss16 = "1h0wa3g6vrpi86qshx187c2a26kh7ccy89rxi2kxajqis8lc9c25";
+  sgr-iosevka-fixed-ss17 = "1hlhi5fllz3sb3p25im7ymvcvhf761iafkiass2cw83l2ypbh9ph";
+  sgr-iosevka-fixed-ss18 = "0cwkbj232kb0nwvy59wjinxk6ncck5yg9594p49fx6016qxsv022";
+  sgr-iosevka-slab = "1imc9pamhxd5pm3xv274yv2qbnsd258rxz0skq7kc5f647bfb1dn";
+  sgr-iosevka-ss01 = "0j97757fj595mlr9mgc5vkqxriskxzc1cch0sk9fb2qvr0gpyjvk";
+  sgr-iosevka-ss02 = "0j1i9zakq2svfp727sxhcnqhrb0962pzdc7g0bdxgvxwdhmqzqn1";
+  sgr-iosevka-ss03 = "1bz95n1xpx756sfsgyshnaqrrygvh3pmcmxjqjyc0yk5f3aawqgm";
+  sgr-iosevka-ss04 = "11c4q2dsfkqbw1ppw2r2x932mhlr6bq8sc1hr6z7pvflx3kvdgdg";
+  sgr-iosevka-ss05 = "1jwy3wfd4yk6q4cyrry2s3hgkg0pbnn8mmr7w5wpgph4sg2lyrs4";
+  sgr-iosevka-ss06 = "0b4rilasn6zkrwf6dfxgrd957r8sjkw259acp1fnsc2wjpi27krf";
+  sgr-iosevka-ss07 = "0rvprfprypd54rnjsza0z6xswx22k4mva6pq8qs8fl8kfp3b92kk";
+  sgr-iosevka-ss08 = "0jfq72pi9bfmldxk8rnb3hv5kq7bps4pbs15k307avadj80dy107";
+  sgr-iosevka-ss09 = "1rlckb7djrkv1bicrp8nkszvk5wkkyhm6f88br13prqhsfbkdfpi";
+  sgr-iosevka-ss10 = "0v6jqs75s0xqplgxxk09ah7gpbajajwbyfcmifq2db4sv65bkalj";
+  sgr-iosevka-ss11 = "1avc38qc0r7ylmvmyw9lcdimsmh3xha675qzz7gxwalp1mp6d2zp";
+  sgr-iosevka-ss12 = "1y9sbvq0mdhzwkaih2gh9jg07993jzjymjgmcn52kvygyn4jc8vf";
+  sgr-iosevka-ss13 = "1xsgm6301vfpvsp0z3n3wbv03557whrnkw0cb9vkb9hbww5sjcq6";
+  sgr-iosevka-ss14 = "0fvj6amlgifnppfwgvl39vq76aww170wiici596zqvbddl8hhf0k";
+  sgr-iosevka-ss15 = "1ihsw196wbkr6cmisf7yasd3cfipz17033crjhsmh6f5q85705l7";
+  sgr-iosevka-ss16 = "1b6w69cjmaa0a29yklly9b26m5ivrn5rpygrsbzsrfadgm6h9xcb";
+  sgr-iosevka-ss17 = "1zvqrpg1m5i9af80qs847lz139zj1awx6akr7m3alwpz6jm178yd";
+  sgr-iosevka-ss18 = "1vw5swd09a0xplz367f26li0ksf5c54a0rf65dr62nviilvlphmx";
+  sgr-iosevka-term = "0zc1n1ansv5r4ph9xshm8vaj96m718ypagg4v9in0a0mdgpdp6il";
+  sgr-iosevka-term-curly = "1z487mq31afz0cpc7mfpny5x1wq8vdf2c0mmzhr46bcncinwinll";
+  sgr-iosevka-term-curly-slab = "15iw3mpy75486ybws9ya4x1bn9y00v1v40clcxjcbk276bfw121p";
+  sgr-iosevka-term-slab = "0y6wym3knhcvw1dlrqy9h8f68rsfpwwlb2hl9kdcfrv5zmd8mngy";
+  sgr-iosevka-term-ss01 = "03q1j73jwhi54hp3dfx3yj4vabmsrgiy8g5jk6lqcmqk6d42zhgq";
+  sgr-iosevka-term-ss02 = "10i1wb4if30zf61ridmqks7j2915yrs72plbv6wy7c4x1qdawhy1";
+  sgr-iosevka-term-ss03 = "05ywks1ikwgwxksx0jxawp2a9gaka76gknzxxxzxxvd3x7g6qh4v";
+  sgr-iosevka-term-ss04 = "15n5ky9yppcb5gz1pqm77hqihc2br0v52silg2d5yaj1fp4lzjpr";
+  sgr-iosevka-term-ss05 = "05p8sc1cjj9412bnyq3xda0v8xrzgf5g6ikgkanps3glvvvlkf3m";
+  sgr-iosevka-term-ss06 = "0w6zra0hpdyl0pkm9hdv4171fcgksv1s75wmwrh50dwnlv2hlns3";
+  sgr-iosevka-term-ss07 = "0zg9bnrfh3kbq69v4ih8yna70hzdbkbz1x0fminp79s0j9c66fjs";
+  sgr-iosevka-term-ss08 = "0sqv98xg1z5p30npg66s2z2wh139prs7960d8y06s09k0npjzlsz";
+  sgr-iosevka-term-ss09 = "0cqw79mf969kwbz5gwif3qg0zxk7pdbncpvq24m6kdws7sry06p4";
+  sgr-iosevka-term-ss10 = "15vaj99l2xrlcqg7712ksjcz0nwba7nlqcfc2angmw8zy163qg23";
+  sgr-iosevka-term-ss11 = "0rcn1761jv9wzi1nzl7sy57msw754yxys468jkacdpskqymfrhly";
+  sgr-iosevka-term-ss12 = "0l1f60gvvswnc02w8ylzsk37px0j0jv75pbc572p012x3mvkqipw";
+  sgr-iosevka-term-ss13 = "0nl7qbgas1zybi7gm6jr5rgzmk2vylh3ky8ggzlkljn9zw4mm1sn";
+  sgr-iosevka-term-ss14 = "0nyvayy0xj9gv21s6yjfp9xa6g4qih8lpvsrsinic4jgjhjxxn1l";
+  sgr-iosevka-term-ss15 = "14p7cq5rfr8f7lzi5q7q48a5rrvrd9mghkwr09a0m9fyqav2bnwh";
+  sgr-iosevka-term-ss16 = "17b88cv3ylnlybw4zlaa2y55s63p4ylrjk8y15p27knkwf0j7km3";
+  sgr-iosevka-term-ss17 = "1fh3b47g6faswq4ppksa6kkq5l1wpkq8c523ffakmjgjw92za7qi";
+  sgr-iosevka-term-ss18 = "161afvra35nfvk5crri1jfnwm579wbdn6r16afzq8fr5g46ddcla";
 }

pkgs/desktops/plasma-5/3rdparty/addons/krunner-symbols.nix

···
   meta = with lib; {
     description = "A little krunner plugin (Plasma 5) to retrieve unicode symbols, or any other string, based on a corresponding keyword";
     homepage = "https://github.com/domschrei/krunner-symbols";
-    license = licenses.gpl3Only;
+    license = licenses.gpl3Plus;
     maintainers = with maintainers; [ hqurve ];
     platforms = platforms.linux;
   };

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

···
-{ lib, mkCoqDerivation, which, autoconf, coq, coquelicot, flocq, bignums ? null, version ? null }:
+{ lib, mkCoqDerivation, which, autoconf, coq, coquelicot, flocq, bignums ? null, gnuplot_qt, version ? null }:
 
-with lib; mkCoqDerivation {
+with lib; mkCoqDerivation rec {
   pname = "interval";
   owner = "coqinterval";
   domain = "gitlab.inria.fr";
   inherit version;
   defaultVersion = with versions; switch coq.coq-version [
-    { case = isGe "8.8" ;        out = "4.1.1"; }
+    { 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"; }
     { case = range "8.5" "8.6";  out = "3.3.0"; }
   ] null;
+  release."4.3.0".sha256 = "sha256-k8DLC4HYYpHeEEgXUafS8jkaECqlM+/CoYaInmUTYko=";
+  release."4.2.0".sha256 = "sha256-SD5thgpirs3wmZBICjXGpoefg9AAXyExb5t8tz3iZhE=";
   release."4.1.1".sha256 = "sha256-h2NJ6sZt1C/88v7W2xyuftEDoyRt3H6kqm5g2hc1aoU=";
   release."4.0.0".sha256 = "1hhih6zmid610l6c8z3x4yzdzw9jniyjiknd1vpkyb2rxvqm3gzp";
   release."3.4.2".sha256 = "07ngix32qarl3pjnm9d0vqc9fdrgm08gy7zp306hwxjyq7h1v7z0";
···
   releaseRev = v: "interval-${v}";
 
   nativeBuildInputs = [ which autoconf ];
-  propagatedBuildInputs = [ bignums coquelicot flocq ];
+  propagatedBuildInputs = [ bignums coquelicot flocq ]
+    ++ lib.optionals (versions.isGe "4.2.0" defaultVersion) [ gnuplot_qt ];
   useMelquiondRemake.logpath = "Interval";
+  mlPlugin = true;
+  enableParallelBuilding = true;
 
   meta = with lib; {
     description = "Tactics for simplifying the proofs of inequalities on expressions of real numbers for the Coq proof assistant";

pkgs/development/interpreters/erlang/R24.nix

···
 # How to obtain `sha256`:
 # nix-prefetch-url --unpack https://github.com/erlang/otp/archive/OTP-${version}.tar.gz
 mkDerivation {
-  version = "24.0.4";
-  sha256 = "OeXXNaVJh5el+V+5ukcNOAgDmkJuGy1lYLpUTd1yxHM=";
+  version = "24.0.5";
+  sha256 = "4ZyYcBhep67aPr8SY7JK/3YXD5Th8UcyjTP7UIZ5c5Q=";
 }

pkgs/development/interpreters/yabasic/default.nix

···
 
 stdenv.mkDerivation rec {
   pname = "yabasic";
-  version = "2.89.1";
+  version = "2.90.1";
 
   src = fetchurl {
     url = "http://www.yabasic.de/download/${pname}-${version}.tar.gz";
-    hash = "sha256-k8QmQCpszLyotEiWDrG878RM2wqSq7I4W9j6Z2Ub3Yg=";
+    hash = "sha256-9LqiwS3Udql3YZoufo3spVpE46me3McI8L08TpNJpJo=";
   };
 
   buildInputs = [
···
   ];
 
   meta = with lib; {
-    homepage = "http://www.yabasic.de/";
+    homepage = "http://2484.de/yabasic/";
     description = "Yet another BASIC";
     longDescription = ''
       Yabasic is a traditional basic-interpreter. It comes with goto and various

pkgs/development/libraries/aws-sdk-cpp/default.nix

···
 
 stdenv.mkDerivation rec {
   pname = "aws-sdk-cpp";
-  version = "1.8.121";
+  version = "1.8.130";
 
   src = fetchFromGitHub {
     owner = "awslabs";
     repo = "aws-sdk-cpp";
     rev = version;
-    sha256 = "sha256-uita3HPcerxH/bnSIL3ZNUp68QXtKJLYi0pcnV7OBkQ=";
+    sha256 = "sha256-5T4l0KYB0utFTdEOtYT9trQ/JehQbXxk/IhI6YavErs=";
   };
 
   # FIXME: might be nice to put different APIs in different outputs

pkgs/development/libraries/dyncall/default.nix

···
 
 stdenv.mkDerivation {
   pname = "dyncall";
-  version = "1.1";
+  version = "1.2";
 
   src = fetchurl {
-    url = "https://www.dyncall.org/r1.1/dyncall-1.1.tar.gz";
-    # https://www.dyncall.org/r1.1/SHA256
-    sha256 = "cf97fa3f142db832ff34235caa4d69a7d5f16716573d446b2d95069126e88795";
+    url = "https://www.dyncall.org/r1.2/dyncall-1.2.tar.gz";
+    # https://www.dyncall.org/r1.2/SHA256
+    sha256 = "sha256-6IFUwCQ0IVYHBPXHKUr73snpka+gYB1a3/UELqgYCNc=";
   };
 
   # XXX: broken tests, failures masked, lets avoid crashing a bunch for now :)

pkgs/development/libraries/ethash/default.nix

···
 
 stdenv.mkDerivation rec {
   pname = "ethash";
-  version = "0.6.0";
+  version = "0.7.0";
 
   src =
     fetchFromGitHub {
       owner = "chfast";
       repo = "ethash";
       rev = "v${version}";
-      sha256 = "sha256-N30v9OZwTmDbltPPmeSa0uOGJhos1VzyS5zY9vVCWfA=";
+      sha256 = "sha256-QQoWOJGwL03zbBfrFNXz0Ff9Agc2dMBW9nW3jdOwEE8=";
     };
 
   nativeBuildInputs = [

pkgs/development/libraries/freetds/default.nix

···
 
 stdenv.mkDerivation rec {
   pname = "freetds";
-  version = "1.2.21";
+  version = "1.3";
 
   src = fetchurl {
     url    = "https://www.freetds.org/files/stable/${pname}-${version}.tar.bz2";
-    sha256 = "sha256-pea79tbz3AgWsZy9CDCNJ6CEsEkmqqBaxn+AjqB9PY0=";
+    sha256 = "sha256-j5ecrU2DUJBubDZF9wRxr0eNCHWe2TzToxQn8HkrX5c=";
   };
 
   buildInputs = [

pkgs/development/libraries/leptonica/default.nix

···
 
 stdenv.mkDerivation rec {
   pname = "leptonica";
-  version = "1.81.0";
+  version = "1.81.1";
 
   src = fetchurl {
     url = "http://www.leptonica.org/source/${pname}-${version}.tar.gz";
-    sha256 = "sha256-0ZKwVem9YLhBEQI8yYDDc5Dm1CexlKj9K9YRVDo73a0=";
+    sha256 = "sha256-D06zFem93deX9MVf3qTh9F/Kfjs1ii/Gk/2VfOLEPKk=";
   };
 
   nativeBuildInputs = [ autoreconfHook pkg-config ];

pkgs/development/libraries/libfilezilla/default.nix

···
 
 stdenv.mkDerivation rec {
   pname = "libfilezilla";
-  version = "0.27.0";
+  version = "0.30.0";
 
   src = fetchurl {
     url = "https://download.filezilla-project.org/${pname}/${pname}-${version}.tar.bz2";
-    sha256 = "sha256-c3ClGHyrNgqhubLA2njRrebjupN1tIKniF3OBNZJqXs=";
+    sha256 = "sha256-wW322s2y3tT24FFBtGge2pGloboFKQCiSp+E5lpQ3EA=";
   };
 
   nativeBuildInputs = [ autoreconfHook pkg-config ];

pkgs/development/libraries/reproc/default.nix

···
 
 stdenv.mkDerivation rec {
   pname = "reproc";
-  version = "14.1.0";
+  version = "14.2.2";
 
   src = fetchFromGitHub {
     owner = "DaanDeMeyer";
     repo = "reproc";
     rev = "v${version}";
-    sha256 = "1n71wb50qv2dmhjgw7azx5gigbrp19l2n3d41g9p05l5l0y1qg0q";
+    sha256 = "sha256-QOQcNDQkG929cEchIZ+XzjRncUUB10DpdB4zqgPqv4A=";
   };
 
   nativeBuildInputs = [ cmake ];

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

···
+{ lib
+, fetchFromGitHub
+, buildPythonPackage
+, pythonOlder
+, cffi
+, brotli
+}:
+
+buildPythonPackage rec {
+  pname = "brotlicffi";
+  version = "1.0.9.2";
+  disabled = pythonOlder "3.6";
+
+  src = fetchFromGitHub {
+    owner = "python-hyper";
+    repo = pname;
+    rev = "v${version}";
+    sha256 = "0qx7an7772brmx1rbbrqzqnkqqvicc70mx740nl31kzzyv4jjs00";
+  };
+
+  buildInputs = [
+    brotli
+  ];
+
+  propagatedBuildInputs = [
+    cffi
+  ];
+
+  preBuild = ''
+    export USE_SHARED_BROTLI=1
+  '';
+
+  # Test data is not available, only when using libbortli git checkout
+  doCheck = false;
+
+  pythonImportsCheck = [ "brotlicffi" ];
+
+  meta = with lib; {
+    description = "Python CFFI bindings to the Brotli library";
+    homepage = "https://github.com/python-hyper/brotlicffi";
+    license = licenses.mit;
+    maintainers = with maintainers; [ fab ];
+  };
+}

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

···
 
 buildPythonPackage rec {
   pname = "hap-python";
-  version = "3.5.2";
+  version = "4.0.0";
   disabled = pythonOlder "3.6";
 
   src = fetchFromGitHub {
     owner = "ikalchev";
     repo = "HAP-python";
     rev = "v${version}";
-    sha256 = "1irf4dcq9fcqvvjbijkymm63n2s7a19igs1zsbv7y8fa5a2yprhd";
+    sha256 = "1k4gq23j4f7yppxf8rzrrayn6clj48cdzixjdsmv5awhzsf9n6w4";
   };
 
   propagatedBuildInputs = [

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

···
 
 buildPythonPackage rec {
   pname = "iaqualink";
-  version = "0.4.0";
+  version = "0.4.1";
   disabled = pythonOlder "3.8";
 
   src = fetchFromGitHub {
     owner = "flz";
     repo = "iaqualink-py";
     rev = "v${version}";
-    sha256 = "13iwngjjqzr1pkmskbc2wakccvcjkf4bk65f4jp4ywpciilr4zjw";
+    sha256 = "0xgxajw38jrc55xh8w8mq0dk82ml77mfs8yn05gcpv8l24y70chq";
   };
 
   nativeBuildInputs = [ pytest-runner ];

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

···
 
 buildPythonPackage rec {
   pname = "praw";
-  version = "7.3.0";
+  version = "7.4.0";
 
   src = fetchFromGitHub {
     owner = "praw-dev";
     repo = pname;
     rev = "v${version}";
-    sha256 = "0pj987v04y5askczlma2ilwllwfsg7p5mwhv0h1lcl1lg0fbsvn9";
+    sha256 = "1wcr59k1bncwfza5k8mllaxz8fwfyqbwgm5xp908w2449i71wl7r";
   };
 
   propagatedBuildInputs = [

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

···
 
 buildPythonPackage rec {
   pname = "pyairvisual";
-  version = "5.0.8";
+  version = "5.0.9";
   format = "pyproject";
 
   disabled = pythonOlder "3.6";
···
     owner = "bachya";
     repo = pname;
     rev = version;
-    sha256 = "sha256-QgMc0O5jk5LgKQg9ZMCZd3dNLv1typm1Rp2u8kSsqYk=";
+    sha256 = "1jfbwnipklpgxjgsgsx4j53anbqyrbgvj0wb84fvsm32jq9m8avf";
   };
 
   nativeBuildInputs = [ poetry-core ];

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

···
 
 buildPythonPackage rec {
   pname = "python-magic";
-  version = "0.4.22";
+  version = "0.4.24";
 
   src = fetchFromGitHub {
     owner = "ahupp";
     repo = "python-magic";
     rev = version;
-    sha256 = "0zbdjr5shijs0jayz7gycpx0kn6v2bh83dpanyajk2vmy47jvbd6";
+    sha256 = "17jalhjbfd600lzfz296m0nvgp6c7vx1mgz82jbzn8hgdzknf4w0";
   };
 
   patches = [
···
     LC_ALL="en_US.UTF-8" ${python.interpreter} test/test.py
   '';
 
-  meta = {
+  meta = with lib; {
     description = "A python interface to the libmagic file type identification library";
     homepage = "https://github.com/ahupp/python-magic";
-    license = lib.licenses.mit;
+    license = licenses.mit;
+    maintainers = with maintainers; [ ];
   };
 }

pkgs/development/python-modules/python-magic/libmagic-path.patch

···
-diff --git a/magic/loader.py b/magic/loader.py
-index 6b2bfcb..69778af 100644
---- a/magic/loader.py
-+++ b/magic/loader.py
-@@ -5,11 +5,7 @@ import glob
+diff --git i/magic/loader.py w/magic/loader.py
+index 931f161..b8096d1 100644
+--- i/magic/loader.py
++++ w/magic/loader.py
+@@ -35,16 +35,12 @@ def _lib_candidates():
+ 
+ 
  def load_lib():
-   libmagic = None
-   # Let's try to find magic or magic1
--  dll = ctypes.util.find_library('magic') \
--        or ctypes.util.find_library('magic1') \
--        or ctypes.util.find_library('cygmagic-1') \
--        or ctypes.util.find_library('libmagic-1') \
--        or ctypes.util.find_library('msys-magic-1')  # for MSYS2
-+  dll = '@libmagic@'
++  lib = '@libmagic@'
+ 
+-  for lib in _lib_candidates():
+-    # find_library returns None when lib not found
+-    if lib is None:
+-      continue
+-    try:
+-      return ctypes.CDLL(lib)
+-    except OSError:
+-      pass
+-  else:
+-    # It is better to raise an ImportError since we are importing magic module
+-    raise ImportError('failed to find libmagic.  Check your installation')
++  try:
++    return ctypes.CDLL(lib)
++  except OSError:
++    pass
  
-   # necessary because find_library returns None if it doesn't find the library
-   if dll:
++  # It is better to raise an ImportError since we are importing magic module
++  raise ImportError('failed to find libmagic.  Check your installation')

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

···
 
 buildPythonPackage rec {
   pname = "pywemo";
-  version = "0.6.5";
+  version = "0.6.6";
   format = "pyproject";
   disabled = pythonOlder "3.7";
 
···
     owner = pname;
     repo = pname;
     rev = version;
-    sha256 = "sha256-8nLzNEle5eR5qc/tC1CX+Kh3WkPuKyy9VDMiAVbOykA=";
+    sha256 = "04h4av65x0a2iv3a4rpsq19m9pi7wk8j447rr5z7jwap870gs8nd";
   };
 
   nativeBuildInputs = [

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

···
 
 buildGoPackage rec {
   pname = "tfsec";
-  version = "0.52.1";
+  version = "0.55.0";
 
   src = fetchFromGitHub {
     owner = "aquasecurity";
     repo = pname;
     rev = "v${version}";
-    sha256 = "1ky2pp924c10ylgk0pgdgj822sajd51ijamlgshy9jc2s3n9acay";
+    sha256 = "1l71r9il45svdwydvi08hnyh310j0gha11qhyqvdz14d8czf8ahn";
   };
 
   goPackagePath = "github.com/aquasecurity/tfsec";

pkgs/development/tools/ktlint/default.nix

···
 
 stdenv.mkDerivation rec {
   pname = "ktlint";
-  version = "0.41.0";
+  version = "0.42.0";
 
   src = fetchurl {
     url = "https://github.com/pinterest/ktlint/releases/download/${version}/ktlint";
-    sha256 = "10z1010k25i40iv7v339csmbs83hmwjv1004jikckb78wncd12s3";
+    sha256 = "sha256-MrIn+siqBnjwst4HKdJQ+iy1PxCldKizXkmqHH6D3Kg=";
   };
 
   nativeBuildInputs = [ makeWrapper ];

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

···
 
 rustPlatform.buildRustPackage rec {
   pname = "cargo-criterion";
-  version = "1.0.1";
+  version = "1.1.0";
 
   src = fetchFromGitHub {
     owner = "bheisler";
     repo = pname;
     rev = version;
-    sha256 = "sha256-NiuK+PexfF2wmA8drqqkv/RQlVwYLT3q2QWvV0ghJwg=";
+    sha256 = "sha256-RPix9DM6E32PhObvV3xPGrnXrrVHn3auxLUhysP8GM0=";
   };
 
-  cargoSha256 = "sha256-5Z9Oz8jjyM3+cHAZ++thRDdNlb0Kj54Mg7JjF9JrLdw=";
+  cargoSha256 = "sha256-L/ILHKWlcYTkbEi2qDu7tf/3NHfTl6GhW0s+fUlsW08=";
 
   meta = with lib; {
     description = "Cargo extension for running Criterion.rs benchmarks";

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

···
 
 rustPlatform.buildRustPackage rec {
   pname = "cargo-expand";
-  version = "1.0.7";
+  version = "1.0.8";
 
   src = fetchFromGitHub {
     owner = "dtolnay";
     repo = pname;
     rev = version;
-    sha256 = "sha256-8YppfgYa5Sd/3nPCMCgaM3A93ND0vU5eUoCW02uDkiM=";
+    sha256 = "sha256-UkNO2uNiyN6xB74dNMiWZUCH6qq6P6u95wTq8xRvxsQ=";
   };
 
-  cargoSha256 = "sha256-0lrz8awAtLuLWE6Prmi07iGfYVmNZIETv3QL55CPYHQ=";
+  cargoSha256 = "sha256-JTjPdTG8KGYVkiCkTqRiJyTpm7OpZkbW10EKSp9lLJ4=";
 
   buildInputs = lib.optional stdenv.isDarwin libiconv;
 

pkgs/development/tools/scalafmt/default.nix

···
 
 let
   baseName = "scalafmt";
-  version = "2.6.4";
+  version = "2.7.5";
   deps = stdenv.mkDerivation {
     name = "${baseName}-deps-${version}";
     buildCommand = ''
···
     '';
     outputHashMode = "recursive";
     outputHashAlgo = "sha256";
-    outputHash     = "1h19rsxsn2piifillv29nwks2k9l391jwygjbfy8pc0ha8yi63mw";
+    outputHash     = "1xvx9bd6lf9m1r5p05d37qnjlzny6xrbkh8m7z4q4rk7i1vl8xv0";
   };
 in
 stdenv.mkDerivation {

pkgs/development/tools/wrangler/default.nix

···
 
 rustPlatform.buildRustPackage rec {
   pname = "wrangler";
-  version = "1.18.0";
+  version = "1.19.0";
 
   src = fetchFromGitHub {
     owner = "cloudflare";
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-Ue9HCAYqv8DXiEZEuGRFPywNegakxBpb66RELP1Y+cg=";
+    sha256 = "sha256-z6fL2uvv8E6NDBbbQKZ2Xhc6PI+e0Zl6mUvxIRhduH0=";
   };
 
-  cargoSha256 = "sha256-HCsJG//RnlcmRSrBdf7iZTUOiQabMV2rICPLKvuE4AI=";
+  cargoSha256 = "sha256-xGoOVp0Pt6cpCBK8IkyFCIcBNucDo98o3f7T3TQQhZY=";
 
   nativeBuildInputs = [ pkg-config ];
 

pkgs/os-specific/linux/ipset/default.nix

···
 
 stdenv.mkDerivation rec {
   pname = "ipset";
-  version = "7.11";
+  version = "7.14";
 
   src = fetchurl {
     url = "http://ipset.netfilter.org/${pname}-${version}.tar.bz2";
-    sha256 = "sha256-MVG6rTDx2eMXsqtPL1qnqfe03BH8+P5zrNDcC126v30=";
+    sha256 = "sha256-JwMcNtNVkHAxzOQeZVU+mbsBPXYvzVU5L2PX6Edg+QA=";
   };
 
   nativeBuildInputs = [ pkg-config ];

pkgs/servers/openafs/1.8/module.nix

···
 
   buildInputs = [ libkrb5 ];
 
-  patches = [
-    # LINUX 5.8: Replace kernel_setsockopt with new funcs
-    (fetchpatch {
-      url = "https://github.com/openafs/openafs/commit/d7fc5bf9bf031089d80703c48daf30d5b15a80ca.patch";
-      sha256 = "0469ydzgvyvrl1b2s1qbl9cd8c5c1nb99c3z52z5i685da5z6pab";
-    })
-    # LINUX 5.8: do not set name field in backing_dev_info
-    (fetchpatch {
-      url = "https://github.com/openafs/openafs/commit/335f37be13d2ff954e4aeea617ee66502170805e.patch";
-      sha256 = "0jr6cgplnip61cjlcd3fvgsc6n3jhfk93mm9m7ak04w1vc26dk9x";
-    })
-    # LINUX 5.8: use lru_cache_add
-    (fetchpatch {
-      url = "https://github.com/openafs/openafs/commit/facff58b840a47853592510617ba7a1da2e3eaa9.patch";
-      sha256 = "0izafg6bi5iaigq3jjx0zlg1cxwaddz3238hk0s08fcb6nyhkvx1";
-    })
-    # LINUX 5.9: Remove HAVE_UNLOCKED_IOCTL/COMPAT_IOCTL
-    (fetchpatch {
-      url = "https://github.com/openafs/openafs/commit/e7902252f15acfc28453c531f6fa3b29c9c91b92.patch";
-      sha256 = "1jy4v8yx8p6mhma6b3h3g94mb38bw7hg7q6lnyc8bijkbnl0d1rl";
-    })
-    # Linux: Refactor test for 32bit compat
-    (fetchpatch {
-      url = "https://github.com/openafs/openafs/commit/4ad1057ab8fd206c9fa8d5e3bdde4f1a8417afdb.patch";
-      sha256 = "0v2537wkav78yi8lv6fkd1n6rf2g17igf44rpa3kd0kkidxv5lqr";
-    })
-    # Linux 5.11: Test 32bit compat with in_compat_syscall
-    (fetchpatch {
-      url = "https://github.com/openafs/openafs/commit/ee53dd3bc087a05e22fc4111297a51ddb30013f0.patch";
-      sha256 = "0dfab3zk0dmf6iksna5n09lf5dn4f8w43q4irl2yf5dgqm35shkr";
-    })
-    # Linux: Create wrapper for setattr_prepare
-    (fetchpatch {
-      url = "https://github.com/openafs/openafs/commit/5a5d358b02b88d6d2c7a27a75149e35b1de7db38.patch";
-      sha256 = "07gywsg41cz5h6iafr4pb0gb9jnsb58xkwn479lw46b3y5jgz7ki";
-    })
-    # Linux 5.12: Add user_namespace param to inode ops
-    (fetchpatch {
-      url = "https://github.com/openafs/openafs/commit/c747b15dd2877e6d17e3e6b940ae78c1e1ccd3ea.patch";
-      sha256 = "0bbqmx4nkmfkapk25zrv9ivhhs91rn9dizb1lkfs7a6937q1kaqh";
-    })
-  ];
-
   hardeningDisable = [ "pic" ];
 
   configureFlags = [

pkgs/servers/openafs/1.8/srcs.nix

···
 { fetchurl }:
 rec {
-  version = "1.8.7";
+  version = "1.8.8";
   src = fetchurl {
     url = "https://www.openafs.org/dl/openafs/${version}/openafs-${version}-src.tar.bz2";
-    sha256 = "0ygsrf65w9sqji2x3jbx3h31vk6513s6nalzxi7p2ryf3xb3lm2k";
+    sha256 = "sha256-2qjvhqdyf6z83jvJemrRQxKcHCXuNfM0cIDsfp0oTaA=";
   };
 
   srcs = [ src
     (fetchurl {
       url = "https://www.openafs.org/dl/openafs/${version}/openafs-${version}-doc.tar.bz2";
-      sha256 = "0zri99pxmp4klh8ki5ycnjpf1h21lynn4049s6ywmap1vkpq84yn";
+      sha256 = "sha256-3cxODH1KvOTxrGB+acEudxGCX1iBPjZcTfjpfraOm+U=";
     })];
 }

pkgs/tools/misc/arch-install-scripts/default.nix

···
+{ lib
+, resholvePackage
+, fetchFromGitHub
+, asciidoc
+, bash
+, coreutils
+, gawk
+, gnum4
+, testVersion
+, util-linux
+}:
+
+resholvePackage rec {
+  pname = "arch-install-scripts";
+  version = "24";
+
+  src = fetchFromGitHub {
+    owner = "archlinux";
+    repo = "arch-install-scripts";
+    rev = "v${version}";
+    sha256 = "06rydiliis34lbz5fsayhbczs1xqi1a80jnhxafpjf6k3rfji6iq";
+  };
+
+  nativeBuildInputs = [ asciidoc gnum4 ];
+
+  preBuild = ''
+    substituteInPlace ./Makefile \
+      --replace "PREFIX = /usr/local" "PREFIX ?= /usr/local"
+
+    # https://github.com/archlinux/arch-install-scripts/pull/10
+    substituteInPlace ./common \
+      --replace "print '%s' \"\$1\"" "printf '%s' \"\$1\""
+  '';
+
+  installFlags = [ "PREFIX=$(out)" ];
+
+  doCheck = true;
+
+  solutions = {
+    # Give each solution a short name. This is what you'd use to
+    # override its settings, and it shows in (some) error messages.
+    profile = {
+      # the only *required* arguments are the 3 below
+
+      # Specify 1 or more $out-relative script paths. Unlike many
+      # builders, resholvePackage modifies the output files during
+      # fixup (to correctly resolve in-package sourcing).
+      scripts = [ "bin/arch-chroot" "bin/genfstab" "bin/pacstrap" ];
+
+      # "none" for no shebang, "${bash}/bin/bash" for bash, etc.
+      interpreter = "${bash}/bin/bash";
+
+      # packages resholve should resolve executables from
+      inputs = [ coreutils gawk util-linux ];
+    };
+  };
+
+  meta = with lib; {
+    description = "Useful scripts for installing Arch Linux";
+    longDescription = ''
+      A small suite of scripts aimed at automating some menial tasks when installing Arch Linux.
+    '';
+    homepage = "https://github.com/archlinux/arch-install-scripts";
+    license = licenses.gpl2Only;
+    maintainers = with maintainers; [ yayayayaka ];
+    platforms = platforms.linux;
+  };
+}

pkgs/tools/misc/fend/default.nix

···
 
 rustPlatform.buildRustPackage rec {
   pname = "fend";
-  version = "0.1.21";
+  version = "0.1.22";
 
   src = fetchFromGitHub {
     owner = "printfn";
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-LrHZsnW96+QsXuGxWoGqIEKTE86m3tMnh4fpDPIhd1w=";
+    sha256 = "sha256-JuOhJGszsEBBz9G4jjV7OhCAyrSOIktYgoDpYPMk21c=";
   };
 
-  cargoSha256 = "sha256-GZ4Yt5iQkgupJMTYIbvCPtz19985MFf8IDy3ui0M6DE=";
+  cargoSha256 = "sha256-rKSbsxFt+ntE68eQK6zbIPdOL9JBOgqyqLnb8paVVo0=";
 
   doInstallCheck = true;
 

pkgs/tools/networking/mu/default.nix

···
 
 stdenv.mkDerivation rec {
   pname = "mu";
-  version = "1.6.0";
+  version = "1.6.1";
 
   src = fetchFromGitHub {
     owner  = "djcb";
     repo   = "mu";
     rev    = version;
-    sha256 = "d2REyoSbznMhqV4PNntvg8uQmU66Bsi4OwH2Gj7gQ10=";
+    sha256 = "7mSP1F2RxW0CEDRWbMzDRfoehrr24b11sCLM2gQFjuI=";
   };
 
   postPatch = lib.optionalString (batchSize != null) ''

pkgs/tools/package-management/cargo-release/default.nix

···
 
 rustPlatform.buildRustPackage rec {
   pname = "cargo-release";
-  version = "0.16.0";
+  version = "0.16.2";
 
   src = fetchFromGitHub {
     owner = "sunng87";
     repo = "cargo-release";
     rev = "v${version}";
-    sha256 = "sha256-+vQXaI6v8HXzsfXZFxmBJe+1u9nmW0z3SBjo38orJYA=";
+    sha256 = "sha256-o3AKA/uP6VWMO4c62H3ey0P98KIhbzhnng5ggKjNeZ8=";
   };
 
-  cargoSha256 = "sha256-Zcg1MAAESD6qrh7domslisT2wG4ZaYyZtPCQ5IQrLVo=";
+  cargoSha256 = "sha256-SHLiUVH5LiQNd/Ipj/xrjSG0X2HXfcAwswqsbqweJBs=";
 
   nativeBuildInputs = [ pkg-config ];
   buildInputs = [ openssl ]

pkgs/tools/typesetting/pdfchain/default.nix

···
   meta = with lib; {
     description = "A graphical user interface for the PDF Toolkit (PDFtk)";
     homepage = "https://pdfchain.sourceforge.io";
-    license = licenses.gpl3Only;
+    license = licenses.gpl3Plus;
     maintainers = with maintainers; [ hqurve ];
     platforms = platforms.linux;
   };

pkgs/top-level/all-packages.nix

···
 
   albert = libsForQt5.callPackage ../applications/misc/albert {};
 
+  arch-install-scripts = callPackage ../tools/misc/arch-install-scripts {};
+
   auditwheel = callPackage ../tools/package-management/auditwheel { };
 
   amidst = callPackage ../tools/games/minecraft/amidst { };

pkgs/top-level/python-packages.nix

···
 
   brotli = callPackage ../development/python-modules/brotli { };
 
+  brotlicffi = callPackage ../development/python-modules/brotlicffi {
+    inherit (pkgs) brotli;
+  };
+
   brotlipy = callPackage ../development/python-modules/brotlipy { };
 
   brottsplatskartan = callPackage ../development/python-modules/brottsplatskartan { };