public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

astroid: 0.13 -> 0.14

Browse Source
This commit is contained in:
Yurii Rashkovskii 2018-10-05 17:52:24 -07:00
parent 9289920193
commit f0e5a51c98
No known key found for this signature in database
GPG Key ID: 1D60D7CFD80845FF
2 changed files with 6 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
pkgs/applications/networking/mailreaders/astroid/default.nix
View File

@ -1,36 +1,31 @@
{ stdenv, fetchFromGitHub, cmake, pkgconfig, gnome3, gmime3, webkitgtk { stdenv, fetchFromGitHub, cmake, pkgconfig, gnome3, gmime3, webkitgtk222x
, libsass, notmuch, boost, wrapGAppsHook, glib-networking, protobuf, vim_configurable , libsass, notmuch, boost, wrapGAppsHook, glib-networking, protobuf, vim_configurable
, makeWrapper, python3, python3Packages , makeWrapper, python3, python3Packages
, vim ? vim_configurable.override { , vim ? vim_configurable.override {
features = "normal"; features = "normal";
gui = "auto"; gui = "auto";
} }
, ronn
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "astroid-${version}"; name = "astroid-${version}";
version = "0.13"; version = "0.14";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "astroidmail"; owner = "astroidmail";
repo = "astroid"; repo = "astroid";
rev = "v${version}"; rev = "v${version}";
sha256 = "105x5g44hng3fi03h67j3an53088148jbq8726nmcp0zs0cy9gac"; sha256 = "1wkv1icsx3g3gq485dnvcdhr9srrjgz4ws1i1krcw9n61bj7gxh8";
}; };
nativeBuildInputs = [ cmake pkgconfig wrapGAppsHook ]; nativeBuildInputs = [ cmake ronn pkgconfig wrapGAppsHook ];
buildInputs = [ gnome3.gtkmm gmime3 webkitgtk libsass gnome3.libpeas buildInputs = [ gnome3.gtkmm gmime3 webkitgtk222x libsass gnome3.libpeas
python3 python3Packages.pygobject3 python3 python3Packages.pygobject3
notmuch boost gnome3.gsettings-desktop-schemas gnome3.defaultIconTheme notmuch boost gnome3.gsettings-desktop-schemas gnome3.defaultIconTheme
glib-networking protobuf ] ++ (if vim == null then [] else [ vim ]); 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 = '' postPatch = ''
sed -i "s~gvim ~${vim}/bin/vim -g ~g" src/config.cc sed -i "s~gvim ~${vim}/bin/vim -g ~g" src/config.cc
sed -i "s~ -geom 10x10~~g" src/config.cc sed -i "s~ -geom 10x10~~g" src/config.cc

10
pkgs/applications/networking/mailreaders/astroid/run_tests.diff
View File

@ -1,10 +0,0 @@
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