Merge staging-next into staging

This commit is contained in:
github-actions[bot] 2022-04-17 12:01:43 +00:00 committed by GitHub
commit 7408ce3c70
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
18 changed files with 77 additions and 51 deletions

View File

@ -68,7 +68,7 @@ in
};
hardware.nvidia.prime.nvidiaBusId = mkOption {
type = types.str;
type = types.strMatching "[[:print:]]+\:[0-9]{1,3}\:[0-9]{1,2}\:[0-9]";
default = "";
example = "PCI:1:0:0";
description = ''
@ -78,7 +78,7 @@ in
};
hardware.nvidia.prime.intelBusId = mkOption {
type = types.str;
type = types.strMatching "[[:print:]]+\:[0-9]{1,3}\:[0-9]{1,2}\:[0-9]";
default = "";
example = "PCI:0:2:0";
description = ''
@ -88,7 +88,7 @@ in
};
hardware.nvidia.prime.amdgpuBusId = mkOption {
type = types.str;
type = types.strMatching "[[:print:]]+\:[0-9]{1,3}\:[0-9]{1,2}\:[0-9]";
default = "";
example = "PCI:4:0:0";
description = ''

View File

@ -163,7 +163,7 @@ in
specialisation = mkOption {
default = {};
example = lib.literalExpression "{ fewJobsManyCores.configuration = { nix.settings = { core = 0; max-jobs = 1; }; }";
example = lib.literalExpression "{ fewJobsManyCores.configuration = { nix.settings = { core = 0; max-jobs = 1; }; }; }";
description = ''
Additional configurations to build. If
<literal>inheritParentConfig</literal> is true, the system

View File

@ -0,0 +1,42 @@
{ rustPlatform, lib, fetchFromGitHub
, zlib, elfutils, openssl
, cmake, python3, pkg-config, protobuf, perl, llvmPackages
}:
rustPlatform.buildRustPackage rec {
#https://github.com/near/nearcore
pname = "nearcore";
version = "1.25.0";
src = fetchFromGitHub {
owner = "near";
repo = "nearcore";
# there is also a branch for this version number, so we need to be explicit
rev = "refs/tags/${version}";
sha256 = "sha256-7hiBqJLGIf+kNKJvMQ7KtGZm/SWLY3pT7YDlwbm3HDM=";
};
cargoSha256 = "sha256-EGv4CibSHL9oTAdWK7d/SOzZWPcEB16hTWlWHjKU4wc=";
# don't build SDK samples that require wasm-enabled rust
cargoBuildFlags = [ "-p" "neard" ];
doCheck = false; # needs network
buildInputs = [ zlib elfutils openssl ];
nativeBuildInputs = [
cmake
python3
pkg-config
protobuf
perl
];
LIBCLANG_PATH = "${llvmPackages.libclang.lib}/lib";
BINDGEN_EXTRA_CLANG_ARGS = "-isystem ${llvmPackages.libclang.lib}/lib/clang/${lib.getVersion llvmPackages.clang}/include";
meta = with lib; {
description = "Reference client for NEAR Protocol";
homepage = "https://github.com/near/nearcore";
license = licenses.mit;
maintainers = with maintainers; [ mic92 ];
platforms = platforms.unix;
};
}

View File

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "popeye";
version = "0.9.8";
version = "0.10.0";
src = fetchFromGitHub {
rev = "v${version}";
owner = "derailed";
repo = "popeye";
sha256 = "sha256-uGy2BbZS4SGT0w9ICYPUIfFawSvIVMsEezPfPAPQU/Q=";
sha256 = "sha256-iCsEYbEENDOg69wdWu9QQ8tTGxvaY2i/Hboc6XSYyEM=";
};
ldflags = [
@ -17,7 +17,7 @@ buildGoModule rec {
"-X github.com/derailed/popeye/cmd.commit=${version}"
];
vendorSha256 = "sha256-vUUDLMicop5QzZmAHi5qrc0hx8oV2xWNFHvCWioLhl8=";
vendorSha256 = "sha256-aLTzhBMwQHa6twzBC3FyMsZa1vQsBDdg4MpzJWZz3n4=";
doCheck = true;

View File

@ -20,13 +20,13 @@
stdenv.mkDerivation rec {
pname = "ghex";
version = "42.0";
version = "42.1";
outputs = [ "out" "dev" "devdoc" ];
src = fetchurl {
url = "mirror://gnome/sources/ghex/${lib.versions.major version}/${pname}-${version}.tar.xz";
sha256 = "Ly11VO8SimxoAJ2YY5TiBMMWeMU+HUpAnyGQmNS/ybs=";
sha256 = "8QMj08MvvRqDFU+/0qJ+yj7pDZwbJSNfGxX+3l+xE6M=";
};
nativeBuildInputs = [

View File

@ -25,6 +25,7 @@ stdenv.mkDerivation rec {
sed -i 's/\$(shell git show --pretty=%H -s)/${rev}/' Makefile
sed -i 's/\$(shell git symbolic-ref -q --short HEAD || git describe --tags --exact-match)/${tag}/' Makefile
sed -i 's/\$(shell git diff-index --quiet HEAD; echo $$?)/0/' Makefile
sed '1i#include <limits>' -i src/trans/codegen_c.cpp
'';
strictDeps = true;

View File

@ -1,13 +0,0 @@
--- a/src/tools/rustfmt/src/ignore_path.rs
+++ b/src/tools/rustfmt/src/ignore_path.rs
@@ -37,9 +37,9 @@
#[nightly_only_test]
#[test]
fn test_ignore_path_set() {
- use std::path::{Path, PathBuf};
use crate::config::{Config, FileName};
use crate::ignore_path::IgnorePathSet;
+ use std::path::{Path, PathBuf};
let config =
Config::from_toml(r#"ignore = ["foo.rs", "bar_dir/*"]"#, Path::new("")).unwrap();

View File

@ -21,9 +21,6 @@ rustPlatform.buildRustPackage rec {
CFG_RELEASE = rustPlatform.rust.rustc.version;
CFG_RELEASE_CHANNEL = if asNightly then "nightly" else "stable";
# FIXME: seems fixed upstream, remove after the next update
patches = [ ./rustfmt-fix-self-tests.patch ];
meta = with lib; {
description = "A tool for formatting Rust code according to style guidelines";
homepage = "https://github.com/rust-lang-nursery/rustfmt";

View File

@ -28,8 +28,10 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ cmake ];
# https://gcc.gnu.org/bugzilla/show_bug.cgi?id=102823
NIX_CFLAGS_COMPILE = "-fno-ipa-modref";
NIX_CFLAGS_COMPILE =
lib.optionals (stdenv.cc.isGNU && lib.versionAtLeast stdenv.cc.version "11") [
"-fno-ipa-modref" # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=102823
];
cmakeFlags = [
"-DBUILD_SHARED_LIBS=OFF"

View File

@ -10,6 +10,7 @@ stdenv.mkDerivation rec {
patches = [ ./install-fix.patch ];
nativeBuildInputs = [ unzip ];
makeFlags = [ "prefix=$(out)" ];
NIX_CFLAGS_COMPILE = [ "-std=c++11" ];
preInstall = "mkdir -p $out/lib";
meta = with lib; {

View File

@ -12,6 +12,8 @@ stdenv.mkDerivation {
nativeBuildInputs = [ autoreconfHook ];
NIX_CFLAGS_COMPILE = [ "-std=c++11" ];
meta = with lib; {
description = "A forked version of log4cpp that has been created for the Shibboleth project";
maintainers = [ maintainers.jammerful ];

View File

@ -92,12 +92,14 @@ stdenv.mkDerivation rec {
# Do not build static libraries
cmakeFlags = [ "-DENABLE_STATIC=NO" ];
NIX_CFLAGS_COMPILE = toString [
NIX_CFLAGS_COMPILE = [
"-DGIT_VERSION=\"v${version}\""
"-Wno-error=deprecated-declarations"
"-Wno-error=cast-function-type"
"-Wno-error=stringop-truncation"
"-Wno-error=stringop-overflow"
] ++ lib.optionals (stdenv.cc.isGNU && lib.versionAtLeast stdenv.cc.version "11") [
"-Wno-error=stringop-overread"
];
NIX_LDFLAGS = "-lXext";

View File

@ -1,6 +1,5 @@
{ lib, stdenv
, fetchpatch
, fetchurl
, fetchurl, unzip
, hdf5
, m4
, curl # for DAP
@ -11,25 +10,13 @@ let
inherit (hdf5) mpiSupport mpi;
in stdenv.mkDerivation rec {
pname = "netcdf" + lib.optionalString mpiSupport "-mpi";
version = "4.8.0"; # Remove patch mentioned below on upgrade
version = "4.8.1";
src = fetchurl {
url = "https://www.unidata.ucar.edu/downloads/netcdf/ftp/netcdf-c-${version}.tar.gz";
sha256 = "1mfn8qi4k0b8pyar3wa8v0npj69c7rhgfdlppdwmq5jqk88kb5k7";
url = "https://downloads.unidata.ucar.edu/netcdf-c/${version}/netcdf-c-${version}.tar.gz";
sha256 = "1cbjwjmp9691clacw5v88hmpz46ngxs3bfpkf2xy1j7cvlkc72l0";
};
patches = [
# Fixes:
# *** Checking vlen of compound file...Sorry! Unexpected result, tst_h_atts3.c, line: 289
# FAIL tst_h_atts3 (exit status: 2)
# TODO: Remove with next netcdf release (see https://github.com/Unidata/netcdf-c/pull/1980)
(fetchpatch {
name = "netcdf-Fix-tst_h_atts3-for-hdf5-1.12.patch";
url = "https://github.com/Unidata/netcdf-c/commit/9fc8ae62a8564e095ff17f4612874581db0e4db5.patch";
sha256 = "128kxz5jikq32x5qjmi0xdngi0k336rf6bvbcppvlk5gibg5nk7v";
})
];
postPatch = ''
patchShebangs .
@ -61,6 +48,7 @@ in stdenv.mkDerivation rec {
'';
doCheck = !(mpiSupport || (stdenv.isDarwin && stdenv.isAarch64));
checkInputs = [ unzip ];
meta = {
description = "Libraries for the Unidata network Common Data Format";

View File

@ -23,6 +23,8 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ cmake ninja ];
buildInputs = [ opencascade ] ++ lib.optionals stdenv.isDarwin [ Cocoa ];
NIX_CFLAGS_COMPILE = [ "-std=c++11" ];
meta = with lib; {
description = "Extension to OCE providing advanced meshing features";
homepage = "https://github.com/tpaviot/smesh";

View File

@ -10,14 +10,14 @@
buildPythonPackage rec {
pname = "jupyterlab";
version = "3.3.3";
version = "3.3.4";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-KU1nEmAVujl/axyAVj3uyGLkfgQmI4Ubvip9hw1p62o=";
sha256 = "sha256-4ENVhIs9kaxNlcLjhGoEKbM+nC7ceWaPtPxNIS8eUQc=";
};
nativeBuildInputs = [

View File

@ -2,12 +2,12 @@
stdenv.mkDerivation rec {
pname = "mbpfan";
version = "2.2.1";
version = "2.3.0";
src = fetchFromGitHub {
owner = "dgraziotin";
repo = "mbpfan";
rev = "v${version}";
sha256 = "0gc9ypxi55vxs77nx8ihhh9zk7fr9v0m0zfm76q7x0bi6jz11mbr";
sha256 = "sha256-jIYg9b0c/7mMRS5WF+mOH6t9SCWEP32lsdbCgpWpg24=";
};
installPhase = ''
mkdir -p $out/bin $out/etc

View File

@ -33,7 +33,7 @@ xorg,
}:
let
version = "1.31.1";
version = "1.31.2";
rpath = lib.makeLibraryPath [
alsa-lib
@ -82,7 +82,7 @@ let
if stdenv.hostPlatform.system == "x86_64-linux" then
fetchurl {
url = "https://downloads.mongodb.com/compass/mongodb-compass_${version}_amd64.deb";
sha256 = "sha256-sC3ghtOA+Zp7LuAwry460WvyWXXw35aQESlaWznfZYk=";
sha256 = "sha256-ij5lOP3xaty9YjKPionfUhZTcuumlFHt46MUMkjO2yA=";
}
else
throw "MongoDB compass is not supported on ${stdenv.hostPlatform.system}";

View File

@ -8168,6 +8168,8 @@ with pkgs;
ndppd = callPackage ../applications/networking/ndppd { };
nearcore = callPackage ../applications/blockchains/nearcore { };
nebula = callPackage ../tools/networking/nebula { };
nemiver = callPackage ../development/tools/nemiver { };