diff --git a/pkgs/development/libraries/xapian/default.nix b/pkgs/development/libraries/xapian/1.0.x.nix similarity index 100% rename from pkgs/development/libraries/xapian/default.nix rename to pkgs/development/libraries/xapian/1.0.x.nix diff --git a/pkgs/development/libraries/xapian/bindings/default.nix b/pkgs/development/libraries/xapian/bindings/1.0.x.nix similarity index 94% rename from pkgs/development/libraries/xapian/bindings/default.nix rename to pkgs/development/libraries/xapian/bindings/1.0.x.nix index 5e902f74fff..ea49c3cbd9e 100644 --- a/pkgs/development/libraries/xapian/bindings/default.nix +++ b/pkgs/development/libraries/xapian/bindings/1.0.x.nix @@ -1,4 +1,4 @@ -{ composableDerivation, fetchurl, xapian, pkgconfig +{ stdenv, composableDerivation, fetchurl, xapian10, pkgconfig , python ? null, php ? null, ruby ? null }: let inherit (composableDerivation) wwf; in @@ -12,7 +12,7 @@ composableDerivation.composableDerivation {} rec { sha256 = "6028123c3cd9bfc380b672b89f5420f7d5c063fc3511dee4dd5d34033ccb6911"; }; - buildInputs = [ xapian pkgconfig ]; + buildInputs = [ xapian10 pkgconfig ]; # most interpreters aren't tested yet.. (see python for example how to do it) flags = @@ -67,7 +67,7 @@ composableDerivation.composableDerivation {} rec { meta = { description = "Bindings for the Xapian library"; - homepage = xapian.meta.homepage; + homepage = xapian10.meta.homepage; license = "GPL"; maintainers = [ stdenv.lib.maintainers.chaoflow ]; }; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ac87fe850bd..945326b3ac8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4316,9 +4316,9 @@ let x264 = callPackage ../development/libraries/x264 { }; - xapian = callPackage ../development/libraries/xapian { }; + xapian10 = callPackage ../development/libraries/xapian/1.0.x.nix { }; - xapianBindings = callPackage ../development/libraries/xapian/bindings { # TODO perl php Java, tcl, C#, python + xapianBindings10 = callPackage ../development/libraries/xapian/bindings/1.0.x.nix { # TODO perl php Java, tcl, C#, python }; Xaw3d = callPackage ../development/libraries/Xaw3d { };