diff options
author | Graham Christensen <graham@grahamc.com> | 2016-03-31 14:00:50 -0500 |
---|---|---|
committer | Graham Christensen <graham@grahamc.com> | 2016-04-04 07:42:38 -0500 |
commit | 2c0310d8d8e84967418aa4224f00664966161608 (patch) | |
tree | 99722f0a95e1dd630c4f078c2e66c9a32fce1f72 /pkgs | |
parent | c74cbb824b334ba8bb5aecb519d4a8db1dc558e3 (diff) | |
download | nixlib-2c0310d8d8e84967418aa4224f00664966161608.tar nixlib-2c0310d8d8e84967418aa4224f00664966161608.tar.gz nixlib-2c0310d8d8e84967418aa4224f00664966161608.tar.bz2 nixlib-2c0310d8d8e84967418aa4224f00664966161608.tar.lz nixlib-2c0310d8d8e84967418aa4224f00664966161608.tar.xz nixlib-2c0310d8d8e84967418aa4224f00664966161608.tar.zst nixlib-2c0310d8d8e84967418aa4224f00664966161608.zip |
xapian10/xapianBindings10: Remove, 5 years old.
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/development/libraries/xapian/1.0.x.nix | 19 | ||||
-rw-r--r-- | pkgs/development/libraries/xapian/bindings/1.0.x.nix | 73 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 15 |
3 files changed, 5 insertions, 102 deletions
diff --git a/pkgs/development/libraries/xapian/1.0.x.nix b/pkgs/development/libraries/xapian/1.0.x.nix deleted file mode 100644 index b89900d2b05e..000000000000 --- a/pkgs/development/libraries/xapian/1.0.x.nix +++ /dev/null @@ -1,19 +0,0 @@ -{ stdenv, fetchurl, zlib }: - -stdenv.mkDerivation { - name = "xapian-1.0.23"; - - src = fetchurl { - url = http://oligarchy.co.uk/xapian/1.0.23/xapian-core-1.0.23.tar.gz; - sha256 = "0aed7296bd56b4b49aba944cc744e1e76fff8cfb0a70fd5b1f49d4c62a97ecc6"; - }; - - buildInputs = [ zlib ]; - - meta = { - description = "Xapian Probabilistic Information Retrieval library"; - homepage = "http://xapian.org"; - license = stdenv.lib.licenses.gpl2Plus; - maintainers = [ stdenv.lib.maintainers.chaoflow ]; - }; -} diff --git a/pkgs/development/libraries/xapian/bindings/1.0.x.nix b/pkgs/development/libraries/xapian/bindings/1.0.x.nix deleted file mode 100644 index 5d69f73d7973..000000000000 --- a/pkgs/development/libraries/xapian/bindings/1.0.x.nix +++ /dev/null @@ -1,73 +0,0 @@ -{ stdenv, composableDerivation, fetchurl, xapian10, pkgconfig -, python ? null, php ? null, ruby ? null }: - -let inherit (composableDerivation) wwf; in - -composableDerivation.composableDerivation {} rec { - - name = "xapian-bindings-1.0.23"; - - src = fetchurl { - url = "http://oligarchy.co.uk/xapian/1.0.23/${name}.tar.gz"; - sha256 = "6028123c3cd9bfc380b672b89f5420f7d5c063fc3511dee4dd5d34033ccb6911"; - }; - - buildInputs = [ xapian10 pkgconfig ]; - - # most interpreters aren't tested yet.. (see python for example how to do it) - flags = - wwf { - name = "python"; - enable = { - buildInputs = [ python ]; - # export same env vars as in pythonNew - preConfigure = '' - export PYTHON_LIB=$out/lib/${python.libPrefix}/site-packages - mkdir -p $out/nix-support - echo "export NIX_PYTHON_SITES=\"$out:\$NIX_PYTHON_SITES\"" >> $out/nix-support/setup-hook - echo "export PYTHONPATH=\"$PYTHON_LIB:\$PYTHONPATH\"" >> $out/nix-support/setup-hook - ''; - }; - } - // wwf { - name = "php"; - enable = { - buildInputs = [ php ]; - preConfigure = '' - export PHP_EXTENSION_DIR=$out/lib/php # TODO use a sane directory. Its not used anywhere by now - ''; - }; - } - // wwf { - name = "ruby"; - enable = { - buildInputs = [ ruby ]; - preConfigure = '' - export RUBY_LIB=$out/${ruby.libPath} - export RUBY_LIB_ARCH=$RUBY_LIB - mkdir -p $out/nix-support - echo "export RUBYLIB=\"$RUBY_LIB:\$RUBYLIB\"" >> $out/nix-support/setup-hook - echo "export GEM_PATH=\"$out:\$GEM_PATH\"" >> $out/nix-support/setup-hook - ''; - }; - } - - # note: see configure --help to get see which env vars can be used - # // wwf { name = "tcl"; enable = { buildInputs = [ tcl ];};} - # // wwf { name = "csharp"; } - # // wwf { name = "java"; } - ; - - cfg = { - pythonSupport = true; - phpSupport = true; - rubySupport = true; - }; - - meta = { - description = "Bindings for the Xapian library"; - homepage = xapian10.meta.homepage; - license = stdenv.lib.licenses.gpl2Plus; - maintainers = [ stdenv.lib.maintainers.chaoflow ]; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 19631d7fc56a..65f793dc5bae 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1590,11 +1590,11 @@ in gazebo6-headless = callPackage ../applications/science/robotics/gazebo/6.nix { withHeadless = true; }; gazebo7 = callPackage ../applications/science/robotics/gazebo { }; - + gazebo7-headless = callPackage ../applications/science/robotics/gazebo { withHeadless = true; }; }; - + # at present, Gazebo 7.0.0 does not match Gazebo 6.5.1 for compatibility gazebo = gazeboSimulator.gazebo6; @@ -1938,12 +1938,12 @@ in ifuse = callPackage ../tools/filesystems/ifuse/default.nix { }; - ignition = recurseIntoAttrs { + ignition = recurseIntoAttrs { math = callPackage ../development/libraries/ignition-math { }; - + math2 = ignition.math; - + transport0 = callPackage ../development/libraries/ignition-transport/0.9.0.nix { }; transport1 = callPackage ../development/libraries/ignition-transport/1.0.1.nix { }; @@ -9045,11 +9045,6 @@ in xapianBindings = callPackage ../development/libraries/xapian/bindings { # TODO perl php Java, tcl, C#, python }; - xapian10 = callPackage ../development/libraries/xapian/1.0.x.nix { }; - - xapianBindings10 = callPackage ../development/libraries/xapian/bindings/1.0.x.nix { # TODO perl php Java, tcl, C#, python - }; - xapian-omega = callPackage ../tools/misc/xapian-omega {}; xavs = callPackage ../development/libraries/xavs { }; |