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
This commit is contained in:
commit
ad8857a81a
|
@ -106,5 +106,6 @@ stdenv.mkDerivation rec {
|
|||
homepage = http://kiwix.org;
|
||||
license = licenses.gpl3;
|
||||
maintainers = with maintainers; [ robbinch ];
|
||||
broken = true;
|
||||
};
|
||||
}
|
||||
|
|
|
@ -1,8 +1,9 @@
|
|||
source "https://rubygems.org"
|
||||
|
||||
gem 'rake'
|
||||
gem 'sup'
|
||||
gem 'gpgme'
|
||||
|
||||
# Sup tries to `xapian-ruby` in its extconf instead of listing it as a
|
||||
# dependency.
|
||||
gem 'xapian-ruby', "~> 1.2.15"
|
||||
gem 'xapian-ruby', "~> 1.2.22"
|
||||
|
|
|
@ -2,33 +2,40 @@ GEM
|
|||
remote: https://rubygems.org/
|
||||
specs:
|
||||
chronic (0.9.1)
|
||||
gpgme (2.0.7)
|
||||
mini_portile (>= 0.5.0, <= 0.6.0)
|
||||
highline (1.6.21)
|
||||
locale (2.1.0)
|
||||
gpgme (2.0.12)
|
||||
mini_portile2 (~> 2.1.0)
|
||||
highline (1.7.8)
|
||||
locale (2.1.2)
|
||||
lockfile (2.1.3)
|
||||
mime-types (1.25.1)
|
||||
mini_portile (0.6.0)
|
||||
mime-types (3.0)
|
||||
mime-types-data (~> 3.2015)
|
||||
mime-types-data (3.2016.0221)
|
||||
mini_portile2 (2.1.0)
|
||||
ncursesw (1.4.9)
|
||||
rake (11.1.2)
|
||||
rmail-sup (1.0.1)
|
||||
sup (0.20.0)
|
||||
sup (0.22.1)
|
||||
chronic (~> 0.9.1)
|
||||
highline
|
||||
locale (~> 2.0)
|
||||
lockfile
|
||||
mime-types (~> 1.0)
|
||||
mime-types (> 2.0)
|
||||
ncursesw (~> 1.4.0)
|
||||
rmail-sup (~> 1.0.1)
|
||||
trollop (>= 1.12)
|
||||
unicode (~> 0.4.4)
|
||||
trollop (2.1.1)
|
||||
trollop (2.1.2)
|
||||
unicode (0.4.4.2)
|
||||
xapian-ruby (1.2.19.1)
|
||||
xapian-ruby (1.2.22)
|
||||
|
||||
PLATFORMS
|
||||
ruby
|
||||
|
||||
DEPENDENCIES
|
||||
gpgme
|
||||
rake
|
||||
sup
|
||||
xapian-ruby (~> 1.2.15)
|
||||
xapian-ruby (~> 1.2.22)
|
||||
|
||||
BUNDLED WITH
|
||||
1.10.6
|
||||
|
|
|
@ -2,9 +2,14 @@
|
|||
, pkgconfig, which }:
|
||||
|
||||
bundlerEnv {
|
||||
name = "sup-0.20.0";
|
||||
name = "sup-0.22.1";
|
||||
|
||||
inherit ruby;
|
||||
|
||||
# Updated with:
|
||||
# nix-shell -p bundix -p bundler -p ncurses -p ruby -p which -p zlib -p libuuid
|
||||
# bundle install --path ./vendor
|
||||
# bundix
|
||||
gemfile = ./Gemfile;
|
||||
lockfile = ./Gemfile.lock;
|
||||
gemset = ./gemset.nix;
|
||||
|
|
|
@ -1,107 +1,126 @@
|
|||
{
|
||||
"chronic" = {
|
||||
version = "0.9.1";
|
||||
xapian-ruby = {
|
||||
version = "1.2.22";
|
||||
source = {
|
||||
type = "gem";
|
||||
sha256 = "0kspaxpfy7yvyk1lvpx31w852qfj8wb9z04mcj5bzi70ljb9awqk";
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1xbarnxmhy6r0rxpspn4wk85j183w6b18nah73djcs06b3gfas15";
|
||||
};
|
||||
dependencies = [ "rake" ];
|
||||
};
|
||||
"gpgme" = {
|
||||
version = "2.0.7";
|
||||
source = {
|
||||
type = "gem";
|
||||
sha256 = "1p84zhiri2ihcld7py9mwc2kg5xs5da8fk11zhndrhmw05yvf5mr";
|
||||
};
|
||||
dependencies = [
|
||||
"mini_portile"
|
||||
];
|
||||
};
|
||||
"highline" = {
|
||||
version = "1.6.21";
|
||||
source = {
|
||||
type = "gem";
|
||||
sha256 = "06bml1fjsnrhd956wqq5k3w8cyd09rv1vixdpa3zzkl6xs72jdn1";
|
||||
};
|
||||
};
|
||||
"locale" = {
|
||||
version = "2.1.0";
|
||||
source = {
|
||||
type = "gem";
|
||||
sha256 = "18bb0g24flq9dr8qv4j7pm7w9i2vmvmqrbmry95ibf1r1c4s60yj";
|
||||
};
|
||||
};
|
||||
"lockfile" = {
|
||||
version = "2.1.3";
|
||||
source = {
|
||||
type = "gem";
|
||||
sha256 = "0dij3ijywylvfgrpi2i0k17f6w0wjhnjjw0k9030f54z56cz7jrr";
|
||||
};
|
||||
};
|
||||
"mime-types" = {
|
||||
version = "1.25.1";
|
||||
source = {
|
||||
type = "gem";
|
||||
sha256 = "0mhzsanmnzdshaba7gmsjwnv168r1yj8y0flzw88frw1cickrvw8";
|
||||
};
|
||||
};
|
||||
"mini_portile" = {
|
||||
version = "0.6.0";
|
||||
source = {
|
||||
type = "gem";
|
||||
sha256 = "09kcn4g63xrdirgwxgjikqg976rr723bkc9bxfr29pk22cj3wavn";
|
||||
};
|
||||
};
|
||||
"ncursesw" = {
|
||||
version = "1.4.9";
|
||||
source = {
|
||||
type = "gem";
|
||||
sha256 = "154cls3b237imdbhih7rni5p85nw6mpbpkzdw08jxzvqaml7q093";
|
||||
};
|
||||
};
|
||||
"rmail-sup" = {
|
||||
version = "1.0.1";
|
||||
source = {
|
||||
type = "gem";
|
||||
sha256 = "1xswk101s560lxqaax3plqh8vjx7jjspnggdwb3q80m358f92q9g";
|
||||
};
|
||||
};
|
||||
"sup" = {
|
||||
version = "0.20.0";
|
||||
source = {
|
||||
type = "gem";
|
||||
sha256 = "1lpqgrqkv29xr1h1142qsbmknlshpgys7fc3w1nkyhib8s3ikamg";
|
||||
};
|
||||
dependencies = [
|
||||
"chronic"
|
||||
"highline"
|
||||
"locale"
|
||||
"lockfile"
|
||||
"mime-types"
|
||||
"ncursesw"
|
||||
"rmail-sup"
|
||||
"trollop"
|
||||
"unicode"
|
||||
];
|
||||
};
|
||||
"trollop" = {
|
||||
version = "2.1.1";
|
||||
source = {
|
||||
type = "gem";
|
||||
sha256 = "0z5dvh7glwqjprlihsjx67hfzy4whsjfhqj9akyyrby9q5va1i4k";
|
||||
};
|
||||
};
|
||||
"unicode" = {
|
||||
unicode = {
|
||||
version = "0.4.4.2";
|
||||
source = {
|
||||
type = "gem";
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "15fggljzan8zvmr8h12b5m7pcj1gvskmmnx367xs4p0rrpnpil8g";
|
||||
};
|
||||
};
|
||||
"xapian-ruby" = {
|
||||
version = "1.2.19.1";
|
||||
trollop = {
|
||||
version = "2.1.2";
|
||||
source = {
|
||||
type = "gem";
|
||||
sha256 = "1crfrmc8kf6qq1xcfcmgf213zg66badpg4d86n7y9x3i1f5lxlbv";
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0415y63df86sqj43c0l82and65ia5h64if7n0znkbrmi6y0jwhl8";
|
||||
};
|
||||
};
|
||||
}
|
||||
sup = {
|
||||
version = "0.22.1";
|
||||
source = {
|
||||
type = "gem";
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "17s2sxismf46zdhgr6g2v53fw9f3sp1ijx7xdw3wx8qpcsgazcgi";
|
||||
};
|
||||
dependencies = ["chronic" "highline" "locale" "lockfile" "mime-types" "ncursesw" "rmail-sup" "trollop" "unicode" "rake" ];
|
||||
};
|
||||
rmail-sup = {
|
||||
version = "1.0.1";
|
||||
source = {
|
||||
type = "gem";
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1xswk101s560lxqaax3plqh8vjx7jjspnggdwb3q80m358f92q9g";
|
||||
};
|
||||
};
|
||||
rake = {
|
||||
version = "11.1.2";
|
||||
source = {
|
||||
type = "gem";
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0jfmy7kd543ldi3d4fg35a1w7q6jikpnzxqj4bzchfbn94cbabqz";
|
||||
};
|
||||
};
|
||||
ncursesw = {
|
||||
version = "1.4.9";
|
||||
source = {
|
||||
type = "gem";
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "154cls3b237imdbhih7rni5p85nw6mpbpkzdw08jxzvqaml7q093";
|
||||
};
|
||||
};
|
||||
mini_portile2 = {
|
||||
version = "2.1.0";
|
||||
source = {
|
||||
type = "gem";
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1y25adxb1hgg1wb2rn20g3vl07qziq6fz364jc5694611zz863hb";
|
||||
};
|
||||
};
|
||||
mime-types-data = {
|
||||
version = "3.2016.0221";
|
||||
source = {
|
||||
type = "gem";
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "05ygjn0nnfh6yp1wsi574jckk95wqg9a6g598wk4svvrkmkrzkpn";
|
||||
};
|
||||
};
|
||||
mime-types = {
|
||||
version = "3.0";
|
||||
source = {
|
||||
type = "gem";
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1snjc38a9vqvy8j41xld1i1byq9prbl955pbjw7dxqcfcirqlzra";
|
||||
};
|
||||
dependencies = ["mime-types-data"];
|
||||
};
|
||||
lockfile = {
|
||||
version = "2.1.3";
|
||||
source = {
|
||||
type = "gem";
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0dij3ijywylvfgrpi2i0k17f6w0wjhnjjw0k9030f54z56cz7jrr";
|
||||
};
|
||||
};
|
||||
locale = {
|
||||
version = "2.1.2";
|
||||
source = {
|
||||
type = "gem";
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1sls9bq4krx0fmnzmlbn64dw23c4d6pz46ynjzrn9k8zyassdd0x";
|
||||
};
|
||||
};
|
||||
highline = {
|
||||
version = "1.7.8";
|
||||
source = {
|
||||
type = "gem";
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1nf5lgdn6ni2lpfdn4gk3gi47fmnca2bdirabbjbz1fk9w4p8lkr";
|
||||
};
|
||||
};
|
||||
gpgme = {
|
||||
version = "2.0.12";
|
||||
source = {
|
||||
type = "gem";
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0a04a76dw9dias0a8rp6dyk3vx2y024gim40lg2md6zdh2m1kx85";
|
||||
};
|
||||
dependencies = ["mini_portile2"];
|
||||
};
|
||||
chronic = {
|
||||
version = "0.9.1";
|
||||
source = {
|
||||
type = "gem";
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0kspaxpfy7yvyk1lvpx31w852qfj8wb9z04mcj5bzi70ljb9awqk";
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
|
@ -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 ];
|
||||
};
|
||||
}
|
|
@ -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 ];
|
||||
};
|
||||
}
|
|
@ -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;
|
||||
|
|
|
@ -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" ];
|
||||
|
|
|
@ -1591,11 +1591,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;
|
||||
|
||||
|
@ -1939,12 +1939,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 { };
|
||||
|
@ -9044,11 +9044,7 @@ in
|
|||
xapian = callPackage ../development/libraries/xapian { };
|
||||
|
||||
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
|
||||
php = php56;
|
||||
};
|
||||
|
||||
xapian-omega = callPackage ../tools/misc/xapian-omega {};
|
||||
|
@ -13192,7 +13188,7 @@ in
|
|||
smtube = qt5.callPackage ../applications/video/smtube {};
|
||||
|
||||
sup = callPackage ../applications/networking/mailreaders/sup {
|
||||
ruby = ruby_1_9.override { cursesSupport = true; };
|
||||
ruby = ruby_2_3.override { cursesSupport = true; };
|
||||
};
|
||||
|
||||
synapse = callPackage ../applications/misc/synapse {
|
||||
|
|
|
@ -7099,11 +7099,11 @@ in modules // {
|
|||
|
||||
|
||||
pyramid_beaker = buildPythonPackage rec {
|
||||
name = "pyramid_beaker-0.7";
|
||||
name = "pyramid_beaker-0.8";
|
||||
|
||||
src = pkgs.fetchurl {
|
||||
url = "http://pypi.python.org/packages/source/p/pyramid_beaker/${name}.tar.gz";
|
||||
sha256 = "c76578dac3ea717e9ca89c327daf13975987d0b8827d15157319c20614fab74a";
|
||||
sha256 = "0hflx3qkcdml1mwpq53sz46s7jickpfn0zy0ns2c7j445j66bp3p";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = with self; [ beaker pyramid ];
|
||||
|
@ -7111,6 +7111,7 @@ in modules // {
|
|||
meta = {
|
||||
maintainers = with maintainers; [ iElectric ];
|
||||
platforms = platforms.all;
|
||||
broken = true;
|
||||
};
|
||||
};
|
||||
|
||||
|
|
Loading…
Reference in a new issue