From 9fb8020e4ec2e74e39a8f28dfb3ef18a70bd1eef Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 24 Jan 2016 20:31:44 +0100 Subject: Add version attribute where maintainers |= nckx This will probably be mandatory soon, and is a step in the right direction. Removes the deprecated meta.version, and move some meta sections to the end of the file where I should have put them in the first place. --- pkgs/applications/editors/neovim/default.nix | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) (limited to 'pkgs/applications/editors/neovim') diff --git a/pkgs/applications/editors/neovim/default.nix b/pkgs/applications/editors/neovim/default.nix index a27027406e2c..dcb274513102 100644 --- a/pkgs/applications/editors/neovim/default.nix +++ b/pkgs/applications/editors/neovim/default.nix @@ -15,11 +15,10 @@ with stdenv.lib; let - version = "0.1.1"; - # Note: this is NOT the libvterm already in nixpkgs, but some NIH silliness: - neovimLibvterm = let version = "2015-11-06"; in stdenv.mkDerivation { + neovimLibvterm = stdenv.mkDerivation rec { name = "neovim-libvterm-${version}"; + version = "2015-11-06"; src = fetchFromGitHub { sha256 = "0f9r0wnr9ajcdd6as24igmch0n8s1annycb9f4k0vg6fngwaypy9"; @@ -59,8 +58,9 @@ let ignoreCollisions = true; }; - neovim = stdenv.mkDerivation { + neovim = stdenv.mkDerivation rec { name = "neovim-${version}"; + version = "0.1.1"; src = fetchFromGitHub { sha256 = "0crswjslp687yp1cpn7nmm0j2sccqhcxryzxv1s81cgpai0fzf60"; @@ -146,7 +146,10 @@ let in if (vimAlias == false && configure == null) then neovim else stdenv.mkDerivation { name = "neovim-${version}-configured"; + inherit (neovim) version; + nativeBuildInputs = [ makeWrapper ]; + buildCommand = '' mkdir -p $out/bin for item in ${neovim}/bin/*; do -- cgit 1.4.1