Merge master into staging-next

2021-03-29 00:15:48 +00:00
parent b9456ca263 b9753491a3
commit d495e7527f
45 changed files with 756 additions and 137 deletions
--- a/pkgs/development/libraries/dlib/default.nix
+++ b/pkgs/development/libraries/dlib/default.nix
@@ -9,13 +9,13 @@

 stdenv.mkDerivation rec {
  pname = "dlib";
-  version = "19.21";
+  version = "19.22";

  src = fetchFromGitHub {
    owner = "davisking";
    repo = "dlib";
    rev ="v${version}";
-    sha256 = "00jwklnl21l3hlvb0bjc6rl3hgi88vxb41dsn4m0kh436c9v0rl3";
+    sha256 = "sha256-cEbw01w4KgSG3JTvTE/qruo7i4/L++m02HW+0VNmSSQ=";
  };

  postPatch = ''