diff --git a/nixos/modules/services/monitoring/dd-agent/dd-agent-defaults.nix b/nixos/modules/services/monitoring/dd-agent/dd-agent-defaults.nix deleted file mode 100644 index 045128197421..000000000000 --- a/nixos/modules/services/monitoring/dd-agent/dd-agent-defaults.nix +++ /dev/null @@ -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" -] diff --git a/nixos/modules/services/monitoring/dd-agent/dd-agent.nix b/nixos/modules/services/monitoring/dd-agent/dd-agent.nix index 8d3d4f2065ec..e55faed8e078 100644 --- a/nixos/modules/services/monitoring/dd-agent/dd-agent.nix +++ b/nixos/modules/services/monitoring/dd-agent/dd-agent.nix @@ -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; diff --git a/nixos/modules/services/monitoring/dd-agent/update-dd-agent-defaults b/nixos/modules/services/monitoring/dd-agent/update-dd-agent-defaults deleted file mode 100755 index 76724173171a..000000000000 --- a/nixos/modules/services/monitoring/dd-agent/update-dd-agent-defaults +++ /dev/null @@ -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 diff --git a/pkgs/applications/misc/electrum/default.nix b/pkgs/applications/misc/electrum/default.nix index a2d39f2d486b..14c6c18f91c3 100644 --- a/pkgs/applications/misc/electrum/default.nix +++ b/pkgs/applications/misc/electrum/default.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; [ diff --git a/pkgs/applications/misc/taskwarrior/default.nix b/pkgs/applications/misc/taskwarrior/default.nix index e4938b928dab..841e0a494e48 100644 --- a/pkgs/applications/misc/taskwarrior/default.nix +++ b/pkgs/applications/misc/taskwarrior/default.nix @@ -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; { diff --git a/pkgs/applications/networking/dropbox/default.nix b/pkgs/applications/networking/dropbox/default.nix index b894322062f7..9c68253cf422 100644 --- a/pkgs/applications/networking/dropbox/default.nix +++ b/pkgs/applications/networking/dropbox/default.nix @@ -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 = diff --git a/pkgs/development/python-modules/Nikola/default.nix b/pkgs/development/python-modules/Nikola/default.nix index 503e655e65a1..762c43d93c09 100644 --- a/pkgs/development/python-modules/Nikola/default.nix +++ b/pkgs/development/python-modules/Nikola/default.nix @@ -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 = { diff --git a/pkgs/development/python-modules/appdirs/default.nix b/pkgs/development/python-modules/appdirs/default.nix new file mode 100644 index 000000000000..211d51c241d7 --- /dev/null +++ b/pkgs/development/python-modules/appdirs/default.nix @@ -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; + }; +} diff --git a/pkgs/development/python-modules/bootstrapped-pip/default.nix b/pkgs/development/python-modules/bootstrapped-pip/default.nix index 7c992921e948..cdc77249cb80 100644 --- a/pkgs/development/python-modules/bootstrapped-pip/default.nix +++ b/pkgs/development/python-modules/bootstrapped-pip/default.nix @@ -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"; }; diff --git a/pkgs/development/python-modules/edward/default.nix b/pkgs/development/python-modules/edward/default.nix index ab7391595dc0..4d78acf78deb 100644 --- a/pkgs/development/python-modules/edward/default.nix +++ b/pkgs/development/python-modules/edward/default.nix @@ -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: diff --git a/pkgs/development/python-modules/flask-migrate/default.nix b/pkgs/development/python-modules/flask-migrate/default.nix index 26fbed4ca5e3..3e2c7ac4602c 100644 --- a/pkgs/development/python-modules/flask-migrate/default.nix +++ b/pkgs/development/python-modules/flask-migrate/default.nix @@ -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; diff --git a/pkgs/development/python-modules/guessit/default.nix b/pkgs/development/python-modules/guessit/default.nix index 7cf051b89a6d..cc5c954b645d 100644 --- a/pkgs/development/python-modules/guessit/default.nix +++ b/pkgs/development/python-modules/guessit/default.nix @@ -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. diff --git a/pkgs/development/python-modules/hypothesis.nix b/pkgs/development/python-modules/hypothesis.nix index cb0db6dc2e0c..51887b83e7c8 100644 --- a/pkgs/development/python-modules/hypothesis.nix +++ b/pkgs/development/python-modules/hypothesis.nix @@ -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 ]; diff --git a/pkgs/development/python-modules/ldap.nix b/pkgs/development/python-modules/ldap.nix index ff4d1445f774..b583a2ae2d82 100644 --- a/pkgs/development/python-modules/ldap.nix +++ b/pkgs/development/python-modules/ldap.nix @@ -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. diff --git a/pkgs/development/python-modules/multidict/default.nix b/pkgs/development/python-modules/multidict/default.nix index 1031e81c5e3b..faece73e172f 100644 --- a/pkgs/development/python-modules/multidict/default.nix +++ b/pkgs/development/python-modules/multidict/default.nix @@ -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 ]; diff --git a/pkgs/development/python-modules/netcdf4.nix b/pkgs/development/python-modules/netcdf4.nix index b50bcae033c6..b123921a1cea 100644 --- a/pkgs/development/python-modules/netcdf4.nix +++ b/pkgs/development/python-modules/netcdf4.nix @@ -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 = [ diff --git a/pkgs/development/python-modules/plotly/default.nix b/pkgs/development/python-modules/plotly/default.nix index 6e5627a58ca8..4c78ac63d30a 100644 --- a/pkgs/development/python-modules/plotly/default.nix +++ b/pkgs/development/python-modules/plotly/default.nix @@ -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 = [ diff --git a/pkgs/development/python-modules/pyroute2/default.nix b/pkgs/development/python-modules/pyroute2/default.nix index 5d2e1855f040..757933bd6b6e 100644 --- a/pkgs/development/python-modules/pyroute2/default.nix +++ b/pkgs/development/python-modules/pyroute2/default.nix @@ -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 diff --git a/pkgs/development/python-modules/ropper/default.nix b/pkgs/development/python-modules/ropper/default.nix new file mode 100644 index 000000000000..37369b8f0bde --- /dev/null +++ b/pkgs/development/python-modules/ropper/default.nix @@ -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 ]; + }; +} diff --git a/pkgs/development/python-modules/setuptools/default.nix b/pkgs/development/python-modules/setuptools/default.nix index 63e05736d796..59fe5f148399 100644 --- a/pkgs/development/python-modules/setuptools/default.nix +++ b/pkgs/development/python-modules/setuptools/default.nix @@ -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; }; diff --git a/pkgs/development/python-modules/vcrpy/default.nix b/pkgs/development/python-modules/vcrpy/default.nix index 953c77fb492a..9387c7de792b 100644 --- a/pkgs/development/python-modules/vcrpy/default.nix +++ b/pkgs/development/python-modules/vcrpy/default.nix @@ -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 = [ diff --git a/pkgs/development/python-modules/wheel/default.nix b/pkgs/development/python-modules/wheel/default.nix new file mode 100644 index 000000000000..5574a800b5b7 --- /dev/null +++ b/pkgs/development/python-modules/wheel/default.nix @@ -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/; + }; +} diff --git a/pkgs/development/tools/build-managers/pants/default.nix b/pkgs/development/tools/build-managers/pants/default.nix index f37c2502be6e..1e37a3f85e24 100644 --- a/pkgs/development/tools/build-managers/pants/default.nix +++ b/pkgs/development/tools/build-managers/pants/default.nix @@ -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 = '' diff --git a/pkgs/development/tools/misc/cgdb/default.nix b/pkgs/development/tools/misc/cgdb/default.nix index b9a517f671fc..bd0e769a0fde 100644 --- a/pkgs/development/tools/misc/cgdb/default.nix +++ b/pkgs/development/tools/misc/cgdb/default.nix @@ -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 ]; diff --git a/pkgs/games/instead-launcher/default.nix b/pkgs/games/instead-launcher/default.nix index 6515db9dab32..39324843e5e5 100644 --- a/pkgs/games/instead-launcher/default.nix +++ b/pkgs/games/instead-launcher/default.nix @@ -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 ]; diff --git a/pkgs/games/instead/default.nix b/pkgs/games/instead/default.nix index e3fd6ccb2f7c..a0bb45746f72 100644 --- a/pkgs/games/instead/default.nix +++ b/pkgs/games/instead/default.nix @@ -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"; diff --git a/pkgs/tools/backup/restic/default.nix b/pkgs/tools/backup/restic/default.nix index 928212906679..742c1cafc933 100644 --- a/pkgs/tools/backup/restic/default.nix +++ b/pkgs/tools/backup/restic/default.nix @@ -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 = '' diff --git a/pkgs/tools/bluetooth/blueman/default.nix b/pkgs/tools/bluetooth/blueman/default.nix index 0c298aa1f218..db0c2c26d3c9 100644 --- a/pkgs/tools/bluetooth/blueman/default.nix +++ b/pkgs/tools/bluetooth/blueman/default.nix @@ -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; { diff --git a/pkgs/tools/nagstamon/default.nix b/pkgs/tools/nagstamon/default.nix new file mode 100644 index 000000000000..3163b78437ec --- /dev/null +++ b/pkgs/tools/nagstamon/default.nix @@ -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; + }; +} diff --git a/pkgs/tools/networking/dd-agent/default.nix b/pkgs/tools/networking/dd-agent/default.nix index d1171a3c8355..2556287570fd 100644 --- a/pkgs/tools/networking/dd-agent/default.nix +++ b/pkgs/tools/networking/dd-agent/default.nix @@ -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 <>$out/share/bash-completion/completions/osc <