Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: c090edf752af
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 648678f6e14a
Choose a head ref
  • 1 commit
  • 1 file changed
  • 1 contributor

Commits on Nov 23, 2019

  1. aspell: 0.60.6.1 -> 0.60.8 

    See http://aspell.net/aspell-0.60.8.txt for release information.
(#71242)
    @lsix @c0bw3b
    lsix authored and c0bw3b committed Nov 23, 2019

    Verified

    This commit was signed with the committer’s verified signature.
    sikmir Nikolay Korotkiy
    GPG key ID: D1DE6D7F693663A5
    Verified
    Learn about vigilant mode
    Copy the full SHA
    648678f View commit details
Showing with 4 additions and 10 deletions.
  1. +4 −10 pkgs/development/libraries/aspell/default.nix
14 changes: 4 additions & 10 deletions pkgs/development/libraries/aspell/default.nix
View file
Original file line number Diff line number Diff line change
@@ -15,26 +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";
})
] ++ 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;