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

emacs-haskell-mode: switch default to git version

Browse Source 
We track the git version, because haskell-mode does not provide regular
releases except via MELPA, which our Emacs infrastructure does not support yet.
This commit is contained in:
Peter Simons 2015-08-06 14:16:54 +02:00
parent efdaac847b
commit c67aaca6d9
3 changed files with 13 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
pkgs/applications/editors/emacs-modes/haskell/default.nix
View File

@ -1,19 +1,21 @@
{ stdenv, fetchurl, emacs, texinfo }: { stdenv, fetchFromGitHub, emacs, texinfo }:
let let
version = "13.10"; version = "13.14-130-ga03bd9b"; # git describe --tags
in in
stdenv.mkDerivation { stdenv.mkDerivation {
name = "haskell-mode-${version}"; name = "haskell-mode-${version}";
src = fetchurl { src = fetchFromGitHub {
url = "https://github.com/haskell/haskell-mode/archive/v${version}.tar.gz"; owner = "haskell";
sha256 = "0hcg7wpalcdw8j36m8vd854zrrgym074r7m903rpwfrhx9mlg02b"; repo = "haskell-mode";
rev = "v${version}";
sha256 = "0k4jfixzsvwpsz37f2pvbr9slz8fpcd9nwddcv2bvi4x20jp11ma";
}; };
buildInputs = [ emacs texinfo ]; buildInputs = [ emacs texinfo ];
makeFlags = "VERSION=${version} GIT_VERSION=${version}"; makeFlags = "VERSION=v${version} GIT_VERSION=v${version}";
installPhase = '' installPhase = ''
mkdir -p $out/share/emacs/site-lisp mkdir -p $out/share/emacs/site-lisp
@ -22,6 +24,11 @@ stdenv.mkDerivation {
cp -v *.info* $out/share/info/ cp -v *.info* $out/share/info/
''; '';
# The test suite must run *after* copying the generated files to $out
# because "make check" implies "make clean".
doInstallCheck = true;
installCheckTarget = "check";
meta = { meta = {
homepage = "http://github.com/haskell/haskell-mode"; homepage = "http://github.com/haskell/haskell-mode";
description = "Haskell mode for Emacs"; description = "Haskell mode for Emacs";

39
pkgs/applications/editors/emacs-modes/haskell/git.nix
View File

@ -1,39 +0,0 @@
{ stdenv, fetchFromGitHub, emacs, texinfo }:
let
version = "13.10-361-gfa09425"; # git describe --tags
in
stdenv.mkDerivation {
name = "haskell-mode-${version}";
src = fetchFromGitHub {
owner = "haskell";
repo = "haskell-mode";
rev = "v${version}";
sha256 = "1bq4gddzwjy2w1hbsmwxcamcy87amz7ksy1vmpwg0qij88fk4av9";
};
buildInputs = [ emacs texinfo ];
makeFlags = "VERSION=v${version} GIT_VERSION=v${version}";
installPhase = ''
mkdir -p $out/share/emacs/site-lisp
cp *.el *.elc *.hs $out/share/emacs/site-lisp/
mkdir -p $out/share/info
cp -v *.info* $out/share/info/
'';
# The test suite must run *after* copying the generated files to $out
# because "make check" implies "make clean".
doInstallCheck = true;
installCheckTarget = "check";
meta = {
homepage = "http://github.com/haskell/haskell-mode";
description = "Haskell mode for Emacs";
platforms = stdenv.lib.platforms.unix;
maintainers = [ stdenv.lib.maintainers.simons ];
};
}

1
pkgs/top-level/all-packages.nix
View File

@ -11146,7 +11146,6 @@ let
gitModes = callPackage ../applications/editors/emacs-modes/git-modes { }; gitModes = callPackage ../applications/editors/emacs-modes/git-modes { };
haskellMode = callPackage ../applications/editors/emacs-modes/haskell { }; haskellMode = callPackage ../applications/editors/emacs-modes/haskell { };
haskellModeGit = lowPrio (callPackage ../applications/editors/emacs-modes/haskell/git.nix { });
hsc3Mode = callPackage ../applications/editors/emacs-modes/hsc3 { }; hsc3Mode = callPackage ../applications/editors/emacs-modes/hsc3 { };