Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: efbeb74d0d1b
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 2e6aacb05620
Choose a head ref
  • 2 commits
  • 3 files changed
  • 1 contributor

Commits on Mar 24, 2018

  1. python.pkgs.pygtail: init at 0.8.0

    @globin
    globin committed Mar 24, 2018

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    suvash Suvash Thapaliya
    GPG key ID: BB8D4E7B4156AAA6
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    6a286fc View commit details

  2. python.pkgs.logster: 7475c53822 -> 1.0.1

    @globin
    globin committed Mar 24, 2018
    Copy the full SHA
    2e6aacb View commit details
Showing with 50 additions and 9 deletions.
  1. +21 −0 pkgs/development/python-modules/logster/default.nix
  2. +25 −0 pkgs/development/python-modules/pygtail/default.nix
  3. +4 −9 pkgs/top-level/python-packages.nix
21 changes: 21 additions & 0 deletions pkgs/development/python-modules/logster/default.nix
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
{ lib, buildPythonPackage, fetchFromGitHub, pygtail }:

buildPythonPackage rec {
pname = "logster";
version = "1.0.1";

src = fetchFromGitHub {
owner = "etsy";
repo = pname;
rev = version;
sha256 = "06ac5hydas24h2cn8l5i69v1z0min5hwh6a1lcm1b08xnvpsi85q";
};

propagatedBuildInputs = [ pygtail ];

meta = with lib; {
description = "Parses log files, generates metrics for Graphite and Ganglia";
license = licenses.gpl3Plus;
homepage = https://github.com/etsy/logster;
};
}
25 changes: 25 additions & 0 deletions pkgs/development/python-modules/pygtail/default.nix
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
{ lib, buildPythonPackage, fetchFromGitHub }:

buildPythonPackage rec {
pname = "pygtail";
version = "0.8.0";

src = fetchFromGitHub {
owner = "bgreenlee";
repo = pname;
rev = version;
sha256 = "1f8qlijiwn10jxg1bsi6q42fznbg8rw039yaxfh6rzbaj2gaxbz1";
};

# remove at next bump, tag is one commit early for 0.8.0
postPatch = ''
substituteInPlace pygtail/core.py \
--replace 0.7.0 0.8.0
'';

meta = with lib; {
description = "A library for reading log file lines that have not been read";
license = licenses.gpl2Plus;
homepage = https://github.com/bgreenlee/pygtail;
};
}
13 changes: 4 additions & 9 deletions pkgs/top-level/python-packages.nix
View file
Original file line number Diff line number Diff line change
@@ -267,6 +267,8 @@ in {

lmtpd = callPackage ../development/python-modules/lmtpd { };

logster = callPackage ../development/python-modules/logster { };

mpi4py = callPackage ../development/python-modules/mpi4py {
mpi = pkgs.openmpi;
};
@@ -339,6 +341,8 @@ in {

pygobject3 = callPackage ../development/python-modules/pygobject/3.nix { };

pygtail = callPackage ../development/python-modules/pygtail { };

pygtk = callPackage ../development/python-modules/pygtk { libglade = null; };

pygtksourceview = callPackage ../development/python-modules/pygtksourceview { };
@@ -5423,15 +5427,6 @@ in {

natsort = callPackage ../development/python-modules/natsort { };

logster = buildPythonPackage {
name = "logster-7475c53822";
src = pkgs.fetchgit {
url = git://github.com/etsy/logster;
rev = "7475c53822";
sha256 = "0565wxxiwksnly8rakb2r77k7lwzniq16kv861qd2ns9hgsjgy31";
};
};

ncclient = callPackage ../development/python-modules/ncclient {};

logfury = callPackage ../development/python-modules/logfury { };