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: cc7b771fcfd1
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 608fe16482a6
Choose a head ref
  • 2 commits
  • 2 files changed
  • 1 contributor

Commits on Sep 9, 2017

  1. neomutt: 20170714 -> 20170907

    @peterhoeg
    peterhoeg committed Sep 9, 2017
    Copy the full SHA
    b21778f View commit details

  2. neovim-qt: 0.2.7 -> 0.2.8 

    We now also run some of the tests which is better than nothing.
    @peterhoeg
    peterhoeg committed Sep 9, 2017
    Copy the full SHA
    608fe16 View commit details
Showing with 18 additions and 18 deletions.
  1. +13 −13 pkgs/applications/editors/neovim/qt.nix
  2. +5 −5 pkgs/applications/networking/mailreaders/neomutt/default.nix
26 changes: 13 additions & 13 deletions pkgs/applications/editors/neovim/qt.nix
View file
Original file line number Diff line number Diff line change
@@ -3,28 +3,20 @@

stdenv.mkDerivation rec {
name = "neovim-qt-${version}";
version = "0.2.7";
version = "0.2.8";

src = fetchFromGitHub {
owner = "equalsraf";
repo = "neovim-qt";
rev = "v${version}";
sha256 = "1bfni38l7cs0wbd9c6hgz2jfc8h3ixmg94izdvydm8j7amdz0cb6";
sha256 = "190yg6kkw953h8wajlqr2hvs2fz65y6z0blmywlg1nff724allaq";
};

cmakeFlags = [
"-DMSGPACK_INCLUDE_DIRS=${libmsgpack}/include"
"-DMSGPACK_LIBRARIES=${libmsgpack}/lib/libmsgpackc.so"
];

# The following tests FAILED:
# 2 - tst_neovimconnector (Failed)
# 3 - tst_callallmethods (Failed)
# 4 - tst_encoding (Failed)
#
# Tests failed when upgraded to neovim 0.2.0
doCheck = false;

buildInputs = with pythonPackages; [
neovim qtbase libmsgpack
] ++ (with pythonPackages; [
@@ -38,18 +30,26 @@ stdenv.mkDerivation rec {
preConfigure = ''
# avoid cmake trying to download libmsgpack
echo "" > third-party/CMakeLists.txt
# we rip out the gui test as spawning a GUI fails in our build environment
sed -i '/^add_xtest_gui/d' test/CMakeLists.txt
# we rip out a number of tests that fail in the build env
# the GUI tests will never work but the others should - they did before neovim 0.2.0
# was released
sed -i test/CMakeLists.txt \
-e '/^add_xtest_gui/d' \
-e '/tst_neovimconnector/d' \
-e '/tst_callallmethods/d' \
-e '/tst_encoding/d'
'';

doCheck = true;

postInstall = ''
wrapProgram "$out/bin/nvim-qt" \
--prefix PATH : "${neovim}/bin"
'';

meta = with stdenv.lib; {
description = "Neovim client library and GUI, in Qt5";
license = licenses.isc;
license = licenses.isc;
maintainers = with maintainers; [ peterhoeg ];
inherit (neovim.meta) platforms;
inherit version;
10 changes: 5 additions & 5 deletions pkgs/applications/networking/mailreaders/neomutt/default.nix
View file
Original file line number Diff line number Diff line change
@@ -2,14 +2,14 @@
, cyrus_sasl, gss, gpgme, kerberos, libidn, notmuch, openssl, lmdb, libxslt, docbook_xsl }:

stdenv.mkDerivation rec {
version = "20170714";
version = "20170907";
name = "neomutt-${version}";

src = fetchFromGitHub {
owner = "neomutt";
repo = "neomutt";
rev = "neomutt-${version}";
sha256 = "0jbh83hvq1jwb8ps7ffl2325y6i79wdnwcn6db0r5prmxax18hw1";
sha256 = "0j2k5d77j5dvfh0yqihgvynnxxv2s5lf3pl50dr8b5b4jk04b961";
};

nativeBuildInputs = [ autoreconfHook docbook_xsl libxslt.bin which ];
@@ -48,9 +48,9 @@ stdenv.mkDerivation rec {

meta = with stdenv.lib; {
description = "A small but very powerful text-based mail client";
homepage = http://www.neomutt.org;
license = stdenv.lib.licenses.gpl2Plus;
platforms = platforms.unix;
homepage = http://www.neomutt.org;
license = stdenv.lib.licenses.gpl2Plus;
maintainers = with maintainers; [ cstrahan erikryb jfrankenau vrthra ];
platforms = platforms.unix;
};
}