diff options
author | joachifm <joachifm@users.noreply.github.com> | 2016-04-04 22:53:47 +0200 |
---|---|---|
committer | joachifm <joachifm@users.noreply.github.com> | 2016-04-04 22:53:47 +0200 |
commit | ad8857a81a05062ef8b9dd622f426a27662d1551 (patch) | |
tree | c627b7452e7043e40e2aafd0bc149246653895fa /pkgs/development | |
parent | d54bc765b5662ebe4529a8d8754a9bf5d00a256b (diff) | |
parent | 5024e035428960b6177ab9c90879eb648f41ffa2 (diff) | |
download | nixlib-ad8857a81a05062ef8b9dd622f426a27662d1551.tar nixlib-ad8857a81a05062ef8b9dd622f426a27662d1551.tar.gz nixlib-ad8857a81a05062ef8b9dd622f426a27662d1551.tar.bz2 nixlib-ad8857a81a05062ef8b9dd622f426a27662d1551.tar.lz nixlib-ad8857a81a05062ef8b9dd622f426a27662d1551.tar.xz nixlib-ad8857a81a05062ef8b9dd622f426a27662d1551.tar.zst nixlib-ad8857a81a05062ef8b9dd622f426a27662d1551.zip |
Merge pull request #14367 from grahamc/xapian-sup-kiwix
Xapian: Remove 1.0, Upgrade 1.2, and pin bindings to php 5.6, Fix `sup`, and mark `Kiwix` as Broken
Diffstat (limited to 'pkgs/development')
-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/development/libraries/xapian/bindings/default.nix | 18 | ||||
-rw-r--r-- | pkgs/development/libraries/xapian/default.nix | 4 |
4 files changed, 11 insertions, 103 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/development/libraries/xapian/bindings/default.nix b/pkgs/development/libraries/xapian/bindings/default.nix index 740b71c59a7d..ed7c1e046d55 100644 --- a/pkgs/development/libraries/xapian/bindings/default.nix +++ b/pkgs/development/libraries/xapian/bindings/default.nix @@ -5,11 +5,11 @@ let inherit (composableDerivation) wwf; in composableDerivation.composableDerivation {} rec { - name = "xapian-bindings-1.2.8"; + name = "xapian-bindings-1.2.23"; src = fetchurl { - url = "http://oligarchy.co.uk/xapian/1.2.8/${name}.tar.gz"; - sha256 = "eb740c619c75d288e65a1c2f86faecdca53d44d3f9896bcc080085839887b124"; + url = "http://oligarchy.co.uk/xapian/1.2.23/${name}.tar.xz"; + sha256 = "05929d9bq9df25kh2i6gk2w09w7p5qknf9cc7mrm2g46finbbd0r"; }; buildInputs = [ xapian pkgconfig zlib ]; @@ -24,8 +24,8 @@ composableDerivation.composableDerivation {} rec { 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 + 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 ''; }; } @@ -46,8 +46,8 @@ composableDerivation.composableDerivation {} rec { 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 + echo "export RUBYLIB=\"$RUBY_LIB:\$RUBYLIB\"" >> $out/nix-support/setup-hook + echo "export GEM_PATH=\"$out:\$GEM_PATH\"" >> $out/nix-support/setup-hook ''; }; } @@ -60,11 +60,11 @@ composableDerivation.composableDerivation {} rec { cfg = { pythonSupport = true; - phpSupport = true; + phpSupport = false; rubySupport = true; }; - meta = { + meta = { description = "Bindings for the Xapian library"; homepage = xapian.meta.homepage; license = stdenv.lib.licenses.gpl2Plus; diff --git a/pkgs/development/libraries/xapian/default.nix b/pkgs/development/libraries/xapian/default.nix index 89f97292d39d..8a09d835f3da 100644 --- a/pkgs/development/libraries/xapian/default.nix +++ b/pkgs/development/libraries/xapian/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "xapian-${version}"; - version = "1.2.21"; + version = "1.2.23"; src = fetchurl { url = "http://oligarchy.co.uk/xapian/${version}/xapian-core-${version}.tar.xz"; - sha256 = "0grd2s6gf8yzqwdaa50g57j9d81mxkrrpkyldm2shgyizdc8gx33"; + sha256 = "0z9lhvfaazzmd611bnii9a0d19sqnjs0s9vbcgjhcv8s9spax0wp"; }; outputs = [ "out" "doc" ]; |