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

Merge remote-tracking branch 'origin/master' into staging

Browse Source 
Conflicts:
	pkgs/applications/audio/espeak/edit.nix
	pkgs/applications/audio/lmms/default.nix
	pkgs/desktops/e18/enlightenment.nix
	pkgs/games/exult/default.nix
	pkgs/os-specific/linux/alsa-plugins/default.nix
This commit is contained in:
Eelco Dolstra
2014-07-28 11:30:49 +02:00
parent 3e4a382d67 30431e7160
commit f64d84698e
217 changed files with 2107 additions and 2941 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/tools/system/at/default.nix
+3 -3
View File
@@ -1,12 +1,12 @@
{ fetchurl, stdenv, bison, flex, pam, ssmtp }:
stdenv.mkDerivation {
name = "at-3.1.12";
name = "at-3.1.14";
src = fetchurl {
# Debian is apparently the last location where it can be found.
url = mirror://debian/pool/main/a/at/at_3.1.12.orig.tar.gz;
sha256 = "1wqqrj4lg2ix79ib5kz7lk4hbs1zpw72n6zkd2gdv2my9ymwcmbw";
url = mirror://debian/pool/main/a/at/at_3.1.14.orig.tar.gz;
sha256 = "cd092bf05d29c25b286f55a960ce8b8c3c5beb571d86ed8eb1dfb3b61291b3ae";
};
patches = [ ./install.patch ];
pkgs/tools/system/at/install.patch
+8 -9
View File
@@ -1,6 +1,6 @@
--- at-3.1.10.1/Makefile.in 2005-08-29 10:08:28.000000000 +0200
+++ at-3.1.10.1/Makefile.in 2008-04-01 11:05:38.000000000 +0200
@@ -88,35 +88,28 @@ atrun: atrun.in
--- at-3.1.14/Makefile.in 2013-09-08 14:43:53.000000000 +0200
+++ at-3.1.14/Makefile.in 2014-07-27 20:42:04.017703443 +0200
@@ -91,35 +91,28 @@
$(CC) -c $(CFLAGS) $(DEFS) $*.c
install: all
@@ -15,7 +15,7 @@
- chmod 600 $(IROOT)$(LFILE)
- chown $(DAEMON_USERNAME):$(DAEMON_GROUPNAME) $(IROOT)$(LFILE)
- test -f $(IROOT)$(etcdir)/at.allow || test -f $(IROOT)$(etcdir)/at.deny || $(INSTALL) -o root -g $(DAEMON_GROUPNAME) -m 640 at.deny $(IROOT)$(etcdir)/
- $(INSTALL) -g $(DAEMON_GROUPNAME) -o $(DAEMON_USERNAME) -m 6755 -s at $(IROOT)$(bindir)
- $(INSTALL) -g $(DAEMON_GROUPNAME) -o $(DAEMON_USERNAME) -m 6755 at $(IROOT)$(bindir)
+ $(INSTALL) -m 755 -d $(IROOT)$(bindir)
+ $(INSTALL) -m 755 -d $(IROOT)$(sbindir)
+ $(INSTALL) -m 755 -d $(IROOT)$(docdir)
@@ -27,7 +27,7 @@
- $(INSTALL) -d -o root -g root -m 755 $(IROOT)$(man1dir)
- $(INSTALL) -d -o root -g root -m 755 $(IROOT)$(man5dir)
- $(INSTALL) -d -o root -g root -m 755 $(IROOT)$(man8dir)
- $(INSTALL) -g root -o root -m 755 -s atd $(IROOT)$(sbindir)
- $(INSTALL) -g root -o root -m 755 atd $(IROOT)$(sbindir)
- $(INSTALL) -g root -o root -m 755 atrun $(IROOT)$(sbindir)
- $(INSTALL) -g root -o root -m 644 at.1 $(IROOT)$(man1dir)/
+ $(INSTALL) -m 755 batch $(IROOT)$(bindir)
@@ -44,12 +44,11 @@
- $(INSTALL) -g root -o root -m 644 tmpman $(IROOT)$(man8dir)/atrun.8
+ $(INSTALL) -m 644 tmpman $(IROOT)$(man8dir)/atrun.8
rm -f tmpman
- $(INSTALL) -g root -o root -m 644 at_allow.5 $(IROOT)$(man5dir)/
+ $(INSTALL) -m 644 at_allow.5 $(IROOT)$(man5dir)/
cd $(IROOT)$(man5dir) && $(LN_S) -f at_allow.5 at_deny.5
- $(INSTALL) -g root -o root -m 644 at.allow.5 $(IROOT)$(man5dir)/
+ $(INSTALL) -m 644 at.allow.5 $(IROOT)$(man5dir)/
cd $(IROOT)$(man5dir) && $(LN_S) -f at.allow.5 at.deny.5
- $(INSTALL) -g root -o root -m 644 $(DOCS) $(IROOT)$(atdocdir)
+ $(INSTALL) -m 644 $(DOCS) $(IROOT)$(atdocdir)
rm -f $(IROOT)$(mandir)/cat1/at.1* $(IROOT)$(mandir)/cat1/batch.1* \
$(IROOT)$(mandir)/cat1/atq.1*
rm -f $(IROOT)$(mandir)/cat1/atd.8*
pkgs/tools/system/evemu/default.nix
+37
View File
@@ -0,0 +1,37 @@
{ stdenv, fetchgit, automake, autoconf, libtool, pkgconfig, pythonPackages
, libevdev, linuxHeaders
}:
stdenv.mkDerivation rec {
name = "evemu-${version}";
version = "2.0.0";
# We could have downloaded a release tarball from cgit, but it changes hash
# each time it is downloaded :/
src = fetchgit {
url = git://git.freedesktop.org/git/evemu;
rev = "refs/tags/v${version}";
sha256 = "1509b524a2483054a45698c485968094dd8c0f857bba7333449e9d05acbfbd2c";
};
buildInputs = [
automake autoconf libtool pkgconfig pythonPackages.python
pythonPackages.evdev libevdev
];
preConfigure = ''
./autogen.sh --prefix=$out
'';
postPatch = ''
substituteInPlace src/make-event-names.py --replace "/usr/include/linux/input.h" "${linuxHeaders}/include/linux/input.h"
'';
meta = with stdenv.lib; {
description = "Records and replays device descriptions and events to emulate input devices through the kernel's input system";
homepage = http://www.freedesktop.org/wiki/Evemu/;
repositories.git = git://git.freedesktop.org/git/evemu;
license = licenses.gpl2;
maintainers = [ maintainers.amorsillo ];
};
}
pkgs/tools/system/monit/default.nix
+1 -1
View File
@@ -20,6 +20,6 @@ stdenv.mkDerivation rec {
homepage = http://mmonit.com/monit/;
description = "Monitoring system";
license = stdenv.lib.licenses.agpl3;
maintainer = with stdenv.lib.maintainers; [ raskin wmertens ];
maintainers = with stdenv.lib.maintainers; [ raskin wmertens ];
};
}