diff --git a/nixos/modules/services/networking/dnscrypt-proxy2.nix b/nixos/modules/services/networking/dnscrypt-proxy2.nix index de1ca0d2f20..4592a0c2f6b 100644 --- a/nixos/modules/services/networking/dnscrypt-proxy2.nix +++ b/nixos/modules/services/networking/dnscrypt-proxy2.nix @@ -11,7 +11,7 @@ in settings = mkOption { description = lib.mdDoc '' Attrset that is converted and passed as TOML config file. - For available params, see: + For available params, see: ''; example = literalExpression '' { @@ -49,7 +49,7 @@ in passAsFile = [ "json" ]; } '' ${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 '' else '' cp $jsonPath config.json @@ -80,7 +80,7 @@ in AmbientCapabilities = "CAP_NET_BIND_SERVICE"; CacheDirectory = "dnscrypt-proxy"; DynamicUser = true; - ExecStart = "${pkgs.dnscrypt-proxy2}/bin/dnscrypt-proxy -config ${cfg.configFile}"; + ExecStart = "${pkgs.dnscrypt-proxy}/bin/dnscrypt-proxy -config ${cfg.configFile}"; LockPersonality = true; LogsDirectory = "dnscrypt-proxy"; MemoryDenyWriteExecute = true; diff --git a/pkgs/tools/networking/dnscrypt-proxy2/default.nix b/pkgs/tools/networking/dnscrypt-proxy/default.nix similarity index 95% rename from pkgs/tools/networking/dnscrypt-proxy2/default.nix rename to pkgs/tools/networking/dnscrypt-proxy/default.nix index 24c6f7f2d31..5227a28c1bd 100644 --- a/pkgs/tools/networking/dnscrypt-proxy2/default.nix +++ b/pkgs/tools/networking/dnscrypt-proxy/default.nix @@ -1,7 +1,7 @@ { lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { - pname = "dnscrypt-proxy2"; + pname = "dnscrypt-proxy"; version = "2.1.5"; vendorSha256 = null; diff --git a/pkgs/tools/networking/ivpn/default.nix b/pkgs/tools/networking/ivpn/default.nix index e8e33f3bc73..f5df7e6c384 100644 --- a/pkgs/tools/networking/ivpn/default.nix +++ b/pkgs/tools/networking/ivpn/default.nix @@ -7,7 +7,7 @@ , openvpn , obfs4 , iproute2 -, dnscrypt-proxy2 +, dnscrypt-proxy , iptables , gawk , util-linux @@ -74,7 +74,7 @@ builtins.mapAttrs (pname: attrs: buildGoModule (attrs // rec { --replace 'wgToolBinaryPath = path.Join(installDir, "wireguard-tools/wg")' \ 'wgToolBinaryPath = "${wireguard-tools}/bin/wg"' \ --replace 'dnscryptproxyBinPath = path.Join(installDir, "dnscrypt-proxy/dnscrypt-proxy")' \ - 'dnscryptproxyBinPath = "${dnscrypt-proxy2}/bin/dnscrypt-proxy"' + 'dnscryptproxyBinPath = "${dnscrypt-proxy}/bin/dnscrypt-proxy"' ''; postFixup = '' diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index baac0085f68..9c48d4a2fed 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -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"; 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"; gnatsd = nats-server; # Added 2019-10-28 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8e23480a1a3..aecbd7eeb1e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7381,7 +7381,7 @@ with pkgs; 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 { };