Unverified Commit aad9ab11 authored by Sandro Jäckel's avatar Sandro Jäckel Committed by GitHub
Browse files

bogofilter: split into bogofilter-db and bogofilter-sqlite; fix bogoupgrade (#486691)

parents 4125ba46 c1a2de4b
Loading
Loading
Loading
Loading
+18 −2
Original line number Diff line number Diff line
@@ -6,10 +6,15 @@
  db,
  makeWrapper,
  pax,
  perl,
  database ? db,
}:

let
  dbName = lib.getName database;
in
stdenv.mkDerivation (finalAttrs: {
  pname = "bogofilter";
  pname = "bogofilter-${dbName}";
  version = "1.2.5";

  src = fetchurl {
@@ -21,13 +26,23 @@ stdenv.mkDerivation (finalAttrs: {

  buildInputs = [
    flex
    db
    database
  ]
  ++ lib.optional (dbName == "db") perl; # required by bogoupgrade

  configureFlags = [
    "--with-database=${dbName}"
  ];

  doCheck = false; # needs "y" tool

  postInstall = ''
    wrapProgram "$out/bin/bf_tar" --prefix PATH : "${lib.makeBinPath [ pax ]}"
  ''
  # Only supports upgrading through various db versions, not useful for
  # other database types.
  + lib.optionalString (dbName != "db") ''
    rm "$out/bin/bogoupgrade"
  '';

  meta = {
@@ -40,6 +55,7 @@ stdenv.mkDerivation (finalAttrs: {
      filter.
    '';
    license = lib.licenses.gpl2Plus;
    mainProgram = "bogofilter";
    platforms = lib.platforms.linux;
  };
})
+3 −0
Original line number Diff line number Diff line
@@ -1592,6 +1592,9 @@ with pkgs;

  blockdiag = with python3Packages; toPythonApplication blockdiag;

  bogofilter-sqlite = bogofilter.override { database = sqlite; };
  bogofilter-db = bogofilter.override { database = db; };

  boomerang = libsForQt5.callPackage ../development/tools/boomerang { };

  bozohttpd-minimal = bozohttpd.override { minimal = true; };