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

Merge branch 'master' into staging-next

Browse Source 
Fixed trivial conflicts caused by removing rec.
This commit is contained in:
Jan Tojnar
2019-09-06 03:20:09 +02:00
parent e7cccdbb13 ed54a5b51d
commit cdf426488b
247 changed files with 3153 additions and 2159 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/tools/archivers/xarchive/default.nix
+1 -1
View File
@@ -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;
pkgs/tools/archivers/xarchiver/default.nix
+1 -1
View File
@@ -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;