Merge staging-next into staging

This commit is contained in:
github-actions[bot] 2021-03-06 00:38:46 +00:00 committed by GitHub
commit 0117c50b67
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
21 changed files with 170 additions and 32 deletions

View File

@ -213,7 +213,7 @@ in {
systemd.services.libvirtd = {
requires = [ "libvirtd-config.service" ];
after = [ "systemd-udev-settle.service" "libvirtd-config.service" ]
after = [ "libvirtd-config.service" ]
++ optional vswitch.enable "ovs-vswitchd.service";
environment.LIBVIRTD_ARGS = escapeShellArgs (

View File

@ -16,6 +16,7 @@
, gettext
, coreutils
, ncurses
, caf
}:
stdenv.mkDerivation rec {
@ -34,6 +35,7 @@ stdenv.mkDerivation rec {
outputs = [ "out" "lib" "py" ];
cmakeFlags = [
"-DCAF_ROOT=${caf}"
"-DZEEK_PYTHON_DIR=${placeholder "py"}/lib/${python3.libPrefix}/site-packages"
"-DENABLE_PERFTOOLS=true"
"-DINSTALL_AUX_TOOLS=true"

View File

@ -15,13 +15,13 @@
stdenv.mkDerivation rec {
pname = "indilib";
version = "1.8.8";
version = "1.8.9";
src = fetchFromGitHub {
owner = "indilib";
repo = "indi";
rev = "v${version}";
sha256 = "sha256-WTRfV6f764tDGKnQVd1jeYN/qXa/VRTFK0mMalc+9aU=";
sha256 = "sha256-W6LfrKL56K1B6srEfbNcq1MZwg7Oj8qoJkQ83ZhYhFs=";
};
nativeBuildInputs = [
@ -48,6 +48,7 @@ stdenv.mkDerivation rec {
meta = with lib; {
homepage = "https://www.indilib.org/";
description = "Implementation of the INDI protocol for POSIX operating systems";
changelog = "https://github.com/indilib/indi/releases/tag/v${version}";
license = licenses.lgpl2Plus;
maintainers = with maintainers; [ hjones2199 ];
platforms = [ "x86_64-linux" ];

View File

@ -22,13 +22,13 @@
stdenv.mkDerivation rec {
pname = "indi-3rdparty";
version = "1.8.8";
version = "1.8.9";
src = fetchFromGitHub {
owner = "indilib";
repo = pname;
rev = "v${version}";
sha256 = "18ii9qsghrvj8y4y6c7bx6kjradybnmyq8i5phj7pv4r8w91rq7g";
sha256 = "0klvknhp7l6y2ab4vyv4jq7znk1gjl5b3709kyplm7dsh4b8bppy";
};
cmakeFlags = [
@ -56,6 +56,7 @@ stdenv.mkDerivation rec {
meta = with lib; {
homepage = "https://www.indilib.org/";
description = "Third party drivers for the INDI astronomical software suite";
changelog = "https://github.com/indilib/indi-3rdparty/releases/tag/v${version}";
license = licenses.lgpl2Plus;
maintainers = with maintainers; [ hjones2199 ];
platforms = [ "x86_64-linux" ];

View File

@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, perl }:
{ lib, stdenv, fetchurl, perl, coreutils }:
stdenv.mkDerivation rec {
pname = "libfaketime";
@ -11,6 +11,7 @@ stdenv.mkDerivation rec {
patches = [
./no-date-in-gzip-man-page.patch
./nix-store-date.patch
] ++ (lib.optionals stdenv.cc.isClang [
# https://github.com/wolfcw/libfaketime/issues/277
./0001-Remove-unsupported-clang-flags.patch
@ -22,6 +23,7 @@ stdenv.mkDerivation rec {
substituteInPlace $a \
--replace /bin/bash ${stdenv.shell}
done
substituteInPlace src/faketime.c --replace @DATE_CMD@ ${coreutils}/bin/date
'';
PREFIX = placeholder "out";

View File

@ -0,0 +1,29 @@
From abd7dd05b440e3dc9621a1579e4afb0267897d9c Mon Sep 17 00:00:00 2001
From: Finn Behrens <me@kloenk.de>
Date: Fri, 5 Mar 2021 21:58:57 +0100
Subject: [PATCH] use nix date path
---
src/faketime.c | 6 +-----
1 file changed, 1 insertion(+), 5 deletions(-)
diff --git a/src/faketime.c b/src/faketime.c
index af618f2..48e47da 100644
--- a/src/faketime.c
+++ b/src/faketime.c
@@ -50,11 +50,7 @@
const char version[] = "0.9.9";
-#ifdef __APPLE__
-static const char *date_cmd = "gdate";
-#else
-static const char *date_cmd = "date";
-#endif
+static const char *date_cmd = "@DATE_CMD@";
#define PATH_BUFSIZE 4096
--
2.24.3 (Apple Git-128)

View File

@ -0,0 +1,27 @@
{ lib
, stdenv
, fetchFromGitHub
, cmake
}:
stdenv.mkDerivation rec {
pname = "maxflow";
version = "3.0.5";
src = fetchFromGitHub {
owner = "gerddie";
repo = pname;
rev = version;
hash = "sha256-a84SxGMnfBEaoMEeeIFffTOtErSN5yzZBrAUDjkalGY=";
};
nativeBuildInputs = [ cmake ];
meta = with lib; {
description = "Software for computing mincut/maxflow in a graph";
homepage = "https://github.com/gerddie/maxflow";
license = licenses.gpl3Plus;
platforms = platforms.all;
maintainers = [ maintainers.tadfisher ];
};
}

View File

@ -1,20 +1,24 @@
{ lib, stdenv, fetchFromGitHub
, meson, ninja, pkg-config, wayland-protocols
, pipewire, wayland, elogind, systemd, libdrm }:
, pipewire, wayland, systemd, libdrm }:
stdenv.mkDerivation rec {
pname = "xdg-desktop-portal-wlr";
version = "0.1.0";
version = "0.2.0";
src = fetchFromGitHub {
owner = "emersion";
repo = pname;
rev = "v${version}";
sha256 = "12k92h9dmn1fyn8nzxk69cyv0gnb7g9gj7a66mw5dcl5zqnl07nc";
sha256 = "1vjz0y3ib1xw25z8hl679l2p6g4zcg7b8fcd502bhmnqgwgdcsfx";
};
nativeBuildInputs = [ meson ninja pkg-config wayland-protocols ];
buildInputs = [ pipewire wayland elogind systemd libdrm ];
buildInputs = [ pipewire wayland systemd libdrm ];
mesonFlags = [
"-Dsd-bus-provider=libsystemd"
];
meta = with lib; {
homepage = "https://github.com/emersion/xdg-desktop-portal-wlr";

View File

@ -23,7 +23,7 @@ buildPythonPackage rec {
meta = with lib; {
description = "Simple Python implementation of the Git file formats and protocols";
homepage = "https://samba.org/~jelmer/dulwich/";
homepage = "https://www.dulwich.io/";
license = licenses.gpl2Plus;
maintainers = with maintainers; [ koral ];
};

View File

@ -27,7 +27,8 @@
buildPythonPackage rec {
pname = "qiskit-aer";
version = "0.7.4";
version = "0.7.6";
format = "pyproject";
disabled = pythonOlder "3.6";
@ -35,7 +36,7 @@ buildPythonPackage rec {
owner = "Qiskit";
repo = "qiskit-aer";
rev = version;
sha256 = "sha256-o6c1ZcGFZ3pwinzMTif1nqF29Wq0Nog1++ZoJGuiKxo=";
sha256 = "0595as4rxjrd5dqx54ywz3rjsjk0z7r41bq0z9r8y1h7zgvvlrmn";
};
nativeBuildInputs = [
@ -64,6 +65,7 @@ buildPythonPackage rec {
substituteInPlace setup.py --replace "'cmake!=3.17,!=3.17.0'," ""
'';
# Disable using conan for build
preBuild = ''
export DISABLE_CONAN=1
'';

View File

@ -22,6 +22,7 @@
, nbconvert
, nbformat
, pproxy
, qiskit-aer
, vcrpy
}:
@ -38,7 +39,7 @@ let
in
buildPythonPackage rec {
pname = "qiskit-ibmq-provider";
version = "0.11.1";
version = "0.12.1";
disabled = pythonOlder "3.6";
@ -46,7 +47,7 @@ buildPythonPackage rec {
owner = "Qiskit";
repo = pname;
rev = version;
sha256 = "0b5mnq8f5844idnsmp84lpkvlpszfwwi998yvggcgaayw1dbk53h";
sha256 = "1i5dj5dl0hxqd61bdflyy6yq958fj9qhf6s6m40n1vnql7g50gdx";
};
propagatedBuildInputs = [
@ -64,6 +65,7 @@ buildPythonPackage rec {
nbconvert
nbformat
pproxy
qiskit-aer
vcrpy
] ++ lib.optionals (!withVisualization) visualizationPackages;

View File

@ -15,7 +15,7 @@
buildPythonPackage rec {
pname = "qiskit";
# NOTE: This version denotes a specific set of subpackages. See https://qiskit.org/documentation/release_notes.html#version-history
version = "0.23.5";
version = "0.24.0";
disabled = pythonOlder "3.6";
@ -23,7 +23,7 @@ buildPythonPackage rec {
owner = "qiskit";
repo = "qiskit";
rev = version;
sha256 = "sha256-qtMFztAeqNz0FSgQnOOrvAdPcbUCAal7KrVmpNvvBiY=";
sha256 = "1b78q75bi666v0yj33bkjlc40d2172dsq5yp1s2kkisjfa8qmh7h";
};
propagatedBuildInputs = [

View File

@ -1,39 +1,41 @@
{ lib
, buildPythonPackage
, pythonOlder
, rustPlatform
, fetchFromGitHub
# Check inputs
, pytestCheckHook
, networkx
, numpy
}:
buildPythonPackage rec {
pname = "retworkx";
version = "0.6.0";
version = "0.8.0";
format = "pyproject";
disabled = pythonOlder "3.6";
src = fetchFromGitHub {
owner = "Qiskit";
repo = "retworkx";
rev = version;
sha256 = "11n30ldg3y3y6qxg3hbj837pnbwjkqw3nxq6frds647mmmprrd20";
sha256 = "0plpri6a3d6f1000kmcah9066vq2i37d14bdf8sm96493fhpqhrd";
};
cargoDeps = rustPlatform.fetchCargoTarball {
inherit src;
name = "${pname}-${version}";
hash = "sha256-heOBK8qi2nuc/Ib+I/vLzZ1fUUD/G/KTw9d7M4Hz5O0=";
hash = "sha256-+k779gmge8wDdoZrWn9ND47kUqt7pqe75Zuj2Byfefo=";
};
format = "pyproject";
nativeBuildInputs = with rustPlatform; [ cargoSetupHook maturinBuildHook ];
# Needed b/c need to check AFTER python wheel is installed (using Rust Build, not buildPythonPackage)
doCheck = false;
doInstallCheck = true;
installCheckInputs = [ pytestCheckHook numpy ];
installCheckInputs = [ pytestCheckHook networkx numpy ];
preCheck = ''
export TESTDIR=$(mktemp -d)

View File

@ -0,0 +1,44 @@
{ lib
, buildPythonPackage
, fetchPypi
, isPy3k
, oauthlib
, pytestCheckHook
, pytz
, requests
, requests-mock
, requests_oauthlib
}:
buildPythonPackage rec {
pname = "ring-doorbell";
version = "0.7.0";
disabled = !isPy3k;
src = fetchPypi {
pname = "ring_doorbell";
inherit version;
sha256 = "1qnx9q9rzxhh0pygl3f9bg21b5zv7csv9h1w4zngdvsphbs0yiwg";
};
propagatedBuildInputs = [
oauthlib
pytz
requests
requests_oauthlib
];
checkInputs = [
pytestCheckHook
requests-mock
];
pythonImportsCheck = [ "ring_doorbell" ];
meta = with lib; {
homepage = "https://github.com/tchellomello/python-ring-doorbell";
description = "A Python library to communicate with Ring Door Bell (https://ring.com/)";
license = licenses.lgpl3Plus;
maintainers = with maintainers; [ graham33 ];
};
}

View File

@ -4466,6 +4466,18 @@ let
meta.homepage = "https://github.com/vhda/verilog_systemverilog.vim/";
};
embark-vim = buildVimPluginFrom2Nix {
pname = "embark-vim";
version = "2021-02-23";
src = fetchFromGitHub {
owner = "embark-theme";
repo = "vim";
rev = "d9ea898794c486e2517823f24b9577ce4c488364";
sha256 = "0l1f9pl8nh8lkswwrsw13s8d10ccq0c1jfd3bpszsxc6ryjm0wqw";
};
meta.homepage = "https://github.com/embark-theme/vim/";
};
vim-abolish = buildVimPluginFrom2Nix {
pname = "vim-abolish";
version = "2020-10-30";

View File

@ -106,6 +106,7 @@ eikenb/acp
elixir-editors/vim-elixir
elmcast/elm-vim
elzr/vim-json
embark-theme/vim as embark-vim
embear/vim-localvimrc
enomsg/vim-haskellConcealPlus
enricobacis/vim-airline-clock

View File

@ -679,7 +679,7 @@
"rest_command" = ps: with ps; [ ];
"rflink" = ps: with ps; [ ]; # missing inputs: rflink
"rfxtrx" = ps: with ps; [ ]; # missing inputs: pyRFXtrx
"ring" = ps: with ps; [ ha-ffmpeg ]; # missing inputs: ring_doorbell
"ring" = ps: with ps; [ ha-ffmpeg ring-doorbell ];
"ripple" = ps: with ps; [ ]; # missing inputs: python-ripple-api
"risco" = ps: with ps; [ pyrisco ];
"rmvtransport" = ps: with ps; [ PyRMVtransport ];

View File

@ -23,6 +23,11 @@ let
(mkOverride "astral" "1.10.1"
"d2a67243c4503131c856cafb1b1276de52a86e5b8a1d507b7e08bee51cb67bf1")
# Pinned due to bug in ring-doorbell 0.7.0
# https://github.com/tchellomello/python-ring-doorbell/issues/240
(mkOverride "ring-doorbell" "0.6.2"
"fbd537722a27b3b854c26506d894b7399bb8dc57ff36083285971227a2d46560")
# hass-frontend does not exist in python3.pkgs
(self: super: {
hass-frontend = self.callPackage ./frontend.nix { };

View File

@ -14,10 +14,10 @@
let
# Run `eval $(nix-build -A lorri.updater)` after updating the revision!
version = "1.2";
gitRev = "43a260c221d5dac4a44fd82271736c8444474eec";
sha256 = "0g6zq27dpr8bdan5xrqchybpbqwnhhc7x8sxbfygigbqd3xv9i6n";
cargoSha256 = "1zmlp14v7av0znmjyy2aq83lc74503p6r0l11l9iw7s3xad8rda4";
version = "1.3";
gitRev = "a26745e404c3a201fe98af4c000bb27f910542b1";
sha256 = "0gfkqvla2cphyhnl5xw19yf1v4pvwsvphr019y5r914cwqwnkb92";
cargoSha256 = "1a1alhpivlmxy8iv0ki7s0b8hf3hadashf81rzn207wn3yihsnaf";
in (rustPlatform.buildRustPackage rec {
pname = "lorri";
@ -25,13 +25,13 @@ in (rustPlatform.buildRustPackage rec {
meta = with lib; {
description = "Your project's nix-env";
homepage = "https://github.com/target/lorri";
homepage = "https://github.com/nix-community/lorri";
license = licenses.asl20;
maintainers = with maintainers; [ grahamc Profpatsch ];
};
src = fetchFromGitHub {
owner = "target";
owner = "nix-community";
repo = pname;
rev = gitRev;
inherit sha256;

View File

@ -11258,7 +11258,7 @@ in
dhall-text = haskell.lib.justStaticExecutables haskellPackages.dhall-text;
dhallPackages = callPackage ./dhall-packages.nix { };
dhallPackages = recurseIntoAttrs (callPackage ./dhall-packages.nix { });
duktape = callPackage ../development/interpreters/duktape { };
@ -15980,6 +15980,8 @@ in
matterhorn = haskell.lib.justStaticExecutables haskellPackages.matterhorn;
maxflow = callPackage ../development/libraries/maxflow { };
mbedtls = callPackage ../development/libraries/mbedtls { };
mdctags = callPackage ../development/tools/misc/mdctags { };

View File

@ -6955,7 +6955,7 @@ in {
retrying = callPackage ../development/python-modules/retrying { };
retworkx = disabledIf (pythonOlder "3.5") (toPythonModule (callPackage ../development/python-modules/retworkx { }));
retworkx = callPackage ../development/python-modules/retworkx { };
rfc3986 = callPackage ../development/python-modules/rfc3986 { };
@ -6973,6 +6973,8 @@ in {
rig = callPackage ../development/python-modules/rig { };
ring-doorbell = callPackage ../development/python-modules/ring-doorbell { };
ripser = callPackage ../development/python-modules/ripser { };
rising = callPackage ../development/python-modules/rising { };