Merge pull request #62978 from m-labs/for-upstream

amp: init at 2019.06.11
This commit is contained in:
Aaron Andersen 2019-06-19 21:02:59 -04:00 committed by GitHub
commit 6675589d6d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 32 additions and 0 deletions

View File

@ -0,0 +1,30 @@
{ stdenv, fetchFromGitHub, rustPlatform, openssl, pkgconfig, python3, xorg, cmake, libgit2 }:
rustPlatform.buildRustPackage rec {
pname = "amp";
# The latest release (0.5.2) does not compile, so we use a git snapshot instead.
version = "unstable-2019-06-09";
src = fetchFromGitHub {
owner = "jmacdonald";
repo = pname;
rev = "2c88e82a88ada8a5fd2620ef225192395a4533a2";
sha256 = "0ha1xiabq31s687gkrnszf3zc7b3sfdl79iyg5ygbc49mzvarp8c";
};
cargoSha256 = "1bvj2zg19ak4vi47vjkqlybz011kn5zq1j7zznr76zrryacw4lz1";
nativeBuildInputs = [ cmake pkgconfig ];
buildInputs = [ openssl python3 xorg.libxcb libgit2 ];
# Tests need to write to the theme directory in HOME.
preCheck = "export HOME=`mktemp -d`";
meta = with stdenv.lib; {
description = "A modern text editor inspired by Vim";
homepage = "https://amp.rs";
license = [ licenses.gpl3 ];
maintainers = [ maintainers.sb0 ];
platforms = platforms.unix;
};
}

View File

@ -534,6 +534,8 @@ in
ammonite = callPackage ../development/tools/ammonite {};
amp = callPackage ../applications/editors/amp {};
amtterm = callPackage ../tools/system/amtterm {};
analog = callPackage ../tools/admin/analog {};