sync

pkgs/beets-originquery/default.nix

@@ -1,35 +1,35 @@
-{ python3Packages
-, fetchFromGitHub
-, beets
-, lib
-}:
-
-with python3Packages;
-buildPythonPackage rec {
-  pname = "beets-originquery";
-  version = "unstable-2022-03-11";
-
-  src = fetchFromGitHub {
-    owner = "x1ppy";
-    repo = "beets-originquery";
-    rev = "c353e2b68804cb4dabca0f0f177cee1137888ca4";
-    hash = "sha256-vNROKZgCoWtoou9B8hpJwl4Yf6TzQU0TbKJUd94v7vk=";
-  };
-
-  nativeBuildInputs = [
-    beets
-    setuptools-scm
-  ];
-
-  propagatedBuildInputs = [ jsonpath_rw ];
-
-  # There's no test
-  doCheck = false;
-
-  pythonImportsCheck = [ "beetsplug.originquery" ];
-
-  meta = {
-    description = "Plugin for beets that improves album matching";
-    homepage = "https://github.com/x1ppy/beets-originquery";
-  };
-}
+{
+  python3Packages,
+  fetchFromGitHub,
+  beets,
+  lib,
+}:
+with python3Packages;
+  buildPythonPackage rec {
+    pname = "beets-originquery";
+    version = "unstable-2022-03-11";
+
+    src = fetchFromGitHub {
+      owner = "x1ppy";
+      repo = "beets-originquery";
+      rev = "c353e2b68804cb4dabca0f0f177cee1137888ca4";
+      hash = "sha256-vNROKZgCoWtoou9B8hpJwl4Yf6TzQU0TbKJUd94v7vk=";
+    };
+
+    nativeBuildInputs = [
+      beets
+      setuptools-scm
+    ];
+
+    propagatedBuildInputs = [jsonpath_rw];
+
+    # There's no test
+    doCheck = false;
+
+    pythonImportsCheck = ["beetsplug.originquery"];
+
+    meta = {
+      description = "Plugin for beets that improves album matching";
+      homepage = "https://github.com/x1ppy/beets-originquery";
+    };
+  }

pkgs/default.nix

@@ -4,4 +4,5 @@
   # example = pkgs.callPackage ./example { };
   npiperelay = pkgs.callPackage ./npiperelay {};
   beets-originquery = pkgs.callPackage ./beets-originquery {};
+  prometheus-api-client = pkgs.callPackage ./prometheus-api-client {};
 }

pkgs/prometheus-api-client/default.nix

@@ -0,0 +1,31 @@
+{
+  python3Packages,
+  fetchurl,
+  lib,
+}:
+with python3Packages;
+  buildPythonPackage rec {
+    pname = "prometheus-api-client";
+    version = "0.5.4";
+    src = fetchurl {
+      url = "https://pypi.org/packages/source/p/prometheus-api-client/prometheus-api-client-0.5.4.tar.gz";
+      sha256 = "sha256-OFaBB+GCqibyJZn3lCFeo93l7NPvFJRO72FO6qRsm2o=";
+    };
+
+    doCheck = false;
+    pythonImportsCheck = ["prometheus_api_client"];
+    propagatedBuildInputs = [
+      matplotlib
+      numpy
+      pandas
+      requests
+      dateparser
+      httmock
+    ];
+
+    meta = with lib; {
+      description = "A python wrapper for the prometheus http api";
+      homepage = "https://github.com/4n4nd/prometheus-api-client-python";
+      licence = licences.mit;
+    };
+  }

pkgs/python/prometheus-api-client/default.nix

@@ -1,35 +0,0 @@
-{ lib, python3, pkgs, callPackage, fetchurl,python3Packages, ... }:
-
-let
-    pname = "prometheus-api-client";
-    version = "0.5.4";
-    src = fetchurl {
-      url = "https://pypi.org/packages/source/p/prometheus-api-client/prometheus-api-client-0.5.4.tar.gz";
-      sha256 = "sha256-OFaBB+GCqibyJZn3lCFeo93l7NPvFJRO72FO6qRsm2o=";
-    };
-
-in
-
-python3.pkgs.buildPythonPackage {
-  pname = pname;
-  version = version;
-  src = src;
-
-
-  doCheck = false;
-
-  propagatedBuildInputs = with pkgs.python3Packages; [ 
-    matplotlib
-    numpy
-    pandas
-    requests
-    dateparser
-    httmock
-  ];
-
-  meta = with lib; {
-    description = "A python wrapper for the prometheus http api";
-    homepage = "https://github.com/4n4nd/prometheus-api-client-python";
-    licence = licences.mit;
-  };
-}