diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2023-02-11 00:02:21 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-02-11 00:02:21 +0000 |
| commit | e969c56b62ba3d9114c6acd2ce125fe5848b8ee8 (patch) | |
| tree | eac6d169f711b3e35dca4284c611e61fe0272c37 /pkgs/servers | |
| parent | 42cf9b70d4c1da4bd91c50a423df413b37cfe6f5 (diff) | |
| parent | 0b7adf1effe730f6f696ada2558433b416b1de35 (diff) | |
Merge master into staging-next
Diffstat (limited to 'pkgs/servers')
| -rw-r--r-- | pkgs/servers/adguardhome/bins.nix | 8 | ||||
| -rwxr-xr-x | pkgs/servers/adguardhome/update.sh | 4 | ||||
| -rw-r--r-- | pkgs/servers/http/envoy/default.nix | 1 |
3 files changed, 12 insertions, 1 deletions
diff --git a/pkgs/servers/adguardhome/bins.nix b/pkgs/servers/adguardhome/bins.nix index a54b5a23cdf1c..b58c5ad5c445e 100644 --- a/pkgs/servers/adguardhome/bins.nix +++ b/pkgs/servers/adguardhome/bins.nix @@ -20,4 +20,12 @@ aarch64-linux = fetchurl { sha256 = "sha256-qC7BrBhI9berbuIVIQ6yOo74eHRsoneVRJMx1K/Ljds="; url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.23/AdGuardHome_linux_arm64.tar.gz"; }; +armv6l-linux = fetchurl { + sha256 = "sha256-cWoEpOScFzcz3tsG7IIBV2xpBT+uvSYMEfrmE3pohWA="; + url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.23/AdGuardHome_linux_armv6.tar.gz"; +}; +armv7l-linux = fetchurl { + sha256 = "sha256-DTGyyNCncbGrrpHzcIxpZqukAYsHarqSJhlbYvjN6dA="; + url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.23/AdGuardHome_linux_armv7.tar.gz"; +}; } diff --git a/pkgs/servers/adguardhome/update.sh b/pkgs/servers/adguardhome/update.sh index 8a72bd5a7c990..b7defa8113fac 100755 --- a/pkgs/servers/adguardhome/update.sh +++ b/pkgs/servers/adguardhome/update.sh @@ -22,6 +22,8 @@ declare -A systems systems[linux_386]=i686-linux systems[linux_amd64]=x86_64-linux systems[linux_arm64]=aarch64-linux +systems[linux_armv6]=armv6l-linux +systems[linux_armv7]=armv7l-linux systems[darwin_amd64]=x86_64-darwin systems[darwin_arm64]=aarch64-darwin @@ -30,7 +32,7 @@ echo '{' >> "$bins" for asset in $(curl --silent https://api.github.com/repos/AdguardTeam/AdGuardHome/releases/latest | jq -c '.assets[]') ; do url="$(jq -r '.browser_download_url' <<< "$asset")" - adg_system="$(grep -Eo '(darwin|linux)_(386|amd64|arm64)' <<< "$url" || true)" + adg_system="$(grep -Eo '(darwin|linux)_(386|amd64|arm64|armv6|armv7)' <<< "$url" || true)" if [ -n "$adg_system" ]; then fetch="$(grep '\.zip$' <<< "$url" > /dev/null && echo fetchzip || echo fetchurl)" nix_system=${systems[$adg_system]} diff --git a/pkgs/servers/http/envoy/default.nix b/pkgs/servers/http/envoy/default.nix index aed6a36be1d75..4a219a9cfb05a 100644 --- a/pkgs/servers/http/envoy/default.nix +++ b/pkgs/servers/http/envoy/default.nix @@ -149,6 +149,7 @@ buildBazelPackage rec { "--spawn_strategy=standalone" "--noexperimental_strict_action_env" "--cxxopt=-Wno-error" + "--linkopt=-Wl,-z,noexecstack" # Force use of system Java. "--extra_toolchains=@local_jdk//:all" |