Merge branch 'master' into staging-next-2022-04-23

2022-04-28 18:04:16 +02:00 · 2022-04-28 18:04:16 +02:00 · 8caa1418f6
parent 51554cbbdb 0cd6f99f95
commit 8caa1418f6
234 changed files with 2022 additions and 100963 deletions
--- a/.github/workflows/update-terraform-providers.yml
+++ b/.github/workflows/update-terraform-providers.yml
@ -28,11 +28,12 @@ jobs:
        uses: peter-evans/create-pull-request@v3
        with:
          body: |
-            Automatic update of terraform providers.
+            Automatic update by [update-terraform-providers](https://github.com/NixOS/nixpkgs/blob/master/.github/workflows/update-terraform-providers.yml) action.

-            Created by [update-terraform-providers](https://github.com/NixOS/nixpkgs/blob/master/.github/workflows/update-terraform-providers.yml) action.
-
-            Check that all providers build with `@ofborg build terraform-full`
+            Check that all providers build with:
+            ```
+            @ofborg build terraform-full
+            ```
          branch: terraform-providers-update
          delete-branch: false
          labels: "2.status: work-in-progress"
--- a/lib/default.nix
+++ b/lib/default.nix
@ -94,7 +94,8 @@ let
      concatImapStringsSep makeSearchPath makeSearchPathOutput
      makeLibraryPath makeBinPath optionalString
      hasInfix hasPrefix hasSuffix stringToCharacters stringAsChars escape
-      escapeShellArg escapeShellArgs escapeRegex escapeXML replaceChars lowerChars
+      escapeShellArg escapeShellArgs isValidPosixName toShellVar toShellVars
+      escapeRegex escapeXML replaceChars lowerChars
      upperChars toLower toUpper addContextFrom splitString
      removePrefix removeSuffix versionOlder versionAtLeast
      getName getVersion
--- a/lib/strings.nix
+++ b/lib/strings.nix
@ -17,6 +17,7 @@ rec {
    head
    isInt
    isList
+    isAttrs
    isString
    match
    parseDrvName
@ -324,6 +325,65 @@ rec {
  */
  escapeShellArgs = concatMapStringsSep " " escapeShellArg;

+  /* Test whether the given name is a valid POSIX shell variable name.
+
+     Type: string -> bool
+
+     Example:
+       isValidPosixName "foo_bar000"
+       => true
+       isValidPosixName "0-bad.jpg"
+       => false
+  */
+  isValidPosixName = name: match "[a-zA-Z_][a-zA-Z0-9_]*" name != null;
+
+  /* Translate a Nix value into a shell variable declaration, with proper escaping.
+
+     Supported value types are strings (mapped to regular variables), lists of strings
+     (mapped to Bash-style arrays) and attribute sets of strings (mapped to Bash-style
+     associative arrays). Note that "strings" include string-coercible values like paths.
+
+     Strings are translated into POSIX sh-compatible code; lists and attribute sets
+     assume a shell that understands Bash syntax (e.g. Bash or ZSH).
+
+     Type: string -> (string | listOf string | attrsOf string) -> string
+
+     Example:
+       ''
+         ${toShellVar "foo" "some string"}
+         [[ "$foo" == "some string" ]]
+       ''
+  */
+  toShellVar = name: value:
+    lib.throwIfNot (isValidPosixName name) "toShellVar: ${name} is not a valid shell variable name" (
+    if isAttrs value then
+      "declare -A ${name}=(${
+        concatStringsSep " " (lib.mapAttrsToList (n: v:
+          "[${escapeShellArg n}]=${escapeShellArg v}"
+        ) value)
+      })"
+    else if isList value then
+      "declare -a ${name}=(${escapeShellArgs value})"
+    else
+      "${name}=${escapeShellArg value}"
+    );
+
+  /* Translate an attribute set into corresponding shell variable declarations
+     using `toShellVar`.
+
+     Type: attrsOf (string | listOf string | attrsOf string) -> string
+
+     Example:
+       let
+         foo = "value";
+         bar = foo;
+       in ''
+         ${toShellVars { inherit foo bar; }}
+         [[ "$foo" == "$bar" ]]
+       ''
+  */
+  toShellVars = vars: concatStringsSep "\n" (lib.mapAttrsToList toShellVar vars);
+
  /* Turn a string into a Nix expression representing that string

     Type: string -> string
--- 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/misc.nix
+++ b/lib/tests/misc.nix
@ -251,6 +251,26 @@ runTests {
    expected = "&quot;test&quot; &apos;test&apos; &lt; &amp; &gt;";
  };

+  testToShellVars = {
+    expr = ''
+      ${toShellVars {
+        STRing01 = "just a 'string'";
+        _array_ = [ "with" "more strings" ];
+        assoc."with some" = ''
+          strings
+          possibly newlines
+        '';
+      }}
+    '';
+    expected = ''
+      STRing01='just a '\'''string'\''''
+      declare -a _array_=('with' 'more strings')
+      declare -A assoc=(['with some']='strings
+      possibly newlines
+      ')
+    '';
+  };
+
 # LISTS

  testFilter = {
--- 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
@ -4716,6 +4716,12 @@
    githubId = 201997;
    name = "Eric Seidel";
  };
+  grindhold = {
+    name = "grindhold";
+    email = "grindhold+nix@skarphed.org";
+    github = "grindhold";
+    githubId = 2592640;
+  };
  gspia = {
    email = "iahogsp@gmail.com";
    github = "gspia";
@ -5605,6 +5611,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 +12510,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";
@ -13510,7 +13528,7 @@
    name = "Andrei Pampu";
  };
  wolfangaukang = {
-    email = "liquid.query960@4wrd.cc";
+    email = "clone.gleeful135+nixpkgs@anonaddy.me";
    github = "wolfangaukang";
    githubId = 8378365;
    name = "P. R. d. O.";
@ -13563,6 +13581,13 @@
    github = "wunderbrick";
    githubId = 52174714;
  };
+  wyndon = {
+    email = "72203260+wyndon@users.noreply.github.com";
+    matrix = "@wyndon:envs.net";
+    github = "wyndon";
+    githubId = 72203260;
+    name = "wyndon";
+  };
  wyvie = {
    email = "elijahrum@gmail.com";
    github = "wyvie";
--- 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/nixos/modules/services/x11/desktop-managers/pantheon.xml
+++ b/nixos/modules/services/x11/desktop-managers/pantheon.xml
@ -3,7 +3,7 @@
         xml:id="chap-pantheon">
 <title>Pantheon Desktop</title>
 <para>
-  Pantheon is the desktop environment created for the elementary OS distribution. It is written from scratch in Vala, utilizing GNOME technologies with GTK 3 and Granite.
+  Pantheon is the desktop environment created for the elementary OS distribution. It is written from scratch in Vala, utilizing GNOME technologies with GTK and Granite.
 </para>
 <section xml:id="sec-pantheon-enable">
  <title>Enabling Pantheon</title>
@ -89,9 +89,9 @@ switchboard-with-plugs.override {
     </para>
    </listitem>
   </varlistentry>
-   <varlistentry xml:id="sec-pantheon-faq-gnome3-and-pantheon">
+   <varlistentry xml:id="sec-pantheon-faq-gnome-and-pantheon">
    <term>
-     I cannot enable both GNOME 3 and Pantheon.
+     I cannot enable both GNOME and Pantheon.
    </term>
    <listitem>
     <para>
--- a/pkgs/applications/audio/noise-repellent/default.nix
+++ b/pkgs/applications/audio/noise-repellent/default.nix
@ -1,22 +1,24 @@
-{ lib, stdenv, fetchFromGitHub, meson, ninja, pkg-config, fftwFloat, lv2 }:
+{ lib, stdenv, fetchFromGitHub, meson, ninja, pkg-config, cmake, libspecbleach, lv2 }:

 stdenv.mkDerivation rec {
  pname = "noise-repellent";
-  version = "0.1.5";
+  version = "0.2.1";

  src = fetchFromGitHub {
    owner = "lucianodato";
    repo = pname;
-    rev = version;
-    sha256 = "0hb89x9i2knzan46q4nwscf5zmnb2nwf4w13xl2c0y1mx1ls1mwl";
-    fetchSubmodules = true;
+    rev = "v${version}";
+    sha256 = "sha256-hMNVzhJZFGFeu5aygLkfq495O0zpaIk41ddzejvDITE=";
  };

-  mesonFlags = ("--prefix=${placeholder "out"}/lib/lv2");
+  mesonFlags = [
+    "--prefix=${placeholder "out"}/lib/lv2"
+    "--buildtype=release"
+  ];

-  nativeBuildInputs = [ meson ninja pkg-config ];
+  nativeBuildInputs = [ meson ninja pkg-config cmake ];
  buildInputs = [
-    fftwFloat lv2
+    libspecbleach lv2
  ];

  meta = with lib; {
@ -24,6 +26,6 @@ stdenv.mkDerivation rec {
    homepage    = "https://github.com/lucianodato/noise-repellent";
    license     = licenses.gpl3;
    maintainers = [ maintainers.magnetophon ];
-    platforms = [ "x86_64-linux" "i686-linux" "x86_64-darwin" "i686-darwin"  ];
+    platforms = platforms.unix;
  };
 }
--- 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/jetbrains/default.nix
+++ b/pkgs/applications/editors/jetbrains/default.nix
@ -1,6 +1,6 @@
 { lib, stdenv, callPackage, fetchurl
-, jdk, cmake, zlib, python3
-, dotnet-sdk_5
+, jdk, cmake, gdb, zlib, python3
+, dotnet-sdk_6
 , maven
 , autoPatchelfHook
 , libdbusmenu
@ -53,6 +53,9 @@ let
          # bundled cmake does not find libc
          rm -rf bin/cmake/linux
          ln -s ${cmake} bin/cmake/linux
+          # bundled gdb does not find libcrypto 10
+          rm -rf bin/gdb/linux
+          ln -s ${gdb} bin/gdb/linux

          autoPatchelf $PWD/bin

@ -207,7 +210,7 @@ let
      postPatch = lib.optionalString (!stdenv.isDarwin) (attrs.postPatch + ''
        rm -rf lib/ReSharperHost/linux-x64/dotnet
        mkdir -p lib/ReSharperHost/linux-x64/dotnet/
-        ln -s ${dotnet-sdk_5}/bin/dotnet lib/ReSharperHost/linux-x64/dotnet/dotnet
+        ln -s ${dotnet-sdk_6}/bin/dotnet lib/ReSharperHost/linux-x64/dotnet/dotnet
      '');
    });

--- a/pkgs/applications/editors/jetbrains/versions.json
+++ b/pkgs/applications/editors/jetbrains/versions.json
@ -3,26 +3,26 @@
    "clion": {
      "update-channel": "CLion RELEASE",
      "url-template": "https://download.jetbrains.com/cpp/CLion-{version}.tar.gz",
-      "version": "2021.3.3",
-      "sha256": "35986be8adfe0a291a0d2d550c1bf4861ae6c33ecbc71198a472e0ac01a0f10d",
-      "url": "https://download.jetbrains.com/cpp/CLion-2021.3.3.tar.gz",
-      "version-major-minor": "2021.3"
+      "version": "2022.1",
+      "sha256": "a8ad8db6362d60a5ce60a7552110887dbd12e8420c839c368b55808b68dea38b",
+      "url": "https://download.jetbrains.com/cpp/CLion-2022.1.tar.gz",
+      "version-major-minor": "2022.1"
    },
    "datagrip": {
      "update-channel": "DataGrip RELEASE",
      "url-template": "https://download.jetbrains.com/datagrip/datagrip-{version}.tar.gz",
-      "version": "2021.3.4",
-      "sha256": "a34670f1a6c77e00237302a70f22fb5bf089dfe128341fd89b2f25bb8becb325",
-      "url": "https://download.jetbrains.com/datagrip/datagrip-2021.3.4.tar.gz",
-      "version-major-minor": "2021.3"
+      "version": "2022.1.1",
+      "sha256": "d4ffcb4371ee6e9f03704fa6282630349fd4ff4759846c02d43bb37e3caeae67",
+      "url": "https://download.jetbrains.com/datagrip/datagrip-2022.1.1.tar.gz",
+      "version-major-minor": "2022.1.1"
    },
    "goland": {
      "update-channel": "GoLand RELEASE",
      "url-template": "https://download.jetbrains.com/go/goland-{version}.tar.gz",
-      "version": "2021.3.3",
-      "sha256": "9d2b709703516eddeb7f4d6568a7de2e268de4258c7bc7787baee806fbaee4a3",
-      "url": "https://download.jetbrains.com/go/goland-2021.3.3.tar.gz",
-      "version-major-minor": "2021.3"
+      "version": "2022.1",
+      "sha256": "7803f432b62b7b9a9f340fd48375f50d60b0e5412b052b70e175de8edf82a947",
+      "url": "https://download.jetbrains.com/go/goland-2022.1.tar.gz",
+      "version-major-minor": "2022.1"
    },
    "idea-community": {
      "update-channel": "IntelliJ IDEA RELEASE",
@ -51,76 +51,76 @@
    "phpstorm": {
      "update-channel": "PhpStorm RELEASE",
      "url-template": "https://download.jetbrains.com/webide/PhpStorm-{version}.tar.gz",
-      "version": "2021.3.2",
-      "sha256": "761b347142035e8b74cc5a9939100af9d45f1f6ee29de1e78cd6b1ff06fe20e2",
-      "url": "https://download.jetbrains.com/webide/PhpStorm-2021.3.2.tar.gz",
-      "version-major-minor": "2021.3"
+      "version": "2022.1",
+      "sha256": "e30d6991c98addcc02ab05c623d0c42797d605db73c01b7c153bf2246c877395",
+      "url": "https://download.jetbrains.com/webide/PhpStorm-2022.1.tar.gz",
+      "version-major-minor": "2022.1"
    },
    "pycharm-community": {
      "update-channel": "PyCharm RELEASE",
      "url-template": "https://download.jetbrains.com/python/pycharm-community-{version}.tar.gz",
-      "version": "2021.3.2",
-      "sha256": "f1ae01f471d01c6f09aab0a761c6dea9834ef584f2aaf6d6ebecdce6b55a66e8",
-      "url": "https://download.jetbrains.com/python/pycharm-community-2021.3.2.tar.gz",
-      "version-major-minor": "2021.3"
+      "version": "2022.1",
+      "sha256": "35d857df0ac4bd76caba60ac329c9183594be142094d0592f2afa40534be85eb",
+      "url": "https://download.jetbrains.com/python/pycharm-community-2022.1.tar.gz",
+      "version-major-minor": "2022.1"
    },
    "pycharm-professional": {
      "update-channel": "PyCharm RELEASE",
      "url-template": "https://download.jetbrains.com/python/pycharm-professional-{version}.tar.gz",
-      "version": "2021.3.2",
-      "sha256": "6bd9573a84c1f2ae6b9b6612f0859aee21133f479ace43602dc0af879f9d9e67",
-      "url": "https://download.jetbrains.com/python/pycharm-professional-2021.3.2.tar.gz",
-      "version-major-minor": "2021.3"
+      "version": "2022.1",
+      "sha256": "9b160ed74f384be31ff376af73f91924a212e6440ce142a581b22f261e6cf605",
+      "url": "https://download.jetbrains.com/python/pycharm-professional-2022.1.tar.gz",
+      "version-major-minor": "2022.1"
    },
    "rider": {
      "update-channel": "Rider RELEASE",
      "url-template": "https://download.jetbrains.com/rider/JetBrains.Rider-{version}.tar.gz",
-      "version": "2021.3.3",
-      "sha256": "1dc57d5d7932d4a8dea51fc5cbdaa52f9626490092978f02fa15bb41cb84068f",
-      "url": "https://download.jetbrains.com/rider/JetBrains.Rider-2021.3.3.tar.gz",
-      "version-major-minor": "2021.3"
+      "version": "2022.1",
+      "sha256": "e5d2018bf352f4ff17299d2ee4f286d654946fe4dac2ff47d3dc853820364673",
+      "url": "https://download.jetbrains.com/rider/JetBrains.Rider-2022.1.tar.gz",
+      "version-major-minor": "2022.1"
    },
    "ruby-mine": {
      "update-channel": "RubyMine RELEASE",
      "url-template": "https://download.jetbrains.com/ruby/RubyMine-{version}.tar.gz",
-      "version": "2021.3.2",
-      "sha256": "697510ee2401bb7cbe75193f015d8c2dd1677117defbc2a6f5f3c1443f20dea2",
-      "url": "https://download.jetbrains.com/ruby/RubyMine-2021.3.2.tar.gz",
-      "version-major-minor": "2021.3"
+      "version": "2022.1",
+      "sha256": "495c0d86eb7f3bed0ed692a7ae37e8b3b333c58ae891ca3891a311db6b951401",
+      "url": "https://download.jetbrains.com/ruby/RubyMine-2022.1.tar.gz",
+      "version-major-minor": "2022.1"
    },
    "webstorm": {
      "update-channel": "WebStorm RELEASE",
      "url-template": "https://download.jetbrains.com/webstorm/WebStorm-{version}.tar.gz",
-      "version": "2021.3.2",
-      "sha256": "18a53c1b1b92e9b7e516b425a390f23f46b880a704d1cb223d1ba64410b15060",
-      "url": "https://download.jetbrains.com/webstorm/WebStorm-2021.3.2.tar.gz",
-      "version-major-minor": "2021.3"
+      "version": "2022.1",
+      "sha256": "d9dd5815cc456d74f7dc47533ade3990d0f2f9ce0c4dab3d5ae9b04e01d1746c",
+      "url": "https://download.jetbrains.com/webstorm/WebStorm-2022.1.tar.gz",
+      "version-major-minor": "2022.1"
    }
  },
  "x86_64-darwin": {
    "clion": {
      "update-channel": "CLion RELEASE",
      "url-template": "https://download.jetbrains.com/cpp/CLion-{version}.dmg",
-      "version": "2021.3.3",
-      "sha256": "342a4d8549ae4623a5edfa7f9737887cf0a25c1a61bb414b54b742b1c5a1a84d",
-      "url": "https://download.jetbrains.com/cpp/CLion-2021.3.3.dmg",
-      "version-major-minor": "2021.3"
+      "version": "2022.1",
+      "sha256": "4972403e5ed7587ad76dcfb08b975879a2a955e9be9f88344e369cd4006b2d52",
+      "url": "https://download.jetbrains.com/cpp/CLion-2022.1.dmg",
+      "version-major-minor": "2022.1"
    },
    "datagrip": {
      "update-channel": "DataGrip RELEASE",
      "url-template": "https://download.jetbrains.com/datagrip/datagrip-{version}.dmg",
-      "version": "2021.3.4",
-      "sha256": "27e709d2ced66d37a615d8c56885828e49a08962708e28df1a20f324c626bf52",
-      "url": "https://download.jetbrains.com/datagrip/datagrip-2021.3.4.dmg",
-      "version-major-minor": "2021.3"
+      "version": "2022.1.1",
+      "sha256": "6ea0c0c972bad06fd0378a2c1e9a1cb1b3ec50d52cc98d0f9c98327cc7af2a1e",
+      "url": "https://download.jetbrains.com/datagrip/datagrip-2022.1.1.dmg",
+      "version-major-minor": "2022.1.1"
    },
    "goland": {
      "update-channel": "GoLand RELEASE",
      "url-template": "https://download.jetbrains.com/go/goland-{version}.dmg",
-      "version": "2021.3.3",
-      "sha256": "4b245b6fe0cf588adbf36e68f12397d5fd311b0b6d49f17ba374ebaa10d207c9",
-      "url": "https://download.jetbrains.com/go/goland-2021.3.3.dmg",
-      "version-major-minor": "2021.3"
+      "version": "2022.1",
+      "sha256": "ec44455e83b8c8d85614b63815245a0dff984796a432e05801787c7f8474900b",
+      "url": "https://download.jetbrains.com/go/goland-2022.1.dmg",
+      "version-major-minor": "2022.1"
    },
    "idea-community": {
      "update-channel": "IntelliJ IDEA RELEASE",
@ -149,76 +149,76 @@
    "phpstorm": {
      "update-channel": "PhpStorm RELEASE",
      "url-template": "https://download.jetbrains.com/webide/PhpStorm-{version}.dmg",
-      "version": "2021.3.2",
-      "sha256": "596a9d5fdc30d5fba65ddd482da90f9d555fed748b930587562022bfe7df4e14",
-      "url": "https://download.jetbrains.com/webide/PhpStorm-2021.3.2.dmg",
-      "version-major-minor": "2021.3"
+      "version": "2022.1",
+      "sha256": "daa3c749b3a41e106384ac8e003957a46f38dfc844cebfce8c802c4a223535b8",
+      "url": "https://download.jetbrains.com/webide/PhpStorm-2022.1.dmg",
+      "version-major-minor": "2022.1"
    },
    "pycharm-community": {
      "update-channel": "PyCharm RELEASE",
      "url-template": "https://download.jetbrains.com/python/pycharm-community-{version}.dmg",
-      "version": "2021.3.2",
-      "sha256": "b8f41f5dddeda0ed5f5c81ba57d2560ccc6e227987882fb6bf305b5d1d8c6909",
-      "url": "https://download.jetbrains.com/python/pycharm-community-2021.3.2.dmg",
-      "version-major-minor": "2021.3"
+      "version": "2022.1",
+      "sha256": "99ba20a8b0752ca58e1fc814fb19766fd19c376b42e3cbfa4102c67bc21942ec",
+      "url": "https://download.jetbrains.com/python/pycharm-community-2022.1.dmg",
+      "version-major-minor": "2022.1"
    },
    "pycharm-professional": {
      "update-channel": "PyCharm RELEASE",
      "url-template": "https://download.jetbrains.com/python/pycharm-professional-{version}.dmg",
-      "version": "2021.3.2",
-      "sha256": "188b998660e7cfb7ac1364c818c008a5608ab2aeb17c6cc19d1d9dda547d3775",
-      "url": "https://download.jetbrains.com/python/pycharm-professional-2021.3.2.dmg",
-      "version-major-minor": "2021.3"
+      "version": "2022.1",
+      "sha256": "ab5496370a6145073dbd423e47d6112d9c726a4a286d2528e66711f865d92d56",
+      "url": "https://download.jetbrains.com/python/pycharm-professional-2022.1.dmg",
+      "version-major-minor": "2022.1"
    },
    "rider": {
      "update-channel": "Rider RELEASE",
      "url-template": "https://download.jetbrains.com/rider/JetBrains.Rider-{version}.dmg",
-      "version": "2021.3.3",
-      "sha256": "41a0939cb6258a0fb303268c5a466a663cf3588af14bcbb351be4c3a1d158094",
-      "url": "https://download.jetbrains.com/rider/JetBrains.Rider-2021.3.3.dmg",
-      "version-major-minor": "2021.3"
+      "version": "2022.1",
+      "sha256": "38867fb7ca4b5af013f33b4db3b15994b6e732b121176f98480b5ff1b49ef17e",
+      "url": "https://download.jetbrains.com/rider/JetBrains.Rider-2022.1.dmg",
+      "version-major-minor": "2022.1"
    },
    "ruby-mine": {
      "update-channel": "RubyMine RELEASE",
      "url-template": "https://download.jetbrains.com/ruby/RubyMine-{version}.dmg",
-      "version": "2021.3.2",
-      "sha256": "ba27c14b21d66ca96a64ceb7dc5d9f0952254a5f405b3201f51d2ad3cc749a96",
-      "url": "https://download.jetbrains.com/ruby/RubyMine-2021.3.2.dmg",
-      "version-major-minor": "2021.3"
+      "version": "2022.1",
+      "sha256": "b33f34b889fde6ebe6348499e2ad15bb85937aba1e2a8a9543c411b2476ec4ff",
+      "url": "https://download.jetbrains.com/ruby/RubyMine-2022.1.dmg",
+      "version-major-minor": "2022.1"
    },
    "webstorm": {
      "update-channel": "WebStorm RELEASE",
      "url-template": "https://download.jetbrains.com/webstorm/WebStorm-{version}.dmg",
-      "version": "2021.3.2",
-      "sha256": "932d4920f831d1ceae68a474444c37d986277d8d3288d3aab93dd43d99336a36",
-      "url": "https://download.jetbrains.com/webstorm/WebStorm-2021.3.2.dmg",
-      "version-major-minor": "2021.3"
+      "version": "2022.1",
+      "sha256": "0bd2be5ea0ccabfb7a806ca4c46d33f1e9106c2256243c48091ff61d5ac29a08",
+      "url": "https://download.jetbrains.com/webstorm/WebStorm-2022.1.dmg",
+      "version-major-minor": "2022.1"
    }
  },
  "aarch64-darwin": {
    "clion": {
      "update-channel": "CLion RELEASE",
      "url-template": "https://download.jetbrains.com/cpp/CLion-{version}-aarch64.dmg",
-      "version": "2021.3.3",
-      "sha256": "fbf651fa4a5925fe729be30ca8a6fa3be84dc4d7827dbcf74f4d28c52b903cc2",
-      "url": "https://download.jetbrains.com/cpp/CLion-2021.3.3-aarch64.dmg",
-      "version-major-minor": "2021.3"
+      "version": "2022.1",
+      "sha256": "333d4ac5757f537ad67863dd6fb03644722ab8fce1596976fa99e5ae9de7991c",
+      "url": "https://download.jetbrains.com/cpp/CLion-2022.1-aarch64.dmg",
+      "version-major-minor": "2022.1"
    },
    "datagrip": {
      "update-channel": "DataGrip RELEASE",
      "url-template": "https://download.jetbrains.com/datagrip/datagrip-{version}-aarch64.dmg",
-      "version": "2021.3.4",
-      "sha256": "7a77ba9fce56c781ae6a4fc65eaab4bcc10780b6bd679b04d74146719e42890a",
-      "url": "https://download.jetbrains.com/datagrip/datagrip-2021.3.4-aarch64.dmg",
-      "version-major-minor": "2021.3"
+      "version": "2022.1.1",
+      "sha256": "2ba92ed34366b111a39ba0632d91dbaf232633f5f5557a208dd8ab7696179b6f",
+      "url": "https://download.jetbrains.com/datagrip/datagrip-2022.1.1-aarch64.dmg",
+      "version-major-minor": "2022.1.1"
    },
    "goland": {
      "update-channel": "GoLand RELEASE",
      "url-template": "https://download.jetbrains.com/go/goland-{version}-aarch64.dmg",
-      "version": "2021.3.3",
-      "sha256": "54397d48e20fb534206e13f84b35868b1eaea13175176487b1239b23db4e13db",
-      "url": "https://download.jetbrains.com/go/goland-2021.3.3-aarch64.dmg",
-      "version-major-minor": "2021.3"
+      "version": "2022.1",
+      "sha256": "0506a817e35a80d3d776484a88bf4136628b589a8f5754833387a8dec99798d3",
+      "url": "https://download.jetbrains.com/go/goland-2022.1-aarch64.dmg",
+      "version-major-minor": "2022.1"
    },
    "idea-community": {
      "update-channel": "IntelliJ IDEA RELEASE",
@ -247,50 +247,50 @@
    "phpstorm": {
      "update-channel": "PhpStorm RELEASE",
      "url-template": "https://download.jetbrains.com/webide/PhpStorm-{version}-aarch64.dmg",
-      "version": "2021.3.2",
-      "sha256": "ba15c3f843c85141a9adaec1c4611224a853bd98649148751e34ac304591a314",
-      "url": "https://download.jetbrains.com/webide/PhpStorm-2021.3.2-aarch64.dmg",
-      "version-major-minor": "2021.3"
+      "version": "2022.1",
+      "sha256": "d13744e7a70a9716f1b99cb9b77c77e17cb4710466a29db490ef6e707a54ae21",
+      "url": "https://download.jetbrains.com/webide/PhpStorm-2022.1-aarch64.dmg",
+      "version-major-minor": "2022.1"
    },
    "pycharm-community": {
      "update-channel": "PyCharm RELEASE",
      "url-template": "https://download.jetbrains.com/python/pycharm-community-{version}-aarch64.dmg",
-      "version": "2021.3.2",
-      "sha256": "407bf395cfb6d61f1c0861c7679b197238780e82a019e10162b8cd7130edb15a",
-      "url": "https://download.jetbrains.com/python/pycharm-community-2021.3.2-aarch64.dmg",
-      "version-major-minor": "2021.3"
+      "version": "2022.1",
+      "sha256": "1873565756716cb0eee23c60068dd5d394413b2b2e54b4b75cbe8b882540a0b7",
+      "url": "https://download.jetbrains.com/python/pycharm-community-2022.1-aarch64.dmg",
+      "version-major-minor": "2022.1"
    },
    "pycharm-professional": {
      "update-channel": "PyCharm RELEASE",
      "url-template": "https://download.jetbrains.com/python/pycharm-professional-{version}-aarch64.dmg",
-      "version": "2021.3.2",
-      "sha256": "12fa34d1e60a555bac230acea9cd46c7adfe9ca42ff3e458c79d33e5b88eb8db",
-      "url": "https://download.jetbrains.com/python/pycharm-professional-2021.3.2-aarch64.dmg",
-      "version-major-minor": "2021.3"
+      "version": "2022.1",
+      "sha256": "ba0ea4ff52703a53a9c7e14d42c9ae12688b94364ced77a28d4ed0c417c9642f",
+      "url": "https://download.jetbrains.com/python/pycharm-professional-2022.1-aarch64.dmg",
+      "version-major-minor": "2022.1"
    },
    "rider": {
      "update-channel": "Rider RELEASE",
      "url-template": "https://download.jetbrains.com/rider/JetBrains.Rider-{version}-aarch64.dmg",
-      "version": "2021.3.3",
-      "sha256": "65603860d1fd3134c5659f5a06de7cac17f3183a01056b79cfe72242b99adb37",
-      "url": "https://download.jetbrains.com/rider/JetBrains.Rider-2021.3.3-aarch64.dmg",
-      "version-major-minor": "2021.3"
+      "version": "2022.1",
+      "sha256": "273f40eda119a034ada821db2257e3b5c2bfb835c287365398237f5d9a9daad3",
+      "url": "https://download.jetbrains.com/rider/JetBrains.Rider-2022.1-aarch64.dmg",
+      "version-major-minor": "2022.1"
    },
    "ruby-mine": {
      "update-channel": "RubyMine RELEASE",
      "url-template": "https://download.jetbrains.com/ruby/RubyMine-{version}-aarch64.dmg",
-      "version": "2021.3.2",
-      "sha256": "33773222b2fa14300de5ed12ca96c3442b933f66cef67cebc9610e5cef51c75e",
-      "url": "https://download.jetbrains.com/ruby/RubyMine-2021.3.2-aarch64.dmg",
-      "version-major-minor": "2021.3"
+      "version": "2022.1",
+      "sha256": "06d932a587adcd25b4e70d0b27c2c229381144deaef90cbcdc345edd822e04ed",
+      "url": "https://download.jetbrains.com/ruby/RubyMine-2022.1-aarch64.dmg",
+      "version-major-minor": "2022.1"
    },
    "webstorm": {
      "update-channel": "WebStorm RELEASE",
      "url-template": "https://download.jetbrains.com/webstorm/WebStorm-{version}-aarch64.dmg",
-      "version": "2021.3.2",
-      "sha256": "f4788ec0c55123b1f4e14934792f65bf8040e2a2ee673e985b50b8feded60408",
-      "url": "https://download.jetbrains.com/webstorm/WebStorm-2021.3.2-aarch64.dmg",
-      "version-major-minor": "2021.3"
+      "version": "2022.1",
+      "sha256": "96ec148af1b20ea9d2cb6f8b1f268f96607269e8dd3caf521b48464fe21a7177",
+      "url": "https://download.jetbrains.com/webstorm/WebStorm-2022.1-aarch64.dmg",
+      "version-major-minor": "2022.1"
    }
  }
 }
--- a/pkgs/applications/editors/lifeograph/default.nix
+++ b/pkgs/applications/editors/lifeograph/default.nix
@ -1,21 +1,21 @@
 { stdenv, lib, fetchgit, pkg-config, meson, ninja
-, enchant, gtkmm3, libchamplain, libgcrypt }:
+, enchant, gtkmm3, libchamplain, libgcrypt, shared-mime-info }:

 stdenv.mkDerivation rec {
  pname = "lifeograph";
-  version = "2.0.2";
+  version = "2.0.3";

  src = fetchgit {
    url = "https://git.launchpad.net/lifeograph";
-    # Specific commit hash related to version
-    rev = "d635bbb30011c0d33c33643e6fa5c006f98ed7d6";
-    sha256 = "0j9wn5bj7cbfnmyyx7ikx961sksv50agnb53prymldbsq43rfgnq";
+    rev = "v${version}";
+    sha256 = "sha256-RotbTdTtpwXmo+UKOyp93IAC6CCstv++KtnX2doN+nM=";
  };

  nativeBuildInputs = [
    meson
    ninja
    pkg-config
+    shared-mime-info # for update-mime-database
  ];

  buildInputs = [
--- 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/graphics/graphicsmagick/default.nix
+++ b/pkgs/applications/graphics/graphicsmagick/default.nix
@ -7,11 +7,11 @@

 stdenv.mkDerivation rec {
  pname = "graphicsmagick";
-  version = "1.3.37";
+  version = "1.3.38";

  src = fetchurl {
    url = "mirror://sourceforge/graphicsmagick/GraphicsMagick-${version}.tar.xz";
-    sha256 = "sha256-kNwi8ae9JA5MkGWpQJYr8T2kPJm8w2yxEcw8Gg10d9Q=";
+    sha256 = "sha256-1gzZ21k1HSucsZvrRDFwrKoo8HPRPSWPZ7NidjXjJnU=";
  };

  patches = [
--- 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/fluxcd/default.nix
+++ b/pkgs/applications/networking/cluster/fluxcd/default.nix
@ -1,9 +1,9 @@
 { lib, buildGoModule, fetchFromGitHub, fetchzip, installShellFiles }:

 let
-  version = "0.29.3";
-  sha256 = "02qdczd8x6dl6gsyjyrmga9i67shm54xixckxvva1lhl33zz5wwm";
-  manifestsSha256 = "0ar73dwz5j19qwcp85cd87gx0kwm7ys4xcyk91gj88s5i3djd9sl";
+  version = "0.29.4";
+  sha256 = "110wbz5dyzrzndr937in663cs9hwfs3glgm63f0md9gjj67mz0kk";
+  manifestsSha256 = "14vrkadv2gsz360s0naqr002sw8n5kvgskc13yx936mcz2vs465y";

  manifests = fetchzip {
    url =
@ -23,7 +23,7 @@ in buildGoModule rec {
    inherit sha256;
  };

-  vendorSha256 = "sha256-VWTtHquq/8/nKBGLuIdg2xkpGz1ofhPlQf3NTaQaHBI=";
+  vendorSha256 = "sha256-/8gRyaXTCWe+F4X3z5iT8QhE3LdiNEYKHjtoYKJB/HU=";

  postUnpack = ''
    cp -r ${manifests} source/cmd/flux/manifests
--- a/pkgs/applications/networking/cluster/istioctl/default.nix
+++ b/pkgs/applications/networking/cluster/istioctl/default.nix
@ -2,15 +2,15 @@

 buildGoModule rec {
  pname = "istioctl";
-  version = "1.13.2";
+  version = "1.13.3";

  src = fetchFromGitHub {
    owner = "istio";
    repo = "istio";
    rev = version;
-    sha256 = "sha256-7YtszdwauTz9LfZ77d13fDU6vQm5hiJrIOiqpqIginQ=";
+    sha256 = "sha256-XvV6OlGHW/eB0EUrmyTlFVbDjbxUpVo6WvrEnh6Q68I=";
  };
-  vendorSha256 = "sha256-AOcWkcw+2DcgBxvxRO/sdb339a7hmI7Oy5I4kW4oE+k=";
+  vendorSha256 = "sha256-Ex86yLMTqqiSkJns/eeodmGswAzPVQAQOf8Wqi7DRaE=";

  nativeBuildInputs = [ installShellFiles ];

@ -26,6 +26,11 @@ buildGoModule rec {

  subPackages = [ "istioctl/cmd/istioctl" ];

+  doInstallCheck = true;
+  installCheckPhase = ''
+    $out/bin/istioctl version --remote=false | grep ${version} > /dev/null
+  '';
+
  postInstall = ''
    $out/bin/istioctl collateral --man --bash --zsh
    installManPage *.1
--- 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/applications/networking/termius/default.nix
+++ b/pkgs/applications/networking/termius/default.nix
@ -13,7 +13,7 @@

 stdenv.mkDerivation rec {
  pname = "termius";
-  version = "7.37.0";
+  version = "7.39.0";

  src = fetchurl {
    # find the latest version with
@ -22,8 +22,8 @@ stdenv.mkDerivation rec {
    # curl -H 'X-Ubuntu-Series: 16' https://api.snapcraft.io/api/v1/snaps/details/termius-app | jq '.download_url' -r
    # and the sha512 with
    # curl -H 'X-Ubuntu-Series: 16' https://api.snapcraft.io/api/v1/snaps/details/termius-app | jq '.download_sha512' -r
-    url = "https://api.snapcraft.io/api/v1/snaps/download/WkTBXwoX81rBe3s3OTt3EiiLKBx2QhuS_108.snap";
-    sha512 = "05c4a0baeee8c1ff9547017288d099a9ef7b3049647ef0318ca4b1112df26f9f3a844bbae5f9ada59adaf07838987e2a685aee21ea494945202009236fe5f6bc";
+    url = "https://api.snapcraft.io/api/v1/snaps/download/WkTBXwoX81rBe3s3OTt3EiiLKBx2QhuS_111.snap";
+    sha512 = "1c90f249fd1802d4ed032b85ee835ca04e84e673caff339b6ce9b35188fec65a3ccce0e2a8a9afef46354ed5886ab17c612468ad7281c660c904b180753a1729";
  };

  desktopItem = makeDesktopItem {
--- a/pkgs/applications/radio/kalibrate-rtl/default.nix
+++ b/pkgs/applications/radio/kalibrate-rtl/default.nix
@ -2,13 +2,13 @@

 stdenv.mkDerivation {
  pname = "kalibrate-rtl";
-  version = "unstable-2013-12-14";
+  version = "unstable-2022-02-02";

  src = fetchFromGitHub {
    owner = "steve-m";
    repo = "kalibrate-rtl";
-    rev = "aae11c8a8dc79692a94ccfee39ba01e8c8c05d38";
-    sha256 = "1spbfflkqnw9s8317ppsf7b1nnkicqsmaqsnz1zf8i49ix70i6kn";
+    rev = "340003eb0846b069c3edef19ed3363b8ac7b5215";
+    sha256 = "n9mfu8H2OS8dKPNhtJxBfMDp8aHEIcxg/R+kcRNOBpk=";
  };

  nativeBuildInputs = [ autoreconfHook pkg-config ];
@ -26,7 +26,7 @@ stdenv.mkDerivation {
    '';
    homepage = "https://github.com/steve-m/kalibrate-rtl";
    license = licenses.bsd2;
-    platforms = platforms.linux;
-    maintainers = with maintainers; [ bjornfor ];
+    platforms = platforms.linux ++ platforms.darwin;
+    maintainers = with maintainers; [ bjornfor viraptor ];
  };
 }
--- a/pkgs/applications/science/misc/colmap/default.nix
+++ b/pkgs/applications/science/misc/colmap/default.nix
@ -1,10 +1,14 @@
 { mkDerivation, lib, fetchFromGitHub, cmake, boost17x, ceres-solver, eigen,
  freeimage, glog, libGLU, glew, qtbase,
-  cudaSupport ? false, cudatoolkit ? null }:
+  cudaSupport ? false, cudaPackages }:

-assert !cudaSupport || cudatoolkit != null;
+assert cudaSupport -> cudaPackages != { };

-let boost_static = boost17x.override { enableStatic = true; };
+let
+  boost_static = boost17x.override { enableStatic = true; };
+
+  # TODO: migrate to redist packages
+  inherit (cudaPackages) cudatoolkit;
 in
 mkDerivation rec {
  version = "3.7";
@ -13,15 +17,27 @@ mkDerivation rec {
     owner = "colmap";
     repo = "colmap";
     rev = version;
-     sha256 = "sha256-uVAw6qwhpgIpHkXgxttKupU9zU+vD0Za0maw2Iv4x+I=";
+     hash = "sha256-uVAw6qwhpgIpHkXgxttKupU9zU+vD0Za0maw2Iv4x+I=";
  };

+  # TODO: rm once the gcc11 issue is closed, https://github.com/colmap/colmap/issues/1418#issuecomment-1049305256
+  cmakeFlags = lib.optionals cudaSupport [
+    "-DCUDA_ENABLED=ON"
+    "-DCUDA_NVCC_FLAGS=--std=c++14"
+  ];
+
  buildInputs = [
    boost_static ceres-solver eigen
    freeimage glog libGLU glew qtbase
-  ] ++ lib.optional cudaSupport cudatoolkit;
+  ] ++ lib.optionals cudaSupport [
+    cudatoolkit
+  ];

-  nativeBuildInputs = [ cmake ];
+  nativeBuildInputs = [
+    cmake
+  ] ++ lib.optionals cudaSupport [
+    cudaPackages.autoAddOpenGLRunpathHook
+  ];

  meta = with lib; {
    description = "COLMAP - Structure-From-Motion and Multi-View Stereo pipeline";
--- a/pkgs/desktops/pantheon/artwork/elementary-gtk-theme/default.nix
+++ b/pkgs/desktops/pantheon/artwork/elementary-gtk-theme/default.nix
@ -1,31 +1,38 @@
 { lib
-, stdenv
+, stdenvNoCC
 , fetchFromGitHub
 , nix-update-script
+, gettext
 , meson
 , ninja
-, gettext
+, python3
 , sassc
 }:

-stdenv.mkDerivation rec {
+stdenvNoCC.mkDerivation rec {
  pname = "elementary-gtk-theme";
-  version = "6.1.1";
+  version = "7.0.0";

  src = fetchFromGitHub {
    owner = "elementary";
    repo = "stylesheet";
    rev = version;
-    sha256 = "sha256-gciBn5MQ5Cu+dROL5kCt2GCbNA7W4HOWXyjMBd4OP+8=";
+    sha256 = "sha256-ZnQ54ktH0/ZyFH6c180YzbkK/TyIDziiwAXi/zqHpe4=";
  };

  nativeBuildInputs = [
    gettext
    meson
    ninja
+    python3
    sassc
  ];

+  postPatch = ''
+    chmod +x meson/install-to-dir.py
+    patchShebangs meson/install-to-dir.py
+  '';
+
  passthru = {
    updateScript = nix-update-script {
      attrPath = "pantheon.${pname}";
--- a/pkgs/desktops/pantheon/artwork/elementary-icon-theme/default.nix
+++ b/pkgs/desktops/pantheon/artwork/elementary-icon-theme/default.nix
@ -1,5 +1,5 @@
 { lib
-, stdenv
+, stdenvNoCC
 , fetchFromGitHub
 , nix-update-script
 , meson
@ -7,19 +7,19 @@
 , ninja
 , hicolor-icon-theme
 , gtk3
-, xorg
+, xcursorgen
 , librsvg
 }:

-stdenv.mkDerivation rec {
+stdenvNoCC.mkDerivation rec {
  pname = "elementary-icon-theme";
-  version = "6.1.0";
+  version = "7.0.0";

  src = fetchFromGitHub {
    owner = "elementary";
    repo = "icons";
    rev = version;
-    sha256 = "sha256-WR4HV0nJKj0WeSFHXLK64O0LhX8myAJE4w0aztyhPn4=";
+    sha256 = "sha256-tyhKhZPoZ8xVy1KVUWd8BK2meTT3Z6qM787spjE+NL8=";
  };

  nativeBuildInputs = [
@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
    meson
    ninja
    python3
-    xorg.xcursorgen
+    xcursorgen
  ];

  propagatedBuildInputs = [
--- 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/glslang/default.nix
+++ b/pkgs/development/compilers/glslang/default.nix
@ -9,13 +9,13 @@
 }:
 stdenv.mkDerivation rec {
  pname = "glslang";
-  version = "1.2.198.0";
+  version = "1.3.211.0";

  src = fetchFromGitHub {
    owner = "KhronosGroup";
    repo = "glslang";
    rev = "sdk-${version}";
-    sha256 = "sha256-FRiqsfoyjUW2kbbphxcy0Hn0TLVaszatM/nnWBrchRY=";
+    sha256 = "sha256-YLn/Mxuk6mXPGtBBgfwky5Nl1TCAW6i2g+AZLzqVz+A=";
  };

  # These get set at all-packages, keep onto them for child drvs
--- 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/interpreters/sollya/default.nix
+++ b/pkgs/development/interpreters/sollya/default.nix
@ -10,11 +10,11 @@

 stdenv.mkDerivation rec {
  pname = "sollya";
-  version = "7.0";
+  version = "8.0";

  src = fetchurl {
    url = "https://www.sollya.org/releases/sollya-${version}/sollya-${version}.tar.gz";
-    sha256 = "0amrxg7567yy5xqpgchxggjpfr11xyl27vy29c7vlh7v8a17nj1h";
+    sha256 = "sha256-WNc0+aL8jmczwR+W0t+aslvvJNccQBIw4p8KEzmoEZI=";
  };

  buildInputs = [ gmp mpfr mpfi libxml2 fplll ];
--- a/pkgs/development/libraries/audio/libspecbleach/default.nix
+++ b/pkgs/development/libraries/audio/libspecbleach/default.nix
@ -0,0 +1,26 @@
+{ lib, stdenv, fetchFromGitHub, meson, ninja, pkg-config, fftwFloat}:
+
+stdenv.mkDerivation rec {
+  pname = "libspecbleach";
+  version = "0.1.2";
+
+  src = fetchFromGitHub {
+    owner = "lucianodato";
+    repo = pname;
+    rev = "v${version}";
+    sha256 = "sha256-WmUl8rA/+V+hv7FPG/5Or6aAQVqt1rIJtdb53KhSmuo=";
+  };
+
+  nativeBuildInputs = [ meson ninja pkg-config ];
+  buildInputs = [
+    fftwFloat
+  ];
+
+  meta = with lib; {
+    description = "C library for audio noise reduction";
+    homepage    = "https://github.com/lucianodato/libspecbleach";
+    license     = licenses.lgpl2;
+    maintainers = [ maintainers.magnetophon ];
+    platforms = platforms.unix;
+  };
+}
--- 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/spirv-headers/default.nix
+++ b/pkgs/development/libraries/spirv-headers/default.nix
@ -2,13 +2,13 @@

 stdenv.mkDerivation rec {
  pname = "spirv-headers";
-  version = "1.2.198.0";
+  version = "1.3.211.0";

  src = fetchFromGitHub {
    owner = "KhronosGroup";
    repo = "SPIRV-Headers";
    rev = "sdk-${version}";
-    sha256 = "sha256-cdEiRSCoX0New8ecUh7UTDz/is2v29zhf6Il2N1j3mw=";
+    sha256 = "sha256-LkIrTFWYvZffLVJJW3152um5LTEsMJEDEsIhBAdhBlk=";
  };

  nativeBuildInputs = [ cmake ];
--- 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-headers/default.nix
+++ b/pkgs/development/libraries/vulkan-headers/default.nix
@ -1,7 +1,7 @@
 { lib, stdenv, fetchFromGitHub, cmake }:
 stdenv.mkDerivation rec {
  pname = "vulkan-headers";
-  version = "1.2.198.0";
+  version = "1.3.211.0";

  nativeBuildInputs = [ cmake ];

@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
    owner = "KhronosGroup";
    repo = "Vulkan-Headers";
    rev = "sdk-${version}";
-    sha256 = "sha256-SvC0AX1wIZWLzws3ZS8Wi8fbNUw1+An/PRlFIfNj24Y=";
+    sha256 = "sha256-FqrcFHsUS8e4ZgZpxVc8nNZWdNltniFmMjyyWVoNc7w=";
  };

  meta = with lib; {
--- a/pkgs/development/libraries/vulkan-loader/default.nix
+++ b/pkgs/development/libraries/vulkan-loader/default.nix
@ -3,16 +3,18 @@

 stdenv.mkDerivation rec {
  pname = "vulkan-loader";
-  version = "1.2.198.0";
+  version = "1.3.211.0";

  src = (assert version == vulkan-headers.version;
    fetchFromGitHub {
      owner = "KhronosGroup";
      repo = "Vulkan-Loader";
      rev = "sdk-${version}";
-      sha256 = "sha256-k3eCdZqCjFxpKa0pZ0K4XcORxdSOlr1dFa7C3Qzi04Y=";
+      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/ocaml-modules/ocsigen-ppx-rpc/default.nix
+++ b/pkgs/development/ocaml-modules/ocsigen-ppx-rpc/default.nix
@ -0,0 +1,23 @@
+{ lib, buildDunePackage, fetchFromGitHub, ppxlib }:
+
+buildDunePackage rec {
+  pname = "ocsigen-ppx-rpc";
+  version = "1.0";
+
+  src = fetchFromGitHub {
+    owner = "ocsigen";
+    repo = pname;
+    rev = version;
+    sha256 = "sha256:0qgasd89ayamgl2rfyxsipznmwa3pjllkyq9qg0g1f41h8ixpsfh";
+  };
+
+  propagatedBuildInputs = [ ppxlib ];
+
+  meta = {
+    inherit (src.meta) homepage;
+    description = "Syntax for RPCs for Eliom and Ocsigen Start";
+    license = lib.licenses.lgpl21Only;
+    maintainers = [ lib.maintainers.vbgl ];
+  };
+
+}
--- a/pkgs/development/ocaml-modules/ocsigen-start/default.nix
+++ b/pkgs/development/ocaml-modules/ocsigen-start/default.nix
@ -2,13 +2,15 @@
 , cohttp-lwt-unix, eliom
 , resource-pooling
 , ocamlnet
+, ocsigen-ppx-rpc
 }:

 stdenv.mkDerivation rec {
  pname = "ocaml${ocaml.version}-ocsigen-start";
-  version = "4.5.0";
+  version = "6.0.1";

  nativeBuildInputs = [ ocaml findlib eliom ];
+  buildInputs = [ ocsigen-ppx-rpc ];
  propagatedBuildInputs = [ pgocaml_ppx safepass ocsigen-toolkit yojson resource-pooling cohttp-lwt-unix ocamlnet ];

  strictDeps = true;
@ -19,7 +21,7 @@ stdenv.mkDerivation rec {
    owner = "ocsigen";
    repo = "ocsigen-start";
    rev = version;
-    sha256 = "sha256:1n94r8rbkzxbgcz5w135n6f2cwpc91bdvf7yslcdq4cn713rncmq";
+    sha256 = "sha256:097bjaxvb1canilmqr8ay3ihig2msq7z8mi0g0rnbciikj1jsrym";
  };

  preInstall = ''
--- a/pkgs/development/ocaml-modules/tezos/010-PtGRANAD-test-helpers.nix
+++ b/pkgs/development/ocaml-modules/tezos/010-PtGRANAD-test-helpers.nix
@ -1,39 +0,0 @@
-{ lib
-, buildDunePackage
-, tezos-stdlib
-, tezos-stdlib-unix
-, tezos-base
-, tezos-shell-services
-, tezos-protocol-environment
-, tezos-protocol-010-PtGRANAD
-, tezos-protocol-010-PtGRANAD-parameters
-, tezos-client-010-PtGRANAD
-, alcotest-lwt
-}:
-
-buildDunePackage {
-  pname = "tezos-010-PtGRANAD-test-helpers";
-  inherit (tezos-stdlib) version useDune2;
-  src = "${tezos-stdlib.base_src}/src/proto_010_PtGRANAD/lib_protocol/test/helpers";
-
-  propagatedBuildInputs = [
-    tezos-base
-    tezos-stdlib-unix
-    tezos-shell-services
-    tezos-protocol-environment
-    tezos-protocol-010-PtGRANAD
-    tezos-protocol-010-PtGRANAD-parameters
-    tezos-client-010-PtGRANAD
-    alcotest-lwt
-  ];
-
-  checkInputs = [
-    alcotest-lwt
-  ];
-
-  doCheck = true;
-
-  meta = tezos-stdlib.meta // {
-    description = "Tezos/Protocol: protocol testing framework";
-  };
-}
--- a/pkgs/development/ocaml-modules/tezos/011-PtHangz2-test-helpers.nix
+++ b/pkgs/development/ocaml-modules/tezos/011-PtHangz2-test-helpers.nix
@ -1,35 +0,0 @@
-{ lib
-, buildDunePackage
-, tezos-stdlib
-, tezos-base
-, tezos-client-011-PtHangz2
-, tezos-protocol-011-PtHangz2
-, tezos-protocol-011-PtHangz2-parameters
-, tezos-protocol-environment
-, tezos-shell-services
-, tezos-stdlib-unix
-, tezos-test-helpers
-}:
-
-buildDunePackage {
-  pname = "tezos-011-PtHangz2-test-helpers";
-  inherit (tezos-stdlib) version useDune2;
-  src = "${tezos-stdlib.base_src}/src";
-
-  propagatedBuildInputs = [
-    tezos-base
-    tezos-client-011-PtHangz2
-    tezos-protocol-011-PtHangz2
-    tezos-protocol-011-PtHangz2-parameters
-    tezos-protocol-environment
-    tezos-shell-services
-    tezos-stdlib-unix
-    tezos-test-helpers
-  ];
-
-  doCheck = true;
-
-  meta = tezos-stdlib.meta // {
-    description = "Tezos/Protocol: protocol testing framework";
-  };
-}
--- a/pkgs/development/ocaml-modules/tezos/base-test-helpers.nix
+++ b/pkgs/development/ocaml-modules/tezos/base-test-helpers.nix
@ -1,32 +0,0 @@
-{ lib
-, buildDunePackage
-, alcotest
-, alcotest-lwt
-, tezos-base
-, tezos-event-logging-test-helpers
-, tezos-stdlib
-, tezos-test-helpers
-}:
-
-buildDunePackage {
-  pname = "tezos-base-test-helpers";
-  inherit (tezos-stdlib) version useDune2;
-  src = "${tezos-stdlib.base_src}/src/lib_base/test_helpers";
-
-  propagatedBuildInputs = [
-    alcotest
-    alcotest-lwt
-    tezos-base
-    tezos-event-logging-test-helpers
-  ];
-
-  checkInputs = [
-    tezos-test-helpers
-  ];
-
-  doCheck = true;
-
-  meta = tezos-stdlib.meta // {
-    description = "Tezos: base test helpers";
-  };
-}
--- a/pkgs/development/ocaml-modules/tezos/base.nix
+++ b/pkgs/development/ocaml-modules/tezos/base.nix
@ -1,37 +0,0 @@
-{ lib
-, buildDunePackage
-, tezos-stdlib
-, tezos-crypto
-, tezos-hacl-glue-unix
-, tezos-micheline
-, tezos-test-helpers
-, ptime
-, ipaddr
-, bls12-381-unix
-}:
-
-buildDunePackage {
-  pname = "tezos-base";
-  inherit (tezos-stdlib) version useDune2;
-  src = "${tezos-stdlib.base_src}/src/lib_base";
-
-  propagatedBuildInputs = [
-    tezos-crypto
-    tezos-micheline
-    tezos-hacl-glue-unix
-    bls12-381-unix
-    ptime
-    ipaddr
-  ];
-
-  checkInputs = [
-    # tezos-test-helpers
-  ];
-
-  # circular dependency if we add this
-  doCheck = false;
-
-  meta = tezos-stdlib.meta // {
-    description = "Tezos: meta-package and pervasive type definitions for Tezos";
-  };
-}
--- a/pkgs/development/ocaml-modules/tezos/clic.nix
+++ b/pkgs/development/ocaml-modules/tezos/clic.nix
@ -1,28 +0,0 @@
-{ lib
-, buildDunePackage
-, tezos-stdlib
-, tezos-stdlib-unix
-, alcotest
-, alcotest-lwt
-}:
-
-buildDunePackage {
-  pname = "tezos-clic";
-  inherit (tezos-stdlib) version useDune2;
-  src = "${tezos-stdlib.base_src}/src/lib_clic";
-
-  propagatedBuildInputs = [
-    tezos-stdlib-unix
-  ];
-
-  checkInputs = [
-    alcotest
-    alcotest-lwt
-  ];
-
-  doCheck = true;
-
-  meta = tezos-stdlib.meta // {
-    description = "Tezos: library of auto-documented command-line-parsing combinators";
-  };
-}
--- a/pkgs/development/ocaml-modules/tezos/client-010-PtGRANAD.nix
+++ b/pkgs/development/ocaml-modules/tezos/client-010-PtGRANAD.nix
@ -1,38 +0,0 @@
-{ lib
-, buildDunePackage
-, tezos-stdlib
-, tezos-mockup-registration
-, tezos-proxy
-, tezos-signer-backends
-, tezos-protocol-010-PtGRANAD-parameters
-, tezos-protocol-plugin-010-PtGRANAD
-, alcotest-lwt
-, ppx_inline_test
-, cacert
-}:
-
-buildDunePackage {
-  pname = "tezos-client-010-PtGRANAD";
-  inherit (tezos-stdlib) version useDune2;
-  src = "${tezos-stdlib.base_src}/src/proto_010_PtGRANAD/lib_client";
-
-  propagatedBuildInputs = [
-    tezos-mockup-registration
-    tezos-proxy
-    tezos-signer-backends
-    tezos-protocol-010-PtGRANAD-parameters
-    tezos-protocol-plugin-010-PtGRANAD
-    ppx_inline_test
-  ];
-
-  checkInputs = [
-    alcotest-lwt
-    cacert
-  ];
-
-  doCheck = true;
-
-  meta = tezos-stdlib.meta // {
-    description = "Tezos/Protocol: protocol specific library for `tezos-client`";
-  };
-}
--- a/pkgs/development/ocaml-modules/tezos/client-011-PtHangz2.nix
+++ b/pkgs/development/ocaml-modules/tezos/client-011-PtHangz2.nix
@ -1,44 +0,0 @@
-{ lib
-, buildDunePackage
-, tezos-stdlib
-, tezos-mockup-registration
-, tezos-proxy
-, tezos-signer-backends
-, tezos-protocol-011-PtHangz2-parameters
-, tezos-protocol-plugin-011-PtHangz2
-, alcotest-lwt
-, cacert
-, ppx_inline_test
-, qcheck-alcotest
-, tezos-base-test-helpers
-, tezos-test-helpers
-}:
-
-buildDunePackage {
-  pname = "tezos-client-011-PtHangz2";
-  inherit (tezos-stdlib) version useDune2;
-  src = "${tezos-stdlib.base_src}/src";
-
-  propagatedBuildInputs = [
-    tezos-mockup-registration
-    tezos-proxy
-    tezos-signer-backends
-    tezos-protocol-011-PtHangz2-parameters
-    tezos-protocol-plugin-011-PtHangz2
-    ppx_inline_test
-  ];
-
-  checkInputs = [
-    alcotest-lwt
-    cacert
-    qcheck-alcotest
-    tezos-base-test-helpers
-    tezos-test-helpers
-  ];
-
-  doCheck = true;
-
-  meta = tezos-stdlib.meta // {
-    description = "Tezos/Protocol: protocol specific library for `tezos-client`";
-  };
-}
--- a/pkgs/development/ocaml-modules/tezos/client-base.nix
+++ b/pkgs/development/ocaml-modules/tezos/client-base.nix
@ -1,28 +0,0 @@
-{ lib
-, buildDunePackage
-, tezos-stdlib
-, tezos-shell-services
-, tezos-sapling
-, alcotest
-}:
-
-buildDunePackage {
-  pname = "tezos-client-base";
-  inherit (tezos-stdlib) version useDune2;
-  src = "${tezos-stdlib.base_src}/src/lib_client_base";
-
-  propagatedBuildInputs = [
-    tezos-shell-services
-    tezos-sapling
-  ];
-
-  checkInputs = [
-    alcotest
-  ];
-
-  doCheck = true;
-
-  meta = tezos-stdlib.meta // {
-    description = "Tezos: protocol registration for the mockup mode";
-  };
-}
--- a/pkgs/development/ocaml-modules/tezos/context.nix
+++ b/pkgs/development/ocaml-modules/tezos/context.nix
@ -1,34 +0,0 @@
-{ lib
-, buildDunePackage
-, tezos-stdlib
-, tezos-base
-, tezos-shell-services
-, irmin
-, irmin-pack
-, digestif
-, alcotest-lwt
-}:
-
-buildDunePackage {
-  pname = "tezos-context";
-  inherit (tezos-stdlib) version useDune2;
-  src = "${tezos-stdlib.base_src}/src/lib_context";
-
-  propagatedBuildInputs = [
-    tezos-base
-    tezos-shell-services
-    irmin
-    irmin-pack
-    digestif
-  ];
-
-  checkInputs = [
-    alcotest-lwt
-  ];
-
-  doCheck = true;
-
-  meta = tezos-stdlib.meta // {
-    description = "Tezos: library of auto-documented RPCs (service and hierarchy descriptions)";
-  };
-}
--- a/pkgs/development/ocaml-modules/tezos/crypto.nix
+++ b/pkgs/development/ocaml-modules/tezos/crypto.nix
@ -1,42 +0,0 @@
-{ lib
-, buildDunePackage
-, tezos-stdlib
-, tezos-rpc
-, tezos-clic
-, tezos-hacl-glue
-, tezos-hacl-glue-unix
-, secp256k1-internal
-, ringo
-, bls12-381
-, bls12-381-unix
-, tezos-test-helpers
-, alcotest-lwt
-}:
-
-buildDunePackage {
-  pname = "tezos-crypto";
-  inherit (tezos-stdlib) version useDune2;
-  src = "${tezos-stdlib.base_src}/src/lib_crypto";
-
-  propagatedBuildInputs = [
-    tezos-rpc
-    tezos-clic
-    tezos-hacl-glue
-    tezos-hacl-glue-unix
-    secp256k1-internal
-    ringo
-    bls12-381
-    bls12-381-unix
-  ];
-
-  checkInputs = [
-    tezos-test-helpers
-    alcotest-lwt
-  ];
-
-  doCheck = true;
-
-  meta = tezos-stdlib.meta // {
-    description = "Tezos: library with all the cryptographic primitives used by Tezos";
-  };
-}
--- a/pkgs/development/ocaml-modules/tezos/embedded-protocol-010-PtGRANAD.nix
+++ b/pkgs/development/ocaml-modules/tezos/embedded-protocol-010-PtGRANAD.nix
@ -1,23 +0,0 @@
-{ lib
-, buildDunePackage
-, tezos-stdlib
-, tezos-protocol-010-PtGRANAD
-, tezos-protocol-updater
-}:
-
-buildDunePackage {
-  pname = "tezos-embedded-protocol-010-PtGRANAD";
-  inherit (tezos-stdlib) version useDune2;
-  src = "${tezos-stdlib.base_src}/src";
-
-  propagatedBuildInputs = [
-    tezos-protocol-010-PtGRANAD
-    tezos-protocol-updater
-  ];
-
-  doCheck = true;
-
-  meta = tezos-stdlib.meta // {
-    description = "Tezos/Protocol: economic-protocol definition, embedded in `tezos-node`";
-  };
-}
--- a/pkgs/development/ocaml-modules/tezos/embedded-protocol-demo-noops.nix
+++ b/pkgs/development/ocaml-modules/tezos/embedded-protocol-demo-noops.nix
@ -1,23 +0,0 @@
-{ lib
-, buildDunePackage
-, tezos-stdlib
-, tezos-protocol-demo-noops
-, tezos-protocol-updater
-}:
-
-buildDunePackage {
-  pname = "tezos-embedded-protocol-demo-noops";
-  inherit (tezos-stdlib) version useDune2;
-  src = "${tezos-stdlib.base_src}/src";
-
-  propagatedBuildInputs = [
-    tezos-protocol-demo-noops
-    tezos-protocol-updater
-  ];
-
-  doCheck = true;
-
-  meta = tezos-stdlib.meta // {
-    description = "Tezos/Protocol: demo_noops (economic-protocol definition, embedded in `tezos-node`)";
-  };
-}
--- a/pkgs/development/ocaml-modules/tezos/error-monad.nix
+++ b/pkgs/development/ocaml-modules/tezos/error-monad.nix
@ -1,35 +0,0 @@
-{ lib
-, buildDunePackage
-, tezos-stdlib
-, data-encoding
-, lwt
-, lwt-canceler
-, tezos-lwt-result-stdlib
-, alcotest
-, alcotest-lwt
-}:
-
-buildDunePackage {
-  pname = "tezos-error-monad";
-  inherit (tezos-stdlib) version useDune2;
-  src = "${tezos-stdlib.base_src}/src/lib_error_monad";
-
-  propagatedBuildInputs = [
-    tezos-stdlib
-    data-encoding
-    lwt
-    lwt-canceler
-    tezos-lwt-result-stdlib
-  ];
-
-  checkInputs = [
-    alcotest
-    alcotest-lwt
-  ];
-
-  doCheck = true;
-
-  meta = tezos-stdlib.meta // {
-    description = "Tezos: error monad";
-  };
-}
--- a/pkgs/development/ocaml-modules/tezos/event-logging-test-helpers.nix
+++ b/pkgs/development/ocaml-modules/tezos/event-logging-test-helpers.nix
@ -1,25 +0,0 @@
-{ lib
-, buildDunePackage
-, alcotest
-, tezos-event-logging
-, tezos-stdlib
-, tezos-test-helpers
-}:
-
-buildDunePackage {
-  pname = "tezos-event-logging-test-helpers";
-  inherit (tezos-stdlib) version useDune2;
-  src = "${tezos-stdlib.base_src}/src/lib_event_logging/test_helpers/";
-
-  propagatedBuildInputs = [
-    alcotest
-    tezos-event-logging
-    tezos-test-helpers
-  ];
-
-  doCheck = true;
-
-  meta = tezos-stdlib.meta // {
-    description = "Tezos: test helpers for the event logging library";
-  };
-}
--- a/pkgs/development/ocaml-modules/tezos/event-logging.nix
+++ b/pkgs/development/ocaml-modules/tezos/event-logging.nix
@ -1,28 +0,0 @@
-{ lib
-, buildDunePackage
-, tezos-stdlib
-, tezos-error-monad
-, data-encoding
-, lwt_log
-, lwt
-}:
-
-buildDunePackage {
-  pname = "tezos-event-logging";
-  inherit (tezos-stdlib) version useDune2;
-  src = "${tezos-stdlib.base_src}/src/lib_event_logging";
-
-  propagatedBuildInputs = [
-    tezos-stdlib
-    tezos-error-monad
-    data-encoding
-    lwt_log
-    lwt
-  ];
-
-  doCheck = true;
-
-  meta = tezos-stdlib.meta // {
-    description = "Tezos: event logging library";
-  };
-}
--- a/pkgs/development/ocaml-modules/tezos/hacl-glue-unix.nix
+++ b/pkgs/development/ocaml-modules/tezos/hacl-glue-unix.nix
@ -1,26 +0,0 @@
-{ lib
-, buildDunePackage
-, tezos-stdlib
-, tezos-hacl-glue
-, ctypes
-, hacl-star
-}:
-
-buildDunePackage {
-  pname = "tezos-hacl-glue-unix";
-
-  inherit (tezos-stdlib) version useDune2;
-  src = "${tezos-stdlib.base_src}/src/lib_hacl_glue/unix";
-
-  propagatedBuildInputs = [
-    ctypes
-    hacl-star
-    tezos-hacl-glue
-  ];
-
-  doCheck = true;
-
-  meta = tezos-stdlib.meta // {
-    description = "Tezos: thin layer of glue around hacl-star (unix implementation)";
-  };
-}
--- a/pkgs/development/ocaml-modules/tezos/hacl-glue.nix
+++ b/pkgs/development/ocaml-modules/tezos/hacl-glue.nix
@ -1,17 +0,0 @@
-{ lib
-, buildDunePackage
-, tezos-stdlib
-}:
-
-buildDunePackage {
-  pname = "tezos-hacl-glue";
-
-  inherit (tezos-stdlib) version useDune2;
-  src = "${tezos-stdlib.base_src}/src/lib_hacl_glue/virtual";
-
-  doCheck = true;
-
-  meta = tezos-stdlib.meta // {
-    description = "Tezos: thin layer of glue around hacl-star (virtual package)";
-  };
-}
--- a/pkgs/development/ocaml-modules/tezos/legacy-store.nix
+++ b/pkgs/development/ocaml-modules/tezos/legacy-store.nix
@ -1,42 +0,0 @@
-{ lib
-, buildDunePackage
-, tezos-stdlib
-, tezos-context
-, tezos-lmdb
-, tezos-validation
-, tezos-shell-services
-, tezos-protocol-compiler
-, lwt-watcher
-, alcotest-lwt
-}:
-
-buildDunePackage {
-  pname = "tezos-legacy-store";
-  inherit (tezos-stdlib) version useDune2;
-  src = "${tezos-stdlib.base_src}/src/lib_store/legacy_store";
-
-  propagatedBuildInputs = [
-    tezos-context
-    tezos-lmdb
-    tezos-validation
-    tezos-shell-services
-    lwt-watcher
-  ];
-
-  nativeBuildInputs = [
-    tezos-protocol-compiler
-  ];
-
-  strictDeps = true;
-
-  checkInputs = [
-    alcotest-lwt
-  ];
-
-  # A lot of extra deps with wide dependency cones needed
-  doCheck = false;
-
-  meta = tezos-stdlib.meta // {
-    description = "Tezos: custom economic-protocols environment implementation for `tezos-client` and testing";
-  };
-}
--- a/pkgs/development/ocaml-modules/tezos/lmdb.nix
+++ b/pkgs/development/ocaml-modules/tezos/lmdb.nix
@ -1,51 +0,0 @@
-{ lib
-, fetchFromGitLab
-, pkg-config
-, buildDunePackage
-, lmdb
-, rresult
-, cstruct
-, alcotest
-}:
-
-let
-  version = "7.4";
-  src = fetchFromGitLab {
-    owner = "tezos";
-    repo = "tezos";
-    rev = "v${version}";
-    sha256 = "0sghc60xzr02pmmkr626pnhzrnczf7mki7qyxzzfn7rbbdbrf4wp";
-  };
-in
-
-buildDunePackage {
-  pname = "tezos-lmdb";
-  version = version;
-  src = "${src}/vendors/ocaml-lmdb";
-
-  useDune2 = true;
-
-  nativeBuildInputs = [
-    pkg-config
-  ];
-
-  propagatedBuildInputs = [
-    rresult
-    lmdb
-  ];
-
-  strictDeps = true;
-
-  checkInputs = [
-    cstruct
-    alcotest
-  ];
-
-  doCheck = false;
-
-  meta = {
-    description = "Legacy Tezos OCaml binding to LMDB (Consider ocaml-lmdb instead)";
-    license = lib.licenses.isc;
-    maintainers = [ lib.maintainers.ulrikstrid ];
-  };
-}
--- a/pkgs/development/ocaml-modules/tezos/lwt-result-stdlib.nix
+++ b/pkgs/development/ocaml-modules/tezos/lwt-result-stdlib.nix
@ -1,31 +0,0 @@
-{ lib
-, buildDunePackage
-, ocaml
-, tezos-stdlib
-, lwt
-, alcotest-lwt
-, tezos-test-helpers
-}:
-
-buildDunePackage {
-  pname = "tezos-lwt-result-stdlib";
-  inherit (tezos-stdlib) version useDune2;
-  src = "${tezos-stdlib.base_src}/src/lib_lwt_result_stdlib";
-
-  minimalOCamlVersion = "4.12";
-
-  propagatedBuildInputs = [
-    lwt
-  ];
-
-  checkInputs = [
-    alcotest-lwt
-    tezos-test-helpers
-  ];
-
-  doCheck = true;
-
-  meta = tezos-stdlib.meta // {
-    description = "Tezos: error-aware stdlib replacement";
-  };
-}
--- a/pkgs/development/ocaml-modules/tezos/micheline.nix
+++ b/pkgs/development/ocaml-modules/tezos/micheline.nix
@ -1,32 +0,0 @@
-{ lib
-, buildDunePackage
-, tezos-stdlib
-, tezos-error-monad
-, uutf
-, alcotest
-, alcotest-lwt
-, ppx_inline_test
-}:
-
-buildDunePackage {
-  pname = "tezos-micheline";
-  inherit (tezos-stdlib) version useDune2;
-  src = "${tezos-stdlib.base_src}/src/lib_micheline";
-
-  propagatedBuildInputs = [
-    tezos-error-monad
-    uutf
-    ppx_inline_test
-  ];
-
-  checkInputs = [
-    alcotest
-    alcotest-lwt
-  ];
-
-  doCheck = true;
-
-  meta = tezos-stdlib.meta // {
-    description = "Tezos: internal AST and parser for the Michelson language";
-  };
-}
--- a/pkgs/development/ocaml-modules/tezos/mockup-proxy.nix
+++ b/pkgs/development/ocaml-modules/tezos/mockup-proxy.nix
@ -1,27 +0,0 @@
-{ lib
-, buildDunePackage
-, tezos-stdlib
-, tezos-client-base
-, tezos-protocol-environment
-, tezos-rpc-http-client
-, resto-cohttp-self-serving-client
-}:
-
-buildDunePackage {
-  pname = "tezos-mockup-proxy";
-  inherit (tezos-stdlib) version useDune2;
-  src = "${tezos-stdlib.base_src}/src/lib_mockup_proxy";
-
-  propagatedBuildInputs = [
-    tezos-client-base
-    tezos-protocol-environment
-    tezos-rpc-http-client
-    resto-cohttp-self-serving-client
-  ];
-
-  doCheck = true;
-
-  meta = tezos-stdlib.meta // {
-    description = "Tezos: local RPCs";
-  };
-}
--- a/pkgs/development/ocaml-modules/tezos/mockup-registration.nix
+++ b/pkgs/development/ocaml-modules/tezos/mockup-registration.nix
@ -1,23 +0,0 @@
-{ lib
-, buildDunePackage
-, tezos-stdlib
-, tezos-client-base
-, tezos-protocol-environment
-}:
-
-buildDunePackage {
-  pname = "tezos-mockup-registration";
-  inherit (tezos-stdlib) version useDune2;
-  src = "${tezos-stdlib.base_src}/src/lib_mockup";
-
-  propagatedBuildInputs = [
-    tezos-client-base
-    tezos-protocol-environment
-  ];
-
-  doCheck = true;
-
-  meta = tezos-stdlib.meta // {
-    description = "Tezos: protocol registration for the mockup mode";
-  };
-}
--- a/pkgs/development/ocaml-modules/tezos/p2p-services.nix
+++ b/pkgs/development/ocaml-modules/tezos/p2p-services.nix
@ -1,19 +0,0 @@
-{ lib
-, buildDunePackage
-, tezos-stdlib
-, tezos-base
-}:
-
-buildDunePackage {
-  pname = "tezos-p2p-services";
-  inherit (tezos-stdlib) version useDune2;
-  src = "${tezos-stdlib.base_src}/src/lib_p2p_services";
-
-  propagatedBuildInputs = [
-    tezos-base
-  ];
-
-  meta = tezos-stdlib.meta // {
-    description = "Tezos: descriptions of RPCs exported by `tezos-p2p`";
-  };
-}
--- a/pkgs/development/ocaml-modules/tezos/p2p.nix
+++ b/pkgs/development/ocaml-modules/tezos/p2p.nix
@ -1,38 +0,0 @@
-{ lib
-, buildDunePackage
-, alcotest-lwt
-, astring
-, lwt
-, lwt-canceler
-, lwt-watcher
-, ringo
-, tezos-base-test-helpers
-, tezos-p2p-services
-, tezos-stdlib
-}:
-
-buildDunePackage {
-  pname = "tezos-p2p";
-  inherit (tezos-stdlib) version useDune2;
-  src = "${tezos-stdlib.base_src}/src/lib_p2p";
-
-  propagatedBuildInputs = [
-    lwt
-    lwt-canceler
-    lwt-watcher
-    ringo
-    tezos-p2p-services
-  ];
-
-  checkInputs = [
-    alcotest-lwt
-    astring
-    tezos-base-test-helpers
-  ];
-
-  doCheck = false; # some tests fail
-
-  meta = tezos-stdlib.meta // {
-    description = "Tezos: library for a pool of P2P connections";
-  };
-}
--- a/pkgs/development/ocaml-modules/tezos/protocol-010-PtGRANAD-parameters.nix
+++ b/pkgs/development/ocaml-modules/tezos/protocol-010-PtGRANAD-parameters.nix
@ -1,23 +0,0 @@
-{ lib
-, buildDunePackage
-, tezos-stdlib
-, tezos-protocol-010-PtGRANAD
-, tezos-protocol-environment
-}:
-
-buildDunePackage {
-  pname = "tezos-protocol-010-PtGRANAD-parameters";
-  inherit (tezos-stdlib) version useDune2;
-  src = "${tezos-stdlib.base_src}/src/proto_010_PtGRANAD/lib_parameters";
-
-  propagatedBuildInputs = [
-    tezos-protocol-010-PtGRANAD
-    tezos-protocol-environment
-  ];
-
-  doCheck = true;
-
-  meta = tezos-stdlib.meta // {
-    description = "Tezos/Protocol: parameters";
-  };
-}
--- a/pkgs/development/ocaml-modules/tezos/protocol-010-PtGRANAD.nix
+++ b/pkgs/development/ocaml-modules/tezos/protocol-010-PtGRANAD.nix
@ -1,28 +0,0 @@
-{ lib
-, buildDunePackage
-, tezos-stdlib
-, tezos-protocol-compiler
-, tezos-protocol-environment
-}:
-
-buildDunePackage {
-  pname = "tezos-protocol-010-PtGRANAD";
-  inherit (tezos-stdlib) version useDune2;
-  src = "${tezos-stdlib.base_src}/src";
-
-  nativeBuildInputs = [
-    tezos-protocol-compiler
-  ];
-
-  buildInputs = [
-    tezos-protocol-environment
-  ];
-
-  strictDeps = true;
-
-  doCheck = true;
-
-  meta = tezos-stdlib.meta // {
-    description = "Tezos/Protocol: economic-protocol definition";
-  };
-}
--- a/pkgs/development/ocaml-modules/tezos/protocol-011-PtHangz2-parameters.nix
+++ b/pkgs/development/ocaml-modules/tezos/protocol-011-PtHangz2-parameters.nix
@ -1,23 +0,0 @@
-{ lib
-, buildDunePackage
-, tezos-stdlib
-, tezos-protocol-011-PtHangz2
-, tezos-protocol-environment
-}:
-
-buildDunePackage {
-  pname = "tezos-protocol-011-PtHangz2-parameters";
-  inherit (tezos-stdlib) version useDune2;
-  src = "${tezos-stdlib.base_src}/src";
-
-  propagatedBuildInputs = [
-    tezos-protocol-011-PtHangz2
-    tezos-protocol-environment
-  ];
-
-  doCheck = true;
-
-  meta = tezos-stdlib.meta // {
-    description = "Tezos/Protocol: parameters";
-  };
-}
--- a/pkgs/development/ocaml-modules/tezos/protocol-011-PtHangz2.nix
+++ b/pkgs/development/ocaml-modules/tezos/protocol-011-PtHangz2.nix
@ -1,28 +0,0 @@
-{ lib
-, buildDunePackage
-, tezos-stdlib
-, tezos-protocol-compiler
-, tezos-protocol-environment
-}:
-
-buildDunePackage {
-  pname = "tezos-protocol-011-PtHangz2";
-  inherit (tezos-stdlib) version useDune2;
-  src = "${tezos-stdlib.base_src}/src";
-
-  nativeBuildInputs = [
-    tezos-protocol-compiler
-  ];
-
-  buildInputs = [
-    tezos-protocol-environment
-  ];
-
-  strictDeps = true;
-
-  doCheck = true;
-
-  meta = tezos-stdlib.meta // {
-    description = "Tezos/Protocol: economic-protocol definition";
-  };
-}
--- a/pkgs/development/ocaml-modules/tezos/protocol-alpha.nix
+++ b/pkgs/development/ocaml-modules/tezos/protocol-alpha.nix
@ -1,21 +0,0 @@
-{ lib
-, buildDunePackage
-, tezos-stdlib
-, tezos-protocol-compiler
-}:
-
-buildDunePackage {
-  pname = "tezos-protocol-alpha";
-  inherit (tezos-stdlib) version useDune2;
-  src = "${tezos-stdlib.base_src}/src";
-
-  propagatedBuildInputs = [
-    tezos-protocol-compiler
-  ];
-
-  doCheck = true;
-
-  meta = tezos-stdlib.meta // {
-    description = "Tezos/Protocol: economic-protocol definition";
-  };
-}
--- a/pkgs/development/ocaml-modules/tezos/protocol-compiler.nix
+++ b/pkgs/development/ocaml-modules/tezos/protocol-compiler.nix
@ -1,34 +0,0 @@
-{ lib
-, buildDunePackage
-, ocaml
-, tezos-stdlib
-, tezos-version
-, tezos-protocol-environment
-, ocp-ocamlres
-, pprint
-}:
-
-if lib.versionAtLeast ocaml.version "4.13" then
-  throw "tezos-protocol-compiler-${tezos-stdlib.version} is not available for OCaml > 4.12"
-else
-
-buildDunePackage {
-  pname = "tezos-protocol-compiler";
-  inherit (tezos-stdlib) version useDune2;
-  src = "${tezos-stdlib.base_src}/src/lib_protocol_compiler";
-
-  minimalOCamlVersion = "4.12";
-
-  propagatedBuildInputs = [
-    tezos-version
-    tezos-protocol-environment
-    ocp-ocamlres
-    pprint
-  ];
-
-  doCheck = true;
-
-  meta = tezos-stdlib.meta // {
-    description = "Tezos: economic-protocol compiler";
-  };
-}
--- a/pkgs/development/ocaml-modules/tezos/protocol-demo-noops.nix
+++ b/pkgs/development/ocaml-modules/tezos/protocol-demo-noops.nix
@ -1,21 +0,0 @@
-{ lib
-, buildDunePackage
-, tezos-stdlib
-, tezos-protocol-compiler
-}:
-
-buildDunePackage {
-  pname = "tezos-protocol-demo-noops";
-  inherit (tezos-stdlib) version useDune2;
-  src = "${tezos-stdlib.base_src}/src/";
-
-  propagatedBuildInputs = [
-    tezos-protocol-compiler
-  ];
-
-  doCheck = true;
-
-  meta = tezos-stdlib.meta // {
-    description = "Tezos/Protocol: demo_noops economic-protocol definition";
-  };
-}
--- a/pkgs/development/ocaml-modules/tezos/protocol-environment-packer.nix
+++ b/pkgs/development/ocaml-modules/tezos/protocol-environment-packer.nix
@ -1,18 +0,0 @@
-{ lib
-, buildDunePackage
-, tezos-stdlib
-}:
-
-buildDunePackage {
-  pname = "tezos-protocol-environment-packer";
-  inherit (tezos-stdlib) version useDune2;
-  src = "${tezos-stdlib.base_src}/src/lib_protocol_environment";
-
-  minimalOCamlVersion = "4.03";
-
-  doCheck = true;
-
-  meta = tezos-stdlib.meta // {
-    description = "Tezos: sigs/structs packer for economic protocol environment";
-  };
-}
--- a/pkgs/development/ocaml-modules/tezos/protocol-environment-sigs.nix
+++ b/pkgs/development/ocaml-modules/tezos/protocol-environment-sigs.nix
@ -1,42 +0,0 @@
-{ lib
-, buildDunePackage
-, ocaml
-, tezos-stdlib
-, tezos-protocol-environment-packer
-, zarith
-}:
-
-buildDunePackage {
-  pname = "tezos-protocol-environment-sigs";
-  inherit (tezos-stdlib) version useDune2;
-  src = "${tezos-stdlib.base_src}/src/lib_protocol_environment";
-
-  minimalOCamlVersion = "4.12";
-
-  postPatch = ''
-    ls ./sigs/v0
-    cp -f ${zarith}/lib/ocaml/${ocaml.version}/site-lib/zarith/z.mli ./sigs/v1/z.mli
-    cp -f ${zarith}/lib/ocaml/${ocaml.version}/site-lib/zarith/z.mli ./sigs/v2/z.mli
-    cp -f ${zarith}/lib/ocaml/${ocaml.version}/site-lib/zarith/z.mli ./sigs/v3/z.mli
-    sed -i 's/out_channel/Stdlib.out_channel/g' ./sigs/v1/z.mli
-    sed -i 's/Buffer/Stdlib.Buffer/g' ./sigs/v1/z.mli
-    sed -i 's/out_channel/Stdlib.out_channel/g' ./sigs/v2/z.mli
-    sed -i 's/Buffer/Stdlib.Buffer/g' ./sigs/v2/z.mli
-    sed -i 's/out_channel/Stdlib.out_channel/g' ./sigs/v3/z.mli
-    sed -i 's/Buffer/Stdlib.Buffer/g' ./sigs/v3/z.mli
-  '';
-
-  propagatedBuildInputs = [
-    tezos-protocol-environment-packer
-  ];
-
-  checkInputs = [
-    tezos-stdlib
-  ];
-
-  doCheck = true;
-
-  meta = tezos-stdlib.meta // {
-    description = "Tezos: restricted typing environment for the economic protocols";
-  };
-}
--- a/pkgs/development/ocaml-modules/tezos/protocol-environment-structs.nix
+++ b/pkgs/development/ocaml-modules/tezos/protocol-environment-structs.nix
@ -1,25 +0,0 @@
-{ lib
-, buildDunePackage
-, tezos-stdlib
-, tezos-crypto
-, tezos-protocol-environment-packer
-, bls12-381-legacy
-}:
-
-buildDunePackage {
-  pname = "tezos-protocol-environment-structs";
-  inherit (tezos-stdlib) version useDune2;
-  src = "${tezos-stdlib.base_src}/src/lib_protocol_environment";
-
-  propagatedBuildInputs = [
-    tezos-crypto
-    tezos-protocol-environment-packer
-    bls12-381-legacy
-  ];
-
-  doCheck = true;
-
-  meta = tezos-stdlib.meta // {
-    description = "Tezos: restricted typing environment for the economic protocols";
-  };
-}
--- a/pkgs/development/ocaml-modules/tezos/protocol-environment.nix
+++ b/pkgs/development/ocaml-modules/tezos/protocol-environment.nix
@ -1,43 +0,0 @@
-{ lib
-, ocaml
-, buildDunePackage
-, bls12-381
-, bls12-381-legacy
-, tezos-stdlib
-, tezos-base
-, tezos-sapling
-, tezos-context
-, tezos-protocol-environment-sigs
-, tezos-protocol-environment-structs
-, tezos-test-helpers
-, zarith
-, alcotest-lwt
-}:
-
-buildDunePackage {
-  pname = "tezos-protocol-environment";
-  inherit (tezos-stdlib) version useDune2;
-  src = "${tezos-stdlib.base_src}/src/lib_protocol_environment";
-
-  propagatedBuildInputs = [
-    bls12-381
-    bls12-381-legacy
-    tezos-sapling
-    tezos-base
-    tezos-context
-    tezos-protocol-environment-sigs
-    tezos-protocol-environment-structs
-    zarith # this might break, since they actually want 1.11
-  ];
-
-  checkInputs = [
-    alcotest-lwt
-    tezos-test-helpers
-  ];
-
-  doCheck = true;
-
-  meta = tezos-stdlib.meta // {
-    description = "Tezos: custom economic-protocols environment implementation for `tezos-client` and testing";
-  };
-}
--- a/Show more
+++ b/Show more