From 47d1533036b0ecb3e8839070528df329c2941813 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@nix.build>
Date: Sat, 9 Jan 2021 10:12:23 +0100
Subject: [PATCH 01/26] codeowners: Add myself to autoPatchelfHook

I really hate the very concept of this file (the reason being that I
think "owner" implies some form of BDFL rather than just being
notified), but since there were recent[1] changes[2] in auto-patchelf.sh
which I missed it's probably a good idea to add myself there solely for
being notified, because ofborg can't seem to infer maintainer
information here.

To make indentation consistent with all the other entries in the
codeowners file, I also re-indented the other entries in the "Nixpkgs
Internals" block.

[1]: https://github.com/NixOS/nixpkgs/pull/101142
[2]: https://github.com/NixOS/nixpkgs/pull/106830

Signed-off-by: aszlig <aszlig@nix.build>
---
 .github/CODEOWNERS | 23 ++++++++++++-----------
 1 file changed, 12 insertions(+), 11 deletions(-)

diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 14e810f972c..093239566ce 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -26,17 +26,18 @@
 /lib/asserts.nix            @edolstra @nbp @Profpatsch
 
 # Nixpkgs Internals
-/default.nix                          @nbp
-/pkgs/top-level/default.nix           @nbp @Ericson2314
-/pkgs/top-level/impure.nix            @nbp @Ericson2314
-/pkgs/top-level/stage.nix             @nbp @Ericson2314 @matthewbauer
-/pkgs/top-level/splice.nix            @Ericson2314 @matthewbauer
-/pkgs/top-level/release-cross.nix     @Ericson2314 @matthewbauer
-/pkgs/stdenv/generic                  @Ericson2314 @matthewbauer
-/pkgs/stdenv/cross                    @Ericson2314 @matthewbauer
-/pkgs/build-support/cc-wrapper        @Ericson2314 @orivej
-/pkgs/build-support/bintools-wrapper  @Ericson2314 @orivej
-/pkgs/build-support/setup-hooks       @Ericson2314
+/default.nix                                     @nbp
+/pkgs/top-level/default.nix                      @nbp @Ericson2314
+/pkgs/top-level/impure.nix                       @nbp @Ericson2314
+/pkgs/top-level/stage.nix                        @nbp @Ericson2314 @matthewbauer
+/pkgs/top-level/splice.nix                       @Ericson2314 @matthewbauer
+/pkgs/top-level/release-cross.nix                @Ericson2314 @matthewbauer
+/pkgs/stdenv/generic                             @Ericson2314 @matthewbauer
+/pkgs/stdenv/cross                               @Ericson2314 @matthewbauer
+/pkgs/build-support/cc-wrapper                   @Ericson2314 @orivej
+/pkgs/build-support/bintools-wrapper             @Ericson2314 @orivej
+/pkgs/build-support/setup-hooks                  @Ericson2314
+/pkgs/build-support/setup-hooks/auto-patchelf.sh @aszlig
 
 # Nixpkgs build-support
 /pkgs/build-support/writers @lassulus @Profpatsch

From 7389fd597a62b2db6be8b33122a827b14e354f1e Mon Sep 17 00:00:00 2001
From: 06kellyjac <dev@j-k.io>
Date: Sat, 9 Jan 2021 11:08:23 +0000
Subject: [PATCH 02/26] python3Packages.zha-quirks: remove conftest as a
 checkInput

The policy testing tool conftest isn't used in any of the pytest tests.
---
 pkgs/development/python-modules/zha-quirks/default.nix | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/zha-quirks/default.nix b/pkgs/development/python-modules/zha-quirks/default.nix
index 752d2eeda8d..2f3500516cb 100644
--- a/pkgs/development/python-modules/zha-quirks/default.nix
+++ b/pkgs/development/python-modules/zha-quirks/default.nix
@@ -3,7 +3,6 @@
 , fetchFromGitHub
 , aiohttp
 , zigpy
-, conftest
 , asynctest
 , pytestCheckHook
 }:
@@ -20,7 +19,7 @@ buildPythonPackage rec {
   };
 
   propagatedBuildInputs = [ aiohttp zigpy ];
