mirror of
https://github.com/NixOS/nixpkgs.git
synced 2026-10-02 13:00:23 +00:00
Merge staging-next-21.11 into staging-21.11
This commit is contained in:
github-actions[bot]
@@ -1,6 +1,6 @@
|
||||
{ stdenv
|
||||
, lib
|
||||
, fetchFromGitHub
|
||||
, fetchFromSourcehut
|
||||
, asciidoc
|
||||
, cmocka
|
||||
, docbook_xsl
|
||||
@@ -56,13 +56,14 @@ assert builtins.all
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "imv";
|
||||
version = "4.3.0";
|
||||
version = "4.3.1";
|
||||
outputs = [ "out" "man" ];
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "eXeC64";
|
||||
src = fetchFromSourcehut {
|
||||
owner = "~exec64";
|
||||
repo = "imv";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-HP9W9US9e3YAXwCqiHV8NVqrO20SfQKcW3a6+r1XrIs=";
|
||||
sha256 = "sha256-gMAd8skst72QT4jGFH7aRdWeAd4tf/uQgXhGaM/Dpgc=";
|
||||
};
|
||||
|
||||
mesonFlags = [
|
||||
|
||||
@@ -6,6 +6,6 @@
|
||||
|
||||
callPackage ./generic.nix {
|
||||
inherit buildGoPackage nvidia_x11 nvidiaGpuSupport;
|
||||
version = "1.0.12";
|
||||
sha256 = "04fqliz7y4zzs4xraid54mqxwgrzh138nmfcs876vp534slvikpi";
|
||||
version = "1.0.13";
|
||||
sha256 = "19wlma2y8lpb7p01wb0l20rb6nvrvldz0mm3qfisx33y56ykjyh8";
|
||||
}
|
||||
|
||||
@@ -6,7 +6,7 @@
|
||||
|
||||
callPackage ./genericModule.nix {
|
||||
inherit buildGoModule nvidia_x11 nvidiaGpuSupport;
|
||||
version = "1.1.6";
|
||||
sha256 = "1q6fqay1s9qwimjwlldc8hr6009cgx3ghz142mdx36jjv9isj9ln";
|
||||
vendorSha256 = "0rfd22rf76mwj489zhswah4g3dhhz6davm336xgm9dbnyaz9d8r0";
|
||||
version = "1.1.8";
|
||||
sha256 = "05k1r157h3jaqzzsrkgc96zcny3mi8dvixc2v1w0lwcxixqk0y2l";
|
||||
vendorSha256 = "03hjin9nybf7fpbj5r82qh19qh3cc8m0b236mk0ajhsyjqrk8pir";
|
||||
}
|
||||
|
||||
@@ -31,13 +31,13 @@
|
||||
|
||||
mkDerivation rec {
|
||||
pname = "nheko";
|
||||
version = "0.9.0";
|
||||
version = "0.9.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Nheko-Reborn";
|
||||
repo = "nheko";
|
||||
rev = "v${version}";
|
||||
sha256 = "1akhnngxkxbjwjkg5ispl6j5s2ylbcj92r3zxqqry4gbfxbjpx8k";
|
||||
sha256 = "sha256-KnWZ1DSTg8vtNSlpG5LGUG8YDHt25s9pMLpLuj0WLnM=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -4,6 +4,7 @@
|
||||
, cmake
|
||||
, qtbase
|
||||
, qtmultimedia
|
||||
, qtimageformats
|
||||
, qtx11extras
|
||||
, qttools
|
||||
, libidn
|
||||
@@ -67,6 +68,7 @@ mkDerivation rec {
|
||||
buildInputs = [
|
||||
qtbase
|
||||
qtmultimedia
|
||||
qtimageformats
|
||||
qtx11extras
|
||||
libidn
|
||||
qca-qt5
|
||||
|
||||
@@ -9,18 +9,18 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "shellhub-agent";
|
||||
version = "0.8.1";
|
||||
version = "0.8.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "shellhub-io";
|
||||
repo = "shellhub";
|
||||
rev = "v${version}";
|
||||
sha256 = "LafREMle3v/XLLsfS+sNSE4Q9AwX4v8Mg9/9RngbN40=";
|
||||
sha256 = "saaohHHjX9ws74SXlpP+V9cks0ddLkz04ceY14uoVhA=";
|
||||
};
|
||||
|
||||
modRoot = "./agent";
|
||||
|
||||
vendorSha256 = "sha256-3bHDDjfpXgmS6lpIOkpouTKTjHT1gMbUWnuskaOptUM=";
|
||||
vendorSha256 = "sha256-Xfzk6Ts6+LzGaMTcbopGG6WT541nkAnZxq/3AlX81ks=";
|
||||
|
||||
ldflags = [ "-s" "-w" "-X main.AgentVersion=v${version}" ];
|
||||
|
||||
|
||||
@@ -14,19 +14,16 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "wingpanel-indicator-ayatana";
|
||||
version = "unstable-2021-12-01";
|
||||
version = "unstable-2021-12-18";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Lafydev";
|
||||
repo = pname;
|
||||
rev = "53dc05919cdba772c787620a4bee5821e38c53cd";
|
||||
sha256 = "sha256-T0OHzqENyeAr0pvXUaRMwF1RpwKVyDAF5P5G9S28COU=";
|
||||
rev = "5749f753ca64ce58232a46b9045949b3f8219827";
|
||||
sha256 = "sha256-kuEVw62IDTyC3hRRcWv2RihPOohGqEt8YLr44SurwPM=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Fixes install path for wingpanel indicator
|
||||
# https://github.com/Lafydev/wingpanel-indicator-ayatana/pull/30
|
||||
./fix-indicator-dir.patch
|
||||
# Tells the indicator the path for libapplication.so
|
||||
(substituteAll {
|
||||
src = ./fix-libapplication-dir.patch;
|
||||
|
||||
@@ -1,16 +0,0 @@
|
||||
diff --git a/meson.build b/meson.build
|
||||
index 4aeab2b..dc44e6c 100644
|
||||
--- a/meson.build
|
||||
+++ b/meson.build
|
||||
@@ -25,8 +25,10 @@ dependencies = {
|
||||
'wingpanel': wingpanel
|
||||
}
|
||||
|
||||
+libdir = join_paths(get_option('prefix'), get_option('libdir'))
|
||||
+
|
||||
indicator_name = 'ayatana'
|
||||
-indicator_dir = dependencies['wingpanel'].get_pkgconfig_variable('indicatorsdir')
|
||||
+indicator_dir = dependencies['wingpanel'].get_pkgconfig_variable('indicatorsdir', define_variable: ['libdir', libdir])
|
||||
|
||||
# ----------------------------------------------------------------------------------------------------------------------
|
||||
# Bindings:
|
||||
@@ -11,14 +11,14 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "coeurl";
|
||||
version = "0.1.0";
|
||||
version = "0.1.1";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
domain = "nheko.im";
|
||||
owner = "nheko-reborn";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "10a5klr44m2xy6law8s3s5rynk1q268fa4pkhilbn52yyv0fwajq";
|
||||
sha256 = "sha256-F4kHE9r2pR8hI+CrZQ9ElPjtp0McgwfSxoD5p56KDGs=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ ninja pkg-config meson ];
|
||||
|
||||
@@ -14,13 +14,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "mtxclient";
|
||||
version = "0.6.0";
|
||||
version = "0.6.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Nheko-Reborn";
|
||||
repo = "mtxclient";
|
||||
rev = "v${version}";
|
||||
sha256 = "0sxx7vj6a1n2d95c118pjq52707qwf16154fdvz5f4z1pq7c8dsi";
|
||||
sha256 = "sha256-hTB0a5KXcQb0MCEX9YonDJOGlTmRkrOIP9UFlwuJc6g=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@@ -6,13 +6,13 @@
|
||||
, numpy, tensorflow-tensorboard_2, absl-py
|
||||
, setuptools, wheel, keras-preprocessing, google-pasta
|
||||
, opt-einsum, astunparse, h5py
|
||||
, termcolor, grpcio, six, wrapt, protobuf, tensorflow-estimator_2
|
||||
, termcolor, grpcio, six, wrapt, protobuf-python, tensorflow-estimator_2
|
||||
, dill, flatbuffers-python, tblib, typing-extensions
|
||||
# Common deps
|
||||
, git, pybind11, which, binutils, glibcLocales, cython, perl
|
||||
# Common libraries
|
||||
, jemalloc, mpi, gast, grpc, sqlite, boringssl, jsoncpp
|
||||
, curl, snappy, flatbuffers-core, lmdb-core, icu, double-conversion, libpng, libjpeg_turbo, giflib
|
||||
, curl, snappy, flatbuffers-core, lmdb-core, icu, double-conversion, libpng, libjpeg_turbo, giflib, protobuf-core
|
||||
# Upsteam by default includes cuda support since tensorflow 1.15. We could do
|
||||
# that in nix as well. It would make some things easier and less confusing, but
|
||||
# it would also make the default tensorflow package unfree. See
|
||||
@@ -72,7 +72,7 @@ let
|
||||
|
||||
tfFeature = x: if x then "1" else "0";
|
||||
|
||||
version = "2.4.2";
|
||||
version = "2.4.4";
|
||||
variant = if cudaSupport then "-gpu" else "";
|
||||
pname = "tensorflow${variant}";
|
||||
|
||||
@@ -90,7 +90,7 @@ let
|
||||
keras-preprocessing
|
||||
numpy
|
||||
opt-einsum
|
||||
protobuf
|
||||
protobuf-python
|
||||
setuptools
|
||||
six
|
||||
tblib
|
||||
@@ -124,13 +124,18 @@ let
|
||||
./relax-dependencies.patch
|
||||
# Add missing `io_bazel_rules_docker` dependency.
|
||||
./workspace.patch
|
||||
# Patch the sources to compile with protobuf >= 3.16.
|
||||
./system-protobuf.patch
|
||||
# Avoid using a deprecated method that was removed
|
||||
# https://github.com/protocolbuffers/protobuf/blob/66dc42d891a4fc8e9190c524fd67961688a37bbe/src/google/protobuf/io/coded_stream.h#L387-L39
|
||||
./system-protobuf_SetTotalBytesLimit.patch
|
||||
];
|
||||
|
||||
# On update, it can be useful to steal the changes from gentoo
|
||||
# https://gitweb.gentoo.org/repo/gentoo.git/tree/sci-libs/tensorflow
|
||||
|
||||
nativeBuildInputs = [
|
||||
which pythonEnv cython perl
|
||||
which pythonEnv cython perl protobuf-core
|
||||
] ++ lib.optional cudaSupport addOpenGLRunpath;
|
||||
|
||||
buildInputs = [
|
||||
@@ -179,12 +184,7 @@ let
|
||||
# "com_github_googleapis_googleapis"
|
||||
# "com_github_googlecloudplatform_google_cloud_cpp"
|
||||
"com_github_grpc_grpc"
|
||||
# Multiple issues with custom protobuf.
|
||||
# First `com_github_googleapis` fails to configure. Can be worked around by disabling `com_github_googleapis`
|
||||
# and related functionality, but then the next error is about "dangling symbolic link", and in general
|
||||
# looks like that's only the beginning: see
|
||||
# https://stackoverflow.com/questions/55578884/how-to-build-tensorflow-1-13-1-with-custom-protobuf
|
||||
# "com_google_protobuf"
|
||||
"com_google_protobuf"
|
||||
# Fails with the error: external/org_tensorflow/tensorflow/core/profiler/utils/tf_op_utils.cc:46:49: error: no matching function for call to 're2::RE2::FullMatch(absl::lts_2020_02_25::string_view&, re2::RE2&)'
|
||||
# "com_googlesource_code_re2"
|
||||
"curl"
|
||||
@@ -220,6 +220,11 @@ let
|
||||
|
||||
INCLUDEDIR = "${includes_joined}/include";
|
||||
|
||||
# This is needed for the Nix-provided protobuf dependency to work,
|
||||
# as otherwise the rule `link_proto_files` tries to create the links
|
||||
# to `/usr/include/...` which results in build failures.
|
||||
PROTOBUF_INCLUDE_PATH = "${protobuf-core}/include";
|
||||
|
||||
PYTHON_BIN_PATH = pythonEnv.interpreter;
|
||||
|
||||
TF_NEED_GCP = true;
|
||||
@@ -295,9 +300,12 @@ let
|
||||
fetchAttrs = {
|
||||
# cudaSupport causes fetch of ncclArchive, resulting in different hashes
|
||||
sha256 = if cudaSupport then
|
||||
"10m6qj3kchgxfgb6qh59vc51knm9r9pkng8bf90h00dnggvv8234"
|
||||
"sha256-yxEbdEd7c18+N0XQgadjG72fMbD3f6CvMdfejb6kalo="
|
||||
else
|
||||
"04a98yrp09nd0p17k0jbzkgjppxs0yma7m5zkfrwgvr4g0w71v68";
|
||||
if stdenv.isDarwin then
|
||||
"sha256-SPdW7lBGdlozXBg9nBN1R3XK4stNAgHQO2ewHE2ohCc="
|
||||
else
|
||||
"sha256-zrXOEp2jHf1kYsPca4d1IQS3j6K0tpEoPwld/u4Bn5c=";
|
||||
};
|
||||
|
||||
buildAttrs = {
|
||||
@@ -384,7 +392,7 @@ in buildPythonPackage {
|
||||
keras-preprocessing
|
||||
numpy
|
||||
opt-einsum
|
||||
protobuf
|
||||
protobuf-python
|
||||
six
|
||||
tblib
|
||||
tensorflow-estimator_2
|
||||
|
||||
@@ -0,0 +1,13 @@
|
||||
diff --git a/tensorflow/core/kernels/example_parsing_ops.cc b/tensorflow/core/kernels/example_parsing_ops.cc
|
||||
index a1265cfb5c6..ada919bbd7b 100644
|
||||
--- a/tensorflow/core/kernels/example_parsing_ops.cc
|
||||
+++ b/tensorflow/core/kernels/example_parsing_ops.cc
|
||||
@@ -1218,7 +1218,7 @@ class DecodeJSONExampleOp : public OpKernel {
|
||||
resolver_.get(), "type.googleapis.com/tensorflow.Example", &in, &out);
|
||||
OP_REQUIRES(ctx, status.ok(),
|
||||
errors::InvalidArgument("Error while parsing JSON: ",
|
||||
- string(status.error_message())));
|
||||
+ string(status.message())));
|
||||
}
|
||||
}
|
||||
|
||||
@@ -0,0 +1,21 @@
|
||||
diff -ru a/tensorflow/core/distributed_runtime/tensor_coding.cc b/tensorflow/core/distributed_runtime/tensor_coding.cc
|
||||
--- a/tensorflow/core/distributed_runtime/tensor_coding.cc 2021-12-19 19:12:25.000000000 -0500
|
||||
+++ b/tensorflow/core/distributed_runtime/tensor_coding.cc 2021-12-20 16:10:32.000000000 -0500
|
||||
@@ -82,7 +82,7 @@
|
||||
Status TensorResponse::ParseFrom(Source* source) {
|
||||
if (!on_host_) {
|
||||
protobuf::io::CodedInputStream input(source->contents());
|
||||
- input.SetTotalBytesLimit(INT_MAX, INT_MAX); // Unlimited
|
||||
+ input.SetTotalBytesLimit(INT_MAX); // Unlimited
|
||||
|
||||
// Pre-parse into local storage, then delegate to device.
|
||||
if (!meta_.ParseFromCodedStream(&input) || !input.ConsumedEntireMessage()) {
|
||||
@@ -218,7 +218,7 @@
|
||||
|
||||
bool TensorResponse::ParseFast(Source* source) {
|
||||
protobuf::io::CodedInputStream input(source->contents());
|
||||
- input.SetTotalBytesLimit(INT_MAX, INT_MAX); // Unlimited
|
||||
+ input.SetTotalBytesLimit(INT_MAX); // Unlimited
|
||||
while (true) {
|
||||
auto p = input.ReadTagWithCutoff(127);
|
||||
int tag = GetTagFieldNumber(p.first);
|
||||
@@ -20,6 +20,11 @@ stdenv.mkDerivation rec {
|
||||
url = "https://github.com/jedisct1/pure-ftpd/commit/bf6fcd4935e95128cf22af5924cdc8fe5c0579da.patch";
|
||||
sha256 = "003klx7j82qf92qr1dxg32v5r2bhhywplynd3xil1lbcd3s3mqhi";
|
||||
})
|
||||
(fetchpatch {
|
||||
name = "CVE-2021-40524.patch";
|
||||
url = "https://github.com/jedisct1/pure-ftpd/commit/37ad222868e52271905b94afea4fc780d83294b4.patch";
|
||||
sha256 = "0696qilplfd99di0cba1j3r4fg216091c5j7fdn5qk7pk6bw1r69";
|
||||
})
|
||||
];
|
||||
|
||||
buildInputs = [ openssl ];
|
||||
|
||||
@@ -9,19 +9,19 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "remote-touchpad";
|
||||
version = "1.0.2";
|
||||
version = "1.0.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "unrud";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "09a252z69msy4wd5kazpca8dcn0a2djdw0vs663062fl977p73qs";
|
||||
sha256 = "sha256-VgTjQXjJn17+BhREew62RTjNo8UWc4Fn9x+924nGD+I=";
|
||||
};
|
||||
|
||||
buildInputs = [ libX11 libXi libXt libXtst ];
|
||||
tags = [ "portal,x11" ];
|
||||
|
||||
vendorSha256 = "1pgj0m67g759mcs4s34h4pq3mc7gni643z5cp6ffq4rrn8mdi060";
|
||||
vendorSha256 = "sha256-Cw4uMnID0nDhSl+ijHMo1VcXLdY1bHFpEkqDQDJOJOw=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "Control mouse and keyboard from the webbrowser of a smartphone.";
|
||||
|
||||
@@ -9240,6 +9240,8 @@ in {
|
||||
inherit (pkgs.darwin.apple_sdk.frameworks) Foundation Security;
|
||||
flatbuffers-core = pkgs.flatbuffers;
|
||||
flatbuffers-python = self.flatbuffers;
|
||||
protobuf-core = pkgs.protobuf;
|
||||
protobuf-python = self.protobuf;
|
||||
lmdb-core = pkgs.lmdb;
|
||||
};
|
||||
|
||||
|
||||
Reference in New Issue
Block a user