mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-28 01:43:15 +00:00
Merge remote-tracking branch 'upstream/master' into HEAD
This commit is contained in:
Frederik Rietdijk
commit
2f129026a7
@ -1,8 +0,0 @@
|
||||
# Generated using update-dd-agent-default, please re-run after updating dd-agent. DO NOT EDIT MANUALLY.
|
||||
[
|
||||
"auto_conf"
|
||||
"agent_metrics.yaml.default"
|
||||
"disk.yaml.default"
|
||||
"network.yaml.default"
|
||||
"ntp.yaml.default"
|
||||
]
|
||||
@ -16,100 +16,24 @@ let
|
||||
forwarder_log_file: /var/log/datadog/forwarder.log
|
||||
dogstatsd_log_file: /var/log/datadog/dogstatsd.log
|
||||
pup_log_file: /var/log/datadog/pup.log
|
||||
|
||||
# proxy_host: my-proxy.com
|
||||
# proxy_port: 3128
|
||||
# proxy_user: user
|
||||
# proxy_password: password
|
||||
|
||||
# tags: mytag0, mytag1
|
||||
${optionalString (cfg.tags != null ) "tags: ${concatStringsSep "," cfg.tags }"}
|
||||
|
||||
# collect_ec2_tags: no
|
||||
# recent_point_threshold: 30
|
||||
# use_mount: no
|
||||
# listen_port: 17123
|
||||
# graphite_listen_port: 17124
|
||||
# non_local_traffic: no
|
||||
# use_curl_http_client: False
|
||||
# bind_host: localhost
|
||||
|
||||
# use_pup: no
|
||||
# pup_port: 17125
|
||||
# pup_interface: localhost
|
||||
# pup_url: http://localhost:17125
|
||||
|
||||
# dogstatsd_port : 8125
|
||||
# dogstatsd_interval : 10
|
||||
# dogstatsd_normalize : yes
|
||||
# statsd_forward_host: address_of_own_statsd_server
|
||||
# statsd_forward_port: 8125
|
||||
|
||||
# device_blacklist_re: .*\/dev\/mapper\/lxc-box.*
|
||||
|
||||
# ganglia_host: localhost
|
||||
# ganglia_port: 8651
|
||||
${cfg.extraDdConfig}
|
||||
'';
|
||||
|
||||
diskConfig = pkgs.writeText "disk.yaml" ''
|
||||
init_config:
|
||||
|
||||
instances:
|
||||
- use_mount: no
|
||||
'';
|
||||
|
||||
networkConfig = pkgs.writeText "network.yaml" ''
|
||||
init_config:
|
||||
|
||||
instances:
|
||||
# Network check only supports one configured instance
|
||||
- collect_connection_state: false
|
||||
excluded_interfaces:
|
||||
- lo
|
||||
- lo0
|
||||
'';
|
||||
|
||||
postgresqlConfig = pkgs.writeText "postgres.yaml" cfg.postgresqlConfig;
|
||||
nginxConfig = pkgs.writeText "nginx.yaml" cfg.nginxConfig;
|
||||
mongoConfig = pkgs.writeText "mongo.yaml" cfg.mongoConfig;
|
||||
jmxConfig = pkgs.writeText "jmx.yaml" cfg.jmxConfig;
|
||||
processConfig = pkgs.writeText "process.yaml" cfg.processConfig;
|
||||
|
||||
etcfiles =
|
||||
let
|
||||
defaultConfd = import ./dd-agent-defaults.nix;
|
||||
in (map (f: { source = "${pkgs.dd-agent}/agent/conf.d-system/${f}";
|
||||
target = "dd-agent/conf.d/${f}";
|
||||
}) defaultConfd) ++ [
|
||||
{ source = ddConf;
|
||||
target = "dd-agent/datadog.conf";
|
||||
}
|
||||
{ source = diskConfig;
|
||||
target = "dd-agent/conf.d/disk.yaml";
|
||||
}
|
||||
{ source = networkConfig;
|
||||
target = "dd-agent/conf.d/network.yaml";
|
||||
} ] ++
|
||||
(optional (cfg.postgresqlConfig != null)
|
||||
{ source = postgresqlConfig;
|
||||
target = "dd-agent/conf.d/postgres.yaml";
|
||||
}) ++
|
||||
(optional (cfg.nginxConfig != null)
|
||||
{ source = nginxConfig;
|
||||
target = "dd-agent/conf.d/nginx.yaml";
|
||||
}) ++
|
||||
(optional (cfg.mongoConfig != null)
|
||||
{ source = mongoConfig;
|
||||
target = "dd-agent/conf.d/mongo.yaml";
|
||||
}) ++
|
||||
(optional (cfg.processConfig != null)
|
||||
{ source = processConfig;
|
||||
target = "dd-agent/conf.d/process.yaml";
|
||||
}) ++
|
||||
(optional (cfg.jmxConfig != null)
|
||||
{ source = jmxConfig;
|
||||
target = "dd-agent/conf.d/jmx.yaml";
|
||||
});
|
||||
map (i: { source = if builtins.hasAttr "config" i
|
||||
then pkgs.writeText "${i.name}.yaml" i.config
|
||||
else "${pkgs.dd-agent}/agent/conf.d-system/${i.name}.yaml";
|
||||
target = "dd-agent/conf.d/${i.name}.yaml";
|
||||
}
|
||||
) cfg.integrations ++
|
||||
[ { source = ddConf;
|
||||
target = "dd-agent/datadog.conf";
|
||||
}
|
||||
];
|
||||
|
||||
# restart triggers
|
||||
etcSources = map (i: i.source) etcfiles;
|
||||
|
||||
in {
|
||||
options.services.dd-agent = {
|
||||
@ -139,44 +63,46 @@ in {
|
||||
type = types.uniq (types.nullOr types.string);
|
||||
};
|
||||
|
||||
postgresqlConfig = mkOption {
|
||||
description = "Datadog PostgreSQL integration configuration";
|
||||
default = null;
|
||||
type = types.uniq (types.nullOr types.string);
|
||||
agent = mkOption {
|
||||
description = "The dd-agent package to use. Useful when overriding the package.";
|
||||
default = pkgs.dd-agent;
|
||||
type = types.package;
|
||||
};
|
||||
|
||||
nginxConfig = mkOption {
|
||||
description = "Datadog nginx integration configuration";
|
||||
default = null;
|
||||
type = types.uniq (types.nullOr types.string);
|
||||
};
|
||||
|
||||
mongoConfig = mkOption {
|
||||
description = "MongoDB integration configuration";
|
||||
default = null;
|
||||
type = types.uniq (types.nullOr types.string);
|
||||
};
|
||||
|
||||
jmxConfig = mkOption {
|
||||
description = "JMX integration configuration";
|
||||
default = null;
|
||||
type = types.uniq (types.nullOr types.string);
|
||||
};
|
||||
|
||||
processConfig = mkOption {
|
||||
integrations = mkOption {
|
||||
description = ''
|
||||
Process integration configuration
|
||||
|
||||
See http://docs.datadoghq.com/integrations/process/
|
||||
Any integrations to use. Default config used if none
|
||||
specified. It is currently up to the user to make sure that
|
||||
the dd-agent package used has all the dependencies chosen
|
||||
integrations require in scope.
|
||||
'';
|
||||
type = types.listOf (types.attrsOf types.string);
|
||||
default = [];
|
||||
example = ''
|
||||
[ { name = "elastic";
|
||||
config = '''
|
||||
init_config:
|
||||
|
||||
instances:
|
||||
- url: http://localhost:9200
|
||||
''';
|
||||
}
|
||||
{ name = "nginx"; }
|
||||
{ name = "ntp"; }
|
||||
{ name = "network"; }
|
||||
]
|
||||
'';
|
||||
default = null;
|
||||
type = types.uniq (types.nullOr types.string);
|
||||
};
|
||||
|
||||
extraDdConfig = mkOption {
|
||||
description = "Extra settings to append to datadog agent config.";
|
||||
default = "";
|
||||
type = types.string;
|
||||
};
|
||||
};
|
||||
|
||||
config = mkIf cfg.enable {
|
||||
environment.systemPackages = [ pkgs."dd-agent" pkgs.sysstat pkgs.procps ];
|
||||
environment.systemPackages = [ cfg.agent pkgs.sysstat pkgs.procps ];
|
||||
|
||||
users.extraUsers.datadog = {
|
||||
description = "Datadog Agent User";
|
||||
@ -190,7 +116,7 @@ in {
|
||||
|
||||
systemd.services.dd-agent = {
|
||||
description = "Datadog agent monitor";
|
||||
path = [ pkgs."dd-agent" pkgs.python pkgs.sysstat pkgs.procps ];
|
||||
path = [ cfg.agent pkgs.python pkgs.sysstat pkgs.procps ];
|
||||
wantedBy = [ "multi-user.target" ];
|
||||
serviceConfig = {
|
||||
ExecStart = "${pkgs.dd-agent}/bin/dd-agent foreground";
|
||||
@ -199,28 +125,12 @@ in {
|
||||
Restart = "always";
|
||||
RestartSec = 2;
|
||||
};
|
||||
restartTriggers = [ pkgs.dd-agent ddConf diskConfig networkConfig postgresqlConfig nginxConfig mongoConfig jmxConfig processConfig ];
|
||||
restartTriggers = [ pkgs.dd-agent ddConf ] ++ etcSources;
|
||||
};
|
||||
|
||||
systemd.services.dogstatsd = {
|
||||
description = "Datadog statsd";
|
||||
path = [ pkgs."dd-agent" pkgs.python pkgs.procps ];
|
||||
wantedBy = [ "multi-user.target" ];
|
||||
serviceConfig = {
|
||||
ExecStart = "${pkgs.dd-agent}/bin/dogstatsd start";
|
||||
User = "datadog";
|
||||
Group = "datadog";
|
||||
Type = "forking";
|
||||
PIDFile = "/tmp/dogstatsd.pid";
|
||||
Restart = "always";
|
||||
RestartSec = 2;
|
||||
};
|
||||
restartTriggers = [ pkgs.dd-agent ddConf diskConfig networkConfig postgresqlConfig nginxConfig mongoConfig jmxConfig processConfig ];
|
||||
};
|
||||
|
||||
systemd.services.dd-jmxfetch = lib.mkIf (cfg.jmxConfig != null) {
|
||||
systemd.services.dd-jmxfetch = lib.mkIf (builtins.any (i: i.name == "jmx") cfg.integrations) {
|
||||
description = "Datadog JMX Fetcher";
|
||||
path = [ pkgs."dd-agent" pkgs.python pkgs.sysstat pkgs.procps pkgs.jdk ];
|
||||
path = [ cfg.agent pkgs.python pkgs.sysstat pkgs.procps pkgs.jdk ];
|
||||
wantedBy = [ "multi-user.target" ];
|
||||
serviceConfig = {
|
||||
ExecStart = "${pkgs.dd-agent}/bin/dd-jmxfetch";
|
||||
@ -229,7 +139,7 @@ in {
|
||||
Restart = "always";
|
||||
RestartSec = 2;
|
||||
};
|
||||
restartTriggers = [ pkgs.dd-agent ddConf diskConfig networkConfig postgresqlConfig nginxConfig mongoConfig jmxConfig ];
|
||||
restartTriggers = [ cfg.agent ddConf ] ++ etcSources;
|
||||
};
|
||||
|
||||
environment.etc = etcfiles;
|
||||
|
||||
@ -1,9 +0,0 @@
|
||||
#!/usr/bin/env bash
|
||||
dd=$(nix-build --no-out-link -A dd-agent ../../../..)
|
||||
echo '# Generated using update-dd-agent-default, please re-run after updating dd-agent. DO NOT EDIT MANUALLY.' > dd-agent-defaults.nix
|
||||
echo '[' >> dd-agent-defaults.nix
|
||||
echo ' "auto_conf"' >> dd-agent-defaults.nix
|
||||
for f in $(find $dd/agent/conf.d-system -maxdepth 1 -type f | grep -v '\.example' | sort); do
|
||||
echo " \"$(basename $f)\"" >> dd-agent-defaults.nix
|
||||
done
|
||||
echo ']' >> dd-agent-defaults.nix
|
||||
@ -2,11 +2,11 @@
|
||||
|
||||
python2Packages.buildPythonApplication rec {
|
||||
name = "electrum-${version}";
|
||||
version = "2.8.2";
|
||||
version = "2.8.3";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://download.electrum.org/${version}/Electrum-${version}.tar.gz";
|
||||
sha256 = "01xphbi7lx64s9380zjfakz5h8blqmxp0ryqlll7px66qpmjn5fq";
|
||||
sha256 = "04jswalydzwm16iismbq1h2shj17iq9sqm0mz8p98sh3dwkacvn1";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = with python2Packages; [
|
||||
|
||||
@ -16,8 +16,10 @@ stdenv.mkDerivation rec {
|
||||
nativeBuildInputs = [ cmake libuuid gnutls ];
|
||||
|
||||
postInstall = ''
|
||||
mkdir -p "$out/etc/bash_completion.d"
|
||||
ln -s "../../share/doc/task/scripts/bash/task.sh" "$out/etc/bash_completion.d/"
|
||||
mkdir -p "$out/share/bash-completion/completions"
|
||||
ln -s "../../doc/task/scripts/bash/task.sh" "$out/share/bash-completion/completions/"
|
||||
mkdir -p "$out/etc/fish/completions"
|
||||
ln -s "../../../share/doc/task/scripts/fish/task.fish" "$out/etc/fish/completions/"
|
||||
'';
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
|
||||
@ -23,11 +23,11 @@
|
||||
let
|
||||
# NOTE: When updating, please also update in current stable,
|
||||
# as older versions stop working
|
||||
version = "26.4.24";
|
||||
version = "27.4.22";
|
||||
sha256 =
|
||||
{
|
||||
"x86_64-linux" = "1qzz88d3akbqfk1539w2z0ldyjjscqjqgsvadf9i4xr2y0syfv4y";
|
||||
"i686-linux" = "12xwmmycrg56xl88k9pqd7mcn0jqi4jijf36vn4fdjvmn7ksskcw";
|
||||
"x86_64-linux" = "1v1q799dj0bffg3s98ifzpsccjaajl221h5ckaqijlmpzr2q5hhh";
|
||||
"i686-linux" = "1qsw6c0mb0n0djz7xpfixispi9k68kbvf8dc92frpcbcvm0h845y";
|
||||
}."${stdenv.system}" or (throw "system ${stdenv.system} not supported");
|
||||
|
||||
arch =
|
||||
|
||||
@ -30,7 +30,7 @@
|
||||
buildPythonPackage rec {
|
||||
name = "${pname}-${version}";
|
||||
pname = "Nikola";
|
||||
version = "7.8.4";
|
||||
version = "7.8.6";
|
||||
|
||||
# Nix contains only Python 3 supported version of doit, which is a dependency
|
||||
# of Nikola. Python 2 support would require older doit 0.29.0 (which on the
|
||||
@ -47,7 +47,7 @@ buildPythonPackage rec {
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "14pd5zk6l6f58snq9n9zpxwhqcc3xz8b1gz31zsrqajggg1i8fn8";
|
||||
sha256 = "48d3a00c3fc9c61bcd305653a531949bdd777d9211434172549498fd8136e036";
|
||||
};
|
||||
|
||||
meta = {
|
||||
|
||||
21
pkgs/development/python-modules/appdirs/default.nix
Normal file
21
pkgs/development/python-modules/appdirs/default.nix
Normal file
@ -0,0 +1,21 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "appdirs";
|
||||
version = "1.4.3";
|
||||
name = "${pname}-${version}";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "9e5896d1372858f8dd3344faf4e5014d21849c756c8d5701f78f8a103b372d92";
|
||||
};
|
||||
|
||||
meta = {
|
||||
description = "A python module for determining appropriate platform-specific dirs";
|
||||
homepage = http://github.com/ActiveState/appdirs;
|
||||
license = lib.licenses.mit;
|
||||
};
|
||||
}
|
||||
@ -1,24 +1,31 @@
|
||||
{ stdenv, python, fetchurl, makeWrapper, unzip }:
|
||||
{ stdenv, python, fetchPypi, makeWrapper, unzip }:
|
||||
|
||||
let
|
||||
wheel_source = fetchurl {
|
||||
url = "https://pypi.python.org/packages/py2.py3/w/wheel/wheel-0.29.0-py2.py3-none-any.whl";
|
||||
wheel_source = fetchPypi {
|
||||
pname = "wheel";
|
||||
version = "0.29.0";
|
||||
format = "wheel";
|
||||
sha256 = "ea8033fc9905804e652f75474d33410a07404c1a78dd3c949a66863bd1050ebd";
|
||||
};
|
||||
setuptools_source = fetchurl {
|
||||
url = "https://files.pythonhosted.org/packages/b8/cb/b919f52dd81b4b2210d0c5529b6b629a4002e08d49a90183605d1181b10c/setuptools-30.2.0-py2.py3-none-any.whl";
|
||||
sha256 = "b7e7b28d6a728ea38953d66e12ef400c3c153c523539f1b3997c5a42f3770ff1";
|
||||
setuptools_source = fetchPypi {
|
||||
pname = "setuptools";
|
||||
version = "36.0.1";
|
||||
format = "wheel";
|
||||
sha256 = "f2900e560efc479938a219433c48f15a4ff4ecfe575a65de385eeb44f2425587";
|
||||
};
|
||||
argparse_source = fetchurl {
|
||||
url = "https://pypi.python.org/packages/2.7/a/argparse/argparse-1.4.0-py2.py3-none-any.whl";
|
||||
sha256 = "0533cr5w14da8wdb2q4py6aizvbvsdbk3sj7m1jx9lwznvnlf5n3";
|
||||
argparse_source = fetchPypi {
|
||||
pname = "argparse";
|
||||
version = "1.4.0";
|
||||
sha256 = "c31647edb69fd3d465a847ea3157d37bed1f95f19760b11a47aa91c04b666314";
|
||||
};
|
||||
in stdenv.mkDerivation rec {
|
||||
name = "${python.libPrefix}-bootstrapped-pip-${version}";
|
||||
pname = "pip";
|
||||
version = "9.0.1";
|
||||
name = "${python.libPrefix}-bootstrapped-${pname}-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://files.pythonhosted.org/packages/b6/ac/7015eb97dc749283ffdec1c3a88ddb8ae03b8fad0f0e611408f196358da3/pip-9.0.1-py2.py3-none-any.whl";
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
format = "wheel";
|
||||
sha256 = "690b762c0a8460c303c089d5d0be034fb15a5ea2b75bdf565f40421f542fefb0";
|
||||
};
|
||||
|
||||
|
||||
@ -3,14 +3,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "edward";
|
||||
version = "1.3.1";
|
||||
version = "1.3.2";
|
||||
name = "${pname}-${version}";
|
||||
|
||||
disabled = !(isPy27 || pythonAtLeast "3.4");
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "5f868604c4d13ccc054906fae6c0115edf295a81897cc9dc97026bb083d275ae";
|
||||
sha256 = "24aa0bf237965f47dd39d2b2ff43718ba75cb12c471b26ff80a972a66ff32de3";
|
||||
};
|
||||
|
||||
# disabled for now due to Tensorflow trying to create files in $HOME:
|
||||
|
||||
@ -5,12 +5,12 @@ with stdenv.lib;
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "Flask-Migrate";
|
||||
version = "2.0.3";
|
||||
version = "2.0.4";
|
||||
name = "${pname}-${version}";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "107x78lkqsnbg92dld3dkagg07jvchp3ib3y0sivc4ipz6n1y7rk";
|
||||
sha256 = "1e6dc83bed93aef9a4791d5daaa03b186c8ef5d96c99c7d88166da683c86e42d";
|
||||
};
|
||||
|
||||
checkInputs = optional isPy3k glibcLocales;
|
||||
|
||||
@ -9,12 +9,12 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "guessit";
|
||||
version = "2.1.2";
|
||||
version = "2.1.3";
|
||||
name = "${pname}-${version}";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "9f7e12b7f2215548284631a20aae6fc009c8af2bb8cc5d5e5e339cb15361dd95";
|
||||
sha256 = "b2eebbb61e4d2b3764ce4462e0b27da0dccbb25b78e13493a2f913a402e1d0fb";
|
||||
};
|
||||
|
||||
# Tests require more packages.
|
||||
|
||||
@ -9,7 +9,7 @@ buildPythonPackage rec {
|
||||
# pytz fake_factory django numpy pytest
|
||||
# If you need these, you can just add them to your environment.
|
||||
|
||||
version = "3.11.0";
|
||||
version = "3.11.1";
|
||||
pname = "hypothesis";
|
||||
name = "${pname}-${version}";
|
||||
|
||||
@ -18,7 +18,7 @@ buildPythonPackage rec {
|
||||
owner = "HypothesisWorks";
|
||||
repo = "hypothesis-python";
|
||||
rev = "${version}";
|
||||
sha256 = "1s911pd3y9hvk0hq2fr6i68dqv1ciagryhgp13wgyfqh8hz8j6zv";
|
||||
sha256 = "5344cc3327bc7fa543fc3b42e85c55f40dda0eeaec38327f9bf373c3ece42b39";
|
||||
};
|
||||
|
||||
checkInputs = stdenv.lib.optionals doCheck [ pytest pytest_xdist flake8 flaky ];
|
||||
|
||||
@ -3,13 +3,13 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "python-ldap";
|
||||
version = "2.4.38";
|
||||
version = "2.4.39";
|
||||
name = "${pname}-${version}";
|
||||
disabled = isPy3k;
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "88bab69e519dd8bd83becbe36bd141c174b0fe309e84936cf1bae685b31be779";
|
||||
sha256 = "3fb75108d27e8091de80dffa2ba3bf45c7a3bdc357e2959006aed52fa58bb2f3";
|
||||
};
|
||||
|
||||
# Needed by tests to setup a mockup ldap server.
|
||||
|
||||
@ -7,13 +7,13 @@
|
||||
|
||||
let
|
||||
pname = "multidict";
|
||||
version = "2.1.5";
|
||||
version = "2.1.6";
|
||||
in buildPythonPackage rec {
|
||||
name = "${pname}-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://pypi/${builtins.substring 0 1 pname}/${pname}/${name}.tar.gz";
|
||||
sha256 = "20a30a474882ad174eb64873cfa7bae4604944105adf7f6847141bd7938c5ed1";
|
||||
sha256 = "9ec33a1da4d2096949e29ddd66a352aae57fad6b5483087d54566a2f6345ae10";
|
||||
};
|
||||
|
||||
buildInputs = [ pytest ];
|
||||
|
||||
@ -4,13 +4,13 @@
|
||||
buildPythonPackage rec {
|
||||
pname = "netCDF4";
|
||||
name = "${pname}-${version}";
|
||||
version = "1.2.7";
|
||||
version = "1.2.8";
|
||||
|
||||
disabled = isPyPy;
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://pypi/n/netCDF4/${name}.tar.gz";
|
||||
sha256 = "1fllizmnpw0zkzzm4j9pgamarlzfn3kmv9zrm0w65q1y31h9ni0c";
|
||||
sha256 = "31eb4eae5fd3b2bd8f828721142ddcefdbf10287281bf6f636764dd7957f8450";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -10,12 +10,12 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "plotly";
|
||||
version = "2.0.8";
|
||||
version = "2.0.9";
|
||||
name = "${pname}-${version}";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "1zbwx771w6425w4g6l9fhq4x1854fdnni6xq9xhvs8xqgxkrljm5";
|
||||
sha256 = "1b82ec9e09179b5191297b82a3f89f61055b730b09a1821c71fac18e82857e8f";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -2,12 +2,12 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pyroute2";
|
||||
version = "0.4.14";
|
||||
version = "0.4.15";
|
||||
name = "${pname}-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://pypi/p/pyroute2/${name}.tar.gz";
|
||||
sha256 = "eb41cdc5a9e7c017c65c8ff11013fd1b6d6699163bcf469e643cb1799a87d330";
|
||||
sha256 = "273530e78261ac5e9e2985f12fad9e6c4231f8e49b8c285c05a23dcda5afce58";
|
||||
};
|
||||
|
||||
# requires root priviledges
|
||||
|
||||
28
pkgs/development/python-modules/ropper/default.nix
Normal file
28
pkgs/development/python-modules/ropper/default.nix
Normal file
@ -0,0 +1,28 @@
|
||||
{ stdenv
|
||||
, buildPythonApplication
|
||||
, fetchPypi
|
||||
, capstone
|
||||
, filebytes
|
||||
, pytest }:
|
||||
|
||||
buildPythonApplication rec {
|
||||
name = "${pname}-${version}";
|
||||
pname = "ropper";
|
||||
version = "1.10.10";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "1676e07947a19df9d17002307a7555c2647a4224d6f2869949e8fc4bd18f2e87";
|
||||
};
|
||||
checkPhase = ''
|
||||
py.test testcases
|
||||
'';
|
||||
buildInputs = [pytest];
|
||||
propagatedBuildInputs = [ capstone filebytes ];
|
||||
meta = with stdenv.lib; {
|
||||
homepage = "https://scoding.de/ropper/";
|
||||
license = licenses.gpl2;
|
||||
description = "Show information about files in different file formats";
|
||||
maintainers = with maintainers; [ bennofs ];
|
||||
};
|
||||
}
|
||||
@ -1,18 +1,23 @@
|
||||
{ stdenv, lib, fetchurl, python, wrapPython }:
|
||||
{ stdenv
|
||||
, fetchPypi
|
||||
, python
|
||||
, wrapPython
|
||||
, unzip
|
||||
}:
|
||||
|
||||
# Should use buildPythonPackage here somehow
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "setuptools";
|
||||
shortName = "${pname}-${version}";
|
||||
name = "${python.libPrefix}-${shortName}";
|
||||
version = "36.0.1";
|
||||
name = "${python.libPrefix}-${pname}-${version}";
|
||||
|
||||
version = "30.2.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://pypi/${builtins.substring 0 1 pname}/${pname}/${shortName}.tar.gz";
|
||||
sha256 = "f865709919903e3399343c0b3c42f95e9aeddc41e38cfb334fb2bb5dfa384857";
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
extension = "zip";
|
||||
sha256 = "e17c4687fddd6d70a6604ac0ad25e33324cec71b5137267dd5c45e103c4b288a";
|
||||
};
|
||||
|
||||
buildInputs = [ python wrapPython ];
|
||||
buildInputs = [ python wrapPython unzip ];
|
||||
doCheck = false; # requires pytest
|
||||
installPhase = ''
|
||||
dst=$out/${python.sitePackages}
|
||||
@ -27,7 +32,7 @@ stdenv.mkDerivation rec {
|
||||
meta = with stdenv.lib; {
|
||||
description = "Utilities to facilitate the installation of Python packages";
|
||||
homepage = http://pypi.python.org/pypi/setuptools;
|
||||
license = with lib.licenses; [ psfl zpt20 ];
|
||||
license = with licenses; [ psfl zpt20 ];
|
||||
platforms = platforms.all;
|
||||
priority = 10;
|
||||
};
|
||||
|
||||
@ -16,12 +16,12 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "vcrpy";
|
||||
version = "1.11.0";
|
||||
version = "1.11.1";
|
||||
name = "${pname}-${version}";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "beb30de89c3618482ea76662b4135d48fef7417589df49c303b2e85db40c9705";
|
||||
sha256 = "f434fe7e05d940d576ac850709ae57a738ba40e7f317076ea8d359ced5b32320";
|
||||
};
|
||||
|
||||
checkInputs = [
|
||||
|
||||
32
pkgs/development/python-modules/wheel/default.nix
Normal file
32
pkgs/development/python-modules/wheel/default.nix
Normal file
@ -0,0 +1,32 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, pytest
|
||||
, pytestcov
|
||||
, coverage
|
||||
, jsonschema
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "wheel";
|
||||
version = "0.29.0";
|
||||
name = "${pname}-${version}";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "1ebb8ad7e26b448e9caa4773d2357849bf80ff9e313964bcaf79cbf0201a1648";
|
||||
};
|
||||
|
||||
buildInputs = [ pytest pytestcov coverage ];
|
||||
|
||||
propagatedBuildInputs = [ jsonschema ];
|
||||
|
||||
# We add this flag to ignore the copy installed by bootstrapped-pip
|
||||
installFlags = [ "--ignore-installed" ];
|
||||
|
||||
meta = {
|
||||
description = "A built-package format for Python";
|
||||
license = with lib.licenses; [ mit ];
|
||||
homepage = https://bitbucket.org/pypa/wheel/;
|
||||
};
|
||||
}
|
||||
@ -23,16 +23,16 @@ let
|
||||
};
|
||||
};
|
||||
|
||||
pants13-version = "1.3.0rc2";
|
||||
pants13-version = "1.3.0rc4";
|
||||
|
||||
# TODO: compile the rust native engine ourselves so we don't need to do this shit. We don't use
|
||||
# fetchurl because we don't know the URL ahead of time, even though it's deterministic. So we have
|
||||
# this downloader figure out the URL on the fly and then produce the deterministic result, so we
|
||||
# can still be a fixed-output derivation.
|
||||
pants13-native-engine-info = {
|
||||
"x86_64-darwin" = { prefix = "mac/10.11"; hash = "0n8z7rg0yfpxplvcw88lwv733zkhbzhc4w4zd4aznbcmfqdiz5br"; };
|
||||
"x86_64-linux" = { prefix = "linux/x86_64"; hash = "0cva97899q902m61xnfawhbjrh5h751716sn6ljli9b8fl7b5sz4"; };
|
||||
"i686-linux" = { prefix = "linux/i386"; hash = "1qckg0zsdq9x4jhn59pswbs11mxqxryl65qn42hrsvii2yxa9i5k"; };
|
||||
"x86_64-darwin" = { prefix = "mac/10.11"; hash = "04kfqp4fcxj7zkyb21rgp1kdrlnmayfvakpg5xips716d7pp6vc7"; };
|
||||
"x86_64-linux" = { prefix = "linux/x86_64"; hash = "0vgmcqxcabryxgvk4wmbclqjn56jbmsaysckgwfzhmif8pxyrfam"; };
|
||||
"i686-linux" = { prefix = "linux/i386"; hash = "1xgma6cwvzg1d07xq6bd3j4rpzp6wn6lz82xqprr6vflyn78qaaw"; };
|
||||
}.${stdenv.system} or (throw "Unsupported system ${stdenv.system}!");
|
||||
|
||||
pants13-native-engine = runCommand "pants-native-${pants13-version}" {
|
||||
@ -98,7 +98,7 @@ in {
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "1d3i0jwhn94b96b3lwwxd10007hnxw6dw1azmwv3hhwq713gwnpi";
|
||||
sha256 = "03zv3g55x056vjggwjr8lpniixcpb3kfy7xkl1bxsvjp2ih2wj6g";
|
||||
};
|
||||
|
||||
prePatch = ''
|
||||
|
||||
@ -2,11 +2,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "cgdb-${version}";
|
||||
version = "0.6.8";
|
||||
version = "0.7.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://cgdb.me/files/${name}.tar.gz";
|
||||
sha256 = "0hfgyj8jimb7imqlfdpzaln787r6r0yzwzmnk91rfl19pqlkw85y";
|
||||
sha256 = "08slzg3702v5nivjhdx2bciqxc5vqcn8pc4i4lsgkcwdcrj94ymz";
|
||||
};
|
||||
|
||||
buildInputs = [ ncurses readline flex texinfo help2man ];
|
||||
|
||||
@ -3,13 +3,13 @@
|
||||
stdenv.mkDerivation rec {
|
||||
name = "instead-launcher-${version}";
|
||||
|
||||
version = "0.6.3";
|
||||
version = "0.7.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "instead-hub";
|
||||
repo = "instead-launcher";
|
||||
rev = version;
|
||||
sha256 = "1q0hdgfy9pr48zvxr9x614ka6bd0g8sicdk2a673nwfdyd41p9cw";
|
||||
sha256 = "1svy8i8anspway01pnz2cy69aad03anvkq04wrdfv1h9c34gbvb9";
|
||||
};
|
||||
|
||||
patches = [ ./path.patch ];
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
{ stdenv, fetchurl, SDL, SDL_ttf, SDL_image, SDL_mixer, pkgconfig, lua, zlib, unzip }:
|
||||
|
||||
let
|
||||
version = "2.4.1";
|
||||
version = "3.0.0";
|
||||
|
||||
# I took several games at random from http://instead.syscall.ru/games/
|
||||
games = [
|
||||
@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/project/instead/instead/${version}/instead_${version}.tar.gz";
|
||||
sha256 = "1i69b10jfb980d5zhmvh1i789hh982vxiwgqna82b84pdf3y7kgw";
|
||||
sha256 = "14scbb5x36dywak930ry7hwv502jnzc4m5cjkymqn1vz1xkq2m5w";
|
||||
};
|
||||
|
||||
NIX_LDFLAGS = "-llua -lgcc_s";
|
||||
|
||||
@ -2,7 +2,7 @@
|
||||
|
||||
buildGoPackage rec {
|
||||
name = "restic-${version}";
|
||||
version = "0.6.0";
|
||||
version = "0.6.1";
|
||||
|
||||
goPackagePath = "github.com/restic/restic";
|
||||
|
||||
@ -10,7 +10,7 @@ buildGoPackage rec {
|
||||
owner = "restic";
|
||||
repo = "restic";
|
||||
rev = "v${version}";
|
||||
sha256 = "0kjk8fyfmbnh2jayfjq4ggkc99rh02jkv8gvqcpyqnw3dxznwrk2";
|
||||
sha256 = "1rp4s1gh07j06457rhl4r0qnxqn0h7n4i8k50akdr87nwyikkn17";
|
||||
};
|
||||
|
||||
buildPhase = ''
|
||||
|
||||
@ -33,7 +33,8 @@ in stdenv.mkDerivation rec {
|
||||
|
||||
preFixup = ''
|
||||
makeWrapperArgs="--prefix PATH ':' ${binPath}"
|
||||
wrapPythonPrograms
|
||||
wrapPythonProgramsIn "$out/bin" "$pythonPath"
|
||||
wrapPythonProgramsIn "$out/libexec" "$pythonPath"
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
|
||||
25
pkgs/tools/nagstamon/default.nix
Normal file
25
pkgs/tools/nagstamon/default.nix
Normal file
@ -0,0 +1,25 @@
|
||||
{ stdenv, fetchurl, pythonPackages }:
|
||||
|
||||
pythonPackages.buildPythonApplication rec {
|
||||
name = "nagstamon-${version}";
|
||||
version = "2.0.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://nagstamon.ifw-dresden.de/files/stable/Nagstamon-${version}.tar.gz";
|
||||
sha256 = "3d4b22190d47250b175a4a70b12391c694ba2399832320887e5909e1ce3dfd7b";
|
||||
};
|
||||
|
||||
# Test assumes darwin
|
||||
doCheck = false;
|
||||
|
||||
propagatedBuildInputs = with pythonPackages; [ configparser pyqt5 psutil requests
|
||||
beautifulsoup4 ];
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "A status monitor for the desktop";
|
||||
homepage = https://nagstamon.ifw-dresden.de/;
|
||||
license = licenses.gpl2;
|
||||
maintainers = with maintainers; [ pSub ];
|
||||
inherit version;
|
||||
};
|
||||
}
|
||||
@ -1,5 +1,11 @@
|
||||
{ stdenv, fetchFromGitHub, pythonPackages
|
||||
, sysstat, unzip, makeWrapper }:
|
||||
, sysstat, unzip, makeWrapper
|
||||
# We need extraBuildInputs as we want to be able to override this
|
||||
# package with python packages _and_ have the produced binaries
|
||||
# wrapper with their PYTHONPATH. This means overrideAttrs is not
|
||||
# strong enough (it overrides too late), we need to call it
|
||||
# beforehand.
|
||||
, extraBuildInputs ? [ pythonPackages.psutil ] }:
|
||||
let
|
||||
inherit (pythonPackages) python;
|
||||
docker_1_10 = pythonPackages.buildPythonPackage rec {
|
||||
@ -26,33 +32,42 @@ let
|
||||
# due to flake8
|
||||
doCheck = false;
|
||||
};
|
||||
version = "5.13.2";
|
||||
|
||||
integrations = fetchFromGitHub {
|
||||
owner = "datadog";
|
||||
repo = "integrations-core";
|
||||
rev = version;
|
||||
sha256 = "1nbjmkq0wdfndmx0qap69h2rkwkkb0632j87h9d3j99bykyav3y3";
|
||||
};
|
||||
|
||||
in stdenv.mkDerivation rec {
|
||||
version = "5.11.2";
|
||||
name = "dd-agent-${version}";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "datadog";
|
||||
repo = "dd-agent";
|
||||
rev = version;
|
||||
sha256 = "1iqxvgpsqibqw3vk79158l2pnb6y4pjhjp2d6724lm5rpz4825lx";
|
||||
sha256 = "0x2bxi70l2yf0wi232qksvcscjdpjg8l7dmgg1286vqryyfazfjb";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
python
|
||||
unzip
|
||||
makeWrapper
|
||||
pythonPackages.requests
|
||||
pythonPackages.psycopg2
|
||||
pythonPackages.psutil
|
||||
pythonPackages.ntplib
|
||||
pythonPackages.simplejson
|
||||
pythonPackages.pyyaml
|
||||
pythonPackages.pymongo_2_9_1
|
||||
pythonPackages.python-etcd
|
||||
pythonPackages.consul
|
||||
pythonPackages.boto
|
||||
docker_1_10
|
||||
];
|
||||
pythonPackages.kazoo
|
||||
pythonPackages.ntplib
|
||||
pythonPackages.consul
|
||||
pythonPackages.python-etcd
|
||||
pythonPackages.pyyaml
|
||||
pythonPackages.requests
|
||||
pythonPackages.simplejson
|
||||
pythonPackages.supervisor
|
||||
pythonPackages.tornado
|
||||
pythonPackages.uptime
|
||||
] ++ extraBuildInputs;
|
||||
propagatedBuildInputs = with pythonPackages; [ python tornado ];
|
||||
|
||||
buildCommand = ''
|
||||
@ -67,6 +82,24 @@ in stdenv.mkDerivation rec {
|
||||
# Move out default conf.d so that /etc/dd-agent/conf.d is used
|
||||
mv $out/agent/conf.d $out/agent/conf.d-system
|
||||
|
||||
# Sometime between 5.11.2 and 5.13.2 datadog moved out all its
|
||||
# checks into separate repository. Copy them back in so dd-agent
|
||||
# service can easily pick and choose by copying out configs into
|
||||
# its etc files.
|
||||
mkdir -p $out/agent/checks.d
|
||||
for i in ${toString integrations}/* # */
|
||||
do
|
||||
if [ -f "$i/check.py" ]; then
|
||||
if [ -f "$i/conf.yaml.default" -o -f "$i/conf.yaml.example" ]; then
|
||||
local name=$(basename $i)
|
||||
cp $i/check.py $out/agent/checks.d/$name.py
|
||||
# Copy .default file first unless it doesn't exist then copy .default
|
||||
cp $i/conf.yaml.default $out/agent/conf.d-system/$name.yaml &> /dev/null || \
|
||||
cp $i/conf.yaml.example $out/agent/conf.d-system/$name.yaml
|
||||
fi
|
||||
fi
|
||||
done
|
||||
|
||||
cat > $out/bin/dd-jmxfetch <<EOF
|
||||
#!/usr/bin/env bash
|
||||
exec ${python}/bin/python $out/agent/jmxfetch.py $@
|
||||
|
||||
55
pkgs/tools/security/kwalletcli/default.nix
Normal file
55
pkgs/tools/security/kwalletcli/default.nix
Normal file
@ -0,0 +1,55 @@
|
||||
{
|
||||
kdeDerivation, kdeWrapper, fetchurl, lib,
|
||||
pkgconfig,
|
||||
kcoreaddons, ki18n, kwallet,
|
||||
mksh
|
||||
}:
|
||||
|
||||
let
|
||||
pname = "kwalletcli";
|
||||
version = "3.00";
|
||||
|
||||
unwrapped = kdeDerivation rec {
|
||||
name = "${pname}-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://www.mirbsd.org/MirOS/dist/hosted/kwalletcli/${name}.tar.gz";
|
||||
sha256 = "1q87nm7pkmgvkrml6hgbmv0ddx3871w7x86gn90sjc3vw59qfh98";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace GNUmakefile \
|
||||
--replace '-I/usr/include/KF5/KCoreAddons' '-I${kcoreaddons.dev}/include/KF5/KCoreAddons' \
|
||||
--replace '-I/usr/include/KF5/KI18n' '-I${ki18n.dev}/include/KF5/KI18n' \
|
||||
--replace '-I/usr/include/KF5/KWallet' '-I${kwallet.dev}/include/KF5/KWallet' \
|
||||
--replace /usr/bin $out/bin \
|
||||
--replace /usr/share/man $out/share/man
|
||||
'';
|
||||
|
||||
makeFlags = [ "KDE_VER=5" ];
|
||||
|
||||
# we need this when building against qt 5.8+
|
||||
NIX_CFLAGS_COMPILE = [ "-std=c++11" ];
|
||||
|
||||
nativeBuildInputs = [ pkgconfig ];
|
||||
# if using just kwallet, cmake will be added as a buildInput and fail the build
|
||||
propagatedBuildInputs = [ kcoreaddons ki18n (lib.getLib kwallet) ];
|
||||
|
||||
preInstall = ''
|
||||
mkdir -p $out/bin $out/share/man/man1
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Command-Line Interface to the KDE Wallet";
|
||||
homepage = http://www.mirbsd.org/kwalletcli.htm;
|
||||
license = licenses.miros;
|
||||
maintainers = with maintainers; [ peterhoeg ];
|
||||
};
|
||||
};
|
||||
|
||||
in kdeWrapper {
|
||||
inherit unwrapped;
|
||||
targets = map (b: "bin/" + b)
|
||||
[ "kwalletaskpass" "kwalletcli" "kwalletcli_getpin" "pinentry-kwallet" ];
|
||||
paths = [ mksh ];
|
||||
}
|
||||
@ -2634,6 +2634,8 @@ with pkgs;
|
||||
|
||||
kdiff3 = libsForQt5.callPackage ../tools/text/kdiff3 { };
|
||||
|
||||
kwalletcli = libsForQt5.callPackage ../tools/security/kwalletcli { };
|
||||
|
||||
peruse = libsForQt5.callPackage ../tools/misc/peruse { };
|
||||
|
||||
kst = libsForQt5.callPackage ../tools/graphics/kst { gsl = gsl_1; };
|
||||
@ -2716,6 +2718,10 @@ with pkgs;
|
||||
|
||||
mxt-app = callPackage ../misc/mxt-app { };
|
||||
|
||||
nagstamon = callPackage ../tools/nagstamon {
|
||||
pythonPackages = python3Packages;
|
||||
};
|
||||
|
||||
netdata = callPackage ../tools/system/netdata { };
|
||||
|
||||
netsurf = recurseIntoAttrs (let callPackage = newScope pkgs.netsurf; in rec {
|
||||
|
||||
@ -3800,17 +3800,16 @@ let self = _self // overrides; _self = with self; {
|
||||
};
|
||||
|
||||
DBIxClassSchemaLoader = buildPerlPackage rec {
|
||||
name = "DBIx-Class-Schema-Loader-0.07045";
|
||||
name = "DBIx-Class-Schema-Loader-0.07047";
|
||||
src = fetchurl {
|
||||
url = "mirror://cpan/authors/id/I/IL/ILMARI/${name}.tar.gz";
|
||||
sha256 = "b132c667aa7dfe6f054e097c3e572a7dbf8ad433500f085e372740d5bc23a440";
|
||||
sha256 = "6671fb3afbb1b4f3eb5905f34fb47ce18b29af3e055e479b06c09424bbc1421b";
|
||||
};
|
||||
buildInputs = [ ConfigAny ConfigGeneral DBDSQLite DBIxClassIntrospectableM2M Moose MooseXMarkAsMethods MooseXNonMoose TestDeep TestDifferences TestException TestPod TestWarn namespaceautoclean ];
|
||||
propagatedBuildInputs = [ CarpClan ClassAccessorGrouped ClassC3Componentised ClassInspector ClassUnload DBIxClass DataDump HashMerge LinguaENInflectNumber LinguaENInflectPhrase LinguaENTagger MROCompat ScalarListUtils ScopeGuard StringCamelCase StringToIdentifierEN TryTiny namespaceclean ];
|
||||
meta = {
|
||||
description = "Create a DBIx::Class::Schema based on a database";
|
||||
license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
|
||||
maintainers = [ maintainers.rycee ];
|
||||
};
|
||||
};
|
||||
|
||||
|
||||
@ -1002,20 +1002,7 @@ in {
|
||||
};
|
||||
};
|
||||
|
||||
appdirs = buildPythonPackage rec {
|
||||
name = "appdirs-1.4.0";
|
||||
|
||||
src = pkgs.fetchurl {
|
||||
url = "mirror://pypi/a/appdirs/appdirs-1.4.0.tar.gz";
|
||||
sha256 = "8fc245efb4387a4e3e0ac8ebcc704582df7d72ff6a42a53f5600bbb18fdaadc5";
|
||||
};
|
||||
|
||||
meta = {
|
||||
description = "A python module for determining appropriate platform-specific dirs";
|
||||
homepage = http://github.com/ActiveState/appdirs;
|
||||
license = licenses.mit;
|
||||
};
|
||||
};
|
||||
appdirs = callPackage ../development/python-modules/appdirs { };
|
||||
|
||||
application = buildPythonPackage rec {
|
||||
pname = "python-application";
|
||||
@ -1287,36 +1274,8 @@ in {
|
||||
|
||||
};
|
||||
|
||||
argparse = buildPythonPackage (rec {
|
||||
name = "argparse-1.4.0";
|
||||
|
||||
src = pkgs.fetchurl {
|
||||
url = "mirror://pypi/a/argparse/${name}.tar.gz";
|
||||
sha256 = "1r6nznp64j68ih1k537wms7h57nvppq0szmwsaf99n71bfjqkc32";
|
||||
};
|
||||
|
||||
checkPhase = ''
|
||||
export PYTHONPATH=`pwd`/build/lib:$PYTHONPATH
|
||||
${python.interpreter} test/test_argparse.py
|
||||
'';
|
||||
|
||||
# ordering issues in tests
|
||||
doCheck = !isPy3k;
|
||||
|
||||
meta = {
|
||||
homepage = http://code.google.com/p/argparse/;
|
||||
license = licenses.asl20;
|
||||
description = "argparse: Python command line parser";
|
||||
longDescription = ''
|
||||
The argparse module makes writing command line tools in Python
|
||||
easy. Just briefly describe your command line interface and
|
||||
argparse will take care of the rest, including: parsing the
|
||||
arguments and flags from sys.argv, converting arg strings into
|
||||
objects for your program, formatting and printing any help
|
||||
messages, and much more.
|
||||
'';
|
||||
};
|
||||
});
|
||||
# argparse is part of stdlib in 2.7 and 3.2+
|
||||
argparse = null;
|
||||
|
||||
astroid = callPackage ../development/python-modules/astroid { };
|
||||
|
||||
@ -16052,18 +16011,19 @@ in {
|
||||
});
|
||||
|
||||
osc = buildPythonPackage {
|
||||
name = "osc-0.156.0-16-g9e6d1a5";
|
||||
name = "osc-0.156.0-94-gd8ba394";
|
||||
disabled = isPy3k;
|
||||
src = pkgs.fetchFromGitHub {
|
||||
owner = "openSUSE";
|
||||
repo = "osc";
|
||||
rev = "64cbb10095cf9ef0270d65fff58085a13bc0abe9";
|
||||
sha256 = "0s5kz5ln96ka0f1sa9nyp34c28mkxkrgcxbvysdawlppg7ay9s1z";
|
||||
rev = "d8ba39416bb193a15489cb2ae57847434adbf1c8";
|
||||
sha256 = "0bxl1sjfpdrhyc0qljyqlkffyzn1iywjqgaz2z1y07zq59gc8wq0";
|
||||
};
|
||||
buildInputs = with pkgs; [ bashInteractive ]; # needed for bash-completion helper
|
||||
propagatedBuildInputs = with self; [ urlgrabber m2crypto pyyaml ];
|
||||
postInstall = ''
|
||||
ln -s $out/bin/osc-wrapper.py $out/bin/osc
|
||||
install -D -m444 osc.fish $out/etc/fish/completions/osc.fish
|
||||
install -D -m555 dist/osc.complete $out/share/bash-completion/helpers/osc-helper
|
||||
mkdir -p $out/share/bash-completion/completions
|
||||
cat >>$out/share/bash-completion/completions/osc <<EOF
|
||||
@ -22008,21 +21968,7 @@ in {
|
||||
};
|
||||
};
|
||||
|
||||
ropper = buildPythonApplication rec {
|
||||
name = "ropper-1.10.10";
|
||||
src = pkgs.fetchurl {
|
||||
url = "mirror://pypi/r/ropper/${name}.tar.gz";
|
||||
sha256 = "1676e07947a19df9d17002307a7555c2647a4224d6f2869949e8fc4bd18f2e87";
|
||||
};
|
||||
propagatedBuildInputs = with self; [ capstone filebytes ];
|
||||
meta = with pkgs.stdenv.lib; {
|
||||
homepage = "https://scoding.de/ropper/";
|
||||
license = licenses.gpl2;
|
||||
description = "Show information about files in different file formats";
|
||||
maintainers = with maintainers; [ bennofs ];
|
||||
};
|
||||
};
|
||||
|
||||
ropper = callPackage ../development/python-modules/ropper { };
|
||||
|
||||
routes = buildPythonPackage rec {
|
||||
name = "routes-1.12.3";
|
||||
@ -25963,28 +25909,7 @@ EOF
|
||||
};
|
||||
};
|
||||
|
||||
wheel = buildPythonPackage rec {
|
||||
name = "wheel-${version}";
|
||||
version = "0.29.0";
|
||||
|
||||
src = pkgs.fetchurl {
|
||||
url = "mirror://pypi/w/wheel/${name}.tar.gz";
|
||||
sha256 = "1ebb8ad7e26b448e9caa4773d2357849bf80ff9e313964bcaf79cbf0201a1648";
|
||||
};
|
||||
|
||||
buildInputs = with self; [ pytest pytestcov coverage ];
|
||||
|
||||
propagatedBuildInputs = with self; [ jsonschema ];
|
||||
|
||||
# We add this flag to ignore the copy installed by bootstrapped-pip
|
||||
installFlags = [ "--ignore-installed" ];
|
||||
|
||||
meta = {
|
||||
description = "A built-package format for Python";
|
||||
license = with licenses; [ mit ];
|
||||
homepage = https://bitbucket.org/pypa/wheel/;
|
||||
};
|
||||
};
|
||||
wheel = callPackage ../development/python-modules/wheel { };
|
||||
|
||||
widgetsnbextension = callPackage ../development/python-modules/widgetsnbextension { };
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user