Merge staging-next into staging
This commit is contained in:
github-actions[bot]
GitHub
commit
a37c393ba4
19 changed files with 105 additions and 93 deletions
|
|
@ -11,4 +11,5 @@
|
|||
<xsl:param name="toc.section.depth" select="0" />
|
||||
<xsl:param name="admon.style" select="''" />
|
||||
<xsl:param name="callout.graphics.extension" select="'.svg'" />
|
||||
<xsl:param name="generate.consistent.ids" select="1" />
|
||||
</xsl:stylesheet>
|
||||
|
|
|
|||
|
|
@ -48,9 +48,10 @@ in
|
|||
freeformType = settingsFormat.type;
|
||||
};
|
||||
|
||||
default = {
|
||||
default = { };
|
||||
defaultText = ''
|
||||
metrics = {
|
||||
wal_directory = "\${STATE_DIRECTORY}";
|
||||
wal_directory = "\''${STATE_DIRECTORY}";
|
||||
global.scrape_interval = "5s";
|
||||
};
|
||||
integrations = {
|
||||
|
|
@ -59,8 +60,7 @@ in
|
|||
node_exporter.enabled = true;
|
||||
replace_instance_label = true;
|
||||
};
|
||||
};
|
||||
|
||||
'';
|
||||
example = {
|
||||
metrics.global.remote_write = [{
|
||||
url = "\${METRICS_REMOTE_WRITE_URL}";
|
||||
|
|
@ -104,6 +104,20 @@ in
|
|||
};
|
||||
|
||||
config = mkIf cfg.enable {
|
||||
services.grafana-agent.settings = {
|
||||
# keep this in sync with config.services.grafana-agent.settings.defaultText.
|
||||
metrics = {
|
||||
wal_directory = mkDefault "\${STATE_DIRECTORY}";
|
||||
global.scrape_interval = mkDefault "5s";
|
||||
};
|
||||
integrations = {
|
||||
agent.enabled = mkDefault true;
|
||||
agent.scrape_integration = mkDefault true;
|
||||
node_exporter.enabled = mkDefault true;
|
||||
replace_instance_label = mkDefault true;
|
||||
};
|
||||
};
|
||||
|
||||
systemd.services.grafana-agent = {
|
||||
wantedBy = [ "multi-user.target" ];
|
||||
script = ''
|
||||
|
|
|
|||
|
|
@ -0,0 +1,42 @@
|
|||
From 14635f8a87423f7682e22c4d4bc34551cfe1d10d Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
|
||||
Date: Thu, 30 Jun 2022 07:33:44 +0000
|
||||
Subject: [PATCH] make near-test-contracts optional
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
Signed-off-by: Jörg Thalheim <joerg@thalheim.io>
|
||||
---
|
||||
Cargo.lock | 1 -
|
||||
tools/state-viewer/Cargo.toml | 2 +-
|
||||
2 files changed, 1 insertion(+), 2 deletions(-)
|
||||
|
||||
diff --git a/Cargo.lock b/Cargo.lock
|
||||
index e1d8b2a83..3317587f5 100644
|
||||
--- a/Cargo.lock
|
||||
+++ b/Cargo.lock
|
||||
@@ -5253,7 +5253,6 @@ dependencies = [
|
||||
"near-primitives",
|
||||
"near-primitives-core",
|
||||
"near-store",
|
||||
- "near-test-contracts",
|
||||
"nearcore",
|
||||
"node-runtime",
|
||||
"once_cell",
|
||||
diff --git a/tools/state-viewer/Cargo.toml b/tools/state-viewer/Cargo.toml
|
||||
index 02346bf71..51cfc4cb5 100644
|
||||
--- a/tools/state-viewer/Cargo.toml
|
||||
+++ b/tools/state-viewer/Cargo.toml
|
||||
@@ -30,7 +30,7 @@ near-network = { path = "../../chain/network" }
|
||||
near-primitives = { path = "../../core/primitives" }
|
||||
near-primitives-core = { path = "../../core/primitives-core" }
|
||||
near-store = { path = "../../core/store" }
|
||||
-near-test-contracts = { path = "../../runtime/near-test-contracts" }
|
||||
+#near-test-contracts = { path = "../../runtime/near-test-contracts" }
|
||||
nearcore = { path = "../../nearcore" }
|
||||
node-runtime = { path = "../../runtime/runtime" }
|
||||
|
||||
--
|
||||
2.36.1
|
||||
|
||||
|
|
@ -4,7 +4,7 @@
|
|||
}:
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "nearcore";
|
||||
version = "1.27.0";
|
||||
version = "1.28.0";
|
||||
|
||||
# https://github.com/near/nearcore/tags
|
||||
src = fetchFromGitHub {
|
||||
|
|
@ -12,10 +12,12 @@ rustPlatform.buildRustPackage rec {
|
|||
repo = "nearcore";
|
||||
# there is also a branch for this version number, so we need to be explicit
|
||||
rev = "refs/tags/${version}";
|
||||
sha256 = "sha256-B9HqUa0mBSvsCPzxPt4NqpV99rV4lmQ9Q/z9lxob9oM=";
|
||||
|
||||
sha256 = "sha256-DRVlD74XTYgy3GeUd/7OIl2aie8nEJLmrmmkwPRkrA8=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-6GIt3J6y/O8XaHQJKRSPRgK2XbghMLif4e2Btdww9Ng=";
|
||||
cargoSha256 = "sha256-hTqje17EdVkgqReuLnizaK3cBJuqXJXC6x5NuoKJLbs=";
|
||||
cargoPatches = [ ./0001-make-near-test-contracts-optional.patch ];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace neard/build.rs \
|
||||
|
|
|
|||
|
|
@ -4,14 +4,14 @@
|
|||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "0.8.2";
|
||||
version = "0.8.3";
|
||||
pname = "gummi";
|
||||
|
||||
src = pkgs.fetchFromGitHub {
|
||||
owner = "alexandervdm";
|
||||
repo = "gummi";
|
||||
rev = version;
|
||||
sha256 = "sha256-7txAyzJrEoGPjchXstMWIF1Vy+aoba6aa6+JNUYnKQs=";
|
||||
sha256 = "sha256-71n71KjLmICp4gznd27NlbyA3kayje3hYk/cwkOXEO0=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -9,13 +9,13 @@ with python3Packages;
|
|||
|
||||
buildPythonApplication rec {
|
||||
pname = "inkcut";
|
||||
version = "2.1.3";
|
||||
version = "2.1.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = pname;
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "0px0xdv6kyzkkpmvryrdfavv1qy2xrqdxkpmhvx1gj649xcabv32";
|
||||
rev = "refs/tags/v${version}";
|
||||
sha256 = "sha256-S5IrNWVoUp1w+P7DrKlOUOyY3Q16CHSct9ndZOB3UpU=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
|||
|
|
@ -10,16 +10,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "nerdctl";
|
||||
version = "0.20.0";
|
||||
version = "0.22.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "containerd";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-5bigfsig2LkZoLUlA6764ttG85CNi6rmOgQck+/zc5c=";
|
||||
sha256 = "sha256-XsAAhSJPb/ZpZb6x0c/soFI8FPrZhX6U76rDQs1Sw04=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-Ei4L35/RN2en7gOUzvGflBivTlBy2YnUvTHqcCe5HN4=";
|
||||
vendorSha256 = "sha256-kpEdskjmRLM8TpjX6z19E8iG+wwI0vfULNWbPgeW3YM=";
|
||||
|
||||
nativeBuildInputs = [ makeWrapper installShellFiles ];
|
||||
|
||||
|
|
|
|||
|
|
@ -73,7 +73,7 @@ stdenv.mkDerivation {
|
|||
|
||||
nativeBuildInputs = [ pkg-config cmake ninja yasm ];
|
||||
|
||||
buildInputs = [
|
||||
propagatedBuildInputs = [
|
||||
libjpeg
|
||||
openssl
|
||||
libopus
|
||||
|
|
@ -120,13 +120,5 @@ stdenv.mkDerivation {
|
|||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
propagatedBuildInputs = [
|
||||
# Required for linking downstream binaries.
|
||||
abseil-cpp
|
||||
openh264
|
||||
usrsctp
|
||||
libvpx
|
||||
];
|
||||
|
||||
meta.license = lib.licenses.bsd3;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,13 +0,0 @@
|
|||
diff --git a/src/sage/misc/sagedoc.py b/src/sage/misc/sagedoc.py
|
||||
index 08c4225b87..3a9bbe4ed0 100644
|
||||
--- a/src/sage/misc/sagedoc.py
|
||||
+++ b/src/sage/misc/sagedoc.py
|
||||
@@ -1402,6 +1402,8 @@ class _sage_doc:
|
||||
sage: identity_matrix.__doc__ in browse_sage_doc(identity_matrix, 'rst')
|
||||
True
|
||||
sage: browse_sage_doc(identity_matrix, 'html', False) # optional - sphinx sagemath_doc_html
|
||||
+ ...
|
||||
+ FutureWarning: The configuration setting "embed_images" will be removed in Docutils 1.2. Use "image_loading: link".
|
||||
'...div...File:...Type:...Definition:...identity_matrix...'
|
||||
|
||||
In the 'text' version, double colons have been replaced with
|
||||
|
|
@ -112,22 +112,27 @@ stdenv.mkDerivation rec {
|
|||
# adapted from https://trac.sagemath.org/ticket/23712#comment:22
|
||||
./patches/tachyon-renamed-focallength.patch
|
||||
|
||||
# docutils 0.18.1 now triggers Sphinx warnings. tolerate them for
|
||||
# now, because patching Sphinx is not feasible. remove when Sphinx
|
||||
# 5.0 hits nixpkgs.
|
||||
# https://github.com/sphinx-doc/sphinx/pull/10372
|
||||
./patches/docutils-0.18.1-deprecation.patch
|
||||
|
||||
(fetchSageDiff {
|
||||
name = "eclib-20220621-update.patch";
|
||||
base = "9.7.beta4";
|
||||
rev = "9b65d73399b33043777ba628a4d318638aec6e0e";
|
||||
sha256 = "sha256-pcb9Q9a0ROCZTyfT7TRMtgEqCom8SgrtAaZ8ATgeqVI=";
|
||||
})
|
||||
|
||||
# https://trac.sagemath.org/ticket/34149
|
||||
(fetchSageDiff {
|
||||
name = "sphinx-5-update.patch";
|
||||
base = "9.7.beta6";
|
||||
rev = "6f9ceb7883376a1cacda51d84ec7870121860482";
|
||||
sha256 = "sha256-prTCwBfl/wNXIkdjKLiMSe/B64wCXOjOTr4AVNiFruw=";
|
||||
})
|
||||
];
|
||||
|
||||
patches = nixPatches ++ bugfixPatches ++ packageUpgradePatches;
|
||||
|
||||
# do not create .orig backup files if patch applies with fuzz
|
||||
patchFlags = [ "--no-backup-if-mismatch" "-p1" ];
|
||||
|
||||
postPatch = ''
|
||||
# Make sure sage can at least be imported without setting any environment
|
||||
# variables. It won't be close to feature complete though.
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libspiro";
|
||||
version = "20200505";
|
||||
version = "20220722";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "fontforge";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "1b5bw5qxqlral96y1n5f3sh9yxm2yij3zkqjmlgd8r1k4j0d3nqw";
|
||||
sha256 = "sha256-qNff53wyf8YhFVOn169K7smCXrSxdiZWxWOU8VTcjSI=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config autoreconfHook ];
|
||||
|
|
|
|||
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "k2tf";
|
||||
version = "0.6.3";
|
||||
version = "0.7.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "sl1pm4t";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-75L8fcmZbG7PbZrF4cScRQjqbuu5eTnLIaDGzgF57/0=";
|
||||
sha256 = "sha256-zkkRzCTZCvbwBj4oIhTo5d3PvqLMJPzT3zV9jU3PEJs=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-YsSOw3G5ufxBn8Wu5J8md2Aaqhl0VJa7uB6ZzSPWo/A=";
|
||||
vendorSha256 = "sha256-iCRiBCppqCZrCUQipoVgc4jUnLkX6QVFjxI6sv6n7tU=";
|
||||
|
||||
ldflags = [ "-s" "-w" "-X main.version=${version}" "-X main.commit=v${version}" ];
|
||||
|
||||
|
|
|
|||
|
|
@ -11,16 +11,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "cargo-edit";
|
||||
version = "0.10.2";
|
||||
version = "0.10.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "killercup";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-r4QJkQAtbjivbvr/k7UpbGx+hkzauRxw4bke7lAcmEM=";
|
||||
hash = "sha256-JVKAUbMD9oZSVdsNOWIVKi0LhVOwSg1zgsD8D2eMvcw=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-qNtWH8rvOUP7OjMVrzeDdoqAoTYOmqrjsuOJkD6NQ/I=";
|
||||
cargoSha256 = "sha256-Sz1/El2ZoxS3I8gEbMdYmOQMRSsGOptrp7wiBggMcWA=";
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
||||
|
|
|
|||
|
|
@ -1,31 +0,0 @@
|
|||
{ lib, stdenv, fetchFromGitHub, fetchpatch, kernel, perl, bc, breakpointHook }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "xmm7360-pci";
|
||||
version = "unstable-2021-07-19";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "xmm7360";
|
||||
repo = "xmm7360-pci";
|
||||
rev = "7086b80bb609180b1b89fb478751e5e8414ab64f";
|
||||
sha256 = "1wdb0phqg9rj9g9ycqdya0m7lx24kzjlh25yw0ifp898ddxrrr0c";
|
||||
};
|
||||
|
||||
makeFlags = kernel.makeFlags ++ [
|
||||
"KDIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"
|
||||
"INSTALL_MOD_PATH=${placeholder "out"}"
|
||||
];
|
||||
|
||||
nativeBuildInputs = kernel.moduleBuildDependencies;
|
||||
installFlags = [ "DEPMOD=true" ];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/xmm7360/xmm7360-pci";
|
||||
description = "PCI driver for Fibocom L850-GL modem based on Intel XMM7360 modem";
|
||||
downloadPage = "https://github.com/xmm7360/xmm7360-pci";
|
||||
license = licenses.isc;
|
||||
maintainers = with maintainers; [ flokli hexa ];
|
||||
platforms = platforms.linux;
|
||||
broken = kernel.kernelOlder "4.10" || kernel.kernelAtLeast "5.14";
|
||||
};
|
||||
}
|
||||
|
|
@ -5,16 +5,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "aardvark-dns";
|
||||
version = "1.0.3";
|
||||
version = "1.1.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "containers";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-m2uKTVRonnun+/V69RcPWkkRtDcoaiulMCQz0/CAdCw=";
|
||||
sha256 = "sha256-HxikpGeQlwulSedFCwWLADHKMlFrsgC7bMoZ1OxGCUE=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-Z/OZgWlpwcdqns26ojTLPQBVNrwU/i86tZVx19sRUTw=";
|
||||
cargoHash = "sha256-uP9caaOdFWs73T8icHE9uXNo63NdZrQ5afXFb4Iy1+I=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "Authoritative dns server for A/AAAA container records";
|
||||
|
|
|
|||
|
|
@ -7,16 +7,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "netavark";
|
||||
version = "1.0.3";
|
||||
version = "1.1.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "containers";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-M0jsCwle57YM0RO1hGMju5+8XvHPWc8tJqKWJL/sFsg=";
|
||||
sha256 = "sha256-NZt62oTD7yFO1+HTuyp+wEd2PuUwtsIrMPHwjfmz3aI=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-zTgHjDZdsseUpB5Xqn9yE5T6Tgqx22pQKQLlUtZq+lc=";
|
||||
cargoHash = "sha256-l+y3mkV6uZJed2nuXNWXDr6Q1UhV0YlfRhpE7rvTRrE=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles mandown ];
|
||||
|
||||
|
|
|
|||
|
|
@ -10,13 +10,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "google-guest-oslogin";
|
||||
version = "20220205.00";
|
||||
version = "20220721.00";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "GoogleCloudPlatform";
|
||||
repo = "guest-oslogin";
|
||||
rev = version;
|
||||
sha256 = "sha256-CVJAWda8bn5MPO8ACLtosVvZzuxPbOj377WaysZdhDU=";
|
||||
sha256 = "sha256-VIbejaHN9ANk+9vjpGAYS/SjHx4Tf7SkTqRD1svJRPU=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
|||
|
|
@ -8,13 +8,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "kubevirt";
|
||||
version = "0.54.0";
|
||||
version = "0.55.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kubevirt";
|
||||
repo = "kubevirt";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-MNNseahFXLH9ImViI6542bTwZW4ZXpFMJUz8NMRP/uU";
|
||||
sha256 = "sha256-Nz1x1kFywMbVTPYFQFnTbx+SQs5ZY4pMijo7FFttmxg=";
|
||||
};
|
||||
|
||||
vendorSha256 = null;
|
||||
|
|
|
|||
|
|
@ -483,7 +483,7 @@ in {
|
|||
|
||||
x86_energy_perf_policy = callPackage ../os-specific/linux/x86_energy_perf_policy { };
|
||||
|
||||
xmm7360-pci = callPackage ../os-specific/linux/xmm7360-pci { };
|
||||
xmm7360-pci = throw "Support for the XMM7360 WWAN card was added to the iosm kmod in mainline kernel version 5.18";
|
||||
|
||||
xone = if lib.versionAtLeast kernel.version "5.4" then callPackage ../os-specific/linux/xone { } else null;
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue