Author: chaoflow
Date: Tue Apr 26 20:57:11 2011
New Revision: 26979
URL: https://svn.nixos.org/websvn/nix/?rev=26979&sc=1
Log:
renamed current xapian/xapianBindings to xapian10/xapianBindings10
Added:
nixpkgs/trunk/pkgs/development/libraries/xapian/1.0.x.nix
- copied, changed from r26978,
nixpkgs/trunk/pkgs/development/libraries/xapian/default.nix
nixpkgs/trunk/pkgs/development/libraries/xapian/bindings/1.0.x.nix
- copied, changed from r26978,
nixpkgs/trunk/pkgs/development/libraries/xapian/bindings/default.nix
Deleted:
nixpkgs/trunk/pkgs/development/libraries/xapian/bindings/default.nix
nixpkgs/trunk/pkgs/development/libraries/xapian/default.nix
Modified:
nixpkgs/trunk/pkgs/top-level/all-packages.nix
Copied and modified: nixpkgs/trunk/pkgs/development/libraries/xapian/1.0.x.nix
(from r26978, nixpkgs/trunk/pkgs/development/libraries/xapian/default.nix)
==============================================================================
Copied and modified:
nixpkgs/trunk/pkgs/development/libraries/xapian/bindings/1.0.x.nix (from
r26978, nixpkgs/trunk/pkgs/development/libraries/xapian/bindings/default.nix)
==============================================================================
--- nixpkgs/trunk/pkgs/development/libraries/xapian/bindings/default.nix
Tue Apr 26 20:57:04 2011 (r26978, copy source)
+++ nixpkgs/trunk/pkgs/development/libraries/xapian/bindings/1.0.x.nix Tue Apr
26 20:57:11 2011 (r26979)
@@ -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 @@
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 @@
meta = {
description = "Bindings for the Xapian library";
- homepage = xapian.meta.homepage;
+ homepage = xapian10.meta.homepage;
license = "GPL";
maintainers = [ stdenv.lib.maintainers.chaoflow ];
};
Modified: nixpkgs/trunk/pkgs/top-level/all-packages.nix
==============================================================================
--- nixpkgs/trunk/pkgs/top-level/all-packages.nix Tue Apr 26 20:57:04
2011 (r26978)
+++ nixpkgs/trunk/pkgs/top-level/all-packages.nix Tue Apr 26 20:57:11
2011 (r26979)
@@ -4316,9 +4316,9 @@
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 { };
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
