diff options
| author | Alyssa Ross <hi@alyssa.is> | 2022-12-06 19:57:55 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2023-02-08 13:48:30 +0000 |
| commit | bf3aadfdd39aa197e18bade671fab6726349ffa4 (patch) | |
| tree | 698567af766ed441d757b57a7b21e68d4a342a2b /nixpkgs/pkgs/development/libraries/xapian | |
| parent | f4afc5a01d9539ce09e47494e679c51f80723d07 (diff) | |
| parent | 99665eb45f58d959d2cb9e49ddb960c79d596f33 (diff) | |
| download | nixlib-bf3aadfdd39aa197e18bade671fab6726349ffa4.tar nixlib-bf3aadfdd39aa197e18bade671fab6726349ffa4.tar.gz nixlib-bf3aadfdd39aa197e18bade671fab6726349ffa4.tar.bz2 nixlib-bf3aadfdd39aa197e18bade671fab6726349ffa4.tar.lz nixlib-bf3aadfdd39aa197e18bade671fab6726349ffa4.tar.xz nixlib-bf3aadfdd39aa197e18bade671fab6726349ffa4.tar.zst nixlib-bf3aadfdd39aa197e18bade671fab6726349ffa4.zip | |
Merge commit '99665eb45f58d959d2cb9e49ddb960c79d596f33'
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/xapian')
| -rw-r--r-- | nixpkgs/pkgs/development/libraries/xapian/default.nix | 9 | ||||
| -rw-r--r-- | nixpkgs/pkgs/development/libraries/xapian/tools/omega/default.nix | 6 |
2 files changed, 9 insertions, 6 deletions
diff --git a/nixpkgs/pkgs/development/libraries/xapian/default.nix b/nixpkgs/pkgs/development/libraries/xapian/default.nix index 4d23752b2420..6d617564b04e 100644 --- a/nixpkgs/pkgs/development/libraries/xapian/default.nix +++ b/nixpkgs/pkgs/development/libraries/xapian/default.nix @@ -2,14 +2,14 @@ , libuuid, zlib }: let - generic = version: sha256: stdenv.mkDerivation { + generic = version: hash: stdenv.mkDerivation { pname = "xapian"; inherit version; passthru = { inherit version; }; src = fetchurl { url = "https://oligarchy.co.uk/xapian/${version}/xapian-core-${version}.tar.xz"; - inherit sha256; + inherit hash; }; outputs = [ "out" "man" "doc" ]; @@ -38,5 +38,8 @@ let }; }; in { - xapian_1_4 = generic "1.4.19" "sha256-H8pI/KbMNSbMS6k90ZT+nBMmhXt47c+zfmjQhtcUqcM="; + # Don't forget to change the hashes in xapian-omega and + # python3Packages.xapian. They inherit the version from this package, and + # should always be built with the equivalent xapian version. + xapian_1_4 = generic "1.4.20" "sha256-zivl7/cgdcgQbANA5wsQk9vOviq0LcHBvgjdOtQZRC0="; } diff --git a/nixpkgs/pkgs/development/libraries/xapian/tools/omega/default.nix b/nixpkgs/pkgs/development/libraries/xapian/tools/omega/default.nix index 79e5786f0488..eb03defbf2a6 100644 --- a/nixpkgs/pkgs/development/libraries/xapian/tools/omega/default.nix +++ b/nixpkgs/pkgs/development/libraries/xapian/tools/omega/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkg-config, xapian, perl, pcre, zlib, libmagic }: +{ lib, stdenv, fetchurl, pkg-config, xapian, perl, pcre2, zlib, libmagic }: stdenv.mkDerivation rec { pname = "xapian-omega"; @@ -6,10 +6,10 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://oligarchy.co.uk/xapian/${version}/xapian-omega-${version}.tar.xz"; - sha256 = "0zji8ckp4h5xdy2wbir3lvk680w1g1l4h5swmaxsx7ah12lkrjcr"; + hash = "sha256-Cf19bGCzlP0A2EcAZJlpofzDqiuIuyxsoiD9+o0liB8="; }; - buildInputs = [ xapian perl pcre zlib libmagic ]; + buildInputs = [ xapian perl pcre2 zlib libmagic ]; nativeBuildInputs = [ pkg-config ]; meta = with lib; { |