Merge master into staging-next

nixos/modules/services/x11/desktop-managers/mate.nix

@@ -73,6 +73,7 @@ in
     services.udev.packages = [ pkgs.mate.mate-settings-daemon ];
     services.gvfs.enable = true;
     services.upower.enable = config.powerManagement.enable;
+    services.xserver.libinput.enable = mkDefault true;
 
     security.pam.services.mate-screensaver.unixAuth = true;
 

pkgs/applications/audio/mopidy/mopidy.nix

@@ -4,13 +4,13 @@
 
 pythonPackages.buildPythonApplication rec {
   pname = "mopidy";
-  version = "3.2.0";
+  version = "3.3.0";
 
   src = fetchFromGitHub {
     owner = "mopidy";
     repo = "mopidy";
-    rev = "v${version}";
-    sha256 = "1l1rya48ykiq156spm8pfsm6li8apz66ppz7gs4s91fv7g7l5x2f";
+    rev = "refs/tags/v${version}";
+    sha256 = "sha256-F0fIl9DrludZZdzsrl/xsp7TLMgTPbVGtGvMHyD52Yw=";
   };
 
   nativeBuildInputs = [ wrapGAppsHook ];

pkgs/applications/audio/ncspot/default.nix

@@ -7,16 +7,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "ncspot";
-  version = "0.9.7";
+  version = "0.9.8";
 
   src = fetchFromGitHub {
     owner = "hrkfdn";
     repo = "ncspot";
     rev = "v${version}";
-    sha256 = "sha256-s2rWn6EK+io/yxQiWsWuXpqLOGd0F6ehWqVqgHBGZd0=";
+    sha256 = "sha256-lrEIFPi55aP9utAaMIFtqocpkbDXRJqS/jlGUtE26kE=";
   };
 
-  cargoSha256 = "sha256-aorRy5j3VaOIibuHc6gf6HuB3g739T59vzbybehPirc=";
+  cargoSha256 = "sha256-vkNGQ3SXKJpUqDZ4TfmlSleAPAOQnsEncE8475NLJ4M=";
 
   nativeBuildInputs = [ pkg-config ];
 

pkgs/applications/misc/anytype/default.nix

@@ -2,13 +2,13 @@
 
 let
   pname = "anytype";
-  version = "0.25.0";
+  version = "0.25.4";
   name = "Anytype-${version}";
   nameExecutable = pname;
   src = fetchurl {
     url = "https://at9412003.fra1.digitaloceanspaces.com/Anytype-${version}.AppImage";
     name = "Anytype-${version}.AppImage";
-    sha256 = "sha256-cfiSZLfaVmxsZWDwulbMHKzHCG7zMKCWwg8q/2MolVs=";
+    sha256 = "sha256-v6Zecv/m1GvPJk/SmLlxHFyeYbNbIB+x17+AKCI45AM=";
   };
   appimageContents = appimageTools.extractType2 { inherit name src; };
 in

pkgs/applications/misc/calibre/default.nix

@@ -104,7 +104,6 @@ mkDerivation rec {
       pillow
       pyqt-builder
       pyqt5
-      pyqtwebengine
       python
       regex
       sip
@@ -114,6 +113,11 @@ mkDerivation rec {
       pycryptodome
       # the following are distributed with calibre, but we use upstream instead
       odfpy
+    ] ++ lib.optionals (lib.lists.any (p: p == stdenv.hostPlatform.system) pyqtwebengine.meta.platforms) [
+      # much of calibre's functionality is usable without a web
+      # browser, so we enable building on platforms which qtwebengine
+      # does not support by simply omitting qtwebengine.
+      pyqtwebengine
     ] ++ lib.optional (unrarSupport) unrardll
   );
 

pkgs/applications/misc/charm/default.nix

@@ -2,16 +2,16 @@
 
 buildGoModule rec {
   pname = "charm";
-  version = "0.11.0";
+  version = "0.12.0";
 
   src = fetchFromGitHub {
     owner = "charmbracelet";
     repo = "charm";
     rev = "v${version}";
-    sha256 = "sha256-98TUiFy4X7lMUostkgZikk6r6wzBPF0pqWthrS9nU+U=";
+    sha256 = "sha256-XXKzK5MXJsB3LE7iE5BqnLm0hPs7WbyHR0x9aTldrj4=";
   };
 
-  vendorSha256 = "sha256-enkt7BUAntbB75LR12NB0vW6z9dTPzk0bGdRrn3JHm4=";
+  vendorSha256 = "sha256-6PGdM7aa1BGNZc3M35PJpmrlPUqkykxfTELdgeKcJD4=";
 
   ldflags = [ "-s" "-w" "-X=main.Version=${version}" ];
 

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

@@ -132,5 +132,6 @@ in mkDerivationWith python3Packages.buildPythonApplication rec {
     description = "Keyboard-focused browser with a minimal GUI";
     license     = licenses.gpl3Plus;
     maintainers = with maintainers; [ jagajaga rnhmjoj ebzzry dotlambda ];
+    inherit (backendPackage.meta) platforms;
   };
 }

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

@@ -1,16 +1,28 @@
-{ lib, buildGoModule, fetchFromGitHub, installShellFiles, k3sVersion ? "1.22.2-k3s2" }:
+{ lib
+, buildGoModule
+, fetchFromGitHub
+, installShellFiles
+, k3sVersion ? null
+}:
 
+let
+  hasVPrefix = ver: (builtins.elemAt (lib.stringToCharacters ver) 0) == "v";
+  k3sVersionSet =
+    if k3sVersion != null then
+      if hasVPrefix k3sVersion then throw "k3sVersion should not have a v prefix" else true
+    else
+      false;
+in
 buildGoModule rec {
   pname = "kube3d";
-  version = "5.3.0";
+  version = "5.4.1";
 
   src = fetchFromGitHub {
-    owner = "rancher";
+    owner = "k3d-io";
     repo = "k3d";
     rev = "v${version}";
-    sha256 = "sha256-ZuUjk1wb7iRZX+OpjLJHp1T0WYNjCHU6DpYF4V/heVc=";
+    sha256 = "sha256-DVQrD4JMei9yRFzuiVb6AcydEupNSlpgYLfGWWRiaao=";
   };
-
   vendorSha256 = null;
 
   nativeBuildInputs = [ installShellFiles ];
@@ -18,10 +30,14 @@ buildGoModule rec {
   excludedPackages = [ "tools" "docgen" ];
 
   ldflags =
-    let t = "github.com/rancher/k3d/v5/version"; in
-    [ "-s" "-w" "-X ${t}.Version=v${version}" "-X ${t}.K3sVersion=v${k3sVersion}" ];
+    let t = "github.com/k3d-io/k3d/v5/version"; in
+    [ "-s" "-w" "-X ${t}.Version=v${version}" ] ++ lib.optionals k3sVersionSet [ "-X ${t}.K3sVersion=v${k3sVersion}" ];
 
-  doCheck = false;
+   preCheck = ''
+    # skip test that uses networking
+    substituteInPlace version/version_test.go \
+      --replace "TestGetK3sVersion" "SkipGetK3sVersion"
+  '';
 
   postInstall = ''
     installShellCompletion --cmd k3d \
@@ -34,13 +50,13 @@ buildGoModule rec {
   installCheckPhase = ''
     runHook preInstallCheck
     $out/bin/k3d --help
-    $out/bin/k3d --version | grep -e "k3d version v${version}" -e "k3s version v${k3sVersion}"
+    $out/bin/k3d --version | grep -e "k3d version v${version}" ${lib.optionalString k3sVersionSet "-e \"k3s version v${k3sVersion}\""}
     runHook postInstallCheck
   '';
 
   meta = with lib; {
-    homepage = "https://github.com/rancher/k3d";
-    changelog = "https://github.com/rancher/k3d/blob/v${version}/CHANGELOG.md";
+    homepage = "https://github.com/k3d-io/k3d/";
+    changelog = "https://github.com/k3d-io/k3d/blob/v${version}/CHANGELOG.md";
     description = "A helper to run k3s (Lightweight Kubernetes. 5 less than k8s) in a docker container - k3d";
     longDescription = ''
       k3s is the lightweight Kubernetes distribution by Rancher: rancher/k3s
@@ -50,7 +66,7 @@ buildGoModule rec {
     '';
     license = licenses.mit;
     maintainers = with maintainers; [ kuznero jlesquembre ngerstle jk ricochet ];
-    mainProgram = "k3d";
     platforms = platforms.linux ++ platforms.darwin;
+    mainProgram = "k3d";
   };
 }

pkgs/applications/networking/irc/weechat/default.nix

@@ -28,14 +28,14 @@ let
   in
     assert lib.all (p: p.enabled -> ! (builtins.elem null p.buildInputs)) plugins;
     stdenv.mkDerivation rec {
-      version = "3.4.1";
+      version = "3.5";
       pname = "weechat";
 
       hardeningEnable = [ "pie" ];
 
       src = fetchurl {
         url = "https://weechat.org/files/src/weechat-${version}.tar.bz2";
-        sha256 = "sha256-TJ4JI97WiobkBxgnkUGh/XQAIlDV+PDgIxCzTqefiMw=";
+        sha256 = "sha256-8ZSa2dQPTiChGW00T5OASHmd0C2PatUtTu9Gr4CF4Oc=";
       };
 
       outputs = [ "out" "man" ] ++ map (p: p.name) enabledPlugins;

pkgs/applications/networking/seafile-client/default.nix

@@ -4,13 +4,13 @@
 
 mkDerivation rec {
   pname = "seafile-client";
-  version = "8.0.6";
+  version = "8.0.7";
 
   src = fetchFromGitHub {
     owner = "haiwen";
     repo = "seafile-client";
     rev = "v${version}";
-    sha256 = "sha256-pImSrQ63AS1hi9CUvFAR91ZHgPCJB0ZOAA0fEZ24O8o=";
+    sha256 = "00wfr7dvbyl7pg1xgssgz8a94c7c4n5r9266lhy9qcbz456hdcgj";
   };
 
   nativeBuildInputs = [ pkg-config cmake ];

pkgs/build-support/dotnet/build-dotnet-module/default.nix

@@ -74,13 +74,16 @@ let
     inherit dotnet-sdk dotnet-test-sdk disabledTests nuget-source dotnet-runtime runtimeDeps buildType;
   }) dotnetConfigureHook dotnetBuildHook dotnetCheckHook dotnetInstallHook dotnetFixupHook;
 
-  _nugetDeps = mkNugetDeps { name = "${name}-nuget-deps"; nugetDeps = import nugetDeps; };
-  _localDeps = linkFarmFromDrvs "${name}-local-nuget-deps" projectReferences;
+  localDeps = if (projectReferences != [])
+    then linkFarmFromDrvs "${name}-project-references" projectReferences
+    else null;
+
+  _nugetDeps = mkNugetDeps { inherit name; nugetDeps = import nugetDeps; };
 
   nuget-source = mkNugetSource {
-    name = "${args.pname}-nuget-source";
-    description = "A Nuget source with the dependencies for ${args.pname}";
-    deps = [ _nugetDeps _localDeps ];
+    name = "${name}-nuget-source";
+    description = "A Nuget source with the dependencies for ${name}";
+    deps = [ _nugetDeps ] ++ lib.optional (localDeps != null) localDeps;
   };
 
 in stdenvNoCC.mkDerivation (args // {
@@ -103,6 +106,8 @@ in stdenvNoCC.mkDerivation (args // {
   dontWrapGApps = args.dontWrapGApps or true;
 
   passthru = {
+    inherit nuget-source;
+
     fetch-deps = writeScript "fetch-${pname}-deps" ''
       set -euo pipefail
       cd "$(dirname "''${BASH_SOURCE[0]}")"

pkgs/build-support/dotnet/build-dotnet-module/hooks/dotnet-build-hook.sh

@@ -1,4 +1,5 @@
-declare -a projectFile testProjectFile dotnetBuildFlags dotnetFlags
+# inherit arguments from derivation
+dotnetBuildFlags=( ${dotnetBuildFlags[@]-} )
 
 dotnetBuildHook() {
     echo "Executing dotnetBuildHook"

pkgs/build-support/dotnet/build-dotnet-module/hooks/dotnet-check-hook.sh

@@ -1,4 +1,5 @@
-declare -a testProjectFile dotnetTestFlags dotnetFlags
+# inherit arguments from derivation
+dotnetTestFlags=( ${dotnetTestFlags[@]-} )
 
 dotnetCheckHook() {
     echo "Executing dotnetCheckHook"

pkgs/build-support/dotnet/build-dotnet-module/hooks/dotnet-configure-hook.sh

@@ -1,4 +1,8 @@
-declare -a projectFile testProjectFile dotnetRestoreFlags dotnetFlags
+declare -a projectFile testProjectFile
+
+# inherit arguments from derivation
+dotnetFlags=( ${dotnetFlags[@]-} )
+dotnetRestoreFlags=( ${dotnetRestoreFlags[@]-} )
 
 dotnetConfigureHook() {
     echo "Executing dotnetConfigureHook"

pkgs/build-support/dotnet/build-dotnet-module/hooks/dotnet-fixup-hook.sh

@@ -1,4 +1,5 @@
-declare -a makeWrapperArgs gappsWrapperArgs
+# Inherit arguments from the derivation
+makeWrapperArgs=( ${makeWrapperArgs-} )
 
 # First argument is the executable you want to wrap,
 # the second is the destination for the wrapper.
@@ -15,9 +16,9 @@ wrapDotnetProgram() {
 dotnetFixupHook() {
     echo "Executing dotnetFixupPhase"
 
-    if [ "${executables-}" ]; then
+    if [ "${executables}" ]; then
         for executable in ${executables[@]}; do
-            execPath="$out/lib/${pname-}/$executable"
+            execPath="$out/lib/${pname}/$executable"
 
             if [[ -f "$execPath" && -x "$execPath" ]]; then
                 wrapDotnetProgram "$execPath" "$out/bin/$(basename "$executable")"
@@ -27,7 +28,7 @@ dotnetFixupHook() {
             fi
         done
     else
-        for executable in $out/lib/${pname-}/*; do
+        for executable in $out/lib/${pname}/*; do
             if [[ -f "$executable" && -x "$executable" && "$executable" != *"dll"* ]]; then
                 wrapDotnetProgram "$executable" "$out/bin/$(basename "$executable")"
             fi

pkgs/build-support/dotnet/build-dotnet-module/hooks/dotnet-install-hook.sh

@@ -1,4 +1,5 @@
-declare -a projectFile dotnetInstallFlags dotnetFlags
+# inherit arguments from derivation
+dotnetInstallFlags=( ${dotnetInstallFlags[@]-} )
 
 dotnetInstallHook() {
     echo "Executing dotnetInstallHook"

pkgs/build-support/dotnet/make-nuget-source/default.nix

@@ -1,30 +1,38 @@
 { dotnetPackages, lib, xml2, stdenvNoCC }:
-{ name, description ? "", deps ? [] }:
-let
-  _nuget-source = stdenvNoCC.mkDerivation rec {
-    inherit name;
-    meta.description = description;
 
+{ name
+, description ? ""
+, deps ? []
+}:
+
+let
+  nuget-source = stdenvNoCC.mkDerivation rec {
+    inherit name;
+
+    meta.description = description;
     nativeBuildInputs = [ dotnetPackages.Nuget xml2 ];
+
     buildCommand = ''
       export HOME=$(mktemp -d)
       mkdir -p $out/{lib,share}
 
-      nuget sources Add -Name nixos -Source "$out/lib"
-      ${ lib.concatMapStringsSep "\n" (dep:
-          ''nuget init "${dep}" "$out/lib"''
-        ) deps }
+      ${lib.concatMapStringsSep "\n" (dep: ''
+        nuget init "${dep}" "$out/lib"
+      '') deps}
 
-      # Generates a list of all unique licenses' spdx ids.
+      # Generates a list of all licenses' spdx ids, if available.
+      # Note that this currently ignores any license provided in plain text (e.g. "LICENSE.txt")
       find "$out/lib" -name "*.nuspec" -exec sh -c \
-        "xml2 < {} | grep "license=" | cut -d'=' -f2" \; | sort -u > $out/share/licenses
+        "NUSPEC=\$(xml2 < {}) && echo "\$NUSPEC" | grep license/@type=expression | tr -s \  '\n' | grep "license=" | cut -d'=' -f2" \
+      \; | sort -u > $out/share/licenses
     '';
-} // { # This is done because we need data from `$out` for `meta`. We have to use overrides as to not hit infinite recursion.
-  meta.licence = let
-    depLicenses = lib.splitString "\n" (builtins.readFile "${_nuget-source}/share/licenses");
-    getLicence = spdx: lib.filter (license: license.spdxId or null == spdx) (builtins.attrValues lib.licenses);
-  in (lib.flatten (lib.forEach depLicenses (spdx:
-    if (getLicence spdx) != [] then (getLicence spdx) else [] ++ lib.optional (spdx != "") spdx
-  )));
-};
-in _nuget-source
+  } // { # We need data from `$out` for `meta`, so we have to use overrides as to not hit infinite recursion.
+    meta.licence = let
+      depLicenses = lib.splitString "\n" (builtins.readFile "${nuget-source}/share/licenses");
+    in (lib.flatten (lib.forEach depLicenses (spdx:
+      if (spdx != "")
+        then lib.getLicenseFromSpdxId spdx
+        else []
+    )));
+  };
+in nuget-source

pkgs/build-support/dotnet/nuget-to-nix/default.nix

@@ -1,5 +1,27 @@
-{ runCommand }:
+{ lib
+, runCommandLocal
+, runtimeShell
+, substituteAll
+, nix
+, coreutils
+, findutils
+, gnused
+}:
 
-runCommand "nuget-to-nix" { preferLocalBuild = true; } ''
-  install -D -m755 ${./nuget-to-nix.sh} $out/bin/nuget-to-nix
+runCommandLocal "nuget-to-nix" {
+  script = substituteAll {
+    src = ./nuget-to-nix.sh;
+    inherit runtimeShell;
+
+    binPath = lib.makeBinPath [
+      nix
+      coreutils
+      findutils
+      gnused
+    ];
+  };
+
+  meta.description = "Convert a nuget packages directory to a lockfile for buildDotnetModule";
+} ''
+  install -Dm755 $script $out/bin/nuget-to-nix
 ''

pkgs/build-support/dotnet/nuget-to-nix/nuget-to-nix.sh

@@ -1,7 +1,9 @@
-#!/usr/bin/env bash
+#!@runtimeShell@
 
 set -euo pipefail
 
+export PATH="@binPath@"
+
 if [ $# -eq 0 ]; then
   >&2 echo "Usage: $0 [packages directory] > deps.nix"
   exit 1

pkgs/data/fonts/iosevka/bin.nix

@@ -11,7 +11,7 @@ let
     (builtins.attrNames (builtins.removeAttrs variantHashes [ "iosevka" ]));
 in stdenv.mkDerivation rec {
   pname = "${name}-bin";
-  version = "15.1.0";
+  version = "15.2.0";
 
   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 = "0654wkgdr5gy0s9gr4llyqkvngxrqfn6hfvm5akz0zwq3xwfjc0p";
-  iosevka-aile = "0hkgb7p22ayzsjw7idzl47djcpglsjzyi8rkz39vb9w4w3dvxbn5";
-  iosevka-curly = "04kkvbl0jz3ykdc30wvagh7f49nqxr6vz0wjcq93ajdc2pm4i5k4";
-  iosevka-curly-slab = "189w0xszks8msg7wis0gck3r2cp1rdimkii44dlj8l4p4qjxg8va";
-  iosevka-etoile = "1i8p8knl3hr8gj7nhbd93jh31rbj11pvjwhvjxy1djgipmdn3257";
-  iosevka-slab = "049j6p5v4f50yvmw8ab01pzcf18i326741rsg0kgsxw36yidmd1d";
-  iosevka-ss01 = "1h5s0nlgl5g0w08ii77jg671nwrmpan22ddgxaq941lznhmkv27k";
-  iosevka-ss02 = "03ps2a2z2x1d42mqnal1dr32949ra04hd8igwl93lflijlbww1xh";
-  iosevka-ss03 = "134kzw6ys3rnfw8wv7gfbvjx5im21647n1gvj68bayry41y3xisp";
-  iosevka-ss04 = "03kqg6n4p5m27szkjpfpyr4jgyigvj40rm1nmvv4dfd3cs9rg326";
-  iosevka-ss05 = "1xzvim04d2z152ml9av2zsgyla1n7wa0rja4j9bvi22rh1qb8kwv";
-  iosevka-ss06 = "1r8bj27rfsz732gw6qwqj6hx4babpm5cqm4i7f37spkw1dmvcrkx";
-  iosevka-ss07 = "16ndzr6abacy8m3bf4smfy9yw8w2i51pkv3d7klfflz9jimx540y";
-  iosevka-ss08 = "0kn4q2n1nyn3ds2gajc42b2mi8n67mlgz4rhbbn01nd8miz6lasw";
-  iosevka-ss09 = "1wajl1cng698dk0w81j2n54gcb7lygfj645s3gf2k4ywsmfd17rr";
-  iosevka-ss10 = "1cx44l69z8y2b0dcxw43msppgl030cvihf40asfsj036zab36n71";
-  iosevka-ss11 = "0jk3777bx4ibr7na9qraqhaldbaini9qyjw4lpqnszqxryx5p9ms";
-  iosevka-ss12 = "19w5wmq5q1rwn0yw9q74kfkbqaxbbv1ak7ikdi95qa06c1sz4z73";
-  iosevka-ss13 = "0llhdh641l8hqrpzs663ry3mr1fxh42g7vv1dknyh7lp32qdrh8h";
-  iosevka-ss14 = "1rfi157f3fln2ww3q945ych34lc9fxjx2spv6zrjg6j6k841ld76";
-  iosevka-ss15 = "12qpgbg4d2h8kqlc3xhpg1j3ic6wnffn4af1kr05kdln6av9sfjn";
-  iosevka-ss16 = "1ry923xky52fylhnya3yay3wh0cxwwqy64vq74a8wls1vnfpq7md";
-  iosevka-ss17 = "0d152px48gh8axqaw8myy81h9mff5vkikdqqv1mqcqy5yb50g550";
-  iosevka-ss18 = "1q9j0rp8a29yazgp9a3jgp54xjih0ffqfm5ii85sl0dxrval5vkq";
-  sgr-iosevka = "1khq3vqma1zc588x2rcnqv6lc2ajxkvs711w8zrjb7x9aaysly66";
-  sgr-iosevka-aile = "0cryvq204hadx28raldjp901zvvv7iywah8pcn09qwrhpkbk1r92";
-  sgr-iosevka-curly = "1mqybxgc9pdn5ww5zy9ki6apiv0vbdmspz2glmcrz4vfxylbydqb";
-  sgr-iosevka-curly-slab = "0v7y5ld3ccyb4y7nz391pxljcmxczll319lj6znxj9p9pgykw6gy";
-  sgr-iosevka-etoile = "03vcxnkb766l8i0r9rpd08ylazhxhv2avb3mszpirgs7ax979jqm";
-  sgr-iosevka-fixed = "12b2n3yjz3r67p757dmrdzayjidrlmb16mjlzdc2rrnijd41qyn7";
-  sgr-iosevka-fixed-curly = "12l7d0472m524jx52libsxc5ffjsnki3ah07vfg6lj7w8lam1vq1";
-  sgr-iosevka-fixed-curly-slab = "1lyvjvl5gsx16vfy6s0qgvkw50xvariqp6xvfzz68sg7hm1s3jqp";
-  sgr-iosevka-fixed-slab = "1080269ykl7xpjkp120rm46j3yhj3sd3rpygf79ny2svq0jn99y2";
-  sgr-iosevka-fixed-ss01 = "0g04xlr1jarnmj427gdvskgy7hmbxi5hs2ppjfj71qv75kyvlvyk";
-  sgr-iosevka-fixed-ss02 = "1gh3grq87ibibryl6h0z3z4r55k0wv7w4mvg63jfrbvdc7z2rkhz";
-  sgr-iosevka-fixed-ss03 = "1aa8nyaccx1ryfrdmwjdrfcwcr7vh3f28ygh3m1cmakmji6gr63z";
-  sgr-iosevka-fixed-ss04 = "0qv3pk1pwiciqw15lanljk2j8g667rn6514b16xf9lmmmpczlz2m";
-  sgr-iosevka-fixed-ss05 = "0pjmzrq836xw0nxr1j6hgphwya20k00v29mpbrxrmcg5ii4ph82h";
-  sgr-iosevka-fixed-ss06 = "0wxis8mg9jm38caf2rjsfyc1g83r7yayp415cwzl1pm6sdkxar9g";
-  sgr-iosevka-fixed-ss07 = "0r4rvlk67p8s02i54lpgarw75lhfr2w4an8z34n7689arl2a03bv";
-  sgr-iosevka-fixed-ss08 = "0rd1dglhqzbaib104hh7i89m4br8kg2shd0221kvshkjwbpbpr1r";
-  sgr-iosevka-fixed-ss09 = "02jaykc43c35i0n34gi3ds66gglcdycq9nalidqcldbxcpgciiiz";
-  sgr-iosevka-fixed-ss10 = "046s8iv5yv9vbaf9nv1kr0lpvxa0yb125hjzw3sm8fvihpwks0m7";
-  sgr-iosevka-fixed-ss11 = "19rq860q79cl5b6p7q5phsnb89xxsv4h5dqyn1qkc7axwvx9yj9v";
-  sgr-iosevka-fixed-ss12 = "1gscgqrc9b8liwr00c2h5zbi3xq2nkfwfbfv6adv8wjprfw2ri3d";
-  sgr-iosevka-fixed-ss13 = "0px3zvxbis70b24xzgnrs3rh2pacdqlkdkwb5gwngans2alnq5bw";
-  sgr-iosevka-fixed-ss14 = "1n6pn1jv0diikbhp9kngxnakjkhjc414qzccfrinml6fg7cr8kz8";
-  sgr-iosevka-fixed-ss15 = "00w67v49iqxcrqrqv7fcncdly6cswlzp4x8650hq48dxmc279wmj";
-  sgr-iosevka-fixed-ss16 = "1dxfn2lzgdcdzq5p35q0cafyrq15zmfn5gf8iw4g9xjl4hyyzi29";
-  sgr-iosevka-fixed-ss17 = "0zaxqaxng61gwr2zywq7b4m0aaiqwkb3khpadzcnvd1i4ggx9n7l";
-  sgr-iosevka-fixed-ss18 = "150ialpsvkmnhisv73x9w5dlmvh2a3496zrpyk03xqz9vzxmxw84";
-  sgr-iosevka-slab = "12i3fgr0pj0mp9mcwfd221f6lj6fbf4cj77wq173hzjkjn8l7gbj";
-  sgr-iosevka-ss01 = "1bdba7693iszm1y2zs0c3rsz8wwsgvf9zj9l93fjgnhmxfigkwlx";
-  sgr-iosevka-ss02 = "13pdpg1rhvv86y2wplswri95dpfsly4x37bpflyd1n60rzcgp4d1";
-  sgr-iosevka-ss03 = "199nvbfvwfbn7qfdxzibb38avbwx6476c3iwd93q21d49zk4xfrk";
-  sgr-iosevka-ss04 = "17kv8039g5xdwqmg8ywjnfk95742izrdj5dxkzwq2s3kpqz4yikz";
-  sgr-iosevka-ss05 = "1xg4ds6gfa5h90lggs8sbx2icz7rklq4rgzbrk9x1z3mnmmprm3r";
-  sgr-iosevka-ss06 = "00mrcklg9ijyqhsq848xlqi1s66alkcv7h73qnqjqvsd4a0q6lww";
-  sgr-iosevka-ss07 = "0p0x3974kwlw5m3wn0ngk5ik7apd94hyp2a9b1rw6ndv864h0j5y";
-  sgr-iosevka-ss08 = "12fywxdmsaqbq8xaxgbigjj89g2c0y2brps31mkdz0l1ba329192";
-  sgr-iosevka-ss09 = "0pjl8h2bf6v0llqjs52k9gq3mm31jl80phzcqsz5vx17p5gn7wnn";
-  sgr-iosevka-ss10 = "1cww7ing7is6r6naj3nwaq24v3gqsk0pj9d8r167a5mr8zhx7pqb";
-  sgr-iosevka-ss11 = "1rl13qmxqc8ajshc9ylbb29w8kx5ad5bz71xjw7j646k30hsl8fc";
-  sgr-iosevka-ss12 = "1zyhz1k1a534hq04prw9f8rjm4yrxmc30c65jpx1d94ckzbzj1qm";
-  sgr-iosevka-ss13 = "0rh9w9jdbhi56dcwf51api3v8gqfpzjz91ccnikikrg413b3r2qs";
-  sgr-iosevka-ss14 = "0s2sqdmfnlqzz07spvkhyxg5fj4r4bx2ik2mglqzbawc0fmp6ajn";
-  sgr-iosevka-ss15 = "1kya4lyvcph6d80zbgr1b3189yqa4cngx5bzgp09437pb84k7lv3";
-  sgr-iosevka-ss16 = "1d453qf4arvzxyivj789y9dd87sqg392fl1xshwh56h7rx4qbv4q";
-  sgr-iosevka-ss17 = "1qbvr1307gkqyxgx2sqvc6jvv4x0pibcsxbmp7ih96pk9sryfw06";
-  sgr-iosevka-ss18 = "0lqcjymaxxh2p3irqmyfsq15339amwdnyizi71lh0p16sypcc14f";
-  sgr-iosevka-term = "04fwjyc44kmwaaqm4f47az24vrl502hi8mqjhm3mjhpm7a7ysywx";
-  sgr-iosevka-term-curly = "1h0g2jhv2qirlrqjs7w72db00xvm99agwddb9mngmsg5m97dywmm";
-  sgr-iosevka-term-curly-slab = "0m641zbd4232vpnc92phvsxvzpl33xvrkrm22hxysmwwm6b4sb68";
-  sgr-iosevka-term-slab = "0k8pijigr6i0y2d91c9irkm4xcw8pqwqyv1dpn2y4q6nbrm1jvcs";
-  sgr-iosevka-term-ss01 = "1vv1japj1dxp36smvs4lb9hqlcrkvxandrknjswd343acwf9pr6y";
-  sgr-iosevka-term-ss02 = "11s5zidgx2rdvpix32h9j1d1in35s7acwwfxzf78ba3zlsmkslis";
-  sgr-iosevka-term-ss03 = "179wrslzrji05d2pgcjrspgqmmym6r9ihcjqq8fci7y0nwn2pbzm";
-  sgr-iosevka-term-ss04 = "1g64fviviykl8mwdsd4cjwjcsfjnskjmcxm8kfq22xlh0s9h6p1k";
-  sgr-iosevka-term-ss05 = "15s3q5yv5qv5h6lrw9mjw97csaiql1lqsf8sb0v7is0qk28qld78";
-  sgr-iosevka-term-ss06 = "1i8jb8is2xmdz2m1wh51708861rfvkia28qic9c30xq50a49n4ls";
-  sgr-iosevka-term-ss07 = "15mbhilmv72f824sqks4vkqkh46zs5z46sbibw7vfgz6b5wyknl0";
-  sgr-iosevka-term-ss08 = "02a9ws0fnzrdc4p54sb5x85z46i2071lq24i4676l8q42szf0xal";
-  sgr-iosevka-term-ss09 = "0kakm3fszw6gxr2294fi8pm52drjdihb0sg2ickq5jf22pbknswy";
-  sgr-iosevka-term-ss10 = "1c8jahi1ilny09gm5lvjm1fgqvcfjb9g9hn9f2q7b3cb5m1p3iya";
-  sgr-iosevka-term-ss11 = "1y67g39x2lyw0j7xx3ga4sncrh7q6fciyl26ql2c9jvm9fs6yywh";
-  sgr-iosevka-term-ss12 = "1zg4459v8m21dip5lbfxvp57x64h3js7lzb675m5nhqgyw01phxf";
-  sgr-iosevka-term-ss13 = "0fqc1gpxw8bd0023vvp7js9q1wxinz7j3n6q9c0amq8niw7572d5";
-  sgr-iosevka-term-ss14 = "04q6kq0d0bzarxa976gnq4xvk28r0q2s9wji5av6nivj7df85zl0";
-  sgr-iosevka-term-ss15 = "1ccvb520vfmhsgp9ra1yysc5c93a2d3nasb45f9ppsqbjf3slrz0";
-  sgr-iosevka-term-ss16 = "1spdadjssjnxp63wp04vncnfpyrkjlfkxrsyf8wbarg81c8zz1b3";
-  sgr-iosevka-term-ss17 = "1vm1nkk3arpyk92x4pjccs1d2b5zqqa1pzv0vavnchhri8q6csrd";
-  sgr-iosevka-term-ss18 = "0rpc7hcyc0dv174zk9crdz152bd342d1zinc1xsdm10qnf72ssbr";
+  iosevka = "0yyz8vmpi8pww0p9na564lvbkwhdhpk4bcyrli91dn5gq0pc1pvv";
+  iosevka-aile = "1lciycahvxgvmcniq4h3m1v3rc42nmv8ydb0fpbl9g4sc0qp81hq";
+  iosevka-curly = "02jvrj7kzd4bx3maj1bq2p9j746b8c5713d8lqkxx4fn9fm0zppq";
+  iosevka-curly-slab = "1bhvf95xs74wm8srsvl4yxwvl36llk93mpl1y9acc5z9rdcpzjqq";
+  iosevka-etoile = "1zmgfxfsbxv1k4fwnc7g2jlfhmlzp5kap8m3f10fqanpnkd0yf08";
+  iosevka-slab = "1qy86kdl6lgq5k1qb97adibpfjm4vg1wdnxbqizhqka5bc7avyzb";
+  iosevka-ss01 = "1k451iv9fvp86arw0z685xyixlkpnsg3mxl6k9s47xxf9r82ab2a";
+  iosevka-ss02 = "066l1jamvlnksl1jn4l5qqll4wi19w0jr9x7bw0lpdic9478cs8g";
+  iosevka-ss03 = "0qh5ds9s7rghmar90ymxvcninmcm2hc05f83ixjadjfg9a27sff7";
+  iosevka-ss04 = "1zl2m68wqync8n93n06yj49r6n652yakrvdcsdvqm3agajnz0wnk";
+  iosevka-ss05 = "0rxakr04kwrwjfq7a6y2vdyjfgn162d8353pn7nc9wsfyrjbqpc2";
+  iosevka-ss06 = "0lfv6cvqy1mcn7zds7c6w68ky4y3clmvxcrg5knilm7sfql1jis1";
+  iosevka-ss07 = "1cc15rnnq2vzp22p8ld94jl2lyn6k8bra5792yqvyg23lf493jk2";
+  iosevka-ss08 = "0ysrq40kpvgfiapk1x9nzvvd81r0kyl1jlywwhmm3f4qca86a3ja";
+  iosevka-ss09 = "1535y8gmlkd1nqywcbmp7x9y9ahmskmwgs138baaj642jbq85l1b";
+  iosevka-ss10 = "01z7nwyqqda6jw819ajr9cd691yxd0b3irj4amdwnl6b46a278q7";
+  iosevka-ss11 = "0zi2n6h7jqf4vbg6r5vjzk0y8fj1lfjifsa1s3j0dmgs05m2bzc8";
+  iosevka-ss12 = "1h5bw4fp6kgszzwd9dpi461yf3mnkm0b5cgpaliyl2qpd8jivmm1";
+  iosevka-ss13 = "06v5angxqnbz9a53358ls0w78ib1d57g3svnfyplw7ynd0rrvw93";
+  iosevka-ss14 = "0ic0hh6xh1pl1jzkmp1ddbzhvfzislimlgwsdcnimzxk6ga5k44j";
+  iosevka-ss15 = "1mg363g47j90z00dpha81jk0n2ck59ca172g165m7cmz1bb425iq";
+  iosevka-ss16 = "0bs3rhwgnv9cwzgmsgzgjgv6awz5igxcvq64xpycw0dp17wbfl1z";
+  iosevka-ss17 = "0ssi56j8jdkhpsq7acczy3z9v8q3amr6a6jxv49rd4473fxzh3zc";
+  iosevka-ss18 = "13s77f1ki09szpa64qb00421kj2n5q2lv0vb2ahnlvphsbgik1j6";
+  sgr-iosevka = "0pqhpm13q23f82lkcimk8pinm41j6xmdlqxmfzg1y7m50gzdm10r";
+  sgr-iosevka-aile = "1malyfkc9dd552p04vq2b2nlv613pjzw84q8gnlpy8bycgx5np3s";
+  sgr-iosevka-curly = "0b8gnk8hsily9wp91hi66xjyj5hwqcab7j64x1xzzdc7fnfaz0qq";
+  sgr-iosevka-curly-slab = "0i9k38a7fb9z6jwds92kz3pgf1ryjz1m12ad1mslwq82kwy00h3f";
+  sgr-iosevka-etoile = "0rw4dhivxf3yls28zs34xia56dzx1w2as2j619ji36dpmh1v3ljn";
+  sgr-iosevka-fixed = "1zcr7zcpca5bhgaisjjlbn7zn1ih6mz6k4nj27y4ya8hnasfqxlh";
+  sgr-iosevka-fixed-curly = "17jvx2rvfqx6ip8h8srr6iwy55nnwvkrrflr4hxdyv8ggi8d8y7d";
+  sgr-iosevka-fixed-curly-slab = "01s3wz0r2wmybws96s1mcplx7zrbciqabsgaa5jy4kwn8rg0ajpi";
+  sgr-iosevka-fixed-slab = "1xbsrywi413r6gkmwc11yw8pkrc6hkf5309dfr25qwnn6c8wvqiy";
+  sgr-iosevka-fixed-ss01 = "17776y4lv7vyqhcanmayvksh85v0907vys4f3hpxjbw86497f4zj";
+  sgr-iosevka-fixed-ss02 = "0cwz8bfj05vr2800r35nd8d7r05hr4fd2wbx26dga3qnddawcgbp";
+  sgr-iosevka-fixed-ss03 = "1df1aigpy5g46g68l9fln2af4fafl9fs197nz49biw66ndraym4c";
+  sgr-iosevka-fixed-ss04 = "02g22kfd4nw8cvfkcjw9mixvw2abfzpbalcwcqidyn8qd3s51x1v";
+  sgr-iosevka-fixed-ss05 = "12zwmzh0ilclkpw18lqkp4dpawngwf21ah90ywi3spzl9whqk5wc";
+  sgr-iosevka-fixed-ss06 = "01ajn8gwqljx8da9fv9dlawwafcnqvf9pld9h8lygrg67kf3p1j6";
+  sgr-iosevka-fixed-ss07 = "000sk29gfp9z7690880kixmk08swnwpp8zs89idgpg5qhs5479qm";
+  sgr-iosevka-fixed-ss08 = "1fcw4wmz12ar5hy3r5hmagwss46yjsckk4hxhjfphbapznmyw2dx";
+  sgr-iosevka-fixed-ss09 = "0jxpf854njzjw7r1q1jaizbfhaal7idhs9v5l64c03q40s2cycxr";
+  sgr-iosevka-fixed-ss10 = "0n40gl7ygcc03n6673rkjdfqshd6fx7f0a831fz007s61c38rdl9";
+  sgr-iosevka-fixed-ss11 = "0r0wlmpa5nmgwx92f6x2jimgyh5x05id39wsmxpyhjfrl4dchkgm";
+  sgr-iosevka-fixed-ss12 = "02dvkr2vim8zyd1gngjk41bbg5ncjr6yfxigy5l9gjm64x6q2szz";
+  sgr-iosevka-fixed-ss13 = "14vz894yxw5252krpwh9981hmslwmyxdgp96kpq37lp35w7bhkc0";
+  sgr-iosevka-fixed-ss14 = "0jaz1g89dj27s3xgcginxx4s3kr7114x7wqqda96jyc1zrg79am4";
+  sgr-iosevka-fixed-ss15 = "1h12kcik341vp3yra8izcbj3490payjqy8b0y739s4bj6zmx7zb3";
+  sgr-iosevka-fixed-ss16 = "0yiyxbi1snd33ys8ip29xprwm0876j818g3fr2g6d955lp94crkp";
+  sgr-iosevka-fixed-ss17 = "1sv4zf5w7amhd591cjky7z2fc90hiiwj1g987scwcbvc0fb5gj86";
+  sgr-iosevka-fixed-ss18 = "09yh76152ar2lkw1gavd9x5i6a6vswhw9qyic0zixzr2rmcm2j35";
+  sgr-iosevka-slab = "0xdljj5bh4jsbwjgicpbi91hkjqvzxis9asd4g0vy3qqdr393i9k";
+  sgr-iosevka-ss01 = "0fllywsy23d6nfvgpb98af76cwbq8pizjvcah0p8j4qql6353d5y";
+  sgr-iosevka-ss02 = "0mlp4l3bbm2rm9gjb4pa8k730x3yb85qck7a1n5wdfz881mz6z59";
+  sgr-iosevka-ss03 = "0kcimy2i28a82s74987f6dxkdxzr06fzsi6rb7wz5v4rn5v7vmm9";
+  sgr-iosevka-ss04 = "0ynrq7di10349lfqm34vzr6z9z5hx6lz4q2z73ri91si224qsgih";
+  sgr-iosevka-ss05 = "1p2062x9wd5kkas3j5aqkx7r4asm2727i0sjf207w4lh3r37k9by";
+  sgr-iosevka-ss06 = "0zcpnw5mk3js5rc0cgpn5fncqqwf5s032z04xbaagzsmp7f3f1p9";
+  sgr-iosevka-ss07 = "09h686i2jq2p9i0684kjmsfgdpfwkbncbg3zxhz4m1x4wpfblhk8";
+  sgr-iosevka-ss08 = "0jbzr6saijbmbj1dkc4djawr75agp2c8krsnwskqr9dhisrmnjfk";
+  sgr-iosevka-ss09 = "10ffzi57gibz6w7yn4ign8vn6cagc680jrv81aqdkgav2bx71z9g";
+  sgr-iosevka-ss10 = "0d0wn7564zyvfk79hfqgnm3aa94k8xbddgmmxpq5jk918a1m6614";
+  sgr-iosevka-ss11 = "1zmbnhr1jz53yhighcn8dkj72s4y66ma61qjf5y3z64j7ql99kxi";
+  sgr-iosevka-ss12 = "06czjy90yx7pv958agwwnwn2vpfv1ha2j90bmcjg2c6shvnz5hsr";
+  sgr-iosevka-ss13 = "19k47hb167l6jsymznivdy6mgz228vcc4r5mzjjcszy4ba6n5qvg";
+  sgr-iosevka-ss14 = "0nkj7jmpbwfq7pl7s3ih30zs0szqf7xsbjn70w5i5x2g8fc3sffj";
+  sgr-iosevka-ss15 = "18l78cg3vxibngdbx2ikqhgz1v499ihf7bmdd5w92wrkkjgd0q8m";
+  sgr-iosevka-ss16 = "00mn81r50aw3ymp3mnwb8j6z6n98y03z0g5b8jfybpah65rgsrra";
+  sgr-iosevka-ss17 = "07vpvldkph4wn50vj5179h6zrw7vaf9mylksscw4wyqalinhiiqk";
+  sgr-iosevka-ss18 = "1h0jq8d2lbh0lfsmqcwbw6q9fbhbfrnn3c58xnknr9ys32xc88l2";
+  sgr-iosevka-term = "1j7sv5k4pbrq278nwfxshw23f7hdigy90w82a11s8nkq5b7f81wd";
+  sgr-iosevka-term-curly = "1v3vcvq6p4a3y1alkg45l2jipf0mwsv4x57yxl0dd41fb30araxw";
+  sgr-iosevka-term-curly-slab = "05is4yw7v32yf1h3b5j86wmz0x9fgbp5q99jw2zgn5lmv8x71dgh";
+  sgr-iosevka-term-slab = "1a0fn07ykx93y2myxdmg4xnz67dwmdl66n8la8x1h502b4hacqpl";
+  sgr-iosevka-term-ss01 = "1bwnyd6g0c185ny3d34pza1szc8pzkj15hk76g7s3jancgyajcj8";
+  sgr-iosevka-term-ss02 = "17srbkd4pbr2wwzcw6ycm1c4n5jlk4p5wlm1baqfzvffldbp609k";
+  sgr-iosevka-term-ss03 = "1w9ydkm0lsd0chyhi3b24n6syns55jwgnxkbnn7z7hh9llglplsj";
+  sgr-iosevka-term-ss04 = "1znabmm2plb5w5f8qj61shzm4v6kdqdak547j64w768g6pgc61hh";
+  sgr-iosevka-term-ss05 = "0pg3zannb29pxbfcjarj39my2lhwnid3yr7sbhk5i6sxy8klwjdv";
+  sgr-iosevka-term-ss06 = "0n25hc5gfi4zcc2zr0r5zh0q8v16z8ak2iphh5406pdgj3n9lmi9";
+  sgr-iosevka-term-ss07 = "0kmv8p689wf3mpiaq3749a3361nsckg0v4hsaw2mlshvhp4159h4";
+  sgr-iosevka-term-ss08 = "04g0q2pgimj73hgxr9nv8qmbc6n6fsadhy5x3l3cwcw7wh7s0g37";
+  sgr-iosevka-term-ss09 = "19qssfrmkvdq7bl0bg3a9v6sgnn2hg93kq0qh4j9chr7ffxnlmb2";
+  sgr-iosevka-term-ss10 = "1qc3cfw9f959h1gafhsddrlw2cbvazv17yllsj6rw4rff3bqscaq";
+  sgr-iosevka-term-ss11 = "1jbz5qg2vgrqmhbz8yvmampv7zkmksilvd7y2zrz4h5s2jbr32sg";
+  sgr-iosevka-term-ss12 = "0afcjcpb4dw4d3dggm82yls09rl71x4jqavbil4z7br96vgipdg9";
+  sgr-iosevka-term-ss13 = "04zbhi5mpycb9c6gf5ci1h6pbghy8vmajmzifcpg8d0fb9vyz370";
+  sgr-iosevka-term-ss14 = "0bps3zgarjdq5xn92rgdasnhcqlrmxwpa4bv9wr40df7zxhlvkr4";
+  sgr-iosevka-term-ss15 = "0ylxgmrsl596zdlph2f2lcfy9a37wi0x7418y53g43bdd33kcpxp";
+  sgr-iosevka-term-ss16 = "1ql8x3r19sa36424wijrzxnl3mfz7rjnwlavd0bz8qinfdvjvdsf";
+  sgr-iosevka-term-ss17 = "0plhqk7j64wfs61snly0m49lghk4srmribfqlzdk9xrvnv9h7zv1";
+  sgr-iosevka-term-ss18 = "1h7z1cnd4ia1pbyj5sq1718z8n747cq8kdy97c4vdmw6gjl8wp5x";
 }

pkgs/development/compilers/sbcl/2.2.4.nix

@@ -0,0 +1,4 @@
+import ./common.nix {
+  version = "2.2.4";
+  sha256 = "sha256-/N0lHLxl9/gI7QrXckaEjRvhZqppoX90mWABhLelcgI=";
+}

pkgs/development/embedded/fpga/apio/default.nix

@@ -15,19 +15,20 @@
 
 buildPythonApplication rec {
   pname = "apio";
-  version = "0.8.0";
+  version = "0.8.1";
   format = "flit";
 
   src = fetchFromGitHub {
     owner = "FPGAwars";
     repo = "apio";
     rev = "v${version}";
-    sha256 = "sha256-nOZI+FHdZRnkJF/No8z0mZ4Q5aHFnF7c20ajTPI00N4=";
+    sha256 = "sha256-04qAGTzusMT3GsaRxDoXNJK1Mslzxu+ugQclBJx8xzE=";
   };
 
   postPatch = ''
-    substituteInPlace pyproject.toml --replace \
-      'scons==4.2.0' 'scons'
+    substituteInPlace pyproject.toml \
+      --replace 'scons==4.2.0' 'scons' \
+      --replace '==' '>='
 
     substituteInPlace apio/managers/scons.py --replace \
       'return "tinyprog --libusb --program"' \

pkgs/development/libraries/java/commons/daemon/default.nix

@@ -1,12 +1,12 @@
 { lib, stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  version = "1.2.4";
+  version = "1.3.0";
   pname = "commons-daemon";
 
   src = fetchurl {
     url    = "mirror://apache/commons/daemon/binaries/commons-daemon-${version}-bin.tar.gz";
-    sha256 = "0bsy4xn3gncgrxj3vkpplvyhx06c1470kycj0j5gwq46ylgady9s";
+    sha256 = "sha256-Fihsar8HR2adN2f9deo7bk8tRgeiD6BljVZ/mfkLUUA=";
   };
 
   installPhase = ''

pkgs/development/libraries/qt-5/modules/qtwebengine.nix

@@ -240,7 +240,22 @@ qtModule {
   meta = with lib; {
     description = "A web engine based on the Chromium web browser";
     maintainers = with maintainers; [ matthewbauer ];
-    platforms = platforms.unix;
+
+    # qtwebengine-5.15.8: "QtWebEngine can only be built for x86,
+    # x86-64, ARM, Aarch64, and MIPSel architectures."
+    platforms =
+      lib.trivial.pipe lib.systems.doubles.all [
+        (map (double: lib.systems.elaborate { system = double; }))
+        (lib.lists.filter (parsedPlatform: with parsedPlatform;
+          isUnix &&
+          (isx86_32  ||
+           isx86_64  ||
+           isAarch32 ||
+           isAarch64 ||
+           (isMips && isLittleEndian))))
+        (map (plat: plat.system))
+      ];
+
     # This build takes a long time; particularly on slow architectures
     timeout = 24 * 3600;
     # we are still stuck with MacOS SDK 10.12 on x86_64-darwin

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

@@ -66,6 +66,6 @@ in buildPythonPackage rec {
     description = "Python bindings for Qt5";
     homepage    = "http://www.riverbankcomputing.co.uk";
     license     = licenses.gpl3;
-    platforms   = platforms.mesaPlatforms;
+    platforms   = lib.lists.intersectLists qtwebengine.meta.platforms platforms.mesaPlatforms;
   };
 }

pkgs/development/tools/ddosify/default.nix

@@ -2,16 +2,16 @@
 
 buildGoModule rec {
   pname = "ddosify";
-  version = "0.7.6";
+  version = "0.7.9";
 
   src = fetchFromGitHub {
     owner = pname;
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-nwTVSx6+ELTZnM2tOuyzr7Koq6SE5L52S4revRjGABs=";
+    sha256 = "sha256-7dPDYBypLz0YWcgwP57LtZV+WNEGd705/0jyDXT4xTY=";
   };
 
-  vendorSha256 = "sha256-lbo9P2UN9TmUAqyhFdbOHWokoAogVQZihpcOlhmumxU=";
+  vendorSha256 = "sha256-WvchcVd0tql5Kxt2EP/auSq66hjiVqew7Iyi/ytaI64=";
 
   ldflags = [
     "-s -w"

pkgs/tools/networking/corerad/default.nix

@@ -2,13 +2,13 @@
 
 buildGoModule rec {
   pname = "corerad";
-  version = "1.2.0";
+  version = "1.2.1";
 
   src = fetchFromGitHub {
     owner = "mdlayher";
     repo = "corerad";
     rev = "v${version}";
-    sha256 = "sha256-CNDotCRxKBtg/RsrBa00r3vRKBIIZ4xqpdXkImI44QI=";
+    sha256 = "sha256-JhdR1UKHnzXIUoe1shb3IZne3q198NLwRROEYuKsnW4=";
   };
 
   vendorSha256 = "sha256-w15dRxIBzDN5i4RNEDuSfCHHb4wc4fw1B2wjlTk40iE=";

pkgs/tools/networking/globalprotect-openconnect/default.nix

@@ -4,14 +4,14 @@
 
 stdenv.mkDerivation rec {
   pname = "globalprotect-openconnect";
-  version = "1.3.4";
+  version = "1.4.1";
 
   src = fetchFromGitHub {
     owner = "yuezk";
     repo = "GlobalProtect-openconnect";
     fetchSubmodules = true;
     rev = "v${version}";
-    sha256 = "sha256-w2y6DOFgQ8Xpi1abibvRNpEUbBsdvwDMGqlJxQSCpVg=";
+    sha256 = "sha256-J4f+DJuKQUGK49muAtPU1aL/KI9mofIjyCcIztNVyr4=";
   };
 
   nativeBuildInputs = [ cmake wrapQtAppsHook ];

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

@@ -89,12 +89,12 @@ in lib.makeExtensible (self: {
 
   unstable = lib.lowPrio (common rec {
     version = "2.8";
-    suffix = "pre20220411_${lib.substring 0 7 src.rev}";
+    suffix = "pre20220428_${lib.substring 0 7 src.rev}";
     src = fetchFromGitHub {
       owner = "NixOS";
       repo = "nix";
-      rev = "f7276bc948705f452b2bfcc2a08bc44152f1d5a8";
-      sha256 = "sha256-brqGGdr2CzqufY3NXU8tGm6QbCTSFGfboruU2cUWhu8=";
+      rev = "4bb111c8d4c5692db2f735c2803f632f8c30b6ab";
+      sha256 = "sha256-AmxyCgpd53JBvvj6jPoGMP3eEisgu58YjaZEmhoTlGw=";
     };
   });
 })

pkgs/tools/text/vale/default.nix

@@ -2,7 +2,7 @@
 
 buildGoModule rec {
   pname = "vale";
-  version = "2.15.5";
+  version = "2.16.0";
 
   subPackages = [ "cmd/vale" ];
   outputs = [ "out" "data" ];
@@ -11,10 +11,10 @@ buildGoModule rec {
     owner = "errata-ai";
     repo = "vale";
     rev = "v${version}";
-    sha256 = "sha256-D/HCdYqQCqpgJjEhqAkCf0Dy9lpJUMXeyEemhgGhUco=";
+    sha256 = "sha256-kqyktQxQX4/jBj6vBw1VXRzD5D3wfLwnfi+QKgEqN5A=";
   };
 
-  vendorSha256 = "sha256-5pmocQTTgc6hsHyKFPC/RhKqn3eYjPeiXVNKWjPjWiU=";
+  vendorSha256 = "sha256-EFuzbSVIhsGUJ8a2YoQHOq7BQpOHV43r9VKynR8UZ7k=";
 
   postInstall = ''
     mkdir -p $data/share/vale
@@ -24,7 +24,7 @@ buildGoModule rec {
   ldflags = [ "-s" "-w" "-X main.version=${version}" ];
 
   meta = with lib; {
-    homepage = "https://docs.errata.ai/vale/about";
+    homepage = "https://vale.sh/";
     description = "A syntax-aware linter for prose built with speed and extensibility in mind";
     license = licenses.mit;
     maintainers = [ maintainers.marsam ];

pkgs/top-level/all-packages.nix

@@ -13774,7 +13774,8 @@ with pkgs;
   sbcl_2_1_9 = callPackage ../development/compilers/sbcl/2.1.9.nix {};
   sbcl_2_1_10 = callPackage ../development/compilers/sbcl/2.1.10.nix {};
   sbcl_2_1_11 = callPackage ../development/compilers/sbcl/2.1.11.nix {};
-  sbcl = sbcl_2_1_11;
+  sbcl_2_2_4 = callPackage ../development/compilers/sbcl/2.2.4.nix {};
+  sbcl = sbcl_2_2_4;
 
   roswell = callPackage ../development/tools/roswell { };