Merge staging-next into staging

6 files changed, 115 insertions, 3 deletions

diff --git a/pkgs/development/libraries/boost/generic.nix b/pkgs/development/libraries/boost/generic.nix
index 12fbf13fa9a0b..1881f06aa4afd 100644
--- a/pkgs/development/libraries/boost/generic.nix
+++ b/pkgs/development/libraries/boost/generic.nix
@@ -84,7 +84,9 @@ let
     # TODO: make this unconditional
   ] ++ optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
     "address-model=${toString stdenv.hostPlatform.parsed.cpu.bits}"
-    "architecture=${if stdenv.hostPlatform.isMips64 then "mips64" else toString stdenv.hostPlatform.parsed.cpu.family}"
+    "architecture=${if stdenv.hostPlatform.isMips64
+                    then if versionOlder version "1.78" then "mips1" else "mips"
+                    else toString stdenv.hostPlatform.parsed.cpu.family}"
     "binary-format=${toString stdenv.hostPlatform.parsed.kernel.execFormat.name}"
     "target-os=${toString stdenv.hostPlatform.parsed.kernel.name}"
 
diff --git a/pkgs/development/libraries/jellyfin-ffmpeg/default.nix b/pkgs/development/libraries/jellyfin-ffmpeg/default.nix
new file mode 100644
index 0000000000000..925e58d6a327b
--- /dev/null
+++ b/pkgs/development/libraries/jellyfin-ffmpeg/default.nix
@@ -0,0 +1,30 @@
+{ ffmpeg_4, ffmpeg-full, fetchFromGitHub, lib }:
+
+(ffmpeg-full.override { ffmpeg = ffmpeg_4; }).overrideAttrs (old: rec {
+  name = "jellyfin-ffmpeg";
+  version = "4.4.1-4";
+
+  src = fetchFromGitHub {
+    owner = "jellyfin";
+    repo = "jellyfin-ffmpeg";
+    rev = "v${version}";
+    sha256 = "0y7iskamlx30f0zknbscpi308y685nbnbf5gr9cj1znr5dlfb0bn";
+  };
+
+  postPatch = ''
+    for file in $(cat debian/patches/series); do
+      patch -p1 < debian/patches/$file
+    done
+
+    ${old.postPatch or ""}
+  '';
+
+  doCheck = false; # https://github.com/jellyfin/jellyfin-ffmpeg/issues/79
+
+  meta = with lib; {
+    description = "${old.meta.description} (Jellyfin fork)";
+    homepage = "https://github.com/jellyfin/jellyfin-ffmpeg";
+    license = licenses.gpl3;
+    maintainers = with maintainers; [ justinas ];
+  };
+})
diff --git a/pkgs/development/libraries/science/math/fenics/default.nix b/pkgs/development/libraries/science/math/fenics/default.nix
index 2690d544c2c8b..9ca4d6314c1ea 100644
--- a/pkgs/development/libraries/science/math/fenics/default.nix
+++ b/pkgs/development/libraries/science/math/fenics/default.nix
@@ -243,8 +243,8 @@ let
       export CMAKE_PREFIX_PATH=${pybind11}/share/cmake/pybind11:$CMAKE_PREFIX_PATH
       substituteInPlace setup.py --replace "pybind11==2.2.4" "pybind11"
       substituteInPlace dolfin/jit/jit.py \
-        --replace 'pkg-config.exists("dolfin")' 'pkg-config.exists("${dolfin}/lib/pkgconfig/dolfin.pc")' \
-        --replace 'pkg-config.parse("dolfin")' 'pkg-config.parse("${dolfin}/lib/pkgconfig/dolfin.pc")'
+        --replace 'pkgconfig.exists("dolfin")' 'pkgconfig.exists("${dolfin}/lib/pkgconfig/dolfin.pc")' \
+        --replace 'pkgconfig.parse("dolfin")' 'pkgconfig.parse("${dolfin}/lib/pkgconfig/dolfin.pc")'
     '';
     buildInputs = [
       dolfin
diff --git a/pkgs/development/libraries/tomlc99/default.nix b/pkgs/development/libraries/tomlc99/default.nix
new file mode 100644
index 0000000000000..5ed4fd07b4720
--- /dev/null
+++ b/pkgs/development/libraries/tomlc99/default.nix
@@ -0,0 +1,30 @@
+{ lib
+, stdenv
+, fetchFromGitHub
+}:
+
+stdenv.mkDerivation rec {
+  pname = "tomlc99";
+  version = "0.pre+date=2022-04-04";
+
+  src = fetchFromGitHub {
+    owner = "cktan";
+    repo = pname;
+    rev = "4e7b082ccc44316f212597ae5b09a35cf9329e69";
+    hash = "sha256-R9OBMG/aUa80Qw/zqaks63F9ybQcThfOYRsHP4t1Gv8=";
+  };
+
+  dontConfigure = true;
+
+  installFlags = [
+    "prefix=${placeholder "out"}"
+  ];
+
+  meta = with lib; {
+    homepage = "https://github.com/cktan/tomlc99";
+    description = "TOML v1.0.0-compliant library written in C99";
+    license = licenses.mit;
+    maintainers = with maintainers; [ AndersonTorres ];
+    platforms = with platforms; unix;
+  };
+}
diff --git a/pkgs/development/libraries/tomlcpp/0001-missing-headers.diff b/pkgs/development/libraries/tomlcpp/0001-missing-headers.diff
new file mode 100644
index 0000000000000..3559facf3b54b
--- /dev/null
+++ b/pkgs/development/libraries/tomlcpp/0001-missing-headers.diff
@@ -0,0 +1,15 @@
+diff -Naur old-source/tomlcpp.hpp new-source/tomlcpp.hpp
+--- tomlcpp/tomlcpp.hpp	1969-12-31 21:00:01.000000000 -0300
++++ tomlcpp/tomlcpp.hpp	2022-04-14 12:50:14.269775437 -0300
+@@ -25,6 +25,11 @@
+ #ifndef TOML_HPP
+ #define TOML_HPP
+ 
++#include <memory>
++#include <string>
++#include <utility>
++#include <vector>
++
+ struct toml_table_t;
+ struct toml_array_t;
+ 
diff --git a/pkgs/development/libraries/tomlcpp/default.nix b/pkgs/development/libraries/tomlcpp/default.nix
new file mode 100644
index 0000000000000..96559f04541ba
--- /dev/null
+++ b/pkgs/development/libraries/tomlcpp/default.nix
@@ -0,0 +1,35 @@
+{ lib
+, stdenv
+, fetchFromGitHub
+}:
+
+stdenv.mkDerivation rec {
+  pname = "tomlcpp";
+  version = "0.pre+date=2022-05-01";
+
+  src = fetchFromGitHub {
+    owner = "cktan";
+    repo = pname;
+    rev = "59fcc6dc89fb3f4130a2865e41e1fa5b8c502e45";
+    hash = "sha256-Uc6R5KnGIZXY0EJgFM4Xi7Jtxcu6l8yGh5xgFZPoJDM=";
+  };
+
+  patches = [
+    # Self-explaining
+    ./0001-missing-headers.diff
+  ];
+
+  dontConfigure = true;
+
+  installFlags = [
+    "prefix=${placeholder "out"}"
+  ];
+
+  meta = with lib;{
+    homepage = "https://github.com/cktan/tomlcpp";
+    description = "No fanfare TOML C++ Library";
+    license = licenses.mit;
+    maintainers = with maintainers; [ AndersonTorres ];
+    platforms = with platforms; unix;
+  };
+}