diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2014-09-08 18:24:58 +0200 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2014-09-08 18:24:58 +0200 |
| commit | 82797f98f2917e164db8691b516ed7f354b40ff4 (patch) | |
| tree | 4f901da1992cb81e6dd1a259c3c1087afe710699 /pkgs/tools/archivers | |
| parent | 1e389c976cc5326b08bd166785e643364bb2d8b4 (diff) | |
| parent | 152ae27aac2a78acee996eb035ef2b40e58bbf9d (diff) | |
| download | nixlib-82797f98f2917e164db8691b516ed7f354b40ff4.tar nixlib-82797f98f2917e164db8691b516ed7f354b40ff4.tar.gz nixlib-82797f98f2917e164db8691b516ed7f354b40ff4.tar.bz2 nixlib-82797f98f2917e164db8691b516ed7f354b40ff4.tar.lz nixlib-82797f98f2917e164db8691b516ed7f354b40ff4.tar.xz nixlib-82797f98f2917e164db8691b516ed7f354b40ff4.tar.zst nixlib-82797f98f2917e164db8691b516ed7f354b40ff4.zip | |
Merge branch 'staging' into modular-stdenv
Conflicts: pkgs/development/interpreters/perl/5.10/setup-hook.sh pkgs/development/interpreters/perl/5.8/setup-hook.sh pkgs/stdenv/linux/default.nix
Diffstat (limited to 'pkgs/tools/archivers')
| -rw-r--r-- | pkgs/tools/archivers/sharutils/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/tools/archivers/unrar/default.nix | 27 |
2 files changed, 13 insertions, 16 deletions
diff --git a/pkgs/tools/archivers/sharutils/default.nix b/pkgs/tools/archivers/sharutils/default.nix index afd734fbae04..f19564e4ad91 100644 --- a/pkgs/tools/archivers/sharutils/default.nix +++ b/pkgs/tools/archivers/sharutils/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { }; meta = { - description = "GNU Sharutils, tools for remote synchronization and `shell archives'"; + description = "Tools for remote synchronization and `shell archives'"; longDescription = '' GNU shar makes so-called shell archives out of many files, preparing diff --git a/pkgs/tools/archivers/unrar/default.nix b/pkgs/tools/archivers/unrar/default.nix index a88c0b345d72..9ef93a30b681 100644 --- a/pkgs/tools/archivers/unrar/default.nix +++ b/pkgs/tools/archivers/unrar/default.nix @@ -1,32 +1,29 @@ {stdenv, fetchurl}: let - version = "5.1.5"; + version = "5.1.7"; in stdenv.mkDerivation { name = "unrar-${version}"; src = fetchurl { url = "http://www.rarlab.com/rar/unrarsrc-${version}.tar.gz"; - sha256 = "1jrla255911rbl953br2xbgvyw15kpi11r4lpqm3jlw553ccw912"; + sha256 = "13ida8vcamiagl40d9yfjma9k6givxczhx278f1p7bv9wgb8gfmc"; }; - patchPhase = '' - sed -i \ - -e "/CXX=/d" \ - -e "/CXXFLAGS=/d" \ - makefile - ''; - installPhase = '' - mkdir -p $out/bin - cp unrar $out/bin + installBin unrar + + mkdir -p $out/share/doc/unrar + cp acknow.txt license.txt \ + $out/share/doc/unrar ''; - meta = { + meta = with stdenv.lib; { description = "Utility for RAR archives"; - license = "freeware"; - maintainers = [ stdenv.lib.maintainers.emery ]; - platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin; # arbitrary + homepage = http://www.rarlab.com/; + license = licenses.unfreeRedistributable; + maintainers = [ maintainers.emery ]; + platforms = platforms.all; }; } |