Merge staging-next into staging

This commit is contained in:
github-actions[bot] 2023-04-03 12:02:00 +00:00 committed by GitHub
commit 89ab0e405c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
22 changed files with 134 additions and 64 deletions

View file

@ -12771,12 +12771,6 @@
githubId = 3302;
name = "Renzo Carbonara";
};
retrry = {
email = "retrry@gmail.com";
github = "retrry";
githubId = 500703;
name = "Tadas Barzdžius";
};
revol-xut = {
email = "revol-xut@protonmail.com";
name = "Tassilo Tanneberger";

View file

@ -47,13 +47,13 @@ in
stdenv.mkDerivation (finalAttrs: {
pname = "imagemagick";
version = "7.1.1-5";
version = "7.1.1-6";
src = fetchFromGitHub {
owner = "ImageMagick";
repo = "ImageMagick";
rev = finalAttrs.version;
hash = "sha256-UR5BHCWaecbSF49IMKP/fE+oVVjMlTK41bKcGMtD+O4=";
hash = "sha256-D1ZKTL3c+engyvBwCdjYqeoHx2v/6gwmK8UfaAxjnWI=";
};
outputs = [ "out" "dev" "doc" ]; # bin/ isn't really big

View file

@ -7,16 +7,16 @@
buildGoModule rec {
pname = "seaweedfs";
version = "3.44";
version = "3.45";
src = fetchFromGitHub {
owner = "seaweedfs";
repo = "seaweedfs";
rev = version;
hash = "sha256-buis2OSN/mvI38LvRthy+9xPbpHj+guXNoTEuDUcKYw=";
hash = "sha256-sWomfombHGFhiLmVX56GOc2QDzj5Q2W7qHVgJ3lRxoU=";
};
vendorHash = "sha256-U8K2aQMVJsJWESN5BWjwrEWGzGTB8c/eMh0GJ75Xs7U=";
vendorHash = "sha256-/sL5W9UmvHnp6OD3kmray8fty85v9fcS7R0A/K2PZLg=";
subPackages = [ "weed" ];

View file

@ -2,12 +2,12 @@
python3.pkgs.buildPythonApplication rec {
pname = "fava";
version = "1.24";
version = "1.24.3";
format = "pyproject";
src = python3.pkgs.fetchPypi {
inherit pname version;
hash = "sha256-Ep+8O93L/CG4qcBFzCBMRasK/ySp8+cU59LcyZRTJtg=";
hash = "sha256-eK0JMwu+WN3s6isCt124Cu9fjtL7Lig3+mice4FkwwU=";
};
nativeBuildInputs = with python3.pkgs; [ setuptools-scm ];

View file

@ -0,0 +1,60 @@
{ lib
, stdenv
, fetchurl
, python3
, perl
, blast
, autoPatchelfHook
, zlib
, bzip2
, glib
, libxml2
, coreutils
}:
let
pname = "blast-bin";
version = "2.13.0";
srcs = rec {
x86_64-linux = fetchurl {
url = "https://ftp.ncbi.nlm.nih.gov/blast/executables/blast+/${version}/ncbi-blast-${version}+-x64-linux.tar.gz";
hash = "sha256-QPK3OdT++GoNI1NHyEpu2/hB2hqHYPQ/vNXFAVCwVEc=";
};
aarch64-linux = fetchurl {
url = "https://ftp.ncbi.nlm.nih.gov/blast/executables/blast+/${version}/ncbi-blast-${version}+-x64-arm-linux.tar.gz";
hash = "sha256-vY8K66k7KunpBUjFsJTTb+ur5n1XmU0/mYxhZsi9ycs=";
};
x86_64-darwin = fetchurl {
url = "https://ftp.ncbi.nlm.nih.gov/blast/executables/blast+/${version}/ncbi-blast-${version}+-x64-macosx.tar.gz";
hash = "sha256-Y0JlOUl9Ego6LTxTCNny3P5c1H3fApPXQm7Z6Zhq9RA=";
};
aarch64-darwin = x86_64-darwin;
};
src = srcs.${stdenv.hostPlatform.system};
in
stdenv.mkDerivation {
inherit pname version src;
nativeBuildInputs = lib.optional stdenv.isLinux [ autoPatchelfHook ];
buildInputs = [ python3 perl ] ++ lib.optionals stdenv.isLinux [ zlib bzip2 glib libxml2 ];
installPhase = ''
runHook preInstall
install -Dm755 bin/* -t $out/bin
runHook postInstall
'';
preFixup = ''
substituteInPlace $out/bin/get_species_taxids.sh \
--replace /bin/rm ${coreutils}/bin/rm
'';
meta = with lib; {
inherit (blast.meta) description homepage license;
platforms = [ "x86_64-linux" "aarch64-linux" "x86_64-darwin" "aarch64-darwin" ];
maintainers = with maintainers; [ natsukium ];
};
}

View file

@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
src = fetchgit {
url = "https://digidev.digi.e-technik.uni-kassel.de/git/scalp.git";
# mirrored at https://github.com/wegank/scalp.git
# mirrored at https://git.sr.ht/~weijia/scalp
rev = "185b84e4ff967f42cf2de5db4db4e6fa0cc18fb8";
sha256 = "sha256-NyMZdJwdD3FR6uweYCclJjfcf3Y24Bns1ViwsmJ5izg=";
};

View file

@ -2,13 +2,13 @@
stdenvNoCC.mkDerivation rec {
pname = "material-design-icons";
version = "7.1.96";
version = "7.2.96";
src = fetchFromGitHub {
owner = "Templarian";
repo = "MaterialDesign-Webfont";
rev = "v${version}";
sha256 = "sha256-qS7zJQkd0Q5wYLgYXa63fD3Qi2T5JWD6vXW2FoFzZxo=";
sha256 = "sha256-4r/l7QkD04OR74FZBH0l81hDY5TexEIIJnECYFKsGxM=";
sparseCheckout = [ "fonts" ];
};

View file

@ -23,13 +23,13 @@ lib.checkListOfEnum "${pname}: tweaks" [ "nord" "black" "dracula" "rimless" "nor
stdenvNoCC.mkDerivation rec {
inherit pname;
version = "2022-07-18";
version = "2022.11.11";
src = fetchFromGitHub {
owner = "vinceliuice";
repo = pname;
rev = version;
hash = "sha256-dWYRTwfQRMBdg+htxpWatF325rToaovF/43LxX6I1GI=";
hash = "sha256-3uiQYiseNEKDahjurjnDj9pakx1p94BfsR3LBO2dd/s=";
};
nativeBuildInputs = [
@ -46,7 +46,7 @@ stdenvNoCC.mkDerivation rec {
];
postPatch = ''
patchShebangs install.sh clean-old-theme.sh
patchShebangs install.sh
'';
installPhase = ''
@ -59,7 +59,7 @@ stdenvNoCC.mkDerivation rec {
${lib.optionalString (tweaks != []) "--tweaks " + builtins.toString tweaks} \
--dest $out/share/themes
jdupes --link-soft --recurse $out/share
jdupes --quiet --link-soft --recurse $out/share
runHook postInstall
'';

View file

@ -108,7 +108,7 @@ rustPlatform.buildRustPackage.override {
meta = with lib; {
homepage = "https://crates.io";
description = "Downloads your Rust project's dependencies and builds your project";
maintainers = with maintainers; [ retrry ] ++ teams.rust.members;
maintainers = teams.rust.members;
license = [ licenses.mit licenses.asl20 ];
platforms = platforms.unix;
};

View file

@ -4,11 +4,11 @@
let
version = "3.1";
version = "3.3";
fullMaude = fetchurl {
url = "http://maude.cs.illinois.edu/w/images/0/0a/Full-Maude-${version}.zip";
sha256 = "8b13af02c6243116c2ef9592622ecaa06d05dbe1dd6b1e595551ff33855948f2";
url = "https://maude.cs.illinois.edu/w/images/b/bc/Full-Maude-3.2.1.zip";
sha256 = "0751b3c4619283b3f0adf1c3aac113f1d4334a3ca859ed00d66de5f5857563ec";
};
in
@ -18,8 +18,8 @@ stdenv.mkDerivation {
inherit version;
src = fetchurl {
url = "http://maude.cs.illinois.edu/w/images/d/d3/Maude-${version}.tar.gz";
sha256 = "b112d7843f65217e3b5a9d40461698ef8dab7cbbe830af21216dfb924dc88a2f";
url = "https://github.com/SRI-CSL/Maude/archive/refs/tags/Maude${version}.tar.gz";
sha256 = "aebf21523ba7999b4594e315d49b92c5feaef7ca5d176e2e62a8ee1b901380c6";
};
nativeBuildInputs = [ flex bison unzip makeWrapper ];
@ -34,7 +34,10 @@ stdenv.mkDerivation {
# https://gitweb.gentoo.org/repo/gentoo.git/commit/dev-lang/maude/maude-3.1-r1.ebuild?id=f021cc6cfa1e35eb9c59955830f1fd89bfcb26b4
configureFlags = [ "--without-libsigsegv" ];
# Certain tests (in particular, Misc/fileTest) expect us to build in a subdirectory
# We'll use the directory Opt/ as suggested in INSTALL
preConfigure = ''
mkdir Opt; cd Opt
configureFlagsArray=(
--datadir="$out/share/maude"
TECLA_LIBS="-ltecla -lncursesw"
@ -42,13 +45,14 @@ stdenv.mkDerivation {
CFLAGS="-O3" CXXFLAGS="-O3"
)
'';
configureScript = "../configure";
doCheck = true;
postInstall = ''
for n in "$out/bin/"*; do wrapProgram "$n" --suffix MAUDE_LIB ':' "$out/share/maude"; done
unzip ${fullMaude}
install -D -m 444 full-maude31.maude $out/share/maude/full-maude.maude
install -D -m 444 full-maude.maude $out/share/maude/full-maude.maude
'';
# bison -dv surface.yy -o surface.c

View file

@ -23,13 +23,13 @@
stdenv.mkDerivation rec {
pname = "gvm-libs";
version = "22.4.4";
version = "22.4.5";
src = fetchFromGitHub {
owner = "greenbone";
repo = pname;
rev = "refs/tags/v${version}";
hash = "sha256-qsEIjoaq+iBl6iTdSXrxf7LYin/qiGtJ/LaD4bONbI0=";
hash = "sha256-dnR562qsDoW8Xb4TNrpcn66tn9iVmcmTaBxMbb+CX64=";
};
nativeBuildInputs = [

View file

@ -7,15 +7,14 @@
buildPythonPackage rec {
pname = "gtfs-realtime-bindings";
version = "0.0.7";
version = "1.0.0";
format = "setuptools";
disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
sha256 = "1vav7ah6gpkpi44rk202bwpl345rydg6n9zibzx5p7gcsblcwd45";
extension = "zip";
sha256 = "sha256-LoztiQRADMk6t+hSCttpNM+mAe2sxvWT/Cy0RIZiu0c=";
};
propagatedBuildInputs = [
@ -25,11 +24,13 @@ buildPythonPackage rec {
# Tests are not shipped, only a tarball for Java is present
doCheck = false;
pythonImportsCheck = [ "google.transit" ];
pythonImportsCheck = [
"google.transit"
];
meta = with lib; {
description = "Python bindings generated from the GTFS Realtime protocol buffer spec";
homepage = "https://github.com/andystewart999/TransportNSW";
homepage = "https://github.com/MobilityData/gtfs-realtime-bindings";
license = with licenses; [ asl20 ];
maintainers = with maintainers; [ fab ];
};

View file

@ -445,7 +445,7 @@ let
description = "Computation using data flow graphs for scalable machine learning";
homepage = "http://tensorflow.org";
license = licenses.asl20;
maintainers = with maintainers; [ jyp abbradar ];
maintainers = with maintainers; [ abbradar ];
platforms = with platforms; linux ++ darwin;
broken = !(xlaSupport -> cudaSupport);
} // lib.optionalAttrs stdenv.isDarwin {

View file

@ -11,13 +11,13 @@ assert enableWasmEval && stdenv.isDarwin -> builtins.throw "building with wasm o
buildGoModule rec {
pname = "open-policy-agent";
version = "0.50.2";
version = "0.51.0";
src = fetchFromGitHub {
owner = "open-policy-agent";
repo = "opa";
rev = "v${version}";
hash = "sha256-xoU6S8tQaJgJnF+zLWEhgoznwMY1orE/0QI9KAqr0Gk=";
hash = "sha256-vyz0mmbM9zD1NLmMFGb5rQJAokgS+Equljd3okoJ7WE=";
};
vendorHash = null;

View file

@ -5,16 +5,16 @@
rustPlatform.buildRustPackage rec {
pname = "cargo-expand";
version = "1.0.46";
version = "1.0.47";
src = fetchFromGitHub {
owner = "dtolnay";
repo = pname;
rev = version;
sha256 = "sha256-E1iWbhN6eU/z51T/5kXI56Zff9tR8sfq0ewuv/ieWFU=";
sha256 = "sha256-zbV0m9VezBO543uUvgazjvpbVUpQlJfasCI9b2aF+oA=";
};
cargoHash = "sha256-w6gsonO202kJRCvyAETYSbCNGdkhKHVSeVRhvSlSi/A=";
cargoHash = "sha256-TuGGDdciupk7nCq8r2hTbTPj1q638T9kGzgYMZe1O4g=";
meta = with lib; {
description = "A utility and Cargo subcommand designed to let people expand macros in their Rust source code";

View file

@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "cargo-llvm-lines";
version = "0.4.25";
version = "0.4.26";
src = fetchFromGitHub {
owner = "dtolnay";
repo = pname;
rev = version;
sha256 = "sha256-KTSp4pbxKkSX1Kh7CILtTVq2mjOpn4SKxO16l+I+i7k=";
sha256 = "sha256-TFwuUtRJ1R0dxgCN7ExTpYMHM6IalMxnvTNUGiqEM8s=";
};
cargoSha256 = "sha256-A+vUn/TLpp2dVOA5CAjFlviG+SPTd4BstOb0/NHCpdE=";
cargoSha256 = "sha256-vfuEJC/A06d5t0uCShBljTvTxX78h/r4Us5fSPvosqE=";
meta = with lib; {
description = "Count the number of lines of LLVM IR across all instantiations of a generic function";

View file

@ -2,14 +2,14 @@
rustPlatform.buildRustPackage rec {
pname = "cargo-tally";
version = "1.0.24";
version = "1.0.25";
src = fetchCrate {
inherit pname version;
sha256 = "sha256-oMqmivRKnrhkvGnkj9fmFUhqkh846lABfAWg/6+a/yM=";
sha256 = "sha256-NoRA0l00TVk27ZOmYzGHxbWah08zLl1gL2caw8LT3I4=";
};
cargoSha256 = "sha256-mZ7EV3ZnmfhGOmmUUEHX71ssHNBT6u1l4U7H/b727hE=";
cargoSha256 = "sha256-K77opkbNZWymmWMxekSkdiCqmmwccxEqhRcPnrzHWVQ=";
buildInputs = lib.optionals stdenv.isDarwin (with darwin.apple_sdk_11_0.frameworks; [
DiskArbitration

View file

@ -1,17 +1,17 @@
{ lib, buildPackages, fetchurl, perl, buildLinux, nixosTests, ... } @ args:
{ lib, buildPackages, fetchzip, perl, buildLinux, nixosTests, ... } @ args:
with lib;
buildLinux (args // rec {
version = "6.3-rc1";
version = "6.3-rc5";
extraMeta.branch = lib.versions.majorMinor version;
# modDirVersion needs to be x.y.z, will always add .0
modDirVersion = versions.pad 3 version;
src = fetchurl {
src = fetchzip {
url = "https://git.kernel.org/torvalds/t/linux-${version}.tar.gz";
hash = "sha256-oZhG9dYlRthT4TbRNuJ+/Kw/mRuGTIu2E9Dw5ge+xCo=";
hash = "sha256-HKKDSOK45jT5vUaE3xd7nlxRgy1fw9xXBhqrICy/12Y=";
};
# Should the testing kernels ever be built on Hydra?

View file

@ -4,13 +4,13 @@
stdenv.mkDerivation rec {
pname = "mariadb-galera";
version = "26.4.13";
version = "26.4.14";
src = fetchFromGitHub {
owner = "codership";
repo = "galera";
rev = "release_${version}";
sha256 = "sha256-Jg7RMAwxAYjMcAweBig6Eb0rGcFhjiZbq+xNuQA3bho=";
hash = "sha256-oRDzRylZEqmhtE70XWmwqt6eJaJyGgySjdxouznLP1g=";
fetchSubmodules = true;
};
@ -35,5 +35,6 @@ stdenv.mkDerivation rec {
license = licenses.lgpl2Only;
maintainers = with maintainers; [ ajs124 izorkin ];
platforms = platforms.all;
broken = stdenv.isDarwin;
};
}

View file

@ -10,16 +10,16 @@
rustPlatform.buildRustPackage rec {
pname = "halp";
version = "0.1.4";
version = "0.1.5";
src = fetchFromGitHub {
owner = "orhun";
repo = "halp";
rev = "v${version}";
hash = "sha256-ZlatBdMFLbw3+lApc68IG4xnFKQgCxRPX2n1oQtPrmw=";
hash = "sha256-Iowo3IBYnLCLnILIBithJejqDkzszCEgufcOcv2pVHI=";
};
cargoHash = "sha256-rGqqa2olnIm2bGkltM6cHceM4HJDRFIUmOrl2hLOSiI=";
cargoHash = "sha256-YWMcY8tc/XAm7tMxGD+TyowTisDlcdVI/GXMDR7m/kQ=";
patches = [
# patch tests to point to the correct target directory

View file

@ -13,22 +13,30 @@ stdenv.mkDerivation rec {
substituteInPlace Makefile --replace 'install -o root' 'install'
'';
preConfigure = ''
makeFlagsArray=( IP=${iproute2}/bin/ip PPPD=${ppp}/sbin/pppd \
BINDIR=$out/sbin MANDIR=$out/share/man/man8 \
PPPDIR=$out/etc/ppp )
'';
makeFlags = [
"CC:=$(CC)"
"IP=${iproute2}/bin/ip"
"PPPD=${ppp}/bin/pppd"
"BINDIR=${placeholder "out"}/sbin"
"MANDIR=${placeholder "out"}/share/man/man8"
"PPPDIR=${placeholder "out"}/etc/ppp"
];
buildInputs = [ perl ];
strictDeps = true;
postFixup = ''
patchShebangs $out
'';
nativeBuildInputs = [
perl # pod2man
];
buildInputs = [
perl # in shebang of pptpsetup
];
meta = with lib; {
description = "PPTP client for Linux";
homepage = "https://pptpclient.sourceforge.net/";
license = licenses.gpl2;
platforms = platforms.linux;
maintainers = with maintainers; [ nickcao ];
};
}

View file

@ -36925,6 +36925,8 @@ with pkgs;
inherit (darwin.apple_sdk.frameworks) ApplicationServices;
};
blast-bin = callPackage ../applications/science/biology/blast/bin.nix { };
bpp-core = callPackage ../development/libraries/science/biology/bpp-core {
stdenv = gcc10StdenvCompat;
};