Revert "Revert "Merge pull request #9543 from NixOS/staging.post-15.06""
This reverts commit 741bf840da.
This reverts the fallout from reverting the major changes.
wip/yesman
William A. Kennington III
9 years ago
parent
e4feccce81
commit
6602f49495
@ -0,0 +1,35 @@ |
||||
{ stdenv, fetchurl, pkgs, jack ? pkgs.libjack2 }: |
||||
|
||||
stdenv.mkDerivation rec { |
||||
name = "jackmix-0.5.2"; |
||||
src = fetchurl { |
||||
url = https://github.com/kampfschlaefer/jackmix/archive/v0.5.2.tar.gz; |
||||
sha256 = "18f5v7g66mgarhs476frvayhch7fy4nyjf2xivixc061ipn0m82j"; |
||||
}; |
||||
|
||||
buildInputs = [ |
||||
pkgs.pkgconfig |
||||
pkgs.scons |
||||
pkgs.kde4.qt4 |
||||
pkgs.lash |
||||
jack |
||||
]; |
||||
|
||||
buildPhase = '' |
||||
scons |
||||
''; |
||||
installPhase = '' |
||||
mkdir -p $out/bin |
||||
cp jackmix/jackmix $out/bin |
||||
''; |
||||
|
||||
meta = { |
||||
description = "Matrix-Mixer for the Jack-Audio-connection-Kit"; |
||||
homepage = http://www.arnoldarts.de/jackmix/; |
||||
license = stdenv.lib.licenses.gpl2; |
||||
maintainers = [ stdenv.lib.maintainers.kampfschlaefer ]; |
||||
platforms = stdenv.lib.platforms.linux; |
||||
}; |
||||
} |
||||
|
||||
|
||||
@ -0,0 +1,44 @@ |
||||
{ stdenv, fetchurl, ncurses }: |
||||
|
||||
stdenv.mkDerivation rec { |
||||
version = "1.1.4"; |
||||
name = "iptraf-ng-${version}"; |
||||
|
||||
src = fetchurl { |
||||
url = "https://fedorahosted.org/releases/i/p/iptraf-ng/${name}.tar.gz"; |
||||
sha256 = "02gb8z9h2s6s1ybyikywz7jgb1mafdx88hijfasv3khcgkq0q53r"; |
||||
}; |
||||
|
||||
buildInputs = [ ncurses ]; |
||||
|
||||
configurePhase = '' |
||||
./configure --prefix=$out/usr --sysconfdir=$out/etc \ |
||||
--localstatedir=$out/var --sbindir=$out/bin |
||||
''; |
||||
|
||||
meta = { |
||||
description = "A console-based network monitoring utility (fork of iptraf)"; |
||||
longDescription = '' |
||||
IPTraf-ng is a console-based network monitoring utility. IPTraf-ng |
||||
gathers data like TCP connection packet and byte counts, interface |
||||
statistics and activity indicators, TCP/UDP traffic breakdowns, and LAN |
||||
station packet and byte counts. IPTraf-ng features include an IP traffic |
||||
monitor which shows TCP flag information, packet and byte counts, ICMP |
||||
details, OSPF packet types, and oversized IP packet warnings; interface |
||||
statistics showing IP, TCP, UDP, ICMP, non-IP and other IP packet counts, |
||||
IP checksum errors, interface activity and packet size counts; a TCP and |
||||
UDP service monitor showing counts of incoming and outgoing packets for |
||||
common TCP and UDP application ports, a LAN statistics module that |
||||
discovers active hosts and displays statistics about their activity; TCP, |
||||
UDP and other protocol display filters so you can view just the traffic |
||||
you want; logging; support for Ethernet, FDDI, ISDN, SLIP, PPP, and |
||||
loopback interfaces; and utilization of the built-in raw socket interface |
||||
of the Linux kernel, so it can be used on a wide variety of supported |
||||
network cards. |
||||
''; |
||||
homepage = https://fedorahosted.org/iptraf-ng/; |
||||
license = stdenv.lib.licenses.gpl2; |
||||
platforms = stdenv.lib.platforms.linux; |
||||
maintainers = [ stdenv.lib.maintainers.devhell ]; |
||||
}; |
||||
} |
||||
@ -1,17 +0,0 @@ |
||||
{ stdenv }: |
||||
|
||||
assert stdenv.isDarwin; |
||||
|
||||
stdenv.mkDerivation { |
||||
name = "libunwind-native"; |
||||
|
||||
unpackPhase = ":"; |
||||
dontBuild = true; |
||||
|
||||
installPhase = '' |
||||
mkdir -p $out/lib |
||||
cat /usr/lib/system/libunwind.dylib > $out/lib/libunwind.dylib |
||||
''; |
||||
|
||||
meta.platforms = stdenv.lib.platforms.darwin; |
||||
} |
||||
@ -0,0 +1,24 @@ |
||||
diff -Naur a/tools/gyp/pylib/gyp/xcode_emulation.py b/tools/gyp/pylib/gyp/xcode_emulation.py
|
||||
--- a/tools/gyp/pylib/gyp/xcode_emulation.py 2014-01-23 06:05:51.000000000 +0100
|
||||
+++ b/tools/gyp/pylib/gyp/xcode_emulation.py 2014-02-04 17:49:48.000000000 +0100
|
||||
@@ -1018,12 +1033,16 @@
|
||||
# Since the value returned by this function is only used when ARCHS is not
|
||||
# set, then on iOS we return "i386", as the default xcode project generator
|
||||
# does not set ARCHS if it is not set in the .gyp file.
|
||||
- if self.isIOS:
|
||||
+
|
||||
+ try:
|
||||
+ if self.isIOS:
|
||||
+ return 'i386'
|
||||
+ version, build = self._XcodeVersion()
|
||||
+ if version >= '0500':
|
||||
+ return 'x86_64'
|
||||
return 'i386'
|
||||
- version, build = self._XcodeVersion()
|
||||
- if version >= '0500':
|
||||
+ except:
|
||||
return 'x86_64'
|
||||
- return 'i386'
|
||||
|
||||
class MacPrefixHeader(object):
|
||||
"""A class that helps with emulating Xcode's GCC_PREFIX_HEADER feature.
|
||||
@ -0,0 +1,13 @@ |
||||
diff --git a/configure b/configure
|
||||
index d199975..66d903b 100755
|
||||
--- a/configure
|
||||
+++ b/configure
|
||||
@@ -734,7 +734,7 @@ def configure_library(lib, output):
|
||||
# libpath needs to be provided ahead libraries
|
||||
if pkg_libpath:
|
||||
output['libraries'] += (
|
||||
- filter(None, map(str.strip, pkg_cflags.split('-L'))))
|
||||
+ pkg_libpath.split())
|
||||
|
||||
default_libs = getattr(options, shared_lib + '_libname')
|
||||
default_libs = map('-l{0}'.format, default_libs.split(','))
|
||||
@ -0,0 +1,42 @@ |
||||
{ stdenv, fetchgit, gcc, gmp, libsigsegv, openssl, automake, autoconf, ragel, |
||||
cmake, re2c, libtool, ncurses, perl, zlib, python }: |
||||
|
||||
stdenv.mkDerivation rec { |
||||
|
||||
name = "urbit-${version}"; |
||||
version = "2015.09.26"; |
||||
|
||||
src = fetchgit { |
||||
url = "https://github.com/urbit/urbit.git"; |
||||
rev = "c9592664c797b2dd74f26886528656f8a7058640"; |
||||
sha256 = "0sgrxnmpqh54mgar81wlb6gff8c0pc24p53xwxr448g5shvnzjx9"; |
||||
}; |
||||
|
||||
buildInputs = with stdenv.lib; [ |
||||
gcc gmp libsigsegv openssl automake autoconf ragel cmake re2c libtool |
||||
ncurses perl zlib python |
||||
]; |
||||
|
||||
configurePhase = '' |
||||
: |
||||
''; |
||||
|
||||
buildPhase = '' |
||||
sed -i 's/-lcurses/-lncurses/' Makefile |
||||
mkdir -p $out |
||||
cp -r . $out/ |
||||
cd $out |
||||
make |
||||
''; |
||||
|
||||
installPhase = '' |
||||
: |
||||
''; |
||||
|
||||
meta = with stdenv.lib; { |
||||
description = "an operating function"; |
||||
homepage = http://urbit.org/preview/~2015.9.25/materials; |
||||
license = licenses.mit; |
||||
maintainers = with maintainers; [ mudri ]; |
||||
}; |
||||
} |
||||
@ -0,0 +1,26 @@ |
||||
{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, udev, systemd, glib, readline }: |
||||
|
||||
with stdenv.lib; |
||||
stdenv.mkDerivation rec { |
||||
name = "miraclecast-0.0-git-20151002"; |
||||
|
||||
src = fetchFromGitHub { |
||||
owner = "albfan"; |
||||
repo = "miraclecast"; |
||||
rev = "30b8c2d22391423f76ba582aaaa1e0936869103a"; |
||||
sha256 = "0i076n76kq64fayc7v06gr1853pk5r6ms86m57vd1xsjd0r9wyxd"; |
||||
}; |
||||
|
||||
# INFO: It is important to list 'systemd' first as for now miraclecast |
||||
# links against a customized systemd. Otherwise, a systemd package from |
||||
# a propagatedBuildInput could take precedence. |
||||
buildInputs = [ systemd autoreconfHook pkgconfig udev glib readline ]; |
||||
|
||||
meta = { |
||||
homepage = https://github.com/albfan/miraclecast; |
||||
description = "Connect external monitors via Wi-Fi"; |
||||
license = licenses.lgpl21Plus; |
||||
maintainers = with maintainers; [ tstrobel ]; |
||||
platforms = platforms.linux; |
||||
}; |
||||
} |
||||
@ -0,0 +1,22 @@ |
||||
From 2bf6f08b2492cc04a2c39fdcb22a2d0c18963d1c Mon Sep 17 00:00:00 2001
|
||||
From: sonic414 <sonic414@gmail.com>
|
||||
Date: Tue, 28 Apr 2015 19:30:15 +0530
|
||||
Subject: [PATCH] strnicmp to strncasecmp in Linux 4.0.0
|
||||
|
||||
---
|
||||
nvidiabl-module.c | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/nvidiabl-module.c b/nvidiabl-module.c
|
||||
index b789ea4..b306579 100644
|
||||
--- a/nvidiabl-module.c
|
||||
+++ b/nvidiabl-module.c
|
||||
@@ -214,7 +214,7 @@ static int __init nvidiabl_init(void)
|
||||
#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,39)
|
||||
|
||||
for (iii = 0 ; iii < sizeof(backlight_type_ids) ; iii++) {
|
||||
- if (strnicmp(bl_type, backlight_type_ids[iii].id, sizeof(bl_type)) == 0) {
|
||||
+ if (strncasecmp(bl_type, backlight_type_ids[iii].id, sizeof(bl_type)) == 0) {
|
||||
props.type = backlight_type_ids[iii].type;
|
||||
printk(KERN_INFO "nvidiabl: backlight type is %s\n", backlight_type_ids[iii].id);
|
||||
}
|
||||
@ -1,26 +0,0 @@ |
||||
diff --git a/com32/include/menu.h b/com32/include/menu.h
|
||||
index bc0182f..b0251e4 100644
|
||||
--- a/com32/include/menu.h
|
||||
+++ b/com32/include/menu.h
|
||||
@@ -195,7 +195,7 @@ void local_cursor_enable(bool);
|
||||
|
||||
static inline int my_isspace(char c)
|
||||
{
|
||||
- return (unsigned char)c <= ' ';
|
||||
+ return (unsigned char)c <= ' ' || (unsigned char)c == '\x7f';
|
||||
}
|
||||
|
||||
int my_isxdigit(char c);
|
||||
diff --git a/com32/menu/readconfig.c b/com32/menu/readconfig.c
|
||||
index b7814be..a433fad 100644
|
||||
--- a/com32/menu/readconfig.c
|
||||
+++ b/com32/menu/readconfig.c
|
||||
@@ -299,7 +299,7 @@ static char *copy_sysappend_string(char *dst, const char *src)
|
||||
char c;
|
||||
|
||||
while ((c = *src++)) {
|
||||
- if (c <= ' ' && c == '\x7f') {
|
||||
+ if (my_isspace(c)) {
|
||||
if (!was_space)
|
||||
*dst++ = '_';
|
||||
was_space = true;
|
||||
@ -0,0 +1,79 @@ |
||||
{ stdenv, fetchurl, openssl, libevent, libasr, |
||||
python2, pkgconfig, lua5, perl, mariadb, postgresql, sqlite, hiredis }: |
||||
stdenv.mkDerivation rec { |
||||
name = "opensmtpd-extras-${version}"; |
||||
version = "5.7.1"; |
||||
|
||||
src = fetchurl { |
||||
url = "https://www.opensmtpd.org/archives/${name}.tar.gz"; |
||||
sha256 = "1kld4hxgz792s0cb2gl7m2n618ikzqkj88w5dhaxdrxg4x2c4vdm"; |
||||
}; |
||||
|
||||
nativeBuildInputs = [ pkgconfig ]; |
||||
buildInputs = [ openssl libevent |
||||
libasr python2 lua5 perl mariadb postgresql sqlite hiredis ]; |
||||
|
||||
configureFlags = [ |
||||
"--sysconfdir=/etc" |
||||
"--localstatedir=/var" |
||||
"--with-privsep-user=smtpd" |
||||
"--with-libevent-dir=${libevent}" |
||||
|
||||
"--with-filter-clamav" |
||||
"--with-filter-dkim-signer" |
||||
"--with-filter-dnsbl" |
||||
"--with-filter-monkey" |
||||
"--with-filter-pause" |
||||
"--with-filter-regex" |
||||
"--with-filter-spamassassin" |
||||
"--with-filter-stub" |
||||
"--with-filter-trace" |
||||
"--with-filter-void" |
||||
"--with-queue-null" |
||||
"--with-queue-ram" |
||||
"--with-queue-stub" |
||||
"--with-table-ldap" |
||||
"--with-table-socketmap" |
||||
"--with-table-passwd" |
||||
"--with-table-stub" |
||||
"--with-scheduler-ram" |
||||
"--with-scheduler-stub" |
||||
|
||||
] ++ stdenv.lib.optional (python2 != null) [ |
||||
"--with-python=${python2}" |
||||
"--with-filter-python" |
||||
"--with-queue-python" |
||||
"--with-table-python" |
||||
"--with-scheduler-python" |
||||
|
||||
] ++ stdenv.lib.optional (lua5 != null) [ |
||||
"--with-lua=${pkgconfig}" |
||||
"--with-filter-lua" |
||||
|
||||
] ++ stdenv.lib.optional (perl != null) [ |
||||
"--with-perl=${perl}" |
||||
"--with-filter-perl" |
||||
|
||||
] ++ stdenv.lib.optional (mariadb != null) [ |
||||
"--with-table-mysql" |
||||
|
||||
] ++ stdenv.lib.optional (postgresql != null) [ |
||||
"--with-table-postgres" |
||||
|
||||
] ++ stdenv.lib.optional (sqlite != null) [ |
||||
"--with-table-sqlite" |
||||
|
||||
] ++ stdenv.lib.optional (hiredis != null) [ |
||||
"--with-table-redis" |
||||
]; |
||||
|
||||
NIX_CFLAGS_COMPILE = stdenv.lib.optional (hiredis != null) [ "-I${hiredis}/include/hiredis" ]; |
||||
|
||||
meta = with stdenv.lib; { |
||||
homepage = https://www.opensmtpd.org/; |
||||
description = "Extra plugins for the OpenSMTPD mail server"; |
||||
license = licenses.isc; |
||||
platforms = platforms.unix; |
||||
maintainers = with maintainers; [ gebner ]; |
||||
}; |
||||
} |
||||
@ -0,0 +1,76 @@ |
||||
diff -Naur opensmtpd-5.7.1p1/smtpd/parse.y opensmtpd-5.7.1p1.patched/smtpd/parse.y
|
||||
--- opensmtpd-5.7.1p1/smtpd/parse.y 2015-06-30 10:13:34.000000000 +0200
|
||||
+++ opensmtpd-5.7.1p1.patched/smtpd/parse.y 2015-09-26 08:41:17.012472516 +0200
|
||||
@@ -2519,13 +2519,19 @@
|
||||
{
|
||||
struct filter_conf *f;
|
||||
char *path;
|
||||
+ const char *proc_path;
|
||||
|
||||
if (dict_get(&conf->sc_filters, name)) {
|
||||
yyerror("filter \"%s\" already defined", name);
|
||||
return (NULL);
|
||||
}
|
||||
|
||||
- if (asprintf(&path, "%s/filter-%s", PATH_LIBEXEC, prog) == -1) {
|
||||
+ proc_path = getenv("OPENSMTPD_PROC_PATH");
|
||||
+ if (proc_path == NULL) {
|
||||
+ proc_path = PATH_LIBEXEC;
|
||||
+ }
|
||||
+
|
||||
+ if (asprintf(&path, "%s/filter-%s", proc_path, prog) == -1) {
|
||||
yyerror("filter \"%s\" asprintf failed", name);
|
||||
return (0);
|
||||
}
|
||||
diff -Naur opensmtpd-5.7.1p1/smtpd/smtpd.c opensmtpd-5.7.1p1.patched/smtpd/smtpd.c
|
||||
--- opensmtpd-5.7.1p1/smtpd/smtpd.c 2015-06-30 10:13:34.000000000 +0200
|
||||
+++ opensmtpd-5.7.1p1.patched/smtpd/smtpd.c 2015-09-26 08:41:16.998472557 +0200
|
||||
@@ -854,6 +854,7 @@
|
||||
char path[PATH_MAX];
|
||||
char name[PATH_MAX];
|
||||
char *arg;
|
||||
+ char *proc_path;
|
||||
|
||||
if (strlcpy(name, conf, sizeof(name)) >= sizeof(name)) {
|
||||
log_warnx("warn: %s-proc: conf too long", key);
|
||||
@@ -864,7 +865,12 @@
|
||||
if (arg)
|
||||
*arg++ = '\0';
|
||||
|
||||
- if (snprintf(path, sizeof(path), PATH_LIBEXEC "/%s-%s", key, name) >=
|
||||
+ proc_path = getenv("OPENSMTPD_PROC_PATH");
|
||||
+ if (proc_path == NULL) {
|
||||
+ proc_path = PATH_LIBEXEC;
|
||||
+ }
|
||||
+
|
||||
+ if (snprintf(path, sizeof(path), "%s/%s-%s", proc_path, key, name) >=
|
||||
(ssize_t)sizeof(path)) {
|
||||
log_warn("warn: %s-proc: exec path too long", key);
|
||||
return (-1);
|
||||
diff -Naur opensmtpd-5.7.1p1/smtpd/table.c opensmtpd-5.7.1p1.patched/smtpd/table.c
|
||||
--- opensmtpd-5.7.1p1/smtpd/table.c 2015-06-30 10:13:34.000000000 +0200
|
||||
+++ opensmtpd-5.7.1p1.patched/smtpd/table.c 2015-09-26 08:41:17.005472536 +0200
|
||||
@@ -201,6 +201,7 @@
|
||||
struct table_backend *tb;
|
||||
char buf[LINE_MAX];
|
||||
char path[LINE_MAX];
|
||||
+ const char *proc_path;
|
||||
size_t n;
|
||||
struct stat sb;
|
||||
|
||||
@@ -215,8 +216,14 @@
|
||||
if (name && table_find(name, NULL))
|
||||
fatalx("table_create: table \"%s\" already defined", name);
|
||||
|
||||
+ proc_path = getenv("OPENSMTPD_PROC_PATH");
|
||||
+ if (proc_path == NULL) {
|
||||
+ proc_path = PATH_LIBEXEC;
|
||||
+ }
|
||||
+
|
||||
if ((tb = table_backend_lookup(backend)) == NULL) {
|
||||
- if ((size_t)snprintf(path, sizeof(path), PATH_LIBEXEC "/table-%s",
|
||||
+ if ((size_t)snprintf(path, sizeof(path), "%s/table-%s",
|
||||
+ proc_path,
|
||||
backend) >= sizeof(path)) {
|
||||
fatalx("table_create: path too long \""
|
||||
PATH_LIBEXEC "/table-%s\"", backend);
|
||||
@ -0,0 +1,28 @@ |
||||
{ stdenv, fetchFromGitHub, rustPlatform }: |
||||
|
||||
with rustPlatform; |
||||
|
||||
buildRustPackage rec { |
||||
name = "heatseeker-${version}"; |
||||
version = "1.3.0"; |
||||
|
||||
depsSha256 = "03jap7myf85xgx9270sws8x57nl04a1wx8szrk9qx24s9vnnjcnh"; |
||||
|
||||
src = fetchFromGitHub { |
||||
owner = "rschmitt"; |
||||
repo = "heatseeker"; |
||||
rev = "v${version}"; |
||||
sha256 = "1xdvwgmh9lwv82hv1qg82bjv2iplnvva6lzbg7dyhbszhv7rhkbl"; |
||||
}; |
||||
|
||||
# some tests require a tty, this variable turns them off for Travis CI, |
||||
# which we can also make use of |
||||
TRAVIS= "true"; |
||||
|
||||
meta = with stdenv.lib; { |
||||
description = "A general-purpose fuzzy selector"; |
||||
homepage = https://github.com/rschmitt/heatseeker; |
||||
license = stdenv.lib.licenses.mit; |
||||
maintainers = [ maintainers.michaelpj ]; |
||||
}; |
||||
} |
||||
Loading…
Reference in new issue