Unverified Commit c54f4fdf authored by Atemu's avatar Atemu Committed by GitHub
Browse files

Merge pull request #248669 from Atemu/dnscrypt-proxy-update-alias 

dnscrypt-proxy: rename from dnscrypt-proxy2
parents 8961aaa0 7706f570

nixos/modules/services/networking/dnscrypt-proxy2.nix

+3 −3
Original line number Diff line number Diff line
@@ -11,7 +11,7 @@ in 
    settings = mkOption {

      description = lib.mdDoc ''

        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 ''

        {
@@ -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;

pkgs/tools/networking/dnscrypt-proxy2/default.nix→pkgs/tools/networking/dnscrypt-proxy/default.nix

+1 −1
Original line number Diff line number Diff line 
{ lib, buildGoModule, fetchFromGitHub }:



buildGoModule rec {

  pname = "dnscrypt-proxy2";

  pname = "dnscrypt-proxy";

  version = "2.1.5";



  vendorSha256 = null;

pkgs/tools/networking/ivpn/default.nix

+2 −2
Original line number Diff line number Diff line
@@ -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 = ''

pkgs/top-level/aliases.nix

+1 −1
Original line number Diff line number Diff line
@@ -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

pkgs/top-level/all-packages.nix

+1 −1
Original line number Diff line number Diff line
@@ -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 { };