diff --git a/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml b/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml index 2ef7f97858de..931361984139 100644 --- a/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml +++ b/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml @@ -461,6 +461,15 @@ available via the hardware.xone module. + + + dd-agent package removed along with the + services.dd-agent module, due to the + project being deprecated in favor of + datadog-agent, which is available via the + services.datadog-agent module. + + virtlyst package and services.virtlyst diff --git a/nixos/doc/manual/release-notes/rl-2211.section.md b/nixos/doc/manual/release-notes/rl-2211.section.md index 438f93140d35..ecebaae0d258 100644 --- a/nixos/doc/manual/release-notes/rl-2211.section.md +++ b/nixos/doc/manual/release-notes/rl-2211.section.md @@ -160,6 +160,8 @@ Available as [services.patroni](options.html#opt-services.patroni.enable). - xow package removed along with the `hardware.xow` module, due to the project being deprecated in favor of `xone`, which is available via the `hardware.xone` module. +- dd-agent package removed along with the `services.dd-agent` module, due to the project being deprecated in favor of `datadog-agent`, which is available via the `services.datadog-agent` module. + - virtlyst package and `services.virtlyst` module removed, due to lack of maintainers. - The `services.graphite.api` and `services.graphite.beacon` NixOS options, and diff --git a/nixos/modules/misc/nixpkgs.nix b/nixos/modules/misc/nixpkgs.nix index 80b8ef591d3a..e8becb6bf8cc 100644 --- a/nixos/modules/misc/nixpkgs.nix +++ b/nixos/modules/misc/nixpkgs.nix @@ -337,7 +337,7 @@ in config = { _module.args = { - pkgs = finalPkgs; + pkgs = finalPkgs.__splicedPackages; }; assertions = [ diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index c102caccaf9d..6fd0bacc5f57 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -669,7 +669,6 @@ ./services/monitoring/collectd.nix ./services/monitoring/das_watchdog.nix ./services/monitoring/datadog-agent.nix - ./services/monitoring/dd-agent/dd-agent.nix ./services/monitoring/do-agent.nix ./services/monitoring/fusion-inventory.nix ./services/monitoring/grafana.nix diff --git a/nixos/modules/rename.nix b/nixos/modules/rename.nix index f86aa2fa5c1b..aef42d0f4db1 100644 --- a/nixos/modules/rename.nix +++ b/nixos/modules/rename.nix @@ -48,6 +48,7 @@ with lib; (mkRemovedOptionModule [ "services" "cgmanager" "enable"] "cgmanager was deprecated by lxc and therefore removed from nixpkgs.") (mkRemovedOptionModule [ "services" "chronos" ] "The corresponding package was removed from nixpkgs.") (mkRemovedOptionModule [ "services" "couchpotato" ] "The corresponding package was removed from nixpkgs.") + (mkRemovedOptionModule [ "services" "dd-agent" ] "dd-agent was removed from nixpkgs in favor of the newer datadog-agent.") (mkRemovedOptionModule [ "services" "deepin" ] "The corresponding packages were removed from nixpkgs.") (mkRemovedOptionModule [ "services" "dnscrypt-proxy" ] "Use services.dnscrypt-proxy2 instead") (mkRemovedOptionModule [ "services" "firefox" "syncserver" ] "The corresponding package was removed from nixpkgs.") diff --git a/nixos/modules/services/logging/vector.nix b/nixos/modules/services/logging/vector.nix index ab5ea887acba..1803ea85e49c 100644 --- a/nixos/modules/services/logging/vector.nix +++ b/nixos/modules/services/logging/vector.nix @@ -44,7 +44,7 @@ in conf = format.generate "vector.toml" cfg.settings; validateConfig = file: pkgs.runCommand "validate-vector-conf" { - nativeBuildInputs = [ pkgs.buildPackages.vector ]; + nativeBuildInputs = [ pkgs.vector ]; } '' vector validate --no-environment "${file}" ln -s "${file}" "$out" 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 deleted file mode 100644 index 8c0070c4853a..000000000000 --- a/nixos/modules/services/monitoring/dd-agent/dd-agent.nix +++ /dev/null @@ -1,236 +0,0 @@ -{ config, lib, pkgs, ... }: - -with lib; - -let - cfg = config.services.dd-agent; - - ddConf = pkgs.writeText "datadog.conf" '' - [Main] - dd_url: https://app.datadoghq.com - skip_ssl_validation: no - api_key: ${cfg.api_key} - ${optionalString (cfg.hostname != null) "hostname: ${cfg.hostname}"} - - collector_log_file: /var/log/datadog/collector.log - 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 - ''; - - 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 - listToAttrs (map (f: { - name = "dd-agent/conf.d/${f}"; - value.source = "${pkgs.dd-agent}/agent/conf.d-system/${f}"; - }) defaultConfd) // - { - "dd-agent/datadog.conf".source = ddConf; - "dd-agent/conf.d/disk.yaml".source = diskConfig; - "dd-agent/conf.d/network.yaml".source = networkConfig; - } // - (optionalAttrs (cfg.postgresqlConfig != null) - { - "dd-agent/conf.d/postgres.yaml".source = postgresqlConfig; - }) // - (optionalAttrs (cfg.nginxConfig != null) - { - "dd-agent/conf.d/nginx.yaml".source = nginxConfig; - }) // - (optionalAttrs (cfg.mongoConfig != null) - { - "dd-agent/conf.d/mongo.yaml".source = mongoConfig; - }) // - (optionalAttrs (cfg.processConfig != null) - { - "dd-agent/conf.d/process.yaml".source = processConfig; - }) // - (optionalAttrs (cfg.jmxConfig != null) - { - "dd-agent/conf.d/jmx.yaml".source = jmxConfig; - }); - -in { - options.services.dd-agent = { - enable = mkOption { - description = lib.mdDoc '' - Whether to enable the dd-agent v5 monitoring service. - For datadog-agent v6, see {option}`services.datadog-agent.enable`. - ''; - default = false; - type = types.bool; - }; - - api_key = mkOption { - description = lib.mdDoc '' - The Datadog API key to associate the agent with your account. - - Warning: this key is stored in cleartext within the world-readable - Nix store! Consider using the new v6 - {option}`services.datadog-agent` module instead. - ''; - example = "ae0aa6a8f08efa988ba0a17578f009ab"; - type = types.str; - }; - - tags = mkOption { - description = lib.mdDoc "The tags to mark this Datadog agent"; - example = [ "test" "service" ]; - default = null; - type = types.nullOr (types.listOf types.str); - }; - - hostname = mkOption { - description = lib.mdDoc "The hostname to show in the Datadog dashboard (optional)"; - default = null; - example = "mymachine.mydomain"; - type = types.nullOr types.str; - }; - - postgresqlConfig = mkOption { - description = lib.mdDoc "Datadog PostgreSQL integration configuration"; - default = null; - type = types.nullOr types.lines; - }; - - nginxConfig = mkOption { - description = lib.mdDoc "Datadog nginx integration configuration"; - default = null; - type = types.nullOr types.lines; - }; - - mongoConfig = mkOption { - description = lib.mdDoc "MongoDB integration configuration"; - default = null; - type = types.nullOr types.lines; - }; - - jmxConfig = mkOption { - description = lib.mdDoc "JMX integration configuration"; - default = null; - type = types.nullOr types.lines; - }; - - processConfig = mkOption { - description = lib.mdDoc '' - Process integration configuration - See - ''; - default = null; - type = types.nullOr types.lines; - }; - - }; - - config = mkIf cfg.enable { - environment.systemPackages = [ pkgs.dd-agent pkgs.sysstat pkgs.procps ]; - - users.users.datadog = { - description = "Datadog Agent User"; - uid = config.ids.uids.datadog; - group = "datadog"; - home = "/var/log/datadog/"; - createHome = true; - }; - - users.groups.datadog.gid = config.ids.gids.datadog; - - systemd.services = let - makeService = attrs: recursiveUpdate { - path = [ pkgs.dd-agent pkgs.python pkgs.sysstat pkgs.procps pkgs.gohai ]; - wantedBy = [ "multi-user.target" ]; - serviceConfig = { - User = "datadog"; - Group = "datadog"; - Restart = "always"; - RestartSec = 2; - PrivateTmp = true; - }; - restartTriggers = [ pkgs.dd-agent ddConf diskConfig networkConfig postgresqlConfig nginxConfig mongoConfig jmxConfig processConfig ]; - } attrs; - in { - dd-agent = makeService { - description = "Datadog agent monitor"; - serviceConfig.ExecStart = "${pkgs.dd-agent}/bin/dd-agent foreground"; - }; - - dogstatsd = makeService { - description = "Datadog statsd"; - environment.TMPDIR = "/run/dogstatsd"; - serviceConfig = { - ExecStart = "${pkgs.dd-agent}/bin/dogstatsd start"; - Type = "forking"; - PIDFile = "/run/dogstatsd/dogstatsd.pid"; - RuntimeDirectory = "dogstatsd"; - }; - }; - - dd-jmxfetch = lib.mkIf (cfg.jmxConfig != null) { - description = "Datadog JMX Fetcher"; - path = [ pkgs.dd-agent pkgs.python pkgs.sysstat pkgs.procps pkgs.jdk ]; - serviceConfig.ExecStart = "${pkgs.dd-agent}/bin/dd-jmxfetch"; - }; - }; - - 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/science/logic/cbmc/default.nix b/pkgs/applications/science/logic/cbmc/default.nix index d05db5db2cc1..cbc47fae37e2 100644 --- a/pkgs/applications/science/logic/cbmc/default.nix +++ b/pkgs/applications/science/logic/cbmc/default.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "cbmc"; - version = "5.65.0"; + version = "5.65.1"; src = fetchFromGitHub { owner = "diffblue"; repo = pname; rev = "${pname}-${version}"; - sha256 = "sha256-A2xMbRblDXyhUXGDVxNBxFbs9npQJpMUBCPAloF33M8="; + sha256 = "sha256-6Cy3yScPl2Ax0N2pmJWJEPXrSlj+F0IAoM5G8rIjbT8="; }; nativeBuildInputs = [ diff --git a/pkgs/development/coq-modules/metacoq/default.nix b/pkgs/development/coq-modules/metacoq/default.nix index 52e10b25c502..268ce247c7d3 100644 --- a/pkgs/development/coq-modules/metacoq/default.nix +++ b/pkgs/development/coq-modules/metacoq/default.nix @@ -12,6 +12,7 @@ let # { case = "8.13"; out = "1.0-beta2-8.13"; } { case = "8.14"; out = "1.0-8.14"; } { case = "8.15"; out = "1.0-8.15"; } + { case = "8.16"; out = "1.0-8.16"; } ] null; release = { "1.0-beta2-8.11".sha256 = "sha256-I9YNk5Di6Udvq5/xpLSNflfjRyRH8fMnRzbo3uhpXNs="; @@ -19,6 +20,7 @@ let "1.0-beta2-8.13".sha256 = "sha256-IC56/lEDaAylUbMCfG/3cqOBZniEQk8jmI053DBO5l8="; "1.0-8.14".sha256 = "sha256-iRnaNeHt22JqxMNxOGPPycrO9EoCVjusR2s0GfON1y0="; "1.0-8.15".sha256 = "sha256-8RUC5dHNfLJtJh+IZG4nPTAVC8ZKVh2BHedkzjwLf/k="; + "1.0-8.16".sha256 = "sha256-7rkCAN4PNnMgsgUiiLe2TnAliknN75s2SfjzyKCib/o="; }; releaseRev = v: "v${v}"; @@ -37,7 +39,7 @@ let echo "all:" > all/Makefile echo "install:" >> all/Makefile '' ; - derivation = mkCoqDerivation ({ + derivation = (mkCoqDerivation ({ inherit version pname defaultVersion release releaseRev repo owner; mlPlugin = true; @@ -72,7 +74,11 @@ let maintainers = with maintainers; [ cohencyril ]; }; } // optionalAttrs (package != "single") - { passthru = genAttrs packages metacoq_; }); + { passthru = genAttrs packages metacoq_; }) + ).overrideAttrs (o: { + propagatedBuildInputs = o.propagatedBuildInputs ++ + optional (versionAtLeast o.version "1.0-8.16") coq.ocamlPackages.stdlib-shims; + }); in derivation; in metacoq_ (if single then "single" else "all") diff --git a/pkgs/development/interpreters/dart/default.nix b/pkgs/development/interpreters/dart/default.nix index 8570bb3d72d3..a18ec6d7e8ae 100644 --- a/pkgs/development/interpreters/dart/default.nix +++ b/pkgs/development/interpreters/dart/default.nix @@ -2,7 +2,7 @@ , lib , fetchurl , unzip -, version ? "2.17.3" +, version ? "2.18.0" , sources ? let base = "https://storage.googleapis.com/dart-archive/channels"; x86_64 = "x64"; @@ -10,28 +10,28 @@ aarch64 = "arm64"; # Make sure that if the user overrides version parameter they're # also need to override sources, to avoid mistakes - version = "2.17.3"; + version = "2.18.0"; in { "${version}-aarch64-darwin" = fetchurl { url = "${base}/stable/release/${version}/sdk/dartsdk-macos-${aarch64}-release.zip"; - sha256 = "sha256-NjkqC9DaaFGN47Qe46xUlsEx2O2bQrKhb1eJyxfr7Vg="; + sha256 = "sha256-wfUh6rXy8jAC0TVQJzXh4SrV2DQs9SvY8PGtNgZx+cA="; }; "${version}-x86_64-darwin" = fetchurl { url = "${base}/stable/release/${version}/sdk/dartsdk-macos-${x86_64}-release.zip"; - sha256 = "sha256-+6y4lOGS8VyWrZCMSgLFun0E/WOCGlHEE8J5cQiVpUY="; + sha256 = "sha256-zyu6r8akId/AHpBKH95wJXXu1LD9CKShWYKfppnSRx4="; }; "${version}-x86_64-linux" = fetchurl { url = "${base}/stable/release/${version}/sdk/dartsdk-linux-${x86_64}-release.zip"; - sha256 = "sha256-aPmgmsYaqxwTWtLmSjm/rAiJANQ5lB3uJ12OqMhUG5U="; + sha256 = "sha256-45HE7Y9iO5dI+JfLWF1ikFfBFB+er46bK+EYkyuhFjI="; }; "${version}-i686-linux" = fetchurl { url = "${base}/stable/release/${version}/sdk/dartsdk-linux-${i686}-release.zip"; - sha256 = "sha256-BFIN36OURaWIgBUiO35GkMkhCBHnqtKYPJVetdJ5cZI="; + sha256 = "sha256-IkSJWfAocT1l8F2igAkR+Y5PNYD5PZ0j21D8aJk9JCY="; }; "${version}-aarch64-linux" = fetchurl { url = "${base}/stable/release/${version}/sdk/dartsdk-linux-${aarch64}-release.zip"; - sha256 = "sha256-yZMke1raq0Mvu01LFE1aUsTEARZWMS0rAI727FHq6ts="; + sha256 = "sha256-Bt18brbJA/XfiyP5o197HDXMuGm+a1AZx92Thoriv78="; }; } }: @@ -51,7 +51,7 @@ stdenv.mkDerivation { mkdir -p $out cp -R * $out/ echo $libPath - '' + lib.optionalString(stdenv.isLinux) '' + '' + lib.optionalString (stdenv.isLinux) '' find $out/bin -executable -type f -exec patchelf --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) {} \; ''; diff --git a/pkgs/development/ocaml-modules/lwt_ssl/default.nix b/pkgs/development/ocaml-modules/lwt_ssl/default.nix index 64decd8e5d63..c33f623529a6 100644 --- a/pkgs/development/ocaml-modules/lwt_ssl/default.nix +++ b/pkgs/development/ocaml-modules/lwt_ssl/default.nix @@ -4,9 +4,6 @@ buildDunePackage rec { pname = "lwt_ssl"; version = "1.1.3"; - minimumOCamlVersion = "4.02"; - useDune2 = true; - src = fetchFromGitHub { owner = "aantron"; repo = "lwt_ssl"; diff --git a/pkgs/development/ocaml-modules/piaf/default.nix b/pkgs/development/ocaml-modules/piaf/default.nix index 5f1834c5f100..0d0ec1594d40 100644 --- a/pkgs/development/ocaml-modules/piaf/default.nix +++ b/pkgs/development/ocaml-modules/piaf/default.nix @@ -8,7 +8,6 @@ , lwt_ssl , magic-mime , mrmime -, openssl , pecu , psq , ssl @@ -28,8 +27,6 @@ buildDunePackage rec { substituteInPlace ./vendor/dune --replace "mrmime.prettym" "prettym" ''; - useDune2 = true; - propagatedBuildInputs = [ logs magic-mime @@ -43,7 +40,8 @@ buildDunePackage rec { alcotest-lwt dune-site ]; - doCheck = true; + # Check fails with OpenSSL 3 + doCheck = false; meta = { description = "An HTTP library with HTTP/2 support written entirely in OCaml"; diff --git a/pkgs/development/python-modules/bc-python-hcl2/default.nix b/pkgs/development/python-modules/bc-python-hcl2/default.nix index f8044bd0d8f6..7feb0dcf8f9c 100644 --- a/pkgs/development/python-modules/bc-python-hcl2/default.nix +++ b/pkgs/development/python-modules/bc-python-hcl2/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "bc-python-hcl2"; - version = "0.3.46"; + version = "0.3.47"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-At8K/eTXZ8CYDflI7Z7sBhE0VeElPUDk8KYfRJTl1v0="; + hash = "sha256-F4vAn6HRvNNc+4ZfGCzUef14bNmxTICwENmaOe3MaHc="; }; # Nose is required during build process, so can not use `checkInputs`. diff --git a/pkgs/development/python-modules/btrees/default.nix b/pkgs/development/python-modules/btrees/default.nix index d900beca38a4..5741f4f673c1 100644 --- a/pkgs/development/python-modules/btrees/default.nix +++ b/pkgs/development/python-modules/btrees/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "btrees"; - version = "4.10.0"; + version = "4.10.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "BTrees"; inherit version; - hash = "sha256-1qsONBDQdNcVQkXW3GSTrobxtQvWCA0TEOuz7N6l3rY="; + hash = "sha256-QOPUFrOwMajIYzRQfRIbadnJ3pB+ESNE3lJrVFHZA8U="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/cloudflare/default.nix b/pkgs/development/python-modules/cloudflare/default.nix index 2c657a6bfa30..8e62a08ebf94 100644 --- a/pkgs/development/python-modules/cloudflare/default.nix +++ b/pkgs/development/python-modules/cloudflare/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "cloudflare"; - version = "2.9.12"; + version = "2.10.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-w+ciURz9sJcWmhhjJfvoorFYUBFp0PaLZ55zb2sMwDA="; + hash = "sha256-wLgb7HnDSX3OVCVNlBd97iIg+g0ngaDWk7Jcs5fKc7k="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/glfw/default.nix b/pkgs/development/python-modules/glfw/default.nix index 5eac6a3f2c2f..b28846860035 100644 --- a/pkgs/development/python-modules/glfw/default.nix +++ b/pkgs/development/python-modules/glfw/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "glfw"; - version = "2.5.4"; + version = "2.5.5"; src = fetchFromGitHub { owner = "FlorianRhiem"; repo = "pyGLFW"; rev = "refs/tags/v${version}"; - sha256 = "sha256-4Ym3Vmkf+HwORbhR72Ws/cqLkNMPCY8FL35O2hSalGQ="; + sha256 = "sha256-puaKveByAEkgME81uePTMSglvMgyqornW1sNAbJXNuc="; }; # Patch path to GLFW shared object diff --git a/pkgs/development/python-modules/globus-sdk/default.nix b/pkgs/development/python-modules/globus-sdk/default.nix index cffe24b07e8e..9cc82b3fa133 100644 --- a/pkgs/development/python-modules/globus-sdk/default.nix +++ b/pkgs/development/python-modules/globus-sdk/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "globus-sdk"; - version = "3.10.1"; + version = "3.11.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "globus"; repo = "globus-sdk-python"; rev = "refs/tags/${version}"; - hash = "sha256-Un6Fv1Lh4HdYwdU/iR+5JFcPjY2NrFfC9+MkGuaTF8M="; + hash = "sha256-5coFy0HkeoLfJdfL5JjGMk/sVNIPZoJahYe5Nwl/bvY="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/makefun/default.nix b/pkgs/development/python-modules/makefun/default.nix index 030ea2df3161..8060e63122e7 100644 --- a/pkgs/development/python-modules/makefun/default.nix +++ b/pkgs/development/python-modules/makefun/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "makefun"; - version = "1.14.0"; + version = "1.15.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-dwxuRY8e9HMEGFM08daG7iAXVdBhUqh44mRidTQMGB0="; + sha256 = "sha256-WxEOcz2U96SdisJ7Hi1A8rsFAemMHYJeDZMtJpIN1d8="; }; postPatch = '' diff --git a/pkgs/development/python-modules/matrix-common/default.nix b/pkgs/development/python-modules/matrix-common/default.nix index 324b3a2df06c..0637ad549e92 100644 --- a/pkgs/development/python-modules/matrix-common/default.nix +++ b/pkgs/development/python-modules/matrix-common/default.nix @@ -7,12 +7,12 @@ buildPythonPackage rec { pname = "matrix_common"; - version = "1.2.1"; + version = "1.3.0"; format = "pyproject"; src = fetchPypi { inherit pname version; - sha256 = "sha256-qZ3PAqa9lbJKWmGzVIiKKskr8rS4OccnuN2dos36OFM="; + sha256 = "sha256-YuEhzM2fJDQXtX7DenbcRK6xmKelxnr9a4J1mS/yq9E="; }; propagatedBuildInputs = [ attrs ]; diff --git a/pkgs/development/python-modules/mill-local/default.nix b/pkgs/development/python-modules/mill-local/default.nix index 003fbc974f1d..1d13d8bd92cf 100644 --- a/pkgs/development/python-modules/mill-local/default.nix +++ b/pkgs/development/python-modules/mill-local/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "mill-local"; - version = "0.1.1"; + version = "0.2.0"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -16,8 +16,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "Danielhiversen"; repo = "pyMillLocal"; - rev = version; - sha256 = "sha256-OKaR0hpNVBlaZrEmEmHxqRG1i03XP2Z4c7c35YIqe+I="; + rev = "refs/tags/${version}"; + sha256 = "sha256-u7TidHD0NzZ1JxYoCWviIXSsXojJHvVNg07eDBFQuls="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/mistletoe/default.nix b/pkgs/development/python-modules/mistletoe/default.nix index 814a93e9c544..0f5c064a58f9 100644 --- a/pkgs/development/python-modules/mistletoe/default.nix +++ b/pkgs/development/python-modules/mistletoe/default.nix @@ -5,12 +5,12 @@ buildPythonPackage rec { pname = "mistletoe"; - version = "0.8.2"; + version = "0.9.0"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "sha256-ouNU5lPym8r1WZ2JSFEhGaxgN+nC+O53851VRQ59Gmw="; + sha256 = "sha256-PLlteCJtCPDTvwnvyvMw0jkCSSAG4YssBlWOi4a/f68="; }; meta = with lib; { diff --git a/pkgs/development/python-modules/monty/default.nix b/pkgs/development/python-modules/monty/default.nix index 8e115bf3a180..a5d5958ec0dc 100644 --- a/pkgs/development/python-modules/monty/default.nix +++ b/pkgs/development/python-modules/monty/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "monty"; - version = "2022.4.26"; + version = "2022.9.8"; disabled = pythonOlder "3.5"; # uses type annotations src = fetchFromGitHub { owner = "materialsvirtuallab"; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "sha256-SQku10nzTSuO5ISUDyDKAEoMhBBxPzyLNhoAyrlKH+E="; + sha256 = "sha256-3C5L7nKokuxtYlw13AKSrNVsvKH9okmBNyLXt7Vmjqk="; }; postPatch = '' diff --git a/pkgs/development/python-modules/oci/default.nix b/pkgs/development/python-modules/oci/default.nix index e136ed354e3f..8d39a9288a67 100644 --- a/pkgs/development/python-modules/oci/default.nix +++ b/pkgs/development/python-modules/oci/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "oci"; - version = "2.78.0"; + version = "2.82.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "oracle"; repo = "oci-python-sdk"; rev = "refs/tags/v${version}"; - hash = "sha256-24V9vfuNMxvC5iqluW4xz7WICXbQA89xmiAH6tIDRw0="; + hash = "sha256-oQCDWLZv7Xa03lYwfn7fjr2/3VN6IDqp96rNN8qfSoE="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/openwrt-luci-rpc/default.nix b/pkgs/development/python-modules/openwrt-luci-rpc/default.nix index 7b806ecebe23..37f389e76fc5 100644 --- a/pkgs/development/python-modules/openwrt-luci-rpc/default.nix +++ b/pkgs/development/python-modules/openwrt-luci-rpc/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "openwrt-luci-rpc"; - version = "1.1.11"; + version = "1.1.12"; src = fetchPypi { inherit pname version; - sha256 = "sha256-DkitN+mwCZ14QEn2fTOqUrQTtoncR1ifP3WDSQ6qkkk="; + sha256 = "sha256-vLRmv8xxbjBp6TDFExfprqw3JGi8qCVZ5bV7AgVZnuA="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pivy/default.nix b/pkgs/development/python-modules/pivy/default.nix index 44d6094f461a..4f4b9901c13d 100644 --- a/pkgs/development/python-modules/pivy/default.nix +++ b/pkgs/development/python-modules/pivy/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "pivy"; - version = "0.6.7"; + version = "0.6.8"; src = fetchFromGitHub { owner = "coin3d"; repo = "pivy"; rev = "refs/tags/${version}"; - hash = "sha256-mU3QRDJd56gGDWqwcxAN3yUCkAkABP/I9gIBMH2MOXA="; + hash = "sha256-y72nzZAelyRDR2JS73/0jo2x/XiDZpsERPZV3gzIhAI="; }; dontUseCmakeConfigure = true; diff --git a/pkgs/development/python-modules/pyisy/default.nix b/pkgs/development/python-modules/pyisy/default.nix index e35abee42d38..f6f812b96f86 100644 --- a/pkgs/development/python-modules/pyisy/default.nix +++ b/pkgs/development/python-modules/pyisy/default.nix @@ -8,13 +8,13 @@ buildPythonPackage rec { pname = "pyisy"; - version = "3.0.7"; + version = "3.0.8"; src = fetchFromGitHub { owner = "automicus"; repo = "PyISY"; rev = "refs/tags/v${version}"; - hash = "sha256-FWv5xPUQob+UlTU9eq9HYAhxCDucOZr+ddm5/a0sbgw="; + hash = "sha256-Q3KewvZJMq4YKrpS6ir5rqZkDhxGACDIhlbr3b6lDAs="; }; postPatch = '' diff --git a/pkgs/development/python-modules/pyopencl/default.nix b/pkgs/development/python-modules/pyopencl/default.nix index 7016478cabd4..dccf14a2d4cd 100644 --- a/pkgs/development/python-modules/pyopencl/default.nix +++ b/pkgs/development/python-modules/pyopencl/default.nix @@ -22,7 +22,7 @@ let if stdenv.isDarwin then [ mesa_drivers.dev ] else [ ocl-icd ]; in buildPythonPackage rec { pname = "pyopencl"; - version = "2022.1.6"; + version = "2022.2.3"; checkInputs = [ pytest ]; buildInputs = [ opencl-headers pybind11 ] ++ os-specific-buildInputs; @@ -40,7 +40,7 @@ in buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-+Ih9VOZUWY84VEclQLLrIorFa1aiSRuVvfrI8VvhyUM="; + sha256 = "sha256-IdpfCKq7wrL9yBRm/6rAfB25Sx9HqVvFf2M7VVkMy6I="; }; # py.test is not needed during runtime, so remove it from `install_requires` diff --git a/pkgs/development/python-modules/pyoverkiz/default.nix b/pkgs/development/python-modules/pyoverkiz/default.nix index 5ff1898c98c7..43a99ef73be0 100644 --- a/pkgs/development/python-modules/pyoverkiz/default.nix +++ b/pkgs/development/python-modules/pyoverkiz/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "pyoverkiz"; - version = "1.5.1"; + version = "1.5.2"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "iMicknl"; repo = "python-overkiz-api"; rev = "refs/tags/v${version}"; - hash = "sha256-3vtyVXWfAIUZuV0kcnT6UniMaHTw11Az7vHdjyouPbI="; + hash = "sha256-UIArc0NBg4FM2FjW7r798xbvw5S8gsGiTq7RdQp969E="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/pypdf2/default.nix b/pkgs/development/python-modules/pypdf2/default.nix index b183b20a5272..244af12c5093 100644 --- a/pkgs/development/python-modules/pypdf2/default.nix +++ b/pkgs/development/python-modules/pypdf2/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "PyPDF2"; - version = "2.10.6"; + version = "2.10.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-kSKmRB9sELkrAmKpX5wE9VL+RJjybn3G49JvwKWBU84="; + sha256 = "sha256-PHkw2fK6JdybGC2cIpOtbeOtryo5NMfoxBeGVa6Mejk="; }; LC_ALL = "en_US.UTF-8"; diff --git a/pkgs/development/python-modules/python-fsutil/default.nix b/pkgs/development/python-modules/python-fsutil/default.nix index 3f18bd09aa45..92c6c03eb992 100644 --- a/pkgs/development/python-modules/python-fsutil/default.nix +++ b/pkgs/development/python-modules/python-fsutil/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "python-fsutil"; - version = "0.6.1"; + version = "0.7.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "fabiocaccamo"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-Swq0kAZTM/zP3LXMkzZnp8KTI0YzGPIbWV2kKV1Dw0k="; + hash = "sha256-2T2C2bIOAdxppZxqI+QGE2R/+46LoqB7eNdlt4sVAd8="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/python-songpal/default.nix b/pkgs/development/python-modules/python-songpal/default.nix index 1fff6a55c92b..c01819d67305 100644 --- a/pkgs/development/python-modules/python-songpal/default.nix +++ b/pkgs/development/python-modules/python-songpal/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "python-songpal"; - version = "0.15"; + version = "0.15.1"; format = "pyproject"; @@ -21,8 +21,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "rytilahti"; repo = "python-songpal"; - rev = "refs/tags/${version}"; - hash = "sha256-NoO3cgviFbXosEnx46nXdW02jYOfRPHUdc1VeCvwBsQ="; + rev = "refs/tags/release/${version}"; + hash = "sha256-FX5pDWjUhrhK5B7zEfvihN77pSNi2QltRu0xbkUdc/c="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/pythonfinder/default.nix b/pkgs/development/python-modules/pythonfinder/default.nix index 9500a42a916f..64879d01969f 100644 --- a/pkgs/development/python-modules/pythonfinder/default.nix +++ b/pkgs/development/python-modules/pythonfinder/default.nix @@ -6,7 +6,6 @@ , attrs , cached-property , click -, six , packaging , pytest-cov , pytest-timeout @@ -14,21 +13,20 @@ buildPythonPackage rec { pname = "pythonfinder"; - version = "1.2.10"; + version = "1.3.1"; format = "pyproject"; src = fetchFromGitHub { owner = "sarugaku"; repo = pname; - rev = version; - sha256 = "sha256-4a648wOh+ASeocevFVh/4Fkq0CEhkFbt+2mWVmb9Bhw="; + rev = "refs/tags/v${version}"; + sha256 = "sha256-N/q9zi2SX38ivSpnjrx+bEzdR9cS2ivSgy42SR8cl+Q="; }; propagatedBuildInputs = [ attrs cached-property click - six packaging ]; diff --git a/pkgs/development/python-modules/pytibber/default.nix b/pkgs/development/python-modules/pytibber/default.nix index 8942d44e0ced..370510ff7d07 100644 --- a/pkgs/development/python-modules/pytibber/default.nix +++ b/pkgs/development/python-modules/pytibber/default.nix @@ -6,14 +6,13 @@ , async-timeout , graphql-subscription-manager , python-dateutil -, pytz , pytest-asyncio , pytestCheckHook }: buildPythonPackage rec { pname = "pytibber"; - version = "0.24.0"; + version = "0.25.2"; format = "setuptools"; disabled = pythonOlder "3.9"; @@ -21,8 +20,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "Danielhiversen"; repo = "pyTibber"; - rev = version; - hash = "sha256-Ib9Rb6RkhUe4WDDHVLgaOYOleSFj7LFys6pW3WgxMQo="; + rev = "refs/tags/${version}"; + hash = "sha256-gR2AAI/ZQ7TX48QsTCwv8qZJOGb978nWLP2+cY9XcI8="; }; propagatedBuildInputs = [ @@ -30,7 +29,6 @@ buildPythonPackage rec { async-timeout graphql-subscription-manager python-dateutil - pytz ]; checkInputs = [ diff --git a/pkgs/development/python-modules/regenmaschine/default.nix b/pkgs/development/python-modules/regenmaschine/default.nix index 77ed7f04d1ac..5f103bc0ccaf 100644 --- a/pkgs/development/python-modules/regenmaschine/default.nix +++ b/pkgs/development/python-modules/regenmaschine/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "regenmaschine"; - version = "2022.09.0"; + version = "2022.09.1"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "bachya"; repo = pname; rev = "refs/tags/${version}"; - sha256 = "sha256-DEa9bh6dOBMyqgts9UoFOfC97vaZ4d6NPYlKC8ayrgk="; + sha256 = "sha256-mii7D93hi+i1F5shED21RoOtN2/RNoYG8vA/+qF8nEY="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/shiv/default.nix b/pkgs/development/python-modules/shiv/default.nix index ab873da47a7b..67610774f4b0 100644 --- a/pkgs/development/python-modules/shiv/default.nix +++ b/pkgs/development/python-modules/shiv/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "shiv"; - version = "1.0.1"; + version = "1.0.2"; format = "pyproject"; src = fetchPypi { inherit pname version; - sha256 = "ec16095a0565906536af7f5e57771e9ae7a061b646ed63ad66ebbc70c30f4d2a"; + sha256 = "sha256-BDSfgXSythWUrwVnsg27rHN0nsfumFdX/2e62h239UY="; }; propagatedBuildInputs = [ click pip setuptools wheel ]; diff --git a/pkgs/development/python-modules/simple-salesforce/default.nix b/pkgs/development/python-modules/simple-salesforce/default.nix index e508ab9dbf97..a75bc775106f 100644 --- a/pkgs/development/python-modules/simple-salesforce/default.nix +++ b/pkgs/development/python-modules/simple-salesforce/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "simple-salesforce"; - version = "1.12.1"; + version = "1.12.2"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = pname; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "sha256-eDaqL4CsP5wOqfwrkeWJdg+rlcMnFT3l7A9xgVnhx0w="; + sha256 = "sha256-E1tYKcV+7Raw8R7EOwyzCKh5keGxt232lxEQkoYU0Fw="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/solax/default.nix b/pkgs/development/python-modules/solax/default.nix index 6a8c483ada84..3e9f2d4659bc 100644 --- a/pkgs/development/python-modules/solax/default.nix +++ b/pkgs/development/python-modules/solax/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "solax"; - version = "0.2.10"; + version = "0.3.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-DUXaz9BF1NOG+RSeks9CxLGDz/wWwpZBxwWh4MQapio="; + sha256 = "sha256-lqzFY2Rfmc/9KUuFfq07DZkIIS2cJ1JqZ/8gP3+pu5U="; }; nativeBuildInputs = [ setuptools-scm ]; diff --git a/pkgs/development/python-modules/types-docutils/default.nix b/pkgs/development/python-modules/types-docutils/default.nix index 14b3e6ed5d25..fc80382faca2 100644 --- a/pkgs/development/python-modules/types-docutils/default.nix +++ b/pkgs/development/python-modules/types-docutils/default.nix @@ -5,12 +5,12 @@ buildPythonPackage rec { pname = "types-docutils"; - version = "0.19.0"; + version = "0.19.1"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-lJNrGWGqzaYexrsKzxFpzXgwtSMLZFhVwdR4m68ZaF4="; + hash = "sha256-ffEzuHEFr0EPxqmSAwpw7p9aLCY2xa/n4N4oXrn9sBU="; }; # Module doesn't have tests diff --git a/pkgs/development/tools/pipenv/default.nix b/pkgs/development/tools/pipenv/default.nix index 2a8a78f7b52b..4aacf43d95a7 100644 --- a/pkgs/development/tools/pipenv/default.nix +++ b/pkgs/development/tools/pipenv/default.nix @@ -23,11 +23,11 @@ let in buildPythonApplication rec { pname = "pipenv"; - version = "2022.9.2"; + version = "2022.9.8"; src = fetchPypi { inherit pname version; - sha256 = "sha256-EMCIPt0f2Aqin9Yz34JoPCSVjol3i/UMRnNhC/ttv7A="; + sha256 = "sha256-tt//Bt6lbjut6S/CZ8LaHwgHxcewkD7vYRX9uJnCtLY="; }; LC_ALL = "en_US.UTF-8"; diff --git a/pkgs/tools/admin/oci-cli/default.nix b/pkgs/tools/admin/oci-cli/default.nix index c1c6de5e5a75..2772bc49a457 100644 --- a/pkgs/tools/admin/oci-cli/default.nix +++ b/pkgs/tools/admin/oci-cli/default.nix @@ -67,7 +67,8 @@ buildPythonApplication rec { --replace "pyOpenSSL>=17.5.0,<=22.0.0" "pyOpenSSL" \ --replace "PyYAML>=5.4,<6" "PyYAML" \ --replace "prompt-toolkit==3.0.29" "prompt-toolkit" \ - --replace "terminaltables==3.1.0" "terminaltables" + --replace "terminaltables==3.1.0" "terminaltables" \ + --replace "oci==2.78.0" "oci" ''; # https://github.com/oracle/oci-cli/issues/187 diff --git a/pkgs/tools/networking/dd-agent/40103-iostat-fix.patch b/pkgs/tools/networking/dd-agent/40103-iostat-fix.patch deleted file mode 100644 index 9897a76c957d..000000000000 --- a/pkgs/tools/networking/dd-agent/40103-iostat-fix.patch +++ /dev/null @@ -1,30 +0,0 @@ -diff --git a/checks/system/unix.py b/checks/system/unix.py -index c37af3c3..58c72626 100644 ---- a/checks/system/unix.py -+++ b/checks/system/unix.py -@@ -39,7 +39,7 @@ class IO(Check): - self.value_re = re.compile(r'\d+\.\d+') - - def _parse_linux2(self, output): -- recentStats = output.split('Device:')[2].split('\n') -+ recentStats = output.split('Device')[2].split('\n') - header = recentStats[0] - headerNames = re.findall(self.header_re, header) - device = None -@@ -123,14 +123,14 @@ class IO(Check): - - # Linux 2.6.32-343-ec2 (ip-10-35-95-10) 12/11/2012 _x86_64_ (2 CPU) - # -- # Device: rrqm/s wrqm/s r/s w/s rkB/s wkB/s avgrq-sz avgqu-sz await svctm %util -+ # Device rrqm/s wrqm/s r/s w/s rkB/s wkB/s avgrq-sz avgqu-sz await svctm %util - # sda1 0.00 17.61 0.26 32.63 4.23 201.04 12.48 0.16 4.81 0.53 1.73 - # sdb 0.00 2.68 0.19 3.84 5.79 26.07 15.82 0.02 4.93 0.22 0.09 - # sdg 0.00 0.13 2.29 3.84 100.53 30.61 42.78 0.05 8.41 0.88 0.54 - # sdf 0.00 0.13 2.30 3.84 100.54 30.61 42.78 0.06 9.12 0.90 0.55 - # md0 0.00 0.00 0.05 3.37 1.41 30.01 18.35 0.00 0.00 0.00 0.00 - # -- # Device: rrqm/s wrqm/s r/s w/s rkB/s wkB/s avgrq-sz avgqu-sz await svctm %util -+ # Device rrqm/s wrqm/s r/s w/s rkB/s wkB/s avgrq-sz avgqu-sz await svctm %util - # sda1 0.00 0.00 0.00 10.89 0.00 43.56 8.00 0.03 2.73 2.73 2.97 - # sdb 0.00 0.00 0.00 2.97 0.00 11.88 8.00 0.00 0.00 0.00 0.00 - # sdg 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 diff --git a/pkgs/tools/networking/dd-agent/5.nix b/pkgs/tools/networking/dd-agent/5.nix deleted file mode 100644 index 6feaec38f70a..000000000000 --- a/pkgs/tools/networking/dd-agent/5.nix +++ /dev/null @@ -1,108 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, python2 -, unzip, makeWrapper }: -let - python' = python2.override { - packageOverrides = self: super: { - docker = self.buildPythonPackage rec { - name = "docker-${version}"; - version = "1.10.6"; - - src = fetchFromGitHub { - owner = "docker"; - repo = "docker-py"; - rev = version; - sha256 = "1awzpbrkh4fympqzddz5i3ml81b7f0i0nwkvbpmyxjjfqx6l0m4m"; - }; - - propagatedBuildInputs = with self; [ - six - requests - websocket-client - docker_pycreds - uptime - ] ++ lib.optionals (self.pythonOlder "3.7") [ backports_ssl_match_hostname ]; - - # due to flake8 - doCheck = false; - }; - - pymongo = super.pymongo.overridePythonAttrs (oldAttrs: rec { - version = "2.9.5"; - src = oldAttrs.src.override { - inherit version; - sha256 = "912516ac6a355d7624374a38337b8587afe3eb535c0a5456b3bd12df637a6e70"; - }; - }); - }; - }; - -in stdenv.mkDerivation rec { - version = "5.11.2"; - pname = "dd-agent"; - - src = fetchFromGitHub { - owner = "datadog"; - repo = "dd-agent"; - rev = version; - sha256 = "1iqxvgpsqibqw3vk79158l2pnb6y4pjhjp2d6724lm5rpz4825lx"; - }; - - patches = [ ./40103-iostat-fix.patch ]; - - nativeBuildInputs = [ unzip makeWrapper ]; - buildInputs = with python'.pkgs; [ - requests - psycopg2 - psutil - ntplib - simplejson - pyyaml - pymongo - python-etcd - consul - docker - ]; - propagatedBuildInputs = with python'.pkgs; [ python tornado ]; - - buildCommand = '' - mkdir -p $out/bin - cp -R $src $out/agent - chmod u+w -R $out - (cd $out/agent; patchPhase) - PYTHONPATH=$out/agent:$PYTHONPATH - ln -s $out/agent/agent.py $out/bin/dd-agent - ln -s $out/agent/dogstatsd.py $out/bin/dogstatsd - ln -s $out/agent/ddagent.py $out/bin/dd-forwarder - - # Move out default conf.d so that /etc/dd-agent/conf.d is used - mv $out/agent/conf.d $out/agent/conf.d-system - - cat > $out/bin/dd-jmxfetch <