From fe1a3630227cb1e6cf936118119e1921c0a8920a Mon Sep 17 00:00:00 2001 From: Graham Bennett Date: Tue, 23 Feb 2021 22:22:52 +0000 Subject: [PATCH 01/16] python3Packages.ring_doorbell: init at 0.7.0 --- .../python-modules/ring-doorbell/default.nix | 44 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 46 insertions(+) create mode 100644 pkgs/development/python-modules/ring-doorbell/default.nix diff --git a/pkgs/development/python-modules/ring-doorbell/default.nix b/pkgs/development/python-modules/ring-doorbell/default.nix new file mode 100644 index 00000000000..f70e4921b9e --- /dev/null +++ b/pkgs/development/python-modules/ring-doorbell/default.nix @@ -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 ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 48e571147c8..9871d1c4462 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6927,6 +6927,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 { }; From cb55068397db15974a0d0d0bd79ffb14d6b99229 Mon Sep 17 00:00:00 2001 From: Graham Bennett Date: Wed, 24 Feb 2021 19:10:59 +0000 Subject: [PATCH 02/16] home-assistant: add ring-doorbell dependency For the ring integration. This is currently pinned back to 0.6.2 to avoid an upstream bug in 0.7.0. --- pkgs/servers/home-assistant/component-packages.nix | 2 +- pkgs/servers/home-assistant/default.nix | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index 1dc8490c3c2..a0e9c01c7cb 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -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 ]; diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index 2ddd4a45323..8931bf65b5c 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -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 { }; From f836e661a5e8760f3102e1acfbc2d43351cfc220 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Fri, 5 Mar 2021 06:00:00 -0500 Subject: [PATCH 03/16] zeek: use caf from nixpkgs --- pkgs/applications/networking/ids/zeek/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/applications/networking/ids/zeek/default.nix b/pkgs/applications/networking/ids/zeek/default.nix index 12e25fb774e..a12e914097c 100644 --- a/pkgs/applications/networking/ids/zeek/default.nix +++ b/pkgs/applications/networking/ids/zeek/default.nix @@ -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" From cad7bb44f90dac3fead3171c82dc7bb0de880231 Mon Sep 17 00:00:00 2001 From: Tad Fisher Date: Fri, 5 Mar 2021 10:52:32 -0800 Subject: [PATCH 04/16] maxflow: init at 3.0.5 --- .../development/libraries/maxflow/default.nix | 27 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 29 insertions(+) create mode 100644 pkgs/development/libraries/maxflow/default.nix diff --git a/pkgs/development/libraries/maxflow/default.nix b/pkgs/development/libraries/maxflow/default.nix new file mode 100644 index 00000000000..9c53a16d372 --- /dev/null +++ b/pkgs/development/libraries/maxflow/default.nix @@ -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 ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 97a0e998a24..bf40b12d239 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15965,6 +15965,8 @@ in matterhorn = haskell.lib.justStaticExecutables haskellPackages.matterhorn; + maxflow = callPackage ../development/libraries/maxflow { }; + mbedtls = callPackage ../development/libraries/mbedtls { }; mdctags = callPackage ../development/tools/misc/mdctags { }; From 46a0c019c026d277f01bb0a240339c6c60c81838 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20St=C3=BChrk?= Date: Fri, 5 Mar 2021 21:07:13 +0100 Subject: [PATCH 05/16] xdg-desktop-portal-wlr: 0.1.0 -> 0.2.0 --- .../libraries/xdg-desktop-portal-wlr/default.nix | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/xdg-desktop-portal-wlr/default.nix b/pkgs/development/libraries/xdg-desktop-portal-wlr/default.nix index 151c74f0b70..da60f2b27fc 100644 --- a/pkgs/development/libraries/xdg-desktop-portal-wlr/default.nix +++ b/pkgs/development/libraries/xdg-desktop-portal-wlr/default.nix @@ -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"; From 12672f90c5898ae7231f7c2bef077d93fcb57828 Mon Sep 17 00:00:00 2001 From: Drew Risinger Date: Fri, 5 Mar 2021 14:26:31 -0500 Subject: [PATCH 06/16] python3Packages.retworkx: 0.6.0 -> 0.8.0 --- .../python-modules/retworkx/default.nix | 14 ++++++++------ pkgs/top-level/python-packages.nix | 2 +- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/retworkx/default.nix b/pkgs/development/python-modules/retworkx/default.nix index 8cce139facb..c4b7a6323e4 100644 --- a/pkgs/development/python-modules/retworkx/default.nix +++ b/pkgs/development/python-modules/retworkx/default.nix @@ -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) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index a392ef3764f..8869631a5fc 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6951,7 +6951,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 { }; From b2e2f0422f23e5943fcccd5f067f756655327706 Mon Sep 17 00:00:00 2001 From: Finn Behrens Date: Fri, 5 Mar 2021 22:23:09 +0100 Subject: [PATCH 07/16] libfaketime: use date from nix store (#115212) Previously the faketime command used date (or gdate on darwin) from the environment. This led to issues when the date command was not available or did not behave as expected. Thus, we patch libfaketime to use the date binary from the Nix coreutils package, pulling it into the closure. --- .../libraries/libfaketime/default.nix | 4 ++- .../libfaketime/nix-store-date.patch | 29 +++++++++++++++++++ 2 files changed, 32 insertions(+), 1 deletion(-) create mode 100644 pkgs/development/libraries/libfaketime/nix-store-date.patch diff --git a/pkgs/development/libraries/libfaketime/default.nix b/pkgs/development/libraries/libfaketime/default.nix index 27487c6a315..ced1c3e7bb9 100644 --- a/pkgs/development/libraries/libfaketime/default.nix +++ b/pkgs/development/libraries/libfaketime/default.nix @@ -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"; diff --git a/pkgs/development/libraries/libfaketime/nix-store-date.patch b/pkgs/development/libraries/libfaketime/nix-store-date.patch new file mode 100644 index 00000000000..b88245dfe8f --- /dev/null +++ b/pkgs/development/libraries/libfaketime/nix-store-date.patch @@ -0,0 +1,29 @@ +From abd7dd05b440e3dc9621a1579e4afb0267897d9c Mon Sep 17 00:00:00 2001 +From: Finn Behrens +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) + From 67ae0f17db696540cdb58fb9bc8c605ca69e296f Mon Sep 17 00:00:00 2001 From: Hunter Jones Date: Fri, 5 Mar 2021 15:23:01 -0600 Subject: [PATCH 08/16] indilib: 1.8.8 -> 1.8.9 --- pkgs/development/libraries/indilib/default.nix | 5 +++-- pkgs/development/libraries/indilib/indi-3rdparty.nix | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/indilib/default.nix b/pkgs/development/libraries/indilib/default.nix index 4813e431a66..da4ba218fdf 100644 --- a/pkgs/development/libraries/indilib/default.nix +++ b/pkgs/development/libraries/indilib/default.nix @@ -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" ]; diff --git a/pkgs/development/libraries/indilib/indi-3rdparty.nix b/pkgs/development/libraries/indilib/indi-3rdparty.nix index 02862820b3a..e6e82bc0249 100644 --- a/pkgs/development/libraries/indilib/indi-3rdparty.nix +++ b/pkgs/development/libraries/indilib/indi-3rdparty.nix @@ -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" ]; From c0c288b70b6da05dd22cde0247d4ba43f31f5dd6 Mon Sep 17 00:00:00 2001 From: rnhmjoj Date: Mon, 1 Mar 2021 13:50:29 +0100 Subject: [PATCH 09/16] nixos/libvirtd: remove systemd-udev-settle This dependency has been added in 65eae4d, when NixOS switched to systemd, as a substitute for the previous udevtrigger and hasn't been touched since. It's probably unneeded as the upstream unit[1] doesn't do it and I haven't found any mention of any problem in NixOS or the upstream issue trackers. [1]: https://gitlab.com/libvirt/libvirt/-/blob/master/src/remote/libvirtd.service.in --- nixos/modules/virtualisation/libvirtd.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/virtualisation/libvirtd.nix b/nixos/modules/virtualisation/libvirtd.nix index 1d6a9457dde..6357baf29e0 100644 --- a/nixos/modules/virtualisation/libvirtd.nix +++ b/nixos/modules/virtualisation/libvirtd.nix @@ -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 ( From e75b4c796e5a032237b21a7de3077f9ac659ccdc Mon Sep 17 00:00:00 2001 From: Profpatsch Date: Fri, 5 Mar 2021 13:14:08 +0100 Subject: [PATCH 10/16] dhallPackages: add recurseIntoAttrs dhallPackages were not built by the hydra, because the `recurseIntoAttrs` calls was missing (all other package sets use it to make hydra build the packages). --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c82854c62c0..3bec75450df 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -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 { }; From c7c81dced8adc0278dbbaad7ecfc81895c18568b Mon Sep 17 00:00:00 2001 From: Profpatsch Date: Fri, 5 Mar 2021 13:07:31 +0100 Subject: [PATCH 11/16] lorri: 1.2.0 -> 1.3.0 We forked lorri to nix-community, so this release also moves us over to the new official repository. Release notes: Fix the build loop. Previously, any change (for example a direnv ping or a change in the nix files) would add a new build invocation to the queue, and the builds would all be done one after the other. However, a new build will always use the newest state of the files anyway, so the CPU time spent on all the other builds will be wasted (and hog your processor). Now lorri will only finish the current build (if running) schedule at maximum one additional build if requested This should improve the resource use drastically in some situations. --- Make lorri daemon exit with exit code 0 instead of 130/143 on SIGINT or SIGTERM. --- Add lorri self-upgrade branch sub-subcommand. This enables us to point users to a branch name, in order to test out fixes from repository branches. --- pkgs/tools/misc/lorri/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/tools/misc/lorri/default.nix b/pkgs/tools/misc/lorri/default.nix index 951cb8b5caa..401636ab687 100644 --- a/pkgs/tools/misc/lorri/default.nix +++ b/pkgs/tools/misc/lorri/default.nix @@ -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; From 67eedd9067ac25b2f0ebeb356453e4ccf54673fe Mon Sep 17 00:00:00 2001 From: daemon1024 Date: Sat, 6 Mar 2021 04:33:48 +0530 Subject: [PATCH 12/16] vimPlugins.embark-vim: init at 2021-02-23 --- pkgs/misc/vim-plugins/generated.nix | 12 ++++++++++++ pkgs/misc/vim-plugins/vim-plugin-names | 1 + 2 files changed, 13 insertions(+) diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix index ad33bd7473a..3f146382dc6 100644 --- a/pkgs/misc/vim-plugins/generated.nix +++ b/pkgs/misc/vim-plugins/generated.nix @@ -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"; diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names index c216d2a7d44..5869e8a6be2 100644 --- a/pkgs/misc/vim-plugins/vim-plugin-names +++ b/pkgs/misc/vim-plugins/vim-plugin-names @@ -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 From 302cafc29d3b600459e83ed8ace16a00d5cbfb79 Mon Sep 17 00:00:00 2001 From: Drew Risinger Date: Thu, 25 Feb 2021 11:43:35 -0500 Subject: [PATCH 13/16] python3Packages.qiskit-aer: 0.7.4 -> 0.7.6 --- pkgs/development/python-modules/qiskit-aer/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/qiskit-aer/default.nix b/pkgs/development/python-modules/qiskit-aer/default.nix index bb04309d1a5..10a3b4482fc 100644 --- a/pkgs/development/python-modules/qiskit-aer/default.nix +++ b/pkgs/development/python-modules/qiskit-aer/default.nix @@ -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 ''; From 65444f26e78bce231b78b94f9a548008b5c41b81 Mon Sep 17 00:00:00 2001 From: Drew Risinger Date: Fri, 5 Mar 2021 14:30:37 -0500 Subject: [PATCH 14/16] python3Packages.qiskit-ibmq-provider: 0.11.1 -> 0.12.1 --- .../python-modules/qiskit-ibmq-provider/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/qiskit-ibmq-provider/default.nix b/pkgs/development/python-modules/qiskit-ibmq-provider/default.nix index 7374d7ce017..9346fae9743 100644 --- a/pkgs/development/python-modules/qiskit-ibmq-provider/default.nix +++ b/pkgs/development/python-modules/qiskit-ibmq-provider/default.nix @@ -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; From 82b087fa97b94b6ce13c2879bf50c6e47c4fc92b Mon Sep 17 00:00:00 2001 From: Drew Risinger Date: Thu, 25 Feb 2021 11:43:52 -0500 Subject: [PATCH 15/16] python3Packages.qiskit: 0.23.5 -> 0.24.0 --- pkgs/development/python-modules/qiskit/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/qiskit/default.nix b/pkgs/development/python-modules/qiskit/default.nix index 3c7a0044202..5051c6541cd 100644 --- a/pkgs/development/python-modules/qiskit/default.nix +++ b/pkgs/development/python-modules/qiskit/default.nix @@ -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 = [ From 26f06f8ec68b2bee5c015f0b7e9308c92e1a6a32 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jelmer=20Vernoo=C4=B3?= Date: Fri, 5 Mar 2021 23:54:15 +0000 Subject: [PATCH 16/16] python2Packages.dulwich: Fix the homepage. --- pkgs/development/python-modules/dulwich/0_19.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/dulwich/0_19.nix b/pkgs/development/python-modules/dulwich/0_19.nix index f0d3bad7a04..9a09c7cc75d 100644 --- a/pkgs/development/python-modules/dulwich/0_19.nix +++ b/pkgs/development/python-modules/dulwich/0_19.nix @@ -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 ]; };