diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2023-02-25 18:01:03 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-02-25 18:01:03 +0000 |
| commit | 52a11b56f9808fbaa9b494047b9b8dd3bf826017 (patch) | |
| tree | eaf2ca3535187244373255b8e50b32336fc1c12d /pkgs/servers | |
| parent | 79a47b8646727a72db41577abddac067bf0a9512 (diff) | |
| parent | 546f356db67baac2c34fcb1245c6267de1100260 (diff) | |
Merge master into staging-next
Diffstat (limited to 'pkgs/servers')
| -rw-r--r-- | pkgs/servers/consul/default.nix | 6 | ||||
| -rw-r--r-- | pkgs/servers/mqtt/nanomq/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/servers/shishi/default.nix | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/pkgs/servers/consul/default.nix b/pkgs/servers/consul/default.nix index cc2fa4be2745d..19284bd52da92 100644 --- a/pkgs/servers/consul/default.nix +++ b/pkgs/servers/consul/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "consul"; - version = "1.14.4"; + version = "1.15.0"; rev = "v${version}"; # Note: Currently only release tags are supported, because they have the Consul UI @@ -17,7 +17,7 @@ buildGoModule rec { owner = "hashicorp"; repo = pname; inherit rev; - sha256 = "sha256-aPJcb7nIjNIT5Bt/On+KFHHA2bNBO4y7HDFpsjhh8j0="; + sha256 = "sha256-WJQHBSwmcJiUGt69DMMZxs+xEk3z+fadSHoHvxb48ZU="; }; passthru.tests.consul = nixosTests.consul; @@ -26,7 +26,7 @@ buildGoModule rec { # has a split module structure in one repo subPackages = ["." "connect/certgen"]; - vendorHash = "sha256-g7Pi/wOjClwcuqeHQjhqBtnORArx1G4Znqvfl0bf3V4="; + vendorHash = "sha256-XwoZ/iwsZ/zXgPRGfBit5TO2NDS2pTEO0FT4KSUhJtA="; doCheck = false; diff --git a/pkgs/servers/mqtt/nanomq/default.nix b/pkgs/servers/mqtt/nanomq/default.nix index 482c274f2112a..ee56a44c11ca5 100644 --- a/pkgs/servers/mqtt/nanomq/default.nix +++ b/pkgs/servers/mqtt/nanomq/default.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation (finalAttrs: { "-DNNG_ENABLE_TLS=ON" ]; - NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-Wno-return-type"; + env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-Wno-return-type"; meta = with lib; { description = "An ultra-lightweight and blazing-fast MQTT broker for IoT edge"; diff --git a/pkgs/servers/shishi/default.nix b/pkgs/servers/shishi/default.nix index d752c1bb8aee5..1e93613808d5a 100644 --- a/pkgs/servers/shishi/default.nix +++ b/pkgs/servers/shishi/default.nix @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { (enableFeature true "arcfour") ]; - NIX_CFLAGS_COMPILE + env.NIX_CFLAGS_COMPILE = optionalString stdenv.isDarwin "-DBIND_8_COMPAT"; doCheck = true; |