-  checkInputs = [ pytestCheckHook conftest asynctest ];
+  checkInputs = [ pytestCheckHook asynctest ];
 
   meta = with lib; {
     description = "ZHA Device Handlers are custom quirks implementations for Zigpy";

From 8dae4e7122b60d6c0d3453be1d41c855069dfc5d Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sun, 10 Jan 2021 11:38:24 +0100
Subject: [PATCH 03/26] python3Packages.dnachisel: 3.2.5 -> 3.2.6

---
 pkgs/development/python-modules/dnachisel/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/dnachisel/default.nix b/pkgs/development/python-modules/dnachisel/default.nix
index 465f1bb5b4d..72d52d82c53 100644
--- a/pkgs/development/python-modules/dnachisel/default.nix
+++ b/pkgs/development/python-modules/dnachisel/default.nix
@@ -11,11 +11,11 @@
 
 buildPythonPackage rec {
   pname = "dnachisel";
-  version = "3.2.5";
+  version = "3.2.6";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "35301c5eda0baca5902403504e0b5a22eb65da92c2bbd23199d95c4a6bf0ef37";
+    sha256 = "1i49cfpvjvf9610gg4jz06dl5clc8vmcpjmhnm2d1j7lhpp1ksbb";
   };
 
   propagatedBuildInputs = [

From 0575e0d2c220224361613c1a3491749632542930 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sun, 10 Jan 2021 13:12:44 +0100
Subject: [PATCH 04/26] python3Packages.primer3: init at 0.6.1

---
 .../python-modules/primer3/default.nix        | 32 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 ++
 2 files changed, 34 insertions(+)
 create mode 100644 pkgs/development/python-modules/primer3/default.nix

diff --git a/pkgs/development/python-modules/primer3/default.nix b/pkgs/development/python-modules/primer3/default.nix
new file mode 100644
index 00000000000..e8aa83ed94d
--- /dev/null
+++ b/pkgs/development/python-modules/primer3/default.nix
@@ -0,0 +1,32 @@
+{ lib
+, buildPythonPackage
+, fetchFromGitHub
+, cython
+, click
+}:
+
+buildPythonPackage rec {
+  pname = "primer3";
+  version = "0.6.1";
+
+  src = fetchFromGitHub {
+    owner = "libnano";
+    repo = "primer3-py";
+    rev = version;
+    sha256 = "1glybwp9w2m1ydvaphr41gj31d8fvlh40s35galfbjqa563si72g";
+  };
+
+  nativeBuildInputs = [ cython ];
+
+  # pytestCheckHook leads to a circular import issue
+  checkInputs = [ click ];
+
+  pythonImportsCheck = [ "primer3" ];
+
+  meta = with lib; {
+    description = "Oligo analysis and primer design";
+    homepage = "https://github.com/libnano/primer3-py";
+    license = with licenses; [ gpl2Only ];
+    maintainers = with maintainers; [ fab ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 8b5f6ec0d60..c7dfc66e87d 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -4899,6 +4899,8 @@ in {
   else
     callPackage ../development/python-modules/prettytable/1.nix { };
 
+  primer3 = callPackage ../development/python-modules/primer3 { };
+
   priority = callPackage ../development/python-modules/priority { };
 
   prison = callPackage ../development/python-modules/prison { };

From a53f12762b0ebeeb87bfc444438a29b4dd4bf11b Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sun, 10 Jan 2021 13:48:45 +0100
Subject: [PATCH 05/26] python3Packages.genome-collector: init at 0.1.6

---
 .../genome-collector/default.nix              | 34 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 ++
 2 files changed, 36 insertions(+)
 create mode 100644 pkgs/development/python-modules/genome-collector/default.nix

diff --git a/pkgs/development/python-modules/genome-collector/default.nix b/pkgs/development/python-modules/genome-collector/default.nix
new file mode 100644
index 00000000000..70589912520
--- /dev/null
+++ b/pkgs/development/python-modules/genome-collector/default.nix
@@ -0,0 +1,34 @@
+{ lib
+, buildPythonPackage
+, appdirs
+, biopython
+, fetchPypi
+, proglog
+}:
+
+buildPythonPackage rec {
+  pname = "genome_collector";
+  version = "0.1.6";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "0023ihrz0waxbhq28xh1ymvk51ih882y9psg4glm6s9d1zmqvdph";
+  };
+
+  propagatedBuildInputs = [
+    appdirs
+    biopython
+    proglog
+  ];
+
+  # Project hasn't released the tests yet
+  doCheck = false;
+  pythonImportsCheck = [ "genome_collector" ];
+
+  meta = with lib; {
+    description = "Genomes and build BLAST/Bowtie indexes in Python";
+    homepage = "https://github.com/Edinburgh-Genome-Foundry/genome_collector";
+    license = with licenses; [ mit ];
+    maintainers = with maintainers; [ fab ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index c7dfc66e87d..8912079732a 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -2422,6 +2422,8 @@ in {
 
   genanki = callPackage ../development/python-modules/genanki { };
 
+  genome-collector = callPackage ../development/python-modules/genome-collector { };
+
   genpy = callPackage ../development/python-modules/genpy { };
 
   genshi = callPackage ../development/python-modules/genshi { };

From ec988a139bea0b9cd3a01f5b0d88659606267eda Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sun, 10 Jan 2021 13:56:16 +0100
Subject: [PATCH 06/26] python3Packages.dnachisel: switch to GitHub as source
 and enable tests

---
 .../python-modules/dnachisel/default.nix      | 35 +++++++++++++++----
 1 file changed, 28 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/python-modules/dnachisel/default.nix b/pkgs/development/python-modules/dnachisel/default.nix
index 72d52d82c53..50ba05aca6f 100644
--- a/pkgs/development/python-modules/dnachisel/default.nix
+++ b/pkgs/development/python-modules/dnachisel/default.nix
@@ -1,21 +1,27 @@
 { lib
 , buildPythonPackage
-, fetchPypi
+, fetchFromGitHub
 , biopython
 , docopt
 , flametree
 , numpy
 , proglog
+, pytestCheckHook
 , python-codon-tables
- }:
+, primer3
+, genome-collector
+, matplotlib
+}:
 
 buildPythonPackage rec {
   pname = "dnachisel";
   version = "3.2.6";
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "1i49cfpvjvf9610gg4jz06dl5clc8vmcpjmhnm2d1j7lhpp1ksbb";
+  src = fetchFromGitHub {
+    owner = "Edinburgh-Genome-Foundry";
+    repo = "DnaChisel";
+    rev = "v${version}";
+    sha256 = "0m88biw7sycjwsmncdybj9n3yf4n9cyvifv9zv7irm8ha3scchji";
   };
 
   propagatedBuildInputs = [
@@ -27,9 +33,24 @@ buildPythonPackage rec {
     python-codon-tables
   ];
 
-  # no tests in tarball
-  doCheck = false;
+  checkInputs = [
+    primer3
+    genome-collector
+    matplotlib
+    pytestCheckHook
+  ];
 
+  # Disable tests which requires network access
+  disabledTests = [
+    "test_circular_sequence_optimize_with_report"
+    "test_constraints_reports"
+    "test_optimize_with_report"
+    "test_optimize_with_report_no_solution"
+    "test_avoid_blast_matches_with_list"
+    "test_avoid_phage_blast_matches"
+    "test_avoid_matches_with_list"
+    "test_avoid_matches_with_phage"
+   ];
   pythonImportsCheck = [ "dnachisel" ];
 
   meta = with lib; {

From 124bb278229f7d1997a24e15fb2dd977b21e6cc1 Mon Sep 17 00:00:00 2001
From: Florian Klink <flokli@flokli.de>
Date: Mon, 11 Jan 2021 01:14:05 +0100
Subject: [PATCH 07/26] lensfun: update website

Project has moved to GitHub.
---
 pkgs/development/libraries/lensfun/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/lensfun/default.nix b/pkgs/development/libraries/lensfun/default.nix
index addcb5b5a4f..24983d5ce6e 100644
--- a/pkgs/development/libraries/lensfun/default.nix
+++ b/pkgs/development/libraries/lensfun/default.nix
@@ -19,6 +19,6 @@ stdenv.mkDerivation rec {
     maintainers = with maintainers; [ ];
     license = stdenv.lib.licenses.lgpl3;
     description = "An opensource database of photographic lenses and their characteristics";
-    homepage = "http://lensfun.sourceforge.net/";
+    homepage = "https://lensfun.github.io";
   };
 }

From 55ec76d22917ea34d022c6ab00b6184f4230c8df Mon Sep 17 00:00:00 2001
From: Benjamin Staffin <bstaffin@singlestore.com>
Date: Mon, 11 Jan 2021 17:10:48 -0500
Subject: [PATCH 08/26] tmuxPlugins.power-theme: init at 2020-11-18

---
 pkgs/misc/tmux-plugins/default.nix | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/pkgs/misc/tmux-plugins/default.nix b/pkgs/misc/tmux-plugins/default.nix
index e41427d89e5..bee3f26dd6f 100644
--- a/pkgs/misc/tmux-plugins/default.nix
+++ b/pkgs/misc/tmux-plugins/default.nix
@@ -325,6 +325,18 @@ in rec {
     '';
   };
 
+  power-theme = mkDerivation {
+    pluginName = "power";
+    rtpFilePath = "tmux-power.tmux";
+    version = "unstable-2020-11-18";
+    src = pkgs.fetchFromGitHub {
+      owner = "wfxr";
+      repo = "tmux-power";
+      rev = "aec44aa5e00cc39eb71c668b1d73823270058e7d";
+      sha256 = "11nm8cylx10d565g17acy0bj12n6dcbxp71zca2bmg0j1dq859cm";
+    };
+  };
+
   prefix-highlight = mkDerivation {
     pluginName = "prefix-highlight";
     version = "unstable-2020-03-26";

From 8def5f630a29cd4e7d2c124155185132a6fb6b95 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Mon, 11 Jan 2021 23:19:51 +0100
Subject: [PATCH 09/26] python3Packages.pypck: init at 0.7.8

---
 .../python-modules/pypck/default.nix          | 45 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 +
 2 files changed, 47 insertions(+)
 create mode 100644 pkgs/development/python-modules/pypck/default.nix

diff --git a/pkgs/development/python-modules/pypck/default.nix b/pkgs/development/python-modules/pypck/default.nix
new file mode 100644
index 00000000000..f8e6cc96aff
--- /dev/null
+++ b/pkgs/development/python-modules/pypck/default.nix
@@ -0,0 +1,45 @@
+{ lib
+, buildPythonPackage
+, fetchFromGitHub
+, pytest-asyncio
+, pytest-cov
+, pytest-timeout
+, pytestCheckHook
+, pythonOlder
+, stdenv
+}:
+
+buildPythonPackage rec {
+  pname = "pypck";
+  version = "0.7.8";
+  disabled = pythonOlder "3.8";
+
+  src = fetchFromGitHub {
+    owner = "alengwenus";
+    repo = pname;
+    rev = version;
+    sha256 = "06yqyqpzpypid27z31prvsp7nzpjqzn7gjlfqwjhhxl8fdgh8hkr";
+  };
+
+  checkInputs = [
+    pytest-asyncio
+    pytest-cov
+    pytest-timeout
+    pytestCheckHook
+  ];
+
+  disabledTests = lib.optionals stdenv.isDarwin [
+    "test_connection_lost"
+  ];
+
+  __darwinAllowLocalNetworking = true;
+
+  pythonImportsCheck = [ "pypck" ];
+
+  meta = with lib; {
+    description = "LCN-PCK library written in Python";
+    homepage = "https://github.com/alengwenus/pypck";
+    license = with licenses; [ epl20 ];
+    maintainers = with maintainers; [ fab ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 8b5f6ec0d60..e63cf04b1fd 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -5565,6 +5565,8 @@ in {
 
   pypcap = callPackage ../development/python-modules/pypcap { };
 
+  pypck = callPackage ../development/python-modules/pypck { };
+
   pypdf2 = callPackage ../development/python-modules/pypdf2 { };
 
   pyPdf = callPackage ../development/python-modules/pypdf { };

From 461c9adaa62f99f9e27a3f2e9d278f304760ef79 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Mon, 11 Jan 2021 23:20:17 +0100
Subject: [PATCH 10/26] home-assistant: update component-packages

---
 pkgs/servers/home-assistant/component-packages.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix
index c961ffe538c..528b6927b88 100644
--- a/pkgs/servers/home-assistant/component-packages.nix
+++ b/pkgs/servers/home-assistant/component-packages.nix
@@ -428,7 +428,7 @@
     "lannouncer" = ps: with ps; [ ];
     "lastfm" = ps: with ps; [ pylast ];
     "launch_library" = ps: with ps; [ ]; # missing inputs: pylaunches
-    "lcn" = ps: with ps; [ ]; # missing inputs: pypck
+    "lcn" = ps: with ps; [ pypck ];
     "lg_netcast" = ps: with ps; [ ]; # missing inputs: pylgnetcast-homeassistant
     "lg_soundbar" = ps: with ps; [ ]; # missing inputs: temescal
     "life360" = ps: with ps; [ ]; # missing inputs: life360

From 54c18a3ae4e22af71441be0852968ed15e373bf9 Mon Sep 17 00:00:00 2001
From: Jonathan Ringer <jonringer117@gmail.com>
Date: Mon, 11 Jan 2021 18:28:12 -0800
Subject: [PATCH 11/26] python3Packages.strictyaml: 1.1.1 -> 1.3.0

---
 pkgs/development/python-modules/strictyaml/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/strictyaml/default.nix b/pkgs/development/python-modules/strictyaml/default.nix
index ee18a6ca6b2..8f383b60b17 100644
--- a/pkgs/development/python-modules/strictyaml/default.nix
+++ b/pkgs/development/python-modules/strictyaml/default.nix
@@ -7,13 +7,13 @@
 }:
 
 buildPythonPackage rec {
-  version = "1.1.1";
+  version = "1.3.0";
   pname = "strictyaml";
   disabled = isPy27;
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "ea2bb97aacc12fff7df11bd4cb4ae64b1418a0311fbd1611445cc59dc650bdd3";
+    sha256 = "f640ae4e6fe761c3ae7138092c3dcb9b5050ec56e9cbac45d8a6b549d7ec973c";
   };
 
   propagatedBuildInputs = [ ruamel_yaml python-dateutil ];

From b3daf3ebc5b815faaa4ac30a3e601a137919c767 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 12 Jan 2021 05:52:09 +0000
Subject: [PATCH 12/26] tmuxp: 1.6.3 -> 1.7.0

---
 pkgs/tools/misc/tmuxp/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/misc/tmuxp/default.nix b/pkgs/tools/misc/tmuxp/default.nix
index 839ee5b2082..940ae130c84 100644
--- a/pkgs/tools/misc/tmuxp/default.nix
+++ b/pkgs/tools/misc/tmuxp/default.nix
@@ -4,11 +4,11 @@ with python.pkgs;
 
 buildPythonApplication rec {
   pname = "tmuxp";
-  version = "1.6.3";
+  version = "1.7.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "4bc52d6683235307c92ddbb164c84e3e892ee2d00afa16ed89eca0fa7f85029e";
+    sha256 = "e5135d07a8944170e39ea8b96b09123c54648cca94537b4953d8f15e5a537da2";
   };
 
   postPatch = ''

From 0a72c763b61ce87e33328b5897a7a56a357eea5f Mon Sep 17 00:00:00 2001
From: Gaute Ravndal <gaute.ravndal@gmail.com>
Date: Tue, 12 Jan 2021 07:35:37 +0100
Subject: [PATCH 13/26] python3Packages.google-api-python-client: add missing
 dependency

---
 .../python-modules/google-api-python-client/default.nix   | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/google-api-python-client/default.nix b/pkgs/development/python-modules/google-api-python-client/default.nix
index 2f6508c062f..854ec37a1e4 100644
--- a/pkgs/development/python-modules/google-api-python-client/default.nix
+++ b/pkgs/development/python-modules/google-api-python-client/default.nix
@@ -1,6 +1,6 @@
 { lib, buildPythonPackage, fetchPypi
 , google-auth, google-auth-httplib2, google-api-core
-, httplib2, six, uritemplate, oauth2client }:
+, httplib2, six, uritemplate, oauth2client, setuptools }:
 
 buildPythonPackage rec {
   pname = "google-api-python-client";
@@ -16,7 +16,11 @@ buildPythonPackage rec {
 
   propagatedBuildInputs = [
     google-auth google-auth-httplib2 google-api-core
-    httplib2 six uritemplate oauth2client
+    httplib2 six uritemplate oauth2client setuptools
+  ];
+
+  pythonImportsCheck = [
+    "googleapiclient"
   ];
 
   meta = with lib; {

From 488c4cf2e50fad49efd9602196e9fa34fac895c1 Mon Sep 17 00:00:00 2001
From: Pavol Rusnak <pavol@rusnak.io>
Date: Sun, 10 Jan 2021 13:06:36 +0100
Subject: [PATCH 14/26] electrs: init at 0.8.6

---
 pkgs/applications/blockchains/electrs.nix | 30 +++++++++++++++++++++++
 pkgs/top-level/all-packages.nix           |  2 ++
 2 files changed, 32 insertions(+)
 create mode 100644 pkgs/applications/blockchains/electrs.nix

diff --git a/pkgs/applications/blockchains/electrs.nix b/pkgs/applications/blockchains/electrs.nix
new file mode 100644
index 00000000000..0b0da5913ab
--- /dev/null
+++ b/pkgs/applications/blockchains/electrs.nix
@@ -0,0 +1,30 @@
+{ lib
+, rustPlatform
+, fetchFromGitHub
+, llvmPackages
+}:
+
+rustPlatform.buildRustPackage rec {
+  pname = "electrs";
+  version = "0.8.6";
+
+  src = fetchFromGitHub {
+    owner = "romanz";
+    repo = pname;
+    rev = "v${version}";
+    sha256 = "0nnblxz4xr8k083wy3whx8qxqmdzbxsh5gd91161mrnvidganvgb";
+  };
+
+  # needed for librocksdb-sys
+  nativeBuildInputs = [ llvmPackages.clang ];
+  LIBCLANG_PATH = "${llvmPackages.libclang}/lib";
+
+  cargoSha256 = "11xwjcfc3kqjyp94qzmyb26xwynf4f1q3ac3rp7l7qq1njly07gr";
+
+  meta = with lib; {
+    description = "An efficient re-implementation of Electrum Server in Rust";
+    homepage = "https://github.com/romanz/electrs";
+    license = licenses.mit;
+    maintainers = with maintainers; [ prusnak ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 5cf5f776cad..4a1e5797be6 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -25766,6 +25766,8 @@ in
   dogecoin  = callPackage ../applications/blockchains/dogecoin.nix { boost = boost165; withGui = true; };
   dogecoind = callPackage ../applications/blockchains/dogecoin.nix { boost = boost165; withGui = false; };
 
+  electrs = callPackage ../applications/blockchains/electrs.nix { };
+
   ergo = callPackage ../applications/blockchains/ergo { };
 
   exodus = callPackage ../applications/blockchains/exodus { };

From 8c1d575ce479dea79eeefd804825d6884b16ba5c Mon Sep 17 00:00:00 2001
From: Florian Klink <flokli@flokli.de>
Date: Mon, 11 Jan 2021 01:14:34 +0100
Subject: [PATCH 15/26] lensfun: fetchFromGitHub, s/pkgconfig/pkg-config/

---
 pkgs/development/libraries/lensfun/default.nix | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/libraries/lensfun/default.nix b/pkgs/development/libraries/lensfun/default.nix
index 24983d5ce6e..b39f281c1bf 100644
--- a/pkgs/development/libraries/lensfun/default.nix
+++ b/pkgs/development/libraries/lensfun/default.nix
@@ -1,15 +1,20 @@
-{ stdenv, fetchurl, pkgconfig, glib, zlib, libpng, cmake }:
+{ stdenv, fetchFromGitHub, pkg-config, glib, zlib, libpng, cmake }:
 
-stdenv.mkDerivation rec {
+let
   version = "0.3.95";
   pname = "lensfun";
+in
+stdenv.mkDerivation {
+  inherit pname version;
 
-  src = fetchurl {
-    url = "mirror://sourceforge/lensfun/${version}/${pname}-${version}.tar.gz";
-    sha256 = "0218f3xrlln0jmh4gcf1zbpvi2bidgl3b2mblf6c810n7j1rrhl2";
+  src = fetchFromGitHub {
+    owner = "lensfun";
+    repo = "lensfun";
+    rev = "v${version}";
+    sha256 = "0isli0arns8bmxqpbr1jnbnqh5wvspixdi51adm671f9ngng7x5r";
   };
 
-  nativeBuildInputs = [ cmake pkgconfig ];
+  nativeBuildInputs = [ cmake pkg-config ];
   buildInputs = [ glib zlib libpng ];
 
   configureFlags = [ "-v" ];

From 77a64e88d7993643d74012830cedc387d57a8d5d Mon Sep 17 00:00:00 2001
From: Florian Klink <flokli@flokli.de>
Date: Mon, 11 Jan 2021 01:15:14 +0100
Subject: [PATCH 16/26] lensfun: add flokli as maintainer

---
 pkgs/development/libraries/lensfun/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/lensfun/default.nix b/pkgs/development/libraries/lensfun/default.nix
index b39f281c1bf..1f22f64f057 100644
--- a/pkgs/development/libraries/lensfun/default.nix
+++ b/pkgs/development/libraries/lensfun/default.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation {
 
   meta = with stdenv.lib; {
     platforms = platforms.linux ++ platforms.darwin;
-    maintainers = with maintainers; [ ];
+    maintainers = with maintainers; [ flokli ];
     license = stdenv.lib.licenses.lgpl3;
     description = "An opensource database of photographic lenses and their characteristics";
     homepage = "https://lensfun.github.io";

From c939d8f1999d0452aca081939f5a9ff743e31ec7 Mon Sep 17 00:00:00 2001
From: Florian Klink <flokli@flokli.de>
Date: Mon, 11 Jan 2021 01:19:15 +0100
Subject: [PATCH 17/26] lensfun: don't install helper scripts

The `[g-]lensfun-update-data` binaries can't really work on NixOS (as
the database is immutable), and most other scripts seem to require the
lensfun python bindings (which aren't installed either).

Let's disable installing the helper scripts for now.
---
 pkgs/development/libraries/lensfun/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/lensfun/default.nix b/pkgs/development/libraries/lensfun/default.nix
index 1f22f64f057..c27a2c4daa7 100644
--- a/pkgs/development/libraries/lensfun/default.nix
+++ b/pkgs/development/libraries/lensfun/default.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation {
   nativeBuildInputs = [ cmake pkg-config ];
   buildInputs = [ glib zlib libpng ];
 
-  configureFlags = [ "-v" ];
+  cmakeFlags = [ "-DINSTALL_HELPER_SCRIPTS=OFF" ];
 
   meta = with stdenv.lib; {
     platforms = platforms.linux ++ platforms.darwin;

From 9137be6daa6274f8fcd1a362ab75cf777375c09d Mon Sep 17 00:00:00 2001
From: Florian Klink <flokli@flokli.de>
Date: Mon, 11 Jan 2021 01:29:50 +0100
Subject: [PATCH 18/26] lensfun: update database to a more recent snapshot

lensfun hasn't had a new release since quite some time, and the database
updater doesn't work in NixOS
(https://github.com/NixOS/nixpkgs/issues/99009).

This replaces the database with a more recent snapshot during build,
thus adding support for more recent camera models/lenses (as reported in
https://github.com/NixOS/nixpkgs/issues/107304)
---
 pkgs/development/libraries/lensfun/default.nix | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/pkgs/development/libraries/lensfun/default.nix b/pkgs/development/libraries/lensfun/default.nix
index c27a2c4daa7..e9e8d3447b9 100644
--- a/pkgs/development/libraries/lensfun/default.nix
+++ b/pkgs/development/libraries/lensfun/default.nix
@@ -3,6 +3,16 @@
 let
   version = "0.3.95";
   pname = "lensfun";
+
+  # Fetch a more recent version of the repo containing a more recent lens
+  # database
+  lensfunDatabase = fetchFromGitHub {
+    owner = "lensfun";
+    repo = "lensfun";
+    rev = "4672d765a17bfef7bc994ca7008cb717c61045d5";
+    sha256 = "00x35xhpn55j7f8qzakb6wl1ccbljg1gqjb93jl9w3mha2bzsr41";
+  };
+
 in
 stdenv.mkDerivation {
   inherit pname version;
@@ -14,6 +24,12 @@ stdenv.mkDerivation {
     sha256 = "0isli0arns8bmxqpbr1jnbnqh5wvspixdi51adm671f9ngng7x5r";
   };
 
+  # replace database with a more recent snapshot
+  postUnpack = ''
+    rm -R source/data/db
+    cp -R ${lensfunDatabase}/data/db source/data
+  '';
+
   nativeBuildInputs = [ cmake pkg-config ];
   buildInputs = [ glib zlib libpng ];
 

From cefafbb75e14c918387d5badbebcdddb302866cc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Tue, 12 Jan 2021 14:29:03 -0300
Subject: [PATCH 19/26] matcha-gtk-theme: 2020-12-07 -> 2021-01-12

---
 pkgs/data/themes/matcha/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/data/themes/matcha/default.nix b/pkgs/data/themes/matcha/default.nix
index e0d706d2b0b..f7f139a9ea9 100644
--- a/pkgs/data/themes/matcha/default.nix
+++ b/pkgs/data/themes/matcha/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "matcha-gtk-theme";
-  version = "2020-12-07";
+  version = "2021-01-12";
 
   src = fetchFromGitHub {
     owner = "vinceliuice";
     repo = pname;
     rev = version;
-    sha256 = "0ch05nz1hipi9fz4sx1pah61jkbjw2gz3binsqayhp76jmp344a1";
+    sha256 = "1h6y89aajygbp1rc3d5dw2vgb64a3hiajlifb4xnzhycc77vjskr";
   };
 
   buildInputs = [ gdk-pixbuf librsvg ];
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
   meta = with lib; {
     description = "A stylish flat Design theme for GTK based desktop environments";
     homepage = "https://vinceliuice.github.io/theme-matcha";
-    license = licenses.gpl3;
+    license = licenses.gpl3Only;
     platforms = platforms.unix;
     maintainers = [ maintainers.romildo ];
   };

From ced009c2a0c4ae43ec194e4d393b3a05bd5dc97e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Tue, 12 Jan 2021 14:42:40 -0300
Subject: [PATCH 20/26] greybird: 3.22.13 -> 3.22.14

---
 pkgs/data/themes/greybird/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/data/themes/greybird/default.nix b/pkgs/data/themes/greybird/default.nix
index 1af0230d569..987df8deaf4 100644
--- a/pkgs/data/themes/greybird/default.nix
+++ b/pkgs/data/themes/greybird/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "greybird";
-  version = "3.22.13";
+  version = "3.22.14";
 
   src = fetchFromGitHub {
     owner = "shimmerproject";
     repo = pname;
     rev = "v${version}";
-    sha256 = "154qawiga792iimkpk3a6q8f4gm4r158wmsagkbqqbhj33kxgxhg";
+    sha256 = "0b0axzrvdsv7aa029idz4rs1jm6df4ff3v4j4d5wf4yiypb48js9";
   };
 
   nativeBuildInputs = [

From c249d03341cf5bcb837e03c2f0f4d22accc63f72 Mon Sep 17 00:00:00 2001
From: Dmitry Ivankov <divanorama@gmail.com>
Date: Tue, 12 Jan 2021 19:06:36 +0100
Subject: [PATCH 21/26] mycrypto: 1.7.12 -> 1.7.13

---
 pkgs/applications/blockchains/mycrypto/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/blockchains/mycrypto/default.nix b/pkgs/applications/blockchains/mycrypto/default.nix
index 77e603e8380..b884f044efe 100644
--- a/pkgs/applications/blockchains/mycrypto/default.nix
+++ b/pkgs/applications/blockchains/mycrypto/default.nix
@@ -4,8 +4,8 @@
 
 let
   pname = "MyCrypto";
-  version = "1.7.12";
-  sha256 = "0zmdmkli9zxygrcvrd4lbi0xqyq32dqlkxby8lsjknj1nd6l26n3";
+  version = "1.7.13";
+  sha256 = "15m21n68lxnz6fxwf1bb3cxg5qi6nrwcnqymiw8s9wizvv575vj7";
   name = "${pname}-${version}";
 
   src = fetchurl {

From d7e7eb3fb63b27f11d879a6cdfeec1a088ddf56a Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 12 Jan 2021 19:29:39 +0100
Subject: [PATCH 22/26] python3Packages.rpyc: 4.1.3 -> 5.0.1

---
 pkgs/development/python-modules/rpyc/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/rpyc/default.nix b/pkgs/development/python-modules/rpyc/default.nix
index acd52c22d1b..2a80a7457ca 100644
--- a/pkgs/development/python-modules/rpyc/default.nix
+++ b/pkgs/development/python-modules/rpyc/default.nix
@@ -7,13 +7,13 @@
 
 buildPythonPackage rec {
   pname = "rpyc";
-  version = "4.1.3";
+  version = "5.0.1";
 
   src = fetchFromGitHub {
     owner = "tomerfiliba";
     repo = pname;
     rev = version;
-    sha256 = "145mi8p37x9cbfm5117g4ng7b5rmghjjwgm319qqhwgzvqg3y4j9";
+    sha256 = "1g75k4valfjgab00xri4pf8c8bb2zxkhgkpyy44fjk7s5j66daa1";
   };
 
   propagatedBuildInputs = [ plumbum ];

From 253e48bb86da99e9406d0338bf596626b81177d8 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 12 Jan 2021 19:33:02 +0100
Subject: [PATCH 23/26] python3Packages.rpyc: update check part

---
 .../python-modules/rpyc/default.nix           | 21 ++++++++++++-------
 1 file changed, 13 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/python-modules/rpyc/default.nix b/pkgs/development/python-modules/rpyc/default.nix
index 2a80a7457ca..a18b298acca 100644
--- a/pkgs/development/python-modules/rpyc/default.nix
+++ b/pkgs/development/python-modules/rpyc/default.nix
@@ -1,8 +1,9 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchFromGitHub
 , nose
 , plumbum
+, pytestCheckHook
 }:
 
 buildPythonPackage rec {
@@ -18,17 +19,21 @@ buildPythonPackage rec {
 
   propagatedBuildInputs = [ plumbum ];
 
-  checkInputs = [ nose ];
-  checkPhase = ''
-    cd tests
-    # some tests have added complexities and some tests attempt network use
-    nosetests -I test_deploy -I test_gevent_server -I test_ssh -I test_registry
-  '';
+  checkInputs = [ pytestCheckHook ];
+
+  # Disable tests that requires network access
+  disabledTests = [
+    "test_api"
+    "test_pruning"
+    "test_rpyc"
+  ];
+  pythonImportsCheck = [ "rpyc" ];
 
   meta = with lib; {
     description = "Remote Python Call (RPyC), a transparent and symmetric RPC library";
     homepage = "https://rpyc.readthedocs.org";
     license = licenses.mit;
   };
-
 }
+    license = with licenses; [ mit ];
+    maintainers = with maintainers; [ fab ];
\ No newline at end of file

From 368a2d854f59ce057501188239500353470fb800 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 12 Jan 2021 19:35:40 +0100
Subject: [PATCH 24/26] python3Packages.rpyc: update meta

---
 pkgs/development/python-modules/rpyc/default.nix | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/rpyc/default.nix b/pkgs/development/python-modules/rpyc/default.nix
index a18b298acca..e549a00c894 100644
--- a/pkgs/development/python-modules/rpyc/default.nix
+++ b/pkgs/development/python-modules/rpyc/default.nix
@@ -32,8 +32,7 @@ buildPythonPackage rec {
   meta = with lib; {
     description = "Remote Python Call (RPyC), a transparent and symmetric RPC library";
     homepage = "https://rpyc.readthedocs.org";
-    license = licenses.mit;
+    license = with licenses; [ mit ];
+    maintainers = with maintainers; [ fab ];
   };
 }
-    license = with licenses; [ mit ];
-    maintainers = with maintainers; [ fab ];
\ No newline at end of file

From 213286bb181c9b6588bb5c4fa130301cefc90dd0 Mon Sep 17 00:00:00 2001
From: Milan <me@pbb.lc>
Date: Tue, 12 Jan 2021 20:17:11 +0100
Subject: [PATCH 25/26] mindustry: fix desktop item (#109121)

- make pre- and post-{build,install} phases usable for the main derivation
- replace uses of stdenv.lib with just lib
- specify which buildInputs are only needed for the client
---
 pkgs/games/mindustry/default.nix | 24 ++++++++++++++----------
 1 file changed, 14 insertions(+), 10 deletions(-)

diff --git a/pkgs/games/mindustry/default.nix b/pkgs/games/mindustry/default.nix
index 6cf3941fb08..b9969b84fb7 100644
--- a/pkgs/games/mindustry/default.nix
+++ b/pkgs/games/mindustry/default.nix
@@ -102,10 +102,6 @@ let
     popd
   '';
 
-  preBuild = ''
-    export GRADLE_USER_HOME=$(mktemp -d)
-  '';
-
   # The default one still uses jdk8 (#89731)
   gradle_6 = (gradleGen.override (old: { java = jdk; })).gradle_6_7;
 
@@ -119,8 +115,9 @@ let
     # Here we download dependencies for both the server and the client so
     # we only have to specify one hash for 'deps'. Deps can be garbage
     # collected after the build, so this is not really an issue.
-    buildPhase = preBuild + ''
+    buildPhase = ''
       pushd Mindustry
+      export GRADLE_USER_HOME=$(mktemp -d)
       gradle --no-daemon resolveDependencies
       popd
     '';
@@ -136,7 +133,7 @@ let
   };
 
 in
-assert stdenv.lib.assertMsg (enableClient || enableServer)
+assert lib.assertMsg (enableClient || enableServer)
   "mindustry: at least one of 'enableClient' and 'enableServer' must be true";
 stdenv.mkDerivation rec {
   inherit pname version unpackPhase patches;
@@ -147,7 +144,7 @@ stdenv.mkDerivation rec {
     rm Arc/backends/backend-sdl/libs/linux64/libsdl-arc*.so
   '' + cleanupMindustrySrc;
 
-  buildInputs = [
+  buildInputs = lib.optionals enableClient [
     SDL2
     glew
     alsaLib
@@ -157,13 +154,16 @@ stdenv.mkDerivation rec {
     gradle_6
     makeWrapper
     jdk
+  ] ++ lib.optionals enableClient [
     ant
     copyDesktopItems
   ];
 
-  desktopItems = [ desktopItem ];
+  desktopItems = lib.optional enableClient desktopItem;
+
+  buildPhase = with lib; ''
+    export GRADLE_USER_HOME=$(mktemp -d)
 
-  buildPhase = with stdenv.lib; preBuild + ''
     # point to offline repo
     sed -ie "s#mavenLocal()#mavenLocal(); maven { url '${deps}' }#g" Mindustry/build.gradle
     sed -ie "s#mavenCentral()#mavenCentral(); maven { url '${deps}' }#g" Arc/build.gradle
@@ -180,7 +180,9 @@ stdenv.mkDerivation rec {
     gradle --offline --no-daemon server:dist -Pbuildversion=${buildVersion}
   '';
 
-  installPhase = with stdenv.lib; optionalString enableClient ''
+  installPhase = with lib; ''
+    runHook preInstall
+  '' + optionalString enableClient ''
     install -Dm644 desktop/build/libs/Mindustry.jar $out/share/mindustry.jar
     mkdir -p $out/bin
     makeWrapper ${jdk}/bin/java $out/bin/mindustry \
@@ -191,6 +193,8 @@ stdenv.mkDerivation rec {
     mkdir -p $out/bin
     makeWrapper ${jdk}/bin/java $out/bin/mindustry-server \
       --add-flags "-jar $out/share/mindustry-server.jar"
+  '' + ''
+    runHook postInstall
   '';
 
   meta = with lib; {

From c79031acf86abe7a5f22a0407e0e57eb043ffccf Mon Sep 17 00:00:00 2001
From: Ryan Horiguchi <ryan.horiguchi@gmail.com>
Date: Mon, 11 Jan 2021 14:03:02 +0100
Subject: [PATCH 26/26] vscode-extensions.alexdima.copy-relative-path: init at
 0.0.2

---
 pkgs/misc/vscode-extensions/default.nix | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/pkgs/misc/vscode-extensions/default.nix b/pkgs/misc/vscode-extensions/default.nix
index 4c644643658..2e78a92c18a 100644
--- a/pkgs/misc/vscode-extensions/default.nix
+++ b/pkgs/misc/vscode-extensions/default.nix
@@ -36,6 +36,18 @@ let
         };
       };
 
+      alexdima.copy-relative-path = buildVscodeMarketplaceExtension {
+        mktplcRef = {
+          name = "copy-relative-path";
+          publisher = "alexdima";
+          version = "0.0.2";
+          sha256 = "06g601n9d6wyyiz659w60phgm011gn9jj5fy0gf5wpi2bljk3vcn";
+        };
+        meta = {
+          license = lib.licenses.mit;
+        };
+      };
+
       ms-python.vscode-pylance = buildVscodeMarketplaceExtension {
         mktplcRef = {
           name = "vscode-pylance";