Merge master into staging-next

2022-04-28 12:05:39 +00:00 · 2022-04-28 12:05:39 +00:00 · 5891152d70
commit 5891152d70
parent 2d5d5db400 6ff202cb7b
110 changed files with 965 additions and 98701 deletions
--- a/lib/systems/doubles.nix
+++ b/lib/systems/doubles.nix
@ -74,6 +74,8 @@ in {
  mips          = filterDoubles predicates.isMips;
  mmix          = filterDoubles predicates.isMmix;
  riscv         = filterDoubles predicates.isRiscV;
+  riscv32       = filterDoubles predicates.isRiscV32;
+  riscv64       = filterDoubles predicates.isRiscV64;
  vc4           = filterDoubles predicates.isVc4;
  or1k          = filterDoubles predicates.isOr1k;
  m68k          = filterDoubles predicates.isM68k;
--- a/lib/systems/inspect.nix
+++ b/lib/systems/inspect.nix
@ -24,6 +24,8 @@ rec {
    isMips64n64    = { cpu = { family = "mips"; bits = 64; }; abi = { abi = "64";  }; };
    isMmix         = { cpu = { family = "mmix"; }; };
    isRiscV        = { cpu = { family = "riscv"; }; };
+    isRiscV32      = { cpu = { family = "riscv"; bits = 32; }; };
+    isRiscV64      = { cpu = { family = "riscv"; bits = 64; }; };
    isSparc        = { cpu = { family = "sparc"; }; };
    isWasm         = { cpu = { family = "wasm"; }; };
    isMsp430       = { cpu = { family = "msp430"; }; };
--- a/lib/tests/systems.nix
+++ b/lib/tests/systems.nix
@ -19,6 +19,9 @@ with lib.systems.doubles; lib.runTests {
  testi686 = mseteq i686 [ "i686-linux" "i686-freebsd" "i686-genode" "i686-netbsd" "i686-openbsd" "i686-cygwin" "i686-windows" "i686-none" "i686-darwin" ];
  testmips = mseteq mips [ "mips64el-linux" "mipsel-linux" "mipsel-netbsd" ];
  testmmix = mseteq mmix [ "mmix-mmixware" ];
+  testriscv = mseteq riscv [ "riscv32-linux" "riscv64-linux" "riscv32-netbsd" "riscv64-netbsd" "riscv32-none" "riscv64-none" ];
+  testriscv32 = mseteq riscv32 [ "riscv32-linux" "riscv32-netbsd" "riscv32-none" ];
+  testriscv64 = mseteq riscv64 [ "riscv64-linux" "riscv64-netbsd" "riscv64-none" ];
  testx86_64 = mseteq x86_64 [ "x86_64-linux" "x86_64-darwin" "x86_64-freebsd" "x86_64-genode" "x86_64-redox" "x86_64-openbsd" "x86_64-netbsd" "x86_64-cygwin" "x86_64-solaris" "x86_64-windows" "x86_64-none" ];

  testcygwin = mseteq cygwin [ "i686-cygwin" "x86_64-cygwin" ];
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@ -5605,6 +5605,12 @@
    githubId = 488556;
    name = "Javier Aguirre";
  };
+  jayesh-bhoot = {
+    name = "Jayesh Bhoot";
+    email = "jayesh@bhoot.sh";
+    github = "jayesh-bhoot";
+    githubId = 1915507;
+  };
  jb55 = {
    email = "jb55@jb55.com";
    github = "jb55";
@ -12498,6 +12504,12 @@
    githubId = 844343;
    name = "Thiago K. Okada";
  };
+  thibaultlemaire = {
+    email = "thibault.lemaire@protonmail.com";
+    github = "ThibaultLemaire";
+    githubId = 21345269;
+    name = "Thibault Lemaire";
+  };
  thibautmarty = {
    email = "github@thibautmarty.fr";
    matrix = "@thibaut:thibautmarty.fr";
--- a/nixos/modules/hardware/all-firmware.nix
+++ b/nixos/modules/hardware/all-firmware.nix
@ -27,7 +27,8 @@ in {
    };

    hardware.enableRedistributableFirmware = mkOption {
-      default = false;
+      default = config.hardware.enableAllFirmware;
+      defaultText = lib.literalExpression "config.hardware.enableAllFirmware";
      type = types.bool;
      description = ''
        Turn on this option if you want to enable all the firmware with a license allowing redistribution.
--- a/nixos/modules/services/web-apps/galene.nix
+++ b/nixos/modules/services/web-apps/galene.nix
@ -164,6 +164,35 @@ in
            optional (cfg.dataDir == defaultdataDir) "galene/data" ++
            optional (cfg.groupsDir == defaultgroupsDir) "galene/groups" ++
            optional (cfg.recordingsDir == defaultrecordingsDir) "galene/recordings";
+
+          # Hardening
+          CapabilityBoundingSet = [ "" ];
+          DeviceAllow = [ "" ];
+          LockPersonality = true;
+          MemoryDenyWriteExecute = true;
+          NoNewPrivileges = true;
+          PrivateDevices = true;
+          PrivateTmp = true;
+          PrivateUsers = true;
+          ProcSubset = "pid";
+          ProtectClock = true;
+          ProtectControlGroups = true;
+          ProtectHome = true;
+          ProtectHostname = true;
+          ProtectKernelLogs = true;
+          ProtectKernelModules = true;
+          ProtectKernelTunables = true;
+          ProtectProc = "invisible";
+          ProtectSystem = "strict";
+          ReadWritePaths = cfg.recordingsDir;
+          RemoveIPC = true;
+          RestrictAddressFamilies = [ "AF_INET" "AF_INET6" ];
+          RestrictNamespaces = true;
+          RestrictRealtime = true;
+          RestrictSUIDSGID = true;
+          SystemCallArchitectures = "native";
+          SystemCallFilter = [ "@system-service" "~@privileged" "~@resources" ];
+          UMask = "0077";
        }
      ];
    };
--- a/pkgs/applications/audio/spotify/default.nix
+++ b/pkgs/applications/audio/spotify/default.nix
@ -10,14 +10,14 @@ let
  # If an update breaks things, one of those might have valuable info:
  # https://aur.archlinux.org/packages/spotify/
  # https://community.spotify.com/t5/Desktop-Linux
-  version = "1.1.80.699.gc3dac750";
+  version = "1.1.84.716.gc5f8b819";
  # To get the latest stable revision:
  # curl -H 'X-Ubuntu-Series: 16' 'https://api.snapcraft.io/api/v1/snaps/details/spotify?channel=stable' | jq '.download_url,.version,.last_updated'
  # To get general information:
  # curl -H 'Snap-Device-Series: 16' 'https://api.snapcraft.io/v2/snaps/info/spotify' | jq '.'
  # More examples of api usage:
  # https://github.com/canonical-websites/snapcraft.io/blob/master/webapp/publisher/snaps/views.py
-  rev = "58";
+  rev = "60";

  deps = [
    alsa-lib
@ -80,7 +80,7 @@ stdenv.mkDerivation {
  # https://community.spotify.com/t5/Desktop-Linux/Redistribute-Spotify-on-Linux-Distributions/td-p/1695334
  src = fetchurl {
    url = "https://api.snapcraft.io/api/v1/snaps/download/pOBIoZ2LrCB3rDohMxoYGnbN14EHOgD7_${rev}.snap";
-    sha512 = "91385a5a8de31d6e9f1945d23108447fd369c1cdc2e4d95cbb7cec5d403c3be14a1b0fabe3fb01aef809a39b033d289add1bcb307ab19c7fcb63689dbae57c53";
+    sha512 = "1209b956822d8bb661daa2c88616bed403ec26dc22c6b866cecff59235c56112284c2f99aa06352fc0df6fcd15225a6ad60afd3b4ff4d7b948ab83e70ab31a71";
  };

  nativeBuildInputs = [ makeWrapper wrapGAppsHook squashfsTools ];
--- a/pkgs/applications/editors/vscode/extensions/remote-ssh/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/remote-ssh/default.nix
@ -37,8 +37,8 @@ buildVscodeMarketplaceExtension {
  mktplcRef = {
    name = "remote-ssh";
    publisher = "ms-vscode-remote";
-    version = "0.66.1";
-    sha256 = "sha256-+v4UnGRG5xOc8k0IzvHUBHa128fhgd3jcmEuciiMQmI=";
+    version = "0.78.0";
+    sha256 = "sha256-vd+9d86Z8429QpQVCZm8gtiJDcMpD++aiFVwvCrPg5w=";
  };

  postPatch = ''
--- a/pkgs/applications/kde/default.nix
+++ b/pkgs/applications/kde/default.nix
@ -154,6 +154,7 @@ let
      kmime = callPackage ./kmime.nix {};
      kmines = callPackage ./kmines.nix {};
      kmix = callPackage ./kmix.nix {};
+      kmousetool = callPackage ./kmousetool.nix {};
      kmplot = callPackage ./kmplot.nix {};
      knavalbattle = callPackage ./knavalbattle.nix {};
      knetwalk = callPackage ./knetwalk.nix {};
--- a/pkgs/applications/kde/kmousetool.nix
+++ b/pkgs/applications/kde/kmousetool.nix
@ -0,0 +1,35 @@
+{ mkDerivation
+, lib
+, extra-cmake-modules
+, kdoctools
+, ki18n
+, kiconthemes
+, knotifications
+, kxmlgui
+, kwindowsystem
+, phonon
+, libXtst
+, libXt
+}:
+
+mkDerivation {
+  pname = "kmousetool";
+  nativeBuildInputs = [ extra-cmake-modules kdoctools ];
+  buildInputs = [
+    ki18n
+    kiconthemes
+    knotifications
+    kxmlgui
+    kwindowsystem
+    phonon
+    libXtst
+    libXt
+  ];
+  meta = {
+    homepage = "https://github.com/KDE/kmousetool";
+    description = "Program that clicks the mouse for you";
+    license = with lib.licenses; [ gpl2 fdl12 ];
+    maintainers = [ lib.maintainers.jayesh-bhoot ];
+  };
+}
+
--- a/pkgs/applications/misc/bottles/default.nix
+++ b/pkgs/applications/misc/bottles/default.nix
@ -20,13 +20,13 @@ let
 in
 python3Packages.buildPythonApplication rec {
  pname = "bottles";
-  version = "2022.4.14-trento-1";
+  version = "2022.4.28-trento";

  src = fetchFromGitHub {
    owner = "bottlesdevs";
    repo = pname;
    rev = version;
-    sha256 = "16cb01fhxa64f8fadwpr0mawfmchig6xlbx20mz4q9yh5fnagywj";
+    sha256 = "sha256-PVtjKAwCA9GliUDIoAFMqeVFZYPo2dxCWhW9lSotC6w=";
  };

  postPatch = ''
--- a/pkgs/applications/networking/cluster/kn/default.nix
+++ b/pkgs/applications/networking/cluster/kn/default.nix
@ -2,13 +2,13 @@

 buildGoModule rec {
  pname = "kn";
-  version = "1.3.1";
+  version = "1.4.0";

  src = fetchFromGitHub {
    owner = "knative";
    repo = "client";
    rev = "knative-v${version}";
-    sha256 = "sha256-xpSnirdEZ/Cua/wicu62HzeDm0E8Xo/Jt2eMfUS7mDo=";
+    sha256 = "sha256-Q67dictDE+HWw99lFAiidBvIL30mMAkjYb2CDLDcalw=";
  };

  vendorSha256 = null;
--- a/pkgs/applications/networking/cluster/terraform-providers/providers.json
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json
@ -330,19 +330,19 @@
    "owner": "dome9",
    "provider-source-address": "registry.terraform.io/dome9/dome9",
    "repo": "terraform-provider-dome9",
-    "rev": "v1.25.2",
-    "sha256": "sha256-6AtJEeAoOfqGwLC687aMTBg4yRXIDYqDbkXyXuiV8aQ=",
+    "rev": "v1.25.3",
+    "sha256": "sha256-0Pde+xVToBP5gavr0ckEIUmgCmRBbqSP5C0YkMthQGQ=",
    "vendorSha256": null,
-    "version": "1.25.2"
+    "version": "1.25.3"
  },
  "elasticsearch": {
    "owner": "phillbaker",
    "provider-source-address": "registry.terraform.io/phillbaker/elasticsearch",
    "repo": "terraform-provider-elasticsearch",
-    "rev": "v2.0.0",
-    "sha256": "sha256-wl8pRAB97JObpZvi2rdyDZP5itKcOnm6Gsbku1+5oqQ=",
-    "vendorSha256": "sha256-OCXTZg0JkaxJDEgoF2Qs4BcMSiYkQpLmehWdCpEmTzk=",
-    "version": "2.0.0"
+    "rev": "v2.0.1",
+    "sha256": "sha256-WdGwLQe4jInZiMxJ7BasfwVBsei0V02D6vAA4dLLoAI=",
+    "vendorSha256": "sha256-gBC5+6bGJzfb0yLKlolfrZNuhpPacqX3p1HjIB4i3IU=",
+    "version": "2.0.1"
  },
  "exoscale": {
    "owner": "exoscale",
@ -366,10 +366,10 @@
    "owner": "fastly",
    "provider-source-address": "registry.terraform.io/fastly/fastly",
    "repo": "terraform-provider-fastly",
-    "rev": "v1.1.2",
-    "sha256": "sha256-CxyVW9uE9mK+ZF8fyjAsrFKY82xAyGn9k1jOFqTaAhA=",
+    "rev": "v1.1.3",
+    "sha256": "sha256-zkZ3ZORky0OmM5YvDU30lqpIhO7f49imW+pWjndXSwQ=",
    "vendorSha256": null,
-    "version": "1.1.2"
+    "version": "1.1.3"
  },
  "flexibleengine": {
    "owner": "FlexibleEngineCloud",
@ -384,10 +384,10 @@
    "owner": "fortinetdev",
    "provider-source-address": "registry.terraform.io/fortinetdev/fortios",
    "repo": "terraform-provider-fortios",
-    "rev": "v1.14.0",
-    "sha256": "078wvbihrs6j5yrbqsx5g6l7z05y98kwlyanq5w99fsazz78rr4h",
+    "rev": "v1.14.1",
+    "sha256": "sha256-9e1PEg8RtJa7DR5g3cCdAhubFxt7vN5dPjaBA+F7Y4E=",
    "vendorSha256": null,
-    "version": "1.14.0"
+    "version": "1.14.1"
  },
  "gandi": {
    "owner": "go-gandi",
@ -421,29 +421,29 @@
    "provider-source-address": "registry.terraform.io/hashicorp/google",
    "proxyVendor": true,
    "repo": "terraform-provider-google",
-    "rev": "v4.18.0",
-    "sha256": "sha256-/s0O2ZBNPfBNffZp9sdG2omfXKDgwLaX4cJZs553WLU=",
+    "rev": "v4.19.0",
+    "sha256": "sha256-b6oEKiz8REeJIDFLDI80+kA4f32KRjZy/GhKg0qeN24=",
    "vendorSha256": "sha256-l2OviwplP/Sg2ShaEA88pMwVTkREnLkFAzterjr2kvU=",
-    "version": "4.18.0"
+    "version": "4.19.0"
  },
  "google-beta": {
    "owner": "hashicorp",
    "provider-source-address": "registry.terraform.io/hashicorp/google-beta",
    "proxyVendor": true,
    "repo": "terraform-provider-google-beta",
-    "rev": "v4.18.0",
-    "sha256": "sha256-mVuo+dFDNcmWIh9WJNkkpowF7lI3mQy8scgij6jM9Zw=",
+    "rev": "v4.19.0",
+    "sha256": "sha256-MPB/ca0GIIs7yEfIyqeOkzK2mkEdkE/DkEbaSqpaF0U=",
    "vendorSha256": "sha256-l2OviwplP/Sg2ShaEA88pMwVTkREnLkFAzterjr2kvU=",
-    "version": "4.18.0"
+    "version": "4.19.0"
  },
  "grafana": {
    "owner": "grafana",
    "provider-source-address": "registry.terraform.io/grafana/grafana",
    "repo": "terraform-provider-grafana",
-    "rev": "v1.21.1",
-    "sha256": "sha256-2eTVJB0Scs6cZzwy+DQLgKqP0JPNnQMjUcG7THH2Cgg=",
-    "vendorSha256": "sha256-YfE5ob/gB+X9x0Zx6gqjUR3+P+EhQrZ6aNiHOkbkNIc=",
-    "version": "1.21.1"
+    "rev": "v1.22.0",
+    "sha256": "sha256-0OkFf2YiwJHwXheYkN1HA1DG5vadyhZOzVjmu0BNDHI=",
+    "vendorSha256": "sha256-Pd4cSmDzRhu8MD2osXg6mVYiKG2VM6MQ67aC6jDy59U=",
+    "version": "1.22.0"
  },
  "gridscale": {
    "owner": "gridscale",
@ -458,10 +458,10 @@
    "owner": "hetznercloud",
    "provider-source-address": "registry.terraform.io/hetznercloud/hcloud",
    "repo": "terraform-provider-hcloud",
-    "rev": "v1.33.1",
-    "sha256": "1mskbr0adhnri72fa3afghxpcfbzq0qnpslhh9gdnymvs3afjbdg",
-    "vendorSha256": "0rc4pznb16fm5dhi54fwka44zvngy3hp0cfwlrh84ifmzqgx0mlv",
-    "version": "1.33.1"
+    "rev": "v1.33.2",
+    "sha256": "sha256-kERpOIEy6UsT2BEY9kkINuWbncDXJuwWjR/Kzua97m8=",
+    "vendorSha256": "sha256-p+NFt9QjbR12bGnCrhUTJzwtBagjXn5w1UcQFMQpY+I=",
+    "version": "1.33.2"
  },
  "helm": {
    "owner": "hashicorp",
@ -602,10 +602,10 @@
    "owner": "hashicorp",
    "provider-source-address": "registry.terraform.io/hashicorp/kubernetes",
    "repo": "terraform-provider-kubernetes",
-    "rev": "v2.10.0",
-    "sha256": "sha256-pA0yI59iRBmiT3rdvoP4vkSz/+bH29O4eLGPCBjfiZU=",
+    "rev": "v2.11.0",
+    "sha256": "sha256-qrADveCJUvYcseTUmqQzmRKn4Whb/KfJjwz2+6V7yZc=",
    "vendorSha256": null,
-    "version": "2.10.0"
+    "version": "2.11.0"
  },
  "launchdarkly": {
    "owner": "launchdarkly",
@ -746,10 +746,10 @@
    "owner": "newrelic",
    "provider-source-address": "registry.terraform.io/newrelic/newrelic",
    "repo": "terraform-provider-newrelic",
-    "rev": "v2.43.3",
-    "sha256": "sha256-RSE0JHhIKR0Xst2iol3L02OZnEHwkVoaN32Yu2YZy7s=",
-    "vendorSha256": "sha256-4C8OWJSaUp4W8ScERveGYJ0m8avl6HHeTtGleJa5mdk=",
-    "version": "2.43.3"
+    "rev": "v2.43.4",
+    "sha256": "sha256-7ckPPU5ieVEZogW7lWd5vMHyXSlTuSqXj1suxKfEyis=",
+    "vendorSha256": "sha256-HhjTcdw8LbwMJ7P5LcZtgtEojLsqnsiBDrRIp62EZhQ=",
+    "version": "2.43.4"
  },
  "nomad": {
    "owner": "hashicorp",
@ -801,19 +801,19 @@
    "owner": "oracle",
    "provider-source-address": "registry.terraform.io/oracle/oci",
    "repo": "terraform-provider-oci",
-    "rev": "v4.72.0",
-    "sha256": "sha256-ztlMhwcRraPdR95iZGiEKJAKe7PZeE4ABLBNVo2maUQ=",
+    "rev": "v4.73.0",
+    "sha256": "sha256-duONflOa+ZmWNAOZTcjLJUaeIUSiDR3VC4+SC4UXBBg=",
    "vendorSha256": null,
-    "version": "4.72.0"
+    "version": "4.73.0"
  },
  "okta": {
    "owner": "okta",
    "provider-source-address": "registry.terraform.io/okta/okta",
    "repo": "terraform-provider-okta",
-    "rev": "v3.24.0",
-    "sha256": "sha256-nP42jYvdXmW4gz1fRcEm3Cmv7RXlpk6l2qL5dImIvAw=",
-    "vendorSha256": "sha256-S4HVfl/PbgpgWFedkWM+EGyYAL5P0cdkLMYL+y+aX8w=",
-    "version": "3.24.0"
+    "rev": "v3.25.1",
+    "sha256": "sha256-+XCpk/vfAD8TWxMdi/WqXxDEh6cEZ684Zr+vkHnNMsI=",
+    "vendorSha256": "sha256-LHiOQNFkMajqytrv387yIhAyCQCaG2Kw5OCI8Xe7u2k=",
+    "version": "3.25.1"
  },
  "oktaasa": {
    "owner": "oktadeveloper",
@ -855,10 +855,10 @@
    "owner": "opentelekomcloud",
    "provider-source-address": "registry.terraform.io/opentelekomcloud/opentelekomcloud",
    "repo": "terraform-provider-opentelekomcloud",
-    "rev": "v1.29.2-alpha.1",
-    "sha256": "sha256-OAbsX7GMGeDvc22xj4V/Jfap2ROg7ECTFf+FJTm0aDM=",
-    "vendorSha256": "sha256-kSZvxbovF2/oCqFY/0zpGmAhLFuCw6nWG3B4ppyxzLY=",
-    "version": "1.29.2-alpha.1"
+    "rev": "v1.29.2",
+    "sha256": "sha256-V5EGRd5/JmCDaF1fQkpwHA4DNVFKwvGnMR/AyKvgLtk=",
+    "vendorSha256": "sha256-FOcddb1+uG5avqYZMvzR1UXDvtDDwtxBzf7FsN6ZROM=",
+    "version": "1.29.2"
  },
  "opsgenie": {
    "owner": "opsgenie",
--- a/pkgs/applications/networking/instant-messengers/linphone/default.nix
+++ b/pkgs/applications/networking/instant-messengers/linphone/default.nix
@ -48,9 +48,25 @@
 , zlib
 }:

+# How to update Linphone? (The Qt desktop app)
+#
+# Belledonne Communications (BC), the company making Linphone, has split the
+# project into several sub-projects that they maintain, plus some third-party
+# dependencies that they also extend with commits of their own, specific to
+# Linphone and not (yet?) upstreamed.
+#
+# All of this is organised in a Software Development Kit (SDK) meta-repository
+# with git submodules to pin all those repositories into a coherent whole.
+#
+# The Linphone Qt desktop app uses this SDK as submodule as well.
+#
+# So, in order to update the desktop app to a new release, one has to follow
+# the submodule chain and update the corresponding derivations here, in nixpkgs,
+# with the corresponding version number (or commit hash)
+
 mkDerivation rec {
  pname = "linphone-desktop";
-  version = "4.2.5";
+  version = "4.4.1";

  src = fetchFromGitLab {
    domain = "gitlab.linphone.org";
@ -58,12 +74,13 @@ mkDerivation rec {
    group = "BC";
    repo = pname;
    rev = version;
-    sha256 = "1gq4l9p21rbrcksa7fbkzn9fzbbynqmn6ni6lhnvzk359sb1xvbz";
+    sha256 = "sha256-BBOTyKMZikkxMJSmzAuChVHpVeCvbAimn1K3REGbqEg=";
  };

  patches = [
    ./do-not-build-linphone-sdk.patch
    ./remove-bc_compute_full_version-usage.patch
+    ./no-store-path-in-autostart.patch
  ];

  # See: https://gitlab.linphone.org/BC/public/linphone-desktop/issues/21
@ -77,12 +94,21 @@ mkDerivation rec {
  # there might be some build inputs here that aren't needed for
  # linphone-desktop.
  buildInputs = [
+    # Made by BC
    bcg729
    bctoolbox
    belcard
    belle-sip
    belr
    bzrtp
+    liblinphone
+    mediastreamer
+    mediastreamer-openh264
+    ortp
+
+    # Vendored by BC but we use upstream, might cause problems
+    libmatroska
+
    cairo
    cyrus_sasl
    ffmpeg
@ -91,19 +117,14 @@ mkDerivation rec {
    gtk2
    libX11
    libexosip
-    liblinphone
-    libmatroska
    libnotify
    libosip
    libsoup
    libupnp
    libxml2
    mbedtls
-    mediastreamer
-    mediastreamer-openh264
    minizip2
    openldap
-    ortp
    pango
    qtbase
    qtgraphicaleffects
@ -117,7 +138,9 @@ mkDerivation rec {
  ];

  nativeBuildInputs = [
+    # Made by BC
    bcunit
+
    cmake
    graphviz
    intltool
@ -126,7 +149,6 @@ mkDerivation rec {
  ];

  cmakeFlags = [
-    "-DCMAKE_BUILD_TYPE=RelWithDebInfo"
    "-DMINIZIP_INCLUDE_DIRS=${minizip2}/include"
    "-DMINIZIP_LIBRARIES=minizip"
  ];
@ -160,18 +182,25 @@ mkDerivation rec {
  # Linphone will randomly crash when it tries to access those files. Then,
  # those just need to be copied manually below.
  installPhase = ''
-    mkdir -p $out/bin
+    mkdir -p $out/bin $out/lib
    cp linphone-app/linphone $out/bin/
+    cp linphone-app/libapp-plugin.so $out/lib/
+    mkdir -p $out/lib/mediastreamer/plugins
+    ln -s ${mediastreamer-openh264}/lib/mediastreamer/plugins/* $out/lib/mediastreamer/plugins/
+    ln -s ${mediastreamer}/lib/mediastreamer/plugins/* $out/lib/mediastreamer/plugins/
    wrapProgram $out/bin/linphone \
      --set MEDIASTREAMER_PLUGINS_DIR \
-            ${mediastreamer-openh264}/lib/mediastreamer/plugins
+            $out/lib/mediastreamer/plugins
    mkdir -p $out/share/applications
    cp linphone-app/linphone.desktop $out/share/applications/
-    cp -r ../linphone-app/assets/icons $out/share/
+    mkdir -p $out/share/icons/hicolor/scalable/apps
+    cp ../linphone-app/assets/images/linphone_logo.svg $out/share/icons/hicolor/scalable/apps/linphone.svg
    mkdir -p $out/share/belr/grammars
    ln -s ${liblinphone}/share/belr/grammars/* $out/share/belr/grammars/
+    ln -s ${belle-sip}/share/belr/grammars/* $out/share/belr/grammars/
    mkdir -p $out/share/linphone
    ln -s ${liblinphone}/share/linphone/* $out/share/linphone/
+    ln -s ${liblinphone}/share/sounds $out/share/sounds
  '';

  meta = with lib; {
--- a/pkgs/applications/networking/instant-messengers/linphone/do-not-build-linphone-sdk.patch
+++ b/pkgs/applications/networking/instant-messengers/linphone/do-not-build-linphone-sdk.patch
@ -1,30 +1,31 @@
-From 08b8b1811a1ad079fa713d19a8cc6bf2dc782bb7 Mon Sep 17 00:00:00 2001
-From: David P <megver83@parabola.nu>
-Date: Thu, 26 Nov 2020 15:56:30 -0300
-Subject: [PATCH 1/2] do not build linphone-sdk
+From e6a9992461f368d08d1ad63ffe454714ec0c59ce Mon Sep 17 00:00:00 2001
+From: Lorenz Brun <lorenz@brun.one>
+Date: Fri, 28 Jan 2022 02:36:01 +0100
+Subject: [PATCH] Remove Linphone SDK build

-Signed-off-by: David P <megver83@parabola.nu>
 ---
- CMakeLists.txt                                | 61 +------------------
- .../cmake_builder/additional_steps.cmake      |  9 ---
- 2 files changed, 3 insertions(+), 67 deletions(-)
+ CMakeLists.txt                                | 86 ++-----------------
+ .../cmake_builder/additional_steps.cmake      |  9 --
+ 2 files changed, 5 insertions(+), 90 deletions(-)

 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index f7eb05f2..5921ee5b 100644
+index 2002b925..6d92a8e5 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -118,7 +118,6 @@ list(APPEND APP_OPTIONS "-DENABLE_RELATIVE_PREFIX=${ENABLE_RELATIVE_PREFIX}")
- 
+@@ -152,7 +152,6 @@ list(APPEND APP_OPTIONS "-DENABLE_RELATIVE_PREFIX=${ENABLE_RELATIVE_PREFIX}")
 list(APPEND APP_OPTIONS "-DLINPHONE_OUTPUT_DIR=${LINPHONE_OUTPUT_DIR}")
+ list(APPEND APP_OPTIONS "-DENABLE_QT_GL=${ENABLE_VIDEO}")#Activate on video
 
 -include(ExternalProject)
 set(PROJECT_BUILD_COMMAND "")
 if(CMAKE_BUILD_PARALLEL_LEVEL)
 	list(APPEND APP_OPTIONS "-DCMAKE_BUILD_PARALLEL_LEVEL=${CMAKE_BUILD_PARALLEL_LEVEL}")
-@@ -136,29 +135,8 @@ if(UNIX AND NOT APPLE)
- 	set(CMAKE_INSTALL_RPATH "$ORIGIN:$ORIGIN/lib64:$ORIGIN/../lib64:$ORIGIN/lib:$ORIGIN/../lib:${LINPHONE_OUTPUT_DIR}/${CMAKE_INSTALL_LIBDIR}")
- 	list(APPEND APP_OPTIONS "-DCMAKE_INSTALL_RPATH=${CMAKE_INSTALL_RPATH}")
+@@ -190,30 +189,8 @@ if(ENABLE_BUILD_APP_PLUGINS)
+ 	endif()
 endif()
+ 
+-
+-if(NOT LINPHONE_QT_ONLY)
 -ExternalProject_Add(sdk PREFIX "${CMAKE_BINARY_DIR}/sdk"
 -    SOURCE_DIR "${CMAKE_SOURCE_DIR}/linphone-sdk"
 -    INSTALL_DIR "${LINPHONE_OUTPUT_DIR}"
@ -35,7 +36,7 @@ index f7eb05f2..5921ee5b 100644
 -    INSTALL_COMMAND ${CMAKE_COMMAND} -E echo "Install step is already done at build time."
 -    LIST_SEPARATOR | # Use the alternate list separator
 -    CMAKE_ARGS ${APP_OPTIONS} ${USER_ARGS} -DCMAKE_INSTALL_PREFIX:PATH=<INSTALL_DIR> -DCMAKE_PREFIX_PATH=${PREFIX_PATH}
-    #BUILD_ALWAYS NO #${DO_BUILD}
+-    BUILD_ALWAYS NO #${DO_BUILD}
 -)
 -ExternalProject_Add_Step(sdk force_build
 -	COMMENT "Forcing build for 'desktop'"
@ -43,18 +44,17 @@ index f7eb05f2..5921ee5b 100644
 -	DEPENDERS build
 -	ALWAYS 1
 -)
+-endif()
 include(FindPkgConfig)
 
 -set(APP_DEPENDS sdk)
-
-
- find_package(Qt5 5.12 COMPONENTS Core REQUIRED)
+ find_package(Qt5 5.10 COMPONENTS Core REQUIRED)
 
 if ( NOT Qt5_FOUND )
-@@ -173,39 +151,6 @@ find_package(Mediastreamer2 CONFIG QUIET)
+@@ -227,62 +204,9 @@ find_package(belcard CONFIG QUIET)
+ find_package(Mediastreamer2 CONFIG QUIET)
 find_package(ortp CONFIG QUIET)
 
- 
 -if(NOT (LinphoneCxx_FOUND) OR NOT (Linphone_FOUND) OR NOT (bctoolbox_FOUND) OR NOT (belcard_FOUND) OR NOT (Mediastreamer2_FOUND) OR NOT (ortp_FOUND) OR FORCE_APP_EXTERNAL_PROJECTS)
 -	message("Projects are set as External projects. You can start building them by using for example : cmake --build . --target install")
 -	ExternalProject_Add(linphone-qt PREFIX "${CMAKE_BINARY_DIR}/linphone-app"
@ -63,23 +63,51 @@ index f7eb05f2..5921ee5b 100644
 -		BINARY_DIR "${CMAKE_BINARY_DIR}/linphone-app"
 -		DEPENDS ${APP_DEPENDS}
 -		BUILD_COMMAND ${CMAKE_COMMAND} --build <BINARY_DIR> --config $<CONFIG> ${PROJECT_BUILD_COMMAND}
-		INSTALL_COMMAND ${CMAKE_COMMAND} -E echo "Install step will not be done by external project"
+-		INSTALL_COMMAND ${CMAKE_COMMAND} -E echo "Install step is already done at build time."
 -		LIST_SEPARATOR | # Use the alternate list separator
 -		CMAKE_ARGS ${APP_OPTIONS} ${USER_ARGS} -DCMAKE_INSTALL_PREFIX:PATH=<INSTALL_DIR> -DCMAKE_PREFIX_PATH=${PREFIX_PATH}
 -	# ${APP_OPTIONS}
 -		BUILD_ALWAYS ON
 -	)
+-	if( ENABLE_BUILD_APP_PLUGINS)
+-		ExternalProject_Add(app-plugins PREFIX "${CMAKE_BINARY_DIR}/plugins-app"
+-			SOURCE_DIR "${CMAKE_SOURCE_DIR}/plugins"
+-			INSTALL_DIR "${APPLICATION_OUTPUT_DIR}"
+-			BINARY_DIR "${CMAKE_BINARY_DIR}/plugins-app"
+-			DEPENDS linphone-qt
+-			BUILD_COMMAND ${CMAKE_COMMAND} --build <BINARY_DIR> --config $<CONFIG> ${PROJECT_BUILD_COMMAND}
+-			INSTALL_COMMAND ${CMAKE_COMMAND} -E echo "Install step is already done at build time."
+-			LIST_SEPARATOR | # Use the alternate list separator
+-			CMAKE_ARGS ${APP_OPTIONS} ${USER_ARGS} -DCMAKE_INSTALL_PREFIX:PATH=<INSTALL_DIR> -DCMAKE_PREFIX_PATH=${PREFIX_PATH}
+-		)
+-	endif()
 -	install(CODE "message(STATUS Running install)")
 -	set(AUTO_REGENERATION auto_regeneration)
-	add_custom_target(${AUTO_REGENERATION} ALL
-		COMMAND ${CMAKE_COMMAND} ${CMAKE_CURRENT_SOURCE_DIR}
-		DEPENDS linphone-qt)
+-	if(	ENABLE_BUILD_APP_PLUGINS)
+-		add_custom_target(${AUTO_REGENERATION} ALL
+-			COMMAND ${CMAKE_COMMAND} ${CMAKE_CURRENT_SOURCE_DIR}
+-			DEPENDS app-plugins)
+-	else()
+-		add_custom_target(${AUTO_REGENERATION} ALL
+-			COMMAND ${CMAKE_COMMAND} ${CMAKE_CURRENT_SOURCE_DIR}
+-			DEPENDS linphone-qt)
+-	endif()
 -else()
 -	message("Adding Linphone Desktop in an IDE-friendly state")
 -	set(CMAKE_INSTALL_PREFIX "${APPLICATION_OUTPUT_DIR}")
 -	add_subdirectory(${CMAKE_SOURCE_DIR}/linphone-app)
-	add_dependencies(app-library ${APP_DEPENDS})
-endif()
+-	if(NOT LINPHONE_QT_ONLY)
+-		add_dependencies(app-library ${APP_DEPENDS})
+-	endif()
+-	if( ENABLE_BUILD_APP_PLUGINS)
+-		add_subdirectory(${CMAKE_SOURCE_DIR}/plugins "plugins-app")
+-	endif()
+message("Adding Linphone Desktop in an IDE-friendly state")
+set(CMAKE_INSTALL_PREFIX "${APPLICATION_OUTPUT_DIR}")
+add_subdirectory(${CMAKE_SOURCE_DIR}/linphone-app)
+if( ENABLE_BUILD_APP_PLUGINS)
+	add_subdirectory(${CMAKE_SOURCE_DIR}/plugins "plugins-app")
+ endif()
 -ExternalProject_Add(linphone-qt-only PREFIX "${CMAKE_BINARY_DIR}/linphone-app"
 -    SOURCE_DIR "${CMAKE_SOURCE_DIR}/linphone-app"
 -    INSTALL_DIR "${APPLICATION_OUTPUT_DIR}"
@ -89,11 +117,8 @@ index f7eb05f2..5921ee5b 100644
 -    LIST_SEPARATOR | # Use the alternate list separator
 -    CMAKE_ARGS ${APP_OPTIONS} ${USER_ARGS} -DCMAKE_INSTALL_PREFIX:PATH=<INSTALL_DIR> -DCMAKE_PREFIX_PATH=${PREFIX_PATH}
 -    EXCLUDE_FROM_ALL ON
-    BUILD_ALWAYS ON
+-    #BUILD_ALWAYS ON
 -)
-+message("Adding Linphone Desktop in an IDE-friendly state")
-+set(CMAKE_INSTALL_PREFIX "${APPLICATION_OUTPUT_DIR}")
-+add_subdirectory(${CMAKE_SOURCE_DIR}/linphone-app)
 diff --git a/linphone-app/cmake_builder/additional_steps.cmake b/linphone-app/cmake_builder/additional_steps.cmake
 index 7f7fd573..a69a04e8 100644
 --- a/linphone-app/cmake_builder/additional_steps.cmake
@ -114,5 +139,5 @@ index 7f7fd573..a69a04e8 100644
   endif ()
 endif ()
 -- 
-2.29.2
+2.25.1

--- a/pkgs/applications/networking/instant-messengers/linphone/no-store-path-in-autostart.patch
+++ b/pkgs/applications/networking/instant-messengers/linphone/no-store-path-in-autostart.patch
@ -0,0 +1,27 @@
+From 6a26922e5e4363de36057d635a1bf889160b2533 Mon Sep 17 00:00:00 2001
+From: Lorenz Brun <lorenz@brun.one>
+Date: Fri, 28 Jan 2022 18:44:43 +0100
+Subject: [PATCH] Do not use store path for autostart on Nix
+
+---
+ linphone-app/src/app/App.cpp | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/linphone-app/src/app/App.cpp b/linphone-app/src/app/App.cpp
+index 868f8f44..2c61c648 100644
+--- a/linphone-app/src/app/App.cpp
+++ b/linphone-app/src/app/App.cpp
+@@ -858,6 +858,10 @@ void App::setAutoStart (bool enabled) {
+ 		exec = QProcessEnvironment::systemEnvironment().value(QStringLiteral("APPIMAGE"));
+ 		qDebug() << "exec path autostart set appimage=" << exec;
+ 	}
+	else if (binPath.startsWith("/nix/store")) { // Nix/NixOS
+		exec = QStringLiteral("linphone");
+		qDebug() << "exec path autostart set nix=" << exec;
+	}
+ 	else { //classic package
+ 		exec = binPath;
+ 		qDebug() << "exec path autostart set classic package=" << exec;
+-- 
+2.25.1
+
--- a/pkgs/applications/networking/instant-messengers/linphone/remove-bc_compute_full_version-usage.patch
+++ b/pkgs/applications/networking/instant-messengers/linphone/remove-bc_compute_full_version-usage.patch
@ -1,7 +1,7 @@
-From 6fc23da651d54979e73776fcda38614e290d65dc Mon Sep 17 00:00:00 2001
+From 4849d5633b98e6d3514355436eab5ba537cbfd99 Mon Sep 17 00:00:00 2001
 From: David P <megver83@parabola.nu>
 Date: Fri, 23 Oct 2020 16:44:17 -0300
-Subject: [PATCH 2/2] remove bc_compute_full_version usage
+Subject: [PATCH] remove bc_compute_full_version usage

 ---
 linphone-app/CMakeLists.txt                           | 11 +----------
@ -10,7 +10,7 @@ Subject: [PATCH 2/2] remove bc_compute_full_version usage
 3 files changed, 2 insertions(+), 24 deletions(-)

 diff --git a/linphone-app/CMakeLists.txt b/linphone-app/CMakeLists.txt
-index 3bc9420a..27b418ee 100644
+index de7f917f..ee14ff78 100644
 --- a/linphone-app/CMakeLists.txt
 +++ b/linphone-app/CMakeLists.txt
@@ -21,17 +21,8 @@
@ -30,8 +30,8 @@ index 3bc9420a..27b418ee 100644
 -
 -project(linphoneqt VERSION "${version_major}.${version_minor}.${version_patch}")
 
+ 
 if(ENABLE_BUILD_VERBOSE)
- 	#message("CMAKE_PREFIX_PATH ${CMAKE_PREFIX_PATH}")
 diff --git a/linphone-app/build/CMakeLists.txt b/linphone-app/build/CMakeLists.txt
 index 8ef03faa..97d94bd6 100644
 --- a/linphone-app/build/CMakeLists.txt
@ -49,7 +49,7 @@ index 8ef03faa..97d94bd6 100644
 
 set(CPACK_SOURCE_PACKAGE_FILE_NAME ${CPACK_PACKAGE_FILE_NAME})
 diff --git a/linphone-app/cmake_builder/linphone_package/CMakeLists.txt b/linphone-app/cmake_builder/linphone_package/CMakeLists.txt
-index baea03cf..08ffc1b5 100644
+index ac85c68a..e6af5a66 100644
 --- a/linphone-app/cmake_builder/linphone_package/CMakeLists.txt
 +++ b/linphone-app/cmake_builder/linphone_package/CMakeLists.txt
@@ -38,15 +38,7 @@ set(LINPHONE_QML_DIR "${CMAKE_CURRENT_SOURCE_DIR}/../../ui")
@ -70,5 +70,5 @@ index baea03cf..08ffc1b5 100644
 endif ()
 string(REGEX REPLACE "([0-9.]+)-?.*" "\\1" LINPHONE_VERSION "${APP_PROJECT_VERSION}")
 -- 
-2.29.2
+2.25.1

--- a/pkgs/applications/networking/instant-messengers/signalbackup-tools/default.nix
+++ b/pkgs/applications/networking/instant-messengers/signalbackup-tools/default.nix
@ -2,13 +2,13 @@

 stdenv.mkDerivation rec {
  pname = "signalbackup-tools";
-  version = "20220411";
+  version = "20220425";

  src = fetchFromGitHub {
    owner = "bepaald";
    repo = pname;
    rev = version;
-    sha256 = "sha256-ia+8RZ1wQTyUCs+6o9AMCH4Kh2neHjPWbXWjLkDb6/w=";
+    sha256 = "sha256-FWW4rVaoShT55ZWN/siFHoTTNcarnfTa2h/J2GWxLW8=";
  };

  # Remove when Apple SDK is >= 10.13
--- a/pkgs/desktops/pantheon/services/pantheon-agent-polkit/default.nix
+++ b/pkgs/desktops/pantheon/services/pantheon-agent-polkit/default.nix
@ -15,13 +15,13 @@

 stdenv.mkDerivation rec {
  pname = "pantheon-agent-polkit";
-  version = "1.0.4";
+  version = "1.0.5";

  src = fetchFromGitHub {
    owner = "elementary";
    repo = pname;
    rev = version;
-    sha256 = "1acqjjarl225yk0f68wkldsamcrzrj0ibpcxma04wq9w7jlmz60c";
+    sha256 = "sha256-sC+Ec8a/17EfHsSRKQflBlzv9XAFjUVhjX691gIVa2A=";
  };

  nativeBuildInputs = [
--- a/pkgs/development/compilers/graalvm/community-edition/default.nix
+++ b/pkgs/development/compilers/graalvm/community-edition/default.nix
@ -12,11 +12,11 @@ let
  /*
    Looks a bit ugly but makes version update in the update script using sed
    much easier
+
+    Don't change these values! They will be updated by the update script, see ./update.nix.
  */
-  graalvm11-ce-release-version = "22.0.0.2";
-  graalvm17-ce-release-version = "22.0.0.2";
-  graalvm11-ce-dev-version = "22.2.0-dev-20220415_1945";
-  graalvm17-ce-dev-version = "22.2.0-dev-20220415_1945";
+  graalvm11-ce-release-version = "22.1.0";
+  graalvm17-ce-release-version = "22.1.0";

  products = [
    "graalvm-ce"
@ -40,7 +40,6 @@ in
      aarch64-darwin = {
        inherit products;
        arch = "darwin-aarch64";
-        version = graalvm11-ce-dev-version;
      };
      aarch64-linux = {
        inherit products;
@ -64,7 +63,6 @@ in
      aarch64-darwin = {
        inherit products;
        arch = "darwin-aarch64";
-        version = graalvm17-ce-dev-version;
      };
      aarch64-linux = {
        inherit products;
--- a/pkgs/development/compilers/graalvm/community-edition/graalvm11-ce-sources.json
+++ b/pkgs/development/compilers/graalvm/community-edition/graalvm11-ce-sources.json
@ -1,42 +1,42 @@
 {
  "darwin-aarch64": {
-    "graalvm-ce|java11|22.2.0-dev-20220415_1945": {
-      "sha256": "ab81b00177124d746a3871b6e48ce7611e93dd3b4f6dee45d77300ef214fbab8",
-      "url": "https://github.com/graalvm/graalvm-ce-dev-builds/releases/download/22.2.0-dev-20220415_1945/graalvm-ce-java11-darwin-aarch64-dev.tar.gz"
+    "graalvm-ce|java11|22.1.0": {
+      "sha256": "06bc19a0b1e93aa3df5e15c08e97f8cef624cb6070eeae40a69a51ec7fd41152",
+      "url": "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.1.0/graalvm-ce-java11-darwin-aarch64-22.1.0.tar.gz"
    },
-    "native-image-installable-svm|java11|22.2.0-dev-20220415_1945": {
-      "sha256": "9d3753736fe71f55f3fb3bcbdf43271dd96dda0c4b731d11f3f890d5bddf3bbb",
-      "url": "https://github.com/graalvm/graalvm-ce-dev-builds/releases/download/22.2.0-dev-20220415_1945/native-image-installable-svm-java11-darwin-aarch64-dev.jar"
+    "native-image-installable-svm|java11|22.1.0": {
+      "sha256": "21f84ccf7b979dccc9091032fe76b5737b38e0092f282107cef75143dadb3bdb",
+      "url": "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.1.0/native-image-installable-svm-java11-darwin-aarch64-22.1.0.jar"
    }
  },
  "darwin-amd64": {
-    "graalvm-ce|java11|22.0.0.2": {
-      "sha256": "8280159b8a66c51a839c8079d885928a7f759d5da0632f3af7300df2b63a6323",
-      "url": "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.0.0.2/graalvm-ce-java11-darwin-amd64-22.0.0.2.tar.gz"
+    "graalvm-ce|java11|22.1.0": {
+      "sha256": "c4c9df94ca47b83b582758b87d39042732ba0193fc63f1ab93f6818005a1fe6b",
+      "url": "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.1.0/graalvm-ce-java11-darwin-amd64-22.1.0.tar.gz"
    },
-    "native-image-installable-svm|java11|22.0.0.2": {
-      "sha256": "03c27de6cce61ee8073e89252212457f3fbac2c0bc9bfa4acbff12176476c176",
-      "url": "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.0.0.2/native-image-installable-svm-java11-darwin-amd64-22.0.0.2.jar"
+    "native-image-installable-svm|java11|22.1.0": {
+      "sha256": "e0758687f4bd46f15fcee9b0a5bdd65d702ec81c41d465ee7229d3f4465bcf13",
+      "url": "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.1.0/native-image-installable-svm-java11-darwin-amd64-22.1.0.jar"
    }
  },
  "linux-aarch64": {
-    "graalvm-ce|java11|22.0.0.2": {
-      "sha256": "1cc0263d95f642dada4e290dca7f49c0456cefa7b690b67e3e5c159b537b2c58",
-      "url": "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.0.0.2/graalvm-ce-java11-linux-aarch64-22.0.0.2.tar.gz"
+    "graalvm-ce|java11|22.1.0": {
+      "sha256": "050a4d471247d91935f7f485e92d678f0163e1d6209e26e8fe75d7c924f73e71",
+      "url": "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.1.0/graalvm-ce-java11-linux-aarch64-22.1.0.tar.gz"
    },
-    "native-image-installable-svm|java11|22.0.0.2": {
-      "sha256": "51d41e890a5aabf8e7b9d4f4e0f88206ee70a261f7dbb0315d51770ab8f3009e",
-      "url": "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.0.0.2/native-image-installable-svm-java11-linux-aarch64-22.0.0.2.jar"
+    "native-image-installable-svm|java11|22.1.0": {
+      "sha256": "12715793b223ce1db7ec7d0a339f0b578a0c9fb6dcc6607044e5af4fd33b25a7",
+      "url": "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.1.0/native-image-installable-svm-java11-linux-aarch64-22.1.0.jar"
    }
  },
  "linux-amd64": {
-    "graalvm-ce|java11|22.0.0.2": {
-      "sha256": "bc86083bb7e2778c7e4fe4f55d74790e42255b96f7806a7fefa51d06f3bc7103",
-      "url": "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.0.0.2/graalvm-ce-java11-linux-amd64-22.0.0.2.tar.gz"
+    "graalvm-ce|java11|22.1.0": {
+      "sha256": "78c628707007bb97b09562932ee16f50beb1c3fa4a36e4311a0465a4a718e683",
+      "url": "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.1.0/graalvm-ce-java11-linux-amd64-22.1.0.tar.gz"
    },
-    "native-image-installable-svm|java11|22.0.0.2": {
-      "sha256": "8504a3441f5b28b8fd625f676674a9216f082ae63a4e30d43930c80f9672e71d",
-      "url": "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.0.0.2/native-image-installable-svm-java11-linux-amd64-22.0.0.2.jar"
+    "native-image-installable-svm|java11|22.1.0": {
+      "sha256": "36e4a2a9a73a19b03883f9e783bc8bde7c214bb0fa4b617379cb81798de425bf",
+      "url": "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.1.0/native-image-installable-svm-java11-linux-amd64-22.1.0.jar"
    }
  }
 }
--- a/pkgs/development/compilers/graalvm/community-edition/graalvm17-ce-sources.json
+++ b/pkgs/development/compilers/graalvm/community-edition/graalvm17-ce-sources.json
@ -1,42 +1,42 @@
 {
  "darwin-aarch64": {
-    "graalvm-ce|java17|22.2.0-dev-20220415_1945": {
-      "sha256": "1dbb0e0b9c85391ea6f1a0bd95ae252a396152d83e3a0e79cffd988144259e68",
-      "url": "https://github.com/graalvm/graalvm-ce-dev-builds/releases/download/22.2.0-dev-20220415_1945/graalvm-ce-java17-darwin-aarch64-dev.tar.gz"
+    "graalvm-ce|java17|22.1.0": {
+      "sha256": "06075cd390bd261721392cd6fd967b1d28c0500d1b5625272ea906038e5cd533",
+      "url": "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.1.0/graalvm-ce-java17-darwin-aarch64-22.1.0.tar.gz"
    },
-    "native-image-installable-svm|java17|22.2.0-dev-20220415_1945": {
-      "sha256": "029499c011ceb1a4560957db651805325a201488b5f0b7467f007c7385d004e2",
-      "url": "https://github.com/graalvm/graalvm-ce-dev-builds/releases/download/22.2.0-dev-20220415_1945/native-image-installable-svm-java17-darwin-aarch64-dev.jar"
+    "native-image-installable-svm|java17|22.1.0": {
+      "sha256": "beabecdd5b87e7536772d4dfe70abf4c5dd9847e87615464cf309138d21c39af",
+      "url": "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.1.0/native-image-installable-svm-java17-darwin-aarch64-22.1.0.jar"
    }
  },
  "darwin-amd64": {
-    "graalvm-ce|java17|22.0.0.2": {
-      "sha256": "d54af9d1f4d0d351827395a714ed84d2489b023b74a9c13a431cc9d31d1e8f9a",
-      "url": "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.0.0.2/graalvm-ce-java17-darwin-amd64-22.0.0.2.tar.gz"
+    "graalvm-ce|java17|22.1.0": {
+      "sha256": "b9327fa73531a822d9a27d25980396353869eefbd73fdcef89b4fceb9f529c75",
+      "url": "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.1.0/graalvm-ce-java17-darwin-amd64-22.1.0.tar.gz"
    },
-    "native-image-installable-svm|java17|22.0.0.2": {
-      "sha256": "007fa742cd139d447f83d776b6d78e717c9df11d56a61061a5937547c20028b7",
-      "url": "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.0.0.2/native-image-installable-svm-java17-darwin-amd64-22.0.0.2.jar"
+    "native-image-installable-svm|java17|22.1.0": {
+      "sha256": "e6bfe208bb28cd1d98da55e00fa705890a7f69286b919947b07d18cc9bb9c270",
+      "url": "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.1.0/native-image-installable-svm-java17-darwin-amd64-22.1.0.jar"
    }
  },
  "linux-aarch64": {
-    "graalvm-ce|java17|22.0.0.2": {
-      "sha256": "c7d78387d2a144944f26773697c1b61d3478a081a1c5e7fc20f47f1f5f3c82c7",
-      "url": "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.0.0.2/graalvm-ce-java17-linux-aarch64-22.0.0.2.tar.gz"
+    "graalvm-ce|java17|22.1.0": {
+      "sha256": "05128e361ed44beebc89495faaa504b0b975bf93aa5e512e217b3cf5e42dfada",
+      "url": "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.1.0/graalvm-ce-java17-linux-aarch64-22.1.0.tar.gz"
    },
-    "native-image-installable-svm|java17|22.0.0.2": {
-      "sha256": "798947d0a93988929d2b8e3555f7c65225e789124cd99fbc0c3aae5f350175db",
-      "url": "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.0.0.2/native-image-installable-svm-java17-linux-aarch64-22.0.0.2.jar"
+    "native-image-installable-svm|java17|22.1.0": {
+      "sha256": "6e10f6953ec8b9509c7a7d0194d57f265cf2a05dcb8f3272a6a8e847bda49cda",
+      "url": "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.1.0/native-image-installable-svm-java17-linux-aarch64-22.1.0.jar"
    }
  },
  "linux-amd64": {
-    "graalvm-ce|java17|22.0.0.2": {
-      "sha256": "4f743e0ed3d974b7d619ca2ed6014554e8c12e5ebbb38b9bc9e820b182169bd4",
-      "url": "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.0.0.2/graalvm-ce-java17-linux-amd64-22.0.0.2.tar.gz"
+    "graalvm-ce|java17|22.1.0": {
+      "sha256": "f11d46098efbf78465a875c502028767e3de410a31e45d92a9c5cf5046f42aa2",
+      "url": "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.1.0/graalvm-ce-java17-linux-amd64-22.1.0.tar.gz"
    },
-    "native-image-installable-svm|java17|22.0.0.2": {
-      "sha256": "8c25f650d58c2649c97061cb806dfaec9e685d5d2b80afc7cf72fe61d6891831",
-      "url": "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.0.0.2/native-image-installable-svm-java17-linux-amd64-22.0.0.2.jar"
+    "native-image-installable-svm|java17|22.1.0": {
+      "sha256": "d81eecea15ebbf4f24850860c14104eaf6f8ae74574330e22afac533b8f96738",
+      "url": "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.1.0/native-image-installable-svm-java17-linux-amd64-22.1.0.jar"
    }
  }
 }
--- a/pkgs/development/compilers/graalvm/community-edition/update.nix
+++ b/pkgs/development/compilers/graalvm/community-edition/update.nix
@ -53,6 +53,7 @@ let
  getArchString = nixArchString:
    {
      "aarch64-linux" = "linux-aarch64";
+      "aarch64-darwin" = "darwin-aarch64";
      "x86_64-linux" = "linux-amd64";
      "x86_64-darwin" = "darwin-amd64";
    }.${nixArchString};
--- a/pkgs/development/libraries/bc-decaf/default.nix
+++ b/pkgs/development/libraries/bc-decaf/default.nix
@ -0,0 +1,36 @@
+{ cmake
+, fetchFromGitLab
+, lib
+, python3
+, stdenv
+}:
+
+stdenv.mkDerivation rec {
+  pname = "bc-decaf";
+  version = "linphone-4.4.1";
+
+  nativeBuildInputs = [ cmake ];
+  buildInputs = [
+    python3
+  ];
+
+  src = fetchFromGitLab {
+    domain = "gitlab.linphone.org";
+    group = "BC";
+    owner = "public/external";
+    repo = "decaf";
+    rev = "6e78a9beb24d1e3d7050dd52a65e4f88b101a1fc";
+    sha256 = "sha256-D2SzkinloL0Ya9p25YUsc+7lKvoTMUsdkKrkv/5AEeY=";
+  };
+
+  # Do not build static libraries and do not enable -Werror
+  cmakeFlags = [ "-DENABLE_STATIC=NO" "-DENABLE_STRICT=NO" ];
+
+  meta = with lib; {
+    description = "Elliptic curve library supporting Ed448-Goldilocks and Curve25519. Belledonne Communications' fork for Linphone.";
+    homepage = "https://gitlab.linphone.org/BC/public/bctoolbox";
+    license = licenses.mit;
+    maintainers = with maintainers; [ thibaultlemaire ];
+    platforms = platforms.linux;
+  };
+}
--- a/pkgs/development/libraries/bctoolbox/default.nix
+++ b/pkgs/development/libraries/bctoolbox/default.nix
@ -1,16 +1,28 @@
 { bcunit
 , cmake
+, bc-decaf
 , fetchFromGitLab
 , mbedtls
-, lib, stdenv
+, lib
+, stdenv
 }:

 stdenv.mkDerivation rec {
  pname = "bctoolbox";
  version = "5.1.17";

-  nativeBuildInputs = [ cmake ];
-  buildInputs = [ mbedtls bcunit ];
+  nativeBuildInputs = [
+    cmake
+  ];
+  buildInputs = [
+    # Made by BC
+    bcunit
+
+    # Vendored by BC
+    bc-decaf
+
+    mbedtls
+  ];

  src = fetchFromGitLab {
    domain = "gitlab.linphone.org";
@ -22,9 +34,7 @@ stdenv.mkDerivation rec {
  };

  # Do not build static libraries
-  cmakeFlags = [ "-DENABLE_STATIC=NO" ];
-
-  NIX_CFLAGS_COMPILE = [ "-Wno-error=stringop-truncation" ];
+  cmakeFlags = [ "-DENABLE_STATIC=NO" "-DENABLE_STRICT=NO" ];

  strictDeps = true;

--- a/pkgs/development/libraries/belcard/default.nix
+++ b/pkgs/development/libraries/belcard/default.nix
@ -2,12 +2,13 @@
 , belr
 , cmake
 , fetchFromGitLab
-, lib, stdenv
+, lib
+, stdenv
 }:

 stdenv.mkDerivation rec {
  pname = "belcard";
-  version = "5.1.10";
+  version = "5.1.12";

  src = fetchFromGitLab {
    domain = "gitlab.linphone.org";
@ -25,7 +26,7 @@ stdenv.mkDerivation rec {
  cmakeFlags = [ "-DENABLE_STATIC=NO" ];

  meta = with lib; {
-    description = "C++ library to manipulate VCard standard format";
+    description = "C++ library to manipulate VCard standard format. Part of the Linphone project.";
    homepage = "https://gitlab.linphone.org/BC/public/belcard";
    license = licenses.gpl3Plus;
    platforms = platforms.all;
--- a/pkgs/development/libraries/belle-sip/default.nix
+++ b/pkgs/development/libraries/belle-sip/default.nix
@ -1,5 +1,5 @@
-{ antlr3_4
-, bctoolbox
+{ bctoolbox
+, belr
 , cmake
 , fetchFromGitLab
 , lib
@ -11,18 +11,18 @@

 stdenv.mkDerivation rec {
  pname = "belle-sip";
-  version = "4.5.14";
+  version = "linphone-4.4.1";

  src = fetchFromGitLab {
    domain = "gitlab.linphone.org";
    owner = "public";
    group = "BC";
    repo = pname;
-    rev = version;
-    sha256 = "sha256-L6dhgBJrzYgBuMNd2eMZJCqB/GIZjKipfn1SffxBFWw=";
+    rev = "44d5977570280763ee1fecdb920736715bad58a3";
+    sha256 = "sha256-w++v3YlDZfpCHAbUQA/RftjRNGkz9J/zYoxZqRgtvnA=";
  };

-  nativeBuildInputs = [ antlr3_4 cmake ];
+  nativeBuildInputs = [ cmake ];

  buildInputs = [ zlib ];

@ -36,11 +36,11 @@ stdenv.mkDerivation rec {
    "-Wno-error=stringop-overflow"
  ];

-  propagatedBuildInputs = [ libantlr3c mbedtls bctoolbox ];
+  propagatedBuildInputs = [ libantlr3c mbedtls bctoolbox belr ];

  meta = with lib; {
    homepage = "https://linphone.org/technical-corner/belle-sip";
-    description = "Modern library implementing SIP (RFC 3261) transport, transaction and dialog layers";
+    description = "Modern library implementing SIP (RFC 3261) transport, transaction and dialog layers. Part of the Linphone project.";
    license = licenses.gpl3Plus;
    platforms = platforms.all;
    maintainers = with maintainers; [ jluttine ];
--- a/pkgs/development/libraries/belr/default.nix
+++ b/pkgs/development/libraries/belr/default.nix
@ -1,12 +1,13 @@
 { bctoolbox
 , cmake
 , fetchFromGitLab
-, lib, stdenv
+, lib
+, stdenv
 }:

 stdenv.mkDerivation rec {
  pname = "belr";
-  version = "5.1.3";
+  version = "5.1.12";

  src = fetchFromGitLab {
    domain = "gitlab.linphone.org";
@ -24,7 +25,7 @@ stdenv.mkDerivation rec {
  cmakeFlags = [ "-DENABLE_STATIC=NO" ];

  meta = with lib; {
-    description = "Belledonne Communications' language recognition library";
+    description = "Belledonne Communications' language recognition library. Part of the Linphone project.";
    homepage = "https://gitlab.linphone.org/BC/public/belr";
    license = licenses.gpl3Plus;
    platforms = platforms.all;
--- a/pkgs/development/libraries/bzrtp/default.nix
+++ b/pkgs/development/libraries/bzrtp/default.nix
@ -2,12 +2,13 @@
 , cmake
 , fetchFromGitLab
 , sqlite
-, lib, stdenv
+, lib
+, stdenv
 }:

 stdenv.mkDerivation rec {
  pname = "bzrtp";
-  version = "5.1.0";
+  version = "5.1.12";

  src = fetchFromGitLab {
    domain = "gitlab.linphone.org";
@ -22,12 +23,10 @@ stdenv.mkDerivation rec {
  nativeBuildInputs = [ cmake ];

  # Do not build static libraries
-  cmakeFlags = [ "-DENABLE_STATIC=NO" ];
-
-  NIX_CFLAGS_COMPILE = "-Wno-error=cast-function-type";
+  cmakeFlags = [ "-DENABLE_STATIC=NO" "-DCMAKE_C_FLAGS=-Wno-error=cast-function-type" ];

  meta = with lib; {
-    description = "An opensource implementation of ZRTP keys exchange protocol";
+    description = "An opensource implementation of ZRTP keys exchange protocol. Part of the Linphone project.";
    homepage = "https://gitlab.linphone.org/BC/public/bzrtp";
    license = licenses.gpl3Plus;
    platforms = platforms.all;
--- a/pkgs/development/libraries/liblinphone/default.nix
+++ b/pkgs/development/libraries/liblinphone/default.nix
@ -16,6 +16,7 @@
 , graphviz
 , gtk2
 , intltool
+, jsoncpp
 , libexosip
 , libmatroska
 , libnotify
@ -34,11 +35,12 @@
 , pkg-config
 , python3
 , readline
-, soci
+, bc-soci
 , boost
 , speex
 , sqlite
-, lib, stdenv
+, lib
+, stdenv
 , udev
 , xercesc
 , xsd
@ -47,7 +49,7 @@

 stdenv.mkDerivation rec {
  pname = "liblinphone";
-  version = "4.5.17";
+  version = "5.1.22";

  src = fetchFromGitLab {
    domain = "gitlab.linphone.org";
@ -55,9 +57,11 @@ stdenv.mkDerivation rec {
    group = "BC";
    repo = pname;
    rev = version;
-    sha256 = "sha256-ryyT4bG3lnE72ydvCAoiT3IeHY4mZwX9nCqaTRC1wyc=";
+    sha256 = "sha256-hTyp/fUA1+7J1MtqX33kH8Vn1XNjx51Wy5REvrpdJTY=";
  };

+  patches = [ ./use-normal-jsoncpp.patch ];
+
  # Do not build static libraries
  cmakeFlags = [ "-DENABLE_STATIC=NO" ];

@ -66,12 +70,24 @@ stdenv.mkDerivation rec {
  # of them might not be needed for liblinphone alone.
  buildInputs = [
    (python3.withPackages (ps: [ ps.pystache ps.six ]))
+
+    # Made by BC
    bcg729
    bctoolbox
    belcard
    belle-sip
    belr
    bzrtp
+    lime
+    mediastreamer
+    ortp
+
+    # Vendored by BC
+    bc-soci
+
+    # Vendored by BC but we use upstream, might cause problems
+    libmatroska
+
    cairo
    cyrus_sasl
    ffmpeg
@ -80,20 +96,15 @@ stdenv.mkDerivation rec {
    gtk2
    libX11
    libexosip
-    libmatroska
    libnotify
    libosip
    libsoup
    libupnp
    libxml2
-    lime
    mbedtls
-    mediastreamer
    openldap
-    ortp
    pango
    readline
-    soci
    boost
    speex
    sqlite
@ -101,10 +112,13 @@ stdenv.mkDerivation rec {
    xercesc
    xsd
    zlib
+    jsoncpp
  ];

  nativeBuildInputs = [
+    # Made by BC
    bcunit
+
    cmake
    doxygen
    graphviz
--- a/pkgs/development/libraries/liblinphone/use-normal-jsoncpp.patch
+++ b/pkgs/development/libraries/liblinphone/use-normal-jsoncpp.patch
@ -0,0 +1,57 @@
+From ea6901c9ed0f804bd2d6d09e514610518c2f4f09 Mon Sep 17 00:00:00 2001
+From: Lorenz Brun <lorenz@brun.one>
+Date: Fri, 18 Mar 2022 17:36:22 +0100
+Subject: [PATCH] Use normal jsoncpp
+
+---
+ src/CMakeLists.txt    | 6 +++---
+ tester/CMakeLists.txt | 2 +-
+ 2 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index 5cd87fe9a..822b2151e 100644
+--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
+@@ -34,7 +34,7 @@ if (ENABLE_FLEXIAPI)
+ 	if (XCODE)
+ 		list(APPEND LINK_LIBS jsoncpp_static)
+ 	else()
+-		list(APPEND LINK_LIBS jsoncpp_object)
+		list(APPEND LINK_LIBS jsoncpp)
+ 	endif()
+ endif()
+ 
+@@ -592,7 +592,7 @@ if(ENABLE_STATIC)
+ 		if (XCODE)
+ 			target_link_libraries(linphone PRIVATE jsoncpp_static)
+ 		else()
+-			target_link_libraries(linphone PRIVATE jsoncpp_object)
+			target_link_libraries(linphone PRIVATE jsoncpp)
+ 		endif()
+ 	endif()
+ 
+@@ -646,7 +646,7 @@ if(ENABLE_SHARED)
+ 		if (XCODE)
+ 			target_link_libraries(linphone PRIVATE jsoncpp_static)
+ 		else()
+-			target_link_libraries(linphone PRIVATE jsoncpp_object)
+			target_link_libraries(linphone PRIVATE jsoncpp)
+ 		endif()
+ 	endif()
+ 
+diff --git a/tester/CMakeLists.txt b/tester/CMakeLists.txt
+index b97042678..b4c5a5794 100644
+--- a/tester/CMakeLists.txt
+++ b/tester/CMakeLists.txt
+@@ -34,7 +34,7 @@ if (ENABLE_FLEXIAPI)
+ 	if (XCODE)
+ 		list(APPEND OTHER_LIBS_FOR_TESTER jsoncpp_static)
+ 	else()
+-		list(APPEND OTHER_LIBS_FOR_TESTER jsoncpp_object)
+		list(APPEND OTHER_LIBS_FOR_TESTER jsoncpp)
+ 	endif()
+ endif()
+ 
+-- 
+2.25.1
+
--- a/pkgs/development/libraries/lime/default.nix
+++ b/pkgs/development/libraries/lime/default.nix
@ -3,7 +3,7 @@
 , cmake
 , fetchFromGitLab
 , lib
-, soci
+, bc-soci
 , sqlite
 , boost
 , stdenv
@ -11,7 +11,7 @@

 stdenv.mkDerivation rec {
  pname = "lime";
-  version = "5.0.53";
+  version = "5.1.12";

  src = fetchFromGitLab {
    domain = "gitlab.linphone.org";
@ -19,17 +19,27 @@ stdenv.mkDerivation rec {
    group = "BC";
    repo = pname;
    rev = version;
-    sha256 = "sha256-M+KdauIVsN3c+cEPw4CaMzXnQZwAPNXeJCriuk9NCWM=";
+    sha256 = "sha256-vgaxb8sfgtAhqG8kg3C4+UrTOHyTVR9QVO9iuKFgSBk=";
  };

-  buildInputs = [ bctoolbox soci belle-sip sqlite boost ];
+  buildInputs = [
+    # Made by BC
+    bctoolbox
+    belle-sip
+
+    # Vendored by BC
+    bc-soci
+
+    sqlite
+    boost
+  ];
  nativeBuildInputs = [ cmake ];

  # Do not build static libraries
  cmakeFlags = [ "-DENABLE_STATIC=NO" ];

  meta = with lib; {
-    description = "End-to-end encryption library for instant messaging";
+    description = "End-to-end encryption library for instant messaging. Part of the Linphone project.";
    homepage = "http://www.linphone.org/technical-corner/lime";
    license = licenses.gpl3Only;
    platforms = platforms.all;
--- a/pkgs/development/libraries/mediastreamer/default.nix
+++ b/pkgs/development/libraries/mediastreamer/default.nix
@ -25,6 +25,8 @@
 , ortp
 , pkg-config
 , python3
+, qtbase
+, qtdeclarative
 , SDL
 , speex
 , srtp
@ -33,7 +35,9 @@

 stdenv.mkDerivation rec {
  pname = "mediastreamer2";
-  version = "4.5.15";
+  version = "5.1.20";
+
+  dontWrapQtApps = true;

  src = fetchFromGitLab {
    domain = "gitlab.linphone.org";
@ -41,7 +45,7 @@ stdenv.mkDerivation rec {
    group = "BC";
    repo = pname;
    rev = version;
-    sha256 = "sha256-n/EuXEQ9nJKC32PMvWkfP1G+E6uQQuu1/A168n8/cIY=";
+    sha256 = "sha256-u8YqF5BzyYIF9+XB90Eu6DlwXuu1FDOJUzxebj0errU=";
  };

  patches = [
@ -59,12 +63,20 @@ stdenv.mkDerivation rec {
    intltool
    pkg-config
    python3
+    qtbase
+    qtdeclarative
  ];

  propagatedBuildInputs = [
-    alsa-lib
+    # Made by BC
    bctoolbox
    bzrtp
+    ortp
+
+    # Vendored by BC but we use upstream, might cause problems
+    libmatroska
+
+    alsa-lib
    ffmpeg
    glew
    gsm
@ -73,7 +85,6 @@ stdenv.mkDerivation rec {
    libX11
    libXext
    libXv
-    libmatroska
    libopus
    libpcap
    libpulseaudio
@ -81,7 +92,6 @@ stdenv.mkDerivation rec {
    libupnp
    libv4l
    libvpx
-    ortp
    SDL
    speex
    srtp
@ -89,22 +99,17 @@ stdenv.mkDerivation rec {

  strictDeps = true;

-  # Do not build static libraries
-  cmakeFlags = [ "-DENABLE_STATIC=NO" ];
-
-  NIX_CFLAGS_COMPILE = [
-    "-DGIT_VERSION=\"v${version}\""
-    "-Wno-error=deprecated-declarations"
-    "-Wno-error=cast-function-type"
-    "-Wno-error=stringop-truncation"
-    "-Wno-error=stringop-overflow"
-  ] ++ lib.optionals (stdenv.cc.isGNU && lib.versionAtLeast stdenv.cc.version "11") [
-    "-Wno-error=stringop-overread"
+  cmakeFlags = [
+    "-DENABLE_STATIC=NO" # Do not build static libraries
+    "-DENABLE_QT_GL=ON" # Build necessary MSQOGL plugin for Linphone desktop
+    "-DCMAKE_C_FLAGS=-DGIT_VERSION=\"v${version}\""
+    "-DENABLE_STRICT=NO" # Disable -Werror
  ];
+
  NIX_LDFLAGS = "-lXext";

  meta = with lib; {
-    description = "A powerful and lightweight streaming engine specialized for voice/video telephony applications";
+    description = "A powerful and lightweight streaming engine specialized for voice/video telephony applications. Part of the Linphone project";
    homepage = "http://www.linphone.org/technical-corner/mediastreamer2";
    license = licenses.gpl3Only;
    platforms = platforms.linux;
--- a/pkgs/development/libraries/mediastreamer/msopenh264.nix
+++ b/pkgs/development/libraries/mediastreamer/msopenh264.nix
@ -5,22 +5,21 @@
 , mediastreamer
 , openh264
 , pkg-config
-, lib, stdenv
+, lib
+, stdenv
 }:

 stdenv.mkDerivation rec {
  pname = "msopenh264";
-  # Using master branch for linphone-desktop caused a chain reaction that many
-  # of its dependencies needed to use master branch too.
-  version = "unstable-2020-03-03";
+  version = "linphone-4.4.1";

  src = fetchFromGitLab {
    domain = "gitlab.linphone.org";
    owner = "public";
    group = "BC";
    repo = pname;
-    rev = "2c3abf52824ad23a4caae7565ef158ef91767704";
-    sha256 = "140hs5lzpshzswvl39klcypankq3v2qck41696j22my7s4wsa0hr";
+    rev = "5603a432be2ed10f5d5a5ce068ef83ab2a996d6b";
+    sha256 = "sha256-AqZ7tsNZw2Djgyo1JBJbT/c3eQVyEn6r3CT6DQLD/B8=";
  };

  nativeBuildInputs = [ autoreconfHook cmake pkg-config ];
@ -40,7 +39,7 @@ stdenv.mkDerivation rec {
  '';

  meta = with lib; {
-    description = "H.264 encoder/decoder plugin for mediastreamer2";
+    description = "H.264 encoder/decoder plugin for mediastreamer2. Part of the Linphone project.";
    homepage = "https://www.linphone.org/technical-corner/mediastreamer2";
    license = licenses.gpl2;
    platforms = platforms.linux;
--- a/pkgs/development/libraries/ortp/default.nix
+++ b/pkgs/development/libraries/ortp/default.nix
@ -1,12 +1,13 @@
 { bctoolbox
 , cmake
 , fetchFromGitLab
-, lib, stdenv
+, lib
+, stdenv
 }:

 stdenv.mkDerivation rec {
  pname = "ortp";
-  version = "4.5.1";
+  version = "5.1.12";

  src = fetchFromGitLab {
    domain = "gitlab.linphone.org";
@ -14,7 +15,7 @@ stdenv.mkDerivation rec {
    group = "BC";
    repo = pname;
    rev = version;
-    sha256 = "1lc1j7wvkyp5lhcflq3h5y7n8aiwgwj84ffm81ggbsmavamgwkk7";
+    sha256 = "sha256-CD9xn1m6zpUEC+shmNeWfGAJxNto87UbznD+TLdeuEg=";
  };

  # Do not build static libraries
@ -26,7 +27,7 @@ stdenv.mkDerivation rec {
  nativeBuildInputs = [ cmake ];

  meta = with lib; {
-    description = "A Real-Time Transport Protocol (RFC3550) stack";
+    description = "A Real-Time Transport Protocol (RFC3550) stack. Part of the Linphone project.";
    homepage = "https://linphone.org/technical-corner/ortp";
    license = licenses.gpl3Plus;
    platforms = platforms.all;
--- a/pkgs/development/libraries/skalibs/default.nix
+++ b/pkgs/development/libraries/skalibs/default.nix
@ -4,8 +4,8 @@ with skawarePackages;

 buildPackage {
  pname = "skalibs";
-  version = "2.11.1.0";
-  sha256 = "1fga2kmzcp2llqv5nzrmgm33p1jz7y9pnaghzbxf8ldnsns800a0";
+  version = "2.11.2.0";
+  sha256 = "sha256-ZJzzI2/jED9FNmthlrG80EV8nBfKhvK4AAdpaiuqe3c=";

  description = "A set of general-purpose C programming libraries";

--- a/pkgs/development/libraries/soci/bc-soci.nix
+++ b/pkgs/development/libraries/soci/bc-soci.nix
@ -0,0 +1,53 @@
+{ cmake
+, fetchFromGitLab
+, fetchpatch
+, sqlite
+, boost
+, lib
+, stdenv
+}:
+
+stdenv.mkDerivation rec {
+  pname = "bc-soci";
+  version = "linphone-4.4.1";
+
+  src = fetchFromGitLab {
+    domain = "gitlab.linphone.org";
+    group = "BC";
+    owner = "public/external";
+    repo = "soci";
+    rev = "bc8ce0c5628dd48eca6ef5ce0a0a2f52547d88b6";
+    sha256 = "sha256-qo26aYp/G2C6UkGA1qkHQwTKD5go7TQ9JWxb9xtbe6M=";
+  };
+
+  patches = [
+    (fetchpatch {
+      name = "fix-backend-search-path.patch";
+      url = "https://github.com/SOCI/soci/commit/56c93afc467bdba8ffbe68739eea76059ea62f7a.patch";
+      sha256 = "sha256-nC/39pn3Cv5e65GgIfF3l64/AbCsfZHPUPIWETZFZAY=";
+    })
+  ];
+
+  cmakeFlags = [
+    # Do not build static libraries
+    "-DSOCI_SHARED=YES"
+    "-DSOCI_STATIC=OFF"
+
+    "-DSOCI_TESTS=NO"
+    "-DWITH_SQLITE3=YES"
+  ];
+
+  nativeBuildInputs = [ cmake ];
+  buildInputs = [
+    sqlite
+    boost
+  ];
+
+  meta = with lib; {
+    description = "Database access library for C++. Belledonne Communications' fork for Linphone.";
+    homepage = "https://gitlab.linphone.org/BC/public/external/soci";
+    license = licenses.boost;
+    platforms = platforms.all;
+    maintainers = with maintainers; [ thibaultlemaire ];
+  };
+}
--- a/pkgs/development/libraries/utmps/default.nix
+++ b/pkgs/development/libraries/utmps/default.nix
@ -4,8 +4,8 @@ with skawarePackages;

 buildPackage {
  pname = "utmps";
-  version = "0.1.1.0";
-  sha256 = "0vsx5b99fwmp05l4wsw744gg79hbfb4wlzyfip3k0g76fcs49nil";
+  version = "0.1.2.0";
+  sha256 = "sha256-kCXZYbgnGg7MjutXhhJra3mTdq+m8r0lwPhy/STxEjw=";

  description = "A secure utmpx and wtmp implementation";

--- a/pkgs/development/libraries/vulkan-loader/default.nix
+++ b/pkgs/development/libraries/vulkan-loader/default.nix
@ -13,6 +13,8 @@ stdenv.mkDerivation rec {
      sha256 = "sha256-NQu98wA7UK231rpoKDs1yQ6pEyB4wZg7MjFC3JwS2BY=";
    });

+  patches = [ ./fix-pkgconfig.patch ];
+
  nativeBuildInputs = [ cmake pkg-config ];
  buildInputs = [ vulkan-headers ]
    ++ lib.optionals (!stdenv.isDarwin) [ libX11 libxcb libXrandr wayland ];
--- a/pkgs/development/libraries/vulkan-loader/fix-pkgconfig.patch
+++ b/pkgs/development/libraries/vulkan-loader/fix-pkgconfig.patch
@ -0,0 +1,14 @@
+diff --git a/loader/vulkan.pc.in b/loader/vulkan.pc.in
+index 153815577..584b15273 100644
+--- a/loader/vulkan.pc.in
+++ b/loader/vulkan.pc.in
+@@ -1,7 +1,5 @@
+-prefix=@CMAKE_INSTALL_PREFIX@
+-exec_prefix=${prefix}
+-libdir=${exec_prefix}/@CMAKE_INSTALL_LIBDIR@
+-includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@
+libdir=@CMAKE_INSTALL_LIBDIR@
+includedir=@CMAKE_INSTALL_INCLUDEDIR@
+ 
+ Name: @CMAKE_PROJECT_NAME@
+ Description: Vulkan Loader
--- a/pkgs/development/python-modules/aiolifx/default.nix
+++ b/pkgs/development/python-modules/aiolifx/default.nix
@ -8,14 +8,14 @@

 buildPythonPackage rec {
  pname = "aiolifx";
-  version = "0.8.0";
+  version = "0.8.1";
  format = "setuptools";

  disabled = pythonOlder "3.7";

  src = fetchPypi {
    inherit pname version;
-    hash = "sha256-7XwtTALfEFAI2Rl3JcVcncIZBTFNuXyyclpJj5jHyEU=";
+    hash = "sha256-w6d2qpU8jPrE2Dtuq4825qOCU1SoIpkEjOEX+BYxhuU=";
  };

  propagatedBuildInputs = [
--- a/pkgs/development/python-modules/aioslimproto/default.nix
+++ b/pkgs/development/python-modules/aioslimproto/default.nix
@ -0,0 +1,34 @@
+{ lib
+, buildPythonPackage
+, fetchFromGitHub
+, pythonOlder
+}:
+
+buildPythonPackage rec {
+  pname = "aioslimproto";
+  version = "1.0.1";
+  format = "setuptools";
+
+  disabled = pythonOlder "3.9";
+
+  src = fetchFromGitHub {
+    owner = "home-assistant-libs";
+    repo = pname;
+    rev = version;
+    hash = "sha256-kR2PG2eivBfqu67hXr8/RRvo5EzI75e8NmG15NPGo1E=";
+  };
+
+  # Module has no tests
+  doCheck = false;
+
+  pythonImportsCheck = [
+    "aioslimproto"
+  ];
+
+  meta = with lib; {
+    description = "Module to control Squeezebox players";
+    homepage = "https://github.com/home-assistant-libs/aioslimproto";
+    license = with licenses; [ asl20 ];
+    maintainers = with maintainers; [ fab ];
+  };
+}
--- a/pkgs/development/python-modules/av/default.nix
+++ b/pkgs/development/python-modules/av/default.nix
@ -18,15 +18,16 @@

 buildPythonPackage rec {
  pname = "av";
-  version = "9.1.1";
+  version = "9.2.0";
  format = "pyproject";
+
  disabled = pythonOlder "3.7";

  src = fetchFromGitHub {
    owner = "mikeboers";
    repo = "PyAV";
    rev = "v${version}";
-    hash = "sha256-/6C5GE9zANPy0xaptu/+pIupOLDra/R7TJ41YLGszUs=";
+    hash = "sha256-I7j+EzpvgKCNY8TbcaHsaWtetyvmno6YYhQTer2+Ds0=";
  };

  nativeBuildInputs = [
@ -100,6 +101,11 @@ buildPythonPackage rec {
    "--deselect=tests/test_videoframe.py::TestVideoFrameImage::test_roundtrip"
  ];

+  disabledTests = [
+    # urlopen fails during DNS resolution
+    "test_writing_to_custom_io"
+  ];
+
  disabledTestPaths = [
    # urlopen fails during DNS resolution
    "tests/test_doctests.py"
--- a/pkgs/development/python-modules/aws-adfs/default.nix
+++ b/pkgs/development/python-modules/aws-adfs/default.nix
@ -5,7 +5,6 @@
 , click
 , configparser
 , fetchFromGitHub
-, fetchpatch
 , fido2
 , lxml
 , poetry-core
@ -19,7 +18,7 @@

 buildPythonPackage rec {
  pname = "aws-adfs";
-  version = "2.0.1";
+  version = "2.0.2";
  format = "pyproject";

  disabled = pythonOlder "3.6";
@ -28,7 +27,7 @@ buildPythonPackage rec {
    owner = "venth";
    repo = pname;
    rev = version;
-    hash = "sha256-0BURXbEOZvb8kszuajLtR+V7HjJycCBAQrm3WqpVB1w=";
+    hash = "sha256-T3AmPCOSeu7gvl57aHjnviy5iQAKlWy85fUOVecFRFc=";
  };

  nativeBuildInputs = [
@ -47,15 +46,6 @@ buildPythonPackage rec {
    requests-kerberos
  ];

-  patches = [
-    # Switch to poetry-core, https://github.com/venth/aws-adfs/pull/230
-    (fetchpatch {
-      name = "switch-to-poetry-core.patch";
-      url = "https://github.com/venth/aws-adfs/commit/da095ccf64629d36a6045ffec2684038378ee690.patch";
-      sha256 = "sha256-xg4c7iIonkUmNN74q/UeGSuYP3to7q4cLW6+TMW9nh4=";
-    })
-  ];
-
  postPatch = ''
    substituteInPlace pyproject.toml \
      --replace 'boto3 = "^1.20.50"' 'boto3 = "*"' \
--- a/pkgs/development/python-modules/dockerfile-parse/default.nix
+++ b/pkgs/development/python-modules/dockerfile-parse/default.nix
@ -1,24 +1,42 @@
-{ lib, buildPythonPackage, fetchPypi, six, pytest-cov, pytest }:
+{ lib
+, buildPythonPackage
+, fetchPypi
+, six
+, pytestCheckHook
+, pythonOlder
+}:

 buildPythonPackage rec {
-  version = "1.2.0";
  pname = "dockerfile-parse";
+  version = "1.2.0";
+  format = "setuptools";
+
+  disabled = pythonOlder "3.7";

  src = fetchPypi {
    inherit pname version;
-    sha256 = "07e65eec313978e877da819855870b3ae47f3fac94a40a965b9ede10484dacc5";
+    hash = "sha256-B+Ze7DE5eOh32oGYVYcLOuR/P6yUpAqWW57eEEhNrMU=";
  };

-  postPatch = ''
-    echo " " > tests/requirements.txt \
-  '';
+  propagatedBuildInputs = [
+    six
+  ];

-  propagatedBuildInputs = [ six ];
+  checkInputs = [
+    pytestCheckHook
+  ];

-  checkInputs = [ pytest-cov pytest ];
+  pythonImportsCheck = [
+    "dockerfile_parse"
+  ];
+
+  disabledTests = [
+    # python-dockerfile-parse.spec is not present
+    "test_all_versions_match"
+  ];

  meta = with lib; {
-    description = "Python library for parsing Dockerfile files";
+    description = "Library for parsing Dockerfile files";
    homepage = "https://github.com/DBuildService/dockerfile-parse";
    license = licenses.bsd3;
    maintainers = with maintainers; [ leenaars ];
--- a/pkgs/development/python-modules/docstring-parser/default.nix
+++ b/pkgs/development/python-modules/docstring-parser/default.nix
@ -1,25 +1,39 @@
 { lib
 , buildPythonPackage
 , fetchFromGitHub
-, setuptools
-, setuptools-scm
-, wheel
-, pytest
-}: buildPythonPackage rec {
+, poetry-core
+, pytestCheckHook
+, pythonOlder
+}:
+
+buildPythonPackage rec {
  pname = "docstring-parser";
-  version = "0.12";
+  version = "0.14.1";
+  format = "pyproject";
+
+  disabled = pythonOlder "3.7";
+
  src = fetchFromGitHub {
    owner = "rr-";
    repo = "docstring_parser";
    rev = "${version}";
-    sha256 = "sha256-hQuPJQrGvDs4dJrMLSR4sSnqy45xrF2ufinBG+azuCg=";
+    hash = "sha256-NIijq+QR0panVCGDEQrTlkAvHfIexwS0PxFikglxd74=";
  };
-  nativeBuildInputs = [ setuptools-scm ];
-  propagatedBuildInputs = [ pytest setuptools wheel ];
-  SETUPTOOLS_SCM_PRETEND_VERSION = version;
+
+  nativeBuildInputs = [
+    poetry-core
+  ];
+
+  checkInputs = [
+    pytestCheckHook
+  ];
+
+  pythonImportsCheck = [
+    "docstring_parser"
+  ];

  meta = with lib; {
-    description = "Parse Python docstrings in various flavors. ";
+    description = "Parse Python docstrings in various flavors";
    homepage = "https://github.com/rr-/docstring_parser";
    license = licenses.mit;
    maintainers = with maintainers; [ SomeoneSerge ];
--- a/pkgs/development/python-modules/faraday-agent-parameters-types/default.nix
+++ b/pkgs/development/python-modules/faraday-agent-parameters-types/default.nix
@ -2,6 +2,7 @@
 , buildPythonPackage
 , fetchPypi
 , marshmallow
+, packaging
 , pytestCheckHook
 }:

@ -17,6 +18,7 @@ buildPythonPackage rec {

  propagatedBuildInputs = [
    marshmallow
+    packaging
  ];

  checkInputs = [
@ -28,7 +30,10 @@ buildPythonPackage rec {
      --replace '"pytest-runner",' ""
  '';

-  pythonImportsCheck = [ "faraday_agent_parameters_types" ];
+  pythonImportsCheck = [
+    "faraday_agent_parameters_types"
+    "faraday_agent_parameters_types.utils"
+  ];

  meta = with lib; {
    description = "Collection of Faraday agent parameters types";
--- a/pkgs/development/python-modules/hatasmota/default.nix
+++ b/pkgs/development/python-modules/hatasmota/default.nix
@ -8,7 +8,7 @@

 buildPythonPackage rec {
  pname = "hatasmota";
-  version = "0.4.0";
+  version = "0.4.1";
  format = "setuptools";

  disabled = pythonOlder "3.6";
@ -16,8 +16,8 @@ buildPythonPackage rec {
  src = fetchFromGitHub {
    owner = "emontnemery";
    repo = pname;
-    rev = version;
-    sha256 = "sha256-r9EBuaKxc7Vcdfk8zoDpIi2i6yIGc7soSWx+RjG+SZo=";
+    rev = "refs/tags/${version}";
+    sha256 = "sha256-So3wnz6HBGlgBgBJiU4m+fFx7f8Y+6c15OCD8GFGQaE=";
  };

  propagatedBuildInputs = [
--- a/pkgs/development/python-modules/identify/default.nix
+++ b/pkgs/development/python-modules/identify/default.nix
@ -9,7 +9,7 @@

 buildPythonPackage rec {
  pname = "identify";
-  version = "2.4.12";
+  version = "2.5.0";
  format = "setuptools";

  disabled = pythonOlder "3.7";
@ -18,7 +18,7 @@ buildPythonPackage rec {
    owner = "pre-commit";
    repo = pname;
    rev = "v${version}";
-    sha256 = "sha256-kXhUlt+lcqK3ohOA8eziFcrm4U/FAYWpie4rH5xRejI=";
+    sha256 = "sha256-gbR2z4mo5EFHS2N3pg5mwFQAfL9ysqYaC+tSSYBK7YI=";
  };

  checkInputs = [
--- a/pkgs/development/python-modules/marshmallow-dataclass/default.nix
+++ b/pkgs/development/python-modules/marshmallow-dataclass/default.nix
@ -12,7 +12,7 @@

 buildPythonPackage rec {
  pname = "marshmallow-dataclass";
-  version = "8.5.6";
+  version = "8.5.8";
  format = "setuptools";

  disabled = pythonOlder "3.6";
@ -21,7 +21,7 @@ buildPythonPackage rec {
    owner = "lovasoa";
    repo = "marshmallow_dataclass";
    rev = "v${version}";
-    sha256 = "sha256-wUjgIjpN+c26yhlz3XzMOcKwTt/MDCiCLh7yGdy42jk=";
+    sha256 = "sha256-3kd/V3U3+/HfUmzwkp3/ChwSjknQ8rIYnTUsRH3WoP4=";
  };

  propagatedBuildInputs = [
--- a/pkgs/development/python-modules/meshtastic/default.nix
+++ b/pkgs/development/python-modules/meshtastic/default.nix
@ -18,7 +18,7 @@

 buildPythonPackage rec {
  pname = "meshtastic";
-  version = "1.2.93";
+  version = "1.2.95";
  format = "setuptools";

  disabled = pythonOlder "3.6";
@ -27,7 +27,7 @@ buildPythonPackage rec {
    owner = "meshtastic";
    repo = "Meshtastic-python";
    rev = version;
-    sha256 = "sha256-4jh5AYjr1qnr3nOeJSLwtAzdPlmpW1BBrEXfB86NrL0=";
+    sha256 = "sha256-CMw7PbM82AjbhrCYnRuxF9WFJqr6gvCEkTyG2vKM7FM=";
  };

  propagatedBuildInputs = [
--- a/pkgs/development/python-modules/peaqevcore/default.nix
+++ b/pkgs/development/python-modules/peaqevcore/default.nix
@ -6,20 +6,18 @@

 buildPythonPackage rec {
  pname = "peaqevcore";
-  version = "0.0.16";
+  version = "0.0.19";
  format = "setuptools";

  disabled = pythonOlder "3.7";

  src = fetchPypi {
    inherit pname version;
-    hash = "sha256-VYJzypRiVOF4FrvglAp2NWMUNxZx2Fq1Pw7lx0xbVFw=";
+    hash = "sha256-eEMzhrVKZJjUYwwdZ8M+xi0pbxseOS4ddW9il4XYwJs=";
  };

  postPatch = ''
    substituteInPlace setup.py \
-      --replace "datetime" "" \
-      --replace "statistics" "" \
      --replace "pytest" ""
  '';

--- a/pkgs/development/python-modules/pipdate/default.nix
+++ b/pkgs/development/python-modules/pipdate/default.nix
@ -1,9 +1,10 @@
 { lib
+, appdirs
 , buildPythonPackage
 , fetchPypi
-, pythonOlder
-, appdirs
 , importlib-metadata
+, packaging
+, pythonOlder
 , requests
 , rich
 , setuptools
@ -12,19 +13,22 @@

 buildPythonPackage rec {
  pname = "pipdate";
-  version = "0.5.5";
+  version = "0.5.6";
  format = "pyproject";
  disabled = pythonOlder "3.6";

  src = fetchPypi {
    inherit pname version;
-    sha256 = "03hr9i691cpg9q2xc1xr4lpd90xs8rba0xjh6qmc1vg7lgcdgbaa";
+    hash = "sha256-G2t+wsVGj7cDbsnWss7XqKU421WqygPzAZkhbTu9Jks=";
  };

-  nativeBuildInputs = [ wheel ];
+  nativeBuildInputs = [
+    wheel
+  ];

  propagatedBuildInputs = [
    appdirs
+    packaging
    requests
    rich
    setuptools
--- a/pkgs/development/python-modules/pybullet/default.nix
+++ b/pkgs/development/python-modules/pybullet/default.nix
@ -8,11 +8,11 @@

 buildPythonPackage rec {
  pname = "pybullet";
-  version = "3.2.2";
+  version = "3.2.4";

  src = fetchPypi {
    inherit pname version;
-    sha256 = "sha256-Rtq2RZ2CjgS2YbuA4BS8+xPJ8bpAwCLl6xEy78/guOA=";
+    sha256 = "sha256-lZ6FvABRMkucSroj15Nlt33iFvnO68OS+dVR/mOg68Y=";
  };

  buildInputs = [
--- a/pkgs/development/python-modules/pycm/default.nix
+++ b/pkgs/development/python-modules/pycm/default.nix
@ -10,7 +10,7 @@

 buildPythonPackage rec {
  pname = "pycm";
-  version = "3.4";
+  version = "3.5";
  format = "setuptools";

  disabled = pythonOlder "3.5";
@ -18,8 +18,8 @@ buildPythonPackage rec {
  src = fetchFromGitHub {
    owner = "sepandhaghighi";
    repo = pname;
-    rev = "v${version}";
-    sha256 = "0agis9jh6kjf7k1vf1fiyf5h3lb9p0w9k710wwpsby292ydazr4f";
+    rev = "refs/tags/v${version}";
+    sha256 = "sha256-iDt1voNcn59bZN/AyKrWFBIymTT618o91kz2AV42hWs=";
  };

  propagatedBuildInputs = [
--- a/pkgs/development/python-modules/pyrogram/default.nix
+++ b/pkgs/development/python-modules/pyrogram/default.nix
@ -12,7 +12,7 @@

 buildPythonPackage rec {
  pname = "pyrogram";
-  version = "2.0.13";
+  version = "2.0.14";

  disabled = pythonOlder "3.7";

@ -20,7 +20,7 @@ buildPythonPackage rec {
    owner = "pyrogram";
    repo = "pyrogram";
    rev = "v${version}";
-    hash = "sha256-8mnGfW8/2RbU4gFS8e72KAxMGGkb8XrhsyK01wD97rI=";
+    hash = "sha256-uPScRNbN0XjdfokTNgzCdiVNRucDzNPR/60/IHEDUrg=";
  };

  propagatedBuildInputs = [
--- a/pkgs/development/python-modules/python-benedict/default.nix
+++ b/pkgs/development/python-modules/python-benedict/default.nix
@ -19,7 +19,7 @@

 buildPythonPackage rec {
  pname = "python-benedict";
-  version = "0.25.0";
+  version = "0.25.1";
  format = "setuptools";

  disabled = pythonOlder "3.7";
@ -27,8 +27,8 @@ buildPythonPackage rec {
  src = fetchFromGitHub {
    owner = "fabiocaccamo";
    repo = pname;
-    rev = version;
-    hash = "sha256-G7pTbxNcESMUiKpQxjiF0gwN5mBhmuwIDlzauN5JCB4=";
+    rev = "refs/tags/${version}";
+    hash = "sha256-egOrotWgRyB6pdWUIRWogwdoK82g/1JfRDc85W4FrjQ=";
  };

  propagatedBuildInputs = [
--- a/pkgs/development/python-modules/scmrepo/default.nix
+++ b/pkgs/development/python-modules/scmrepo/default.nix
@ -14,7 +14,7 @@

 buildPythonPackage rec {
  pname = "scmrepo";
-  version = "0.0.18";
+  version = "0.0.19";
  format = "pyproject";

  disabled = pythonOlder "3.7";
@ -23,7 +23,7 @@ buildPythonPackage rec {
    owner = "iterative";
    repo = pname;
    rev = "refs/tags/${version}";
-    hash = "sha256-eMtYVdKLiIaagDB1OEdYge6+McchOZPBcuIKGMzyvQQ=";
+    hash = "sha256-f/KV3NfIumkZcg9r421QhdyPU/274aAU4b78myi+fFY=";
  };

  propagatedBuildInputs = [
--- a/pkgs/development/python-modules/types-dateutil/default.nix
+++ b/pkgs/development/python-modules/types-dateutil/default.nix
@ -5,12 +5,12 @@

 buildPythonPackage rec {
  pname = "types-python-dateutil";
-  version = "2.8.12";
+  version = "2.8.14";
  format = "setuptools";

  src = fetchPypi {
    inherit pname version;
-    sha256 = "sha256-7zBTt0XwHERDtRK2s9WwT7ry1HaqUDtsyTIEah7fpWo=";
+    sha256 = "sha256-Nnwf+hpSpLKlNMmzC0CwHyt/LqR6l/2CH2x20ceuMSk=";
  };

  pythonImportsCheck = [ "dateutil-stubs" ];
--- a/pkgs/development/python-modules/types-pytz/default.nix
+++ b/pkgs/development/python-modules/types-pytz/default.nix
@ -5,12 +5,12 @@

 buildPythonPackage rec {
  pname = "types-pytz";
-  version = "2021.3.6";
+  version = "2021.3.7";
  format = "setuptools";

  src = fetchPypi {
    inherit pname version;
-    sha256 = "sha256-dFR/2Q2NirTx7t86NEp9GG2XSGlziV+BIhpxLh4s2ZM=";
+    sha256 = "sha256-EdW6BiaBZ5U8zEo+7hksJLQtANKu9FbBYKh5iJPLIIE=";
  };

  # Modules doesn't have tests
--- a/pkgs/development/python-modules/types-requests/default.nix
+++ b/pkgs/development/python-modules/types-requests/default.nix
@ -6,12 +6,12 @@

 buildPythonPackage rec {
  pname = "types-requests";
-  version = "2.27.20";
+  version = "2.27.22";
  format = "setuptools";

  src = fetchPypi {
    inherit pname version;
-    sha256 = "sha256-YzRFc83mxO/UTYZ8AVjZ+35r65VyHL6YgvP4V+6KU5g=";
+    sha256 = "sha256-LoGnTS2x5tBrqkqeGJZyBUNzkpeiParAQ2o04vxzJXQ=";
  };

  propagatedBuildInputs = [
--- a/pkgs/development/python-modules/types-tabulate/default.nix
+++ b/pkgs/development/python-modules/types-tabulate/default.nix
@ -5,11 +5,11 @@

 buildPythonPackage rec {
  pname = "types-tabulate";
-  version = "0.8.7";
+  version = "0.8.8";

  src = fetchPypi {
    inherit pname version;
-    hash = "sha256-Cs0ClYZuXy3i6Qc4/wvBIBdR4d0Ci9MMv6Qap6Zpkp4=";
+    hash = "sha256-CzGcfhDdVh98FfVt7DR8MZP9hl9Ovl/x7LAg6vp5O8M=";
  };

  # Module doesn't have tests
--- a/pkgs/development/python-modules/types-toml/default.nix
+++ b/pkgs/development/python-modules/types-toml/default.nix
@ -5,12 +5,12 @@

 buildPythonPackage rec {
  pname = "types-toml";
-  version = "0.10.5";
+  version = "0.10.6";
  format = "setuptools";

  src = fetchPypi {
    inherit pname version;
-    sha256 = "sha256-+UlGOjiCAL45Lvk5nbrT4eO75tRUPYStk9lsP9oCgIA=";
+    sha256 = "sha256-aus+17+oaTgVUcd07WqRQuPu2YqD76UQipYy6v1W3NM=";
  };

  # Module doesn't have tests
--- a/pkgs/development/python-modules/types-typed-ast/default.nix
+++ b/pkgs/development/python-modules/types-typed-ast/default.nix
@ -5,12 +5,12 @@

 buildPythonPackage rec {
  pname = "types-typed-ast";
-  version = "1.5.2";
+  version = "1.5.4";
  format = "setuptools";

  src = fetchPypi {
    inherit pname version;
-    hash = "sha256-bY/S6pCDbLQxEayKrnzYZOCYWTyT7M66kP5G1rewxz4=";
+    hash = "sha256-MlOHn/Y6+4lkZa/kIoocTfLmPNw57vm5dD1QC42aUXY=";
  };

  # Module doesn't have tests
--- a/pkgs/games/kabeljau/default.nix
+++ b/pkgs/games/kabeljau/default.nix
@ -1,27 +1,29 @@
-{ stdenvNoCC, lib, fetchFromGitea, bash, dialog, makeWrapper }:
+{ stdenvNoCC, lib, fetchFromGitea, just, inkscape, makeWrapper, bash, dialog }:

 stdenvNoCC.mkDerivation rec {
  pname = "kabeljau";
-  version = "1.0.1";
+  version = "1.2.0";

  src = fetchFromGitea {
    domain = "codeberg.org";
    owner = "papojari";
    repo = "kabeljau";
    rev = "v${version}";
-    sha256 = "sha256-LOvr5fgSUTXnYhbVmynCCjo0W098jKWQnFULtIprE3M=";
+    sha256 = "sha256-RedVItgfr6vgqXHA3bOiHXDpfGuHI+sX4jCHL9G5jYk=";
  };

-  nativeBuildInputs = [ makeWrapper ];
+  # Inkscape is needed in a just recipe where it is used to export the SVG icon to several different sized PNGs.
+  nativeBuildInputs = [ just inkscape makeWrapper ];
  postPatch = ''
    patchShebangs --host ${pname}
+    substituteInPlace ./justfile \
+      --replace " /bin" " $out/bin" \
+      --replace " /usr" " $out"
  '';
-
  installPhase = ''
    runHook preInstall

-    mkdir -p $out/bin
-    cp ${pname}.sh $out/bin/${pname}
+    just install
    wrapProgram $out/bin/${pname} --suffix PATH : ${
      lib.makeBinPath [ dialog ]
    }
--- a/pkgs/os-specific/linux/kernel/hardened/patches.json
+++ b/pkgs/os-specific/linux/kernel/hardened/patches.json
@ -2,51 +2,51 @@
    "4.14": {
        "patch": {
            "extra": "-hardened1",
-            "name": "linux-hardened-4.14.269-hardened1.patch",
-            "sha256": "1hj3yn70aifprcfz4k088pj0lbr92cl5y840g08p0cqz3f3jvf24",
-            "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.14.269-hardened1/linux-hardened-4.14.269-hardened1.patch"
+            "name": "linux-hardened-4.14.276-hardened1.patch",
+            "sha256": "1q0w8fqn9z32r35s3lil9dllkykydnpfp1dkhgvmy5rggbm801ay",
+            "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.14.276-hardened1/linux-hardened-4.14.276-hardened1.patch"
        },
-        "sha256": "1lhqq3va468k8w5f4hhsq1rgjcfrgi5l8lnrikfy9jisbi05z9h3",
-        "version": "4.14.269"
+        "sha256": "1rxksrmkh5raz930y9khfg85dglgphrgcvkj21n86m333pajs4mf",
+        "version": "4.14.276"
    },
    "4.19": {
        "patch": {
            "extra": "-hardened1",
-            "name": "linux-hardened-4.19.232-hardened1.patch",
-            "sha256": "195gbiial5rpiak4mszw3kn1dmm38npk2bchyb9lfvk1f26h2ybc",
-            "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.232-hardened1/linux-hardened-4.19.232-hardened1.patch"
+            "name": "linux-hardened-4.19.239-hardened1.patch",
+            "sha256": "1w0h47av90aapz5g5ldny1vrq21n22kxag24byk4b43ndg6q0ksc",
+            "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.239-hardened1/linux-hardened-4.19.239-hardened1.patch"
        },
-        "sha256": "0b520cwwqr5b1skc3gbq35hfjqpidxcl3gq7x5bdqqqdg0afiksg",
-        "version": "4.19.232"
+        "sha256": "0fsr9jy8d1rpg6ixp7av01pqz3vq50rgfcjd7vj16ccsdk15sz5z",
+        "version": "4.19.239"
    },
    "5.10": {
        "patch": {
            "extra": "-hardened1",
-            "name": "linux-hardened-5.10.103-hardened1.patch",
-            "sha256": "0i70cya9llz6nnhf4d5zz3f8xhj21si8capymmzcjczz0378argj",
-            "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.103-hardened1/linux-hardened-5.10.103-hardened1.patch"
+            "name": "linux-hardened-5.10.112-hardened1.patch",
+            "sha256": "1sryrhl7bblx4r0smvlzw7p4xhc4l8bsqgwzlj2x8qamj544w464",
+            "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.112-hardened1/linux-hardened-5.10.112-hardened1.patch"
        },
-        "sha256": "02jq126r8dgqrhgdg8dym2v8xgp9jkjm8kf9zgj440s3wrasvf2g",
-        "version": "5.10.103"
+        "sha256": "19aa7fq8n75gh0vv01mpxg4cxkfpr5lj0sv6lxiyzcgbc71isv4c",
+        "version": "5.10.112"
    },
    "5.15": {
        "patch": {
            "extra": "-hardened1",
-            "name": "linux-hardened-5.15.26-hardened1.patch",
-            "sha256": "14pdmiqnn06by8mvxw4gklqfrnngrimyz1ag76pr60iz6ka6y5g8",
-            "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.15.26-hardened1/linux-hardened-5.15.26-hardened1.patch"
+            "name": "linux-hardened-5.15.35-hardened1.patch",
+            "sha256": "10x2q01bckmfmgdzfg01khj43pav1drzzp3fr20hk718ywikvgax",
+            "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.15.35-hardened1/linux-hardened-5.15.35-hardened1.patch"
        },
-        "sha256": "0fmydc5v51iacd5ys7p1m1k2318p47prj8xv02rcngv1y8s224jq",
-        "version": "5.15.26"
+        "sha256": "1n05c4c4ish25x483a2p5177zgda8pq7g4752n1b7chfygi5l6ha",
+        "version": "5.15.35"
    },
    "5.4": {
        "patch": {
            "extra": "-hardened1",
-            "name": "linux-hardened-5.4.182-hardened1.patch",
-            "sha256": "0hcxy2hn836mivydmrbqrpvm4bfdsgf9xpx0iyz92rhd91ipgcyq",
-            "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.182-hardened1/linux-hardened-5.4.182-hardened1.patch"
+            "name": "linux-hardened-5.4.190-hardened1.patch",
+            "sha256": "0z4w05fq20pmiyxf4bip61ywy5xg96klbnj62yxiaha68pfwlm29",
+            "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.190-hardened1/linux-hardened-5.4.190-hardened1.patch"
        },
-        "sha256": "03gly4ivsdahixmshi021al48ycsalx30vsxr3iyj47hchgj1wdj",
-        "version": "5.4.182"
+        "sha256": "157ifcl59xxj721r302hg82vmbqzx5hjrlihrc5s4maxfw3ygm41",
+        "version": "5.4.190"
    }
 }
--- a/pkgs/os-specific/linux/kernel/hardened/update.py
+++ b/pkgs/os-specific/linux/kernel/hardened/update.py
@ -219,7 +219,16 @@ failures = False

 # Match each kernel version with the best patch version.
 releases = {}
+i = 0
 for release in repo.get_releases():
+    # Dirty workaround to make sure that we don't run into issues because
+    # GitHub's API only allows fetching the last 1000 releases.
+    # It's not reliable to exit earlier because not every kernel minor may
+    # have hardened patches, hence the naive search below.
+    i += 1
+    if i > 500:
+        break
+
    version = parse_version(release.tag_name)
    # needs to look like e.g. 5.6.3-hardened1
    if len(version) < 4:
--- a/pkgs/os-specific/linux/kernel/linux-4.14.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.14.nix
@ -3,7 +3,7 @@
 with lib;

 buildLinux (args // rec {
-  version = "4.14.275";
+  version = "4.14.276";

  # modDirVersion needs to be x.y.z, will automatically add .0 if needed
  modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
@ -13,6 +13,6 @@ buildLinux (args // rec {

  src = fetchurl {
    url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "1yaq5qhl694ygx17x998syg79yx72l3n9vzfkyf0g3idzdh9j2hh";
+    sha256 = "1rxksrmkh5raz930y9khfg85dglgphrgcvkj21n86m333pajs4mf";
  };
 } // (args.argsOverride or {}))
--- a/pkgs/os-specific/linux/kernel/linux-4.19.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.19.nix
@ -3,7 +3,7 @@
 with lib;

 buildLinux (args // rec {
-  version = "4.19.237";
+  version = "4.19.239";

  # modDirVersion needs to be x.y.z, will automatically add .0 if needed
  modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
@ -13,6 +13,6 @@ buildLinux (args // rec {

  src = fetchurl {
    url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "1n0c4bmmbj145zsp662a5rxh294fpq4dkillpz16wj6c098z7zxs";
+    sha256 = "0fsr9jy8d1rpg6ixp7av01pqz3vq50rgfcjd7vj16ccsdk15sz5z";
  };
 } // (args.argsOverride or {}))
--- a/pkgs/os-specific/linux/kernel/linux-4.9.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.9.nix
@ -1,12 +1,12 @@
 { buildPackages, fetchurl, perl, buildLinux, nixosTests, stdenv, ... } @ args:

 buildLinux (args // rec {
-  version = "4.9.310";
+  version = "4.9.311";
  extraMeta.branch = "4.9";
  extraMeta.broken = stdenv.isAarch64;

  src = fetchurl {
    url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "17d3isb1i52v8360vspnywjpsy9vvkc54k5kwdddj0plawvxklw5";
+    sha256 = "15wqwplq1qk3ni5arfigfl62zbdwhaki3vkg1lv3sln2gnpm059l";
  };
 } // (args.argsOverride or {}))
--- a/pkgs/os-specific/linux/kernel/linux-5.10.nix
+++ b/pkgs/os-specific/linux/kernel/linux-5.10.nix
@ -3,7 +3,7 @@
 with lib;

 buildLinux (args // rec {
-  version = "5.10.111";
+  version = "5.10.112";

  # modDirVersion needs to be x.y.z, will automatically add .0 if needed
  modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
@ -13,6 +13,6 @@ buildLinux (args // rec {

  src = fetchurl {
    url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
-    sha256 = "06mbl327bin8pv1073f7x37np3whklbvnh8lwn8wx4jmfvcb6c8q";
+    sha256 = "19aa7fq8n75gh0vv01mpxg4cxkfpr5lj0sv6lxiyzcgbc71isv4c";
  };
 } // (args.argsOverride or {}))
--- a/pkgs/os-specific/linux/kernel/linux-5.15.nix
+++ b/pkgs/os-specific/linux/kernel/linux-5.15.nix
@ -3,7 +3,7 @@
 with lib;

 buildLinux (args // rec {
-  version = "5.15.34";
+  version = "5.15.35";

  # modDirVersion needs to be x.y.z, will automatically add .0 if needed
  modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
@ -15,6 +15,6 @@ buildLinux (args // rec {

  src = fetchurl {
    url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
-    sha256 = "0sfviwwp7qy8b5h15lg84dyskih4l082l9gs6yrqj3rg762lcld7";
+    sha256 = "1n05c4c4ish25x483a2p5177zgda8pq7g4752n1b7chfygi5l6ha";
  };
 } // (args.argsOverride or { }))
--- a/pkgs/os-specific/linux/kernel/linux-5.16.nix
+++ b/pkgs/os-specific/linux/kernel/linux-5.16.nix
@ -1,18 +0,0 @@
-{ lib, buildPackages, fetchurl, perl, buildLinux, nixosTests, modDirVersionArg ? null, ... } @ args:
-
-with lib;
-
-buildLinux (args // rec {
-  version = "5.16.20";
-
-  # modDirVersion needs to be x.y.z, will automatically add .0 if needed
-  modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
-
-  # branchVersion needs to be x.y
-  extraMeta.branch = versions.majorMinor version;
-
-  src = fetchurl {
-    url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
-    sha256 = "09dz8zp8cxvsc5amrswqqrkxd3i92ay2samlcspalaw6iz40s1nq";
-  };
-} // (args.argsOverride or { }))
--- a/pkgs/os-specific/linux/kernel/linux-5.17.nix
+++ b/pkgs/os-specific/linux/kernel/linux-5.17.nix
@ -3,7 +3,7 @@
 with lib;

 buildLinux (args // rec {
-  version = "5.17.3";
+  version = "5.17.4";

  # modDirVersion needs to be x.y.z, will automatically add .0 if needed
  modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
@ -13,6 +13,6 @@ buildLinux (args // rec {

  src = fetchurl {
    url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
-    sha256 = "0b0nb807r2pwrifc7yk0p9q6cm472ahggfaix6yiqzmqcvisil1j";
+    sha256 = "1ifkl1j5dimipqxwki26i4v6gav70g24456y7ynbb71sx1pdag3f";
  };
 } // (args.argsOverride or { }))
--- a/pkgs/os-specific/linux/kernel/linux-5.4.nix
+++ b/pkgs/os-specific/linux/kernel/linux-5.4.nix
@ -3,7 +3,7 @@
 with lib;

 buildLinux (args // rec {
-  version = "5.4.188";
+  version = "5.4.190";

  # modDirVersion needs to be x.y.z, will automatically add .0 if needed
  modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
@ -13,6 +13,6 @@ buildLinux (args // rec {

  src = fetchurl {
    url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
-    sha256 = "1g7xf2jx1hx580f42yirfgv9v0f9f88wzxxx0wiwx7wcqbyqpg4z";
+    sha256 = "157ifcl59xxj721r302hg82vmbqzx5hjrlihrc5s4maxfw3ygm41";
  };
 } // (args.argsOverride or {}))
--- a/pkgs/os-specific/linux/kernel/linux-libre.nix
+++ b/pkgs/os-specific/linux/kernel/linux-libre.nix
@ -1,8 +1,8 @@
 { stdenv, lib, fetchsvn, linux
 , scripts ? fetchsvn {
    url = "https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/branches/";
-    rev = "18664";
-    sha256 = "0yvgnqf355wr7wmfd0r8zydbr7icic06cp5hjp060vv0m9bf87xi";
+    rev = "18688";
+    sha256 = "15f83zcwxk28b3a4am8avi0xwd7zr79n00150k6xdf3g8haz7yaj";
  }
 , ...
 }:
--- a/pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix
+++ b/pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix
@ -17,6 +17,7 @@
    extraMeta = {
      branch = "master";
      maintainers = with lib.maintainers; [ davidak Madouura ];
+      broken = true;
    };
  } // argsOverride;

--- a/pkgs/os-specific/linux/s6-linux-init/default.nix
+++ b/pkgs/os-specific/linux/s6-linux-init/default.nix
@ -4,8 +4,8 @@ with skawarePackages;

 buildPackage {
  pname = "s6-linux-init";
-  version = "1.0.7.0";
-  sha256 = "16bzijmzxi91ycayhpn398yjgag3c5pnlghs6sqdmzlf2fiirif5";
+  version = "1.0.7.3";
+  sha256 = "sha256-yQblfr/jANwXz7+5wlSvWZaHYt/RYr/gZLTOK9aVp3Y=";

  description = "A set of minimalistic tools used to create a s6-based init system, including a /sbin/init binary, on a Linux kernel";
  platforms = lib.platforms.linux;
--- a/pkgs/servers/adguardhome/bins.nix
+++ b/pkgs/servers/adguardhome/bins.nix
@ -1,18 +1,22 @@
 { fetchurl, fetchzip }:
 {
-"x86_64-darwin" = fetchzip {
+x86_64-darwin = fetchzip {
  sha256 = "sha256-vUOdHDyvVg+8GhctW925WfjONi7TnPRfVfXmehOweB4=";
  url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.6/AdGuardHome_darwin_amd64.zip";
 };
-"i686-linux" = fetchurl {
+aarch64-darwin = fetchzip {
+  sha256 = "sha256-3JmMvxd317Qmyrv7vWyfQsLol+yPuKBXHByt5YRrbX8=";
+  url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.6/AdGuardHome_darwin_arm64.zip";
+};
+i686-linux = fetchurl {
  sha256 = "sha256-A6IsDRbRHyU0+IUKkrudKvlKiJkVNNs12MrKQ6RlpMQ=";
  url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.6/AdGuardHome_linux_386.tar.gz";
 };
-"x86_64-linux" = fetchurl {
+x86_64-linux = fetchurl {
  sha256 = "sha256-nPcqAk0m1e9izkylBuNcatHESgvSewR+MKmVdz+HBec=";
  url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.6/AdGuardHome_linux_amd64.tar.gz";
 };
-"aarch64-linux" = fetchurl {
+aarch64-linux = fetchurl {
  sha256 = "sha256-ITkZdVU03FG9AUAMgD6nlCyioPJX357wB9m1jYdPlS4=";
  url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.6/AdGuardHome_linux_arm64.tar.gz";
 };
--- a/pkgs/servers/adguardhome/default.nix
+++ b/pkgs/servers/adguardhome/default.nix
@ -1,10 +1,14 @@
 { lib, stdenv, fetchurl, fetchzip, nixosTests }:

+let
+  inherit (stdenv.hostPlatform) system;
+  sources = import ./bins.nix { inherit fetchurl fetchzip; };
+in
+
 stdenv.mkDerivation rec {
  pname = "adguardhome";
  version = "0.107.6";
-
-  src = (import ./bins.nix { inherit fetchurl fetchzip; }).${stdenv.hostPlatform.system};
+  src = sources.${system} or (throw "Source for ${pname} is not available for ${system}");

  installPhase = ''
    install -m755 -D ./AdGuardHome $out/bin/adguardhome
@ -18,7 +22,7 @@ stdenv.mkDerivation rec {
  meta = with lib; {
    homepage = "https://github.com/AdguardTeam/AdGuardHome";
    description = "Network-wide ads & trackers blocking DNS server";
-    platforms = [ "x86_64-linux" "aarch64-linux" "i686-linux" "x86_64-darwin" ];
+    platforms = builtins.attrNames sources;
    maintainers = with maintainers; [ numkem iagoq ];
    license = licenses.gpl3Only;
  };
--- a/pkgs/servers/adguardhome/update.sh
+++ b/pkgs/servers/adguardhome/update.sh
@ -18,9 +18,10 @@ systems[linux_386]=i686-linux
 systems[linux_amd64]=x86_64-linux
 systems[linux_arm64]=aarch64-linux
 systems[darwin_amd64]=x86_64-darwin
+systems[darwin_arm64]=aarch64-darwin

 echo '{ fetchurl, fetchzip }:' > "$bins"
-echo '{'        >> "$bins"
+echo '{' >> "$bins"

 for asset in $(curl --silent https://api.github.com/repos/AdguardTeam/AdGuardHome/releases/latest | jq -c '.assets[]') ; do
    url="$(jq -r '.browser_download_url' <<< "$asset")"
@ -29,7 +30,7 @@ for asset in $(curl --silent https://api.github.com/repos/AdguardTeam/AdGuardHom
        fetch="$(grep '\.zip$' <<< "$url" > /dev/null && echo fetchzip || echo fetchurl)"
        nix_system=${systems[$adg_system]}
        nix_src="$(nix-prefetch -s --output nix $fetch --url $url)"
-        echo "\"$nix_system\" = $fetch $nix_src;" >> $bins
+        echo "$nix_system = $fetch $nix_src;" >> $bins
    fi
 done

--- a/pkgs/servers/monitoring/grafana/default.nix
+++ b/pkgs/servers/monitoring/grafana/default.nix
@ -2,7 +2,7 @@

 buildGoModule rec {
  pname = "grafana";
-  version = "8.4.7";
+  version = "8.5.0";

  excludedPackages = [ "alert_webhook_listener" "clean-swagger" "release_publisher" "slow_proxy" "slow_proxy_mac" "macaron" ];

@ -10,15 +10,15 @@ buildGoModule rec {
    rev = "v${version}";
    owner = "grafana";
    repo = "grafana";
-    sha256 = "sha256-8owcfWTiXhejFc5P0AM6POXBXuAABn4M/uX9X68Zn8k=";
+    sha256 = "sha256-6arJ903XWfS8vnr8jtxyMj7jju6XiwR0xAq/mh8hys4=";
  };

  srcStatic = fetchurl {
    url = "https://dl.grafana.com/oss/release/grafana-${version}.linux-amd64.tar.gz";
-    sha256 = "1wi28v1xhav8p2jqkf2gmk1accfcf1w0d6h312d4pns6pkhdabxv";
+    sha256 = "1alqkc8pj0798anybvfcv1z8dij1ywf5gyc3byj9vmjm4a78apmd";
  };

-  vendorSha256 = "sha256-7ZeOncdiA/0Awg+olJvsLneLQH4zBQka4M81jsxwUdE=";
+  vendorSha256 = "sha256-7ZcREAWaUs8aQHtqKxtH84Pkf54lhH/rlFmYQTZtKj8=";

  nativeBuildInputs = [ wire ];

--- a/pkgs/servers/monitoring/prometheus/default.nix
+++ b/pkgs/servers/monitoring/prometheus/default.nix
@ -2,13 +2,10 @@
 , lib
 , go
 , pkgs
-, nodejs-14_x
-, nodePackages
 , buildGoModule
 , fetchFromGitHub
-, mkYarnPackage
+, fetchurl
 , nixosTests
-, fetchpatch
 , enableAWS ? true
 , enableAzure ? true
 , enableConsul ? true
@ -30,131 +27,82 @@
 }:

 let
-  version = "2.30.3";
+  version = "2.35.0";
+  webUiStatic = fetchurl {
+    url = "https://github.com/prometheus/prometheus/releases/download/v${version}/prometheus-web-ui-${version}.tar.gz";
+    sha256 = "sha256-66zWOjFTYwmspiKeklt3NAAT1uJJrZqeyQvWWsCN9fQ=";
+  };
+in
+buildGoModule rec {
+  pname = "prometheus";
+  inherit version;

  src = fetchFromGitHub {
    rev = "v${version}";
    owner = "prometheus";
    repo = "prometheus";
-    sha256 = "1as6x5bsp7mxa4rp7jhyjlpcvzqm1zngnwvp73rc4rwhz8w8vm3k";
+    sha256 = "sha256-h0uBs3xMKpRH3A1VG5xrhjXVAT7GL5L3UZWb3HJ2Fz4=";
  };

-  goPackagePath = "github.com/prometheus/prometheus";
-
-  codemirrorNode = import ./webui/codemirror-promql {
-    inherit pkgs;
-    nodejs = nodejs-14_x;
-    inherit (stdenv.hostPlatform) system;
-  };
-  webuiNode = import ./webui/webui {
-    inherit pkgs;
-    nodejs = nodejs-14_x;
-    inherit (stdenv.hostPlatform) system;
-  };
-
-  codemirror = stdenv.mkDerivation {
-    name = "prometheus-webui-codemirror-promql";
-    src = "${src}/web/ui/module/codemirror-promql";
-
-    buildInputs = [ nodejs-14_x nodePackages.typescript codemirrorNode.nodeDependencies ];
-
-    configurePhase = ''
-      ln -s ${codemirrorNode.nodeDependencies}/lib/node_modules node_modules
-    '';
-    buildPhase = ''
-      PUBLIC_URL=. npm run build
-    '';
-    installPhase = ''
-      mkdir -p $out
-      mv lib dist $out
-    '';
-    distPhase = ":";
-  };
-
-
-  webui = stdenv.mkDerivation {
-    name = "prometheus-webui";
-    src = "${src}/web/ui/react-app";
-
-    buildInputs = [ nodejs-14_x webuiNode.nodeDependencies ];
-
-    # create `node_modules/.cache` dir (we need writeable .cache)
-    # and then copy the rest over.
-    configurePhase = ''
-      mkdir -p node_modules/{.cache,.bin}
-      cp -a ${webuiNode.nodeDependencies}/lib/node_modules/. node_modules
-    '';
-    buildPhase = "PUBLIC_URL=. npm run build";
-    installPhase = "mv build $out";
-    distPhase = "true";
-  };
-in
-buildGoModule rec {
-  pname = "prometheus";
-  inherit src version;
-
-  vendorSha256 = "0qyv8vybx5wg8k8hwvrpp4hz9wv6g4kf9sq5v5qc2bxx6apc0s9r";
+  vendorSha256 = "sha256-0I6hmjhdfB41rWOQ9FM9CMq5w5437ka/jLuFXcBQBlM=";

  excludedPackages = [ "documentation/prometheus-mixin" ];

-  nativeBuildInputs = [ nodejs-14_x ];
-
  postPatch = ''
-    # we don't want this anyways, as we
-    # build modules for them
-    echo "exit 0" > web/ui/module/build.sh
+    tar -C web/ui -xzf ${webUiStatic}

-    ln -s ${webuiNode.nodeDependencies}/lib/node_modules web/ui/react-app/node_modules
-    ln -s ${webui} web/ui/static/react
+    patchShebangs scripts

-    # webui-codemirror
-    ln -s ${codemirror}/dist web/ui/module/codemirror-promql/dist
-    ln -s ${codemirror}/lib web/ui/module/codemirror-promql/lib
+    # Enable only select service discovery to shrink binaries.
+    (
+    ${lib.optionalString (enableAWS)
+      "echo - github.com/prometheus/prometheus/discovery/aws"}
+    ${lib.optionalString (enableAzure)
+      "echo - github.com/prometheus/prometheus/discovery/azure"}
+    ${lib.optionalString (enableConsul)
+      "echo - github.com/prometheus/prometheus/discovery/consul"}
+    ${lib.optionalString (enableDigitalOcean)
+      "echo - github.com/prometheus/prometheus/discovery/digitalocean"}
+    ${lib.optionalString (enableEureka)
+      "echo - github.com/prometheus/prometheus/discovery/eureka"}
+    ${lib.optionalString (enableGCE)
+      "echo - github.com/prometheus/prometheus/discovery/gce"}
+    ${lib.optionalString (enableHetzner)
+      "echo - github.com/prometheus/prometheus/discovery/hetzner"}
+    ${lib.optionalString (enableKubernetes)
+      "echo - github.com/prometheus/prometheus/discovery/kubernetes"}
+    ${lib.optionalString (enableLinode)
+      "echo - github.com/prometheus/prometheus/discovery/linode"}
+    ${lib.optionalString (enableMarathon)
+      "echo - github.com/prometheus/prometheus/discovery/marathon"}
+    ${lib.optionalString (enableMoby)
+      "echo - github.com/prometheus/prometheus/discovery/moby"}
+    ${lib.optionalString (enableOpenstack)
+      "echo - github.com/prometheus/prometheus/discovery/openstack"}
+    ${lib.optionalString (enablePuppetDB)
+      "echo - github.com/prometheus/prometheus/discovery/puppetdb"}
+    ${lib.optionalString (enableScaleway)
+      "echo - github.com/prometheus/prometheus/discovery/scaleway"}
+    ${lib.optionalString (enableTriton)
+      "echo - github.com/prometheus/prometheus/discovery/triton"}
+    ${lib.optionalString (enableUyuni)
+      "echo - github.com/prometheus/prometheus/discovery/uyuni"}
+    ${lib.optionalString (enableXDS)
+      "echo - github.com/prometheus/prometheus/discovery/xds"}
+    ${lib.optionalString (enableZookeeper)
+      "echo - github.com/prometheus/prometheus/discovery/zookeeper"}
+    ) > plugins.yml
+  '';

-    # Disable some service discovery to shrink binaries.
-    ${lib.optionalString (!enableAWS)
-      "sed -i -e '/register aws/d' discovery/install/install.go"}
-    ${lib.optionalString (!enableAzure)
-      "sed -i -e '/register azure/d' discovery/install/install.go"}
-    ${lib.optionalString (!enableConsul)
-      "sed -i -e '/register consul/d' discovery/install/install.go"}
-    ${lib.optionalString (!enableDigitalOcean)
-      "sed -i -e '/register digitalocean/d' discovery/install/install.go"}
-    ${lib.optionalString (!enableEureka)
-      "sed -i -e '/register eureka/d' discovery/install/install.go"}
-    ${lib.optionalString (!enableGCE)
-      "sed -i -e '/register gce/d' discovery/install/install.go"}
-    ${lib.optionalString (!enableHetzner)
-      "sed -i -e '/register hetzner/d' discovery/install/install.go"}
-    ${lib.optionalString (!enableKubernetes)
-      "sed -i -e '/register kubernetes/d' discovery/install/install.go"}
-    ${lib.optionalString (!enableLinode)
-      "sed -i -e '/register linode/d' discovery/install/install.go"}
-    ${lib.optionalString (!enableMarathon)
-      "sed -i -e '/register marathon/d' discovery/install/install.go"}
-    ${lib.optionalString (!enableMoby)
-      "sed -i -e '/register moby/d' discovery/install/install.go"}
-    ${lib.optionalString (!enableOpenstack)
-      "sed -i -e '/register openstack/d' discovery/install/install.go"}
-    ${lib.optionalString (!enablePuppetDB)
-      "sed -i -e '/register puppetdb/d' discovery/install/install.go"}
-    ${lib.optionalString (!enableScaleway)
-      "sed -i -e '/register scaleway/d' discovery/install/install.go"}
-    ${lib.optionalString (!enableTriton)
-      "sed -i -e '/register triton/d' discovery/install/install.go"}
-    ${lib.optionalString (!enableUyuni)
-      "sed -i -e '/register uyuni/d' discovery/install/install.go"}
-    ${lib.optionalString (!enableXDS)
-      "sed -i -e '/register xds/d' discovery/install/install.go"}
-    ${lib.optionalString (!enableZookeeper)
-      "sed -i -e '/register zookeeper/d' discovery/install/install.go"}
+  preBuild = ''
+    if [[ -d vendor ]]; then make -o assets assets-compress plugins; fi
  '';

  tags = [ "builtinassets" ];

  ldflags =
    let
-      t = "${goPackagePath}/vendor/github.com/prometheus/common/version";
+      t = "github.com/prometheus/common/version";
    in
    [
      "-X ${t}.Version=${version}"
@ -165,20 +113,13 @@ buildGoModule rec {
      "-X ${t}.GoVersion=${lib.getVersion go}"
    ];

-  # only run this in the real build, not during the vendor build
-  # this should probably be fixed in buildGoModule
-  preBuild = ''
-    if [ -d vendor ]; then make assets; fi
-  '';
-
  preInstall = ''
    mkdir -p "$out/share/doc/prometheus" "$out/etc/prometheus"
    cp -a $src/documentation/* $out/share/doc/prometheus
    cp -a $src/console_libraries $src/consoles $out/etc/prometheus
  '';

-  # doCheck = !stdenv.isDarwin; # https://hydra.nixos.org/build/130673870/nixlog/1
-  doCheck = false;
+  doCheck = !stdenv.isDarwin; # https://hydra.nixos.org/build/130673870/nixlog/1

  passthru.tests = { inherit (nixosTests) prometheus; };

--- a/pkgs/servers/monitoring/prometheus/webui/codemirror-promql/default.nix
+++ b/pkgs/servers/monitoring/prometheus/webui/codemirror-promql/default.nix
@ -1,17 +0,0 @@
-# This file has been generated by node2nix 1.9.0. Do not edit!
-
-{pkgs ? import <nixpkgs> {
-    inherit system;
-  }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-12_x"}:
-
-let
-  nodeEnv = import ../../../../../development/node-packages/node-env.nix {
-    inherit (pkgs) stdenv lib python2 runCommand writeTextFile writeShellScript;
-    inherit pkgs nodejs;
-    libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null;
-  };
-in
-import ./node-packages.nix {
-  inherit (pkgs) fetchurl nix-gitignore stdenv lib fetchgit;
-  inherit nodeEnv;
-}
--- a/pkgs/servers/monitoring/prometheus/webui/codemirror-promql/node-packages.nix
+++ b/pkgs/servers/monitoring/prometheus/webui/codemirror-promql/node-packages.nix
--- a/pkgs/servers/monitoring/prometheus/webui/codemirror-promql/package-lock.json
+++ b/pkgs/servers/monitoring/prometheus/webui/codemirror-promql/package-lock.json
--- a/pkgs/servers/monitoring/prometheus/webui/codemirror-promql/package.json
+++ b/pkgs/servers/monitoring/prometheus/webui/codemirror-promql/package.json
@ -1,93 +0,0 @@
-{
-  "name": "codemirror-promql",
-  "version": "0.17.0",
-  "description": "a CodeMirror mode for the PromQL language",
-  "main": "cjs/index.js",
-  "module": "esm/index.js",
-  "scripts": {
-    "start": "webpack-dev-server --config webpack.config.cjs --open",
-    "build": "npm run build:grammar && npm run build:lib && npm run build:app",
-    "build:grammar": "lezer-generator src/lang-promql/grammar/promql.grammar -o src/lang-promql/grammar/parser",
-    "build:lib": "bash ./build.sh",
-    "build:app": "webpack --config webpack.config.cjs",
-    "test": "npm run build:grammar && ts-mocha -p tsconfig.json src/**/*.test.ts",
-    "test-coverage": "npm run build:grammar && nyc ts-mocha -p ./tsconfig.json ./**/*.test.ts",
-    "codecov": "nyc report --reporter=text-lcov > coverage.lcov && codecov",
-    "lint": "eslint src/ --ext .ts",
-    "lint:fix": "eslint --fix src/ --ext .ts"
-  },
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/prometheus-community/codemirror-promql.git"
-  },
-  "keywords": [
-    "promql",
-    "codemirror",
-    "mode",
-    "prometheus"
-  ],
-  "author": "Prometheus Authors <prometheus-developers@googlegroups.com>",
-  "license": "MIT",
-  "bugs": {
-    "url": "https://github.com/prometheus-community/codemirror-promql/issues"
-  },
-  "homepage": "https://github.com/prometheus-community/codemirror-promql/blob/master/README.md",
-  "dependencies": {
-    "lru-cache": "^6.0.0"
-  },
-  "devDependencies": {
-    "@codemirror/autocomplete": "^0.18.3",
-    "@codemirror/basic-setup": "^0.18.0",
-    "@codemirror/highlight": "^0.18.3",
-    "@codemirror/language": "^0.18.0",
-    "@codemirror/lint": "^0.18.1",
-    "@codemirror/state": "^0.18.2",
-    "@codemirror/view": "^0.18.1",
-    "@types/chai": "^4.2.12",
-    "@types/lru-cache": "^5.1.0",
-    "@types/mocha": "^8.0.3",
-    "@types/node": "^14.0.13",
-    "@typescript-eslint/eslint-plugin": "^2.22.0",
-    "@typescript-eslint/parser": "^2.22.0",
-    "chai": "^4.2.0",
-    "clean-webpack-plugin": "^3.0.0",
-    "codecov": "^3.8.1",
-    "eslint": "^6.8.0",
-    "eslint-config-prettier": "^6.11.0",
-    "eslint-plugin-flowtype": "^5.2.0",
-    "eslint-plugin-import": "^2.22.0",
-    "eslint-plugin-prettier": "^3.1.4",
-    "html-webpack-plugin": "^4.3.0",
-    "isomorphic-fetch": "^3.0.0",
-    "lezer": "^0.13.1",
-    "lezer-generator": "^0.13.1",
-    "mocha": "^8.1.2",
-    "nock": "^13.0.11",
-    "nyc": "^15.1.0",
-    "prettier": "^2.0.5",
-    "ts-loader": "^7.0.4",
-    "ts-mocha": "^8.0.0",
-    "ts-node": "^9.0.0",
-    "typescript": "^4.2.3",
-    "webpack": "^4.43.0",
-    "webpack-cli": "^3.3.11",
-    "webpack-dev-server": "^3.11.0"
-  },
-  "peerDependencies": {
-    "@codemirror/autocomplete": "^0.18.3",
-    "@codemirror/highlight": "^0.18.3",
-    "@codemirror/language": "^0.18.0",
-    "@codemirror/lint": "^0.18.1",
-    "@codemirror/state": "^0.18.2",
-    "@codemirror/view": "^0.18.1",
-    "lezer": "^0.13.0"
-  },
-  "prettier": {
-    "singleQuote": true,
-    "trailingComma": "es5",
-    "printWidth": 150
-  },
-  "engines": {
-    "node": ">=12.0.0"
-  }
-}
--- a/pkgs/servers/monitoring/prometheus/webui/update-web-deps.sh
+++ b/pkgs/servers/monitoring/prometheus/webui/update-web-deps.sh
@ -1,32 +0,0 @@
-#!/usr/bin/env nix-shell
-#! nix-shell -i bash -p nodePackages.node2nix
-set -euo pipefail
-
-if [[ "$#" -ne 1 || "$1" == -* ]]; then
-    echo "Regenerates the npm dependency lock files for the prometheus package."
-    echo "Usage: $0 <git release tag>"
-    exit 1
-fi
-
-update() {
-    RELEASE_TAG=$1
-    GIT_PATH=$2
-    OUTPUT_PATH=$3
-    NODE_ENV=$4
-
-    PROM_WEB_SRC="https://raw.githubusercontent.com/prometheus/prometheus/$1"
-    wget "$PROM_WEB_SRC/$GIT_PATH/package.json" -O package.json
-    wget "$PROM_WEB_SRC/$GIT_PATH/package-lock.json" -O package-lock.json
-
-    node2nix \
-        --lock package-lock.json \
-        --development \
-        --node-env $NODE_ENV \
-        --no-copy-node-env
-
-    mkdir -p $OUTPUT_PATH
-    mv default.nix node-packages.nix package.json package-lock.json $OUTPUT_PATH
-}
-
-update $1 "web/ui/module/codemirror-promql" "codemirror-promql" ../../../../../development/node-packages/node-env.nix
-update $1 "web/ui/react-app" "webui" ../../../../../development/node-packages/node-env.nix
--- a/pkgs/servers/monitoring/prometheus/webui/webui/default.nix
+++ b/pkgs/servers/monitoring/prometheus/webui/webui/default.nix
@ -1,17 +0,0 @@
-# This file has been generated by node2nix 1.9.0. Do not edit!
-
-{pkgs ? import <nixpkgs> {
-    inherit system;
-  }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-12_x"}:
-
-let
-  nodeEnv = import ../../../../../development/node-packages/node-env.nix {
-    inherit (pkgs) stdenv lib python2 runCommand writeTextFile writeShellScript;
-    inherit pkgs nodejs;
-    libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null;
-  };
-in
-import ./node-packages.nix {
-  inherit (pkgs) fetchurl nix-gitignore stdenv lib fetchgit;
-  inherit nodeEnv;
-}
--- a/pkgs/servers/monitoring/prometheus/webui/webui/node-packages.nix
+++ b/pkgs/servers/monitoring/prometheus/webui/webui/node-packages.nix
--- a/pkgs/servers/monitoring/prometheus/webui/webui/package-lock.json
+++ b/pkgs/servers/monitoring/prometheus/webui/webui/package-lock.json
--- a/pkgs/servers/monitoring/prometheus/webui/webui/package.json
+++ b/pkgs/servers/monitoring/prometheus/webui/webui/package.json
@ -1,109 +0,0 @@
-{
-  "name": "graph",
-  "version": "0.1.0",
-  "private": true,
-  "dependencies": {
-    "@codemirror/autocomplete": "^0.18.3",
-    "@codemirror/closebrackets": "^0.18.0",
-    "@codemirror/commands": "^0.18.0",
-    "@codemirror/comment": "^0.18.0",
-    "@codemirror/highlight": "^0.18.3",
-    "@codemirror/history": "^0.18.0",
-    "@codemirror/language": "^0.18.0",
-    "@codemirror/lint": "^0.18.1",
-    "@codemirror/matchbrackets": "^0.18.0",
-    "@codemirror/search": "^0.18.2",
-    "@codemirror/state": "^0.18.2",
-    "@codemirror/view": "^0.18.3",
-    "@forevolve/bootstrap-dark": "^1.0.0",
-    "@fortawesome/fontawesome-svg-core": "^1.2.14",
-    "@fortawesome/free-solid-svg-icons": "^5.7.1",
-    "@fortawesome/react-fontawesome": "^0.1.4",
-    "@nexucis/fuzzy": "^0.3.0",
-    "bootstrap": "^4.6.0",
-    "codemirror-promql": "^0.17.0",
-    "css.escape": "^1.5.1",
-    "downshift": "^3.4.8",
-    "i": "^0.3.6",
-    "jquery": "^3.5.1",
-    "jquery.flot.tooltip": "^0.9.0",
-    "jsdom": "^16.4.0",
-    "moment": "^2.24.0",
-    "moment-timezone": "^0.5.23",
-    "popper.js": "^1.14.3",
-    "react": "^16.7.0",
-    "react-copy-to-clipboard": "^5.0.1",
-    "react-dom": "^16.7.0",
-    "react-resize-detector": "^5.0.7",
-    "react-router-dom": "^5.2.1",
-    "react-test-renderer": "^16.9.0",
-    "reactstrap": "^8.9.0",
-    "sanitize-html": "^2.3.3",
-    "sass": "1.39.0",
-    "tempusdominus-bootstrap-4": "^5.1.2",
-    "tempusdominus-core": "^5.0.3",
-    "use-media": "^1.4.0"
-  },
-  "scripts": {
-    "start": "react-scripts start",
-    "build": "react-scripts build",
-    "test": "react-scripts test --runInBand --resetMocks=false",
-    "test:debug": "react-scripts --inspect-brk test --runInBand --no-cache",
-    "eject": "react-scripts eject",
-    "lint:ci": "eslint --quiet \"src/**/*.{ts,tsx}\"",
-    "lint": "eslint --fix \"src/**/*.{ts,tsx}\""
-  },
-  "prettier": {
-    "singleQuote": true,
-    "trailingComma": "es5",
-    "printWidth": 125
-  },
-  "browserslist": [
-    ">0.2%",
-    "not dead",
-    "not ie <= 11",
-    "not op_mini all"
-  ],
-  "devDependencies": {
-    "@testing-library/react-hooks": "^3.1.1",
-    "@types/enzyme": "^3.10.3",
-    "@types/enzyme-adapter-react-16": "^1.0.5",
-    "@types/flot": "0.0.32",
-    "@types/jest": "^27.0.0",
-    "@types/jquery": "^3.5.1",
-    "@types/moment-timezone": "^0.5.10",
-    "@types/node": "^12.11.1",
-    "@types/react": "^16.8.2",
-    "@types/react-copy-to-clipboard": "^5.0.0",
-    "@types/react-dom": "^16.8.0",
-    "@types/react-resize-detector": "^5.0.0",
-    "@types/react-router-dom": "^5.1.8",
-    "@types/reactstrap": "^8.7.2",
-    "@types/sanitize-html": "^1.20.2",
-    "@types/sinon": "^9.0.4",
-    "enzyme": "^3.10.0",
-    "enzyme-adapter-react-16": "^1.15.1",
-    "enzyme-to-json": "^3.4.3",
-    "eslint-config-prettier": "^8.3.0",
-    "eslint-config-react-app": "^6.0.0",
-    "eslint-plugin-prettier": "^4.0.0",
-    "jest-fetch-mock": "^3.0.3",
-    "mutationobserver-shim": "^0.3.7",
-    "prettier": "^2.3.2",
-    "react-scripts": "4.0.3",
-    "sinon": "^9.0.3",
-    "typescript": "^4.4.2"
-  },
-  "proxy": "http://localhost:9090",
-  "jest": {
-    "snapshotSerializers": [
-      "enzyme-to-json/serializer"
-    ],
-    "transformIgnorePatterns": [
-      "/node_modules/(?!codemirror-promql).+(js|jsx)$"
-    ]
-  },
-  "optionalDependencies": {
-    "fsevents": "^2.3.2"
-  }
-}
--- a/pkgs/stdenv/darwin/default.nix
+++ b/pkgs/stdenv/darwin/default.nix
@ -75,7 +75,7 @@ rec {
    inherit (bootstrapFiles) mkdir bzip2 cpio tarball;

    __impureHostDeps = commonImpureHostDeps;
-  } // lib.optionalAttrs (config.contentAddressedByDefault or false) {
+  } // lib.optionalAttrs config.contentAddressedByDefault {
    __contentAddressed = true;
    outputHashAlgo = "sha256";
    outputHashMode = "recursive";
--- a/pkgs/stdenv/freebsd/default.nix
+++ b/pkgs/stdenv/freebsd/default.nix
@ -182,7 +182,7 @@ in
      buildInputs = [ make ];
      mkdir = "/bin/mkdir";
      ln = "/bin/ln";
-    } // lib.optionalAttrs (config.contentAddressedByDefault or false) {
+    } // lib.optionalAttrs config.contentAddressedByDefault {
      __contentAddressed = true;
      outputHashAlgo = "sha256";
      outputHashMode = "recursive";
--- a/pkgs/stdenv/generic/default.nix
+++ b/pkgs/stdenv/generic/default.nix
@ -90,7 +90,7 @@ let
      allowedRequisites = allowedRequisites
        ++ defaultNativeBuildInputs ++ defaultBuildInputs;
    }
-    // lib.optionalAttrs (config.contentAddressedByDefault or false) {
+    // lib.optionalAttrs config.contentAddressedByDefault {
      __contentAddressed = true;
      outputHashAlgo = "sha256";
      outputHashMode = "recursive";
--- a/pkgs/stdenv/generic/make-derivation.nix
+++ b/pkgs/stdenv/generic/make-derivation.nix
@ -69,7 +69,7 @@ in
 , doInstallCheck ? config.doCheckByDefault or false

 , # TODO(@Ericson2314): Make always true and remove
-  strictDeps ? stdenv.hostPlatform != stdenv.buildPlatform
+  strictDeps ? if config.strictDepsByDefault then true else stdenv.hostPlatform != stdenv.buildPlatform
 , meta ? {}
 , passthru ? {}
 , pos ? # position used in error messages and for meta.position
@ -93,7 +93,7 @@ in

 , __contentAddressed ?
  (! attrs ? outputHash) # Fixed-output drvs can't be content addressed too
-  && (config.contentAddressedByDefault or false)
+  && config.contentAddressedByDefault

 , ... } @ attrs:

--- a/pkgs/stdenv/linux/default.nix
+++ b/pkgs/stdenv/linux/default.nix
@ -66,7 +66,7 @@ let
  bootstrapTools = import (if localSystem.libc == "musl" then ./bootstrap-tools-musl else ./bootstrap-tools) {
    inherit system bootstrapFiles;
    extraAttrs = lib.optionalAttrs
-      (config.contentAddressedByDefault or false)
+      config.contentAddressedByDefault
      {
        __contentAddressed = true;
        outputHashAlgo = "sha256";
--- a/pkgs/stdenv/linux/make-bootstrap-tools.nix
+++ b/pkgs/stdenv/linux/make-bootstrap-tools.nix
@ -235,7 +235,7 @@ in with pkgs; rec {

  bootstrapTools =
    let extraAttrs = lib.optionalAttrs
-      (config.contentAddressedByDefault or false)
+      config.contentAddressedByDefault
      {
        __contentAddressed = true;
        outputHashAlgo = "sha256";
--- a/pkgs/tools/graphics/pixel2svg/default.nix
+++ b/pkgs/tools/graphics/pixel2svg/default.nix
@ -0,0 +1,20 @@
+{ lib, buildPythonPackage, fetchurl, python310Packages }:
+
+python310Packages.buildPythonPackage rec {
+  pname = "pixel2svg";
+  version = "0.3.0";
+
+  src = fetchurl {
+    url = "https://static.florian-berger.de/pixel2svg-${version}.zip";
+    sha256 = "sha256-aqcTTmZKcdRdVd8GGz5cuaQ4gjPapVJNtiiZu22TZgQ=";
+  };
+
+  propagatedBuildInputs = with python310Packages; [ pillow svgwrite ];
+
+  meta = with lib; {
+    homepage = "https://florian-berger.de/en/software/pixel2svg/";
+    description = "Converts pixel art to SVG - pixel by pixel";
+    license = licenses.gpl3Plus;
+    maintainers = with maintainers; [ papojari ];
+  };
+}
--- a/pkgs/tools/misc/bcunit/default.nix
+++ b/pkgs/tools/misc/bcunit/default.nix
@ -5,9 +5,7 @@

 stdenv.mkDerivation rec {
  pname = "bcunit";
-  # Latest release 3.0.2 is missing some functions needed by bctoolbox. See:
-  # https://gitlab.linphone.org/BC/public/bcunit/issues/1
-  version = "unstable-2019-11-19";
+  version = "linphone-4.4.1";

  nativeBuildInputs = [ cmake ];
  src = fetchFromGitLab {
@ -15,12 +13,12 @@ stdenv.mkDerivation rec {
    owner = "public";
    group = "BC";
    repo = pname;
-    rev = "3c720fbf67dd3c02b0c7011ed4036982b2c93532";
-    sha256 = "1237hpmkls2igp60gdfkbknxpgwvxn1vmv2m41vyl25xw1d3g35w";
+    rev = "c5eebcc7f794e9567d3c72d15d3f28bffe6bfd0f";
+    sha256 = "sha256-8DSfqHerx/V00SJjTSQaG9Rjqx330iG6sGivBDUvQfA=";
  };

  meta = with lib; {
-    description = "A fork of CUnit test framework";
+    description = "Belledonne Communications' fork of CUnit test framework. Part of the Linphone project.";
    homepage = "https://gitlab.linphone.org/BC/public/bcunit";
    license = licenses.lgpl2Plus;
    maintainers = with maintainers; [ raskin jluttine ];
--- a/Show More
+++ b/Show More