From 82f811e6ede5b137c2102167037308ae903fc0b4 Mon Sep 17 00:00:00 2001 From: Robert Scott Date: Sat, 4 Dec 2021 23:51:52 +0000 Subject: [PATCH 01/14] pure-ftpd: add patch for CVE-2021-40524 --- pkgs/servers/ftp/pure-ftpd/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/servers/ftp/pure-ftpd/default.nix b/pkgs/servers/ftp/pure-ftpd/default.nix index b88d926e1db6..abfb1072b03c 100644 --- a/pkgs/servers/ftp/pure-ftpd/default.nix +++ b/pkgs/servers/ftp/pure-ftpd/default.nix @@ -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 ]; From e2793924314e25b50c94854e6ed80d5f28581b54 Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Tue, 14 Dec 2021 10:58:47 -0500 Subject: [PATCH 02/14] python3Packages.tensorflow: 2.4.2 -> 2.4.4 --- pkgs/development/python-modules/tensorflow/default.nix | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/tensorflow/default.nix b/pkgs/development/python-modules/tensorflow/default.nix index b9e5bb0c2344..97c2d7a2540f 100644 --- a/pkgs/development/python-modules/tensorflow/default.nix +++ b/pkgs/development/python-modules/tensorflow/default.nix @@ -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}"; @@ -295,9 +295,12 @@ let fetchAttrs = { # cudaSupport causes fetch of ncclArchive, resulting in different hashes sha256 = if cudaSupport then - "10m6qj3kchgxfgb6qh59vc51knm9r9pkng8bf90h00dnggvv8234" + "sha256-ZAi093u2AQBBcgs9O2/KqdoZCtupQGzWc/1BNofEpoI=" else - "04a98yrp09nd0p17k0jbzkgjppxs0yma7m5zkfrwgvr4g0w71v68"; + if stdenv.isDarwin then + "sha256-LLjUcM+s69CbAczuAvytoM3jnq+VnF9XUA6lXC1XJoo=" + else + "sha256-yOxwOHgk78ezm7/Uo6oHut8r3/xLgnnCBc0mcLNHSRE="; }; buildAttrs = { From 6639552622d7d6a5d0335d78fac192fd889b5bf1 Mon Sep 17 00:00:00 2001 From: Viacheslav Lotsmanov Date: Sun, 12 Dec 2021 16:44:19 +0200 Subject: [PATCH 03/14] psi-plus: add WebP support MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Add “qtimageformats” dependency that provides “libqwebp.so”. (cherry picked from commit 397bcbe410d38de14056f151f2e21e83beb5e8bb) --- .../networking/instant-messengers/psi-plus/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/applications/networking/instant-messengers/psi-plus/default.nix b/pkgs/applications/networking/instant-messengers/psi-plus/default.nix index 5344e5204801..c80757384109 100644 --- a/pkgs/applications/networking/instant-messengers/psi-plus/default.nix +++ b/pkgs/applications/networking/instant-messengers/psi-plus/default.nix @@ -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 From de8c45602184282f2ea1b28ac4ab0cfbc5a48695 Mon Sep 17 00:00:00 2001 From: schnusch Date: Sat, 11 Dec 2021 13:03:51 +0100 Subject: [PATCH 04/14] remote-touchpad: 1.0.2 -> 1.0.4 (cherry picked from commit fbee1459e67723ea91503c2d583fa38b79d7bb25) --- pkgs/tools/inputmethods/remote-touchpad/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/inputmethods/remote-touchpad/default.nix b/pkgs/tools/inputmethods/remote-touchpad/default.nix index 90a438adb73a..6606f1f0011f 100644 --- a/pkgs/tools/inputmethods/remote-touchpad/default.nix +++ b/pkgs/tools/inputmethods/remote-touchpad/default.nix @@ -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."; From 3462399bbc87b15be0c22206f988780d2763ef42 Mon Sep 17 00:00:00 2001 From: Alexander Tsvyashchenko Date: Sat, 18 Dec 2021 23:39:59 +0100 Subject: [PATCH 05/14] python3Packages.tensorflow: switched to Nix-provided protobuf. (#150887) This prevents conflicts with other Python packages that also use protobuf, see e.g. #150765. (cherry picked from commit 487bb1b1e232015fe4732880389f2fa664f812fc) --- .../python-modules/tensorflow/default.nix | 30 ++++++++++--------- .../tensorflow/system-protobuf.patch | 13 ++++++++ pkgs/top-level/python-packages.nix | 2 ++ 3 files changed, 31 insertions(+), 14 deletions(-) create mode 100644 pkgs/development/python-modules/tensorflow/system-protobuf.patch diff --git a/pkgs/development/python-modules/tensorflow/default.nix b/pkgs/development/python-modules/tensorflow/default.nix index 97c2d7a2540f..5a80f3abcb97 100644 --- a/pkgs/development/python-modules/tensorflow/default.nix +++ b/pkgs/development/python-modules/tensorflow/default.nix @@ -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 @@ -90,7 +90,7 @@ let keras-preprocessing numpy opt-einsum - protobuf + protobuf-python setuptools six tblib @@ -124,13 +124,15 @@ 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 ]; # 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 +181,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 +217,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,12 +297,12 @@ let fetchAttrs = { # cudaSupport causes fetch of ncclArchive, resulting in different hashes sha256 = if cudaSupport then - "sha256-ZAi093u2AQBBcgs9O2/KqdoZCtupQGzWc/1BNofEpoI=" + "sha256-yxEbdEd7c18+N0XQgadjG72fMbD3f6CvMdfejb6kalo=" else if stdenv.isDarwin then - "sha256-LLjUcM+s69CbAczuAvytoM3jnq+VnF9XUA6lXC1XJoo=" + "sha256-SPdW7lBGdlozXBg9nBN1R3XK4stNAgHQO2ewHE2ohCc=" else - "sha256-yOxwOHgk78ezm7/Uo6oHut8r3/xLgnnCBc0mcLNHSRE="; + "sha256-zrXOEp2jHf1kYsPca4d1IQS3j6K0tpEoPwld/u4Bn5c="; }; buildAttrs = { @@ -387,7 +389,7 @@ in buildPythonPackage { keras-preprocessing numpy opt-einsum - protobuf + protobuf-python six tblib tensorflow-estimator_2 diff --git a/pkgs/development/python-modules/tensorflow/system-protobuf.patch b/pkgs/development/python-modules/tensorflow/system-protobuf.patch new file mode 100644 index 000000000000..dce6df810464 --- /dev/null +++ b/pkgs/development/python-modules/tensorflow/system-protobuf.patch @@ -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()))); + } + } + diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index b02145a16087..d70f9de17349 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -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; }; From 406c65c7ae14bf0248aad4569cf14d41aff57050 Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Mon, 20 Dec 2021 17:28:46 -0500 Subject: [PATCH 06/14] python3Packages.tensorflow: apply an extra patch for protobuf unvendoing --- .../python-modules/tensorflow/default.nix | 3 +++ .../system-protobuf_SetTotalBytesLimit.patch | 21 +++++++++++++++++++ 2 files changed, 24 insertions(+) create mode 100644 pkgs/development/python-modules/tensorflow/system-protobuf_SetTotalBytesLimit.patch diff --git a/pkgs/development/python-modules/tensorflow/default.nix b/pkgs/development/python-modules/tensorflow/default.nix index 5a80f3abcb97..ae30ece09f23 100644 --- a/pkgs/development/python-modules/tensorflow/default.nix +++ b/pkgs/development/python-modules/tensorflow/default.nix @@ -126,6 +126,9 @@ let ./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 diff --git a/pkgs/development/python-modules/tensorflow/system-protobuf_SetTotalBytesLimit.patch b/pkgs/development/python-modules/tensorflow/system-protobuf_SetTotalBytesLimit.patch new file mode 100644 index 000000000000..b7f5563f0cb5 --- /dev/null +++ b/pkgs/development/python-modules/tensorflow/system-protobuf_SetTotalBytesLimit.patch @@ -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); From f6c0ce5e4ab9d0eb0bf77510c49de7e61de40920 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Mon, 20 Dec 2021 23:02:50 +0800 Subject: [PATCH 07/14] wingpanel-indicator-ayatana: unstable-2021-12-01 -> unstable-2021-12-18 (cherry picked from commit faa933d4c023055faac40d83dd80ee230eaf678e) --- .../wingpanel-indicator-ayatana/default.nix | 9 +++------ .../fix-indicator-dir.patch | 16 ---------------- 2 files changed, 3 insertions(+), 22 deletions(-) delete mode 100644 pkgs/desktops/pantheon/third-party/wingpanel-indicator-ayatana/fix-indicator-dir.patch diff --git a/pkgs/desktops/pantheon/third-party/wingpanel-indicator-ayatana/default.nix b/pkgs/desktops/pantheon/third-party/wingpanel-indicator-ayatana/default.nix index 6acb1fe36f44..6e3fbf5777bc 100644 --- a/pkgs/desktops/pantheon/third-party/wingpanel-indicator-ayatana/default.nix +++ b/pkgs/desktops/pantheon/third-party/wingpanel-indicator-ayatana/default.nix @@ -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; diff --git a/pkgs/desktops/pantheon/third-party/wingpanel-indicator-ayatana/fix-indicator-dir.patch b/pkgs/desktops/pantheon/third-party/wingpanel-indicator-ayatana/fix-indicator-dir.patch deleted file mode 100644 index e6f71558e3e4..000000000000 --- a/pkgs/desktops/pantheon/third-party/wingpanel-indicator-ayatana/fix-indicator-dir.patch +++ /dev/null @@ -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: From a36549783f813c7bda01f68dc4a91a0f7c859b32 Mon Sep 17 00:00:00 2001 From: Emery Hemingway Date: Mon, 20 Dec 2021 14:55:47 +0100 Subject: [PATCH 08/14] imv: 4.3.0 -> 4.3.1 Package update, split outputs, sources moved to SourceHut. (cherry picked from commit 8c509d504d110e633dca1a9731fe54840556508a) --- pkgs/applications/graphics/imv/default.nix | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/graphics/imv/default.nix b/pkgs/applications/graphics/imv/default.nix index 04150a1ceb81..f78a4f606815 100644 --- a/pkgs/applications/graphics/imv/default.nix +++ b/pkgs/applications/graphics/imv/default.nix @@ -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 = [ From d570c001e0db231eeca5e4af364af114e4f7d523 Mon Sep 17 00:00:00 2001 From: Philipp Date: Tue, 21 Dec 2021 11:38:02 +0100 Subject: [PATCH 09/14] coeurl: 0.1.0 -> 0.1.1 (cherry picked from commit ecded07b3073c5c33040c5c3afc7136e54ffbee4) --- pkgs/development/libraries/coeurl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/coeurl/default.nix b/pkgs/development/libraries/coeurl/default.nix index df87210bb791..44e534757ce9 100644 --- a/pkgs/development/libraries/coeurl/default.nix +++ b/pkgs/development/libraries/coeurl/default.nix @@ -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 ]; From e51ed859e9bd1180f11f57ec741373cb18973ff9 Mon Sep 17 00:00:00 2001 From: Philipp Date: Tue, 21 Dec 2021 11:38:27 +0100 Subject: [PATCH 10/14] mtxclient: 0.6.0 -> 0.6.1 (cherry picked from commit 9e623420e743a37eeae6d2445f30f95446cddabb) --- pkgs/development/libraries/mtxclient/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/mtxclient/default.nix b/pkgs/development/libraries/mtxclient/default.nix index 48f860c672c7..4e5eed1e4391 100644 --- a/pkgs/development/libraries/mtxclient/default.nix +++ b/pkgs/development/libraries/mtxclient/default.nix @@ -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 = '' From 6e205934b58e8d5ed7eb35212647cf8a90bfaa20 Mon Sep 17 00:00:00 2001 From: Philipp Date: Tue, 21 Dec 2021 11:38:56 +0100 Subject: [PATCH 11/14] nheko: 0.9.0 -> 0.9.1 (cherry picked from commit f1dad295977477ee4362eeb1e31674feb4b9971a) --- .../networking/instant-messengers/nheko/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/nheko/default.nix b/pkgs/applications/networking/instant-messengers/nheko/default.nix index 2a2c25e5593c..c3ea872384d2 100644 --- a/pkgs/applications/networking/instant-messengers/nheko/default.nix +++ b/pkgs/applications/networking/instant-messengers/nheko/default.nix @@ -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 = [ From 70772360e701b382caaa61e112045a45cec9986c Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Tue, 21 Dec 2021 13:48:26 -0300 Subject: [PATCH 12/14] shellhub-agent: 0.8.1 -> 0.8.2 Signed-off-by: Otavio Salvador (cherry picked from commit 46865ea66f6427a2329dd96bab1b5b82c832227a) --- pkgs/applications/networking/shellhub-agent/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/shellhub-agent/default.nix b/pkgs/applications/networking/shellhub-agent/default.nix index fba8c4b07faa..3128529f0e67 100644 --- a/pkgs/applications/networking/shellhub-agent/default.nix +++ b/pkgs/applications/networking/shellhub-agent/default.nix @@ -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}" ]; From 6c3b14f25268ad84b1b923611fba012b7e4f4267 Mon Sep 17 00:00:00 2001 From: Robert Scott Date: Tue, 14 Dec 2021 21:00:24 +0000 Subject: [PATCH 13/14] nomad_1_0: 1.0.12 -> 1.0.13 (cherry picked from commit 5c5068cb1028c5da921685f7b163b80c52e711a8) --- pkgs/applications/networking/cluster/nomad/1.0.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/nomad/1.0.nix b/pkgs/applications/networking/cluster/nomad/1.0.nix index 53430cdf94ed..079c957ebb0f 100644 --- a/pkgs/applications/networking/cluster/nomad/1.0.nix +++ b/pkgs/applications/networking/cluster/nomad/1.0.nix @@ -6,6 +6,6 @@ callPackage ./generic.nix { inherit buildGoPackage nvidia_x11 nvidiaGpuSupport; - version = "1.0.12"; - sha256 = "04fqliz7y4zzs4xraid54mqxwgrzh138nmfcs876vp534slvikpi"; + version = "1.0.13"; + sha256 = "19wlma2y8lpb7p01wb0l20rb6nvrvldz0mm3qfisx33y56ykjyh8"; } From ffafec7b6ace1ae2a82dcee9e9374378e4782ca5 Mon Sep 17 00:00:00 2001 From: Robert Scott Date: Tue, 14 Dec 2021 21:00:47 +0000 Subject: [PATCH 14/14] nomad: 1.1.6 -> 1.1.8 (cherry picked from commit 8068953a633de35856e91769e7846cac1472a0fc) --- pkgs/applications/networking/cluster/nomad/1.1.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/nomad/1.1.nix b/pkgs/applications/networking/cluster/nomad/1.1.nix index b8c58e9c347c..5a3e964ad5f8 100644 --- a/pkgs/applications/networking/cluster/nomad/1.1.nix +++ b/pkgs/applications/networking/cluster/nomad/1.1.nix @@ -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"; }