diff options
| author | Martin Weinelt <hexa@darmstadt.ccc.de> | 2022-03-28 17:48:40 +0200 |
|---|---|---|
| committer | Martin Weinelt <hexa@darmstadt.ccc.de> | 2022-03-28 18:04:19 +0200 |
| commit | 999f3c2b9d61942e3fd07dfaa1d6c51d080351ce (patch) | |
| tree | e2ecf84847ee1f92f29a3d70c9e3d58ede917ed9 | |
| parent | 01656454995be26a38490626c060ec66a0415cfe (diff) | |
| download | nixpkgs-999f3c2b9d61942e3fd07dfaa1d6c51d080351ce.tar nixpkgs-999f3c2b9d61942e3fd07dfaa1d6c51d080351ce.tar.gz nixpkgs-999f3c2b9d61942e3fd07dfaa1d6c51d080351ce.tar.bz2 nixpkgs-999f3c2b9d61942e3fd07dfaa1d6c51d080351ce.tar.lz nixpkgs-999f3c2b9d61942e3fd07dfaa1d6c51d080351ce.tar.xz nixpkgs-999f3c2b9d61942e3fd07dfaa1d6c51d080351ce.tar.zst nixpkgs-999f3c2b9d61942e3fd07dfaa1d6c51d080351ce.zip | |
pdns: rename from powerdns
https://github.com/PowerDNS/pdns https://repology.org/project/pdns/versions
| -rw-r--r-- | nixos/modules/services/networking/powerdns.nix | 4 | ||||
| -rw-r--r-- | pkgs/servers/dns/pdns/default.nix (renamed from pkgs/servers/dns/powerdns/default.nix) | 0 | ||||
| -rw-r--r-- | pkgs/servers/dns/pdns/version.patch (renamed from pkgs/servers/dns/powerdns/version.patch) | 0 | ||||
| -rw-r--r-- | pkgs/top-level/aliases.nix | 1 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
5 files changed, 4 insertions, 3 deletions
diff --git a/nixos/modules/services/networking/powerdns.nix b/nixos/modules/services/networking/powerdns.nix index 8cae61b8354..b035698456c 100644 --- a/nixos/modules/services/networking/powerdns.nix +++ b/nixos/modules/services/networking/powerdns.nix @@ -24,14 +24,14 @@ in { config = mkIf cfg.enable { - systemd.packages = [ pkgs.powerdns ]; + systemd.packages = [ pkgs.pdns ]; systemd.services.pdns = { wantedBy = [ "multi-user.target" ]; after = [ "network.target" "mysql.service" "postgresql.service" "openldap.service" ]; serviceConfig = { - ExecStart = [ "" "${pkgs.powerdns}/bin/pdns_server --config-dir=${configDir} --guardian=no --daemon=no --disable-syslog --log-timestamp=no --write-pid=no" ]; + ExecStart = [ "" "${pkgs.pdns}/bin/pdns_server --config-dir=${configDir} --guardian=no --daemon=no --disable-syslog --log-timestamp=no --write-pid=no" ]; }; }; diff --git a/pkgs/servers/dns/powerdns/default.nix b/pkgs/servers/dns/pdns/default.nix index ff057b48bd5..ff057b48bd5 100644 --- a/pkgs/servers/dns/powerdns/default.nix +++ b/pkgs/servers/dns/pdns/default.nix diff --git a/pkgs/servers/dns/powerdns/version.patch b/pkgs/servers/dns/pdns/version.patch index 185d0702883..185d0702883 100644 --- a/pkgs/servers/dns/powerdns/version.patch +++ b/pkgs/servers/dns/pdns/version.patch diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index a793fa063f9..a196d7d053f 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -922,6 +922,7 @@ mapAliases ({ polarssl = throw "'polarssl' has been renamed to/replaced by 'mbedtls'"; # Converted to throw 2022-02-22 polysh = throw "polysh has been removed from nixpkgs as the upstream has abandoned the project"; # Added 2022-01-01 poppler_qt5 = throw "'poppler_qt5' has been renamed to/replaced by 'libsForQt5.poppler'"; # Converted to throw 2022-02-22 + powerdns = pdns; # Added 2022-03-28 # postgresql postgresql96 = postgresql_9_6; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ad9eae28faa..d2244bc3801 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -23226,7 +23226,7 @@ with pkgs; semodule-utils = callPackage ../os-specific/linux/semodule-utils { }; - powerdns = callPackage ../servers/dns/powerdns { + pdns = callPackage ../servers/dns/pdns { boost = boost172; }; |