Merge staging-next into staging

This commit is contained in:
github-actions[bot] 2021-02-11 00:36:13 +00:00 committed by GitHub
commit 8df773cc54
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
27 changed files with 147 additions and 93 deletions

View file

@ -326,30 +326,36 @@ in
};
};
services.zfs.zed.settings = mkOption {
type = with types; attrsOf (oneOf [ str int bool (listOf str) ]);
example = literalExample ''
{
ZED_DEBUG_LOG = "/tmp/zed.debug.log";
services.zfs.zed = {
enableMail = mkEnableOption "ZED's ability to send emails" // {
default = cfgZfs.package.enableMail;
};
ZED_EMAIL_ADDR = [ "root" ];
ZED_EMAIL_PROG = "mail";
ZED_EMAIL_OPTS = "-s '@SUBJECT@' @ADDRESS@";
settings = mkOption {
type = with types; attrsOf (oneOf [ str int bool (listOf str) ]);
example = literalExample ''
{
ZED_DEBUG_LOG = "/tmp/zed.debug.log";
ZED_NOTIFY_INTERVAL_SECS = 3600;
ZED_NOTIFY_VERBOSE = false;
ZED_EMAIL_ADDR = [ "root" ];
ZED_EMAIL_PROG = "mail";
ZED_EMAIL_OPTS = "-s '@SUBJECT@' @ADDRESS@";
ZED_USE_ENCLOSURE_LEDS = true;
ZED_SCRUB_AFTER_RESILVER = false;
}
'';
description = ''
ZFS Event Daemon /etc/zfs/zed.d/zed.rc content
ZED_NOTIFY_INTERVAL_SECS = 3600;
ZED_NOTIFY_VERBOSE = false;
See
<citerefentry><refentrytitle>zed</refentrytitle><manvolnum>8</manvolnum></citerefentry>
for details on ZED and the scripts in /etc/zfs/zed.d to find the possible variables
'';
ZED_USE_ENCLOSURE_LEDS = true;
ZED_SCRUB_AFTER_RESILVER = false;
}
'';
description = ''
ZFS Event Daemon /etc/zfs/zed.d/zed.rc content
See
<citerefentry><refentrytitle>zed</refentrytitle><manvolnum>8</manvolnum></citerefentry>
for details on ZED and the scripts in /etc/zfs/zed.d to find the possible variables
'';
};
};
};
@ -358,6 +364,14 @@ in
config = mkMerge [
(mkIf cfgZfs.enabled {
assertions = [
{
assertion = cfgZED.enableMail -> cfgZfs.package.enableMail;
message = ''
To allow ZED to send emails, ZFS needs to be configured to enable
this. To do so, one must override the `zfs` package and set
`enableMail` to true.
'';
}
{
assertion = config.networking.hostId != null;
message = "ZFS requires networking.hostId to be set";
@ -437,7 +451,7 @@ in
};
services.zfs.zed.settings = {
ZED_EMAIL_PROG = mkDefault "${pkgs.mailutils}/bin/mail";
ZED_EMAIL_PROG = mkIf cfgZED.enableMail (mkDefault "${pkgs.mailutils}/bin/mail");
PATH = lib.makeBinPath [
cfgZfs.package
pkgs.coreutils

View file

@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
src = fetchFromGitHub {
owner = "openAVproductions";
repo = "openAV-ArtyFX";
rev = "492587461b50d140455aa3c98d915eb8673bebf0";
rev = "8c542627d936a01b1d97825e7f26a8e95633f7aa";
sha256 = "0wwg8ivnpyy0235bapjy4g0ij85zq355jwi6c1nkrac79p4z9ail";
};

View file

@ -2,12 +2,12 @@
let
pname = "ledger-live-desktop";
version = "2.20.0";
version = "2.21.3";
name = "${pname}-${version}";
src = fetchurl {
url = "https://github.com/LedgerHQ/${pname}/releases/download/v${version}/${pname}-${version}-linux-x86_64.AppImage";
sha256 = "10gi29mcvs4d5flqycwid190pnlciznzbvg36250mxaxxs58rq7j";
sha256 = "11r6gwzg5qym7h40d8mrpw8c6zbdi534c2y7ghy2k0a4k3ybk8x1";
};
appimageContents = appimageTools.extractType2 {

View file

@ -73,6 +73,9 @@ let
cp -r . $out
wrapProgram $out/bin/studio.sh \
--set ANDROID_EMULATOR_USE_SYSTEM_LIBS 1 \
--set JAVA_HOME "$out/jre" \
--set QT_XKB_CONFIG_ROOT "${xkeyboard_config}/share/X11/xkb" \
--set FONTCONFIG_FILE ${fontsConf} \
--prefix PATH : "${lib.makeBinPath [
# Checked in studio.sh
@ -139,9 +142,7 @@ let
gnome_vfs
glib
GConf
]}" \
--set QT_XKB_CONFIG_ROOT "${xkeyboard_config}/share/X11/xkb" \
--set FONTCONFIG_FILE ${fontsConf}
]}"
# AS launches LLDBFrontend with a custom LD_LIBRARY_PATH
wrapProgram $out/bin/lldb/bin/LLDBFrontend --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [

View file

@ -6,9 +6,9 @@ stdenv.mkDerivation rec {
src = fetchFromGitHub {
owner = "ebzzry";
repo = pname;
rev = "9c87ea8a707a47c3d7f6ef94d07591c5ab594282";
sha256 = "1r05gw041fz9dkkb70zd6kqw9dd8dhpv87407qxqg43pd7x47kf4";
repo = "usync";
rev = "99f11b0c196a81843f55ca3456abcb85149b6d51";
sha256 = "16i1q8f0jmfd43rb8d70l2b383vr5ib4kh7iq3yd345q7xjz9c2j";
};
installPhase = ''

View file

@ -1,15 +1,20 @@
{ lib, buildPythonPackage, fetchFromGitHub
, pytest_4, pytest-django, django }:
{ lib
, buildPythonPackage
, fetchFromGitHub
, pytestCheckHook
, pytest-django
, django
}:
buildPythonPackage {
buildPythonPackage rec {
pname = "django-crispy-forms";
version = "2019.04.21";
version = "1.10.0";
src = fetchFromGitHub {
owner = "django-crispy-forms";
repo = "django-crispy-forms";
rev = "e25a5326697e5b545689b3a914e516404a6911bb";
sha256 = "12zqa76q6i7j47aqvhilivpbdplgp9zw2q8zfcjzlgclrqafaj39";
rev = version;
sha256 = "0y6kskfxgckb9npcgwx4zrs5n9px159zh9zhinhxi3i7wlriqpf5";
};
# For reasons unknown, the source dir must contain a dash
@ -19,12 +24,10 @@ buildPythonPackage {
export sourceRoot=source-
'';
checkInputs = [ pytest_4 pytest-django django ];
checkInputs = [ django pytest-django pytestCheckHook ];
checkPhase = ''
PYTHONPATH="$(pwd):$PYTHONPATH" \
DJANGO_SETTINGS_MODULE=crispy_forms.tests.test_settings \
pytest crispy_forms/tests
preCheck = ''
export DJANGO_SETTINGS_MODULE=crispy_forms.tests.test_settings
'';
meta = with lib; {

View file

@ -1,10 +1,20 @@
{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, boost, gnuradio
, makeWrapper, cppunit, gr-osmosdr, log4cpp
, pythonSupport ? true, python, swig
{ lib
, stdenv
, fetchFromGitHub
, cmake
, pkg-config
, boost
, gnuradio
, makeWrapper
, cppunit
, gr-osmosdr
, log4cpp
, pythonSupport ? true
, python
, swig
, fetchpatch
}:
assert pythonSupport -> python != null && swig != null;
stdenv.mkDerivation {
pname = "gr-ais";
version = "2015-12-20";
@ -12,14 +22,20 @@ stdenv.mkDerivation {
src = fetchFromGitHub {
owner = "bistromath";
repo = "gr-ais";
# Upstream PR: https://github.com/bistromath/gr-ais/commit/8502d0252a2a1a9b8d1a71795eaeb5d820684054
rev = "8502d0252a2a1a9b8d1a71795eaeb5d820684054";
sha256 = "1b9j0kc74cw12a7jv4lii77dgzqzg2s8ndzp4xmisxksgva1qfvh";
rev = "cdc1f52745853f9c739c718251830eb69704b26e";
sha256 = "1vl3kk8xr2mh5lf31zdld7yzmwywqffffah8iblxdzblgsdwxfl6";
};
patches = [
(fetchpatch {
url = "https://github.com/bistromath/gr-ais/commit/8502d0252a2a1a9b8d1a71795eaeb5d820684054.patch";
sha256 = "1cwalphldvf6dbhzwz1gi53z0cb4921qsvlz4138q7m6dxccvssg";
})
];
nativeBuildInputs = [ cmake makeWrapper pkg-config ];
buildInputs = [ boost gnuradio cppunit gr-osmosdr log4cpp ]
++ lib.optionals pythonSupport [ python swig ];
++ lib.optionals pythonSupport [ python swig ];
postInstall = ''
for prog in "$out"/bin/*; do

View file

@ -8,13 +8,13 @@ in
stdenv.mkDerivation rec {
pname = "git-cinnabar";
version = "0.5.4";
version = "0.5.6";
src = fetchFromGitHub {
owner = "glandium";
repo = "git-cinnabar";
rev = version;
sha256 = "1cjn2cc6mj4m736wxab9s6qx83p5n5ha8cr3x84s9ra6rxs8d7pi";
sha256 = "1wbp4xqpkaqhhkjw8rbbsagwiciqffacqqbm4j49q41mlk371ai3";
fetchSubmodules = true;
};
@ -27,6 +27,8 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
installPhase = ''
runHook preInstall
mkdir -p $out/bin $out/libexec
install git-cinnabar-helper $out/bin
install git-cinnabar git-remote-hg $out/libexec
@ -38,12 +40,14 @@ stdenv.mkDerivation rec {
--prefix GIT_CINNABAR_EXPERIMENTS , python3 \
--set PYTHONPATH ${mercurial}/${python3.sitePackages}
done
runHook postInstall
'';
meta = with lib; {
homepage = "https://github.com/glandium/git-cinnabar";
description = "git remote helper to interact with mercurial repositories";
license = licenses.gpl2;
license = licenses.gpl2Only;
maintainers = with maintainers; [ qyliss ];
platforms = platforms.all;
};

View file

@ -5,6 +5,7 @@ fetchFromGitHub {
owner = "tomokuni";
repo = "Myrica";
# commit does not exist on any branch on the target repository
rev = "b737107723bfddd917210f979ccc32ab3eb6dc20";
sha256 = "187rklcibbkai6m08173ca99qn8v7xpdfdv0izpymmavj85axm12";

View file

@ -1,11 +1,13 @@
{ lib, stdenv, fetchzip, libfaketime, fonttosfnt, mkfontscale }:
{ lib, stdenv, fetchFromGitHub, libfaketime, fonttosfnt, mkfontscale }:
stdenv.mkDerivation rec {
name = "siji-${version}";
version = "2016-05-13";
src = fetchzip {
url = "https://github.com/stark/siji/archive/95369afac3e661cb6d3329ade5219992c88688c1.zip";
src = fetchFromGitHub {
owner = "stark";
repo = "siji";
rev = "3cbb7fe938c33aaadbb657803ea5946e5157d6e2";
sha256 = "1408g4nxwdd682vjqpmgv0cp0bfnzzzwls62cjs9zrds16xa9dpf";
};

View file

@ -1,13 +1,13 @@
{ lib, fetchFromGitHub, buildPythonPackage, isPy3k, future, pyusb, ipython, pygreat }:
buildPythonPackage {
buildPythonPackage rec {
pname = "GreatFET";
version = "2019.5.1.dev0";
src = fetchFromGitHub {
owner = "greatscottgadgets";
repo = "greatfet";
rev = "a927f21d59ccface00635146103a807c1d2b0ad8";
rev = "v${version}";
sha256 = "054vkx4xkbhxhh5grjbs9kw3pjkv1zapp91ysrqr0c8mg1pc7zxv";
};

View file

@ -15,7 +15,7 @@ buildPythonPackage rec {
src = fetchFromGitHub {
owner = "nmigen";
repo = "nmigen-soc";
rev = "f1b009c7e075bca461d10ec963a7eaa3bf4dfc14";
rev = "f5b5cd563e8e8d081b0535c4554c02b5456ee8b4";
sha256 = "04kjaq9qp6ac3h0r1wlb4jyz56bb52l1rikmz1x7azvnr10xhrad";
};

View file

@ -1,13 +1,13 @@
{ lib, pythonPackages, fetchFromGitHub }:
let
pgdbconn = pythonPackages.buildPythonPackage {
pgdbconn = pythonPackages.buildPythonPackage rec {
pname = "pgdbconn";
version = "0.8.0";
src = fetchFromGitHub {
owner = "perseas";
repo = "pgdbconn";
rev = "26c1490e4f32e4b5b925e5b82014ad106ba5b057";
rev = "v${version}";
sha256 = "09r4idk5kmqi3yig7ip61r6js8blnmac5n4q32cdcbp1rcwzdn6z";
};
# The tests are impure (they try to access a PostgreSQL server)

View file

@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
srcs = [
(fetchFromGitHub {
owner = "SymbiFlow";
owner = "YosysHQ";
repo = "prjtrellis";
rev = "60c05b3f4e71fd78d4fba5c31f9974694245199e";
sha256 = "1k37mxwxv9fpm6xnrxlqqap7zqh2dvgqncphj3asi2rz0kh07ppf";
@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
})
(fetchFromGitHub {
owner = "SymbiFlow";
owner = "YosysHQ";
repo = "prjtrellis-db";
rev = "2cf058e7a3ba36134d21e34823e9b2ecaaceac2c";
sha256 = "1hjaw5jkwiaiznm2z0smy88m2cdz63cd51z4nibajfih7ikvkj6g";

View file

@ -6,6 +6,7 @@ let
src = fetchFromGitHub {
owner = "OpenMW";
repo = "osg";
# commit does not exist on any branch on the target repository
rev = "1556cd7966ebc1c80b6626988d2b25fb43a744cf";
sha256 = "0d74hijzmj82nx3jkv5qmr3pkgvplra0b8fbjx1y3vmzxamb0axd";
};

View file

@ -123,6 +123,7 @@ in {
src = fetchFromGitHub {
owner = "IceReaper";
repo = "OpenRA" ;
# commit does not exist on any branch on the target repository
rev = "4e8eab4ca00d1910203c8a103dfd2c002714daa8";
sha256 = "1yyqparf93x8yzy1f46gsymgkj5jls25v2yc7ighr3f7mi3igdvq";
name = "engine";

View file

@ -13,13 +13,15 @@ in stdenv.mkDerivation {
src = fetchFromGitHub {
owner = "Davidebyzero";
repo = "Snipes";
rev = "343e14104b7848eb1f882401888e685b7918ef9f";
sha256 = "1rl70d5miak34warbwfv27z11vln4lvf7maqqc78z0gdc5zivdv2";
rev = "594af45108e07aa4159c3babc9b5e53609c3fd6e";
sha256 = "0gmh38swm74jmljy0bq27ipqzb4h8y9rzwc1j6harbd9qqz5knac";
};
postPatch = ''
substitute config-sample.h config.h \
--replace SnipesConsole.ttf $out/share/snipes/SnipesConsole.ttf
substituteInPlace GNUmakefile \
--replace 'CFLAGS=-Werror -Wall' 'CFLAGS=-Wall'
'';
enableParallelBuilding = true;

View file

@ -925,8 +925,8 @@ in with lib.licenses;
src = fetchFromGitHub {
owner = "snes9xgit";
repo = core;
rev = "6db918cfe32b157239da44096091c212fdfb3b60";
sha256 = "0y3jhy50qdhhfglybys9m0fgk9r24ksdcgv5iqpyxy5a4cjvhv8j";
rev = "bd9246ddd75a5e9f78d6189c8c57754d843630f7";
sha256 = "10fm7ah3aha9lf4k9hgw0dlhdvshzpig2d0ylcb12gf9zz0i22ns";
};
description = "Port of SNES9x git to libretro";
license = "Non-commercial";

View file

@ -7,8 +7,8 @@ stdenv.mkDerivation rec {
src = fetchFromGitHub {
owner = "nix-community";
repo = "acpi_call";
rev = "3d7c9fe5ed3fc5ed5bafd39d54b1fdc7a09ce710";
sha256 = "09kp8zl392h99wjwzqrdw2xcfnsc944hzmfwi8n1y7m2slpdybv3";
rev = "fe4cd0124099b88b61f83006023bc0d95e742e75";
sha256 = "1rksbg78i7y2wzam9p6kbhx8rmkaiq0kqg8nj7k0j6d25m79289s";
};
hardeningDisable = [ "pic" ];

View file

@ -7,6 +7,7 @@ buildLinux (args // {
src = fetchFromGitHub {
owner = "koverstreet";
repo = "bcachefs";
# commit does not exist on any branch on the target repository
rev = "6a505b63ed3003faf5000f19fd08bbd477d93fbc";
sha256 = "1rf34gzv9npafp1c3i6lymk3b0gnqp4rb0wl33pw6yrpgnsry3cc";
};

View file

@ -12,6 +12,7 @@ in stdenv.mkDerivation rec {
src = fetchFromGitHub {
owner = "rtlwifi-linux";
repo = "rtlwifi_new";
# commit does not exist on any branch on the target repository
rev = "a108e3de87c2ed30b71c3c4595b79ab7a2f9e348";
sha256 = "15kjs9i9vvmn1cdzccd5cljf3m45r4ssm65klkj2fdkf3kljj38k";
};

View file

@ -8,8 +8,8 @@
, libtirpc
, nfs-utils
, gawk, gnugrep, gnused, systemd
, smartmontools, sysstat, sudo
, pkg-config
, smartmontools, enableMail ? false
, sysstat, sudo, pkg-config
# Kernel dependencies
, kernel ? null
@ -18,6 +18,8 @@
with lib;
let
smartmon = smartmontools.override { inherit enableMail; };
buildKernel = any (n: n == configFile) [ "kernel" "all" ];
buildUser = any (n: n == configFile) [ "user" "all" ];
@ -148,7 +150,7 @@ let
'';
postFixup = let
path = "PATH=${makeBinPath [ coreutils gawk gnused gnugrep util-linux smartmontools sysstat ]}:$PATH";
path = "PATH=${makeBinPath [ coreutils gawk gnused gnugrep util-linux smartmon sysstat ]}:$PATH";
in ''
for i in $out/libexec/zfs/zpool.d/*; do
sed -i '2i${path}' $i
@ -157,12 +159,17 @@ let
outputs = [ "out" ] ++ optionals buildUser [ "lib" "dev" ];
passthru.tests = if isUnstable then
[ nixosTests.zfs.unstable ]
else [
nixosTests.zfs.installer
nixosTests.zfs.stable
];
passthru = {
inherit enableMail;
tests =
if isUnstable then [
nixosTests.zfs.unstable
] else [
nixosTests.zfs.installer
nixosTests.zfs.stable
];
};
meta = {
description = "ZFS Filesystem Linux Kernel module";

View file

@ -12,16 +12,16 @@ let
in
rustPlatform.buildRustPackage rec {
pname = "fishnet";
version = "2.2.3";
version = "2.2.4";
src = fetchFromGitHub {
owner = "niklasf";
repo = pname;
rev = "v${version}";
sha256 = "159fwjy70n6lvnhdwv65azgi03r5qcc2m2zpzgz0k3r6cy06faxj";
sha256 = "19dh69b6mqx16195w9d20fah4jl8hhbxm84xq4zwsgl4khmw7zqz";
};
cargoSha256 = "1bfs8dy08799r6d63sb33zwcxas3gzp7jvcxv3w8n64gffan8f2n";
cargoSha256 = "0zl2fnmqncyjd52wkn6dddx9lm9ywpw7swy895yq299z2bbbkv3h";
preBuild = ''
rmdir ./assets

View file

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "oil";
version = "0.8.6";
version = "0.8.7";
src = fetchurl {
url = "https://www.oilshell.org/download/oil-${version}.tar.xz";
sha256 = "sha256-fX1miI8yXzn/T9cbbZ/7E6/tLs3RXsX3PgfC7sBxIjU=";
sha256 = "sha256-KcXu1u/MvvbCLb5a7D09NvfJPaeo0c8Z/Czuk7XR23M=";
};
postPatch = ''

View file

@ -1,20 +1,19 @@
{ lib, stdenv
{ lib
, stdenv
, fetchFromGitHub
, upx
}:
let
version = "20202807";
stdenv.mkDerivation rec {
pname = "hdl-dump";
in stdenv.mkDerivation {
inherit pname version;
version = "20202807";
# Using AkuHAK's repo because playstation2's repo is outdated
src = fetchFromGitHub {
owner = "AKuHAK";
repo = pname;
rev = "be37e112a44772a1341c867dc3dfee7381ce9e59";
sha256 = "0akxak6hm11h8z6jczxgr795s4a8czspwnhl3swqxp803dvjdx41";
rev = "0c98b235c83c0fca1da93648f05ea5f940a4aee0";
sha256 = "1s3wflqjjlcslpa9n5chr8dbamhmfk88885dzw68apz4vf6g27iq";
};
buildInputs = [ upx ];

View file

@ -30,6 +30,6 @@ stdenv.mkDerivation rec {
homepage = "https://github.com/adurbin/iotools";
license = licenses.gpl2Only;
maintainers = with maintainers; [ felixsinger ];
platforms = platforms.linux;
platforms = [ "x86_64-linux" "i686-linux" ];
};
}

View file

@ -1,5 +1,6 @@
{ lib, stdenv, fetchurl, autoreconfHook
, mailutils, inetutils
, mailutils, enableMail ? true
, inetutils
, IOKit, ApplicationServices }:
let
@ -26,7 +27,7 @@ in stdenv.mkDerivation rec {
postPatch = "cp -v ${driverdb} drivedb.h";
configureFlags = [
"--with-scriptpath=${lib.makeBinPath [ mailutils inetutils ]}"
"--with-scriptpath=${lib.makeBinPath ([ inetutils ] ++ lib.optional enableMail mailutils)}"
];
nativeBuildInputs = [ autoreconfHook ];