mirror of
https://github.com/ilyakooo0/nixpkgs.git
synced 2024-09-22 21:18:28 +03:00
Merge master into staging-next
This commit is contained in:
commit
ec4b7ebf86
@ -2,13 +2,13 @@
|
|||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "mg";
|
pname = "mg";
|
||||||
version = "6.8.1";
|
version = "6.9";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "ibara";
|
owner = "ibara";
|
||||||
repo = "mg";
|
repo = "mg";
|
||||||
rev = "mg-6.8.1";
|
rev = "mg-${version}";
|
||||||
sha256 = "0fyqyi5sag13jx8bc22bvkgybddvsr0wdili9ikxnpnqg2w84fx7";
|
sha256 = "1w49yb9v1657rv1w5w7rc9ih1d2vzv6ym3mzhf2wgmh04pdm6hid";
|
||||||
};
|
};
|
||||||
|
|
||||||
enableParallelBuilding = true;
|
enableParallelBuilding = true;
|
||||||
|
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
@ -0,0 +1,26 @@
|
|||||||
|
From 635772c4c5ecf11a0f84e6c9fc273dce6b9a5688 Mon Sep 17 00:00:00 2001
|
||||||
|
From: V <v@anomalous.eu>
|
||||||
|
Date: Thu, 10 Jun 2021 18:36:22 +0200
|
||||||
|
Subject: [PATCH] Change product_version to user_agent_product
|
||||||
|
|
||||||
|
This is its name as of CEF 91.1.0.
|
||||||
|
---
|
||||||
|
obs-browser-plugin.cpp | 2 +-
|
||||||
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||||
|
|
||||||
|
diff --git a/obs-browser-plugin.cpp b/obs-browser-plugin.cpp
|
||||||
|
index 1a6a009..5eb379e 100644
|
||||||
|
--- a/plugins/obs-browser/obs-browser-plugin.cpp
|
||||||
|
+++ b/plugins/obs-browser/obs-browser-plugin.cpp
|
||||||
|
@@ -298,7 +298,7 @@ static void BrowserInit(void)
|
||||||
|
prod_ver << std::to_string(obs_maj) << "." << std::to_string(obs_min)
|
||||||
|
<< "." << std::to_string(obs_pat);
|
||||||
|
|
||||||
|
- CefString(&settings.product_version) = prod_ver.str();
|
||||||
|
+ CefString(&settings.user_agent_product) = prod_ver.str();
|
||||||
|
|
||||||
|
#ifdef USE_QT_LOOP
|
||||||
|
settings.external_message_pump = true;
|
||||||
|
--
|
||||||
|
2.31.1
|
||||||
|
|
@ -0,0 +1,36 @@
|
|||||||
|
From 0de0a90f8fe5e1e48fa4ec7aa7c825ef88770f9d Mon Sep 17 00:00:00 2001
|
||||||
|
From: Ryan Foster <RytoEX@gmail.com>
|
||||||
|
Date: Mon, 9 Sep 2019 23:55:02 -0400
|
||||||
|
Subject: [PATCH] Enable file access and universal access for file URLs
|
||||||
|
|
||||||
|
When loading a local file, instead of disabling CEF's web security,
|
||||||
|
enable file access and universal access for file URLs. This should allow
|
||||||
|
local files to make CORS requests without completely disabling CEF's
|
||||||
|
security model.
|
||||||
|
---
|
||||||
|
obs-browser-source.cpp | 9 ++++++---
|
||||||
|
1 file changed, 6 insertions(+), 3 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/obs-browser-source.cpp b/obs-browser-source.cpp
|
||||||
|
index ab1181e..c775283 100644
|
||||||
|
--- a/plugins/obs-browser/obs-browser-source.cpp
|
||||||
|
+++ b/plugins/obs-browser/obs-browser-source.cpp
|
||||||
|
@@ -179,9 +179,12 @@ bool BrowserSource::CreateBrowser()
|
||||||
|
|
||||||
|
#if ENABLE_LOCAL_FILE_URL_SCHEME
|
||||||
|
if (is_local) {
|
||||||
|
- /* Disable web security for file:// URLs to allow
|
||||||
|
- * local content access to remote APIs */
|
||||||
|
- cefBrowserSettings.web_security = STATE_DISABLED;
|
||||||
|
+ /* Enable file access and universal access from file://
|
||||||
|
+ * URLs to allow local content access to remote APIs */
|
||||||
|
+ cefBrowserSettings.file_access_from_file_urls =
|
||||||
|
+ STATE_ENABLED;
|
||||||
|
+ cefBrowserSettings.universal_access_from_file_urls =
|
||||||
|
+ STATE_ENABLED;
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
|
--
|
||||||
|
2.31.1
|
||||||
|
|
@ -53,6 +53,14 @@ in mkDerivation rec {
|
|||||||
fetchSubmodules = true;
|
fetchSubmodules = true;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
patches = [
|
||||||
|
# Lets obs-browser build against CEF 90.1.0+
|
||||||
|
./Enable-file-access-and-universal-access-for-file-URL.patch
|
||||||
|
|
||||||
|
# Lets obs-browser build against CEF 91.1.0+
|
||||||
|
./Change-product_version-to-user_agent_product.patch
|
||||||
|
];
|
||||||
|
|
||||||
nativeBuildInputs = [ addOpenGLRunpath cmake pkg-config ];
|
nativeBuildInputs = [ addOpenGLRunpath cmake pkg-config ];
|
||||||
|
|
||||||
buildInputs = [
|
buildInputs = [
|
||||||
|
@ -1,26 +1,66 @@
|
|||||||
{ lib, stdenv, fetchurl, cmake, alsa-lib, atk, cairo, cups, dbus, expat, fontconfig
|
{ lib, stdenv, fetchurl, cmake
|
||||||
, GConf, gdk-pixbuf, glib, gtk2, libX11, libxcb, libXcomposite, libXcursor
|
, glib
|
||||||
, libXdamage, libXext, libXfixes, libXi, libXrandr, libXrender, libXScrnSaver
|
, nss
|
||||||
, libXtst, nspr, nss, pango, libpulseaudio, systemd, at-spi2-atk, at-spi2-core
|
, nspr
|
||||||
|
, atk
|
||||||
|
, at-spi2-atk
|
||||||
|
, libdrm
|
||||||
|
, expat
|
||||||
|
, libxcb
|
||||||
|
, libxkbcommon
|
||||||
|
, libX11
|
||||||
|
, libXcomposite
|
||||||
|
, libXdamage
|
||||||
|
, libXext
|
||||||
|
, libXfixes
|
||||||
|
, libXrandr
|
||||||
|
, mesa
|
||||||
|
, gtk3
|
||||||
|
, pango
|
||||||
|
, cairo
|
||||||
|
, alsa-lib
|
||||||
|
, dbus
|
||||||
|
, at-spi2-core
|
||||||
|
, cups
|
||||||
|
, libxshmfence
|
||||||
}:
|
}:
|
||||||
|
|
||||||
let
|
let
|
||||||
libPath =
|
rpath = lib.makeLibraryPath [
|
||||||
lib.makeLibraryPath [
|
glib
|
||||||
alsa-lib atk cairo cups dbus expat fontconfig GConf gdk-pixbuf glib gtk2
|
nss
|
||||||
libX11 libxcb libXcomposite libXcursor libXdamage libXext libXfixes libXi
|
nspr
|
||||||
libXrandr libXrender libXScrnSaver libXtst nspr nss pango libpulseaudio
|
atk
|
||||||
systemd at-spi2-core at-spi2-atk
|
at-spi2-atk
|
||||||
];
|
libdrm
|
||||||
in
|
expat
|
||||||
stdenv.mkDerivation rec {
|
libxcb
|
||||||
|
libxkbcommon
|
||||||
|
libX11
|
||||||
|
libXcomposite
|
||||||
|
libXdamage
|
||||||
|
libXext
|
||||||
|
libXfixes
|
||||||
|
libXrandr
|
||||||
|
mesa
|
||||||
|
gtk3
|
||||||
|
pango
|
||||||
|
cairo
|
||||||
|
alsa-lib
|
||||||
|
dbus
|
||||||
|
at-spi2-core
|
||||||
|
cups
|
||||||
|
libxshmfence
|
||||||
|
];
|
||||||
|
in stdenv.mkDerivation rec {
|
||||||
pname = "cef-binary";
|
pname = "cef-binary";
|
||||||
version = "75.1.14-gc81164e";
|
version = "90.6.7";
|
||||||
|
gitRevision = "19ba721";
|
||||||
|
chromiumVersion = "90.0.4430.212";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
name = "cef_binary_75.1.14+gc81164e+chromium-75.0.3770.100_linux64_minimal.tar.bz2";
|
url = "https://cef-builds.spotifycdn.com/cef_binary_${version}+g${gitRevision}+chromium-${chromiumVersion}_linux64_minimal.tar.bz2";
|
||||||
url = "http://opensource.spotify.com/cefbuilds/cef_binary_75.1.14%2Bgc81164e%2Bchromium-75.0.3770.100_linux64_minimal.tar.bz2";
|
sha256 = "1ja711x9fdlf21qw1k9xn3lvjc5zsfgnjga1w1r8sysam73jk7xj";
|
||||||
sha256 = "0985b2bx505j0q693hifjgidzb597wqf5idql5aqxs8lfxhc2pgg";
|
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [ cmake ];
|
nativeBuildInputs = [ cmake ];
|
||||||
@ -32,7 +72,7 @@ stdenv.mkDerivation rec {
|
|||||||
mkdir -p $out/lib/ $out/share/cef/
|
mkdir -p $out/lib/ $out/share/cef/
|
||||||
cp libcef_dll_wrapper/libcef_dll_wrapper.a $out/lib/
|
cp libcef_dll_wrapper/libcef_dll_wrapper.a $out/lib/
|
||||||
cp ../Release/libcef.so $out/lib/
|
cp ../Release/libcef.so $out/lib/
|
||||||
patchelf --set-rpath "${libPath}" $out/lib/libcef.so
|
patchelf --set-rpath "${rpath}" $out/lib/libcef.so
|
||||||
cp ../Release/*.bin $out/share/cef/
|
cp ../Release/*.bin $out/share/cef/
|
||||||
cp -r ../Resources/* $out/share/cef/
|
cp -r ../Resources/* $out/share/cef/
|
||||||
cp -r ../include $out/
|
cp -r ../include $out/
|
||||||
@ -40,7 +80,7 @@ stdenv.mkDerivation rec {
|
|||||||
|
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
description = "Simple framework for embedding Chromium-based browsers in other applications";
|
description = "Simple framework for embedding Chromium-based browsers in other applications";
|
||||||
homepage = "http://opensource.spotify.com/cefbuilds/index.html";
|
homepage = "https://cef-builds.spotifycdn.com/index.html";
|
||||||
maintainers = with maintainers; [ puffnfresh ];
|
maintainers = with maintainers; [ puffnfresh ];
|
||||||
license = licenses.bsd3;
|
license = licenses.bsd3;
|
||||||
platforms = with platforms; linux;
|
platforms = with platforms; linux;
|
||||||
|
@ -1,20 +1,40 @@
|
|||||||
{ buildPythonPackage, fetchFromGitHub, lib, pythonOlder }:
|
{ buildPythonPackage, fetchFromGitHub, lib, pythonOlder, pytest }:
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
pname = "typed-ast";
|
pname = "typed-ast";
|
||||||
version = "1.4.1";
|
version = "1.4.3";
|
||||||
src = fetchFromGitHub{
|
src = fetchFromGitHub {
|
||||||
owner = "python";
|
owner = "python";
|
||||||
repo = "typed_ast";
|
repo = "typed_ast";
|
||||||
rev = version;
|
rev = version;
|
||||||
sha256 = "086r9qhls6mz1w72a6d1ld3m4fbkxklf6mgwbs8wpw0zlxjm7y40";
|
sha256 = "16mn9snwik5n2ib65sw2xcaqdm02j8ps21zgjxf8kyy7qnx2mx4w";
|
||||||
};
|
};
|
||||||
# Only works with Python 3.3 and newer;
|
# Only works with Python 3.3 and newer;
|
||||||
disabled = pythonOlder "3.3";
|
disabled = pythonOlder "3.3";
|
||||||
# No tests in archive
|
|
||||||
doCheck = false;
|
pythonImportsCheck = [
|
||||||
|
"typed_ast"
|
||||||
|
"typed_ast.ast27"
|
||||||
|
"typed_ast.ast3"
|
||||||
|
"typed_ast.conversions"
|
||||||
|
];
|
||||||
|
|
||||||
|
checkInputs = [
|
||||||
|
pytest
|
||||||
|
];
|
||||||
|
checkPhase = ''
|
||||||
|
runHook preCheck
|
||||||
|
|
||||||
|
# We can't use pytestCheckHook because that invokes pytest with python -m pytest
|
||||||
|
# which adds the current directory to sys.path at the beginning.
|
||||||
|
# _That_ version of the typed_ast module doesn't have the C extensions we need.
|
||||||
|
pytest
|
||||||
|
|
||||||
|
runHook postCheck
|
||||||
|
'';
|
||||||
|
|
||||||
meta = {
|
meta = {
|
||||||
homepage = "https://pypi.python.org/pypi/typed-ast";
|
homepage = "https://github.com/python/typed_ast";
|
||||||
description = "a fork of Python 2 and 3 ast modules with type comment support";
|
description = "Python 2 and 3 ast modules with type comment support";
|
||||||
license = lib.licenses.asl20;
|
license = lib.licenses.asl20;
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
@ -38,6 +38,7 @@ stdenv.mkDerivation rec {
|
|||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
description = "A free multiplayer & singleplayer first person shooter, the successor of the Cube FPS";
|
description = "A free multiplayer & singleplayer first person shooter, the successor of the Cube FPS";
|
||||||
maintainers = with maintainers; [ raskin ajs124 ];
|
maintainers = with maintainers; [ raskin ajs124 ];
|
||||||
|
mainProgram = "sauerbraten_client";
|
||||||
hydraPlatforms =
|
hydraPlatforms =
|
||||||
# raskin: tested amd64-linux;
|
# raskin: tested amd64-linux;
|
||||||
# not setting platforms because it is 0.5+ GiB of game data
|
# not setting platforms because it is 0.5+ GiB of game data
|
||||||
|
@ -23,8 +23,12 @@ buildGoModule rec {
|
|||||||
goPackagePath = "github.com/prometheus/node_exporter";
|
goPackagePath = "github.com/prometheus/node_exporter";
|
||||||
in ''
|
in ''
|
||||||
-ldflags=
|
-ldflags=
|
||||||
-X ${goPackagePath}/vendor/github.com/prometheus/common/version.Version=${version}
|
-s -w
|
||||||
-X ${goPackagePath}/vendor/github.com/prometheus/common/version.Revision=${rev}
|
-X github.com/prometheus/common/version.Version=${version}
|
||||||
|
-X github.com/prometheus/common/version.Revision=${rev}
|
||||||
|
-X github.com/prometheus/common/version.Branch=unknown
|
||||||
|
-X github.com/prometheus/common/version.BuildUser=nix@nixpkgs
|
||||||
|
-X github.com/prometheus/common/version.BuildDate=unknown
|
||||||
'';
|
'';
|
||||||
|
|
||||||
passthru.tests = { inherit (nixosTests.prometheus-exporters) node; };
|
passthru.tests = { inherit (nixosTests.prometheus-exporters) node; };
|
||||||
|
34
pkgs/tools/filesystems/goofys/default.nix
Normal file
34
pkgs/tools/filesystems/goofys/default.nix
Normal file
@ -0,0 +1,34 @@
|
|||||||
|
{ lib
|
||||||
|
, buildGoModule
|
||||||
|
, fetchFromGitHub
|
||||||
|
}:
|
||||||
|
|
||||||
|
buildGoModule {
|
||||||
|
pname = "goofys";
|
||||||
|
version = "unstable-2021-03-26";
|
||||||
|
|
||||||
|
src = fetchFromGitHub {
|
||||||
|
owner = "kahing";
|
||||||
|
repo = "goofys";
|
||||||
|
# Same as v0.24.0 but migrated to Go modules
|
||||||
|
rev = "0c993271269b539196330a18716a33fbeeebd624";
|
||||||
|
sha256 = "18is5sv2a9wmsm0qpakly988z1qyl2b2hf2105lpxrgl659sf14p";
|
||||||
|
};
|
||||||
|
|
||||||
|
vendorSha256 = "15yq0msh9icxd5n2zkkqrlwxifizhpa99d4aznv8clg32ybs61fj";
|
||||||
|
|
||||||
|
subPackages = [ "." ];
|
||||||
|
|
||||||
|
# Tests are using networking
|
||||||
|
postPatch = ''
|
||||||
|
rm internal/*_test.go
|
||||||
|
'';
|
||||||
|
|
||||||
|
meta = {
|
||||||
|
homepage = "https://github.com/kahing/goofys";
|
||||||
|
description = "A high-performance, POSIX-ish Amazon S3 file system written in Go.";
|
||||||
|
license = [ lib.licenses.mit ];
|
||||||
|
maintainers = [ lib.maintainers.adisbladis ];
|
||||||
|
};
|
||||||
|
|
||||||
|
}
|
@ -5315,6 +5315,8 @@ in
|
|||||||
|
|
||||||
go-mtpfs = callPackage ../tools/filesystems/go-mtpfs { };
|
go-mtpfs = callPackage ../tools/filesystems/go-mtpfs { };
|
||||||
|
|
||||||
|
goofys = callPackage ../tools/filesystems/goofys { };
|
||||||
|
|
||||||
go-sct = callPackage ../tools/X11/go-sct { };
|
go-sct = callPackage ../tools/X11/go-sct { };
|
||||||
|
|
||||||
# rename to upower-notify?
|
# rename to upower-notify?
|
||||||
@ -15926,7 +15928,7 @@ in
|
|||||||
|
|
||||||
libcec_platform = callPackage ../development/libraries/libcec/platform.nix { };
|
libcec_platform = callPackage ../development/libraries/libcec/platform.nix { };
|
||||||
|
|
||||||
libcef = callPackage ../development/libraries/libcef { inherit (gnome2) GConf; };
|
libcef = callPackage ../development/libraries/libcef {};
|
||||||
|
|
||||||
libcello = callPackage ../development/libraries/libcello {};
|
libcello = callPackage ../development/libraries/libcello {};
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user