mirror of
https://github.com/ilyakooo0/nixpkgs.git
synced 2024-09-30 01:17:28 +03:00
Merge master into staging-next
This commit is contained in:
github-actions[bot]
GitHub
commit
952bd69944
@ -545,12 +545,14 @@ let
|
||||
};
|
||||
|
||||
server = mkOption {
|
||||
type = types.nullOr types.str;
|
||||
inherit (defaultAndText "server" null) default defaultText;
|
||||
type = types.str;
|
||||
inherit (defaultAndText "server" "https://acme-v02.api.letsencrypt.org/directory") default defaultText;
|
||||
example = "https://acme-staging-v02.api.letsencrypt.org/directory";
|
||||
description = lib.mdDoc ''
|
||||
ACME Directory Resource URI. Defaults to Let's Encrypt's
|
||||
production endpoint,
|
||||
<https://acme-v02.api.letsencrypt.org/directory>, if unset.
|
||||
ACME Directory Resource URI.
|
||||
Defaults to Let's Encrypt's production endpoint.
|
||||
For testing Let's Encrypt's [staging endpoint](https://letsencrypt.org/docs/staging-environment/)
|
||||
should be used to avoid the rather tight rate limit on the production endpoint.
|
||||
'';
|
||||
};
|
||||
|
||||
|
||||
@ -78,6 +78,8 @@
|
||||
|
||||
obs-websocket = qt6Packages.callPackage ./obs-websocket.nix { }; # Websocket 4.x compatibility for OBS Studio 28+
|
||||
|
||||
obs-webkitgtk = callPackage ./obs-webkitgtk.nix { };
|
||||
|
||||
wlrobs = callPackage ./wlrobs.nix { };
|
||||
|
||||
waveform = callPackage ./waveform { };
|
||||
|
||||
51
pkgs/applications/video/obs-studio/plugins/obs-webkitgtk.nix
Normal file
51
pkgs/applications/video/obs-studio/plugins/obs-webkitgtk.nix
Normal file
@ -0,0 +1,51 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, obs-studio
|
||||
, webkitgtk
|
||||
, glib-networking
|
||||
, meson
|
||||
, cmake
|
||||
, pkg-config
|
||||
, ninja
|
||||
, wrapGAppsHook
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "obs-webkitgtk";
|
||||
version = "unstable-2023-11-10";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "fzwoch";
|
||||
repo = "obs-webkitgtk";
|
||||
rev = "ddf230852c3c338e69b248bdf453a0630f1298a7";
|
||||
hash = "sha256-DU2w9dRgqWniTE76KTAtFdxIN82VKa/CS6ZdfNcTMto=";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
obs-studio
|
||||
webkitgtk
|
||||
glib-networking
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
meson
|
||||
cmake
|
||||
pkg-config
|
||||
ninja
|
||||
wrapGAppsHook
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace ./obs-webkitgtk.c \
|
||||
--replace 'g_file_read_link("/proc/self/exe", NULL)' "g_strdup(\"$out/lib/obs-plugins\")"
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Yet another OBS Studio browser source";
|
||||
homepage = "https://github.com/fzwoch/obs-webkitgtk";
|
||||
maintainers = with maintainers; [ j-hui ];
|
||||
license = licenses.gpl2Only;
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
@ -12,7 +12,7 @@
|
||||
}:
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "monophony";
|
||||
version = "2.5.2";
|
||||
version = "2.6.0";
|
||||
format = "other";
|
||||
|
||||
sourceRoot = "source/source";
|
||||
@ -20,7 +20,7 @@ python3Packages.buildPythonApplication rec {
|
||||
owner = "zehkira";
|
||||
repo = "monophony";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-DIAvRxUC1JIK4Tyc+REqgO6kZRokPcmLCKwI/+YRGx8=";
|
||||
hash = "sha256-dLv1zdhWXOimxhoyf0T8oM5dF4fKepcIED+DG6D1MH0=";
|
||||
};
|
||||
|
||||
pythonPath = with python3Packages; [
|
||||
|
||||
@ -1,4 +1,5 @@
|
||||
{ lib, stdenv, fetchurl, ocaml, findlib, ocamlbuild, topkg, uucp, uutf, cmdliner
|
||||
, version ? if lib.versionAtLeast ocaml.version "4.14" then "15.1.0" else "15.0.0"
|
||||
, cmdlinerSupport ? lib.versionAtLeast cmdliner.version "1.1"
|
||||
}:
|
||||
|
||||
@ -10,11 +11,14 @@ in
|
||||
stdenv.mkDerivation rec {
|
||||
|
||||
name = "ocaml${ocaml.version}-${pname}-${version}";
|
||||
version = "15.0.0";
|
||||
inherit version;
|
||||
|
||||
src = fetchurl {
|
||||
url = "${webpage}/releases/${pname}-${version}.tbz";
|
||||
sha256 = "sha256-q8x3bia1QaKpzrWFxUmLWIraKqby7TuPNGvbSjkY4eM=";
|
||||
hash = {
|
||||
"15.1.0" = "sha256-IPI3Wd51HzX4n+uGcgc04us29jMjnKbGgVEAdp0CVMU=";
|
||||
"15.0.0" = "sha256-q8x3bia1QaKpzrWFxUmLWIraKqby7TuPNGvbSjkY4eM=";
|
||||
}."${version}";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ ocaml findlib ocamlbuild topkg ];
|
||||
|
||||
@ -678,7 +678,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "datadog-php-profiling"
|
||||
version = "0.96.0"
|
||||
version = "0.97.0"
|
||||
dependencies = [
|
||||
"ahash 0.8.3",
|
||||
"anyhow",
|
||||
|
||||
@ -13,14 +13,14 @@
|
||||
|
||||
buildPecl rec {
|
||||
pname = "ddtrace";
|
||||
version = "0.96.0";
|
||||
version = "0.97.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "DataDog";
|
||||
repo = "dd-trace-php";
|
||||
rev = version;
|
||||
fetchSubmodules = true;
|
||||
hash = "sha256-SXhva2acXIOuru8tTdRt5OU3Pce5eHm6SOn/y7N3ZIs=";
|
||||
hash = "sha256-Kx2HaWvRT+mFIs0LAAptx6nm9DQ83QEuyHNcEPEr7A4=";
|
||||
};
|
||||
|
||||
cargoDeps = rustPlatform.importCargoLock {
|
||||
|
||||
@ -1,6 +1,7 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, buildPythonPackage
|
||||
, fetchpatch
|
||||
, clarabel
|
||||
, cvxopt
|
||||
, ecos
|
||||
@ -29,6 +30,16 @@ buildPythonPackage rec {
|
||||
hash = "sha256-CjhqV4jb14t7IN0HFSTsY2yPpys2KOafGrxxTI+YEeU=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# fix QP tests. remove on next update
|
||||
# https://github.com/cvxpy/cvxpy/pull/2343
|
||||
(fetchpatch {
|
||||
name = "fix-QP-tests.patch";
|
||||
url = "https://github.com/cvxpy/cvxpy/commit/4c8549b9820e64c1b06f5d71c5d3f36528dd4a76.patch";
|
||||
hash = "sha256-43zjS1STEBaGgj1jEOlX3XzMsE4wjoKAk8ApJo98AzY=";
|
||||
})
|
||||
];
|
||||
|
||||
# we need to patch out numpy version caps from upstream
|
||||
postPatch = ''
|
||||
sed -i 's/\(numpy>=[0-9.]*\),<[0-9.]*;/\1;/g' pyproject.toml
|
||||
|
||||
@ -1,7 +1,9 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, buildPythonPackage
|
||||
, pythonOlder
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, pytest-xdist
|
||||
, pytestCheckHook
|
||||
, absl-py
|
||||
@ -29,6 +31,16 @@ buildPythonPackage rec {
|
||||
hash = "sha256-T/BHSnuk3IRuLkBj3Hvb/tFIb7Au25jjQtvwL28OU1U=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# fix failing tests from scipy 1.12 update
|
||||
# https://github.com/google/jaxopt/pull/574
|
||||
(fetchpatch {
|
||||
name = "scipy-1.12-fix-tests.patch";
|
||||
url = "https://github.com/google/jaxopt/commit/48b09dc4cc93b6bc7e6764ed5d333f9b57f3493b.patch";
|
||||
hash = "sha256-v+617W7AhxA1Dzz+DBtljA4HHl89bRTuGi1QfatobNY=";
|
||||
})
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
absl-py
|
||||
jax
|
||||
@ -54,6 +66,13 @@ buildPythonPackage rec {
|
||||
"jaxopt.tree_util"
|
||||
];
|
||||
|
||||
disabledTests = lib.optionals (stdenv.isLinux && stdenv.isAarch64) [
|
||||
# https://github.com/google/jaxopt/issues/577
|
||||
"test_binary_logit_log_likelihood"
|
||||
"test_solve_sparse"
|
||||
"test_logreg_with_intercept_manual_loop3"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://jaxopt.github.io";
|
||||
description = "Hardware accelerated, batchable and differentiable optimizers in JAX";
|
||||
|
||||
@ -12,15 +12,14 @@
|
||||
, certifi
|
||||
, appdirs
|
||||
, aiohttp
|
||||
, httpx
|
||||
}:
|
||||
let
|
||||
version = "1.22.3";
|
||||
in
|
||||
buildPythonPackage rec {
|
||||
buildPythonPackage {
|
||||
pname = "litellm";
|
||||
format = "pyproject";
|
||||
inherit version;
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "BerriAI";
|
||||
|
||||
@ -5,6 +5,7 @@
|
||||
, fetchPypi
|
||||
, future
|
||||
, numpy
|
||||
, oldest-supported-numpy
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
, qdldl
|
||||
@ -15,7 +16,7 @@
|
||||
buildPythonPackage rec {
|
||||
pname = "osqp";
|
||||
version = "0.6.3";
|
||||
format = "setuptools";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
@ -28,6 +29,7 @@ buildPythonPackage rec {
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
oldest-supported-numpy
|
||||
setuptools-scm
|
||||
];
|
||||
|
||||
@ -50,6 +52,14 @@ buildPythonPackage rec {
|
||||
disabledTests = [
|
||||
# Need an unfree license package - mkl
|
||||
"test_issue14"
|
||||
]
|
||||
# disable tests failing after scipy 1.12 update
|
||||
# https://github.com/osqp/osqp-python/issues/121
|
||||
# re-enable once unit tests fixed
|
||||
++ [
|
||||
"feasibility_tests"
|
||||
"polish_tests"
|
||||
"update_matrices_tests"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
|
||||
@ -18,7 +18,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "qutip";
|
||||
version = "4.7.4";
|
||||
version = "4.7.5";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@ -27,7 +27,7 @@ buildPythonPackage rec {
|
||||
owner = pname;
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-gfWYlQoGESE+EryLVfsnmBq9xFf3d92xOmEz4A32iqU=";
|
||||
hash = "sha256-4nXZPZFu9L+Okha3qvPil1KvLGO1EbrzotQjqQ8r9l8=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -2,16 +2,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "pet";
|
||||
version = "0.5.0";
|
||||
version = "0.6.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "knqyf263";
|
||||
repo = "pet";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-+ng4+wrJW/fl1DJMbycLymFgiviTwjlxNApE2Q8PesQ=";
|
||||
sha256 = "sha256-+SjeQJXWoyNVb9AUB0BlXUJpHYRLhvVjteZypjV0FtE=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-JOP7hcCOwVZ0hb2UXHHdxpKxpZqs6a8AjOFbrs711ps=";
|
||||
vendorHash = "sha256-A3VHpSJc6NJz8ojg6iSnQlIXbf9m1JCzg9Vnoie0ffU=";
|
||||
|
||||
ldflags = [
|
||||
"-s" "-w" "-X=github.com/knqyf263/pet/cmd.version=${version}"
|
||||
|
||||
@ -4,10 +4,8 @@
|
||||
, util-linux
|
||||
, libusb1
|
||||
, evdi
|
||||
, systemd
|
||||
, makeWrapper
|
||||
, makeBinaryWrapper
|
||||
, requireFile
|
||||
, substituteAll
|
||||
}:
|
||||
|
||||
let
|
||||
@ -17,9 +15,8 @@ let
|
||||
else if stdenv.hostPlatform.system == "aarch64-linux" then "aarch64-linux-gnu"
|
||||
else throw "Unsupported architecture";
|
||||
libPath = lib.makeLibraryPath [ stdenv.cc.cc util-linux libusb1 evdi ];
|
||||
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "displaylink";
|
||||
version = "5.8.0-63.33";
|
||||
|
||||
@ -41,15 +38,21 @@ stdenv.mkDerivation rec {
|
||||
'';
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ unzip makeWrapper ];
|
||||
nativeBuildInputs = [
|
||||
makeBinaryWrapper
|
||||
unzip
|
||||
];
|
||||
|
||||
unpackPhase = ''
|
||||
runHook preUnpack
|
||||
unzip $src
|
||||
chmod +x displaylink-driver-${version}.run
|
||||
./displaylink-driver-${version}.run --target . --noexec --nodiskspace
|
||||
chmod +x displaylink-driver-${finalAttrs.version}.run
|
||||
./displaylink-driver-${finalAttrs.version}.run --target . --noexec --nodiskspace
|
||||
runHook postUnpack
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
install -Dt $out/lib/displaylink *.spkg
|
||||
install -Dm755 ${bins}/DisplayLinkManager $out/bin/DisplayLinkManager
|
||||
mkdir -p $out/lib/udev/rules.d $out/share
|
||||
@ -63,6 +66,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
# We introduce a dependency on the source file so that it need not be redownloaded everytime
|
||||
echo $src >> "$out/share/workspace_dependencies.pin"
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
dontStrip = true;
|
||||
@ -71,10 +75,11 @@ stdenv.mkDerivation rec {
|
||||
meta = with lib; {
|
||||
description = "DisplayLink DL-5xxx, DL-41xx and DL-3x00 Driver for Linux";
|
||||
homepage = "https://www.displaylink.com/";
|
||||
hydraPlatforms = [];
|
||||
license = licenses.unfree;
|
||||
mainProgram = "DisplayLinkManager";
|
||||
maintainers = with maintainers; [ abbradar ];
|
||||
platforms = [ "x86_64-linux" "i686-linux" "aarch64-linux" ];
|
||||
hydraPlatforms = [];
|
||||
sourceProvenance = with sourceTypes; [ binaryNativeCode ];
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@ -1,17 +1,23 @@
|
||||
{ lib, stdenv, fetchFromGitHub, kernel, libdrm, python3 }:
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, kernel
|
||||
, libdrm
|
||||
, python3
|
||||
}:
|
||||
|
||||
let
|
||||
python3WithLibs = python3.withPackages (ps: with ps; [
|
||||
pybind11
|
||||
]);
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "evdi";
|
||||
version = "1.14.1-unstable-2024-01-30";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "DisplayLink";
|
||||
repo = pname;
|
||||
repo = "evdi";
|
||||
rev = "d21a6ea3c69ba180457966a04b6545d321cf46ca";
|
||||
hash = "sha256-Txa9yX9h3GfmHRRNvhrfrsUoQhqRWbBt4gJYAZTNe0w=";
|
||||
};
|
||||
@ -24,7 +30,11 @@ stdenv.mkDerivation rec {
|
||||
|
||||
nativeBuildInputs = kernel.moduleBuildDependencies;
|
||||
|
||||
buildInputs = [ kernel libdrm python3WithLibs ];
|
||||
buildInputs = [
|
||||
kernel
|
||||
libdrm
|
||||
python3WithLibs
|
||||
];
|
||||
|
||||
makeFlags = kernel.makeFlags ++ [
|
||||
"KVER=${kernel.modDirVersion}"
|
||||
@ -34,19 +44,21 @@ stdenv.mkDerivation rec {
|
||||
hardeningDisable = [ "format" "pic" "fortify" ];
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
install -Dm755 module/evdi.ko $out/lib/modules/${kernel.modDirVersion}/kernel/drivers/gpu/drm/evdi/evdi.ko
|
||||
install -Dm755 library/libevdi.so $out/lib/libevdi.so
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
meta = with lib; {
|
||||
broken = kernel.kernelOlder "4.19";
|
||||
changelog = "https://github.com/DisplayLink/evdi/releases/tag/v${version}";
|
||||
description = "Extensible Virtual Display Interface";
|
||||
homepage = "https://www.displaylink.com/";
|
||||
license = with licenses; [ lgpl21Only gpl2Only ];
|
||||
maintainers = with maintainers; [ ];
|
||||
platforms = platforms.linux;
|
||||
license = with licenses; [ lgpl21Only gpl2Only ];
|
||||
homepage = "https://www.displaylink.com/";
|
||||
broken = kernel.kernelOlder "4.19";
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@ -1,6 +1,8 @@
|
||||
{ lib, stdenv, fetchurl }:
|
||||
{ lib, stdenvNoCC, fetchurl }:
|
||||
|
||||
let
|
||||
stdenv = stdenvNoCC;
|
||||
|
||||
pname = "ookla-speedtest";
|
||||
version = "1.2.0";
|
||||
|
||||
@ -51,5 +53,6 @@ stdenv.mkDerivation rec {
|
||||
license = licenses.unfree;
|
||||
maintainers = with maintainers; [ kranzes ];
|
||||
platforms = lib.attrNames srcs;
|
||||
mainProgram = "speedtest";
|
||||
};
|
||||
}
|
||||
|
||||
@ -5,16 +5,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "subfinder";
|
||||
version = "2.6.4";
|
||||
version = "2.6.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "projectdiscovery";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-pCfTaxGScGg2pcQERfWYOwBI3dnfOuXcFZ9msncpPwE=";
|
||||
hash = "sha256-+Xw4fom7lNfVxbGGoeWG7f37Gk1Dic+jzozh6HodplE=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-3JlCXW5TfZT6zJ93V45XMDtfpuc31tHCLiJOscizG9M=";
|
||||
vendorHash = "sha256-n+FKmgluRfzhufia5rPqLKt4owCyWO4bP6Zgi+4Ax9w=";
|
||||
|
||||
modRoot = "./v2";
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user