Merge pull request #248669 from Atemu/dnscrypt-proxy-update-alias
dnscrypt-proxy: rename from dnscrypt-proxy2
This commit is contained in:
commit
c54f4fdf8c
|
@ -11,7 +11,7 @@ in
|
||||||
settings = mkOption {
|
settings = mkOption {
|
||||||
description = lib.mdDoc ''
|
description = lib.mdDoc ''
|
||||||
Attrset that is converted and passed as TOML config file.
|
Attrset that is converted and passed as TOML config file.
|
||||||
For available params, see: <https://github.com/DNSCrypt/dnscrypt-proxy/blob/${pkgs.dnscrypt-proxy2.version}/dnscrypt-proxy/example-dnscrypt-proxy.toml>
|
For available params, see: <https://github.com/DNSCrypt/dnscrypt-proxy/blob/${pkgs.dnscrypt-proxy.version}/dnscrypt-proxy/example-dnscrypt-proxy.toml>
|
||||||
'';
|
'';
|
||||||
example = literalExpression ''
|
example = literalExpression ''
|
||||||
{
|
{
|
||||||
|
@ -49,7 +49,7 @@ in
|
||||||
passAsFile = [ "json" ];
|
passAsFile = [ "json" ];
|
||||||
} ''
|
} ''
|
||||||
${if cfg.upstreamDefaults then ''
|
${if cfg.upstreamDefaults then ''
|
||||||
${pkgs.remarshal}/bin/toml2json ${pkgs.dnscrypt-proxy2.src}/dnscrypt-proxy/example-dnscrypt-proxy.toml > example.json
|
${pkgs.remarshal}/bin/toml2json ${pkgs.dnscrypt-proxy.src}/dnscrypt-proxy/example-dnscrypt-proxy.toml > example.json
|
||||||
${pkgs.jq}/bin/jq --slurp add example.json $jsonPath > config.json # merges the two
|
${pkgs.jq}/bin/jq --slurp add example.json $jsonPath > config.json # merges the two
|
||||||
'' else ''
|
'' else ''
|
||||||
cp $jsonPath config.json
|
cp $jsonPath config.json
|
||||||
|
@ -80,7 +80,7 @@ in
|
||||||
AmbientCapabilities = "CAP_NET_BIND_SERVICE";
|
AmbientCapabilities = "CAP_NET_BIND_SERVICE";
|
||||||
CacheDirectory = "dnscrypt-proxy";
|
CacheDirectory = "dnscrypt-proxy";
|
||||||
DynamicUser = true;
|
DynamicUser = true;
|
||||||
ExecStart = "${pkgs.dnscrypt-proxy2}/bin/dnscrypt-proxy -config ${cfg.configFile}";
|
ExecStart = "${pkgs.dnscrypt-proxy}/bin/dnscrypt-proxy -config ${cfg.configFile}";
|
||||||
LockPersonality = true;
|
LockPersonality = true;
|
||||||
LogsDirectory = "dnscrypt-proxy";
|
LogsDirectory = "dnscrypt-proxy";
|
||||||
MemoryDenyWriteExecute = true;
|
MemoryDenyWriteExecute = true;
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
{ lib, buildGoModule, fetchFromGitHub }:
|
{ lib, buildGoModule, fetchFromGitHub }:
|
||||||
|
|
||||||
buildGoModule rec {
|
buildGoModule rec {
|
||||||
pname = "dnscrypt-proxy2";
|
pname = "dnscrypt-proxy";
|
||||||
version = "2.1.5";
|
version = "2.1.5";
|
||||||
|
|
||||||
vendorSha256 = null;
|
vendorSha256 = null;
|
|
@ -7,7 +7,7 @@
|
||||||
, openvpn
|
, openvpn
|
||||||
, obfs4
|
, obfs4
|
||||||
, iproute2
|
, iproute2
|
||||||
, dnscrypt-proxy2
|
, dnscrypt-proxy
|
||||||
, iptables
|
, iptables
|
||||||
, gawk
|
, gawk
|
||||||
, util-linux
|
, util-linux
|
||||||
|
@ -74,7 +74,7 @@ builtins.mapAttrs (pname: attrs: buildGoModule (attrs // rec {
|
||||||
--replace 'wgToolBinaryPath = path.Join(installDir, "wireguard-tools/wg")' \
|
--replace 'wgToolBinaryPath = path.Join(installDir, "wireguard-tools/wg")' \
|
||||||
'wgToolBinaryPath = "${wireguard-tools}/bin/wg"' \
|
'wgToolBinaryPath = "${wireguard-tools}/bin/wg"' \
|
||||||
--replace 'dnscryptproxyBinPath = path.Join(installDir, "dnscrypt-proxy/dnscrypt-proxy")' \
|
--replace 'dnscryptproxyBinPath = path.Join(installDir, "dnscrypt-proxy/dnscrypt-proxy")' \
|
||||||
'dnscryptproxyBinPath = "${dnscrypt-proxy2}/bin/dnscrypt-proxy"'
|
'dnscryptproxyBinPath = "${dnscrypt-proxy}/bin/dnscrypt-proxy"'
|
||||||
'';
|
'';
|
||||||
|
|
||||||
postFixup = ''
|
postFixup = ''
|
||||||
|
|
|
@ -1965,7 +1965,7 @@ mapAliases ({
|
||||||
|
|
||||||
ant-dracula-theme = throw "ant-dracula-theme is now dracula-theme, and theme name is Dracula instead of Ant-Dracula";
|
ant-dracula-theme = throw "ant-dracula-theme is now dracula-theme, and theme name is Dracula instead of Ant-Dracula";
|
||||||
dina-font-pcf = dina-font; # Added 2020-02-09
|
dina-font-pcf = dina-font; # Added 2020-02-09
|
||||||
dnscrypt-proxy = throw "dnscrypt-proxy has been removed. Please use dnscrypt-proxy2"; # Added 2020-02-02
|
dnscrypt-proxy2 = dnscrypt-proxy; # Added 2023-02-02
|
||||||
gcc-snapshot = throw "gcc-snapshot: Marked as broken for >2 years, additionally this 'snapshot' pointed to a fairly old one from gcc7";
|
gcc-snapshot = throw "gcc-snapshot: Marked as broken for >2 years, additionally this 'snapshot' pointed to a fairly old one from gcc7";
|
||||||
gnatsd = nats-server; # Added 2019-10-28
|
gnatsd = nats-server; # Added 2019-10-28
|
||||||
|
|
||||||
|
|
|
@ -7381,7 +7381,7 @@ with pkgs;
|
||||||
|
|
||||||
djbdns = callPackage ../tools/networking/djbdns { };
|
djbdns = callPackage ../tools/networking/djbdns { };
|
||||||
|
|
||||||
dnscrypt-proxy2 = callPackage ../tools/networking/dnscrypt-proxy2 { };
|
dnscrypt-proxy = callPackage ../tools/networking/dnscrypt-proxy { };
|
||||||
|
|
||||||
dnscrypt-wrapper = callPackage ../tools/networking/dnscrypt-wrapper { };
|
dnscrypt-wrapper = callPackage ../tools/networking/dnscrypt-wrapper { };
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue