diff --git a/nixos/modules/misc/ids.nix b/nixos/modules/misc/ids.nix
index 8a2cde50e1e2..80d6ff20f9b4 100644
--- a/nixos/modules/misc/ids.nix
+++ b/nixos/modules/misc/ids.nix
@@ -224,6 +224,7 @@
tvheadend = 200;
uwsgi = 201;
gitit = 202;
+ riemanntools = 203;
# When adding a uid, make sure it doesn't match an existing gid. And don't use uids above 399!
@@ -426,6 +427,7 @@
#tvheadend = 200; #unused
uwsgi = 201;
gitit = 202;
+ riemanntools = 203;
# When adding a gid, make sure it doesn't match an existing
# uid. Users and groups with the same name should have equal
diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index 042824bc8290..76ee1b7f9c65 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -234,6 +234,7 @@
./services/monitoring/nagios.nix
./services/monitoring/riemann.nix
./services/monitoring/riemann-dash.nix
+ ./services/monitoring/riemann-tools.nix
./services/monitoring/scollector.nix
./services/monitoring/smartd.nix
./services/monitoring/statsd.nix
diff --git a/nixos/modules/services/databases/postgresql.nix b/nixos/modules/services/databases/postgresql.nix
index de14c56f7971..328e864ced38 100644
--- a/nixos/modules/services/databases/postgresql.nix
+++ b/nixos/modules/services/databases/postgresql.nix
@@ -154,7 +154,7 @@ in
config = mkIf config.services.postgresql.enable {
- services.postgresql.authentication =
+ services.postgresql.authentication = mkAfter
''
# Generated file; do not edit!
local all all ident ${optionalString pre84 "sameuser"}
diff --git a/nixos/modules/services/monitoring/riemann-tools.nix b/nixos/modules/services/monitoring/riemann-tools.nix
new file mode 100644
index 000000000000..ce277f09464a
--- /dev/null
+++ b/nixos/modules/services/monitoring/riemann-tools.nix
@@ -0,0 +1,62 @@
+{ config, pkgs, lib, ... }:
+
+with pkgs;
+with lib;
+
+let
+
+ cfg = config.services.riemann-tools;
+
+ riemannHost = "${cfg.riemannHost}";
+
+ healthLauncher = writeScriptBin "riemann-health" ''
+ #!/bin/sh
+ exec ${pkgs.riemann-tools}/bin/riemann-health --host ${riemannHost}
+ '';
+
+
+in {
+
+ options = {
+
+ services.riemann-tools = {
+ enableHealth = mkOption {
+ type = types.bool;
+ default = false;
+ description = ''
+ Enable the riemann-health daemon.
+ '';
+ };
+ riemannHost = mkOption {
+ type = types.str;
+ default = "127.0.0.1";
+ description = ''
+ Address of the host riemann node. Defaults to localhost.
+ '';
+ };
+ };
+
+ };
+
+ config = mkIf cfg.enableHealth {
+
+ users.extraGroups.riemanntools.gid = config.ids.gids.riemanntools;
+
+ users.extraUsers.riemanntools = {
+ description = "riemann-tools daemon user";
+ uid = config.ids.uids.riemanntools;
+ group = "riemanntools";
+ };
+
+ systemd.services.riemann-health = {
+ wantedBy = [ "multi-user.target" ];
+ serviceConfig = {
+ User = "riemanntools";
+ ExecStart = "${healthLauncher}/bin/riemann-health";
+ PermissionsStartOnly = true;
+ };
+ };
+
+ };
+
+}
diff --git a/pkgs/applications/audio/vimpc/default.nix b/pkgs/applications/audio/vimpc/default.nix
index 71a07f18e084..25292a4408f9 100644
--- a/pkgs/applications/audio/vimpc/default.nix
+++ b/pkgs/applications/audio/vimpc/default.nix
@@ -1,34 +1,29 @@
-{ stdenv, fetchurl, autoconf, automake, mpd_clientlib, ncurses, pcre, pkgconfig, taglib }:
+{ stdenv, fetchFromGitHub, autoreconfHook, mpd_clientlib, ncurses, pcre, pkgconfig
+, taglib }:
stdenv.mkDerivation rec {
version = "0.09.0";
name = "vimpc-${version}";
- src = fetchurl {
- url = "https://github.com/boysetsfrog/vimpc/archive/v${version}.tar.gz";
- sha256 = "13eb229a5e9eee491765ee89f7fe6a38140a41a01434b117da3869d725c15706";
+ src = fetchFromGitHub {
+ owner = "boysetsfrog";
+ repo = "vimpc";
+ rev = "v${version}";
+ sha256 = "1z9yx2pz84lyng1ig9y4z6pdalwxb80ig7nnzhqfy3pl36hq6shi";
};
- buildInputs = [ autoconf
- automake
- mpd_clientlib
- ncurses
- pcre
- pkgconfig
- taglib
- ];
-
- preConfigure = "./autogen.sh";
+ buildInputs = [ autoreconfHook mpd_clientlib ncurses pcre pkgconfig taglib ];
postInstall = ''
mkdir -p $out/etc
cp doc/vimpcrc.example $out/etc
'';
- meta = {
+ meta = with stdenv.lib; {
description = "A vi/vim inspired client for the Music Player Daemon (mpd)";
homepage = https://github.com/boysetsfrog/vimpc;
- license = stdenv.lib.licenses.gpl3;
- platforms = stdenv.lib.platforms.linux;
+ license = licenses.gpl3;
+ platforms = platforms.linux;
+ maintainers = with maintainers; [ pSub ];
};
}
diff --git a/pkgs/applications/misc/audio/sox/default.nix b/pkgs/applications/misc/audio/sox/default.nix
index 07dbde2939be..fa6e53bcf972 100644
--- a/pkgs/applications/misc/audio/sox/default.nix
+++ b/pkgs/applications/misc/audio/sox/default.nix
@@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
meta = {
description = "Sample Rate Converter for audio";
homepage = http://sox.sourceforge.net/;
- maintainers = [ lib.maintainers.marcweber lib.maintainers.shlevy ];
+ maintainers = [ lib.maintainers.marcweber ];
license = lib.licenses.gpl2Plus;
platforms = lib.platforms.linux ++ lib.platforms.darwin;
};
diff --git a/pkgs/applications/misc/khard/default.nix b/pkgs/applications/misc/khard/default.nix
new file mode 100644
index 000000000000..2eda8acf4b88
--- /dev/null
+++ b/pkgs/applications/misc/khard/default.nix
@@ -0,0 +1,29 @@
+{ stdenv, fetchurl, pkgs, pythonPackages }:
+
+pythonPackages.buildPythonPackage rec {
+ version = "0.4.0";
+ name = "khard-${version}";
+ namePrefix = "";
+
+ src = fetchurl {
+ url = "https://github.com/scheibler/khard/archive/v${version}.tar.gz";
+ sha256 = "0xvg8725297faw5mk7ka4xjc968vq3ix7izd4vmsaqysl43gnh21";
+ };
+
+ propagatedBuildInputs = with pythonPackages; [
+ configobj
+ vobject
+ argparse
+ ];
+
+ buildInputs = with pythonPackages; [
+ pkgs.vdirsyncer
+ ];
+
+ meta = {
+ homepage = https://github.com/scheibler/khard;
+ description = "Console carddav client";
+ license = stdenv.lib.licenses.gpl3;
+ maintainers = with stdenv.lib.maintainers; [ matthiasbeyer ];
+ };
+}
diff --git a/pkgs/applications/networking/instant-messengers/qtox/default.nix b/pkgs/applications/networking/instant-messengers/qtox/default.nix
index 874f68f0ec20..cba5bdeec7e9 100644
--- a/pkgs/applications/networking/instant-messengers/qtox/default.nix
+++ b/pkgs/applications/networking/instant-messengers/qtox/default.nix
@@ -1,41 +1,38 @@
-{ stdenv, fetchFromGitHub, pkgconfig, libtoxcore, qt5, openal, opencv
-, libsodium, libXScrnSaver }:
+{ stdenv, fetchgit, pkgconfig, libtoxcore-dev, qt5, openal, opencv,
+ libsodium, libXScrnSaver, glib, gdk_pixbuf, gtk2, cairo,
+ pango, atk, qrencode, ffmpeg, filter-audio }:
-let
+stdenv.mkDerivation rec {
+ name = "qtox-dev-20150624";
- filteraudio = stdenv.mkDerivation rec {
- name = "filter_audio-20150128";
-
- src = fetchFromGitHub {
- owner = "irungentoo";
- repo = "filter_audio";
- rev = "76428a6cda";
- sha256 = "0c4wp9a7dzbj9ykfkbsxrkkyy0nz7vyr5map3z7q8bmv9pjylbk9";
- };
-
- doCheck = false;
-
- makeFlags = "PREFIX=$(out)";
- };
-
-in stdenv.mkDerivation rec {
- name = "qtox-dev-20150130";
-
- src = fetchFromGitHub {
- owner = "tux3";
- repo = "qTox";
- rev = "7574569b3d";
- sha256 = "0a7zkhl4w2r5ifzs7vwws2lpplp6q5c4jllyf4ld64njgiz6jzip";
+ src = fetchgit {
+ url = "https://github.com/tux3/qTox.git";
+ rev = "9f386135a2cf428d2802b158c70be4beee5abf86";
+ sha256 = "1m2y50q5yim1q75k48cy5daq5qm77cvb3kcla7lpqv54xnfdwxk8";
};
buildInputs =
[
- libtoxcore openal opencv libsodium filteraudio
- qt5.base qt5.tools libXScrnSaver
+ libtoxcore-dev openal opencv libsodium filter-audio
+ qt5.base qt5.tools libXScrnSaver glib gtk2 cairo
+ pango atk qrencode ffmpeg qt5.translations
];
+
nativeBuildInputs = [ pkgconfig ];
- configurePhase = "qmake";
+ preConfigure = ''
+ export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE $(pkg-config --cflags glib-2.0)"
+ export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE $(pkg-config --cflags gdk-pixbuf-2.0)"
+ export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE $(pkg-config --cflags gtk+-2.0)"
+ export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE $(pkg-config --cflags cairo)"
+ export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE $(pkg-config --cflags pango)"
+ export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE $(pkg-config --cflags atk)"
+ '';
+
+ configurePhase = ''
+ runHook preConfigure
+ qmake
+ '';
installPhase = ''
mkdir -p $out/bin
@@ -49,3 +46,4 @@ in stdenv.mkDerivation rec {
platforms = platforms.all;
};
}
+
diff --git a/pkgs/applications/office/todo.txt-cli/default.nix b/pkgs/applications/office/todo.txt-cli/default.nix
index eb4c31ed9d27..70d4a0bf8888 100644
--- a/pkgs/applications/office/todo.txt-cli/default.nix
+++ b/pkgs/applications/office/todo.txt-cli/default.nix
@@ -22,7 +22,6 @@ in stdenv.mkDerivation {
description = "Simple plaintext todo list manager";
homepage = "http://todotxt.com";
license = stdenv.lib.licenses.gpl3;
- maintainers = [ stdenv.lib.maintainers.shlevy ];
platforms = stdenv.lib.platforms.all;
};
}
diff --git a/pkgs/applications/search/recoll/default.nix b/pkgs/applications/search/recoll/default.nix
index 4274f73c7e56..0eb4632a4c00 100644
--- a/pkgs/applications/search/recoll/default.nix
+++ b/pkgs/applications/search/recoll/default.nix
@@ -6,12 +6,12 @@
assert stdenv.system != "powerpc-linux";
stdenv.mkDerivation rec {
- ver = "1.18.1";
+ ver = "1.20.6";
name = "recoll-${ver}";
src = fetchurl {
url = "http://www.lesbonscomptes.com/recoll/${name}.tar.gz";
- sha256 = "0cyrkx5aza3485avb2kxc6cbsqqrb32l1kq8ravr9d828331v84f";
+ sha256 = "0ympk2w21cxfvysyx96p0npsa54csfc84cicpi8nsj1qp824zxwq";
};
configureFlags = [ "--with-inotify" ];
@@ -47,15 +47,15 @@ stdenv.mkDerivation rec {
#substituteInPlace $f --replace untex ${untex}/bin/untex
#substituteInPlace $f --replace wpd2html ${wpd2html}/bin/wpd2html
- meta = {
- description = "finds keywords inside documents as well as file names";
+ meta = with stdenv.lib; {
+ description = "A full-text search tool";
longDescription = ''
Recoll is an Xapian frontend that can search through files, archive
members, email attachments.
'';
homepage = http://www.lesbonscomptes.com/recoll/;
- license = stdenv.lib.licenses.gpl2;
- platforms = stdenv.lib.platforms.unix;
- maintainers = with stdenv.lib.maintainers; [ jcumming ];
+ license = licenses.gpl2;
+ platforms = platforms.unix;
+ maintainers = with maintainers; [ jcumming ];
};
}
diff --git a/pkgs/applications/version-management/meld/default.nix b/pkgs/applications/version-management/meld/default.nix
index a892d7decc07..2a69d1406699 100644
--- a/pkgs/applications/version-management/meld/default.nix
+++ b/pkgs/applications/version-management/meld/default.nix
@@ -1,5 +1,6 @@
{ stdenv, fetchurl, itstool, buildPythonPackage, python27, intltool, makeWrapper
, libxml2, pygobject3, gobjectIntrospection, gtk3, gnome3, pycairo, cairo
+, hicolor_icon_theme
}:
@@ -20,6 +21,7 @@ buildPythonPackage rec {
buildInputs = [
python27 intltool makeWrapper itstool libxml2
gnome3.gtksourceview gnome3.gsettings_desktop_schemas pycairo cairo
+ hicolor_icon_theme
];
propagatedBuildInputs = [ gobjectIntrospection pygobject3 gtk3 ];
diff --git a/pkgs/applications/version-management/src/default.nix b/pkgs/applications/version-management/src/default.nix
index eede33c2145d..0e98791d823a 100644
--- a/pkgs/applications/version-management/src/default.nix
+++ b/pkgs/applications/version-management/src/default.nix
@@ -31,8 +31,6 @@ stdenv.mkDerivation rec {
license = stdenv.lib.licenses.bsd3;
- maintainers = [ stdenv.lib.maintainers.shlevy ];
-
platforms = stdenv.lib.platforms.all;
};
}
diff --git a/pkgs/applications/virtualization/OVMF/default.nix b/pkgs/applications/virtualization/OVMF/default.nix
index e29ab11947fd..479d625c7de7 100644
--- a/pkgs/applications/virtualization/OVMF/default.nix
+++ b/pkgs/applications/virtualization/OVMF/default.nix
@@ -49,7 +49,6 @@ stdenv.mkDerivation (edk2.setup "OvmfPkg/OvmfPkg${targetArch}.dsc" {
description = "Sample UEFI firmware for QEMU and KVM";
homepage = http://sourceforge.net/apps/mediawiki/tianocore/index.php?title=OVMF;
license = stdenv.lib.licenses.bsd2;
- maintainers = [ stdenv.lib.maintainers.shlevy ];
platforms = ["x86_64-linux" "i686-linux"];
};
})
diff --git a/pkgs/applications/virtualization/qemu/default.nix b/pkgs/applications/virtualization/qemu/default.nix
index 5fc502a58468..a5d403457de0 100644
--- a/pkgs/applications/virtualization/qemu/default.nix
+++ b/pkgs/applications/virtualization/qemu/default.nix
@@ -64,7 +64,7 @@ stdenv.mkDerivation rec {
homepage = http://www.qemu.org/;
description = "A generic and open source machine emulator and virtualizer";
license = licenses.gpl2Plus;
- maintainers = with maintainers; [ viric shlevy eelco ];
+ maintainers = with maintainers; [ viric eelco ];
platforms = platforms.linux;
};
}
diff --git a/pkgs/applications/virtualization/virt-manager/default.nix b/pkgs/applications/virtualization/virt-manager/default.nix
index 67e3f9ade980..604cad4c066d 100644
--- a/pkgs/applications/virtualization/virt-manager/default.nix
+++ b/pkgs/applications/virtualization/virt-manager/default.nix
@@ -9,12 +9,12 @@ with pythonPackages;
buildPythonPackage rec {
name = "virt-manager-${version}";
- version = "1.1.0";
+ version = "1.2.1";
namePrefix = "";
src = fetchurl {
url = "http://virt-manager.org/download/sources/virt-manager/${name}.tar.gz";
- sha256 = "0hbr1wf4byfvbqlbq3w6s71ckhn626i4rb497y4z2cm12p5hc2db";
+ sha256 = "1gp6ijrwl6kjs54l395002pc9sblp08p4nqx9zcb9qg5f87aifvl";
};
propagatedBuildInputs =
diff --git a/pkgs/build-support/build-maven.nix b/pkgs/build-support/build-maven.nix
index 284be201ff08..26be7d2aebb7 100644
--- a/pkgs/build-support/build-maven.nix
+++ b/pkgs/build-support/build-maven.nix
@@ -1,6 +1,6 @@
{ stdenv, maven, runCommand, writeText, fetchurl, lib }:
/* Takes an info file generated by mvn2nix
- * (https://github.com/shlevy/mvn2nix-maven-plugin) and builds the maven
+ * (https://github.com/NixOS/mvn2nix-maven-plugin) and builds the maven
* project with it.
*
* repo: A local maven repository with the project's dependencies.
diff --git a/pkgs/desktops/gnome-3/3.16/core/zenity/default.nix b/pkgs/desktops/gnome-3/3.16/core/zenity/default.nix
index 72e8ee6a5937..aca42f1dbc2c 100644
--- a/pkgs/desktops/gnome-3/3.16/core/zenity/default.nix
+++ b/pkgs/desktops/gnome-3/3.16/core/zenity/default.nix
@@ -3,16 +3,20 @@
stdenv.mkDerivation rec {
- versionMajor = "3.14";
- versionMinor = "0";
+ versionMajor = "3.16";
+ versionMinor = "3";
name = "zenity-${versionMajor}.${versionMinor}";
src = fetchurl {
url = "mirror://gnome/sources/zenity/${versionMajor}/${name}.tar.xz";
- sha256 = "0bw95d6ns67h0mw90qcbhxvhbglbpgd66vinvha7gwba8mnfqmvb";
+ sha256 = "1fhyzcmhrzqi10ks1gy8cxyqnbdfsnmqw3bkixnzrcf5zcb81qkz";
};
+ preBuild = ''
+ mkdir -p $out/include
+ '';
+
buildInputs = [ gnome3.gtk libxml2 libxslt libX11 itstool ];
nativeBuildInputs = [ pkgconfig intltool gnome_doc_utils which ];
diff --git a/pkgs/development/compilers/ats-extsolve/default.nix b/pkgs/development/compilers/ats-extsolve/default.nix
deleted file mode 100644
index c1a7f2882a0a..000000000000
--- a/pkgs/development/compilers/ats-extsolve/default.nix
+++ /dev/null
@@ -1,34 +0,0 @@
-{ stdenv, fetchurl, ats2, python, z3, pkgconfig, json_c }:
-
-stdenv.mkDerivation {
- name = "ats-extsolve-0pre11177d9";
-
- buildInputs = [ python z3 ats2 pkgconfig json_c ];
-
- src = fetchurl {
- url = "https://github.com/wdblair/ATS-Postiats-contrib/archive/11177d9194b852392d5e92e67d0ecc7b6abc02bf.tar.gz";
- sha256 = "12fhlcpq5b4pc3h21w1i7yv1ymrll2g4zlf1pvg0v8cr6aa6i813";
- };
-
- postUnpack = ''
- export PATSHOMERELOC="$PWD/$sourceRoot"
- export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I$PATSHOMERELOC"
- export INCLUDE_ATS="-IATS $PATSHOMERELOC"
- '';
-
- preBuild = "cd projects/MEDIUM/ATS-extsolve";
-
- buildFlags = [ "setup" "patsolve" ];
-
- installPhase = ''
- install -d -m755 $out/bin
- install -m755 patsolve $out/bin
- '';
-
- meta = {
- platforms = ats2.meta.platforms;
- homepage = http://www.illtyped.com/projects/patsolve;
- description = "External Constraint-Solving for ATS2";
- maintainer = [ stdenv.lib.maintainers.shlevy ];
- };
-}
diff --git a/pkgs/development/compilers/edk2/default.nix b/pkgs/development/compilers/edk2/default.nix
index 02e22e820290..ebbac8ec3553 100644
--- a/pkgs/development/compilers/edk2/default.nix
+++ b/pkgs/development/compilers/edk2/default.nix
@@ -35,7 +35,6 @@ edk2 = stdenv.mkDerivation {
description = "Intel EFI development kit";
homepage = http://sourceforge.net/projects/edk2/;
license = stdenv.lib.licenses.bsd2;
- maintainers = [ stdenv.lib.maintainers.shlevy ];
platforms = ["x86_64-linux" "i686-linux"];
};
diff --git a/pkgs/development/compilers/gcc/4.8/default.nix b/pkgs/development/compilers/gcc/4.8/default.nix
index 69f9a8df0257..2035e0aaff06 100644
--- a/pkgs/development/compilers/gcc/4.8/default.nix
+++ b/pkgs/development/compilers/gcc/4.8/default.nix
@@ -512,7 +512,7 @@ stdenv.mkDerivation ({
compiler used in the GNU system including the GNU/Linux variant.
'';
- maintainers = with stdenv.lib.maintainers; [ viric shlevy simons ];
+ maintainers = with stdenv.lib.maintainers; [ viric simons ];
# gnatboot is not available out of linux platforms, so we disable the darwin build
# for the gnat (ada compiler).
diff --git a/pkgs/development/compilers/gcc/4.9/default.nix b/pkgs/development/compilers/gcc/4.9/default.nix
index 1cc894b9dcf3..5d525e6d50fe 100644
--- a/pkgs/development/compilers/gcc/4.9/default.nix
+++ b/pkgs/development/compilers/gcc/4.9/default.nix
@@ -511,7 +511,7 @@ stdenv.mkDerivation ({
compiler used in the GNU system including the GNU/Linux variant.
'';
- maintainers = with stdenv.lib.maintainers; [ viric shlevy simons ];
+ maintainers = with stdenv.lib.maintainers; [ viric simons ];
# gnatboot is not available out of linux platforms, so we disable the darwin build
# for the gnat (ada compiler).
diff --git a/pkgs/development/compilers/gcc/5/default.nix b/pkgs/development/compilers/gcc/5/default.nix
index 95125d99893c..323a87bc7746 100644
--- a/pkgs/development/compilers/gcc/5/default.nix
+++ b/pkgs/development/compilers/gcc/5/default.nix
@@ -507,7 +507,7 @@ stdenv.mkDerivation ({
compiler used in the GNU system including the GNU/Linux variant.
'';
- maintainers = with stdenv.lib.maintainers; [ viric shlevy simons ];
+ maintainers = with stdenv.lib.maintainers; [ viric simons ];
# gnatboot is not available out of linux platforms, so we disable the darwin build
# for the gnat (ada compiler).
diff --git a/pkgs/development/compilers/llvm/3.4/clang.nix b/pkgs/development/compilers/llvm/3.4/clang.nix
index 51e871f2ca45..2dd3a23d7668 100644
--- a/pkgs/development/compilers/llvm/3.4/clang.nix
+++ b/pkgs/development/compilers/llvm/3.4/clang.nix
@@ -48,7 +48,6 @@ stdenv.mkDerivation {
description = "A c, c++, objective-c, and objective-c++ frontend for the llvm compiler";
homepage = http://llvm.org/;
license = stdenv.lib.licenses.bsd3;
- maintainers = [ stdenv.lib.maintainers.shlevy ];
platforms = stdenv.lib.platforms.all;
};
}
diff --git a/pkgs/development/compilers/llvm/3.4/dragonegg.nix b/pkgs/development/compilers/llvm/3.4/dragonegg.nix
index 2ebdc10654b1..b2f41914d968 100644
--- a/pkgs/development/compilers/llvm/3.4/dragonegg.nix
+++ b/pkgs/development/compilers/llvm/3.4/dragonegg.nix
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
homepage = http://dragonegg.llvm.org/;
description = "gcc plugin that replaces gcc's optimizers and code generators by those in LLVM";
license = stdenv.lib.licenses.gpl2Plus;
- maintainers = with stdenv.lib.maintainers; [viric shlevy];
+ maintainers = with stdenv.lib.maintainers; [viric];
platforms = with stdenv.lib.platforms; linux;
broken = true;
};
diff --git a/pkgs/development/compilers/llvm/3.4/lld.nix b/pkgs/development/compilers/llvm/3.4/lld.nix
index c28c03fbdd1d..4360ec9ad1b2 100644
--- a/pkgs/development/compilers/llvm/3.4/lld.nix
+++ b/pkgs/development/compilers/llvm/3.4/lld.nix
@@ -25,7 +25,6 @@ stdenv.mkDerivation {
description = "A set of modular code for creating linker tools";
homepage = http://llvm.org/;
license = stdenv.lib.licenses.bsd3;
- maintainers = [ stdenv.lib.maintainers.shlevy ];
platforms = stdenv.lib.platforms.all;
};
}
diff --git a/pkgs/development/compilers/llvm/3.4/lldb.nix b/pkgs/development/compilers/llvm/3.4/lldb.nix
index 7b35119a93fb..540faf01e079 100644
--- a/pkgs/development/compilers/llvm/3.4/lldb.nix
+++ b/pkgs/development/compilers/llvm/3.4/lldb.nix
@@ -38,7 +38,6 @@ stdenv.mkDerivation {
description = "A next-generation high-performance debugger";
homepage = http://llvm.org/;
license = stdenv.lib.licenses.bsd3;
- maintainers = [ stdenv.lib.maintainers.shlevy ];
platforms = stdenv.lib.platforms.all;
};
}
diff --git a/pkgs/development/compilers/llvm/3.4/llvm.nix b/pkgs/development/compilers/llvm/3.4/llvm.nix
index a44f157a13e5..4c9235681e37 100644
--- a/pkgs/development/compilers/llvm/3.4/llvm.nix
+++ b/pkgs/development/compilers/llvm/3.4/llvm.nix
@@ -67,7 +67,7 @@ in stdenv.mkDerivation rec {
description = "Collection of modular and reusable compiler and toolchain technologies";
homepage = http://llvm.org/;
license = stdenv.lib.licenses.bsd3;
- maintainers = with stdenv.lib.maintainers; [ shlevy lovek323 raskin viric ];
+ maintainers = with stdenv.lib.maintainers; [ lovek323 raskin viric ];
platforms = stdenv.lib.platforms.all;
};
}
diff --git a/pkgs/development/compilers/llvm/3.4/polly.nix b/pkgs/development/compilers/llvm/3.4/polly.nix
index 61721ffad67d..2e0018c34c20 100644
--- a/pkgs/development/compilers/llvm/3.4/polly.nix
+++ b/pkgs/development/compilers/llvm/3.4/polly.nix
@@ -21,7 +21,6 @@ stdenv.mkDerivation {
description = "A polyhedral optimizer for llvm";
homepage = http://llvm.org/;
license = stdenv.lib.licenses.bsd3;
- maintainers = [ stdenv.lib.maintainers.shlevy ];
platforms = stdenv.lib.platforms.all;
};
}
diff --git a/pkgs/development/compilers/llvm/3.5/clang.nix b/pkgs/development/compilers/llvm/3.5/clang.nix
index 05ac4be01e5f..292154eb67ad 100644
--- a/pkgs/development/compilers/llvm/3.5/clang.nix
+++ b/pkgs/development/compilers/llvm/3.5/clang.nix
@@ -49,7 +49,6 @@ in stdenv.mkDerivation {
description = "A c, c++, objective-c, and objective-c++ frontend for the llvm compiler";
homepage = http://llvm.org/;
license = stdenv.lib.licenses.bsd3;
- maintainers = [ stdenv.lib.maintainers.shlevy ];
platforms = stdenv.lib.platforms.all;
};
}
diff --git a/pkgs/development/compilers/llvm/3.5/dragonegg.nix b/pkgs/development/compilers/llvm/3.5/dragonegg.nix
index ac433ac90a18..a7d405fd55a8 100644
--- a/pkgs/development/compilers/llvm/3.5/dragonegg.nix
+++ b/pkgs/development/compilers/llvm/3.5/dragonegg.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
homepage = http://dragonegg.llvm.org/;
description = "gcc plugin that replaces gcc's optimizers and code generators by those in LLVM";
license = stdenv.lib.licenses.gpl2Plus;
- maintainers = with stdenv.lib.maintainers; [viric shlevy];
+ maintainers = with stdenv.lib.maintainers; [viric];
platforms = with stdenv.lib.platforms; linux;
};
}
diff --git a/pkgs/development/compilers/llvm/3.5/libc++/default.nix b/pkgs/development/compilers/llvm/3.5/libc++/default.nix
index d2796d678d03..a23daf4f14ae 100644
--- a/pkgs/development/compilers/llvm/3.5/libc++/default.nix
+++ b/pkgs/development/compilers/llvm/3.5/libc++/default.nix
@@ -40,7 +40,6 @@ stdenv.mkDerivation rec {
homepage = http://libcxx.llvm.org/;
description = "A new implementation of the C++ standard library, targeting C++11";
license = "BSD";
- maintainers = [ stdenv.lib.maintainers.shlevy ];
platforms = stdenv.lib.platforms.unix;
};
}
diff --git a/pkgs/development/compilers/llvm/3.5/libc++abi/default.nix b/pkgs/development/compilers/llvm/3.5/libc++abi/default.nix
index ca8558f71472..c84ce2a44354 100644
--- a/pkgs/development/compilers/llvm/3.5/libc++abi/default.nix
+++ b/pkgs/development/compilers/llvm/3.5/libc++abi/default.nix
@@ -53,7 +53,7 @@ in stdenv.mkDerivation {
homepage = http://libcxxabi.llvm.org/;
description = "A new implementation of low level support for a standard C++ library";
license = "BSD";
- maintainers = with stdenv.lib.maintainers; [ shlevy vlstill ];
+ maintainers = with stdenv.lib.maintainers; [ vlstill ];
platforms = stdenv.lib.platforms.unix;
};
}
diff --git a/pkgs/development/compilers/llvm/3.5/lld.nix b/pkgs/development/compilers/llvm/3.5/lld.nix
index 000b3c9d57a2..6bd8c029231e 100644
--- a/pkgs/development/compilers/llvm/3.5/lld.nix
+++ b/pkgs/development/compilers/llvm/3.5/lld.nix
@@ -25,7 +25,6 @@ stdenv.mkDerivation {
description = "A set of modular code for creating linker tools";
homepage = http://llvm.org/;
license = stdenv.lib.licenses.bsd3;
- maintainers = [ stdenv.lib.maintainers.shlevy ];
platforms = stdenv.lib.platforms.all;
};
}
diff --git a/pkgs/development/compilers/llvm/3.5/lldb.nix b/pkgs/development/compilers/llvm/3.5/lldb.nix
index 92ba4108a4d2..574d706a3fd5 100644
--- a/pkgs/development/compilers/llvm/3.5/lldb.nix
+++ b/pkgs/development/compilers/llvm/3.5/lldb.nix
@@ -38,7 +38,6 @@ stdenv.mkDerivation {
description = "A next-generation high-performance debugger";
homepage = http://llvm.org/;
license = stdenv.lib.licenses.bsd3;
- maintainers = [ stdenv.lib.maintainers.shlevy ];
platforms = stdenv.lib.platforms.all;
broken = true;
};
diff --git a/pkgs/development/compilers/llvm/3.5/llvm.nix b/pkgs/development/compilers/llvm/3.5/llvm.nix
index 7e11caa66f0f..b569997acc66 100644
--- a/pkgs/development/compilers/llvm/3.5/llvm.nix
+++ b/pkgs/development/compilers/llvm/3.5/llvm.nix
@@ -68,7 +68,7 @@ in stdenv.mkDerivation rec {
description = "Collection of modular and reusable compiler and toolchain technologies";
homepage = http://llvm.org/;
license = stdenv.lib.licenses.bsd3;
- maintainers = with stdenv.lib.maintainers; [ shlevy lovek323 raskin viric ];
+ maintainers = with stdenv.lib.maintainers; [ lovek323 raskin viric ];
platforms = stdenv.lib.platforms.all;
};
}
diff --git a/pkgs/development/compilers/llvm/3.5/polly.nix b/pkgs/development/compilers/llvm/3.5/polly.nix
index 6de420397af1..03bfe0d154b5 100644
--- a/pkgs/development/compilers/llvm/3.5/polly.nix
+++ b/pkgs/development/compilers/llvm/3.5/polly.nix
@@ -21,7 +21,6 @@ stdenv.mkDerivation {
description = "A polyhedral optimizer for llvm";
homepage = http://llvm.org/;
license = stdenv.lib.licenses.bsd3;
- maintainers = [ stdenv.lib.maintainers.shlevy ];
platforms = stdenv.lib.platforms.all;
};
}
diff --git a/pkgs/development/compilers/llvm/3.6/clang/default.nix b/pkgs/development/compilers/llvm/3.6/clang/default.nix
index ecca67398ec9..93c45c4efb46 100644
--- a/pkgs/development/compilers/llvm/3.6/clang/default.nix
+++ b/pkgs/development/compilers/llvm/3.6/clang/default.nix
@@ -50,7 +50,6 @@ in stdenv.mkDerivation {
description = "A c, c++, objective-c, and objective-c++ frontend for the llvm compiler";
homepage = http://llvm.org/;
license = stdenv.lib.licenses.bsd3;
- maintainers = [ stdenv.lib.maintainers.shlevy ];
platforms = stdenv.lib.platforms.all;
};
}
diff --git a/pkgs/development/compilers/llvm/3.6/libc++/default.nix b/pkgs/development/compilers/llvm/3.6/libc++/default.nix
index 5bc122fa5ce1..d83ca83bbae8 100644
--- a/pkgs/development/compilers/llvm/3.6/libc++/default.nix
+++ b/pkgs/development/compilers/llvm/3.6/libc++/default.nix
@@ -35,7 +35,6 @@ stdenv.mkDerivation rec {
homepage = http://libcxx.llvm.org/;
description = "A new implementation of the C++ standard library, targeting C++11";
license = "BSD";
- maintainers = [ stdenv.lib.maintainers.shlevy ];
platforms = stdenv.lib.platforms.unix;
};
}
diff --git a/pkgs/development/compilers/llvm/3.6/libc++abi.nix b/pkgs/development/compilers/llvm/3.6/libc++abi.nix
index 6cd08e46e637..53a01c95c8a7 100644
--- a/pkgs/development/compilers/llvm/3.6/libc++abi.nix
+++ b/pkgs/development/compilers/llvm/3.6/libc++abi.nix
@@ -41,7 +41,7 @@ stdenv.mkDerivation {
homepage = http://libcxxabi.llvm.org/;
description = "A new implementation of low level support for a standard C++ library";
license = "BSD";
- maintainers = with stdenv.lib.maintainers; [ shlevy vlstill ];
+ maintainers = with stdenv.lib.maintainers; [ vlstill ];
platforms = stdenv.lib.platforms.unix;
};
}
diff --git a/pkgs/development/compilers/llvm/3.6/lldb.nix b/pkgs/development/compilers/llvm/3.6/lldb.nix
index 4740c97cb9b3..334810917fa8 100644
--- a/pkgs/development/compilers/llvm/3.6/lldb.nix
+++ b/pkgs/development/compilers/llvm/3.6/lldb.nix
@@ -38,7 +38,6 @@ stdenv.mkDerivation {
description = "A next-generation high-performance debugger";
homepage = http://llvm.org/;
license = stdenv.lib.licenses.bsd3;
- maintainers = [ stdenv.lib.maintainers.shlevy ];
platforms = stdenv.lib.platforms.all;
};
}
diff --git a/pkgs/development/compilers/llvm/3.6/llvm.nix b/pkgs/development/compilers/llvm/3.6/llvm.nix
index 0cf5ef215a2f..2d6f29aacea0 100644
--- a/pkgs/development/compilers/llvm/3.6/llvm.nix
+++ b/pkgs/development/compilers/llvm/3.6/llvm.nix
@@ -68,7 +68,7 @@ in stdenv.mkDerivation rec {
description = "Collection of modular and reusable compiler and toolchain technologies";
homepage = http://llvm.org/;
license = stdenv.lib.licenses.bsd3;
- maintainers = with stdenv.lib.maintainers; [ shlevy lovek323 raskin viric ];
+ maintainers = with stdenv.lib.maintainers; [ lovek323 raskin viric ];
platforms = stdenv.lib.platforms.all;
};
}
diff --git a/pkgs/development/compilers/openjdk/default.nix b/pkgs/development/compilers/openjdk/default.nix
index be4ca84bd8dd..19dec917bf82 100644
--- a/pkgs/development/compilers/openjdk/default.nix
+++ b/pkgs/development/compilers/openjdk/default.nix
@@ -233,7 +233,7 @@ let
homepage = http://openjdk.java.net/;
license = stdenv.lib.licenses.gpl2;
description = "The open-source Java Development Kit";
- maintainers = [ stdenv.lib.maintainers.eelco stdenv.lib.maintainers.shlevy ];
+ maintainers = [ stdenv.lib.maintainers.eelco ];
platforms = stdenv.lib.platforms.linux;
};
diff --git a/pkgs/development/interpreters/nix-exec/default.nix b/pkgs/development/interpreters/nix-exec/default.nix
index 92df954e5e01..72641161c75c 100644
--- a/pkgs/development/interpreters/nix-exec/default.nix
+++ b/pkgs/development/interpreters/nix-exec/default.nix
@@ -18,8 +18,6 @@ in stdenv.mkDerivation {
license = stdenv.lib.licenses.mit;
- maintainers = [ stdenv.lib.maintainers.shlevy ];
-
platforms = nix.meta.platforms;
};
}
diff --git a/pkgs/development/libraries/c-ares/default.nix b/pkgs/development/libraries/c-ares/default.nix
index 678c7e151122..eb68a7b9a910 100644
--- a/pkgs/development/libraries/c-ares/default.nix
+++ b/pkgs/development/libraries/c-ares/default.nix
@@ -13,6 +13,5 @@ stdenv.mkDerivation rec {
homepage = http://c-ares.haxx.se;
license = licenses.mit;
platforms = platforms.all;
- maintainers = with maintainers; [ shlevy ];
};
}
diff --git a/pkgs/development/libraries/cloog/0.18.0.nix b/pkgs/development/libraries/cloog/0.18.0.nix
index 926da22b2802..ccd938283199 100644
--- a/pkgs/development/libraries/cloog/0.18.0.nix
+++ b/pkgs/development/libraries/cloog/0.18.0.nix
@@ -39,8 +39,6 @@ stdenv.mkDerivation rec {
license = stdenv.lib.licenses.gpl2Plus;
- maintainers = [ stdenv.lib.maintainers.shlevy ];
-
/* Leads to an ICE on Cygwin:
make[3]: Entering directory `/tmp/nix-build-9q5gw5m37q5l4f0kjfv9ar8fsc9plk27-ppl-0.10.2.drv-1/ppl-0.10.2/src'
diff --git a/pkgs/development/libraries/cloog/default.nix b/pkgs/development/libraries/cloog/default.nix
index 629cdba1fd4c..55f705971701 100644
--- a/pkgs/development/libraries/cloog/default.nix
+++ b/pkgs/development/libraries/cloog/default.nix
@@ -40,8 +40,6 @@ stdenv.mkDerivation rec {
license = stdenv.lib.licenses.gpl2Plus;
- maintainers = [ stdenv.lib.maintainers.shlevy ];
-
/* Leads to an ICE on Cygwin:
make[3]: Entering directory `/tmp/nix-build-9q5gw5m37q5l4f0kjfv9ar8fsc9plk27-ppl-0.10.2.drv-1/ppl-0.10.2/src'
diff --git a/pkgs/development/libraries/cpp-netlib/default.nix b/pkgs/development/libraries/cpp-netlib/default.nix
index 2f088b4d3044..57e518635ced 100644
--- a/pkgs/development/libraries/cpp-netlib/default.nix
+++ b/pkgs/development/libraries/cpp-netlib/default.nix
@@ -22,7 +22,6 @@ stdenv.mkDerivation rec {
description = "A collection of open-source libraries for high level network programming";
homepage = http://cpp-netlib.org;
license = licenses.boost;
- maintainers = with maintainers; [ shlevy ];
platforms = platforms.all;
};
}
diff --git a/pkgs/development/libraries/filter-audio/default.nix b/pkgs/development/libraries/filter-audio/default.nix
new file mode 100644
index 000000000000..989d9518a0eb
--- /dev/null
+++ b/pkgs/development/libraries/filter-audio/default.nix
@@ -0,0 +1,24 @@
+{ stdenv, fetchgit }:
+
+stdenv.mkDerivation rec {
+ name = "filter-audio-20150624";
+
+ src = fetchgit {
+ url = "https://github.com/irungentoo/filter_audio.git";
+ rev = "612c5a102550c614e4c8f859e753ea64c0b7250c";
+ sha256 = "0bmf8dxnr4vb6y36lvlwqd5x68r4cbsd625kbw3pypm5yqp0n5na";
+ };
+
+ doCheck = false;
+
+ makeFlags = "PREFIX=$(out)";
+
+ meta = with stdenv.lib; {
+ description = "Lightweight audio filtering library made from webrtc code";
+ license = licenses.bsd3;
+ maintainers = with maintainers; [ viric jgeerds ];
+ platforms = platforms.all;
+ };
+}
+
+
diff --git a/pkgs/development/libraries/gnu-efi/default.nix b/pkgs/development/libraries/gnu-efi/default.nix
index 43479a8f66d1..d21cc0ddd0aa 100644
--- a/pkgs/development/libraries/gnu-efi/default.nix
+++ b/pkgs/development/libraries/gnu-efi/default.nix
@@ -25,7 +25,6 @@ stdenv.mkDerivation rec {
description = "GNU EFI development toolchain";
homepage = http://sourceforge.net/projects/gnu-efi/;
license = licenses.bsd3;
- maintainers = [ stdenv.lib.maintainers.shlevy ];
platforms = platforms.linux;
};
}
diff --git a/pkgs/development/libraries/http-parser/default.nix b/pkgs/development/libraries/http-parser/default.nix
index e7247332059f..e2f06cab5cf7 100644
--- a/pkgs/development/libraries/http-parser/default.nix
+++ b/pkgs/development/libraries/http-parser/default.nix
@@ -42,7 +42,5 @@ in stdenv.mkDerivation {
homepage = https://github.com/joyent/http-parser;
license = stdenv.lib.licenses.mit;
-
- maintainers = [ stdenv.lib.maintainers.shlevy ];
};
}
diff --git a/pkgs/development/libraries/isl/0.11.1.nix b/pkgs/development/libraries/isl/0.11.1.nix
index 931ee831b734..63140dba37f7 100644
--- a/pkgs/development/libraries/isl/0.11.1.nix
+++ b/pkgs/development/libraries/isl/0.11.1.nix
@@ -17,7 +17,6 @@ stdenv.mkDerivation rec {
homepage = http://www.kotnet.org/~skimo/isl/;
license = stdenv.lib.licenses.lgpl21;
description = "A library for manipulating sets and relations of integer points bounded by linear constraints";
- maintainers = [ stdenv.lib.maintainers.shlevy ];
platforms = stdenv.lib.platforms.all;
};
}
diff --git a/pkgs/development/libraries/isl/0.12.2.nix b/pkgs/development/libraries/isl/0.12.2.nix
index 67620881bca6..d7143b8747ee 100644
--- a/pkgs/development/libraries/isl/0.12.2.nix
+++ b/pkgs/development/libraries/isl/0.12.2.nix
@@ -16,7 +16,6 @@ stdenv.mkDerivation rec {
homepage = http://www.kotnet.org/~skimo/isl/;
license = stdenv.lib.licenses.lgpl21;
description = "A library for manipulating sets and relations of integer points bounded by linear constraints";
- maintainers = [ stdenv.lib.maintainers.shlevy ];
platforms = stdenv.lib.platforms.all;
};
}
diff --git a/pkgs/development/libraries/isl/0.14.1.nix b/pkgs/development/libraries/isl/0.14.1.nix
index dc13bbae9892..8196dec283ac 100644
--- a/pkgs/development/libraries/isl/0.14.1.nix
+++ b/pkgs/development/libraries/isl/0.14.1.nix
@@ -16,7 +16,6 @@ stdenv.mkDerivation rec {
homepage = http://www.kotnet.org/~skimo/isl/;
license = stdenv.lib.licenses.lgpl21;
description = "A library for manipulating sets and relations of integer points bounded by linear constraints";
- maintainers = [ stdenv.lib.maintainers.shlevy ];
platforms = stdenv.lib.platforms.all;
};
}
diff --git a/pkgs/development/libraries/isl/default.nix b/pkgs/development/libraries/isl/default.nix
new file mode 100644
index 000000000000..9518a0c0e657
--- /dev/null
+++ b/pkgs/development/libraries/isl/default.nix
@@ -0,0 +1,23 @@
+{ stdenv, fetchurl, gmp }:
+
+stdenv.mkDerivation rec {
+ name = "isl-0.14";
+
+ src = fetchurl {
+ url = "http://isl.gforge.inria.fr/${name}.tar.bz2";
+ sha256 = "0dlg4b85nw4w534525h0fvb7yhb8i4am8kskhmm0ym7qabzh4g3y";
+ };
+
+ buildInputs = [ gmp ];
+
+ enableParallelBuilding = true;
+
+ doCheck = true;
+
+ meta = {
+ homepage = http://www.kotnet.org/~skimo/isl/;
+ license = stdenv.lib.licenses.lgpl21;
+ description = "A library for manipulating sets and relations of integer points bounded by linear constraints";
+ platforms = stdenv.lib.platforms.all;
+ };
+}
diff --git a/pkgs/development/libraries/libtoxcore/new-api/default.nix b/pkgs/development/libraries/libtoxcore/new-api/default.nix
new file mode 100644
index 000000000000..42f81cf6a9d2
--- /dev/null
+++ b/pkgs/development/libraries/libtoxcore/new-api/default.nix
@@ -0,0 +1,60 @@
+{ stdenv, fetchFromGitHub, autoconf, libtool, automake, libsodium, ncurses, libopus
+, libvpx, check, libconfig, pkgconfig }:
+
+stdenv.mkDerivation rec {
+ name = "tox-core-dev-20150629";
+
+ src = fetchFromGitHub {
+ owner = "irungentoo";
+ repo = "toxcore";
+ rev = "219fabc0f5dbaac7968cb7728d25dface3ebb2ea";
+ sha256 = "1rsnxa5b7i2zclx0kzbf4a5mds0jfkvfjz1s4whzk7rf8w3vpqkh";
+ };
+
+ NIX_LDFLAGS = "-lgcc_s";
+
+ postPatch = ''
+ # within Nix chroot builds, localhost is unresolvable
+ sed -i -e '/DEFTESTCASE(addr_resolv_localhost)/d' \
+ auto_tests/network_test.c
+ # takes WAAAY too long (~10 minutes) and would timeout
+ sed -i -e '/DEFTESTCASE[^(]*(many_clients\>/d' \
+ auto_tests/tox_test.c
+ '';
+
+ preConfigure = ''
+ autoreconf -i
+ '';
+
+ configureFlags = [
+ "--with-libsodium-headers=${libsodium}/include"
+ "--with-libsodium-libs=${libsodium}/lib"
+ "--enable-ntox"
+ "--enable-daemon"
+ ];
+
+ buildInputs = [
+ autoconf libtool automake libsodium ncurses
+ check libconfig pkgconfig
+ ] ++ stdenv.lib.optionals (!stdenv.isArm) [
+ libopus
+ ];
+
+ propagatedBuildInputs = stdenv.lib.optionals (!stdenv.isArm) [ libvpx ];
+
+ # Some tests fail randomly due to timeout. This kind of problem is well known
+ # by upstream: https://github.com/irungentoo/toxcore/issues/{950,1054}
+ # They don't recommend running tests on 50core machines with other cpu-bound
+ # tests running in parallel.
+ #
+ # NOTE: run the tests locally on your machine before upgrading this package!
+ doCheck = false;
+
+ meta = with stdenv.lib; {
+ description = "P2P FOSS instant messaging application aimed to replace Skype with crypto";
+ license = licenses.gpl3Plus;
+ maintainers = with maintainers; [ viric jgeerds ];
+ platforms = platforms.all;
+ };
+}
+
diff --git a/pkgs/development/libraries/libtoxcore/default.nix b/pkgs/development/libraries/libtoxcore/old-api/default.nix
similarity index 100%
rename from pkgs/development/libraries/libtoxcore/default.nix
rename to pkgs/development/libraries/libtoxcore/old-api/default.nix
diff --git a/pkgs/development/libraries/libtsm/default.nix b/pkgs/development/libraries/libtsm/default.nix
index febdb0914d6c..b1d149a04454 100644
--- a/pkgs/development/libraries/libtsm/default.nix
+++ b/pkgs/development/libraries/libtsm/default.nix
@@ -24,6 +24,6 @@ stdenv.mkDerivation rec {
description = "Terminal-emulator State Machine";
homepage = "http://www.freedesktop.org/wiki/Software/kmscon/libtsm/";
license = licenses.mit;
- maintainers = with maintainers; [ shlevy cstrahan ];
+ maintainers = with maintainers; [ cstrahan ];
};
}
diff --git a/pkgs/development/libraries/nix-plugins/default.nix b/pkgs/development/libraries/nix-plugins/default.nix
index 2c208ce86bbc..2db193abe592 100644
--- a/pkgs/development/libraries/nix-plugins/default.nix
+++ b/pkgs/development/libraries/nix-plugins/default.nix
@@ -19,7 +19,6 @@ stdenv.mkDerivation {
description = "Collection of miscellaneous plugins for the nix expression language";
homepage = https://github.com/shlevy/nix-plugins;
license = stdenv.lib.licenses.mit;
- maintaners = [ stdenv.lib.maintainers.shlevy ];
platforms = stdenv.lib.platforms.all;
broken = true;
};
diff --git a/pkgs/development/libraries/openldap/default.nix b/pkgs/development/libraries/openldap/default.nix
index 97752a268f79..e5b7ce107197 100644
--- a/pkgs/development/libraries/openldap/default.nix
+++ b/pkgs/development/libraries/openldap/default.nix
@@ -1,16 +1,13 @@
{ stdenv, fetchurl, autoconf, openssl, cyrus_sasl, db, groff }:
stdenv.mkDerivation rec {
- name = "openldap-2.4.40";
+ name = "openldap-2.4.41";
src = fetchurl {
url = "http://www.openldap.org/software/download/OpenLDAP/openldap-release/${name}.tgz";
- sha256 = "1nyslrgwxwilgv5sixc37svls5rbvhsv9drb7hlrjr2vqaji29ni";
+ sha256 = "0vkzfd1pmin6xsv8lb1nabfxma8n1q00khr6nfifqkxlm2s6p197";
};
- # Last tested for openldap 2.4.40
- patches = [ ./fix-libdb-detection-gcc5.patch ];
-
nativeBuildInputs = [ autoconf ];
buildInputs = [ openssl cyrus_sasl db groff ];
diff --git a/pkgs/development/libraries/openldap/fix-libdb-detection-gcc5.patch b/pkgs/development/libraries/openldap/fix-libdb-detection-gcc5.patch
deleted file mode 100644
index 40ba9de73757..000000000000
--- a/pkgs/development/libraries/openldap/fix-libdb-detection-gcc5.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From f0409f40dab6013d1aec05f5c86ae31d2f49b485 Mon Sep 17 00:00:00 2001
-From: Jan Synacek <jsynacek@redhat.com>
-Date: Wed, 11 Feb 2015 10:32:28 +0100
-Subject: [PATCH] fix libdb detection with gcc 5
-
-The old cpp version generated:
-__db_version 5
-
-The new output:
-__db_version
- 5
-
-Running cpp with -P (inhibit linemarkers generation) fixes this when using gcc 5.
-Behavior with older versions of gcc is not changed.
----
- build/openldap.m4 | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/build/openldap.m4 b/build/openldap.m4
-index caf8fc2..bdcb4d6 100644
---- a/build/openldap.m4
-+++ b/build/openldap.m4
-@@ -328,7 +328,7 @@ AC_DEFUN([OL_BDB_HEADER_VERSION],
- #endif
- __db_version DB_VERSION_MAJOR
- ])
-- set X `eval "$ac_cpp conftest.$ac_ext" | $EGREP __db_version` none none
-+ set X `eval "$ac_cpp -P conftest.$ac_ext" | $EGREP __db_version` none none
- ol_cv_bdb_major=${3}
- ])
- case $ol_cv_bdb_major in [[1-9]]*) : ;; *)
-@@ -344,7 +344,7 @@ AC_CACHE_CHECK([for Berkeley DB minor version in db.h], [ol_cv_bdb_minor],[
- #endif
- __db_version DB_VERSION_MINOR
- ])
-- set X `eval "$ac_cpp conftest.$ac_ext" | $EGREP __db_version` none none
-+ set X `eval "$ac_cpp -P conftest.$ac_ext" | $EGREP __db_version` none none
- ol_cv_bdb_minor=${3}
- ])
- case $ol_cv_bdb_minor in [[0-9]]*) : ;; *)
---
-2.1.0
-
diff --git a/pkgs/development/libraries/xapian/default.nix b/pkgs/development/libraries/xapian/default.nix
index 575fb73084c5..a9334f31ecdc 100644
--- a/pkgs/development/libraries/xapian/default.nix
+++ b/pkgs/development/libraries/xapian/default.nix
@@ -1,18 +1,19 @@
{ stdenv, fetchurl, libuuid, zlib }:
-stdenv.mkDerivation {
- name = "xapian-1.2.19";
+stdenv.mkDerivation rec {
+ name = "xapian-${version}";
+ version = "1.2.21";
src = fetchurl {
- url = http://oligarchy.co.uk/xapian/1.2.19/xapian-core-1.2.19.tar.xz;
- sha256 = "11a7lm3w3pchk4rx144nc2p31994spyqmldm18ph86zzi01jcy2a";
+ url = "http://oligarchy.co.uk/xapian/${version}/xapian-core-${version}.tar.xz";
+ sha256 = "0grd2s6gf8yzqwdaa50g57j9d81mxkrrpkyldm2shgyizdc8gx33";
};
buildInputs = [ libuuid zlib ];
meta = {
description = "Search engine library";
- homepage = "http://xapian.org";
+ homepage = http://xapian.org/;
license = stdenv.lib.licenses.gpl2Plus;
maintainers = [ stdenv.lib.maintainers.chaoflow ];
};
diff --git a/pkgs/development/tools/analysis/checkstyle/default.nix b/pkgs/development/tools/analysis/checkstyle/default.nix
index 994f59c52285..f5c6a9bcd1a5 100644
--- a/pkgs/development/tools/analysis/checkstyle/default.nix
+++ b/pkgs/development/tools/analysis/checkstyle/default.nix
@@ -1,12 +1,12 @@
{ stdenv, fetchurl }:
stdenv.mkDerivation rec {
- version = "6.8";
+ version = "6.8.1";
name = "checkstyle-${version}";
src = fetchurl {
- url = "mirror://sourceforge/checkstyle/${version}/${name}-bin.tar.gz";
- sha256 = "1g1hlsyriciipllw4ki21sbdh5br225w0n86w9i3m2a9slac1rdq";
+ url = "mirror://sourceforge/checkstyle/${name}-bin.tar.gz";
+ sha256 = "12da8msz5459ra0g5smr8daqh88mfa653nn475acjp1ycsm395hv";
};
installPhase = ''
diff --git a/pkgs/development/web/nodejs/default.nix b/pkgs/development/web/nodejs/default.nix
index 8162dc4a8c51..2f5e4160923a 100644
--- a/pkgs/development/web/nodejs/default.nix
+++ b/pkgs/development/web/nodejs/default.nix
@@ -63,7 +63,7 @@ in stdenv.mkDerivation {
description = "Event-driven I/O framework for the V8 JavaScript engine";
homepage = http://nodejs.org;
license = licenses.mit;
- maintainers = [ maintainers.goibhniu maintainers.shlevy maintainers.havvy ];
+ maintainers = [ maintainers.goibhniu maintainers.havvy ];
platforms = platforms.linux ++ platforms.darwin;
};
}
diff --git a/pkgs/development/web/nodejs/v0_10.nix b/pkgs/development/web/nodejs/v0_10.nix
index 9d714be1cddb..739a0ff9389b 100644
--- a/pkgs/development/web/nodejs/v0_10.nix
+++ b/pkgs/development/web/nodejs/v0_10.nix
@@ -60,7 +60,7 @@ in stdenv.mkDerivation {
description = "Event-driven I/O framework for the V8 JavaScript engine";
homepage = http://nodejs.org;
license = licenses.mit;
- maintainers = [ maintainers.goibhniu maintainers.shlevy ];
+ maintainers = [ maintainers.goibhniu ];
platforms = platforms.linux ++ platforms.darwin;
};
}
diff --git a/pkgs/os-specific/linux/kernel/manual-config.nix b/pkgs/os-specific/linux/kernel/manual-config.nix
index 963e10a59645..a14088c81ef1 100644
--- a/pkgs/os-specific/linux/kernel/manual-config.nix
+++ b/pkgs/os-specific/linux/kernel/manual-config.nix
@@ -209,7 +209,6 @@ let
homepage = http://www.kernel.org/;
repositories.git = https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git;
maintainers = [
- maintainers.shlevy
maintainers.thoughtpolice
];
platforms = platforms.linux;
diff --git a/pkgs/os-specific/linux/kmod/default.nix b/pkgs/os-specific/linux/kmod/default.nix
index b5559e535ec5..45ca5d0d21d3 100644
--- a/pkgs/os-specific/linux/kmod/default.nix
+++ b/pkgs/os-specific/linux/kmod/default.nix
@@ -27,7 +27,6 @@ stdenv.mkDerivation rec {
meta = {
homepage = http://www.kernel.org/pub/linux/utils/kernel/kmod/;
description = "Tools for loading and managing Linux kernel modules";
- maintainers = [ stdenv.lib.maintainers.shlevy ];
platforms = stdenv.lib.platforms.linux;
};
}
diff --git a/pkgs/os-specific/linux/kmscon/default.nix b/pkgs/os-specific/linux/kmscon/default.nix
index 4f9b872ce1c5..ed2cb76e8203 100644
--- a/pkgs/os-specific/linux/kmscon/default.nix
+++ b/pkgs/os-specific/linux/kmscon/default.nix
@@ -44,7 +44,6 @@ stdenv.mkDerivation rec {
description = "KMS/DRM based System Console";
homepage = "http://www.freedesktop.org/wiki/Software/kmscon/";
license = stdenv.lib.licenses.mit;
- maintainers = [ stdenv.lib.maintainers.shlevy ];
platforms = stdenv.lib.platforms.linux;
};
}
diff --git a/pkgs/servers/http/jetty/9.2.nix b/pkgs/servers/http/jetty/9.2.nix
index 4ac38e8d3cb1..7bef32f3db2a 100644
--- a/pkgs/servers/http/jetty/9.2.nix
+++ b/pkgs/servers/http/jetty/9.2.nix
@@ -21,8 +21,6 @@ stdenv.mkDerivation rec {
homepage = http://www.eclipse.org/jetty/;
- maintainers = [ stdenv.lib.maintainers.shlevy ];
-
platforms = stdenv.lib.platforms.all;
license = [ stdenv.lib.licenses.asl20 stdenv.lib.licenses.epl10 ];
diff --git a/pkgs/servers/irc/ngircd/default.nix b/pkgs/servers/irc/ngircd/default.nix
index 50bc86e805e0..ebc7e7c3128e 100644
--- a/pkgs/servers/irc/ngircd/default.nix
+++ b/pkgs/servers/irc/ngircd/default.nix
@@ -23,7 +23,6 @@ stdenv.mkDerivation rec {
description = "Next Generation IRC Daemon";
homepage = http://ngircd.barton.de;
license = stdenv.lib.licenses.gpl2;
- maintainers = [ stdenv.lib.maintainers.shlevy ];
platforms = stdenv.lib.platforms.all;
};
}
diff --git a/pkgs/servers/monitoring/newrelic-sysmond/default.nix b/pkgs/servers/monitoring/newrelic-sysmond/default.nix
index 777cfe805bf6..a300d3514ee2 100644
--- a/pkgs/servers/monitoring/newrelic-sysmond/default.nix
+++ b/pkgs/servers/monitoring/newrelic-sysmond/default.nix
@@ -24,7 +24,5 @@ stdenv.mkDerivation rec {
description = "System-wide monitoring for newrelic";
license = stdenv.lib.licenses.unfree;
-
- maintainers = [ stdenv.lib.maintainers.shlevy ];
};
}
diff --git a/pkgs/servers/sql/mariadb/default.nix b/pkgs/servers/sql/mariadb/default.nix
index ab93c3499dc3..1e962f5df90d 100644
--- a/pkgs/servers/sql/mariadb/default.nix
+++ b/pkgs/servers/sql/mariadb/default.nix
@@ -112,7 +112,7 @@ stdenv.mkDerivation rec {
description = "An enhanced, drop-in replacement for MySQL";
homepage = https://mariadb.org/;
license = stdenv.lib.licenses.gpl2;
- maintainers = with stdenv.lib.maintainers; [ shlevy thoughtpolice wkennington ];
+ maintainers = with stdenv.lib.maintainers; [ thoughtpolice wkennington ];
platforms = stdenv.lib.platforms.all;
};
}
diff --git a/pkgs/tools/filesystems/unionfs-fuse/default.nix b/pkgs/tools/filesystems/unionfs-fuse/default.nix
index 1d39108afb13..73db9e2ca203 100644
--- a/pkgs/tools/filesystems/unionfs-fuse/default.nix
+++ b/pkgs/tools/filesystems/unionfs-fuse/default.nix
@@ -36,7 +36,6 @@ stdenv.mkDerivation rec {
description = "FUSE UnionFS implementation";
homepage = http://podgorny.cz/moin/UnionFsFuse;
license = stdenv.lib.licenses.bsd3;
- maintainers = [ stdenv.lib.maintainers.shlevy ];
platforms = stdenv.lib.platforms.linux;
};
}
diff --git a/pkgs/tools/misc/gummiboot/default.nix b/pkgs/tools/misc/gummiboot/default.nix
index 8adea97ff14a..9d9b7700c90b 100644
--- a/pkgs/tools/misc/gummiboot/default.nix
+++ b/pkgs/tools/misc/gummiboot/default.nix
@@ -25,7 +25,5 @@ stdenv.mkDerivation rec {
license = stdenv.lib.licenses.lgpl21Plus;
platforms = [ "x86_64-linux" "i686-linux" ];
-
- maintainers = [ stdenv.lib.maintainers.shlevy ];
};
}
diff --git a/pkgs/tools/misc/riemann-tools/Gemfile b/pkgs/tools/misc/riemann-tools/Gemfile
new file mode 100644
index 000000000000..3d56cd85c617
--- /dev/null
+++ b/pkgs/tools/misc/riemann-tools/Gemfile
@@ -0,0 +1,3 @@
+source 'https://rubygems.org'
+
+gem "riemann-tools", "0.2.6"
diff --git a/pkgs/tools/misc/riemann-tools/Gemfile.lock b/pkgs/tools/misc/riemann-tools/Gemfile.lock
new file mode 100644
index 000000000000..58c12fd51516
--- /dev/null
+++ b/pkgs/tools/misc/riemann-tools/Gemfile.lock
@@ -0,0 +1,142 @@
+GEM
+ remote: https://rubygems.org/
+ specs:
+ CFPropertyList (2.3.1)
+ beefcake (1.1.0)
+ builder (3.2.2)
+ excon (0.45.3)
+ faraday (0.9.1)
+ multipart-post (>= 1.2, < 3)
+ fission (0.5.0)
+ CFPropertyList (~> 2.2)
+ fog (1.31.0)
+ fog-atmos
+ fog-aws (~> 0.0)
+ fog-brightbox (~> 0.4)
+ fog-core (~> 1.30)
+ fog-ecloud
+ fog-google (>= 0.0.2)
+ fog-json
+ fog-local
+ fog-powerdns (>= 0.1.1)
+ fog-profitbricks
+ fog-radosgw (>= 0.0.2)
+ fog-riakcs
+ fog-sakuracloud (>= 0.0.4)
+ fog-serverlove
+ fog-softlayer
+ fog-storm_on_demand
+ fog-terremark
+ fog-vmfusion
+ fog-voxel
+ fog-xml (~> 0.1.1)
+ ipaddress (~> 0.5)
+ nokogiri (~> 1.5, >= 1.5.11)
+ fog-atmos (0.1.0)
+ fog-core
+ fog-xml
+ fog-aws (0.6.0)
+ fog-core (~> 1.27)
+ fog-json (~> 1.0)
+ fog-xml (~> 0.1)
+ ipaddress (~> 0.8)
+ fog-brightbox (0.7.2)
+ fog-core (~> 1.22)
+ fog-json
+ inflecto (~> 0.0.2)
+ fog-core (1.31.1)
+ builder
+ excon (~> 0.45)
+ formatador (~> 0.2)
+ mime-types
+ net-scp (~> 1.1)
+ net-ssh (>= 2.1.3)
+ fog-ecloud (0.3.0)
+ fog-core
+ fog-xml
+ fog-google (0.0.6)
+ fog-core
+ fog-json
+ fog-xml
+ fog-json (1.0.2)
+ fog-core (~> 1.0)
+ multi_json (~> 1.10)
+ fog-local (0.2.1)
+ fog-core (~> 1.27)
+ fog-powerdns (0.1.1)
+ fog-core (~> 1.27)
+ fog-json (~> 1.0)
+ fog-xml (~> 0.1)
+ fog-profitbricks (0.0.3)
+ fog-core
+ fog-xml
+ nokogiri
+ fog-radosgw (0.0.4)
+ fog-core (>= 1.21.0)
+ fog-json
+ fog-xml (>= 0.0.1)
+ fog-riakcs (0.1.0)
+ fog-core
+ fog-json
+ fog-xml
+ fog-sakuracloud (1.0.1)
+ fog-core
+ fog-json
+ fog-serverlove (0.1.2)
+ fog-core
+ fog-json
+ fog-softlayer (0.4.7)
+ fog-core
+ fog-json
+ fog-storm_on_demand (0.1.1)
+ fog-core
+ fog-json
+ fog-terremark (0.1.0)
+ fog-core
+ fog-xml
+ fog-vmfusion (0.1.0)
+ fission
+ fog-core
+ fog-voxel (0.1.0)
+ fog-core
+ fog-xml
+ fog-xml (0.1.2)
+ fog-core
+ nokogiri (~> 1.5, >= 1.5.11)
+ formatador (0.2.5)
+ inflecto (0.0.2)
+ ipaddress (0.8.0)
+ mime-types (2.6.1)
+ mini_portile (0.6.2)
+ mtrc (0.0.4)
+ multi_json (1.11.1)
+ multipart-post (2.0.0)
+ munin-ruby (0.2.5)
+ net-scp (1.2.1)
+ net-ssh (>= 2.6.5)
+ net-ssh (2.9.2)
+ nokogiri (1.6.6.2)
+ mini_portile (~> 0.6.0)
+ riemann-client (0.2.5)
+ beefcake (>= 0.3.5)
+ mtrc (>= 0.0.4)
+ trollop (>= 1.16.2)
+ riemann-tools (0.2.6)
+ faraday (>= 0.8.5)
+ fog (>= 1.4.0)
+ munin-ruby (>= 0.2.1)
+ nokogiri (>= 1.5.6)
+ riemann-client (>= 0.2.2)
+ trollop (>= 1.16.2)
+ yajl-ruby (>= 1.1.0)
+ trollop (2.1.2)
+ yajl-ruby (1.2.1)
+
+PLATFORMS
+ ruby
+
+DEPENDENCIES
+ riemann-tools (= 0.2.6)
+
+BUNDLED WITH
+ 1.10.2
diff --git a/pkgs/tools/misc/riemann-tools/default.nix b/pkgs/tools/misc/riemann-tools/default.nix
new file mode 100644
index 000000000000..c518bc66984d
--- /dev/null
+++ b/pkgs/tools/misc/riemann-tools/default.nix
@@ -0,0 +1,8 @@
+{ bundlerEnv }:
+
+bundlerEnv {
+ name = "riemann-tools-0.2.6";
+ gemfile = ./Gemfile;
+ lockfile = ./Gemfile.lock;
+ gemset = ./gemset.nix;
+}
diff --git a/pkgs/tools/misc/riemann-tools/gemset.nix b/pkgs/tools/misc/riemann-tools/gemset.nix
new file mode 100644
index 000000000000..07818fc76bcd
--- /dev/null
+++ b/pkgs/tools/misc/riemann-tools/gemset.nix
@@ -0,0 +1,444 @@
+{
+ "CFPropertyList" = {
+ version = "2.3.1";
+ source = {
+ type = "gem";
+ sha256 = "1wnk3gxnhfafbhgp0ic7qhzlx3lhv04v8nws2s31ii5s8135hs6k";
+ };
+ };
+ "beefcake" = {
+ version = "1.1.0";
+ source = {
+ type = "gem";
+ sha256 = "009gzy9jp81lsnxnwisinhc58cd0qljdiipj2701lzzrha5d826z";
+ };
+ };
+ "builder" = {
+ version = "3.2.2";
+ source = {
+ type = "gem";
+ sha256 = "14fii7ab8qszrvsvhz6z2z3i4dw0h41a62fjr2h1j8m41vbrmyv2";
+ };
+ };
+ "excon" = {
+ version = "0.45.3";
+ source = {
+ type = "gem";
+ sha256 = "183kfxfjjlc97w4rxkrxjw3kis4lxm65vppmvl4bkblvlw4nq94j";
+ };
+ };
+ "faraday" = {
+ version = "0.9.1";
+ source = {
+ type = "gem";
+ sha256 = "1h33znnfzxpscgpq28i9fcqijd61h61zgs3gabpdgqfa1043axsn";
+ };
+ dependencies = [
+ "multipart-post"
+ ];
+ };
+ "fission" = {
+ version = "0.5.0";
+ source = {
+ type = "gem";
+ sha256 = "09pmp1j1rr8r3pcmbn2na2ls7s1j9ijbxj99xi3a8r6v5xhjdjzh";
+ };
+ dependencies = [
+ "CFPropertyList"
+ ];
+ };
+ "fog" = {
+ version = "1.31.0";
+ source = {
+ type = "gem";
+ sha256 = "0xr8xyrrkljm2hxi420x4qr5v6wqcj8d63v0qy1g6rkb3b1yhl9i";
+ };
+ dependencies = [
+ "fog-atmos"
+ "fog-aws"
+ "fog-brightbox"
+ "fog-core"
+ "fog-ecloud"
+ "fog-google"
+ "fog-json"
+ "fog-local"
+ "fog-powerdns"
+ "fog-profitbricks"
+ "fog-radosgw"
+ "fog-riakcs"
+ "fog-sakuracloud"
+ "fog-serverlove"
+ "fog-softlayer"
+ "fog-storm_on_demand"
+ "fog-terremark"
+ "fog-vmfusion"
+ "fog-voxel"
+ "fog-xml"
+ "ipaddress"
+ "nokogiri"
+ ];
+ };
+ "fog-atmos" = {
+ version = "0.1.0";
+ source = {
+ type = "gem";
+ sha256 = "1aaxgnw9zy96gsh4h73kszypc32sx497s6bslvhfqh32q9d1y8c9";
+ };
+ dependencies = [
+ "fog-core"
+ "fog-xml"
+ ];
+ };
+ "fog-aws" = {
+ version = "0.6.0";
+ source = {
+ type = "gem";
+ sha256 = "1m79s5ha6qq60pxqqxr9qs9fg8fwaz79sfxckidyhxdydcsjwx6z";
+ };
+ dependencies = [
+ "fog-core"
+ "fog-json"
+ "fog-xml"
+ "ipaddress"
+ ];
+ };
+ "fog-brightbox" = {
+ version = "0.7.2";
+ source = {
+ type = "gem";
+ sha256 = "0636sqaf2w1rh4i2hxfgs24374l4ai8dgch8a7nycqhvjk2dm0aq";
+ };
+ dependencies = [
+ "fog-core"
+ "fog-json"
+ "inflecto"
+ ];
+ };
+ "fog-core" = {
+ version = "1.31.1";
+ source = {
+ type = "gem";
+ sha256 = "1bcsy4cq7vyjmdf3h2v7q6hfj64v6phn0rfvwgj5wfza7yaxnhk7";
+ };
+ dependencies = [
+ "builder"
+ "excon"
+ "formatador"
+ "mime-types"
+ "net-scp"
+ "net-ssh"
+ ];
+ };
+ "fog-ecloud" = {
+ version = "0.3.0";
+ source = {
+ type = "gem";
+ sha256 = "18rb4qjad9xwwqvvpj8r2h0hi9svy71pm4d3fc28cdcnfarmdi06";
+ };
+ dependencies = [
+ "fog-core"
+ "fog-xml"
+ ];
+ };
+ "fog-google" = {
+ version = "0.0.6";
+ source = {
+ type = "gem";
+ sha256 = "1g3ykk239nxpdsr5anhprkp8vzk106gi4q6aqjh4z8q4bii0dflm";
+ };
+ dependencies = [
+ "fog-core"
+ "fog-json"
+ "fog-xml"
+ ];
+ };
+ "fog-json" = {
+ version = "1.0.2";
+ source = {
+ type = "gem";
+ sha256 = "0advkkdjajkym77r3c0bg2rlahl2akj0vl4p5r273k2qmi16n00r";
+ };
+ dependencies = [
+ "fog-core"
+ "multi_json"
+ ];
+ };
+ "fog-local" = {
+ version = "0.2.1";
+ source = {
+ type = "gem";
+ sha256 = "0i5hxwzmc2ag3z9nlligsaf679kp2pz39cd8n2s9cmxaamnlh2s3";
+ };
+ dependencies = [
+ "fog-core"
+ ];
+ };
+ "fog-powerdns" = {
+ version = "0.1.1";
+ source = {
+ type = "gem";
+ sha256 = "08zavzwfkk344gz83phz4sy9nsjznsdjsmn1ifp6ja17bvydlhh7";
+ };
+ dependencies = [
+ "fog-core"
+ "fog-json"
+ "fog-xml"
+ ];
+ };
+ "fog-profitbricks" = {
+ version = "0.0.3";
+ source = {
+ type = "gem";
+ sha256 = "01a3ylfkjkyagf4b4xg9x2v20pzapr3ivn9ydd92v402bjsm1nmr";
+ };
+ dependencies = [
+ "fog-core"
+ "fog-xml"
+ "nokogiri"
+ ];
+ };
+ "fog-radosgw" = {
+ version = "0.0.4";
+ source = {
+ type = "gem";
+ sha256 = "1pxbvmr4dsqx4x2klwnciyhki4r5ryr9y0hi6xmm3n6fdv4ii7k3";
+ };
+ dependencies = [
+ "fog-core"
+ "fog-json"
+ "fog-xml"
+ ];
+ };
+ "fog-riakcs" = {
+ version = "0.1.0";
+ source = {
+ type = "gem";
+ sha256 = "1nbxc4dky3agfwrmgm1aqmi59p6vnvfnfbhhg7xpg4c2cf41whxm";
+ };
+ dependencies = [
+ "fog-core"
+ "fog-json"
+ "fog-xml"
+ ];
+ };
+ "fog-sakuracloud" = {
+ version = "1.0.1";
+ source = {
+ type = "gem";
+ sha256 = "1s16b48kh7y03hjv74ccmlfwhqqq7j7m4k6cywrgbyip8n3258n8";
+ };
+ dependencies = [
+ "fog-core"
+ "fog-json"
+ ];
+ };
+ "fog-serverlove" = {
+ version = "0.1.2";
+ source = {
+ type = "gem";
+ sha256 = "0hxgmwzygrw25rbsy05i6nzsyr0xl7xj5j2sjpkb9n9wli5sagci";
+ };
+ dependencies = [
+ "fog-core"
+ "fog-json"
+ ];
+ };
+ "fog-softlayer" = {
+ version = "0.4.7";
+ source = {
+ type = "gem";
+ sha256 = "0fgfbhqnyp8ywymvflflhvbns54d1432x57pgpnfy8k1cxvhv9b8";
+ };
+ dependencies = [
+ "fog-core"
+ "fog-json"
+ ];
+ };
+ "fog-storm_on_demand" = {
+ version = "0.1.1";
+ source = {
+ type = "gem";
+ sha256 = "0fif1x8ci095b2yyilf65n7x6iyvn448azrsnmwsdkriy8vxxv3y";
+ };
+ dependencies = [
+ "fog-core"
+ "fog-json"
+ ];
+ };
+ "fog-terremark" = {
+ version = "0.1.0";
+ source = {
+ type = "gem";
+ sha256 = "01lfkh9jppj0iknlklmwyb7ym3bfhkq58m3absb6rf5a5mcwi3lf";
+ };
+ dependencies = [
+ "fog-core"
+ "fog-xml"
+ ];
+ };
+ "fog-vmfusion" = {
+ version = "0.1.0";
+ source = {
+ type = "gem";
+ sha256 = "0g0l0k9ylxk1h9pzqr6h2ba98fl47lpp3j19lqv4jxw0iw1rqxn4";
+ };
+ dependencies = [
+ "fission"
+ "fog-core"
+ ];
+ };
+ "fog-voxel" = {
+ version = "0.1.0";
+ source = {
+ type = "gem";
+ sha256 = "10skdnj59yf4jpvq769njjrvh2l0wzaa7liva8n78qq003mvmfgx";
+ };
+ dependencies = [
+ "fog-core"
+ "fog-xml"
+ ];
+ };
+ "fog-xml" = {
+ version = "0.1.2";
+ source = {
+ type = "gem";
+ sha256 = "1576sbzza47z48p0k9h1wg3rhgcvcvdd1dfz3xx1cgahwr564fqa";
+ };
+ dependencies = [
+ "fog-core"
+ "nokogiri"
+ ];
+ };
+ "formatador" = {
+ version = "0.2.5";
+ source = {
+ type = "gem";
+ sha256 = "1gc26phrwlmlqrmz4bagq1wd5b7g64avpx0ghxr9xdxcvmlii0l0";
+ };
+ };
+ "inflecto" = {
+ version = "0.0.2";
+ source = {
+ type = "gem";
+ sha256 = "085l5axmvqw59mw5jg454a3m3gr67ckq9405a075isdsn7bm3sp4";
+ };
+ };
+ "ipaddress" = {
+ version = "0.8.0";
+ source = {
+ type = "gem";
+ sha256 = "0cwy4pyd9nl2y2apazp3hvi12gccj5a3ify8mi8k3knvxi5wk2ir";
+ };
+ };
+ "mime-types" = {
+ version = "2.6.1";
+ source = {
+ type = "gem";
+ sha256 = "1vnrvf245ijfyxzjbj9dr6i1hkjbyrh4yj88865wv9bs75axc5jv";
+ };
+ };
+ "mini_portile" = {
+ version = "0.6.2";
+ source = {
+ type = "gem";
+ sha256 = "0h3xinmacscrnkczq44s6pnhrp4nqma7k056x5wv5xixvf2wsq2w";
+ };
+ };
+ "mtrc" = {
+ version = "0.0.4";
+ source = {
+ type = "gem";
+ sha256 = "0xj2pv4cpn0ad1xw38sinsxfzwhgqs6ff18hw0cwz5xmsf3zqmiz";
+ };
+ };
+ "multi_json" = {
+ version = "1.11.1";
+ source = {
+ type = "gem";
+ sha256 = "0lrmadw2scqwz7nw3j5pfdnmzqimlbaxlxi37xsydrpbbr78qf6g";
+ };
+ };
+ "multipart-post" = {
+ version = "2.0.0";
+ source = {
+ type = "gem";
+ sha256 = "09k0b3cybqilk1gwrwwain95rdypixb2q9w65gd44gfzsd84xi1x";
+ };
+ };
+ "munin-ruby" = {
+ version = "0.2.5";
+ source = {
+ type = "gem";
+ sha256 = "0378jyf0hdbfs2vvk7v8k7hqilzi1rfkpn271dyrqqal7g2lnjl2";
+ };
+ };
+ "net-scp" = {
+ version = "1.2.1";
+ source = {
+ type = "gem";
+ sha256 = "0b0jqrcsp4bbi4n4mzyf70cp2ysyp6x07j8k8cqgxnvb4i3a134j";
+ };
+ dependencies = [
+ "net-ssh"
+ ];
+ };
+ "net-ssh" = {
+ version = "2.9.2";
+ source = {
+ type = "gem";
+ sha256 = "1p0bj41zrmw5lhnxlm1pqb55zfz9y4p9fkrr9a79nrdmzrk1ph8r";
+ };
+ };
+ "nokogiri" = {
+ version = "1.6.6.2";
+ source = {
+ type = "gem";
+ sha256 = "1j4qv32qjh67dcrc1yy1h8sqjnny8siyy4s44awla8d6jk361h30";
+ };
+ dependencies = [
+ "mini_portile"
+ ];
+ };
+ "riemann-client" = {
+ version = "0.2.5";
+ source = {
+ type = "gem";
+ sha256 = "1myhyh31f290jm1wlhhjvf331n5l8qdm7axkxyacdgjsfg4szsjc";
+ };
+ dependencies = [
+ "beefcake"
+ "mtrc"
+ "trollop"
+ ];
+ };
+ "riemann-tools" = {
+ version = "0.2.6";
+ source = {
+ type = "gem";
+ sha256 = "0qjm7p55h70l5bs876hhvz3isr204663f97py9g0ajxz2z8jkzpi";
+ };
+ dependencies = [
+ "faraday"
+ "fog"
+ "munin-ruby"
+ "nokogiri"
+ "riemann-client"
+ "trollop"
+ "yajl-ruby"
+ ];
+ };
+ "trollop" = {
+ version = "2.1.2";
+ source = {
+ type = "gem";
+ sha256 = "0415y63df86sqj43c0l82and65ia5h64if7n0znkbrmi6y0jwhl8";
+ };
+ };
+ "yajl-ruby" = {
+ version = "1.2.1";
+ source = {
+ type = "gem";
+ sha256 = "0zvvb7i1bl98k3zkdrnx9vasq0rp2cyy5n7p9804dqs4fz9xh9vf";
+ };
+ };
+}
\ No newline at end of file
diff --git a/pkgs/tools/misc/tmux/default.nix b/pkgs/tools/misc/tmux/default.nix
index c906f0a29101..6cc54536eb19 100644
--- a/pkgs/tools/misc/tmux/default.nix
+++ b/pkgs/tools/misc/tmux/default.nix
@@ -44,6 +44,6 @@ stdenv.mkDerivation rec {
license = stdenv.lib.licenses.bsd3;
platforms = stdenv.lib.platforms.unix;
- maintainers = with stdenv.lib.maintainers; [ shlevy thammers ];
+ maintainers = with stdenv.lib.maintainers; [ thammers ];
};
}
diff --git a/pkgs/tools/networking/strongswan/default.nix b/pkgs/tools/networking/strongswan/default.nix
index d65f1ac43351..7d427ac9622d 100644
--- a/pkgs/tools/networking/strongswan/default.nix
+++ b/pkgs/tools/networking/strongswan/default.nix
@@ -23,7 +23,6 @@ stdenv.mkDerivation rec {
NIX_LDFLAGS = "-lgcc_s" ;
meta = {
- maintainers = [ stdenv.lib.maintainers.shlevy ];
description = "OpenSource IPsec-based VPN Solution";
homepage = https://www.strongswan.org;
license = stdenv.lib.licenses.gpl2Plus;
diff --git a/pkgs/tools/security/rng-tools/default.nix b/pkgs/tools/security/rng-tools/default.nix
index 989b84ef957f..75a865917ec1 100644
--- a/pkgs/tools/security/rng-tools/default.nix
+++ b/pkgs/tools/security/rng-tools/default.nix
@@ -17,7 +17,5 @@ stdenv.mkDerivation rec {
license = stdenv.lib.licenses.gpl2;
platforms = stdenv.lib.platforms.linux;
-
- maintainers = [ stdenv.lib.maintainers.shlevy ];
};
}
diff --git a/pkgs/tools/system/efibootmgr/default.nix b/pkgs/tools/system/efibootmgr/default.nix
index 6364267fc479..39fe1bdf09a3 100644
--- a/pkgs/tools/system/efibootmgr/default.nix
+++ b/pkgs/tools/system/efibootmgr/default.nix
@@ -27,7 +27,6 @@ stdenv.mkDerivation rec {
description = "A Linux user-space application to modify the Intel Extensible Firmware Interface (EFI) Boot Manager";
homepage = http://linux.dell.com/efibootmgr/;
license = licenses.gpl2;
- maintainers = with maintainers; [ shlevy ];
platforms = platforms.linux;
};
}
diff --git a/pkgs/tools/system/gptfdisk/default.nix b/pkgs/tools/system/gptfdisk/default.nix
index b8c92eeab567..6551f27e7721 100644
--- a/pkgs/tools/system/gptfdisk/default.nix
+++ b/pkgs/tools/system/gptfdisk/default.nix
@@ -27,8 +27,6 @@ stdenv.mkDerivation rec {
homepage = http://www.rodsbooks.com/gdisk/;
- maintainers = [ stdenv.lib.maintainers.shlevy ];
-
platforms = stdenv.lib.platforms.linux;
};
}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b213d567aa5c..1a3d47d4595a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2777,6 +2777,7 @@ let
rhash = callPackage ../tools/security/rhash { };
riemann_c_client = callPackage ../tools/misc/riemann-c-client { };
+ riemann-tools = callPackage ../tools/misc/riemann-tools { };
ripmime = callPackage ../tools/networking/ripmime {};
@@ -3556,7 +3557,6 @@ let
ats = callPackage ../development/compilers/ats { };
ats2 = callPackage ../development/compilers/ats2 { };
- ats-extsolve = callPackage ../development/compilers/ats-extsolve { };
avra = callPackage ../development/compilers/avra { };
@@ -6059,6 +6059,8 @@ let
fftwSinglePrec = fftw.override { precision = "single"; };
fftwFloat = fftwSinglePrec; # the configure option is just an alias
+ filter-audio = callPackage ../development/libraries/filter-audio {};
+
fish-fillets-ng = callPackage ../games/fish-fillets-ng {};
flann = callPackage ../development/libraries/flann { };
@@ -7198,7 +7200,9 @@ let
else stdenv;
};
- libtoxcore = callPackage ../development/libraries/libtoxcore { };
+ libtoxcore = callPackage ../development/libraries/libtoxcore/old-api { };
+
+ libtoxcore-dev = callPackage ../development/libraries/libtoxcore/new-api { };
libtsm = callPackage ../development/libraries/libtsm {
automake = automake114x;
@@ -11680,6 +11684,8 @@ let
khal = callPackage ../applications/misc/khal { };
+ khard = callPackage ../applications/misc/khard { };
+
kid3 = callPackage ../applications/audio/kid3 {
qt = qt4;
};