diff options
| author | Jan Tojnar <jtojnar@gmail.com> | 2019-09-06 03:20:09 +0200 |
|---|---|---|
| committer | Jan Tojnar <jtojnar@gmail.com> | 2019-09-06 03:20:09 +0200 |
| commit | cdf426488b5dc3a7c051d7ad1c90c07dc0c3a89f (patch) | |
| tree | 3fdd8ed1c086fb0ddf93941114bb1cbbb4659af9 /pkgs/tools/archivers | |
| parent | e7cccdbb139ccf2f9f170500f40c04a6237a2da1 (diff) | |
| parent | ed54a5b51dc9542df94f70b25a13d86d1f494e64 (diff) | |
| download | nixpkgs-cdf426488b5dc3a7c051d7ad1c90c07dc0c3a89f.tar nixpkgs-cdf426488b5dc3a7c051d7ad1c90c07dc0c3a89f.tar.gz nixpkgs-cdf426488b5dc3a7c051d7ad1c90c07dc0c3a89f.tar.bz2 nixpkgs-cdf426488b5dc3a7c051d7ad1c90c07dc0c3a89f.tar.lz nixpkgs-cdf426488b5dc3a7c051d7ad1c90c07dc0c3a89f.tar.xz nixpkgs-cdf426488b5dc3a7c051d7ad1c90c07dc0c3a89f.tar.zst nixpkgs-cdf426488b5dc3a7c051d7ad1c90c07dc0c3a89f.zip | |
Merge branch 'master' into staging-next
Fixed trivial conflicts caused by removing rec.
Diffstat (limited to 'pkgs/tools/archivers')
| -rw-r--r-- | pkgs/tools/archivers/xarchive/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/tools/archivers/xarchiver/default.nix | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/tools/archivers/xarchive/default.nix b/pkgs/tools/archivers/xarchive/default.nix index ff98e96655f..53da140b7fd 100644 --- a/pkgs/tools/archivers/xarchive/default.nix +++ b/pkgs/tools/archivers/xarchive/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { hardeningDisable = [ "format" ]; meta = { - description = "A GTK+ front-end for command line archiving tools"; + description = "A GTK front-end for command line archiving tools"; maintainers = [ stdenv.lib.maintainers.domenkozar ]; license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.all; diff --git a/pkgs/tools/archivers/xarchiver/default.nix b/pkgs/tools/archivers/xarchiver/default.nix index 07684155a7e..2a110c4cc83 100644 --- a/pkgs/tools/archivers/xarchiver/default.nix +++ b/pkgs/tools/archivers/xarchiver/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { buildInputs = [ gtk3 intltool libxslt hicolor-icon-theme ]; meta = { - description = "GTK+ frontend to 7z,zip,rar,tar,bzip2, gzip,arj, lha, rpm and deb (open and extract only)"; + description = "GTK frontend to 7z,zip,rar,tar,bzip2, gzip,arj, lha, rpm and deb (open and extract only)"; homepage = https://github.com/ib/xarchiver; maintainers = [ stdenv.lib.maintainers.domenkozar ]; license = stdenv.lib.licenses.gpl2; |