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

Merge branch 'master' into staging

Browse Source
This commit is contained in:
William A. Kennington III 2015-05-29 14:52:51 -07:00
commit e5bf20a6c6
443 changed files with 8079 additions and 1223 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lib/licenses.nix
View File

@ -85,6 +85,11 @@ lib.mapAttrs (n: v: v // { shortName = n; }) rec {
fullName = "Creative Commons Zero v1.0 Universal";
};
cc-by-sa-25 = spdx {
spdxId = "CC-BY-SA-2.5";
fullName = "Creative Commons Attribution Share Alike 2.5";
};
cc-by-30 = spdx {
spdxId = "CC-BY-3.0";
fullName = "Creative Commons Attribution 3.0";

1
maintainers/scripts/hydra_eval_check
View File

@ -6,6 +6,7 @@ hydra_eval_jobs \
--argstr system i686-linux \
--argstr system x86_64-darwin \
--argstr system i686-cygwin \
--argstr system x86_64-cygwin \
--argstr system i686-freebsd \
--arg officialRelease false \
--arg nixpkgs "{ outPath = builtins.storePath ./. ; rev = 1234; }" \

4
nixos/modules/security/ca.nix
View File

@ -22,7 +22,7 @@ in
security.pki.certificateFiles = mkOption {
type = types.listOf types.path;
default = [];
example = literalExample "[ \"\${pkgs.cacert}/etc/ca-bundle.crt\" ]";
example = literalExample "[ \"\${pkgs.cacert}/ca-bundle.crt\" ]";
description = ''
A list of files containing trusted root certificates in PEM
format. These are concatenated to form
@ -53,7 +53,7 @@ in
config = {
security.pki.certificateFiles = [ "${pkgs.cacert}/etc/ca-bundle.crt" ];
security.pki.certificateFiles = [ "${pkgs.cacert}/ca-bundle.crt" ];
# NixOS canonical location + Debian/Ubuntu/Arch/Gentoo compatibility.
environment.etc."ssl/certs/ca-certificates.crt".source = caBundle;

1
nixos/modules/services/misc/apache-kafka.nix
View File

@ -143,6 +143,7 @@ in {
'';
User = "apache-kafka";
PermissionsStartOnly = true;
SuccessExitStatus = "0 143";
};
preStart = ''
mkdir -m 0700 -p ${concatStringsSep " " cfg.logDirs}

25
nixos/modules/services/misc/mesos-slave.nix
View File

@ -12,6 +12,8 @@ let
attribsArg = optionalString (cfg.attributes != {})
"--attributes=${mkAttributes cfg.attributes}";
containerizers = [ "mesos" ] ++ (optional cfg.withDocker "docker");
in {
options.services.mesos = {
@ -22,8 +24,14 @@ in {
type = types.uniq types.bool;
};
ip = mkOption {
description = "IP address to listen on.";
default = "0.0.0.0";
type = types.string;
};
port = mkOption {
description = "Mesos Slave port";
description = "Port to listen on.";
default = 5051;
type = types.int;
};
@ -43,6 +51,12 @@ in {
type = types.bool;
};
withDocker = mkOption {
description = "Enable the docker containerizer.";
default = config.virtualisation.docker.enable;
type = types.bool;
};
workDir = mkOption {
description = "The Mesos work directory.";
default = "/var/lib/mesos/slave";
@ -92,17 +106,18 @@ in {
description = "Mesos Slave";
wantedBy = [ "multi-user.target" ];
after = [ "network-interfaces.target" ];
environment.MESOS_CONTAINERIZERS = "docker,mesos";
environment.MESOS_CONTAINERIZERS = concatStringsSep "," containerizers;
serviceConfig = {
ExecStart = ''
${pkgs.mesos}/bin/mesos-slave \
--ip=${cfg.ip} \
--port=${toString cfg.port} \
--master=${cfg.master} \
${optionalString cfg.withHadoop "--hadoop-home=${pkgs.hadoop}"} \
${attribsArg} \
--work_dir=${cfg.workDir} \
--logging_level=${cfg.logLevel} \
--docker=${pkgs.docker}/libexec/docker/docker \
${attribsArg} \
${optionalString cfg.withHadoop "--hadoop-home=${pkgs.hadoop}"} \
${optionalString cfg.withDocker "--docker=${pkgs.docker}/libexec/docker/docker"} \
${toString cfg.extraCmdLineOptions}
'';
PermissionsStartOnly = true;

4
nixos/modules/system/boot/loader/grub/grub.nix
View File

@ -337,7 +337,7 @@ in
sha256 = "14kqdx2lfqvh40h6fjjzqgff1mwk74dmbjvmqphi6azzra7z8d59";
}
# GRUB 1.97 doesn't support gzipped XPMs.
else ./winkler-gnu-blue-640x480.png);
else "${pkgs.nixos-artwork}/gnome/Gnome_Dark.png");
}
(mkIf cfg.enable {
@ -354,7 +354,7 @@ in
export PERL5LIB=${makePerlPath (with pkgs.perlPackages; [ FileSlurp XMLLibXML XMLSAX ListCompare ])}
${optionalString cfg.enableCryptodisk "export GRUB_ENABLE_CRYPTODISK=y"}
'' + flip concatMapStrings cfg.mirroredBoots (args: ''
${pkgs.perl}/bin/perl ${./install-grub.pl} ${grubConfig args}
${pkgs.perl}/bin/perl ${./install-grub.pl} ${grubConfig args} $@
''));
system.build.grub = grub;

11
nixos/modules/system/boot/loader/grub/install-grub.pl
View File

@ -11,7 +11,7 @@ require List::Compare;
use POSIX;
use Cwd;
my $defaultConfig = $ARGV[0] or die;
my $defaultConfig = $ARGV[1] or die;
my $dom = XML::LibXML->load_xml(location => $ARGV[0]);
@ -254,10 +254,15 @@ else {
set timeout=$timeout
fi
# Setup the graphics stack for bios and efi systems
insmod vbe
insmod efi_gop
insmod efi_uga
insmod font
if loadfont " . $grubBoot->path . "/grub/fonts/unicode.pf2; then
set gfxmode=640x480
insmod gfxterm
insmod vbe
set gfxmode=auto
set gfxpayload=keep
terminal_output gfxterm
fi
";

BIN
nixos/modules/system/boot/loader/grub/winkler-gnu-blue-640x480.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 73 KiB

6
nixos/modules/system/boot/loader/grub/winkler-gnu-blue.README
View File

@ -1,6 +0,0 @@
This is a resized version of
http://www.gnu.org/graphics/winkler-gnu-blue.png
by Kyle Winkler and released under the Free Art License
(http://artlibre.org/licence.php/lalgb.html).

1
nixos/release-combined.nix
View File

@ -64,6 +64,7 @@ in rec {
(all nixos.tests.installer.btrfsSubvolDefault)
(all nixos.tests.ipv6)
(all nixos.tests.kde4)
(all nixos.tests.lightdm)
(all nixos.tests.login)
(all nixos.tests.misc)
(all nixos.tests.nat.firewall)

1
nixos/release.nix
View File

@ -271,6 +271,7 @@ in rec {
tests.kde4 = callTest tests/kde4.nix {};
tests.kubernetes = hydraJob (import tests/kubernetes.nix { system = "x86_64-linux"; });
tests.latestKernel.login = callTest tests/login.nix { latestKernel = true; };
tests.lightdm = callTest tests/lightdm.nix {};
tests.login = callTest tests/login.nix {};
#tests.logstash = callTest tests/logstash.nix {};
tests.misc = callTest tests/misc.nix {};

6
pkgs/applications/altcoins/bitcoin.nix
View File

@ -10,9 +10,9 @@ stdenv.mkDerivation rec{
version = core_version;
src = fetchurl {
url = [ "https://bitcoin.org/bin/bitcoin-core-${core_version}/bitcoin-${version}.tar.gz"
"mirror://sourceforge/bitcoin/Bitcoin/bitcoin-${core_version}/bitcoin-${version}.tar.gz"
];
urls = [ "https://bitcoin.org/bin/bitcoin-core-${core_version}/bitcoin-${version}.tar.gz"
"mirror://sourceforge/bitcoin/Bitcoin/bitcoin-${core_version}/bitcoin-${version}.tar.gz"
];
sha256 = "cddf96c71d0a35524fde93380981cf0cf0b51441454a3a68b9be491b9239bfec";
};

4
pkgs/applications/audio/beast/default.nix
View File

@ -29,9 +29,9 @@ stdenv.mkDerivation {
./patch.patch # patches taken from gentoo
];
meta = {
meta = with stdenv.lib; {
description = "A music composition and modular synthesis application";
homepage = http://beast.gtk.org;
license = ["GPL-2" "LGPL-2.1"];
license = with licenses; [ gpl2 lgpl21 ];
};
}

6
pkgs/applications/audio/bristol/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, alsaLib, jack2, pkgconfig, pulseaudio, xlibs }:
{ stdenv, fetchurl, alsaLib, jack2, pkgconfig, libpulseaudio, xlibs }:
stdenv.mkDerivation rec {
name = "bristol-${version}";
@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
};
buildInputs = [
alsaLib jack2 pkgconfig pulseaudio xlibs.libX11 xlibs.libXext
alsaLib jack2 pkgconfig libpulseaudio xlibs.libX11 xlibs.libXext
xlibs.xproto
];
@ -26,4 +26,4 @@ stdenv.mkDerivation rec {
platforms = platforms.linux;
maintainers = [ maintainers.goibhniu ];
};
}
}

4
pkgs/applications/audio/chuck/default.nix
View File

@ -1,12 +1,12 @@
{ stdenv, fetchurl, alsaLib, bison, flex, libsndfile, which }:
stdenv.mkDerivation rec {
version = "1.3.5.0";
version = "1.3.5.1";
name = "chuck-${version}";
src = fetchurl {
url = "http://chuck.cs.princeton.edu/release/files/chuck-${version}.tgz";
sha256 = "0rj2l5k6ncm4jaiq0igwfc2bzryzchk1is1jhk1n7wifxcf3d3k5";
sha256 = "0lqzkphfd91kz95nf1wqy0z17r1m70c8inwvnb9fscbiaihwlhfi";
};
buildInputs = [ bison flex libsndfile which ]

4
pkgs/applications/audio/cmus/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchgit, ncurses, pkgconfig, alsaLib, flac, libmad, ffmpeg, libvorbis, libmpc, mp4v2, libcue, pulseaudio}:
{ stdenv, fetchgit, ncurses, pkgconfig, alsaLib, flac, libmad, ffmpeg, libvorbis, libmpc, mp4v2, libcue, libpulseaudio}:
stdenv.mkDerivation rec {
name = "cmus-${version}";
@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
configurePhase = "./configure prefix=$out";
buildInputs = [ ncurses pkgconfig alsaLib flac libmad ffmpeg libvorbis libmpc mp4v2 libcue pulseaudio ];
buildInputs = [ ncurses pkgconfig alsaLib flac libmad ffmpeg libvorbis libmpc mp4v2 libcue libpulseaudio ];
meta = {
description = "Small, fast and powerful console music player for Linux and *BSD";

4
pkgs/applications/audio/csound/default.nix
View File

@ -1,6 +1,6 @@
{ stdenv, fetchurl, cmake, libsndfile, flex, bison
, alsaLib ? null
, pulseaudio ? null
, libpulseaudio ? null
, tcltk ? null
# maybe csound can be compiled with support for those, see configure output
@ -21,7 +21,7 @@ stdenv.mkDerivation {
sha256 = "0w6ij57dbfjljpf05bb9r91jphwaq1v63rh0713vl2n11d73dy7m";
};
buildInputs = [ cmake libsndfile flex bison alsaLib pulseaudio tcltk ];
buildInputs = [ cmake libsndfile flex bison alsaLib libpulseaudio tcltk ];
meta = {
description = "sound design, audio synthesis, and signal processing system, providing facilities for music composition and performance on all major operating systems and platforms";

6
pkgs/applications/audio/deadbeef/default.nix
View File

@ -18,7 +18,7 @@
, osdSupport ? true, dbus ? null
# output plugins
, alsaSupport ? true, alsaLib ? null
, pulseSupport ? true, pulseaudio ? null
, pulseSupport ? true, libpulseaudio ? null
# effect plugins
, resamplerSupport ? true, libsamplerate ? null
, overloadSupport ? true, zlib ? null
@ -41,7 +41,7 @@ assert artworkSupport -> imlib2 != null;
assert hotkeysSupport -> libX11 != null;
assert osdSupport -> dbus != null;
assert alsaSupport -> alsaLib != null;
assert pulseSupport -> pulseaudio != null;
assert pulseSupport -> libpulseaudio != null;
assert resamplerSupport -> libsamplerate != null;
assert overloadSupport -> zlib != null;
assert wavpackSupport -> wavpack != null;
@ -70,7 +70,7 @@ stdenv.mkDerivation rec {
++ optional hotkeysSupport libX11
++ optional osdSupport dbus
++ optional alsaSupport alsaLib
++ optional pulseSupport pulseaudio
++ optional pulseSupport libpulseaudio
++ optional resamplerSupport libsamplerate
++ optional overloadSupport zlib
++ optional wavpackSupport wavpack

4
pkgs/applications/audio/ekho/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchurl, pkgconfig
, libsndfile, pulseaudio
, libsndfile, libpulseaudio
}:
let
@ -35,5 +35,5 @@ in stdenv.mkDerivation rec {
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ libsndfile pulseaudio ];
buildInputs = [ libsndfile libpulseaudio ];
}

4
pkgs/applications/audio/fldigi/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchurl, hamlib, fltk13, libjpeg, libpng, portaudio, libsndfile,
libsamplerate, pulseaudio, libXinerama, gettext, pkgconfig, alsaLib }:
libsamplerate, libpulseaudio, libXinerama, gettext, pkgconfig, alsaLib }:
stdenv.mkDerivation rec {
version = "3.22.02";
@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
};
buildInputs = [ libXinerama gettext hamlib fltk13 libjpeg libpng portaudio
libsndfile libsamplerate pulseaudio pkgconfig alsaLib ];
libsndfile libsamplerate libpulseaudio pkgconfig alsaLib ];
meta = {
description = "Digital modem program";

4
pkgs/applications/audio/fluidsynth/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchurl, alsaLib, glib, jack2, libsndfile, pkgconfig
, pulseaudio }:
, libpulseaudio }:
stdenv.mkDerivation rec {
name = "fluidsynth-${version}";
@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
"-framework CoreAudio";
buildInputs = [ glib libsndfile pkgconfig ]
++ stdenv.lib.optionals (!stdenv.isDarwin) [ alsaLib pulseaudio jack2 ];
++ stdenv.lib.optionals (!stdenv.isDarwin) [ alsaLib libpulseaudio jack2 ];
meta = with stdenv.lib; {
description = "Real-time software synthesizer based on the SoundFont 2 specifications";

2
pkgs/applications/audio/fmit/default.nix
View File

@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
ALSA or JACK as sound input library.
'';
homepage = http://home.gna.org/fmit/index.html;
license = with licenses; gpl3Plus;
license = licenses.gpl3Plus;
platforms = with platforms; linux;
maintainers = with maintainers; [ nckx ];
};

6
pkgs/applications/audio/guitarix/default.nix
View File

@ -1,6 +1,7 @@
{ stdenv, fetchurl, gettext, intltool, pkgconfig, python
, avahi, bluez, boost, eigen, fftw, glib, glibmm, gtk, gtkmm, jack2
, ladspaH, librdf, libsndfile, lilv, lv2, serd, sord, sratom
, zita-convolver, zita-resampler
, optimizationSupport ? false # Enable support for native CPU extensions
}:
@ -22,15 +23,14 @@ stdenv.mkDerivation rec {
buildInputs = [
avahi bluez boost eigen fftw glib glibmm gtk gtkmm jack2
ladspaH librdf libsndfile lilv lv2 serd sord sratom
zita-convolver zita-resampler
];
configureFlags = [
"--shared-lib"
"--no-desktop-update"
"--no-faust" # Need to package a release of faust, 0.9.58 or 0.9.65
"--enable-nls"
"--includeresampler" # Zita-resampler not packaged, use vendored version
"--includeconvolver" # Zita-convolver not packaged, use vendored version
"--no-faust" # todo: find out why --faust doesn't work
] ++ optional optimizationSupport "--optimization";
configurePhase = ''python waf configure --prefix=$out $configureFlags'';

23
pkgs/applications/audio/jaaa/default.nix
View File

@ -25,29 +25,20 @@ stdenv.mkDerivation rec {
"-I${zita-alsa-pcmi}/include"
];
patchPhase = ''
cd source/
sed -i "s@clthreads.h@${libclthreads}/include@g" $(find . -name '*.cc')
sed -i "s@clxclient.h@${libclxclient}/include@g" $(find . -name '*.cc')
sed -i "s@clthreads.h@${libclthreads}/include@g" $(find . -name '*.h')
sed -i "s@clxclient.h@${libclxclient}/include@g" $(find . -name '*.h')
'';
makeFlags = [
"PREFIX=$(out)"
"SUFFIX=''"
];
buildlPhase = ''
make PREFIX="$out"
'';
installPhase = ''
echo zita= ${zita-alsa-pcmi}
make PREFIX="$out" install
install -Dm644 ../README "$out/README"
preConfigure = ''
cd ./source/
'';
meta = with stdenv.lib; {
homepage = http://kokkinizita.linuxaudio.org/linuxaudio/index.html;
description = "JACK and ALSA Audio Analyser";
license = licenses.gpl2;
maintainers = [ maintainers.magnetophon ];
maintainers = with maintainers; [ magnetophon ];
platforms = platforms.linux;
};
}

2
pkgs/applications/audio/keyfinder-cli/default.nix
View File

@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
used to estimate the musical key of many different audio formats.
'';
homepage = https://github.com/EvanPurkhiser/keyfinder-cli;
license = with licenses; gpl3Plus;
license = licenses.gpl3Plus;
platforms = with platforms; linux;
maintainers = with maintainers; [ nckx ];
};

2
pkgs/applications/audio/keyfinder/default.nix
View File

@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
efficient workflow tool.
'';
homepage = http://www.ibrahimshaath.co.uk/keyfinder/;
license = with licenses; gpl3Plus;
license = licenses.gpl3Plus;
platforms = with platforms; linux;
maintainers = with maintainers; [ nckx ];
};

4
pkgs/applications/audio/lmms/default.nix
View File

@ -1,6 +1,6 @@
{ stdenv, fetchurl, SDL, alsaLib, cmake, fftwSinglePrec, fluidsynth
, fltk13, jack2, libvorbis , libsamplerate, libsndfile, pkgconfig
, pulseaudio, qt4, freetype
, libpulseaudio, qt4, freetype
}:
stdenv.mkDerivation rec {
@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
buildInputs = [
SDL alsaLib cmake fftwSinglePrec fltk13 fluidsynth jack2
libsamplerate libsndfile libvorbis pkgconfig pulseaudio qt4
libsamplerate libsndfile libvorbis pkgconfig libpulseaudio qt4
];
enableParallelBuilding = true;

4
pkgs/applications/audio/mhwaveedit/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchurl, SDL , alsaLib, gtk, jack2, ladspaH
, ladspaPlugins, libsamplerate, libsndfile, pkgconfig, pulseaudio }:
, ladspaPlugins, libsamplerate, libsndfile, pkgconfig, libpulseaudio }:
stdenv.mkDerivation rec {
name = "mhwaveedit-${version}";
@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
buildInputs =
[ SDL alsaLib gtk jack2 ladspaH libsamplerate libsndfile
pkgconfig pulseaudio
pkgconfig libpulseaudio
];
configureFlags = "--with-default-ladspa-path=${ladspaPlugins}/lib/ladspa";

4
pkgs/applications/audio/minimodem/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, pkgconfig, fftw, fftwSinglePrec, alsaLib, libsndfile, pulseaudio }:
{ stdenv, fetchurl, pkgconfig, fftw, fftwSinglePrec, alsaLib, libsndfile, libpulseaudio }:
stdenv.mkDerivation rec {
version = "0.19";
@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
sha256 = "003xyqjq59wcjafrdv1b8w34xsn4nvzz51wwd7mqddajh0g4dz4g";
};
buildInputs = [ pkgconfig fftw fftwSinglePrec alsaLib libsndfile pulseaudio ];
buildInputs = [ pkgconfig fftw fftwSinglePrec alsaLib libsndfile libpulseaudio ];
meta = {
description = "General-purpose software audio FSK modem";

4
pkgs/applications/audio/pamixer/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, boost, pulseaudio }:
{ stdenv, fetchurl, boost, libpulseaudio }:
stdenv.mkDerivation rec {
@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
sha256 = "1ad6b46hh02hs1978pgihrm2bnq4z2v0imrfm3wy74xdkr6xjxy4";
};
buildInputs = [ boost pulseaudio ];
buildInputs = [ boost libpulseaudio ];
installPhase = ''
mkdir -p $out/bin

4
pkgs/applications/audio/paprefs/default.nix
View File

@ -1,4 +1,4 @@
{ fetchurl, stdenv, pkgconfig, pulseaudio, gtkmm, libglademm
{ fetchurl, stdenv, pkgconfig, libpulseaudio, gtkmm, libglademm
, dbus_glib, gconfmm, intltool }:
stdenv.mkDerivation rec {
@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
sha256 = "1c5b3sb881szavly220q31g7rvpn94wr7ywlk00hqb9zaikml716";
};
buildInputs = [ pulseaudio gtkmm libglademm dbus_glib gconfmm ];
buildInputs = [ libpulseaudio gtkmm libglademm dbus_glib gconfmm ];
nativeBuildInputs = [ pkgconfig intltool ];

4
pkgs/applications/audio/pavucontrol/default.nix
View File

@ -1,4 +1,4 @@
{ fetchurl, stdenv, pkgconfig, intltool, pulseaudio, gtkmm3
{ fetchurl, stdenv, pkgconfig, intltool, libpulseaudio, gtkmm3
, libcanberra_gtk3, makeWrapper, gnome3 }:
stdenv.mkDerivation rec {
@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
--prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS"
'';
buildInputs = [ pulseaudio gtkmm3 libcanberra_gtk3 makeWrapper
buildInputs = [ libpulseaudio gtkmm3 libcanberra_gtk3 makeWrapper
gnome3.defaultIconTheme ];
nativeBuildInputs = [ pkgconfig intltool ];

4
pkgs/applications/audio/projectm/default.nix
View File

@ -3,7 +3,7 @@
, withQt ? true, qt4
, withLibvisual ? false, libvisual, SDL
, withJack ? false, jack2
, withPulseAudio ? true, pulseaudio
, withPulseAudio ? true, libpulseaudio
}:
assert withJack -> withQt;
@ -46,6 +46,6 @@ stdenv.mkDerivation {
++ optional withQt qt4
++ optionals withLibvisual [ libvisual SDL ]
++ optional withJack jack2
++ optional withPulseAudio pulseaudio
++ optional withPulseAudio libpulseaudio
;
}

4
pkgs/applications/audio/qmmp/default.nix
View File

@ -5,7 +5,7 @@
, libmad, taglib, libvorbis, libogg, flac, libmpcdec, libmodplug, libsndfile
, libcdio, cdparanoia, libcddb, faad2, ffmpeg, wildmidi
# output plugins
, alsaLib, pulseaudio
, alsaLib, libpulseaudio
# effect plugins
, libsamplerate
}:
@ -44,7 +44,7 @@ stdenv.mkDerivation rec {
libmad taglib libvorbis libogg flac libmpcdec libmodplug libsndfile
libcdio cdparanoia libcddb faad2 ffmpeg wildmidi
# output plugins
alsaLib pulseaudio
alsaLib libpulseaudio
# effect plugins
libsamplerate
];

4
pkgs/applications/audio/sonic-visualiser/default.nix
View File

@ -2,7 +2,7 @@
{ stdenv, fetchurl, alsaLib, bzip2, fftw, jack2, libX11, liblo
, libmad, libogg, librdf, librdf_raptor, librdf_rasqal, libsamplerate
, libsndfile, pkgconfig, pulseaudio, qt5, redland
, libsndfile, pkgconfig, libpulseaudio, qt5, redland
, rubberband, serd, sord, vampSDK
}:
@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
# optional
jack2
# portaudio
pulseaudio
libpulseaudio
libmad
libogg # ?
# fishsound

40
pkgs/applications/audio/tetraproc/default.nix
View File

@ -1,33 +1,43 @@
{ stdenv, fetchurl, jack2, libclthreads, libclxclient, fftwFloat, libsndfile, freetype, x11
{ stdenv, fetchurl, makeWrapper
, expat, fftwFloat, fontconfig, freetype, jack2, libclthreads, libclxclient
, libsndfile, libxcb, xlibs
}:
stdenv.mkDerivation rec {
name = "tetraproc-${version}";
version = "0.8.2";
src = fetchurl {
url = "http://kokkinizita.linuxaudio.org/linuxaudio/downloads/${name}.tar.bz2";
sha256 = "17y3vbm5f6h5cmh3yfxjgqz4xhfwpkla3lqfspnbm4ndlzmfpykv";
};
nativeBuildInputs = [ makeWrapper ];
buildInputs = [
jack2 libclthreads libclxclient fftwFloat libsndfile freetype x11
expat jack2 libclthreads libclxclient fftwFloat fontconfig libsndfile freetype
libxcb xlibs.libX11 xlibs.libXau xlibs.libXdmcp xlibs.libXft xlibs.libXrender
];
patchPhase = ''
cd source
sed -e "s@#include <clthreads.h>@#include <${libclthreads}/include>@" -i tetraproc.cc
sed -e "s@#include <clxclient.h>@#include <${libclxclient}/include>@" -i *.h
sed -e "s@#include <clthreads.h>@#include <${libclthreads}/include>@" -i *.h
sed -e "s@#include <clxclient.h>@#include <${libclxclient}/include>@" -i png2img.*
sed -e "s@/usr/local@$out@" -i Makefile
makeFlags = [
"PREFIX=$(out)"
"SUFFIX=''"
];
preConfigure = ''
cd ./source/
'';
meta = {
postInstall = ''
# Make sure Jack is avalable in $PATH for tetraproc
wrapProgram $out/bin/tetraproc --prefix PATH : "${jack2}/bin"
'';
meta = with stdenv.lib; {
description = "Converts the A-format signals from a tetrahedral Ambisonic microphone into B-format signals ready for recording";
version = "${version}";
homepage = "http://kokkinizita.linuxaudio.org/linuxaudio/";
license = stdenv.lib.licenses.gpl2;
maintainers = [ stdenv.lib.maintainers.magnetophon ];
platforms = stdenv.lib.platforms.linux;
homepage = http://kokkinizita.linuxaudio.org/linuxaudio/;
license = licenses.gpl2;
maintainers = with maintainers; [ magnetophon ];
platforms = platforms.linux;
};
}

8
pkgs/applications/display-managers/lightdm/default.nix
View File

@ -4,15 +4,15 @@
}:
let
ver_branch = "1.15";
version = "1.15.0";
ver_branch = "1.14";
version = "1.14.2";
in
stdenv.mkDerivation rec {
name = "lightdm-${version}";
src = fetchurl {
url = "${meta.homepage}/${ver_branch}/${version}/+download/${name}.tar.xz";
sha256 = "0f0c2irb7qq49dabxhh99bwyvkxpfpscy4vynm7y800sz15lm2hs";
sha256 = "18dvipdkp6hc1hysyiwpd5nwq6db3mg98rwi3am2ly3hk2bpic18";
};
patches = [ ./fix-paths.patch ];
@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
];
meta = with stdenv.lib; {
homepage = http://launchpad.net/lightdm;
homepage = https://launchpad.net/lightdm;
platforms = platforms.linux;
license = licenses.gpl3;
maintainers = with maintainers; [ ocharles wkennington ];

2
pkgs/applications/editors/atom/default.nix
View File

@ -46,7 +46,7 @@ in stdenv.mkDerivation rec {
meta = with stdenv.lib; {
description = "A hackable text editor for the 21st Century";
homepage = https://atom.io/;
license = [ licenses.mit ];
license = licenses.mit;
maintainers = [ maintainers.offline ];
platforms = [ "x86_64-linux" ];
};

8
pkgs/applications/editors/emacs-modes/jabber/default.nix
View File

@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
sha256 = "75e3b7853de4783b8ab8270dcbe6a1e4f576224f77f7463116532e11c6498c26";
};
buildInputs = [ emacs ];
meta = {
meta = with stdenv.lib; {
description = "A Jabber client for Emacs";
longDescription = ''
jabber.el is a Jabber client for Emacs. It may seem strange to have a
@ -16,8 +16,8 @@ stdenv.mkDerivation rec {
a special case of text editing.
'';
homepage = http://emacs-jabber.sourceforge.net/;
license = [ "GPLv2+" ];
maintainers = with stdenv.lib.maintainers; [ astsmtl ];
platforms = with stdenv.lib.platforms; linux;
license = licenses.gpl2Plus;
maintainers = with maintainers; [ astsmtl ];
platforms = with platforms; linux;
};
}

6
pkgs/applications/editors/emacs-modes/nyan-mode/default.nix
View File

@ -1,4 +1,4 @@
{trivialBuild, fetchFromGitHub}:
{trivialBuild, lib, fetchFromGitHub}:
trivialBuild rec {
pname = "nyan-mode";
@ -23,9 +23,9 @@ trivialBuild rec {
cp -r mus $out
'';
meta = {
meta = with lib; {
description = "An analog indicator of the position in the buffer";
homepage = https://github.com/TeMPOraL/nyan-mode/;
license = "GPLv3+";
license = licenses.gpl3Plus;
};
}

2
pkgs/applications/editors/lighttable/default.nix
View File

@ -53,6 +53,6 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
description = "the next generation code editor";
homepage = http://www.lighttable.com/;
license = [ licenses.gpl3 ];
license = licenses.gpl3;
};
}

2
pkgs/applications/editors/vim/configurable.nix
View File

@ -190,7 +190,7 @@ composableDerivation {
meta = with stdenv.lib; {
description = "The most popular clone of the VI editor";
homepage = http://www.vim.org;
license = with licenses; [ vim ];
license = licenses.vim;
maintainers = with maintainers; [ lovek323 ];
platforms = platforms.unix;
};

2
pkgs/applications/editors/vim/default.nix
View File

@ -49,7 +49,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
description = "The most popular clone of the VI editor";
homepage = http://www.vim.org;
license = with licenses; [ vim ];
license = licenses.vim;
maintainers = with maintainers; [ lovek323 ];
platforms = platforms.unix;
};

2
pkgs/applications/editors/vim/macvim.nix
View File

@ -87,7 +87,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
description = "Vim - the text editor - for Mac OS X";
homepage = https://github.com/b4winckler/macvim;
license = with licenses; [ vim ];
license = licenses.vim;
maintainers = with maintainers; [ cstrahan ];
platforms = platforms.darwin;
};

2
pkgs/applications/editors/vim/qvim.nix
View File

@ -118,7 +118,7 @@ composableDerivation {
meta = with stdenv.lib; {
description = "The most popular clone of the VI editor (Qt GUI fork)";
homepage = https://bitbucket.org/equalsraf/vim-qt/wiki/Home;
license = with licenses; [ vim ];
license = licenses.vim;
maintainers = with maintainers; [ smironov ttuegel ];
platforms = platforms.linux;
};

2
pkgs/applications/graphics/apitrace/default.nix
View File

@ -21,7 +21,7 @@ stdenv.mkDerivation {
meta = with stdenv.lib; {
homepage = https://apitrace.github.io;
description = "Tools to trace OpenGL, OpenGL ES, Direct3D, and DirectDraw APIs";
license = with licenses; mit;
license = licenses.mit;
platforms = platforms.linux;
maintainers = with maintainers; [ nckx ];
};

4
pkgs/applications/graphics/gimp/plugins/default.nix
View File

@ -59,12 +59,12 @@ rec {
sed -e 's,^\(GIMP_PLUGIN_DIR=\).*,\1'"$out/${gimp.name}-plugins", \
-e 's,^\(GIMP_DATA_DIR=\).*,\1'"$out/share/${gimp.name}", -i configure
'';
meta = {
meta = with stdenv.lib; {
description = "The GIMP Animation Package";
homepage = http://www.gimp.org;
# The main code is given in GPLv3, but it has ffmpeg in it, and I think ffmpeg license
# falls inside "free".
license = [ "GPLv3" "free" ];
license = with licenses; [ gpl3 free ];
};
};

11
pkgs/applications/graphics/potrace/default.nix
View File

@ -1,16 +1,15 @@
{ stdenv, fetchurl, zlib }:
let version = "1.11"; in
stdenv.mkDerivation {
stdenv.mkDerivation rec {
name = "potrace-${version}";
version = "1.12";
src = fetchurl {
url = "http://potrace.sourceforge.net/download/potrace-${version}.tar.gz";
sha256 = "1bbyl7jgigawmwc8r14znv8lb6lrcxh8zpvynrl6s800dr4yp9as";
url = "http://potrace.sourceforge.net/download/${version}/potrace-${version}.tar.gz";
sha256 = "0fqpfq5wwqz8j6pfh4p2pbflf6r86s4h63r8jawzrsyvpbbz3fxh";
};
configureFlags = ["--with-libpotrace"];
configureFlags = [ "--with-libpotrace" ];
buildInputs = [ zlib ];

4
pkgs/applications/graphics/shotwell/default.nix
View File

@ -1,6 +1,6 @@
{ fetchurl, stdenv, m4, glibc, gtk3, libexif, libgphoto2, libsoup, libxml2, vala, sqlite, webkitgtk24x
, pkgconfig, gnome3, gst_all_1, which, udev, libraw, glib, json_glib, gettext, desktop_file_utils
, lcms2, gdk_pixbuf, librsvg, makeWrapper, gnome_doc_utils, hicolor_icon_theme }:
, lcms2, gdk_pixbuf, librsvg, makeWrapper, gnome_doc_utils, hicolor_icon_theme, cacert }:
# for dependencies see http://www.yorba.org/projects/shotwell/install/
@ -13,7 +13,7 @@ let
sha256 = "0fmg7fq5fx0jg3ryk71kwdkspsvj42acxy9imk7vznkqj29a9zqn";
};
configureFlags = "--with-ca-certificates=/etc/ssl/certs/ca-bundle.crt";
configureFlags = "--with-ca-certificates=${cacert}/ca-bundle.crt";
buildInputs = [ pkgconfig glib libsoup ];
};

2
pkgs/applications/graphics/simple-scan/default.nix
View File

@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
interface is well tested.
'';
homepage = https://launchpad.net/simple-scan;
license = with licenses; gpl3Plus;
license = licenses.gpl3Plus;
platforms = with platforms; linux;
maintainers = with maintainers; [ nckx ];
};

2
pkgs/applications/graphics/zgrviewer/default.nix
View File

@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
# Quicker to unpack locally than load Hydra
hydraPlatforms = [];
maintainers = with stdenv.lib.maintainers; [raskin];
license = with stdenv.lib.licenses; lgpl21Plus;
license = stdenv.lib.licenses.lgpl21Plus;
description = "GraphViz graph viewer/navigator";
};
}

2
pkgs/applications/kde-apps-15.04/default.nix
View File

@ -117,7 +117,7 @@ let
OpenEXR = openexr;
Poppler = poppler_qt4;
Prison = prison;
PulseAudio = pulseaudio;
PulseAudio = libpulseaudio;
PythonLibrary = python;
Qalculate = libqalculate;
QCA2 = qca2;

4
pkgs/applications/misc/calibre/default.nix
View File

@ -5,11 +5,11 @@
}:
stdenv.mkDerivation rec {
name = "calibre-2.28.0";
name = "calibre-2.29.0";
src = fetchurl {
url = "mirror://sourceforge/calibre/${name}.tar.xz";
sha256 = "15sb74v0nlj45fhlnw1afll35l90cxw78s15fb2nx3fih7ahv3cf";
sha256 = "1n3cfnjnghhhsgzcbcvbr0gh191lhl6az09q1s68jhlcc2lski6l";
};
inherit python;

8
pkgs/applications/misc/eaglemode/default.nix
View File

@ -31,11 +31,11 @@ stdenv.mkDerivation rec {
ln -s $out/eaglemode.sh $out/bin/eaglemode.sh
'';
meta = {
meta = with stdenv.lib; {
homepage = "http://eaglemode.sourceforge.net";
description = "Zoomable User Interface";
license="GPLv3";
maintainers = with stdenv.lib.maintainers; [viric];
platforms = with stdenv.lib.platforms; linux;
license = licenses.gpl3;
maintainers = with maintainers; [ viric ];
platforms = with platforms; linux;
};
}

6
pkgs/applications/misc/gqrx/default.nix
View File

@ -1,10 +1,10 @@
{ stdenv, fetchurl, qt4, gnuradio, boost, gnuradio-osmosdr
# drivers (optional):
, rtl-sdr
, pulseaudioSupport ? true, pulseaudio
, pulseaudioSupport ? true, libpulseaudio
}:
assert pulseaudioSupport -> pulseaudio != null;
assert pulseaudioSupport -> libpulseaudio != null;
stdenv.mkDerivation rec {
name = "gqrx-${version}";
@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
buildInputs = [
qt4 gnuradio boost gnuradio-osmosdr rtl-sdr
] ++ stdenv.lib.optionals pulseaudioSupport [ pulseaudio ];
] ++ stdenv.lib.optionals pulseaudioSupport [ libpulseaudio ];
configurePhase = ''qmake PREFIX="$out"'';

2
pkgs/applications/misc/grass/default.nix
View File

@ -176,7 +176,7 @@ a.composableDerivation.composableDerivation {} (fix: {
meta = {
description = "free Geographic Information System (GIS) software used for geospatial data management and analysis, image processing, graphics/maps production, spatial modeling, and visualization";
homepage = http://grass.itc.it/index.php;
license = [ "GPL" ];
license = "GPL";
broken = true;
};

2
pkgs/applications/misc/jekyll/default.nix
View File

@ -13,7 +13,7 @@ bundlerEnv {
meta = with lib; {
description = "Simple, blog aware, static site generator";
homepage = http://jekyllrb.com/;
license = with licenses; mit;
license = licenses.mit;
maintainers = with maintainers; [ pesterhazy ];
platforms = platforms.unix;
};

4
pkgs/applications/misc/mediainfo-gui/default.nix
View File

@ -1,11 +1,11 @@
{ stdenv, fetchurl, automake, autoconf, libtool, pkgconfig, libzen, libmediainfo, wxGTK, desktop_file_utils, libSM, imagemagick }:
stdenv.mkDerivation rec {
version = "0.7.73";
version = "0.7.74";
name = "mediainfo-gui-${version}";
src = fetchurl {
url = "http://mediaarea.net/download/source/mediainfo/${version}/mediainfo_${version}.tar.bz2";
sha256 = "14mbiy1xhj4nlp7hnfqvi518xn1f718b2vbl8xkjqr2sqjdf5jm7";
sha256 = "06r6inggkb3gmxax182y4y39icxry5hdcvq7syb060l8wxrk14ky";
};
buildInputs = [ automake autoconf libtool pkgconfig libzen libmediainfo wxGTK desktop_file_utils libSM imagemagick ];

4
pkgs/applications/misc/mediainfo/default.nix
View File

@ -1,11 +1,11 @@
{ stdenv, fetchurl, automake, autoconf, libtool, pkgconfig, libzen, libmediainfo, zlib }:
stdenv.mkDerivation rec {
version = "0.7.73";
version = "0.7.74";
name = "mediainfo-${version}";
src = fetchurl {
url = "http://mediaarea.net/download/source/mediainfo/${version}/mediainfo_${version}.tar.bz2";
sha256 = "14mbiy1xhj4nlp7hnfqvi518xn1f718b2vbl8xkjqr2sqjdf5jm7";
sha256 = "06r6inggkb3gmxax182y4y39icxry5hdcvq7syb060l8wxrk14ky";
};
buildInputs = [ automake autoconf libtool pkgconfig libzen libmediainfo zlib ];

12
pkgs/applications/misc/mysql-workbench/default.nix
View File

@ -3,7 +3,7 @@
, libctemplate, libglade
, libiodbc
, libgnome, libsigcxx, libtool, libuuid, libxml2, libzip, lua, mesa, mysql
, pango, paramiko, pcre, pexpect, pkgconfig, pycrypto, python, sqlite
, pango, paramiko, pcre, pexpect, pkgconfig, pycrypto, python, sqlite, sudo
}:
stdenv.mkDerivation rec {
@ -29,6 +29,16 @@ stdenv.mkDerivation rec {
'';
postInstall = ''
patchShebangs $out/share/mysql-workbench/extras/build_freetds.sh
for i in $out/lib/mysql-workbench/modules/wb_utils_grt.py \
$out/lib/mysql-workbench/modules/wb_server_management.py \
$out/lib/mysql-workbench/modules/wb_admin_grt.py; do
substituteInPlace $i \
--replace "/bin/bash" ${stdenv.shell} \
--replace "/usr/bin/sudo" ${sudo}/bin/sudo
done
wrapProgram "$out/bin/mysql-workbench" \
--prefix LD_LIBRARY_PATH : "${python}/lib" \
--prefix LD_LIBRARY_PATH : "$(cat ${stdenv.cc}/nix-support/orig-cc)/lib64" \

4
pkgs/applications/networking/browsers/chromium/common.nix
View File

@ -26,7 +26,7 @@
, gnomeKeyringSupport ? false, libgnome_keyring3 ? null
, proprietaryCodecs ? true
, cupsSupport ? true
, pulseSupport ? false, pulseaudio ? null
, pulseSupport ? false, libpulseaudio ? null
, hiDPISupport ? false
, source
@ -118,7 +118,7 @@ let
++ optionals gnomeSupport [ gnome.GConf libgcrypt ]
++ optional enableSELinux libselinux
++ optionals cupsSupport [ libgcrypt cups ]
++ optional pulseSupport pulseaudio;
++ optional pulseSupport libpulseaudio;
# XXX: Wait for https://crbug.com/239107 and https://crbug.com/239181 to
# be fixed, then try again to unbundle everything into separate

8
pkgs/applications/networking/browsers/conkeror/default.nix
View File

@ -19,7 +19,7 @@ stdenv.mkDerivation {
--add-flags "-app $out/libexec/conkeror/application.ini"
'';
meta = {
meta = with stdenv.lib; {
description = "A keyboard-oriented, customizable, extensible web browser";
longDescription = ''
Conkeror is a keyboard-oriented, highly-customizable, highly-extensible
@ -30,8 +30,8 @@ stdenv.mkDerivation {
self-documenting, featuring a powerful interactive help system.
'';
homepage = http://conkeror.org/;
license = [ "MPLv1.1" "GPLv2" "LGPLv2.1" ];
maintainers = with stdenv.lib.maintainers; [ astsmtl chaoflow ];
platforms = with stdenv.lib.platforms; linux;
license = with licenses; [ mpl11 gpl2 lgpl21 ];
maintainers = with maintainers; [ astsmtl chaoflow ];
platforms = with platforms; linux;
};
}

4
pkgs/applications/networking/browsers/firefox-bin/default.nix
View File

@ -31,7 +31,7 @@
, nss
, pango
, heimdal
, pulseaudio
, libpulseaudio
, systemd
}:
@ -103,7 +103,7 @@ stdenv.mkDerivation {
nss
pango
heimdal
pulseaudio
libpulseaudio
systemd
] + ":" + stdenv.lib.makeSearchPath "lib64" [
stdenv.cc.cc

8
pkgs/applications/networking/browsers/mozilla-plugins/fribid/default.nix
View File

@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
passthru.mozillaPlugin = "/lib/mozilla/plugins";
meta = {
meta = with stdenv.lib; {
description = "A browser plugin to manage Swedish BankID:s";
longDescription = ''
FriBID is an open source software for the Swedish e-id system
@ -30,8 +30,8 @@ stdenv.mkDerivation rec {
support.
'';
homepage = http://fribid.se;
license = [ "GPLv2" "MPLv1" ];
maintainers = [ stdenv.lib.maintainers.edwtjo ];
platforms = with stdenv.lib.platforms; linux;
license = with licenses; [ gpl2 mpl10 ];
maintainers = [ maintainers.edwtjo ];
platforms = with platforms; linux;
};
}

4
pkgs/applications/networking/browsers/mozilla-plugins/google-talk-plugin/default.nix
View File

@ -1,6 +1,6 @@
{ stdenv, fetchurl, rpm, cpio, mesa, xorg, cairo
, libpng, gtk, glib, gdk_pixbuf, fontconfig, freetype, curl
, dbus_glib, alsaLib, pulseaudio, udev, pango
, dbus_glib, alsaLib, libpulseaudio, udev, pango
}:
with stdenv.lib;
@ -34,7 +34,7 @@ let
xorg.libXrandr
stdenv.cc.cc
alsaLib
pulseaudio
libpulseaudio
dbus_glib
udev
curl

4
pkgs/applications/networking/browsers/mozilla-plugins/mplayerplug-in/default.nix
View File

@ -28,9 +28,9 @@ stdenv.mkDerivation rec {
mozillaPlugin = "/lib/mozilla/plugins";
};
meta = {
meta = with stdenv.lib; {
description = "A browser plugin that uses mplayer to play digital media from websites";
homepage = http://mplayerplug-in.sourceforge.net/;
license = [ "GPLv2+" "LGPLv2+" "MPLv1+" ];
license = with licenses; [ gpl2Plus lgpl2Plus "MPLv1+" ];
};
}

11
pkgs/applications/networking/browsers/netsurf/netsurf.nix
View File

@ -23,12 +23,15 @@ stdenv.mkDerivation {
buildPhase = "make PREFIX=$out";
installPhase = "make PREFIX=$out install";
meta = {
meta = with args.lib; {
description = "free, open source web browser";
homepage = http://www.netsurf-browser.org;
license = ["GPLv2" /* visual worrk : */ "MIT" ];
maintainers = [args.lib.maintainers.marcweber];
platforms = args.lib.platforms.linux;
license = with licenses; [
gpl2
mit /* visual work */
];
maintainers = with maintainers; [ marcweber ];
platforms = platforms.linux;
};
}

4
pkgs/applications/networking/browsers/vimb/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchurl, pkgconfig, libsoup, webkit, gtk, glib_networking
, gsettings_desktop_schemas, makeWrapper
, gsettings_desktop_schemas, makeWrapper, cacert
}:
stdenv.mkDerivation rec {
@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
# Nixos default ca bundle
patchPhase = ''
sed -i s,/etc/ssl/certs/ca-certificates.crt,/etc/ssl/certs/ca-bundle.crt, src/config.def.h
sed -i s,/etc/ssl/certs/ca-certificates.crt,${cacert}/ca-bundle.crt, src/config.def.h
'';
buildInputs = [ makeWrapper gtk libsoup pkgconfig webkit gsettings_desktop_schemas ];

4
pkgs/applications/networking/browsers/vimprobable2/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchurl, makeWrapper, glib, glib_networking, gtk, libsoup, libX11, perl,
pkgconfig, webkit, gsettings_desktop_schemas }:
pkgconfig, webkit, gsettings_desktop_schemas, cacert }:
stdenv.mkDerivation rec {
version = "1.4.2";
@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
# Nixos default ca bundle
patchPhase = ''
sed -i s,/etc/ssl/certs/ca-certificates.crt,/etc/ssl/certs/ca-bundle.crt, config.h
sed -i s,/etc/ssl/certs/ca-certificates.crt,${cacert}/ca-bundle.crt, config.h
'';
buildInputs = [ makeWrapper gtk libsoup libX11 perl pkgconfig webkit gsettings_desktop_schemas ];

1710
pkgs/applications/networking/browsers/w3m/cygwin.patch Normal file
View File

File diff suppressed because it is too large Load Diff

3
pkgs/applications/networking/browsers/w3m/default.nix
View File

@ -22,7 +22,8 @@ stdenv.mkDerivation rec {
patches = [ ./glibc214.patch ]
# Patch for the newer unstable boehm-gc 7.2alpha. Not all platforms use that
# alpha. At the time of writing this, boehm-gc-7.1 is the last stable.
++ stdenv.lib.optional (boehmgc.name != "boehm-gc-7.1") [ ./newgc.patch ];
++ stdenv.lib.optional (boehmgc.name != "boehm-gc-7.1") [ ./newgc.patch ]
++ stdenv.lib.optional stdenv.isCygwin ./cygwin.patch;
buildInputs = [ncurses boehmgc gettext zlib]
++ stdenv.lib.optional sslSupport openssl

4
pkgs/applications/networking/cluster/panamax/api/default.nix
View File

@ -62,8 +62,8 @@ stdenv.mkDerivation rec {
--prefix "PATH" : "$out/share/panamax-api/bin:${env.ruby}/bin:$PATH" \
--prefix "HOME" : "$out/share/panamax-api" \
--prefix "GEM_HOME" : "${env}/${env.ruby.gemPath}" \
--prefix "OPENSSL_X509_CERT_FILE" : "${cacert}/etc/ca-bundle.crt" \
--prefix "SSL_CERT_FILE" : "${cacert}/etc/ca-bundle.crt" \
--prefix "OPENSSL_X509_CERT_FILE" : "${cacert}/ca-bundle.crt" \
--prefix "SSL_CERT_FILE" : "${cacert}/ca-bundle.crt" \
--prefix "GEM_PATH" : "$out/share/panamax-api:${bundler}/${env.ruby.gemPath}"
'';

2
pkgs/applications/networking/feedreaders/rsstail/default.nix
View File

@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
detects a new entry it'll emit only that new entry.
'';
homepage = http://www.vanheusden.com/rsstail/;
license = with licenses; gpl2Plus;
license = licenses.gpl2Plus;
platforms = with platforms; linux;
maintainers = with maintainers; [ nckx ];
};

2
pkgs/applications/networking/instant-messengers/baresip/default.nix
View File

@ -40,7 +40,7 @@ stdenv.mkDerivation rec {
homepage = "http://www.creytiv.com/baresip.html";
platforms = with stdenv.lib.platforms; linux;
maintainers = with stdenv.lib.maintainers; [raskin];
license = with stdenv.lib.licenses; bsd3;
license = stdenv.lib.licenses.bsd3;
inherit version;
downloadPage = "http://www.creytiv.com/pub/";
updateWalker = true;

2
pkgs/applications/networking/instant-messengers/fuze/default.nix
View File

@ -6,7 +6,7 @@ assert stdenv.system == "x86_64-linux";
let
curl_custom =
stdenv.lib.overrideDerivation curl (args: {
configureFlags = args.configureFlags ++ ["--with-ca-bundle=${cacert}/etc/ca-bundle.crt"] ;
configureFlags = args.configureFlags ++ ["--with-ca-bundle=${cacert}/ca-bundle.crt"] ;
} );
in
stdenv.mkDerivation {

2
pkgs/applications/networking/instant-messengers/oneteam/default.nix
View File

@ -1,6 +1,6 @@
x@{builderDefsPackage
, fetchgit, perl, xulrunner, cmake, perlPackages, zip, unzip, pkgconfig
, pulseaudio, glib, gtk, pixman, nspr, nss, libXScrnSaver, scrnsaverproto
, libpulseaudio, glib, gtk, pixman, nspr, nss, libXScrnSaver, scrnsaverproto
, ...}:
builderDefsPackage
(a :

4
pkgs/applications/networking/instant-messengers/sflphone/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, libyaml, alsaLib, openssl, libuuid, pkgconfig, pulseaudio, libsamplerate
{ stdenv, fetchurl, libyaml, alsaLib, openssl, libuuid, pkgconfig, libpulseaudio, libsamplerate
, commoncpp2, ccrtp, libzrtpcpp, dbus, dbus_cplusplus, expat, pcre, gsm, speex, ilbc, libopus
, autoconf, automake, libtool, gettext, perl
, cmake, qt4
@ -43,7 +43,7 @@ rec {
configureFlags = "--with-expat --with-expat-inc=${expat}/include " +
"--with-expat-lib=-lexpat --with-opus ";
buildInputs = [ libyaml alsaLib openssl libuuid pkgconfig pulseaudio libsamplerate
buildInputs = [ libyaml alsaLib openssl libuuid pkgconfig libpulseaudio libsamplerate
commoncpp2 ccrtp libzrtpcpp dbus dbus_cplusplus expat pcre gsm speex ilbc libopus
autoconf automake libtool gettext perl ];
};

4
pkgs/applications/networking/instant-messengers/skype/default.nix
View File

@ -1,6 +1,6 @@
{ stdenv, fetchurl, libXv, libXi, libXrender, libXrandr, zlib, glib
, libXext, libX11, libXScrnSaver, libSM, qt4, libICE, freetype, fontconfig
, pulseaudio, lib, ... }:
, libpulseaudio, lib, ... }:
assert stdenv.system == "i686-linux";
@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
libXi
libXrender
libXrandr
pulseaudio
libpulseaudio
freetype
fontconfig
zlib

4
pkgs/applications/networking/instant-messengers/teamspeak/client.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchurl, makeWrapper, zlib, glib, libpng, freetype, xorg
, fontconfig, xlibs, qt5, xkeyboard_config, alsaLib, pulseaudio ? null
, fontconfig, xlibs, qt5, xkeyboard_config, alsaLib, libpulseaudio ? null
, libredirect, quazip, less, which
}:
@ -12,7 +12,7 @@ let
deps =
[ zlib glib libpng freetype xorg.libSM xorg.libICE xorg.libXrender
xorg.libXrandr xorg.libXfixes xorg.libXcursor xorg.libXinerama
xlibs.libxcb fontconfig xorg.libXext xorg.libX11 alsaLib qt5.base pulseaudio
xlibs.libxcb fontconfig xorg.libXext xorg.libX11 alsaLib qt5.base libpulseaudio
];
in

4
pkgs/applications/networking/instant-messengers/telepathy/gabble/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchurl, pkgconfig, libxslt, telepathy_glib, libxml2, dbus_glib, dbus_daemon
, sqlite, libsoup, libnice, gnutls }:
, sqlite, libsoup, libnice, gnutls, cacert }:
stdenv.mkDerivation rec {
name = "telepathy-gabble-0.18.2";
@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
buildInputs = [ libxml2 dbus_glib sqlite libsoup libnice telepathy_glib gnutls ]
++ stdenv.lib.optional doCheck dbus_daemon;
configureFlags = "--with-ca-certificates=/etc/ssl/certs/ca-bundle.crt";
configureFlags = "--with-ca-certificates=${cacert}/ca-bundle.crt";
enableParallelBuilding = true;
doCheck = true;

2
pkgs/applications/networking/irc/weechat/default.nix
View File

@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
cacert cmake ]
++ extraBuildInputs;
NIX_CFLAGS_COMPILE = "-I${python}/include/${python.libPrefix} -DCA_FILE=${cacert}/etc/ca-bundle.crt";
NIX_CFLAGS_COMPILE = "-I${python}/include/${python.libPrefix} -DCA_FILE=${cacert}/ca-bundle.crt";
postInstall = ''
NIX_PYTHONPATH="$out/lib/${python.libPrefix}/site-packages"

2
pkgs/applications/networking/mailreaders/sup/default.nix
View File

@ -12,7 +12,7 @@ bundlerEnv {
meta = with lib; {
description = "A curses threads-with-tags style email client";
homepage = http://supmua.org;
license = with licenses; gpl2;
license = licenses.gpl2;
maintainers = with maintainers; [ cstrahan lovek323 ];
platforms = platforms.unix;
};

2
pkgs/applications/networking/remote/freerdp/default.nix
View File

@ -15,7 +15,7 @@
#, xmlto, docbook_xml_dtd_412, docbook_xml_xslt
, libXinerama
, libXv
, pulseaudioSupport ? true, pulseaudio
, pulseaudioSupport ? true, libpulseaudio
}:
assert printerSupport -> cups != null;

6
pkgs/applications/networking/remote/freerdp/unstable.nix
View File

@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, cmake, pkgconfig, openssl, zlib, libX11, libXcursor
, libXdamage, libXext, glib, alsaLib, ffmpeg, libxkbfile, libXinerama, libXv
, substituteAll
, pulseaudio ? null, cups ? null, pcsclite ? null
, libpulseaudio ? null, cups ? null, pcsclite ? null
, buildServer ? true, optimize ? true
}:
@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
buildInputs = [
cmake pkgconfig openssl zlib libX11 libXcursor libXdamage libXext glib
alsaLib ffmpeg libxkbfile libXinerama libXv cups pulseaudio pcsclite
alsaLib ffmpeg libxkbfile libXinerama libXv cups libpulseaudio pcsclite
];
doCheck = false;
@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
cmakeFlags = [
"-DCMAKE_INSTALL_LIBDIR=lib"
"-DWITH_CUNIT=OFF"
] ++ stdenv.lib.optional (pulseaudio != null) "-DWITH_PULSE=ON"
] ++ stdenv.lib.optional (libpulseaudio != null) "-DWITH_PULSE=ON"
++ stdenv.lib.optional (cups != null) "-DWITH_CUPS=ON"
++ stdenv.lib.optional (pcsclite != null) "-DWITH_PCSC=ON"
++ stdenv.lib.optional buildServer "-DWITH_SERVER=ON"

2
pkgs/applications/networking/remote/x2goclient/default.nix
View File

@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
description = "Graphical NoMachine NX3 remote desktop client";
homepage = http://x2go.org/;
license = with licenses; gpl2;
license = licenses.gpl2;
platforms = with platforms; linux;
maintainers = with maintainers; [ nckx ];
};

4
pkgs/applications/networking/sniffers/wireshark/default.nix
View File

@ -10,7 +10,7 @@ assert withQt -> !withGtk && qt4 != null;
with stdenv.lib;
let
version = "1.12.4";
version = "1.12.5";
variant = if withGtk then "gtk" else if withQt then "qt" else "cli";
in
@ -19,7 +19,7 @@ stdenv.mkDerivation {
src = fetchurl {
url = "http://www.wireshark.org/download/src/wireshark-${version}.tar.bz2";
sha256 = "04n3xfakg6368ba49vj6n3csqnkzipac4sldsaavgr2jwac4x06y";
sha256 = "10mxgj916bwv92pfhk4kldcaanr9vndjklzp9ypdxr29xyr7gwfh";
};
buildInputs = [

2
pkgs/applications/networking/syncthing/default.nix
View File

@ -25,7 +25,7 @@ buildGoPackage rec {
meta = {
homepage = http://syncthing.net/;
description = "Replaces Dropbox and BitTorrent Sync with something open, trustworthy and decentralized";
license = with lib.licenses; mit;
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ matejc ];
platforms = with lib.platforms; unix;
};

4
pkgs/applications/office/zotero/firefox-bin/default.nix
View File

@ -31,7 +31,7 @@
, nss
, pango
, heimdal
, pulseaudio
, libpulseaudio
, systemd
}:
@ -103,7 +103,7 @@ stdenv.mkDerivation {
nss
pango
heimdal
pulseaudio
libpulseaudio
systemd
] + ":" + stdenv.lib.makeSearchPath "lib64" [
stdenv.cc.cc

8
pkgs/applications/science/electronics/ngspice/default.nix
View File

@ -12,11 +12,11 @@ stdenv.mkDerivation {
configureFlags = [ "--enable-x" "--with-x" "--with-readline" ];
meta = {
meta = with stdenv.lib; {
description = "The Next Generation Spice (Electronic Circuit Simulator)";
homepage = "http://ngspice.sourceforge.net";
license = ["BSD" "GPLv2"];
maintainers = with stdenv.lib.maintainers; [viric];
platforms = with stdenv.lib.platforms; linux;
license = with licenses; [ "BSD" gpl2 ];
maintainers = with maintainers; [ viric ];
platforms = with platforms; linux;
};
}

2
pkgs/applications/science/logic/lci/default.nix
View File

@ -11,6 +11,6 @@ stdenv.mkDerivation rec {
description = ''Lambda calculus interpreter'';
maintainers = with stdenv.lib.maintainers; [raskin];
platforms = with stdenv.lib.platforms; linux;
license = with stdenv.lib.licenses; gpl3;
license = stdenv.lib.licenses.gpl3;
};
}

2
pkgs/applications/science/logic/stp/default.nix
View File

@ -18,6 +18,6 @@ stdenv.mkDerivation rec {
description = ''Simple Theorem Prover'';
maintainers = with stdenv.lib.maintainers; [mornfall];
platforms = with stdenv.lib.platforms; linux;
license = with stdenv.lib.licenses; mit;
license = stdenv.lib.licenses.mit;
};
}

8
pkgs/applications/science/math/pari/default.nix
View File

@ -16,12 +16,12 @@ stdenv.mkDerivation rec {
"--with-gmp=${gmp} " +
"--with-readline=${readline}";
meta = {
meta = with stdenv.lib; {
description = "Computer algebra system for high-performance number theory computations";
homepage = "http://pari.math.u-bordeaux.fr/";
license = "GPLv2+";
maintainers = with stdenv.lib.maintainers; [ertes raskin];
platforms = stdenv.lib.platforms.linux;
license = licenses.gpl2Plus;
maintainers = with maintainers; [ ertes raskin ];
platforms = platforms.linux;
inherit version;
downloadPage = "http://pari.math.u-bordeaux.fr/download.html";

4
pkgs/applications/science/math/speedcrunch/default.nix
View File

@ -23,9 +23,9 @@ stdenv.mkDerivation rec {
buildFlags = "VERBOSE=1";
meta = {
meta = with stdenv.lib; {
homepage = "http://speedcrunch.digitalfanatics.org";
license = "GPLv2+";
license = licenses.gpl2Plus;
description = "A fast power user calculator";
longDescription = ''
SpeedCrunch is a fast, high precision and powerful desktop calculator.

4
pkgs/applications/science/molecular-dynamics/gromacs/default.nix
View File

@ -19,9 +19,9 @@ stdenv.mkDerivation {
${if singlePrec then "-DGMX_DOUBLE=OFF" else "-DGMX_DOUBLE=ON -DGMX_DEFAULT_SUFFIX=OFF"}
'';
meta = {
meta = with stdenv.lib; {
homepage = "http://www.gromacs.org";
license = "GPLv2";
license = licenses.gpl2;
description = "Molecular dynamics software package";
longDescription = ''
GROMACS is a versatile package to perform molecular dynamics,

4
pkgs/applications/version-management/bazaar/default.nix
View File

@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
sha256 = "1c6sj77h5f97qimjc14kr532kgc0jk3wq778xrkqi0pbh9qpk509";
};
buildInputs = [ pythonPackages.python pythonPackages.wrapPython cacert ];
buildInputs = [ pythonPackages.python pythonPackages.wrapPython ];
# Readline support is needed by bzrtools.
pythonPath = [ pythonPackages.readline ];
@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
patches = [ ./add_certificates.patch ];
postPatch = ''
substituteInPlace bzrlib/transport/http/_urllib2_wrappers.py \
--subst-var-by "certPath" "${cacert}/etc/ca-bundle.crt"
--subst-var-by "certPath" "${cacert}/ca-bundle.crt"
'';

4
pkgs/applications/version-management/mercurial/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchurl, python, makeWrapper, docutils, unzip
, guiSupport ? false, tk ? null, curses }:
, guiSupport ? false, tk ? null, curses, cacert }:
let
version = "3.3.3";
@ -44,7 +44,7 @@ stdenv.mkDerivation {
mkdir -p $out/etc/mercurial
cat >> $out/etc/mercurial/hgrc << EOF
[web]
cacerts = /etc/ssl/certs/ca-bundle.crt
cacerts = ${cacert}/ca-bundle.crt
EOF
# copy hgweb.cgi to allow use in apache

2
pkgs/applications/version-management/src/default.nix
View File

@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
homepage = http://www.catb.org/~esr/src/;
license = [ stdenv.lib.licenses.bsd3 ];
license = stdenv.lib.licenses.bsd3;
maintainers = [ stdenv.lib.maintainers.shlevy ];

6
pkgs/applications/video/aegisub/default.nix
View File

@ -9,14 +9,14 @@
, automationSupport ? true, lua ? null
, openalSupport ? false, openal ? null
, alsaSupport ? true, alsaLib ? null
, pulseaudioSupport ? true, pulseaudio ? null
, pulseaudioSupport ? true, libpulseaudio ? null
, portaudioSupport ? false, portaudio ? null }:
assert spellcheckSupport -> (hunspell != null);
assert automationSupport -> (lua != null);
assert openalSupport -> (openal != null);
assert alsaSupport -> (alsaLib != null);
assert pulseaudioSupport -> (pulseaudio != null);
assert pulseaudioSupport -> (libpulseaudio != null);
assert portaudioSupport -> (portaudio != null);
with stdenv.lib;
@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
++ optional automationSupport lua
++ optional openalSupport openal
++ optional alsaSupport alsaLib
++ optional pulseaudioSupport pulseaudio
++ optional pulseaudioSupport libpulseaudio
++ optional portaudioSupport portaudio
;

6
pkgs/applications/video/bomi/default.nix
View File

@ -13,7 +13,7 @@
, libbluray
, jackSupport ? false, jack ? null
, portaudioSupport ? false, portaudio ? null
, pulseSupport ? true, pulseaudio ? null
, pulseSupport ? true, libpulseaudio ? null
, cddaSupport ? false, libcdda ? null
, youtubeSupport ? true, youtube-dl ? null
}:
@ -22,7 +22,7 @@ with stdenv.lib;
assert jackSupport -> jack != null;
assert portaudioSupport -> portaudio != null;
assert pulseSupport -> pulseaudio != null;
assert pulseSupport -> libpulseaudio != null;
assert cddaSupport -> libcdda != null;
assert youtubeSupport -> youtube-dl != null;
@ -63,7 +63,7 @@ stdenv.mkDerivation rec {
]
++ optional jackSupport jack
++ optional portaudioSupport portaudio
++ optional pulseSupport pulseaudio
++ optional pulseSupport libpulseaudio
++ optional cddaSupport libcdda
;

2
pkgs/applications/video/clipgrab/default.nix
View File

@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
videos to MPEG4, MP3 or other formats in just one easy step.
'';
homepage = http://clipgrab.org/;
license = with licenses; gpl3Plus;
license = licenses.gpl3Plus;
platforms = with platforms; linux;
maintainers = with maintainers; [ nckx ];
};

Some files were not shown because too many files have changed in this diff Show More