Unverified Commit 6f451b24 authored by Nick Cao's avatar Nick Cao Committed by GitHub
Browse files

compactor: migrate to by-name, modernize derivation (#492876)

parents 2377bea6 5b08f045

pkgs/applications/networking/compactor/default.nix→pkgs/by-name/co/compactor/package.nix

+8 −6
Original line number Diff line number Diff line
@@ -12,7 +12,7 @@ 
  libpcap,

  libtins,

  openssl,

  protobuf,

  protobuf_21,

  xz,

  zlib,

  catch2,
@@ -25,15 +25,17 @@ 
  tcpdump,

  wireshark-cli,

}:



stdenv.mkDerivation rec {

let

  protobuf = protobuf_21;

in

stdenv.mkDerivation (finalAttrs: {

  pname = "compactor";

  version = "1.2.3";



  src = fetchFromGitHub {

    owner = "dns-stats";

    repo = "compactor";

    rev = version;

    tag = finalAttrs.version;

    fetchSubmodules = true;

    hash = "sha256-5Z14suhO5ghhmZsSj4DsSoKm+ct2gQFO6qxhjmx4Xm4=";

  };
@@ -100,9 +102,9 @@ stdenv.mkDerivation rec { 
  meta = {

    description = "Tools to capture DNS traffic and record it in C-DNS files";

    homepage = "https://dns-stats.org/";

    changelog = "https://github.com/dns-stats/compactor/raw/${version}/ChangeLog.txt";

    changelog = "https://github.com/dns-stats/compactor/raw/${finalAttrs.version}/ChangeLog.txt";

    license = lib.licenses.mpl20;

    maintainers = with lib.maintainers; [ fdns ];

    platforms = lib.platforms.unix;

  };

}
 
})

pkgs/applications/networking/compactor/patches/add-a-space-after-type-in-check-response-opt-sh.patch→pkgs/by-name/co/compactor/patches/add-a-space-after-type-in-check-response-opt-sh.patch

+0 −0

File moved.

View file

pkgs/top-level/all-packages.nix

+0 −4
Original line number Diff line number Diff line
@@ -1616,10 +1616,6 @@ with pkgs; 
    extraPackages = [ ffmpeg ];

  };



  compactor = callPackage ../applications/networking/compactor {

    protobuf = protobuf_21;

  };



  inherit (callPackages ../tools/misc/coreboot-utils { })

    msrtool

    cbmem