From 95c16b345c1543e71027a4439e051a591e48152d Mon Sep 17 00:00:00 2001 From: sstent Date: Tue, 23 Jan 2024 03:25:08 +0000 Subject: [PATCH] sync --- overlays/default.nix | 12 +++++++++ pkgs/default.nix | 2 -- pkgs/prometheus-api-client/default.nix | 35 -------------------------- 3 files changed, 12 insertions(+), 37 deletions(-) delete mode 100644 pkgs/prometheus-api-client/default.nix diff --git a/overlays/default.nix b/overlays/default.nix index a13ea3c..f566158 100644 --- a/overlays/default.nix +++ b/overlays/default.nix @@ -10,6 +10,18 @@ # example = prev.example.overrideAttrs (oldAttrs: rec { # ... # }); + + pythonPackagesExtensions = prev.pythonPackagesExtensions ++ [ + ( + python-final: python-prev: + { + prometheus-api-client = python-final.callPackage ../pkgs/python/prometheus-api-client { }; + } + ) + ]; + + + }; # When applied, the unstable nixpkgs set (declared in the flake inputs) will diff --git a/pkgs/default.nix b/pkgs/default.nix index 27b42ea..8ba999a 100644 --- a/pkgs/default.nix +++ b/pkgs/default.nix @@ -4,6 +4,4 @@ # example = pkgs.callPackage ./example { }; npiperelay = pkgs.callPackage ./npiperelay {}; beets-originquery = pkgs.callPackage ./beets-originquery {}; - prometheus-api-client = pkgs.callPackage ./prometheus-api-client {}; - } diff --git a/pkgs/prometheus-api-client/default.nix b/pkgs/prometheus-api-client/default.nix deleted file mode 100644 index 3e40086..0000000 --- a/pkgs/prometheus-api-client/default.nix +++ /dev/null @@ -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; - }; -} \ No newline at end of file