diff options
author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2022-10-22 06:05:55 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-10-22 06:05:55 +0000 |
commit | 3c2db12b377d9c8c06659881e125422ff7ac94b2 (patch) | |
tree | 9caafe127bde17d6b69131189ae11b0e3c607ecc | |
parent | c8a9826fe26b36b54ddf708291356c0bc2f168c8 (diff) | |
parent | 00a4d236da788cd599362d2150ab3ea6d0cb21f0 (diff) | |
download | nixpkgs-3c2db12b377d9c8c06659881e125422ff7ac94b2.tar nixpkgs-3c2db12b377d9c8c06659881e125422ff7ac94b2.tar.gz nixpkgs-3c2db12b377d9c8c06659881e125422ff7ac94b2.tar.bz2 nixpkgs-3c2db12b377d9c8c06659881e125422ff7ac94b2.tar.lz nixpkgs-3c2db12b377d9c8c06659881e125422ff7ac94b2.tar.xz nixpkgs-3c2db12b377d9c8c06659881e125422ff7ac94b2.tar.zst nixpkgs-3c2db12b377d9c8c06659881e125422ff7ac94b2.zip |
Merge master into staging-next
27 files changed, 188 insertions, 85 deletions
diff --git a/pkgs/applications/audio/tagger/default.nix b/pkgs/applications/audio/tagger/default.nix index b7708299d30..97751d6107c 100644 --- a/pkgs/applications/audio/tagger/default.nix +++ b/pkgs/applications/audio/tagger/default.nix @@ -18,13 +18,13 @@ stdenv.mkDerivation rec { pname = "tagger"; - version = "2022.10.3"; + version = "2022.10.4"; src = fetchFromGitHub { owner = "nlogozzo"; repo = "NickvisionTagger"; rev = version; - hash = "sha256-dyp2XzTnDs08tTTbCnjWh061UXnH4Q0Gnt0jofgVm2U="; + hash = "sha256-I4jhlz/dmS24nszP755xlYMF6aLhmAxlv6Td4xFbr3U="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/blockchains/ledger-live-desktop/default.nix b/pkgs/applications/blockchains/ledger-live-desktop/default.nix index 019aefcff3f..4d2f727193e 100644 --- a/pkgs/applications/blockchains/ledger-live-desktop/default.nix +++ b/pkgs/applications/blockchains/ledger-live-desktop/default.nix @@ -2,11 +2,11 @@ let pname = "ledger-live-desktop"; - version = "2.48.0"; + version = "2.49.0"; src = fetchurl { url = "https://download.live.ledger.com/${pname}-${version}-linux-x86_64.AppImage"; - hash = "sha256-U5QOr76OMTABVb5kteB0FP3igwpXqh9q5XL7aY92UqI="; + hash = "sha256-5HrPeLeMPh6hc1OLZVSPWMSV+ZwjgQyUmFCW+ZyYdCA="; }; appimageContents = appimageTools.extractType2 { diff --git a/pkgs/applications/networking/cluster/arkade/default.nix b/pkgs/applications/networking/cluster/arkade/default.nix index 0ccd3c6bdad..b60a88da5c2 100644 --- a/pkgs/applications/networking/cluster/arkade/default.nix +++ b/pkgs/applications/networking/cluster/arkade/default.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "arkade"; - version = "0.8.46"; + version = "0.8.47"; src = fetchFromGitHub { owner = "alexellis"; repo = "arkade"; rev = version; - sha256 = "sha256-ihSvhXJcvdx06Y1eET/eI/yeFx8k42yQrVEXWAkiJU8="; + sha256 = "sha256-vKP/bexxXbhyJEa6ojLFw7ebDS+NYsZgq2jKtimbE3A="; }; CGO_ENABLED = 0; diff --git a/pkgs/applications/networking/cluster/atmos/default.nix b/pkgs/applications/networking/cluster/atmos/default.nix index e255611a1b3..a38f6463e40 100644 --- a/pkgs/applications/networking/cluster/atmos/default.nix +++ b/pkgs/applications/networking/cluster/atmos/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "atmos"; - version = "1.10.2"; + version = "1.10.4"; src = fetchFromGitHub { owner = "cloudposse"; repo = pname; rev = "v${version}"; - sha256 = "sha256-/rxGAfYjV5VzYs9h8eCpz5jhmW7jPdk1XB3bXHH+oQw="; + sha256 = "sha256-ZNoucLjvj5nZxIDbzoAXtIx3TAg405+CaKBSLmC1PNM="; }; - vendorSha256 = "sha256-/b764auKkZF0oMqNlXmsW9aB5gcq4WFQRFjsVhNDiB4="; + vendorSha256 = "sha256-j4KvGLnFm3P9EUXxfRgsandKc0lJMs9ntBQacsEha2w="; ldflags = [ "-s" "-w" "-X github.com/cloudposse/atmos/cmd.Version=v${version}" ]; diff --git a/pkgs/applications/networking/cluster/kubedb-cli/default.nix b/pkgs/applications/networking/cluster/kubedb-cli/default.nix index fd2402fe1dc..af41b7ba9de 100644 --- a/pkgs/applications/networking/cluster/kubedb-cli/default.nix +++ b/pkgs/applications/networking/cluster/kubedb-cli/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "kubedb-cli"; - version = "0.28.0"; + version = "0.29.0"; src = fetchFromGitHub { owner = "kubedb"; repo = "cli"; rev = "v${version}"; - sha256 = "sha256-fSJ9IIuyOuKmpklw7uh1NKM3Pr5epJefYBJ3udeC5sE="; + sha256 = "sha256-MVvhXvf/R7Cku8S4zbs1MlH4NuEwkxCsbbc2ASCF67c="; }; vendorSha256 = null; diff --git a/pkgs/applications/networking/cluster/kubeone/default.nix b/pkgs/applications/networking/cluster/kubeone/default.nix index ecd867f28ab..ab526bababa 100644 --- a/pkgs/applications/networking/cluster/kubeone/default.nix +++ b/pkgs/applications/networking/cluster/kubeone/default.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "kubeone"; - version = "1.5.1"; + version = "1.5.2"; src = fetchFromGitHub { owner = "kubermatic"; repo = "kubeone"; rev = "v${version}"; - sha256 = "sha256-DGLbbIDX2JASre/AQ1eWStNeu4GHgRTQyzrJRTz5DyE="; + sha256 = "sha256-8wYrDGykob1YLvtscQdL867vuRv8J83DC7AzvQVXVr8="; }; - vendorSha256 = "sha256-w/uLR7wi28Ub7Nouxxg39NlD1OzyIE2oEP4D88Xbwu0="; + vendorSha256 = "sha256-Y4eivDchnN2rtQWjFY3cFiJXRfj48UfVUKM/OLuWXGA="; ldflags = [ "-s -w" diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 557e1d22e65..98084d83873 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -102,13 +102,13 @@ "version": "2.24.1" }, "aws": { - "hash": "sha256-0oN4kbAm2j32VZhcPe62M8ILEBHxeujnTMgeToDsAe4=", + "hash": "sha256-IWcENR7OnW2jFHsKTYLLPkZKqgeKdrQE0YceqZ9lduU=", "owner": "hashicorp", "provider-source-address": "registry.terraform.io/hashicorp/aws", "repo": "terraform-provider-aws", - "rev": "v4.36.0", - "vendorHash": "sha256-rIZUmZHeYJGdKSKjw14gbIH6mCEYbBe5VthnLXjqKJc=", - "version": "4.36.0" + "rev": "v4.36.1", + "vendorHash": "sha256-CwrBNz1HzuTlmuh6fq/hLSi9bG7PUIFx6Fp8WoRdb/Q=", + "version": "4.36.1" }, "azuread": { "hash": "sha256-rj/ODxmuK0Ro1KVHh4onR/evtUdKzay9BpQDgrx+eNA=", @@ -120,13 +120,13 @@ "version": "2.29.0" }, "azurerm": { - "hash": "sha256-MWbw0E5TtqHaoU9nxeMVrUCPlRE73KYxvC6A6tMrjC0=", + "hash": "sha256-ASZs5raOUCMRI+GzncADLtCtc5QJvPfGoQ67n8DiMMg=", "owner": "hashicorp", "provider-source-address": "registry.terraform.io/hashicorp/azurerm", "repo": "terraform-provider-azurerm", - "rev": "v3.27.0", + "rev": "v3.28.0", "vendorHash": null, - "version": "3.27.0" + "version": "3.28.0" }, "azurestack": { "hash": "sha256-aSwVa7y1AJ6sExx+bO/93oLBNgSBDJjuPYPY8i3C9T0=", @@ -777,13 +777,13 @@ "version": "0.6.12" }, "newrelic": { - "hash": "sha256-Av6NIAjIfJbiOKr7y8bWCsLxToKn4eeroicWo7yu1PU=", + "hash": "sha256-tbjb+K2QP8+MFyJLQ3ewS6ALg7MGdpBjxZIaSKSxbiw=", "owner": "newrelic", "provider-source-address": "registry.terraform.io/newrelic/newrelic", "repo": "terraform-provider-newrelic", - "rev": "v3.5.1", - "vendorHash": "sha256-1D66m18oWwuXgBIWstRWvjfy9iGrmO3gyVBucdPps2c=", - "version": "3.5.1" + "rev": "v3.5.2", + "vendorHash": "sha256-lEFcR908CK4RSSO/3kbqQ/wse5HKaqveWUZbzUhUTMI=", + "version": "3.5.2" }, "nomad": { "hash": "sha256-oHY+jM4JQgLlE1wd+/H9H8H2g0e9ZuxI6OMlz3Izfjg=", @@ -958,13 +958,13 @@ "version": "1.7.0" }, "rancher2": { - "hash": "sha256-B+GBBjqKw+1rU8Y2SW1ly5ZXBbTxQNc0FewWKe1WaVI=", + "hash": "sha256-TqztIk0sHevfv+BpNZJUs1XbwrbzJtcqdafGN5fTVaE=", "owner": "rancher", "provider-source-address": "registry.terraform.io/rancher/rancher2", "repo": "terraform-provider-rancher2", - "rev": "v1.24.1", - "vendorHash": "sha256-4dhDSaekq9xyhiXtzk5WL3RTL1phrMnwL66mL9ixijA=", - "version": "1.24.1" + "rev": "v1.24.2", + "vendorHash": "sha256-Ntq4wxXPUGbu4+6X1pBsmQsqfJ/jccTiHDJeHVpWe8Y=", + "version": "1.24.2" }, "random": { "hash": "sha256-oYtvVK0OOHyLUG6amhkvmr6zlbzy0CKoS3DxztoLbdE=", @@ -976,13 +976,13 @@ "version": "3.4.3" }, "remote": { - "hash": "sha256-h6V2sd6j2HzIN1MVMBMqquM54fzmzHPcPfsP5t4bU1A=", + "hash": "sha256-up4+W2mLii7alqdcBoMBTAWI5Vwfc1QtsDK592sAcDM=", "owner": "tenstad", "provider-source-address": "registry.terraform.io/tenstad/remote", "repo": "terraform-provider-remote", - "rev": "v0.1.0", - "vendorHash": "sha256-ckPs3iaFbmHbBnwRuYn9XdnGZsj+UoYK4OE/9B6Z6Kc=", - "version": "0.1.0" + "rev": "v0.1.1", + "vendorHash": "sha256-dMT3PEYNu9NxwLmY5SHa79yeVSB8Pi3UBEHiGvGGVmU=", + "version": "0.1.1" }, "rundeck": { "hash": "sha256-GkX5p6hV66G45JG3aJmYD5e2LQvf6kmfa6fQK10tc68=", @@ -994,13 +994,13 @@ "version": "0.4.3" }, "scaleway": { - "hash": "sha256-MRZbVEUcjJL+leDCok1S+wsLW1N2IP76P0D7M8NzvHY=", + "hash": "sha256-mo8zq/EdT6RrOxBAnWu1rhQpZ26DZcU7I/dMCUIHxBE=", "owner": "scaleway", "provider-source-address": "registry.terraform.io/scaleway/scaleway", "repo": "terraform-provider-scaleway", - "rev": "v2.4.0", - "vendorHash": "sha256-CEYDT2G/V+XeCwcQzJksNb4EVRzH0iiaWiaudhBiaLw=", - "version": "2.4.0" + "rev": "v2.5.0", + "vendorHash": "sha256-CycLXG84Sfi1aciXn2darHIGfE6DpCYOHc7Op/0R26I=", + "version": "2.5.0" }, "secret": { "hash": "sha256-MmAnA/4SAPqLY/gYcJSTnEttQTsDd2kEdkQjQj6Bb+A=", @@ -1275,13 +1275,13 @@ "version": "2.11.4" }, "wavefront": { - "hash": "sha256-6hqVAg3YwkEDBpkgPQZQyrjHfKfRc8+iTZqMg2vBwJI=", + "hash": "sha256-6uEEvTX0a+pZ9V+upBZOWH+IemEimVk9Jtfiz2UF5fI=", "owner": "vmware", "provider-source-address": "registry.terraform.io/vmware/wavefront", "repo": "terraform-provider-wavefront", - "rev": "v3.2.0", - "vendorHash": "sha256-0N2YWVnbGvD4YLdEtfdvAjhLY4zkj07GoXtFFPSD5Zk=", - "version": "3.2.0" + "rev": "v3.3.0", + "vendorHash": "sha256-ib1Esx2AO7b9S+v+zzuATgSVHI3HVwbzEeyqhpBz1BQ=", + "version": "3.3.0" }, "yandex": { "hash": "sha256-WdiJD1gt56VDFe2qVKwiYOvneixaGRie6mrxdOCklQY=", diff --git a/pkgs/applications/networking/instant-messengers/discord/default.nix b/pkgs/applications/networking/instant-messengers/discord/default.nix index 50d005302f5..3a2eae2a3fc 100644 --- a/pkgs/applications/networking/instant-messengers/discord/default.nix +++ b/pkgs/applications/networking/instant-messengers/discord/default.nix @@ -1,7 +1,7 @@ { branch ? "stable", callPackage, fetchurl, lib, stdenv }: let versions = if stdenv.isLinux then { - stable = "0.0.20"; + stable = "0.0.21"; ptb = "0.0.29"; canary = "0.0.140"; } else { @@ -14,7 +14,7 @@ let x86_64-linux = { stable = fetchurl { url = "https://dl.discordapp.net/apps/linux/${version}/discord-${version}.tar.gz"; - sha256 = "3f7yuxigEF3e8qhCetCHKBtV4XUHsx/iYiaCCXjspYw="; + sha256 = "KDKUssPRrs/D10s5GhJ23hctatQmyqd27xS9nU7iNaM="; }; ptb = fetchurl { url = "https://dl-ptb.discordapp.net/apps/linux/${version}/discord-ptb-${version}.tar.gz"; diff --git a/pkgs/applications/networking/nali/default.nix b/pkgs/applications/networking/nali/default.nix index 8efc9b1f8f2..50949da7539 100644 --- a/pkgs/applications/networking/nali/default.nix +++ b/pkgs/applications/networking/nali/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "nali"; - version = "0.6.0"; + version = "0.7.0"; src = fetchFromGitHub { owner = "zu1k"; repo = "nali"; rev = "v${version}"; - sha256 = "sha256-WAYNSIv4/eJfjJLej7msgat8nRm4r+xidHrFvL/OocA="; + sha256 = "sha256-NHTS9YajVjyAjSEQxMqyyY2Hwd30pjnIthZ+1jroqTE="; }; - vendorSha256 = "sha256-YTzuOhJQN/BCgGQnA9sKNz0OIut/mCj1eXwfEh9gxTA="; + vendorSha256 = "sha256-1sXG/xEzPVN1aRCsYqUee9aidT+ognZszOC7SR8YArw="; subPackages = [ "." ]; meta = with lib; { diff --git a/pkgs/applications/virtualization/imgcrypt/default.nix b/pkgs/applications/virtualization/imgcrypt/default.nix index 1f917080bce..058da0d5351 100644 --- a/pkgs/applications/virtualization/imgcrypt/default.nix +++ b/pkgs/applications/virtualization/imgcrypt/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "imgcrypt"; - version = "1.1.6"; + version = "1.1.7"; src = fetchFromGitHub { owner = "containerd"; repo = pname; rev = "v${version}"; - sha256 = "sha256-ytoxdwmyg7IlJOhC6FPI9dnoiptEQrlAAPV57/O3M4U="; + sha256 = "sha256-VGP63tGyYD/AtjEZD1uo8A2I/4Di7bfLeeaNat+coI4="; }; ldflags = [ diff --git a/pkgs/development/libraries/libfilezilla/default.nix b/pkgs/development/libraries/libfilezilla/default.nix index bc70e1fde3a..9d1c2f27b3b 100644 --- a/pkgs/development/libraries/libfilezilla/default.nix +++ b/pkgs/development/libraries/libfilezilla/default.nix @@ -12,11 +12,11 @@ stdenv.mkDerivation rec { pname = "libfilezilla"; - version = "0.38.1"; + version = "0.39.1"; src = fetchurl { url = "https://download.filezilla-project.org/${pname}/${pname}-${version}.tar.bz2"; - hash = "sha256-1AGotagKfBexo2DdnMy23Fb9jTlEE6n7K2uxvF2Y/Uw="; + hash = "sha256-89bA3yjzP1LPJTywP8UVeXUq5NrvKqxzRaa9feYjpsU="; }; nativeBuildInputs = [ autoreconfHook pkg-config ]; diff --git a/pkgs/development/tools/continuous-integration/drone/default.nix b/pkgs/development/tools/continuous-integration/drone/default.nix index 4beef373eea..6816ee3931a 100644 --- a/pkgs/development/tools/continuous-integration/drone/default.nix +++ b/pkgs/development/tools/continuous-integration/drone/default.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "drone.io${lib.optionalString (!enableUnfree) "-oss"}"; - version = "2.13.0"; + version = "2.14.0"; src = fetchFromGitHub { owner = "harness"; repo = "drone"; rev = "v${version}"; - sha256 = "sha256-2NezH7+hsOz+r+gong2CxXVjtxRyIKkA0G6OGoJcGFk="; + sha256 = "sha256-8G7Xy4bKBybw5waL/AqqYZ6FKBlnzp7b6PAwixydTEg="; }; vendorSha256 = "sha256-6/wbxQ+Cv0lOlBqi8NUQQ8Z21w27betfeX/NiNDpOjA="; diff --git a/pkgs/development/tools/java/visualvm/default.nix b/pkgs/development/tools/java/visualvm/default.nix index 82f93cb73e6..c8fa6863c1b 100644 --- a/pkgs/development/tools/java/visualvm/default.nix +++ b/pkgs/development/tools/java/visualvm/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchzip, lib, makeWrapper, makeDesktopItem, jdk, gawk }: stdenv.mkDerivation rec { - version = "2.1.4"; + version = "2.1.5"; pname = "visualvm"; src = fetchzip { url = "https://github.com/visualvm/visualvm.src/releases/download/${version}/visualvm_${builtins.replaceStrings ["."] [""] version}.zip"; - sha256 = "sha256-o7gcKJy3gDUV3WPo5vO+5Zyyz1UVC2wGRTxZL69RxNE="; + sha256 = "sha256-OUGuaI3AcdfscfLRULz3uS8gOCVBseC/6aDsPoHRRTY="; }; desktopItem = makeDesktopItem { diff --git a/pkgs/development/tools/jsonnet-language-server/default.nix b/pkgs/development/tools/jsonnet-language-server/default.nix index e6b9470a54b..82be702f991 100644 --- a/pkgs/development/tools/jsonnet-language-server/default.nix +++ b/pkgs/development/tools/jsonnet-language-server/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "jsonnet-language-server"; - version = "0.9.1"; + version = "0.10.0"; src = fetchFromGitHub { owner = "grafana"; repo = "jsonnet-language-server"; rev = "v${version}"; - sha256 = "sha256-JNRMV52sSA45lp1UdJ4wBGrhlGIFhYHhgZU0lop1HcI="; + sha256 = "sha256-RpjLIz5lfdWULTDTMDVYvTTSaQWvYbvpxvs4L5UldjM="; }; - vendorSha256 = "sha256-tsVevkMHuCv70A9Ohg9L+ghH5+v52X4sToI4bMlDzzo="; + vendorSha256 = "sha256-imFr4N/YmpwjVZSCBHG7cyJt4RKTn+T7VPdL8R/ba5o="; ldflags = [ "-s -w -X 'main.version=${version}'" diff --git a/pkgs/development/tools/rust/rust-analyzer/default.nix b/pkgs/development/tools/rust/rust-analyzer/default.nix index 056b15fc18a..5379d8829d9 100644 --- a/pkgs/development/tools/rust/rust-analyzer/default.nix +++ b/pkgs/development/tools/rust/rust-analyzer/default.nix @@ -12,14 +12,14 @@ rustPlatform.buildRustPackage rec { pname = "rust-analyzer-unwrapped"; - version = "2022-10-10"; - cargoSha256 = "sha256-9ykD9CMvrg6WG2jyKDNdkzZejla7WCXgAxuLGGrx62g="; + version = "2022-10-17"; + cargoSha256 = "sha256-budFHrSZTxGC3a35OlRKtZuJnCWWTwsqqWLpgjSp5Ss="; src = fetchFromGitHub { owner = "rust-lang"; repo = "rust-analyzer"; rev = version; - sha256 = "sha256-Ssoxr1ggoPsvFBsCWNQTleYLOTqx6hFKFvktzGDC51A="; + sha256 = "sha256-vd+UsJSg+Y/iBRJvvvFsunxwXc0jz4JyJLQPChfgfRA="; }; cargoBuildFlags = [ "--bin" "rust-analyzer" "--bin" "rust-analyzer-proc-macro-srv" ]; diff --git a/pkgs/servers/http/unit/default.nix b/pkgs/servers/http/unit/default.nix index c1174383c95..5ce6af5aae4 100644 --- a/pkgs/servers/http/unit/default.nix +++ b/pkgs/servers/http/unit/default.nix @@ -30,14 +30,14 @@ let php81-unit = php81.override phpConfig; in stdenv.mkDerivation rec { - version = "1.27.0"; + version = "1.28.0"; pname = "unit"; src = fetchFromGitHub { owner = "nginx"; repo = pname; rev = version; - sha256 = "sha256-H/WIrCyocEO/HZfVMyI9IwD565JsUIzC8n1qUYmCvWc="; + sha256 = "sha256-nsalloOghC8tOMRP/N/L2raOmWwA4cz6Yr6H3IHHbR4="; }; nativeBuildInputs = [ which ]; diff --git a/pkgs/servers/nosql/influxdb/default.nix b/pkgs/servers/nosql/influxdb/default.nix index eac918cafa2..185c246e6fa 100644 --- a/pkgs/servers/nosql/influxdb/default.nix +++ b/pkgs/servers/nosql/influxdb/default.nix @@ -1,17 +1,76 @@ -{ lib, buildGoModule, fetchFromGitHub, stdenv }: +{ lib, buildGoModule, fetchFromGitHub, stdenv, pkg-config, rustPlatform, llvmPackages, libiconv, fetchpatch, nixosTests }: +let + libflux_version = "0.170.1"; + + # This is copied from influxdb2 with flux version matching the needed by thi + flux = rustPlatform.buildRustPackage { + pname = "libflux"; + version = "v${libflux_version}"; + src = fetchFromGitHub { + owner = "influxdata"; + repo = "flux"; + rev = "v${libflux_version}"; + sha256 = "sha256-P3SpleOVbL+nGWdscwjj9yWqRdck/9JsAwuJtGOO7N8="; + }; + patches = [ + # https://github.com/influxdata/flux/pull/5273 + # fix compile error with Rust 1.64 + (fetchpatch { + url = "https://github.com/influxdata/flux/commit/20ca62138a0669f2760dd469ca41fc333e04b8f2.patch"; + stripLen = 2; + extraPrefix = ""; + sha256 = "sha256-Fb4CuH9ZvrPha249dmLLI8MqSNQRKqKPxPbw2pjqwfY="; + }) + ]; + sourceRoot = "source/libflux"; + cargoSha256 = "sha256-kYiZ5ZRiFHRf1RQeeUGjIhnEkTvhNSZ0t4tidpRIDyk="; + nativeBuildInputs = [ llvmPackages.libclang ]; + buildInputs = lib.optional stdenv.isDarwin libiconv; + LIBCLANG_PATH = "${llvmPackages.libclang.lib}/lib"; + pkgcfg = '' + Name: flux + Version: ${libflux_version} + Description: Library for the InfluxData Flux engine + Cflags: -I/out/include + Libs: -L/out/lib -lflux -ldl -lpthread + ''; + passAsFile = [ "pkgcfg" ]; + postInstall = '' + mkdir -p $out/include $out/pkgconfig + cp -r $NIX_BUILD_TOP/source/libflux/include/influxdata $out/include + substitute $pkgcfgPath $out/pkgconfig/flux.pc \ + --replace /out $out + '' + lib.optionalString stdenv.isDarwin '' + install_name_tool -id $out/lib/libflux.dylib $out/lib/libflux.dylib + ''; + }; +in buildGoModule rec { pname = "influxdb"; - version = "1.8.10"; + version = "1.10.0"; src = fetchFromGitHub { owner = "influxdata"; repo = pname; rev = "v${version}"; - sha256 = "sha256-PErAxRpSi1Kk6IpEAhsUSxCGYeY4p6bbhwLdbRB0M00="; + sha256 = "sha256-BMHR9EdYC+8oA0he7emzBRmNnHn15nO/5NqsLcr+R0k="; }; - vendorSha256 = "sha256-jgAbEWXL1LYRN7ud9ij0Z1KBGHPZ0sRq78tsK92ob8k="; + vendorSha256 = "sha256-AY04cmfg7vbrWR4+LBuCFYqBgQJBXlPpO+2oj0qqjM4="; + + nativeBuildInputs = [ pkg-config ]; + + PKG_CONFIG_PATH = "${flux}/pkgconfig"; + + # Check that libflux is at the right version + preBuild = '' + flux_ver=$(grep github.com/influxdata/flux go.mod | awk '{print $2}') + if [ "$flux_ver" != "v${libflux_version}" ]; then + echo "go.mod wants libflux $flux_ver, but nix derivation provides ${libflux_version}" + exit 1 + fi + ''; doCheck = false; @@ -19,11 +78,12 @@ buildGoModule rec { excludedPackages = "test"; + passthru.tests = { inherit (nixosTests) influxdb; }; + meta = with lib; { description = "An open-source distributed time series database"; license = licenses.mit; homepage = "https://influxdata.com/"; maintainers = with maintainers; [ offline zimbatm ]; - broken = stdenv.isDarwin; # build fails with go > 1.17 }; } diff --git a/pkgs/servers/pocketbase/default.nix b/pkgs/servers/pocketbase/default.nix index f438df71949..e50d97b359f 100644 --- a/pkgs/servers/pocketbase/default.nix +++ b/pkgs/servers/pocketbase/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "pocketbase"; - version = "0.7.7"; + version = "0.7.9"; src = fetchFromGitHub { owner = "pocketbase"; repo = pname; rev = "v${version}"; - sha256 = "sha256-pHYbz1LuPZDOtg3xrvgr+16ziZMZHCtSbY685E8RA1E="; + sha256 = "sha256-3dsgBWpYuNIVLTdxbaanMVnXYpw5f1ct9ksIrJqpURw="; }; vendorSha256 = "sha256-i3CRba2HA7dOEh4PU1rNZUl05pZqIm946lIjP7ZcFEc="; diff --git a/pkgs/servers/ttyd/default.nix b/pkgs/servers/ttyd/default.nix index 6a98e32e132..999f92c49f6 100644 --- a/pkgs/servers/ttyd/default.nix +++ b/pkgs/servers/ttyd/default.nix @@ -7,12 +7,12 @@ with builtins; stdenv.mkDerivation rec { pname = "ttyd"; - version = "1.7.1"; + version = "1.7.2"; src = fetchFromGitHub { owner = "tsl0922"; repo = pname; rev = "refs/tags/${version}"; - sha256 = "sha256-eUddAo9gGL/Uzf9r54U4AKW49Otr8gr+YQXwJS60Eo8="; + sha256 = "sha256-M1tRZ2CXU9XYClj4DdNLGdCXtQDgAoBpuLKvRsbDkMA="; }; nativeBuildInputs = [ pkg-config cmake xxd ]; diff --git a/pkgs/tools/admin/aliyun-cli/default.nix b/pkgs/tools/admin/aliyun-cli/default.nix index a4ca690d318..6927eb3fc31 100644 --- a/pkgs/tools/admin/aliyun-cli/default.nix +++ b/pkgs/tools/admin/aliyun-cli/default.nix @@ -2,14 +2,14 @@ buildGoModule rec { pname = "aliyun-cli"; - version = "3.0.131"; + version = "3.0.132"; src = fetchFromGitHub { rev = "v${version}"; owner = "aliyun"; repo = pname; fetchSubmodules = true; - sha256 = "sha256-YE4+/pzUPk8wte+3ITFfhb9tn5RvaGCteAnirouITSo="; + sha256 = "sha256-X+M81xVJIRPTgDPtd+vKFAgx34D+UMcyS3Mz5PNE3pU="; }; vendorSha256 = "sha256-rUYlFM9OlPXGzxXyOxweUs6md7HhjocC56F+OtT/IXo="; diff --git a/pkgs/tools/admin/kics/default.nix b/pkgs/tools/admin/kics/default.nix index 5467969be87..4dc91567c98 100644 --- a/pkgs/tools/admin/kics/default.nix +++ b/pkgs/tools/admin/kics/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "kics"; - version = "1.6.1"; + version = "1.6.2"; src = fetchFromGitHub { owner = "Checkmarx"; repo = "kics"; rev = "v${version}"; - sha256 = "sha256-9FbepfyZNrVzX+jjsI5GZPRxljziYEXWI+28l4h1fBw="; + sha256 = "sha256-7sblU0UKPminofTKY9Ugc1SFZ/VjdRvzpaaIRkQwSi4="; }; - vendorSha256 = "sha256-Qse9kYYiTRmxuByQmT3l1DKgsWydMyhxomJrQkQ45oE="; + vendorSha256 = "sha256-ao+mFDiHAtD4DQsVHTwd+n9LBxCAXcrEqJNqz3wI1vM="; subPackages = [ "cmd/console" ]; diff --git a/pkgs/tools/misc/goaccess/default.nix b/pkgs/tools/misc/goaccess/default.nix index f2022cbc7c8..b5ca1b41c32 100644 --- a/pkgs/tools/misc/goaccess/default.nix +++ b/pkgs/tools/misc/goaccess/default.nix @@ -10,14 +10,14 @@ }: stdenv.mkDerivation rec { - version = "1.6.3"; + version = "1.6.4"; pname = "goaccess"; src = fetchFromGitHub { owner = "allinurl"; repo = pname; rev = "v${version}"; - sha256 = "sha256-PeF+NfoLizPdk8yHQRfycBSpf3ZIUZX2YQdAbVbdArc="; + sha256 = "sha256-Gm9WtlkjJui8pFk1jypu4i/A14nL8itJIHPQl05+gLg="; }; nativeBuildInputs = [ diff --git a/pkgs/tools/misc/hid-tools/default.nix b/pkgs/tools/misc/hid-tools/default.nix new file mode 100644 index 00000000000..b69dbe4a270 --- /dev/null +++ b/pkgs/tools/misc/hid-tools/default.nix @@ -0,0 +1,41 @@ +{ python3 +, lib +, fetchFromGitLab +}: + +python3.pkgs.buildPythonPackage rec { + pname = "hid-tools"; + version = "0.3.1"; + + format = "setuptools"; + + src = fetchFromGitLab { + domain = "gitlab.freedesktop.org"; + owner = "libevdev"; + repo = "hid-tools"; + rev = version; + sha256 = "r496SKBGgHriIhriWYhhCSiChQUKhnHT/lEx9sEoT/0="; + }; + + propagatedBuildInputs = with python3.pkgs; [ + libevdev + parse + pyyaml + click + pyudev + ]; + + checkInputs = with python3.pkgs; [ + pytestCheckHook + ]; + + # Tests require /dev/uhid + doCheck = false; + + meta = with lib; { + description = "Python scripts to manipulate HID data"; + homepage = "https://gitlab.freedesktop.org/libevdev/hid-tools"; + license = licenses.mit; + maintainers = teams.freedesktop.members; + }; +} diff --git a/pkgs/tools/networking/assh/default.nix b/pkgs/tools/networking/assh/default.nix index 34c498181fa..1a3436c2c33 100644 --- a/pkgs/tools/networking/assh/default.nix +++ b/pkgs/tools/networking/assh/default.nix @@ -9,16 +9,16 @@ buildGoModule rec { pname = "assh"; - version = "2.14.0"; + version = "2.15.0"; src = fetchFromGitHub { repo = "advanced-ssh-config"; owner = "moul"; rev = "v${version}"; - sha256 = "sha256-7I4HFinTuVoy1FIiVJqY7vjd5xms0ciuegwhTHRYDKI="; + sha256 = "sha256-gti2W1y0iFNyDxKjS7joJn3FkZ9AadYsImu4VEdErS4="; }; - vendorSha256 = "sha256-2VNMwmZY2sb9ib+v7mRkeZ2zkTUtXMaDvAbd3jyQMZY="; + vendorSha256 = "sha256-xh/ndjhvSz0atJqOeajAm4nw5/TmMrOdOgTauKAsAcA="; ldflags = [ "-s" "-w" "-X moul.io/assh/v2/pkg/version.Version=${version}" diff --git a/pkgs/tools/networking/netbird/default.nix b/pkgs/tools/networking/netbird/default.nix index fccf0ecc22e..d01bf22f9ba 100644 --- a/pkgs/tools/networking/netbird/default.nix +++ b/pkgs/tools/networking/netbird/default.nix @@ -14,13 +14,13 @@ let in buildGoModule rec { pname = "netbird"; - version = "0.10.0"; + version = "0.10.1"; src = fetchFromGitHub { owner = "netbirdio"; repo = pname; rev = "v${version}"; - sha256 = "sha256-irOrYQIMy1GS/EsN4YtLP4/lHuQ+r7ZGzvNA4dkHi8s="; + sha256 = "sha256-ZP8MYvGotBVvuLZHFJgTz1SGAZLwuZwk9ohNtfcCSgs="; }; vendorSha256 = "sha256-+jJUKp2EvtDxGsv+9B+s7FiIopvO8yH9jldeRZkrd20="; diff --git a/pkgs/tools/security/exploitdb/default.nix b/pkgs/tools/security/exploitdb/default.nix index 53b44417b40..74ba577a6dc 100644 --- a/pkgs/tools/security/exploitdb/default.nix +++ b/pkgs/tools/security/exploitdb/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "exploitdb"; - version = "2022-10-07"; + version = "2022-10-18"; src = fetchFromGitHub { owner = "offensive-security"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-gO2NCQSmaJA6Bg6LKBc0qVi147KzGp2MtXizpM0v1yQ="; + hash = "sha256-qyRAwy4rGaV7fiU0gwvnf6yT4ZAAXYTtZubh+GtsJU8="; }; nativeBuildInputs = [ diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 743b99ca4cc..41f8b1888cb 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4216,6 +4216,8 @@ with pkgs; hid-listen = callPackage ../tools/misc/hid-listen { }; + hid-tools = callPackage ../tools/misc/hid-tools { }; + hidrd = callPackage ../tools/misc/hidrd { }; hiksink = callPackage ../tools/misc/hiksink { |