diff options
author | Ricardo M. Correia <rcorreia@wizy.org> | 2016-02-16 18:11:42 +0100 |
---|---|---|
committer | Ricardo M. Correia <rcorreia@wizy.org> | 2016-02-16 18:11:42 +0100 |
commit | 957ed2c08cb5857eeedcb5e22325ac2432c8cc78 (patch) | |
tree | cdb273ee3cc356c783f70306816c528e490c68d4 | |
parent | 39e9b43082626ae3ed9a37acb876f6def7baf2c5 (diff) | |
parent | 23ab6bf6b274a0605a8099d98623e8b9af6b24f7 (diff) | |
download | nixlib-957ed2c08cb5857eeedcb5e22325ac2432c8cc78.tar nixlib-957ed2c08cb5857eeedcb5e22325ac2432c8cc78.tar.gz nixlib-957ed2c08cb5857eeedcb5e22325ac2432c8cc78.tar.bz2 nixlib-957ed2c08cb5857eeedcb5e22325ac2432c8cc78.tar.lz nixlib-957ed2c08cb5857eeedcb5e22325ac2432c8cc78.tar.xz nixlib-957ed2c08cb5857eeedcb5e22325ac2432c8cc78.tar.zst nixlib-957ed2c08cb5857eeedcb5e22325ac2432c8cc78.zip |
Merge pull request #13015 from ehegnes/exa
exa: init at git 2016-02-15
-rw-r--r-- | lib/maintainers.nix | 1 | ||||
-rw-r--r-- | pkgs/tools/misc/exa/default.nix | 38 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 2 | ||||
-rw-r--r-- | pkgs/top-level/rust-packages.nix | 6 |
4 files changed, 44 insertions, 3 deletions
diff --git a/lib/maintainers.nix b/lib/maintainers.nix index 208a176957df..e69e6df04aca 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -96,6 +96,7 @@ eduarrrd = "Eduard Bachmakov <e.bachmakov@gmail.com>"; edwtjo = "Edward Tjörnhammar <ed@cflags.cc>"; eelco = "Eelco Dolstra <eelco.dolstra@logicblox.com>"; + ehegnes = "Eric Hegnes <eric.hegnes@gmail.com>"; ehmry = "Emery Hemingway <emery@vfemail.net>"; eikek = "Eike Kettner <eike.kettner@posteo.de>"; elasticdog = "Aaron Bull Schaefer <aaron@elasticdog.com>"; diff --git a/pkgs/tools/misc/exa/default.nix b/pkgs/tools/misc/exa/default.nix new file mode 100644 index 000000000000..8518a7331b95 --- /dev/null +++ b/pkgs/tools/misc/exa/default.nix @@ -0,0 +1,38 @@ +{ stdenv, fetchFromGitHub, rustPlatform, openssl, cmake, zlib }: + +with rustPlatform; + +buildRustPackage rec { + name = "exa-${version}"; + version = "2016-02-15"; + + depsSha256 = "1925nhpfph82wn755zf2nmad24f1hzbxq60gpva9sic6rnap4c1x"; + + src = fetchFromGitHub { + owner = "ogham"; + repo = "exa"; + rev = "252eba484476369bb966fb1af7f739732b968fc0"; + sha256 = "1smyy32z44zgmhyhlbjaxcgfnlbcwz7am9225yppqfdsiqqgdybf"; + }; + + nativeBuildInputs = [ cmake ]; + buildInputs = [ openssl zlib ]; + + # Some tests fail, but Travis ensures a proper build + doCheck = false; + + meta = with stdenv.lib; { + description = "Replacement for 'ls' written in Rust"; + longDescription = '' + exa is a modern replacement for ls. It uses colours for information by + default, helping you distinguish between many types of files, such as + whether you are the owner, or in the owning group. It also has extra + features not present in the original ls, such as viewing the Git status + for a directory, or recursing into directories with a tree view. exa is + written in Rust, so it’s small, fast, and portable. + ''; + homepage = http://bsago.me/exa; + license = licenses.mit; + maintainer = [ maintainers.ehegnes ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c98153fa533c..2449ffd01967 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1474,6 +1474,8 @@ let evtest = callPackage ../applications/misc/evtest { }; + exa = callPackage ../tools/misc/exa { }; + exempi = callPackage ../development/libraries/exempi { }; execline = callPackage ../tools/misc/execline { }; diff --git a/pkgs/top-level/rust-packages.nix b/pkgs/top-level/rust-packages.nix index cc16f4502273..fc3e8fcb98cc 100644 --- a/pkgs/top-level/rust-packages.nix +++ b/pkgs/top-level/rust-packages.nix @@ -7,15 +7,15 @@ { runCommand, fetchFromGitHub, git }: let - version = "2016-02-02"; - rev = "9312acc30def6bb16739ab6c4560fb9880b25c5a"; + version = "2016-02-15"; + rev = "af2c6a768083a66a898a07f5f3b7ec62871dbc3c"; src = fetchFromGitHub { inherit rev; owner = "rust-lang"; repo = "crates.io-index"; - sha256 = "0mrfcipc7sv0kzryjs649x3j4djr8jgbl58jd21hrcihc61qa38n"; + sha256 = "f2da91b1a11146eed04c4b4ad7599f1bd3dc2bca4e011b3377ba16365b3124aa"; }; in |