Merge branch 'master' into staging

This commit is contained in:
Vladimír Čunát
2016-02-17 10:06:31 +01:00
456 changed files with 22536 additions and 2438 deletions

View File

@@ -1,14 +1,14 @@
{ stdenv, fetchurl }:
stdenv.mkDerivation rec {
name = "alsa-lib-1.0.29";
name = "alsa-lib-1.1.0";
src = fetchurl {
urls = [
"ftp://ftp.alsa-project.org/pub/lib/${name}.tar.bz2"
"http://alsa.cybermirror.org/lib/${name}.tar.bz2"
];
sha256 = "1l5xzhq7xjy8xap087zbbyi14gr1bhil18pn987vwdlnxcskq13k";
sha256 = "dfde65d11e82b68f82e562ab6228c1fb7c78854345d3c57e2c68a9dd3dae1f15";
};
patches = [

View File

@@ -1,14 +1,14 @@
{ stdenv, fetchurl, lib, pkgconfig, alsaLib, libogg, libpulseaudio ? null, libjack2 ? null }:
stdenv.mkDerivation rec {
name = "alsa-plugins-1.0.29";
name = "alsa-plugins-1.1.0";
src = fetchurl {
urls = [
"ftp://ftp.alsa-project.org/pub/plugins/${name}.tar.bz2"
"http://alsa.cybermirror.org/plugins/${name}.tar.bz2"
];
sha256 = "0ck5xa0vnjhn5w23gf87y30h7bcb6hzsx4817sw35xl5qb58ap9j";
sha256 = "3b83c329953bef99f5fe25ae04ec4a455fe6514939f3b45a5321966652b2c9ee";
};
# ToDo: a52, etc.?

View File

@@ -2,14 +2,14 @@
stdenv.mkDerivation rec {
name = "alsa-tools-${version}";
version = "1.0.29";
version = "1.1.0";
src = fetchurl {
urls = [
"ftp://ftp.alsa-project.org/pub/tools/${name}.tar.bz2"
"http://alsa.cybermirror.org/tools/${name}.tar.bz2"
];
sha256 = "1lgvyb81md25s9ciswpdsbibmx9s030kvyylf0673w3kbamz1awl";
sha256 = "3b1c3135b76e14532d3dd23fb15759ddd7daf9ffbc183f7a9a0a3a86374748f1";
};
buildInputs = [ alsaLib pkgconfig gtk gtk3 fltk13 ];

View File

@@ -1,15 +1,15 @@
{stdenv, fetchurl, alsaLib, gettext, ncurses, libsamplerate, pciutils}:
{stdenv, fetchurl, alsaLib, gettext, ncurses, libsamplerate, pciutils, fftw}:
stdenv.mkDerivation rec {
name = "alsa-utils-${version}";
version = "1.0.29";
version = "1.1.0";
src = fetchurl {
urls = [
"ftp://ftp.alsa-project.org/pub/utils/${name}.tar.bz2"
"http://alsa.cybermirror.org/utils/${name}.tar.bz2"
];
sha256 = "16ryhgbapp4pxyvsjc258mcj14wk7x3xs6g9bpnkqj0l7s7haq2i";
sha256 = "3b1c3135b76e14532d3dd23fb15759ddd7daf9ffbc183f7a9a0a3a86374748f1";
};
patchPhase = ''
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
--replace "which" "type -p" \
--replace "lspci" "${pciutils}/bin/lspci"
'';
buildInputs = [ gettext alsaLib ncurses libsamplerate ];
buildInputs = [ gettext alsaLib ncurses libsamplerate fftw ];
configureFlags = "--disable-xmlto --with-udev-rules-dir=$(out)/lib/udev/rules.d";

View File

@@ -0,0 +1,61 @@
Submitted By: Armin K. <krejzi at email dot com>
Date: 2013-04-29
Initial Package Version: 5.17
Upstream Status: unknown
Origin: Arch Linux (Giovanni Campagna)
Description: Allow using obexd without systemd in the user session
Not all sessions run systemd --user (actually, the majority
doesn't), so the dbus daemon must be able to spawn obexd
directly, and to do so it needs the full path of the daemon.
---
Makefile.obexd | 4 ++--
obexd/src/org.bluez.obex.service | 4 ----
obexd/src/org.bluez.obex.service.in | 4 ++++
3 files changed, 6 insertions(+), 6 deletions(-)
delete mode 100644 obexd/src/org.bluez.obex.service
create mode 100644 obexd/src/org.bluez.obex.service.in
diff --git a/Makefile.obexd b/Makefile.obexd
index 3760867..142e7c3 100644
--- a/Makefile.obexd
+++ b/Makefile.obexd
@@ -2,12 +2,12 @@
if SYSTEMD
systemduserunitdir = @SYSTEMD_USERUNITDIR@
systemduserunit_DATA = obexd/src/obex.service
+endif
dbussessionbusdir = @DBUS_SESSIONBUSDIR@
dbussessionbus_DATA = obexd/src/org.bluez.obex.service
-endif
-EXTRA_DIST += obexd/src/obex.service.in obexd/src/org.bluez.obex.service
+EXTRA_DIST += obexd/src/obex.service.in obexd/src/org.bluez.obex.service.in
obex_plugindir = $(libdir)/obex/plugins
diff --git a/obexd/src/org.bluez.obex.service b/obexd/src/org.bluez.obex.service
deleted file mode 100644
index a538088..0000000
--- a/obexd/src/org.bluez.obex.service
+++ /dev/null
@@ -1,4 +0,0 @@
-[D-BUS Service]
-Name=org.bluez.obex
-Exec=/bin/false
-SystemdService=dbus-org.bluez.obex.service
diff --git a/obexd/src/org.bluez.obex.service.in b/obexd/src/org.bluez.obex.service.in
new file mode 100644
index 0000000..9c815f2
--- /dev/null
+++ b/obexd/src/org.bluez.obex.service.in
@@ -0,0 +1,4 @@
+[D-BUS Service]
+Name=org.bluez.obex
+Exec=@libexecdir@/obexd
+SystemdService=dbus-org.bluez.obex.service
--
1.8.3.1

View File

@@ -23,6 +23,8 @@ stdenv.mkDerivation rec {
# gstreamer gst_plugins_base
];
patches = [ ./bluez-5.37-obexd_without_systemd-1.patch ];
preConfigure = ''
substituteInPlace tools/hid2hci.rules --replace /sbin/udevadm ${systemd}/bin/udevadm
substituteInPlace tools/hid2hci.rules --replace "hid2hci " "$out/lib/udev/hid2hci "
@@ -68,8 +70,11 @@ stdenv.mkDerivation rec {
# for bluez4 compatibility for NixOS
mkdir $out/sbin
ln -s ../libexec/bluetooth/bluetoothd $out/sbin/bluetoothd
ln -s ../libexec/bluetooth/obexd $out/sbin/obexd
'';
enableParallelBuilding = true;
meta = with stdenv.lib; {
homepage = http://www.bluez.org/;
repositories.git = https://git.kernel.org/pub/scm/bluetooth/bluez.git;

View File

@@ -68,6 +68,7 @@ stdenv.mkDerivation rec {
# for bluez4 compatibility for NixOS
mkdir $out/sbin
ln -s ../libexec/bluetooth/bluetoothd $out/sbin/bluetoothd
ln -s ../libexec/bluetooth/obexd $out/sbin/obexd
'';
meta = with stdenv.lib; {

View File

@@ -0,0 +1,33 @@
{ stdenv, fetchFromGitHub, pkgconfig, autoconf, automake,
python, boost, fuse, libtorrentRasterbar, curl }:
stdenv.mkDerivation rec {
name = "btfs-${version}";
version = "2.7";
src = fetchFromGitHub {
owner = "johang";
repo = "btfs";
rev = "e816b4718bd5c9d88a99805d19d2ad91971b2338";
sha256 = "1mac2dwg0pzpmg0x503a8d8gx3ridi4m1qx4jk6ssvl4g9v6p7fl";
};
buildInputs = [
pkgconfig autoconf automake boost
fuse libtorrentRasterbar curl
];
preConfigure = ''
autoreconf -i
substituteInPlace scripts/btplay \
--replace /usr/bin/python ${python}/bin/python
'';
meta = with stdenv.lib; {
description = "A bittorrent filesystem based on FUSE";
homepage = "https://github.com/johang/btfs";
license = licenses.gpl3;
maintainers = with maintainers; [ rnhmjoj ];
platforms = platforms.linux;
};
}

View File

@@ -0,0 +1,34 @@
{ stdenv, fetchFromGitHub, kernel }:
# facetimehd is not supported for kernels older than 3.19";
assert stdenv.lib.versionAtLeast kernel.version "3.19";
stdenv.mkDerivation rec {
name = "facetimehd-${version}-${kernel.version}";
version = "git-20160127";
src = fetchFromGitHub {
owner = "patjak";
repo = "bcwc_pcie";
rev = "186e9f9101ed9bbd7cc8d470f840d4a74c585ca7";
sha256 = "1frsf6z6v94cz9fww9rbnk926jzl36fp3w2d1aw6djhzwm80a5gs";
};
preConfigure = ''
export INSTALL_MOD_PATH="$out"
'';
makeFlags = [
"KDIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"
];
meta = with stdenv.lib; {
homepage = https://github.com/patjak/bcwc_pcie;
description = "Linux driver for the Facetime HD (Broadcom 1570) PCIe webcam";
license = licenses.gpl2;
maintainers = [ maintainers.womfoo ];
platforms = platforms.linux;
};
}

View File

@@ -1,15 +1,16 @@
{stdenv, fetchurl}:
{stdenv, fetchurl, which}:
let
s = # Generated upstream information
rec {
baseName="firejail";
version="0.9.36";
version="0.9.38";
name="${baseName}-${version}";
hash="1mxgkfn2hbacarcp51qwgi7jxxzv69wb4lz78m71zysy3kkqn23k";
url="mirror://sourceforge/project/firejail/firejail/firejail-0.9.36-rc1.tar.bz2";
sha256="1mxgkfn2hbacarcp51qwgi7jxxzv69wb4lz78m71zysy3kkqn23k";
hash="0j0zvff9rwjwxcxddfhgzimjgmr99kd04nl40dllkrv3apv5ag4i";
url="mirror://sourceforge/project/firejail/firejail/firejail-0.9.38-rc1.tar.bz2";
sha256="0j0zvff9rwjwxcxddfhgzimjgmr99kd04nl40dllkrv3apv5ag4i";
};
buildInputs = [
which
];
in
stdenv.mkDerivation {
@@ -21,6 +22,7 @@ stdenv.mkDerivation {
preConfigure = ''
sed -e 's@/bin/bash@${stdenv.shell}@g' -i $( grep -lr /bin/bash .)
sed -e "s@/bin/cp@$(which cp)@g" -i $( grep -lr /bin/cp .)
sed -e '/void fs_var_run(/achar *vrcs = get_link("/var/run/current-system")\;' -i ./src/firejail/fs_var.c
sed -e '/ \/run/iif(vrcs!=NULL){symlink(vrcs, "/var/run/current-system")\;free(vrcs)\;}' -i ./src/firejail/fs_var.c
'';

View File

@@ -0,0 +1,51 @@
{ stdenv, fetchurl, cpio, xz, pkgs }:
let
version = "1.43";
dmgRange = "420107885-421933300"; # the whole download is 1.3GB, this cuts it down to 2MB
firmwareIn = "./System/Library/Extensions/AppleCameraInterface.kext/Contents/MacOS/AppleCameraInterface";
firmwareOut = "firmware.bin";
firmwareOffset = "81920";
firmwareSize = "603715";
# separated this here as the script will fail without the 'exit 0'
unpack = pkgs.writeScriptBin "unpack" ''
xzcat -Q $src | cpio --format odc -i -d ${firmwareIn}
exit 0
'';
in
stdenv.mkDerivation {
name = "facetimehd-firmware-${version}";
src = fetchurl {
url = "https://support.apple.com/downloads/DL1849/en_US/osxupd10.11.2.dmg";
sha256 = "1jw6sy9vj27amfak83cs2c7q856y4mk1wix3rl4q10yvd9bl4k9x";
curlOpts = "-r ${dmgRange}";
};
phases = [ "buildPhase" ];
buildInputs = [ cpio xz ];
buildPhase = ''
${unpack}/bin/unpack
dd bs=1 skip=${firmwareOffset} count=${firmwareSize} if=${firmwareIn} of=${firmwareOut}.gz &> /dev/null
mkdir -p $out/lib/firmware/facetimehd
gunzip -c ${firmwareOut}.gz > $out/lib/firmware/facetimehd/${firmwareOut}
'';
meta = with stdenv.lib; {
description = "facetimehd firmware";
homepage = https://support.apple.com/downloads/DL1849;
license = licenses.unfree;
maintainers = [ maintainers.womfoo ];
platforms = platforms.linux;
};
}

View File

@@ -0,0 +1,34 @@
{ stdenv, fetchurl }:
let version = "3.1"; in
stdenv.mkDerivation {
name = "intel2200BGFirmware-${version}";
src = fetchurl {
url = "http://pkgs.fedoraproject.org/repo/pkgs/ipw2200-firmware/ipw2200-fw-${version}.tgz/eaba788643c7cc7483dd67ace70f6e99/ipw2200-fw-${version}.tgz";
sha256 = "c6818c11c18cc030d55ff83f64b2bad8feef485e7742f84f94a61d811a6258bd";
};
phases = [ "unpackPhase" "installPhase" ];
installPhase = ''
mkdir -p $out/lib/firmware
for fw in \
ipw2200-bss.fw \
ipw2200-ibss.fw \
ipw2200-sniffer.fw
do
cp -f $fw $out/lib/firmware/$fw
done
mkdir -p $out/share/doc/intel2200BGFirmware
cp -f LICENSE.ipw2200-fw $out/share/doc/intel2200BGFirmware/LICENSE
'';
meta = with stdenv.lib; {
description = "Firmware for Intel 2200BG cards";
homepage = http://ipw2200.sourceforge.net/firmware.php;
license = stdenv.lib.licenses.unfreeRedistributableFirmware;
maintainers = with maintainers; [ lukasepple ];
};
}

View File

@@ -1,11 +1,11 @@
{ fetchFromGitHub, stdenv, autoreconfHook, ncurses }:
stdenv.mkDerivation rec {
name = "htop-1.0.3-239-229d0058";
name = "htop-2.0.0";
src = fetchFromGitHub {
sha256 = "1bym6ligd8db4iyv2m1y7aylh7f9fmk71v67rkhird05hx1xb80r";
rev = "229d005851af8dca595b3df8e385375fb9c382b4";
sha256 = "1z8rzf3ndswk3090qypl0bqzq9f32w0ik2k5x4zd7jg4hkx66k7z";
rev = "2.0.0";
repo = "htop";
owner = "hishamhm";
};

View File

@@ -7,7 +7,7 @@ import ./generic.nix (args // rec {
extraMeta = {
branch = "3.18";
maintainer = stdenv.lib.maintainers.layus;
maintainers = stdenv.lib.maintainers.layus;
};
src = fetchurl {

View File

@@ -1,13 +1,13 @@
{ stdenv, fetchurl, perl, buildLinux, ... } @ args:
import ./generic.nix (args // rec {
version = "4.4-rc8";
modDirVersion = "4.4.0-rc8";
extraMeta.branch = "4.4";
version = "4.5-rc4";
modDirVersion = "4.5.0-rc4";
extraMeta.branch = "4.5";
src = fetchurl {
url = "mirror://kernel/linux/kernel/v4.x/testing/linux-${version}.tar.xz";
sha256 = "0cwf80lryzhdajd3r97b33ym5njjpf5rbcbjzz7lja0w9xs1dvwj";
sha256 = "02kzcz2gblbjr0ixjdbwdbk4yix8wyd0xjpqk5mk78132pgj3w0a";
};
features.iwlwifi = true;

View File

@@ -22,7 +22,7 @@ let
{ name = "grsecurity-${grversion}-${kversion}";
inherit grversion kversion revision;
patch = fetchurl {
url = "http://grsecurity.net/${branch}/grsecurity-${grversion}-${kversion}-${revision}.patch";
url = "https://github.com/slashbeast/grsecurity-scrape/blob/master/${branch}/grsecurity-${grversion}-${kversion}-${revision}.patch?raw=true";
inherit sha256;
};
features.grsecurity = true;

View File

@@ -2,10 +2,10 @@
stdenv.mkDerivation rec {
name = "mcelog-${version}";
version = "129";
version = "131";
src = fetchFromGitHub {
sha256 = "143xh5zvgax88yhg6mg6img64nrda85yybf76fgsk7a8gc57ghyk";
sha256 = "1hqb06gdx5bw4jh6xix0z5qhi4956asykf43zk1m1mjsj8lkzaps";
rev = "v${version}";
repo = "mcelog";
owner = "andikleen";

View File

@@ -2,10 +2,10 @@
stdenv.mkDerivation rec {
name = "pagemon-${version}";
version = "0.01.07";
version = "0.01.08";
src = fetchFromGitHub {
sha256 = "041jqk11sq1qn3avsx4jbfqzvg6rfa5kmgn16q8jnwm5fqfaj037";
sha256 = "079x8ah33nh4faqcy0jy24x30l40j5m00d57aawaayaq18smqs3f";
rev = "V${version}";
repo = "pagemon";
owner = "ColinIanKing";

View File

@@ -0,0 +1,33 @@
{ lib, stdenv, fetchurl, python, waf }:
stdenv.mkDerivation rec {
name = "pflask-${version}";
version = "git-2015-12-17";
rev = "599418bb6453eaa0ccab493f9411f13726c1a636";
src = fetchurl {
url = "https://github.com/ghedo/pflask/archive/${rev}.tar.gz";
sha256 = "2545fca37f9da484b46b6fb5e3a9bbba6526a9725189fe4af5227ef6e6fca440";
};
buildInputs = [ python ];
configurePhase = ''
ln -s ${waf} waf
python waf configure --prefix=$out
'';
buildPhase = ''
python waf build
'';
installPhase = ''
python waf install
'';
meta = {
description = "Lightweight process containers for Linux";
homepage = "https://ghedo.github.io/pflask/";
license = lib.licenses.bsd2;
platforms = lib.platforms.linux;
maintainers = with lib.maintainers; [ ];
};
}

View File

@@ -3,10 +3,10 @@ let
inherit (stdenv.lib) optional optionalString;
s = rec {
baseName="sysdig";
version = "0.6.0";
version = "0.8.0";
name="${baseName}-${version}";
url="https://github.com/draios/sysdig/archive/${version}.tar.gz";
sha256 = "0729mjs9gpd7kb495q80zlp23zczm8ka3xcq4571c0sm732sa3g3";
sha256 = "1939k3clwxg09m1bn0szqiy2nxg66srl72n7476jc58hgaraq3dr";
};
buildInputs = [
cmake zlib luajit ncurses perl jsoncpp libb64 openssl curl
@@ -32,7 +32,13 @@ stdenv.mkDerivation {
kernel_dev=${kernel.dev}
kernel_dev=''${kernel_dev#/nix/store/}
kernel_dev=''${kernel_dev%%-linux*dev*}
sed -i "s#$kernel_dev#................................#g" $out/lib/modules/${kernel.modDirVersion}/extra/sysdig-probe.ko
if test -f "$out/lib/modules/${kernel.modDirVersion}/extra/sysdig-probe.ko"; then
sed -i "s#$kernel_dev#................................#g" $out/lib/modules/${kernel.modDirVersion}/extra/sysdig-probe.ko
else
xz -d $out/lib/modules/${kernel.modDirVersion}/extra/sysdig-probe.ko.xz
sed -i "s#$kernel_dev#................................#g" $out/lib/modules/${kernel.modDirVersion}/extra/sysdig-probe.ko
xz $out/lib/modules/${kernel.modDirVersion}/extra/sysdig-probe.ko
fi
'';
meta = with stdenv.lib; {

View File

@@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub, pkgconfig, intltool, gperf, libcap, dbus, kmod
, xz, pam, acl, cryptsetup, libuuid, m4, utillinux
, glib, kbd, libxslt, coreutils, libgcrypt, libapparmor, audit, lz4
, glib, kbd, libxslt, coreutils, libgcrypt, libgpgerror, libapparmor, audit, lz4
, kexectools, libmicrohttpd, linuxHeaders, libseccomp
, autoreconfHook, gettext, docbook_xsl, docbook_xml_dtd_42, docbook_xml_dtd_45
, enableKDbus ? false
@@ -8,24 +8,22 @@
assert stdenv.isLinux;
# FIXME: When updating, please remove makeFlags -- `hwdb_bin` flag is not supported anymore.
stdenv.mkDerivation rec {
version = "228";
version = "229";
name = "systemd-${version}";
src = fetchFromGitHub {
owner = "NixOS";
repo = "systemd";
rev = "b737c07cc0234acfa87282786025d556bca91c3f";
sha256 = "0wca8zkn39914c232andvf3v0ni6ylv154kz3s9fcvg47rhpd5n1";
rev = "4936f6e6c05162516a685ebd227b55816cf2b670";
sha256 = "1q0pyrljmq73qcan9rfqsiw66l1g159m5in5qgb8zwlwhl928670";
};
outputs = [ "out" "man" "doc" ];
buildInputs =
[ linuxHeaders pkgconfig intltool gperf libcap kmod xz pam acl
/* cryptsetup */ libuuid m4 glib libxslt libgcrypt
/* cryptsetup */ libuuid m4 glib libxslt libgcrypt libgpgerror
libmicrohttpd kexectools libseccomp audit lz4 libapparmor
/* FIXME: we may be able to prevent the following dependencies
by generating an autoconf'd tarball, but that's probably not
@@ -66,7 +64,7 @@ stdenv.mkDerivation rec {
"--with-sysvinit-path="
"--with-sysvrcnd-path="
"--with-rc-local-script-path-stop=/etc/halt.local"
] ++ stdenv.lib.optional enableKDbus "--enable-kdbus";
] ++ (if enableKDbus then [ "--enable-kdbus" ] else [ "--disable-kdbus" ]);
preConfigure =
''
@@ -109,13 +107,6 @@ stdenv.mkDerivation rec {
"-USYSTEMD_BINARY_PATH" "-DSYSTEMD_BINARY_PATH=\"/run/current-system/systemd/lib/systemd/systemd\""
];
# Use /var/lib/udev rather than /etc/udev for the generated hardware
# database. Upstream doesn't want this (see commit
# 1e1954f53386cb773e2a152748dd31c4d36aa2d8) because using /var is
# forbidden in early boot, but in NixOS the initrd guarantees that
# /var is mounted.
makeFlags = "hwdb_bin=/var/lib/udev/hwdb.bin";
installFlags =
[ "localstatedir=$(TMPDIR)/var"
"sysconfdir=$(out)/etc"

View File

@@ -0,0 +1,30 @@
{ stdenv, fetchFromGitHub, autoconf, pkgconfig, utillinux, coreutils, expat, libaio, boost}:
let
version = "0.6.1";
in
stdenv.mkDerivation {
name = "thin-provisioning-tools-${version}";
src = fetchFromGitHub {
owner = "jthornber";
repo = "thin-provisioning-tools";
rev = "e46bdfd4cc6cdb13852de8aba4e3019425ab0a89";
sha256 = "061rw33nw16g71ij05axl713wimawx54h2ggpqxvzy7iyi6lhdcm";
};
nativeBuildInputs = [ autoconf pkgconfig expat libaio boost ];
preConfigure =
''
autoconf
'';
meta = {
homepage = https://github.com/jthornber/thin-provisioning-tools;
descriptions = "Tools for manipulating the metadata of the device-mapper targets (dm-thin-pool, dm-cache, dm-era)";
platforms = stdenv.lib.platforms.linux;
inherit version;
};
}