Skip to content
This repository was archived by the owner on Apr 12, 2021. It is now read-only.
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-channels
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 76c2fb25083f
Choose a base ref
...
head repository: NixOS/nixpkgs-channels
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 7990c3ea401f
Choose a head ref
  • 2 commits
  • 5 files changed
  • 1 contributor

Commits on Apr 18, 2019

  1. datadog-agent: add old version pg8000

    @Izorkin @domenkozar
    Izorkin authored and domenkozar committed Apr 18, 2019
    Copy the full SHA
    3c62672 View commit details

  2. nixos/datadog-agent: change start command (#57871) 

    (cherry picked from commit f56d507)
Signed-off-by: Domen Kožar <domen@dev.si>
    @Izorkin @domenkozar
    Izorkin authored and domenkozar committed Apr 18, 2019

    Verified

    This commit was signed with the committer’s verified signature.
    veprbl Dmitry Kalinkin
    GPG key ID: 5157B3EC8B2CA333
    Verified
    Learn about vigilant mode
    Copy the full SHA
    7990c3e View commit details
2 changes: 1 addition & 1 deletion nixos/modules/services/monitoring/datadog-agent.nix
View file
Original file line number Diff line number Diff line change
@@ -235,7 +235,7 @@ in {
'';
script = ''
export DD_API_KEY=$(head -n 1 ${cfg.apiKeyFile})
exec ${datadogPkg}/bin/agent start -c /etc/datadog-agent/datadog.yaml
exec ${datadogPkg}/bin/agent run -c /etc/datadog-agent/datadog.yaml
'';
serviceConfig.PermissionsStartOnly = true;
};
27 changes: 27 additions & 0 deletions pkgs/development/python-modules/pg8000/1_12.nix
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
{ stdenv
, buildPythonPackage
, fetchPypi
, pytz
, six
}:

buildPythonPackage rec {
pname = "pg8000";
version = "1.12.5";

src = fetchPypi {
inherit pname version;
sha256 = "1yc3knh28cx3rjb2ifg5kmqqa78yyyw2gzzslbm9fj0mzh5aq1sx";
};

propagatedBuildInputs = [ pytz six ];

meta = with stdenv.lib; {
homepage = https://github.com/tlocke/pg8000;
description = "PostgreSQL interface library, for asyncio";
maintainers = with maintainers; [ garbas domenkozar ];
platforms = platforms.unix;
};

}

2 changes: 1 addition & 1 deletion pkgs/development/python-modules/pg8000/default.nix
View file
Original file line number Diff line number Diff line change
@@ -17,7 +17,7 @@ buildPythonPackage rec {
propagatedBuildInputs = [ pytz six ];

meta = with stdenv.lib; {
homepage = https://github.com/mfenniak/pg8000;
homepage = https://github.com/tlocke/pg8000;
description = "PostgreSQL interface library, for asyncio";
maintainers = with maintainers; [ garbas domenkozar ];
platforms = platforms.unix;
2 changes: 1 addition & 1 deletion pkgs/tools/networking/dd-agent/integrations-core.nix
View file
Original file line number Diff line number Diff line change
@@ -75,7 +75,7 @@ let
mongo = (ps: [ ps.pymongo ]);
network = (ps: [ ps.psutil ]);
nginx = (ps: []);
postgres = (ps: with ps; [ pg8000 psycopg2 ]);
postgres = (ps: with ps; [ pg8000_1_12 psycopg2 ]);
};

# All integrations (default + extra):
1 change: 1 addition & 0 deletions pkgs/top-level/python-packages.nix
View file
Original file line number Diff line number Diff line change
@@ -3532,6 +3532,7 @@ in {
periodictable = callPackage ../development/python-modules/periodictable { };

pg8000 = callPackage ../development/python-modules/pg8000 { };
pg8000_1_12 = callPackage ../development/python-modules/pg8000/1_12.nix { };

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