nathan/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2026-09-29 19:30:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #79772 from wamserma/fix-aspell-CVEs-backport

Browse Source 
[19.09] aspell: 0.60.6.1 -> 0.60.8
This commit is contained in:
Robert Scott
2020-04-15 22:11:06 +01:00
committed by GitHub
parent f6c1d3b113 24ad80200f
commit b67bc34d4e
1 changed files with 4 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
pkgs/development/libraries/aspell/default.nix
View File

@@ -15,31 +15,20 @@ let
in
stdenv.mkDerivation rec {
name = "aspell-0.60.6.1";
name = "aspell-0.60.8";
src = fetchurl {
url = "mirror://gnu/aspell/${name}.tar.gz";
sha256 = "1qgn5psfyhbrnap275xjfrzppf5a83fb67gpql0kfqv37al869gm";
sha256 = "1wi60ankalmh8ds7nplz434jd7j94gdvbahdwsr539rlad8pxdzr";
};
patches = [
(fetchpatch { # remove in >= 0.60.7
name = "gcc-7.patch";
url = "https://github.com/GNUAspell/aspell/commit/8089fa02122fed0a.diff";
sha256 = "1b3p1zy2lqr2fknddckm58hyk95hw4scf6hzjny1v9iaic2p37ix";
})
(fetchpatch {
name = "CVE-2019-17544.patch";
url = "https://github.com/GNUAspell/aspell/commit/80fa26c74279fced8d778351cff19d1d8f44fe4e.patch";
sha256 = "0k5dnh8gcb7chnyx7jgkksqmz2hm05hmrvcd0znsfib975pvp4rg";
})
] ++ stdenv.lib.optional searchNixProfiles ./data-dirs-from-nix-profiles.patch;
patches = stdenv.lib.optional searchNixProfiles ./data-dirs-from-nix-profiles.patch;
postPatch = ''
patch interfaces/cc/aspell.h < ${./clang.patch}
'';
nativeBuildInputs = [ perl ];
buildInputs = [ perl ];
doCheck = true;