diff options
| author | Vladimír Čunát <v@cunat.cz> | 2021-09-09 13:29:27 +0200 |
|---|---|---|
| committer | Vladimír Čunát <v@cunat.cz> | 2021-09-09 13:29:27 +0200 |
| commit | 4e89f2a6091d2422f20804c603b05395d5f218c2 (patch) | |
| tree | f0fc49c1627c0358976fc7221b7f38df7e92df00 | |
| parent | 793a10699247ca669faf3e8b4de00ac6ed3d86b6 (diff) | |
| parent | 12c40d9972f698042cfaf63342ce6beca5c62a5d (diff) | |
| download | nixpkgs-4e89f2a6091d2422f20804c603b05395d5f218c2.tar nixpkgs-4e89f2a6091d2422f20804c603b05395d5f218c2.tar.gz nixpkgs-4e89f2a6091d2422f20804c603b05395d5f218c2.tar.bz2 nixpkgs-4e89f2a6091d2422f20804c603b05395d5f218c2.tar.lz nixpkgs-4e89f2a6091d2422f20804c603b05395d5f218c2.tar.xz nixpkgs-4e89f2a6091d2422f20804c603b05395d5f218c2.tar.zst nixpkgs-4e89f2a6091d2422f20804c603b05395d5f218c2.zip | |
Merge #137106: knot-dns: 3.1.1 -> 3.1.2
| -rw-r--r-- | pkgs/servers/dns/knot-dns/default.nix | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/pkgs/servers/dns/knot-dns/default.nix b/pkgs/servers/dns/knot-dns/default.nix index 4a8ed6a0b08..4363f9665fa 100644 --- a/pkgs/servers/dns/knot-dns/default.nix +++ b/pkgs/servers/dns/knot-dns/default.nix @@ -1,16 +1,15 @@ { lib, stdenv, fetchurl, pkg-config, gnutls, liburcu, lmdb, libcap_ng, libidn2, libunistring , systemd, nettle, libedit, zlib, libiconv, libintl, libmaxminddb, libbpf, nghttp2, libmnl , autoreconfHook, nixosTests -, fetchpatch }: stdenv.mkDerivation rec { pname = "knot-dns"; - version = "3.1.1"; + version = "3.1.2"; src = fetchurl { url = "https://secure.nic.cz/files/knot-dns/knot-${version}.tar.xz"; - sha256 = "75bfb1acaca774ed3dd781dc74780298dc0fd51b54e4b61015e7487d6cd2067c"; + sha256 = "580087695df350898b2da8a5c2bdf1dc5eb262ed5ff2cb1538cee480a50fa094"; }; outputs = [ "bin" "out" "dev" ]; @@ -26,11 +25,6 @@ stdenv.mkDerivation rec { # They are later created from NixOS itself. ./dont-create-run-time-dirs.patch ./runtime-deps.patch - # rename task_t to worker_task_t to fix redefinition issues on (aach64-)darwin - (fetchpatch { - url = "https://gitlab.nic.cz/knot/knot-dns/-/commit/a70b718085f9b97e556970444313c37a702a60f7.diff"; - sha256 = "0m776pb9iga0lj2gadk23shfrcfrsrzlyaj8800klw7xh6qq32bm"; - }) ]; nativeBuildInputs = [ pkg-config autoreconfHook ]; |