From 49c1f415e85e6abf44df5826e887558c53412b2c Mon Sep 17 00:00:00 2001 From: Jan Malakhovski Date: Sat, 3 Sep 2016 13:42:18 +0000 Subject: [PATCH 1/2] xapian: 1.2.23 -> 1.4.0 --- pkgs/development/libraries/xapian/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/xapian/default.nix b/pkgs/development/libraries/xapian/default.nix index 7c4b699e615..36b55c59c24 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.23"; + version = "1.4.0"; src = fetchurl { url = "http://oligarchy.co.uk/xapian/${version}/xapian-core-${version}.tar.xz"; - sha256 = "0z9lhvfaazzmd611bnii9a0d19sqnjs0s9vbcgjhcv8s9spax0wp"; + sha256 = "0xv4da5rmqqzkkkzx2v3jwh5hz5zxhd2b7m8x30fk99a25blyn0h"; }; outputs = [ "out" "doc" ]; From 6cd407de28c98a9427617e8b9b0994a8fab5e8d8 Mon Sep 17 00:00:00 2001 From: Jan Malakhovski Date: Sat, 3 Sep 2016 13:42:53 +0000 Subject: [PATCH 2/2] xapian-omega: 1.2.21 -> 1.4.0 --- pkgs/tools/misc/xapian-omega/default.nix | 8 ++++---- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/misc/xapian-omega/default.nix b/pkgs/tools/misc/xapian-omega/default.nix index 19bbdceb09e..c3798878f1b 100644 --- a/pkgs/tools/misc/xapian-omega/default.nix +++ b/pkgs/tools/misc/xapian-omega/default.nix @@ -1,15 +1,15 @@ -{ stdenv, fetchurl, pkgconfig, xapian, perl, pcre, zlib }: +{ stdenv, fetchurl, pkgconfig, xapian, perl, pcre, zlib, libmagic }: stdenv.mkDerivation rec { name = "xapian-omega-${version}"; - version = "1.2.21"; + version = "1.4.0"; src = fetchurl { url = "http://oligarchy.co.uk/xapian/${version}/xapian-omega-${version}.tar.xz"; - sha256 = "0zjjr4ypanwrjkcpgi37d72v2jjcfwnw8lgddv0i7z2jf1fklbc6"; + sha256 = "07s341m1csk4v7mc44mqrzc1nxpnmdkji9k1cirbx6q0nlshdz0h"; }; - buildInputs = [ pkgconfig xapian perl pcre zlib ]; + buildInputs = [ pkgconfig xapian perl pcre zlib libmagic ]; meta = with stdenv.lib; { description = "Indexer and CGI search front-end built on Xapian library"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9c47d59069a..f9d8fc3f1da 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9800,7 +9800,9 @@ in php = php56; }; - xapian-omega = callPackage ../tools/misc/xapian-omega {}; + xapian-omega = callPackage ../tools/misc/xapian-omega { + libmagic = file; + }; xavs = callPackage ../development/libraries/xavs { };