From f017f6926e9e4f80b10288e4059476ed01875db5 Mon Sep 17 00:00:00 2001 From: Matilde Ametrine Date: Sat, 2 Oct 2021 20:22:52 -0400 Subject: [PATCH 1/2] maintainers: add @matilde-ametrine --- maintainers/maintainer-list.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 892f671d3b0d2..cfb179413ea52 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -578,6 +578,16 @@ githubId = 2626481; name = "Ambroz Bizjak"; }; + ametrine = { + name = "Matilde Ametrine"; + email = "matilde@diffyq.xyz"; + github = "matilde-ametrine"; + githubId = 90799677; + keys = [{ + longkeyid = "rsa3072/0x07EE1FFCA58A11C5"; + fingerprint = "7931 EB4E 4712 D7BE 04F8 6D34 07EE 1FFC A58A 11C5"; + }]; + }; amiddelk = { email = "amiddelk@gmail.com"; github = "amiddelk"; From 925e11b83225053f54ee834b649ab85789f035a8 Mon Sep 17 00:00:00 2001 From: Matilde Ametrine Date: Sat, 2 Oct 2021 20:25:43 -0400 Subject: [PATCH 2/2] obspy: init at 1.2.2 --- .../python-modules/obspy/default.nix | 46 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 48 insertions(+) create mode 100644 pkgs/development/python-modules/obspy/default.nix diff --git a/pkgs/development/python-modules/obspy/default.nix b/pkgs/development/python-modules/obspy/default.nix new file mode 100644 index 0000000000000..0f5f2c003da06 --- /dev/null +++ b/pkgs/development/python-modules/obspy/default.nix @@ -0,0 +1,46 @@ +{ lib +, buildPythonPackage +, fetchPypi +, decorator +, future +, lxml +, matplotlib +, numpy +, requests +, scipy +, sqlalchemy +}: + +buildPythonPackage rec { + pname = "obspy"; + version = "1.2.2"; + + src = fetchPypi { + inherit pname version; + extension = "zip"; + sha256 = "a0f2b0915beeb597762563fa0358aa1b4d6b09ffda49909c760b5cdf5bdc419e"; + }; + + propagatedBuildInputs = [ + decorator + future + lxml + matplotlib + numpy + requests + scipy + sqlalchemy + ]; + + # Tests require Internet access. + doCheck = false; + + pythonImportsCheck = [ "obspy" ]; + + meta = with lib; { + description = "Python framework for seismological observatories"; + homepage = "https://www.obspy.org"; + license = licenses.lgpl3; + maintainers = [ maintainers.ametrine ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 686dd8c0f3638..90e1d7e1983f0 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5096,6 +5096,8 @@ in { graphvizPkgs = pkgs.graphviz; }; + obspy = callPackage ../development/python-modules/obspy { }; + oci = callPackage ../development/python-modules/oci { }; ocrmypdf = callPackage ../development/python-modules/ocrmypdf { };