Merge remote-tracking branch 'upstream/master' into hardened-stdenv

This commit is contained in:
Robin Gloster
2016-08-03 13:34:44 +00:00
1099 changed files with 2664 additions and 513 deletions
@@ -19,5 +19,6 @@ stdenv.mkDerivation rec {
homepage = http://www.xfce.org/projects/terminal;
description = "A modern terminal emulator primarily for the Xfce desktop environment";
license = stdenv.lib.licenses.gpl2Plus;
platforms = stdenv.lib.platforms.linux;
};
}
+1
View File
@@ -32,5 +32,6 @@ stdenv.mkDerivation rec {
homepage = http://www.xfce.org/;
description = "Basic GUI library for Xfce";
license = stdenv.lib.licenses.lgpl2Plus;
platforms = stdenv.lib.platforms.linux;
};
}
@@ -21,6 +21,7 @@ stdenv.mkDerivation rec {
homepage = http://foo-projects.org/~benny/projects/xfce4-dev-tools/;
description = "Tools and M4 macros for Xfce4 developers";
license = stdenv.lib.licenses.gpl2Plus;
platforms = stdenv.lib.platforms.linux;
};
}