Merge master into staging-next

4 files changed, 4 insertions, 92 deletions

diff --git a/pkgs/development/libraries/dlib/default.nix b/pkgs/development/libraries/dlib/default.nix
index ca40fbb3c68db..9a9b774ad265e 100644
--- a/pkgs/development/libraries/dlib/default.nix
+++ b/pkgs/development/libraries/dlib/default.nix
@@ -18,13 +18,13 @@
 }@inputs:
 (if cudaSupport then cudaPackages.backendStdenv else inputs.stdenv).mkDerivation rec {
   pname = "dlib";
-  version = "19.24.2";
+  version = "19.24.4";
 
   src = fetchFromGitHub {
     owner = "davisking";
     repo = "dlib";
     rev = "v${version}";
-    sha256 = "sha256-Z1fScuaIHjj2L1uqLIvsZ7ARKNjM+iaA8SAtWUTPFZk=";
+    sha256 = "sha256-1A/9u+ThtUtmmSwnFSn8S65Yavucl2X+o3bNYgew0Oc=";
   };
 
   postPatch = ''
diff --git a/pkgs/development/libraries/json-fortran/default.nix b/pkgs/development/libraries/json-fortran/default.nix
index de1909fae4444..52ec487c06369 100644
--- a/pkgs/development/libraries/json-fortran/default.nix
+++ b/pkgs/development/libraries/json-fortran/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "json-fortran";
-  version = "8.5.2";
+  version = "9.0.1";
 
   src = fetchFromGitHub {
     owner = "jacobwilliams";
     repo = pname;
     rev = version;
-    hash = "sha256-ja/MIqAe4V5nasdtWThkRxNWCx4+twz7/dX4+8X+Bt8=";
+    hash = "sha256-nhT2zLyt3ORi35h9KzOiIuD50GGUCZ/Z5SX8UF3rqQs=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/development/libraries/libopus/default.nix b/pkgs/development/libraries/libopus/default.nix
deleted file mode 100644
index a841d1cfa903d..0000000000000
--- a/pkgs/development/libraries/libopus/default.nix
+++ /dev/null
@@ -1,79 +0,0 @@
-{ lib
-, stdenv
-, fetchurl
-, gitUpdater
-, meson
-, python3
-, ninja
-, fixedPoint ? false
-, withCustomModes ? true
-, withIntrinsics ? stdenv.hostPlatform.isAarch || stdenv.hostPlatform.isx86
-, withAsm ? false
-
-# tests
-, ffmpeg-headless
-, testers
-}:
-
-stdenv.mkDerivation (finalAttrs: {
-  pname = "libopus";
-  version = "1.5.2";
-
-  src = fetchurl {
-    url = "https://downloads.xiph.org/releases/opus/opus-${finalAttrs.version}.tar.gz";
-    hash = "sha256-ZcHS94ufL7IAgsOMvkfJUa1YOTRYduRpQWEu6H+afOE=";
-  };
-
-  patches = [
-    # Some tests time out easily on slower machines
-    ./test-timeout.patch
-  ];
-
-  postPatch = ''
-    patchShebangs meson/
-  '';
-
-  outputs = [ "out" "dev" ];
-
-  nativeBuildInputs = [
-    meson
-    python3
-    ninja
-  ];
-
-  mesonFlags = [
-    (lib.mesonBool "fixed-point" fixedPoint)
-    (lib.mesonBool "custom-modes" withCustomModes)
-    (lib.mesonEnable "intrinsics" withIntrinsics)
-    (lib.mesonEnable "rtcd" (withIntrinsics || withAsm))
-    (lib.mesonEnable "asm" withAsm)
-    (lib.mesonEnable "docs" false)
-  ];
-
-  doCheck = !stdenv.isi686 && !stdenv.isAarch32; # test_unit_LPC_inv_pred_gain fails
-
-  passthru = {
-    updateScript = gitUpdater {
-      url = "https://gitlab.xiph.org/xiph/opus.git";
-      rev-prefix = "v";
-    };
-
-    tests = {
-      inherit ffmpeg-headless;
-
-      pkg-config = testers.hasPkgConfigModules {
-        package = finalAttrs.finalPackage;
-        moduleNames = [ "opus" ];
-      };
-    };
-  };
-
-  meta = with lib; {
-    description = "Open, royalty-free, highly versatile audio codec";
-    homepage = "https://opus-codec.org/";
-    changelog = "https://gitlab.xiph.org/xiph/opus/-/releases/v${finalAttrs.version}";
-    license = licenses.bsd3;
-    platforms = platforms.all;
-    maintainers = [ ];
-  };
-})
diff --git a/pkgs/development/libraries/libopus/test-timeout.patch b/pkgs/development/libraries/libopus/test-timeout.patch
deleted file mode 100644
index 76025e648d8f5..0000000000000
--- a/pkgs/development/libraries/libopus/test-timeout.patch
+++ /dev/null
@@ -1,9 +0,0 @@
---- a/tests/meson.build
-+++ b/tests/meson.build
-@@ -1,6 +1,5 @@
- # Tests that link to libopus
- opus_tests = [
--  ['test_opus_api'],
-   ['test_opus_decode', [], 120],
-   ['test_opus_encode', 'opus_encode_regressions.c', 240],
-   ['test_opus_extensions', [], 120],