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

Merge pull request #30054 from dywedir/exa

Browse Source 
exa: 0.7.0 -> 0.8.0, rustRegistry: 2017-09-10 -> 2017-10-03
This commit is contained in:
Tim Steinbach 2017-10-03 08:41:44 -04:00 committed by GitHub
commit d43b06a7c4
2 changed files with 8 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
pkgs/tools/misc/exa/default.nix
View File

@ -2,34 +2,17 @@
with rustPlatform; with rustPlatform;
let buildRustPackage rec {
# check for updates
zoneinfo_compiled = fetchFromGitHub {
owner = "rust-datetime";
repo = "zoneinfo-compiled";
rev = "f56921ea5e9f7cf065b1480ff270a1757c1f742f";
sha256 = "1xmw7c5f5n45lkxnyxp4llfv1bnqhc876w98165ccdbbiylfkw26";
};
cargoPatch = ''
# use non-git dependencies
patch Cargo.toml <<EOF
46c46
< git = "https://github.com/rust-datetime/zoneinfo-compiled.git"
---
> path = "${zoneinfo_compiled}"
EOF
'';
in buildRustPackage rec {
name = "exa-${version}"; name = "exa-${version}";
version = "0.7.0"; version = "0.8.0";
depsSha256 = "0j320hhf2vqaha137pjj4pyiw6d3p5h3nhy3pl9vna1g5mnl1sn7"; depsSha256 = "0yz41prkjs5rmvdhr9k58a52l7hvwy5mfg8rcpsq4ybgf601lja2";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "ogham"; owner = "ogham";
repo = "exa"; repo = "exa";
rev = "v${version}"; rev = "v${version}";
sha256 = "0i9psgna2wwv9qyw9cif4qznqiyi16vl763hpm2yr195aj700339"; sha256 = "0jy11a3xfnfnmyw1kjmv4ffavhijs8c940kw24vafklnacx5n88m";
}; };
nativeBuildInputs = [ cmake pkgconfig perl ]; nativeBuildInputs = [ cmake pkgconfig perl ];
@ -38,15 +21,6 @@ in buildRustPackage rec {
# Some tests fail, but Travis ensures a proper build # Some tests fail, but Travis ensures a proper build
doCheck = false; doCheck = false;
cargoUpdateHook = ''
${cargoPatch}
'';
cargoDepsHook = ''
pushd $sourceRoot
${cargoPatch}
popd
'';
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "Replacement for 'ls' written in Rust"; description = "Replacement for 'ls' written in Rust";
longDescription = '' longDescription = ''
@ -57,7 +31,7 @@ in buildRustPackage rec {
for a directory, or recursing into directories with a tree view. exa is for a directory, or recursing into directories with a tree view. exa is
written in Rust, so it’s small, fast, and portable. written in Rust, so it’s small, fast, and portable.
''; '';
homepage = http://the.exa.website; homepage = https://the.exa.website;
license = licenses.mit; license = licenses.mit;
maintainer = [ maintainers.ehegnes ]; maintainer = [ maintainers.ehegnes ];
}; };

6
pkgs/top-level/rust-packages.nix
View File

@ -7,13 +7,13 @@
{ stdenv, fetchFromGitHub, git }: { stdenv, fetchFromGitHub, git }:
stdenv.mkDerivation { stdenv.mkDerivation {
name = "rustRegistry-2017-09-10"; name = "rustRegistry-2017-10-03";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "rust-lang"; owner = "rust-lang";
repo = "crates.io-index"; repo = "crates.io-index";
rev = "2e573cbbb2db591ff9d46339910f21e35b21339f"; rev = "f9e21955350caf67db45c4a4a38dbab2f2250bfc";
sha256 = "0sgpc2aygmvyjb3kinzh83bj4j92ny18159alqb1x8w26wqmisfq"; sha256 = "1yk0l0r9idn7crnnw44sig69kvvyq3ycv417s88hd16m1fpl5y77";
}; };
phases = [ "unpackPhase" "installPhase" ]; phases = [ "unpackPhase" "installPhase" ];
installPhase = '' installPhase = ''