astroid: 0.11.1 -> 0.13

Couple of things were updated to make this work.

1. webkitgtk24x-gtk3 that is marked unsafe has been replaced with
   webkitgtk (2.20.*) as astroid has recently indicated that [>= 2.20
   is
   acceptable](48ce7e3010)
2. protobuf built input was added to satisfy requirements
3. astroid was not functional at all without proper icons so gnome3.defaultIconTheme
   were added to buildInputs
4. By default, astroid will use `gvim` as a setting for the embedded
   editor, however that didn't work well with nixpkgs. vim is now
   bundled with astroid by default. This setting can be overridden
   by the user in astroid's config file.
This commit is contained in:
Yurii Rashkovskii 2018-08-08 14:04:35 +07:00 committed by Robin Gloster
parent 8bb5054494
commit 61c0adfbc1
2 changed files with 39 additions and 7 deletions

View file

@ -1,22 +1,44 @@
{ stdenv, fetchFromGitHub, cmake, pkgconfig, gnome3, gmime3, webkitgtk24x-gtk3
, libsass, notmuch, boost, wrapGAppsHook, glib-networking }:
{ stdenv, fetchFromGitHub, cmake, pkgconfig, gnome3, gmime3, webkitgtk
, libsass, notmuch, boost, wrapGAppsHook, glib-networking, protobuf, vim_configurable
, makeWrapper, python3, python3Packages
, vim ? vim_configurable.override {
features = "normal";
gui = "auto";
}
}:
stdenv.mkDerivation rec {
name = "astroid-${version}";
version = "0.11.1";
version = "0.13";
src = fetchFromGitHub {
owner = "astroidmail";
repo = "astroid";
rev = "v${version}";
sha256 = "1z48rvlzwi7bq7j55rnb0gg1a4k486yj910z2cxz1p46lxk332j1";
sha256 = "105x5g44hng3fi03h67j3an53088148jbq8726nmcp0zs0cy9gac";
};
nativeBuildInputs = [ cmake pkgconfig wrapGAppsHook ];
buildInputs = [ gnome3.gtkmm gmime3 webkitgtk24x-gtk3 libsass gnome3.libpeas
notmuch boost gnome3.gsettings-desktop-schemas
glib-networking ];
buildInputs = [ gnome3.gtkmm gmime3 webkitgtk libsass gnome3.libpeas
python3 python3Packages.pygobject3
notmuch boost gnome3.gsettings-desktop-schemas gnome3.defaultIconTheme
glib-networking protobuf ] ++ (if vim == null then [] else [ vim ]);
patches = [
# TODO: remove when https://github.com/astroidmail/astroid/pull/531
# is released
./run_tests.diff
];
postPatch = ''
sed -i "s~gvim ~${vim}/bin/vim -g ~g" src/config.cc
sed -i "s~ -geom 10x10~~g" src/config.cc
'';
postInstall = ''
wrapProgram "$out/bin/astroid" --set CHARSET=en_us.UTF-8
'';
meta = with stdenv.lib; {
homepage = https://astroidmail.github.io/;

View file

@ -0,0 +1,10 @@
diff --git a/tests/run_test.sh b/tests/run_test.sh
index f2ea7d7..927c61d 100755
--- a/tests/run_test.sh
+++ b/tests/run_test.sh
@@ -1,4 +1,4 @@
-#! /bin/bash
+#! /usr/bin/env bash
#
# Set up environment and run test specified on command line