ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-12-27 05:43:50 +03:00
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into stdenv-updates.

Browse Source 
Conflicts:
	pkgs/tools/networking/p2p/amule/default.nix
This commit is contained in:
Peter Simons 2013-12-10 00:25:54 +01:00
commit 486e7736df
100 changed files with 1309 additions and 182 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
lib/maintainers.nix
View File

@ -49,6 +49,7 @@
rickynils = "Rickard Nilsson <rickynils@gmail.com>";
rob = "Rob Vermaas <rob.vermaas@gmail.com>";
roconnor = "Russell O'Connor <roconnor@theorem.ca>";
roelof = "Roelof Wobben <rwobben@hotmail.com>";
sander = "Sander van der Burg <s.vanderburg@tudelft.nl>";
shlevy = "Shea Levy <shea@shealevy.com>";
simons = "Peter Simons <simons@cryp.to>";

5
nixos/modules/services/networking/avahi-daemon.nix
View File

@ -51,7 +51,10 @@ in
hostName = mkOption {
type = types.str;
description = ''Host name advertised on the LAN.'';
description = ''
Host name advertised on the LAN. If not set, avahi will use the value
of config.networking.hostName.
'';
};
browseDomains = mkOption {

1
nixos/modules/virtualisation/libvirtd.nix
View File

@ -107,6 +107,7 @@ in
# while still being used by the virtual machine. So update the
# emulator path on each startup to something valid (re-scan $PATH).
for file in /etc/libvirt/qemu/*.xml; do
test -f "$file" || continue
# get (old) emulator path from config file
emulator=$(grep "^[[:space:]]*<emulator>" "$file" | sed 's,^[[:space:]]*<emulator>\(.*\)</emulator>.*,\1,')
# get a (definitely) working emulator path by re-scanning $PATH

5
pkgs/applications/audio/audacity/default.nix
View File

@ -4,12 +4,12 @@
}:
stdenv.mkDerivation rec {
version = "2.0.4";
version = "2.0.5";
name = "audacity-${version}";
src = fetchurl {
url = "http://audacity.googlecode.com/files/audacity-minsrc-${version}.tar.xz";
sha256 = "0pl92filykzs4g2pn7i02kdqgja326wjgafzw2vcgwn3dwrs4avp";
sha256 = "0y9bvc3a3zxsk31yg7bha029mzkjiw5i9m86kbyj7x8ps0fm91z2";
};
preConfigure = /* we prefer system-wide libs */ ''
@ -33,5 +33,6 @@ stdenv.mkDerivation rec {
homepage = http://audacity.sourceforge.net;
license = "GPLv2+";
platforms = with stdenv.lib.platforms; linux;
maintainers = with stdenv.lib.maintainers; [ the-kenny ];
};
}

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

@ -1,5 +1,5 @@
{ stdenv, fetchurl, alsaLib, glib, jackaudio, libsndfile, pkgconfig
, pulseaudio, cmake }:
, pulseaudio }:
stdenv.mkDerivation rec {
name = "fluidsynth-${version}";
@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isDarwin
"-framework CoreAudio";
buildInputs = [ cmake glib libsndfile pkgconfig ]
buildInputs = [ glib libsndfile pkgconfig ]
++ stdenv.lib.optionals (!stdenv.isDarwin) [ alsaLib pulseaudio jackaudio ];
meta = with stdenv.lib; {

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

@ -67,7 +67,7 @@ stdenv.mkDerivation {
ln -s $out/spotify-client/spotify $out/bin/spotify
patchelf \
--interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" \
--set-rpath $out/spotify-client/Data:$out/lib:$out/spotify-client:${stdenv.lib.makeLibraryPath [ xlibs.libXScrnSaver xlibs.libX11 qt4 alsaLib stdenv.gcc.gcc freetype glib pango cairo atk gdk_pixbuf gtk GConf cups sqlite]}:${stdenv.gcc.gcc}/lib64 \
--set-rpath $out/spotify-client/Data:$out/lib:$out/spotify-client:${stdenv.lib.makeLibraryPath [ xlibs.libXScrnSaver xlibs.libX11 qt4 alsaLib stdenv.gcc.gcc freetype glib pango cairo atk gdk_pixbuf gtk GConf cups sqlite xlibs.libXdamage ]}:${stdenv.gcc.gcc}/lib64 \
$out/spotify-client/spotify
dpkg-deb -x ${qt4webkit} ./
@ -78,7 +78,7 @@ stdenv.mkDerivation {
mkdir -p $out/libexec/spotify
gcc -shared ${./preload.c} -o $preload -ldl -DOUT=\"$out\" -fPIC
wrapProgram $out/bin/spotify --set LD_PRELOAD $preload --prefix LD_LIBRARY_PATH : "${stdenv.lib.makeLibraryPath [ GConf libpng cups libgcrypt sqlite gst_plugins_base gstreamer]}:$out/lib"
wrapProgram $out/bin/spotify --set LD_PRELOAD $preload --prefix LD_LIBRARY_PATH : "${stdenv.lib.makeLibraryPath [ GConf libpng cups libgcrypt sqlite gst_plugins_base gstreamer xlibs.libXdamage ]}:$out/lib"
# Desktop file
mkdir -p "$out/share/applications/"

6
pkgs/applications/graphics/sxiv/default.nix
View File

@ -1,12 +1,12 @@
{ stdenv, fetchurl, libX11, imlib2, giflib }:
stdenv.mkDerivation {
name = "sxiv-1.1";
name = "sxiv-1.1.1";
src = fetchurl {
url = "https://github.com/muennich/sxiv/archive/v1.1.tar.gz";
url = "https://github.com/muennich/sxiv/archive/v1.1.1.tar.gz";
name = "sxiv-1.1.tar.gz";
sha256 = "0gsqwa1yacsig7ycjrw0sjyrsa9mynfzzbwm1vp2bgk4s9hb08kx";
sha256 = "07r8125xa8d5q71ql71s4i1dx4swy8hypxh2s5h7z2jnn5y9nmih";
};
buildInputs = [ libX11 imlib2 giflib ];

24
pkgs/applications/misc/robomongo/default.nix Normal file
View File

@ -0,0 +1,24 @@
{ stdenv, fetchurl, qt5, openssl, boost, cmake, scons, python, pcre, bzip2 }:
stdenv.mkDerivation {
name = "robomongo-0.8.3";
src = fetchurl {
url = https://github.com/paralect/robomongo/archive/v0.8.3.tar.gz;
sha256 = "1x8vpmqvjscjcw30hf0i5vsrg3rldlwx6z52i1hymlck2jfzkank";
};
patches = [ ./robomongo.patch ];
NIX_CFLAGS_COMPILE = "-fno-stack-protector";
buildInputs = [ cmake boost scons qt5 openssl python pcre bzip2 ];
meta = {
homepage = "http://robomongo.org/";
description = "Query GUI for mongodb";
platforms = stdenv.lib.platforms.unix;
license = stdenv.lib.licenses.gpl3;
maintainers = [ stdenv.lib.maintainers.amorsillo ];
};
}

48
pkgs/applications/misc/robomongo/robomongo.patch Normal file
View File

@ -0,0 +1,48 @@
Remove check for QT_NO_STYLE_GTK to avoid building with QCleanlooksStyle which results in error due to missing QCleanlooksStyle
Ensure environment is preserved for scons build -- scons clears the env but we want to keep the nix build environment
Fix typo in cmakelists
diff -rupN robomongo-0.8.3/CMakeLists.txt robomongo-0.8.3-patched/CMakeLists.txt
--- robomongo-0.8.3/CMakeLists.txt 2013-10-01 10:55:00.000000000 -0400
+++ robomongo-0.8.3-patched/CMakeLists.txt 2013-12-06 12:22:06.070659856 -0500
@@ -133,7 +133,7 @@ ELSE()
ENDIF()
##################################DEFAULT VALUES##########################################
-IF(NOT CMAKE_INSTALL_PREFIX})
+IF(NOT CMAKE_INSTALL_PREFIX)
SET(CMAKE_INSTALL_PREFIX "${CMAKE_BINARY_DIR}/install")
ENDIF()
diff -rupN robomongo-0.8.3/src/robomongo/gui/AppStyle.h robomongo-0.8.3-patched/src/robomongo/gui/AppStyle.h
--- robomongo-0.8.3/src/robomongo/gui/AppStyle.h 2013-10-01 10:55:00.000000000 -0400
+++ robomongo-0.8.3-patched/src/robomongo/gui/AppStyle.h 2013-12-06 12:20:57.417297186 -0500
@@ -8,13 +8,8 @@
#include <QProxyStyle>
typedef QProxyStyle OsStyle;
#elif defined OS_LINUX
- #if !defined(QT_NO_STYLE_GTK)
- #include <QProxyStyle>
- typedef QProxyStyle OsStyle;
- #else
- #include <QCleanlooksStyle>
- typedef QCleanlooksStyle OsStyle;
- #endif
+ #include <QProxyStyle>
+ typedef QProxyStyle OsStyle;
#endif
namespace Robomongo
diff -rupN robomongo-0.8.3/src/third-party/mongodb/SConstruct robomongo-0.8.3-patched/src/third-party/mongodb/SConstruct
--- robomongo-0.8.3/src/third-party/mongodb/SConstruct 2013-10-01 10:55:00.000000000 -0400
+++ robomongo-0.8.3-patched/src/third-party/mongodb/SConstruct 2013-12-06 12:21:45.705255731 -0500
@@ -283,7 +283,8 @@ usePCH = has_option( "usePCH" )
justClientLib = (COMMAND_LINE_TARGETS == ['mongoclient'])
-env = Environment( BUILD_DIR=variantDir,
+env = Environment( ENV=os.environ,
+ BUILD_DIR=variantDir,
CLIENT_ARCHIVE='${CLIENT_DIST_BASENAME}${DIST_ARCHIVE_SUFFIX}',
CLIENT_DIST_BASENAME=get_option('client-dist-basename'),
CLIENT_LICENSE='#distsrc/client/LICENSE.txt',

4
pkgs/applications/misc/zathura/core/default.nix
View File

@ -1,12 +1,12 @@
{ stdenv, fetchurl, pkgconfig, gtk, girara, gettext, docutils, file, makeWrapper }:
stdenv.mkDerivation rec {
version = "0.2.5";
version = "0.2.6";
name = "zathura-core-${version}";
src = fetchurl {
url = "http://pwmt.org/projects/zathura/download/zathura-${version}.tar.gz";
sha256 = "1lw9q0x4b7x6z86hwgs93f8srimd0sj8fwg91185f63yz9g800fr";
sha1 = "d84878388969d523027a1661f49fd29638bd460b";
};
buildInputs = [ pkgconfig file gtk girara gettext makeWrapper ];

8
pkgs/applications/networking/irc/quassel/default.nix
View File

@ -4,6 +4,7 @@
, withKDE ? stdenv.isLinux # enable KDE integration
, ssl ? true # enable SSL support
, previews ? false # enable webpage previews on hovering over URLs
, tag ? "" # tag added to the package name
, stdenv, fetchurl, cmake, qt4, kdelibs, automoc4, phonon }:
let
@ -11,13 +12,16 @@ let
in with stdenv; mkDerivation rec {
name = "quassel-0.9.2";
version = "0.9.2";
name = "quassel${tag}-${version}";
src = fetchurl {
url = "http://quassel-irc.org/pub/${name}.tar.bz2";
url = "http://quassel-irc.org/pub/quassel-${version}.tar.bz2";
sha256 = "1h2kzi4pgfv3qmvhxix9fffdjixs3bsya0i5c18dkh894mh02kgh";
};
enableParallelBuilding = true;
buildInputs = [ cmake qt4 ]
++ lib.optional withKDE kdelibs
++ lib.optional withKDE automoc4

14
pkgs/applications/networking/mumble/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchurl, qt4, libvorbis, boost, speechd, protobuf, libsndfile,
avahi, dbus, libcap, pkgconfig,
{ stdenv, fetchurl, qt4, boost, speechd, protobuf, libsndfile,
speex, libopus, avahi, pkgconfig,
jackSupport ? false,
jackaudio ? null }:
@ -18,16 +18,18 @@ stdenv.mkDerivation rec {
'';
configurePhase = ''
qmake CONFIG+=no-g15 CONFIG+=no-update \
CONFIG+=no-embed-qt-translations CONFIG+=no-ice \
qmake CONFIG+=no-g15 CONFIG+=no-update CONFIG+=no-server \
CONFIG+=no-embed-qt-translations CONFIG+=packaged \
CONFIG+=bundled-celt CONFIG+=no-bundled-opus \
CONFIG+=no-bundled-speex
''
+ stdenv.lib.optionalString jackSupport ''
CONFIG+=no-oss CONFIG+=no-alsa CONFIG+=jackaudio
'';
buildInputs = [ qt4 libvorbis boost speechd protobuf libsndfile avahi dbus
libcap pkgconfig ]
buildInputs = [ qt4 boost speechd protobuf libsndfile speex
libopus avahi pkgconfig ]
++ (stdenv.lib.optional jackSupport jackaudio);
installPhase = ''

30
pkgs/applications/networking/mumble/murmur.nix Normal file
View File

@ -0,0 +1,30 @@
{ stdenv, fetchurl, qt4, boost, protobuf, avahi, libcap, pkgconfig }:
stdenv.mkDerivation rec {
name = "murmur-" + version;
version = "1.2.4";
src = fetchurl {
url = "mirror://sourceforge/mumble/mumble-${version}.tar.gz";
sha256 = "16wwj6gwcnyjlnzh7wk0l255ldxmbwx0wi652sdp20lsv61q7kx1";
};
configurePhase = ''
qmake CONFIG+=no-client CONFIG+=no-ice CONFIG+=no-embed-qt
'';
buildInputs = [ qt4 boost protobuf avahi libcap pkgconfig ];
installPhase = ''
mkdir -p $out
cp -r ./release $out/bin
'';
meta = {
homepage = http://mumble.sourceforge.net/;
description = "Low-latency, high quality voice chat software";
license = "BSD";
platforms = with stdenv.lib.platforms; linux;
maintainers = with stdenv.lib.maintainers; [viric];
};
}

11
pkgs/applications/science/astronomy/stellarium/default.nix
View File

@ -1,14 +1,11 @@
{stdenv, fetchurl, cmake, freetype, libpng, mesa, gettext, openssl, qt4, perl, libiconv}:
{ stdenv, fetchurl, cmake, freetype, libpng, mesa, gettext, openssl, qt4, perl, libiconv }:
let
name = "stellarium-0.12.1";
in
stdenv.mkDerivation {
inherit name;
stdenv.mkDerivation rec {
name = "stellarium-0.12.4";
src = fetchurl {
url = "mirror://sourceforge/stellarium/${name}.tar.gz";
sha256 = "02qfp56mkg3bqggv3ndx8v6zfswg51gkczwiqy5c9y4rw28hazla";
sha256 = "11367hv9niyz9v47lf31vjsqkgc8da0vy2nhiyxgmk1i49p1pbhg";
};
buildInputs = [ cmake freetype libpng mesa gettext openssl qt4 perl libiconv ];

6
pkgs/applications/science/astronomy/xplanet/default.nix
View File

@ -2,15 +2,17 @@
, libjpeg, netpbm}:
stdenv.mkDerivation rec {
name = "xplanet-1.2.2";
name = "xplanet-1.3.0";
src = fetchurl {
url = "mirror://sourceforge/xplanet/${name}.tar.gz";
sha256 = "1jnkrly9njkibxqbg5im4pq9cqjzwmki6jzd318dvlfmnicqr3vg";
sha256 = "0hml2v228wi2r61m1pgka7h96rl92b6apk0iigm62miyp4mp9ys4";
};
buildInputs = [ pkgconfig freetype pango libpng libtiff giflib libjpeg netpbm ];
patches = [ ./giflib.patch ];
meta = {
description = "Renders an image of the earth or other planets into the X root window";
homepage = http://xplanet.sourceforge.net;

130
pkgs/applications/science/astronomy/xplanet/giflib.patch Normal file
View File

@ -0,0 +1,130 @@
diff -wbBur xplanet-1.3.0/src/libimage/gif.c /home/sergej/tmp/BUILD/staging-i686/sergej/build/xplanet/src/xplanet-1.3.0/src/libimage/gif.c
--- xplanet-1.3.0/src/libimage/gif.c 2006-03-26 01:50:51.000000000 +0300
+++ /home/sergej/tmp/BUILD/staging-i686/sergej/build/xplanet/src/xplanet-1.3.0/src/libimage/gif.c 2013-07-30 18:21:17.412474692 +0400
@@ -20,7 +20,7 @@
#include <stdio.h>
#include <stdlib.h>
-
+#define FALSE 0
#include <gif_lib.h>
/*
@@ -42,11 +42,11 @@
int color_index;
unsigned char *ptr = NULL;
- infile = DGifOpenFileName(filename);
+ infile = DGifOpenFileName(filename, NULL);
if (infile == NULL)
{
- PrintGifError();
+ printf("%s\n", GifErrorString(GIF_ERROR));
return(0);
}
@@ -54,7 +54,7 @@
{
if (DGifGetRecordType(infile, &record_type) == GIF_ERROR)
{
- PrintGifError();
+ printf("%s\n", GifErrorString(GIF_ERROR));
return(0);
}
@@ -63,7 +63,7 @@
case IMAGE_DESC_RECORD_TYPE:
if (DGifGetImageDesc(infile) == GIF_ERROR)
{
- PrintGifError();
+ printf("%s\n", GifErrorString(GIF_ERROR));
return(0);
}
@@ -107,14 +107,14 @@
GifByteType *ext;
if (DGifGetExtension(infile, &ext_code, &ext) == GIF_ERROR)
{
- PrintGifError();
+ printf("%s\n", GifErrorString(GIF_ERROR));
return(0);
}
while (ext != NULL)
{
if (DGifGetExtensionNext(infile, &ext) == GIF_ERROR)
{
- PrintGifError();
+ printf("%s\n", GifErrorString(GIF_ERROR));
return(0);
}
}
@@ -178,7 +178,7 @@
return(0);
}
- colormap = MakeMapObject(colormap_size, NULL);
+ colormap = GifMakeMapObject(colormap_size, NULL);
for (i = 0; i < width * height; i++)
{
@@ -187,10 +187,10 @@
blue[i] = (GifByteType) rgb[3*i+2];
}
- if (QuantizeBuffer(width, height, &colormap_size, red, green, blue,
+ if (GifQuantizeBuffer(width, height, &colormap_size, red, green, blue,
buffer, colormap->Colors) == GIF_ERROR)
{
- PrintGifError();
+ printf("%s\n", GifErrorString(GIF_ERROR));
return(0);
}
@@ -198,24 +198,24 @@
free(green);
free(blue);
- outfile = EGifOpenFileName((char *) filename, FALSE);
+ outfile = EGifOpenFileName((char *) filename, FALSE, NULL);
if (outfile == NULL)
{
- PrintGifError();
+ printf("%s\n", GifErrorString(GIF_ERROR));
return(0);
}
if (EGifPutScreenDesc(outfile, width, height, colormap_size, 0, colormap)
== GIF_ERROR)
{
- PrintGifError();
+ printf("%s\n", GifErrorString(GIF_ERROR));
return(0);
}
if (EGifPutImageDesc(outfile, 0, 0, width, height, FALSE, NULL)
== GIF_ERROR)
{
- PrintGifError();
+ printf("%s\n", GifErrorString(GIF_ERROR));
return(0);
}
@@ -224,7 +224,7 @@
{
if (EGifPutLine(outfile, ptr, width) == GIF_ERROR)
{
- PrintGifError();
+ printf("%s\n", GifErrorString(GIF_ERROR));
return(0);
}
ptr += width;
@@ -233,7 +233,7 @@
EGifSpew(outfile);
if (EGifCloseFile(outfile) == GIF_ERROR)
- PrintGifError();
+ printf("%s\n", GifErrorString(GIF_ERROR));
free(buffer);

5
pkgs/applications/science/electronics/verilog/default.nix
View File

@ -1,17 +1,18 @@
{stdenv, fetchurl, gperf, flex, bison}:
stdenv.mkDerivation rec {
name = "verilog-0.9.3";
name = "verilog-0.9.7";
src = fetchurl {
url = "mirror://sourceforge/iverilog/${name}.tar.gz";
sha256 = "dd68c8ab874a93805d1e93fa76ee1e91fc0c7b20822ded3e57b6536cd8c0d1ba";
sha256 = "0m3liqw7kq24vn7k8wvi630ljz0awz23r3sd4rcklk7vgghp4pks";
};
buildInputs = [ gperf flex bison ];
meta = {
description = "Icarus Verilog compiler";
repositories.git = https://github.com/steveicarus/iverilog.git;
homepage = http://www.icarus.com;
license = "GPLv2+";
maintainers = with stdenv.lib.maintainers; [winden];

2
pkgs/applications/version-management/git-and-tools/default.nix
View File

@ -83,7 +83,7 @@ rec {
};
svn2git = import ./svn2git {
inherit stdenv fetchgit ruby makeWrapper;
inherit stdenv fetchurl ruby makeWrapper;
git = gitSVN;
};

6
pkgs/applications/version-management/git-and-tools/git/default.nix
View File

@ -10,7 +10,7 @@
let
version = "1.8.4.3";
version = "1.8.5.1";
svn = subversionClient.override { perlBindings = true; };
@ -21,7 +21,7 @@ stdenv.mkDerivation {
src = fetchurl {
url = "http://git-core.googlecode.com/files/git-${version}.tar.gz";
sha256 = "08fbdxh2cjd4hffm0nydwysh5zh6nrssbi9x01yy0n2y8rqzly0a";
sha256 = "0i7fz0b79f3algs68m15wg4bq99ayg1crpy66cqylxq3mzbw8n8m";
};
patches = [ ./docbook2texi.patch ./symlinks-in-bin.patch ];
@ -141,6 +141,6 @@ stdenv.mkDerivation {
'';
platforms = stdenv.lib.platforms.all;
maintainers = [ stdenv.lib.maintainers.simons ];
maintainers = with stdenv.lib.maintainers; [ simons the-kenny ];
};
}

6
pkgs/applications/version-management/git-and-tools/stgit/default.nix
View File

@ -1,14 +1,14 @@
{ stdenv, fetchurl, python, git }:
let
name = "stgit-0.15";
name = "stgit-0.16";
in
stdenv.mkDerivation {
inherit name;
src = fetchurl {
url = "http://download.gna.org/stgit/${name}.tar.gz";
sha256 = "0kgq9x0i7riwcl1lmmm40z0jiz5agr1kqxm2byv1qsf0q1ny47v9";
sha256 = "0hla6401g2kicaakz4awk67yf8fhqbw1shn1p9ma5x6ca29s3w82";
};
buildInputs = [ python git ];
@ -28,7 +28,7 @@ stdenv.mkDerivation {
description = "StGit is a patch manager implemented on top of Git";
license = "GPL";
maintainers = [ stdenv.lib.maintainers.simons ];
maintainers = with stdenv.lib.maintainers; [ simons the-kenny ];
platforms = stdenv.lib.platforms.unix;
};
}

24
pkgs/applications/version-management/git-and-tools/svn2git/default.nix
View File

@ -1,12 +1,14 @@
{ stdenv, fetchgit, ruby, makeWrapper, git }:
{ stdenv, fetchurl, ruby, makeWrapper, git }:
stdenv.mkDerivation rec {
name = "svn2git-2.1.0-20111206";
let
version = "2.2.2";
in
stdenv.mkDerivation {
name = "svn2git-${version}";
src = fetchgit {
url = https://github.com/nirvdrum/svn2git;
rev = "5cd8d4b509affb66eb2dad50d7298c52b3b0d848";
sha256 = "26aa17f68f605e958b623d803b4bd405e12d6c5d51056635873a2c59e4c7b9ca";
src = fetchurl {
url = "https://github.com/nirvdrum/svn2git/archive/v${version}.tar.gz";
sha256 = "14zinkpgybz15jvbfw0sb432w6f5w4sa5pdqycjwva8v8lxqn9mh";
};
buildInputs = [ ruby makeWrapper ];
@ -27,4 +29,12 @@ stdenv.mkDerivation rec {
--set RUBYLIB $out/lib \
--prefix PATH : ${git}/bin
'';
meta = {
homepage = https://github.com/nirvdrum/svn2git;
description = "Ruby tool for importing existing svn projects into git";
license = stdenv.lib.licenses.mit;
maintainers = [ stdenv.lib.maintainers.the-kenny ];
};
}

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

@ -2,7 +2,7 @@
, guiSupport ? false, tk ? null, curses }:
let
name = "mercurial-2.6.1";
name = "mercurial-2.8.1";
in
stdenv.mkDerivation {
@ -10,7 +10,7 @@ stdenv.mkDerivation {
src = fetchurl {
url = "http://mercurial.selenic.com/release/${name}.tar.gz";
sha256 = "0r4fg269xnqgacc82ppm3wxl9wwvvgwz8z6zi1iai4gx76iklhdn";
sha256 = "0riksf6p07yxfq1xlraqhl8cacsgb1gg7si185mlbdknrh2a4ffj";
};
inherit python; # pass it so that the same version can be used in hg2git

7
pkgs/applications/video/vlc/default.nix
View File

@ -1,6 +1,6 @@
{ stdenv, fetchurl, xz, bzip2, perl, xlibs, libdvdnav, libbluray
, zlib, a52dec, libmad, faad2, ffmpeg, alsaLib
, pkgconfig, dbus, fribidi, qt4, freefont_ttf
, pkgconfig, dbus, fribidi, qt4, freefont_ttf, libebml, libmatroska
, libvorbis, libtheora, speex, lua5, libgcrypt, libupnp
, libcaca, pulseaudio, flac, schroedinger, libxml2, librsvg
, mpeg2dec, udev, gnutls, avahi, libcddb, jackaudio, SDL, SDL_image
@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
udev gnutls avahi libcddb jackaudio SDL SDL_image libmtp unzip taglib
libkate libtiger libv4l samba liboggz libass libdvbpsi libva
xlibs.xlibs xlibs.libXv xlibs.libXvMC xlibs.libXpm xlibs.xcbutilkeysyms
libdc1394 libraw1394 libopus
libdc1394 libraw1394 libopus libebml libmatroska
];
nativeBuildInputs = [ pkgconfig ];
@ -45,8 +45,9 @@ stdenv.mkDerivation rec {
${freefont_ttf}/share/fonts/truetype/FreeSerifBold.ttf
'';
meta = {
meta = with stdenv.lib; {
description = "Cross-platform media player and streaming server";
homepage = http://www.videolan.org/vlc/;
platforms = platforms.linux;
};
}

29
pkgs/desktops/cinnamon/cinnamon-translations.nix Normal file
View File

@ -0,0 +1,29 @@
{ stdenv, fetchurl}:
stdenv.mkDerivation rec {
name = "cinnamon-translations";
version="2.0.3";
src = fetchurl {
url = "http://github.com/linuxmint/cinnamon-translations/archive/${version}.tar.gz";
sha256 = "07w3v118xrfp8r4dkbdiyd1vr9ah7f3bm2zw9wag9s8l8x0zfxgc";
};
installPhase =
''
mkdir -pv $out/usr/share/cinnamon/locale
cp -av mo-export/* $out/usr/share/cinnamon/locale/
'';
meta = {
homepage = "http://cinnamon.linuxmint.com";
description = "Translations files for the Cinnamon desktop" ;
platforms = stdenv.lib.platforms.linux;
maintainers = [ stdenv.lib.maintainers.roelof ];
};
}

23
pkgs/desktops/gnome-3/core/gnome-menus/default.nix Normal file
View File

@ -0,0 +1,23 @@
{ stdenv, fetchurl, intltool, pkgconfig, glib }:
let
version = "3.10.1";
in
stdenv.mkDerivation {
name = "gnome-menus-${version}";
src = fetchurl {
url = "http://ftp.gnome.org/pub/gnome/sources/gnome-menus/3.10/gnome-menus-3.10.1.tar.xz";
sha256 = "0wcacs1vk3pld8wvrwq7fdrm11i56nrajkrp6j1da6jc4yx0m5a6";
};
preBuild = "patchShebangs ./scripts";
buildInputs=[ intltool pkgconfig glib ];
meta = {
homepage = "http://www.gnome.org";
description = "Gnome menu specification";
platforms = stdenv.lib.platforms.linux;
};
}

2
pkgs/desktops/gnome-3/default.nix
View File

@ -24,6 +24,8 @@ rec {
gnome_icon_theme = callPackage ./core/gnome-icon-theme { };
gnome-menus = callPackage ./core/gnome-menus { };
gnome_keyring = callPackage ./core/gnome-keyring { };
libgnome_keyring = callPackage ./core/libgnome-keyring { };

70
pkgs/desktops/kde-4.10/kdenetwork/kopete-giflib5.patch Normal file
View File

@ -0,0 +1,70 @@
Index: b/kopete/protocols/wlm/wlmchatsession.cpp
===================================================================
--- a/kopete/protocols/wlm/wlmchatsession.cpp
+++ b/kopete/protocols/wlm/wlmchatsession.cpp
@@ -63,10 +63,14 @@
#include "wlmprotocol.h"
#include "wlmaccount.h"
#include "wlmchatsessioninkaction.h"
#ifdef HAVE_GIFLIB
#include <gif_lib.h>
+/* old giflib has no GIFLIB_MAJOR, define to avoid cpp warnings */
+#ifndef GIFLIB_MAJOR
+#define GIFLIB_MAJOR 4
+#endif
#endif
WlmChatSession::WlmChatSession (Kopete::Protocol * protocol,
const Kopete::Contact * user,
Kopete::ContactPtrList others,
@@ -465,15 +469,19 @@ WlmChatSession::slotInviteContact (Kopet
static void
printGifErrorMessage()
{
#ifdef HAVE_GIFLIB
#ifdef HAVE_GIF_ERROR_STRING // giflib 4.2.0+
+#if GIFLIB_MAJOR >= 5
+ fprintf(stderr, "GIF-LIB error (exact reporting not implemented)\n");
+#else
const char * errorString = GifErrorString();
if (errorString)
fprintf(stderr, "GIF-LIB error: %s\n", errorString);
else
fprintf(stderr, "GIF-LIB undefined error: %d\n", GifError());
+#endif
#else // older giflib versions, libungif
PrintGifError();
#endif // HAVE_GIF_ERROR_STRING
#endif // HAVE_GIFLIB
}
@@ -481,10 +489,14 @@ printGifErrorMessage()
/* stolen from kpaint write_to_gif() */
void
WlmChatSession::convertToGif( const QPixmap & ink, QString filename)
{
#ifdef HAVE_GIFLIB
+#if GIFLIB_MAJOR >= 5
+#define FreeMapObject GifFreeMapObject
+#define MakeMapObject GifMakeMapObject
+#endif
int i, status;
GifFileType *GifFile;
ColorMapObject *screenColourmap;
ColorMapObject *imageColourmap;
QImage img = ink.toImage().convertToFormat(QImage::Format_Indexed8);
@@ -523,11 +535,15 @@ WlmChatSession::convertToGif( const QPix
screenColourmap->Colors[i].Green= 0;
screenColourmap->Colors[i].Blue= 0;
}
}
+#if GIFLIB_MAJOR >= 5
+ GifFile= EGifOpenFileName(QFile::encodeName(filename).constData(), 0, NULL);
+#else
GifFile= EGifOpenFileName(QFile::encodeName(filename).constData(), 0);
+#endif
if (!GifFile) {
FreeMapObject(imageColourmap);
FreeMapObject(screenColourmap);
return;
}

1
pkgs/desktops/kde-4.10/kdenetwork/kopete.nix
View File

@ -20,6 +20,7 @@ kde {
cp -v ${./FindmsiLBC.cmake} kopete/cmake/modules/FindmsiLBC.cmake
patch -p1 < ${./kopete-4.10.4-kopete-linphonemediaengine.patch}
patch -p1 < ${./kopete-4.10.4-kopete-stun.patch}
patch -p1 < ${./kopete-giflib5.patch}
'';
cmakeFlags = [ "-DBUILD_skypebuttons=TRUE" ];

134
pkgs/development/compilers/jdk/jdk7-linux.nix Normal file
View File

@ -0,0 +1,134 @@
{ swingSupport ? true
, stdenv
, requireFile
, unzip
, xlibs ? null
, installjdk ? true
, pluginSupport ? true
, installjce ? false
}:
assert stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux";
assert swingSupport -> xlibs != null;
let
/**
* The JRE libraries are in directories that depend on the CPU.
*/
architecture =
if stdenv.system == "i686-linux" then
"i386"
else if stdenv.system == "x86_64-linux" then
"amd64"
else
abort "jdk requires i686-linux or x86_64 linux";
jce =
if installjce then
requireFile {
name = "UnlimitedJCEPolicyJDK7.zip";
url = http://www.oracle.com/technetwork/java/javase/downloads/jce-7-download-432124.html;
sha256 = "0qljzfxbikm8br5k7rkamibp1vkyjrf6blbxpx6hn4k46f62bhnh";
}
else
null;
in
stdenv.mkDerivation {
name =
if installjdk then "jdk-1.7.0_45" else "jre-1.7.0_45";
src =
if stdenv.system == "i686-linux" then
requireFile {
name = "jdk-7u45-linux-i586.tar.gz";
url = http://www.oracle.com/technetwork/java/javase/downloads/jdk7-downloads-1880260.html;
sha256 = "1q0nw2rwmavcrssyigq76p1h00hm8kd3rhb5bdv7rbdcs0jxrjsa";
}
else if stdenv.system == "x86_64-linux" then
requireFile {
name = "jdk-7u45-linux-x64.tar.gz";
url = http://www.oracle.com/technetwork/java/javase/downloads/jdk7-downloads-1880260.html;
sha256 = "06jbz536zycqkdpc7zriay0jidmj9nriqva60afsgpv93kcf9spj";
}
else
abort "jdk requires i686-linux or x86_64 linux";
buildInputs = if installjce then [ unzip ] else [];
installPhase = ''
cd ..
if test -z "$installjdk"; then
mv $sourceRoot/jre $out
else
mv $sourceRoot $out
fi
for file in $out/*
do
if test -f $file ; then
rm $file
fi
done
if test -n "$installjdk"; then
for file in $out/jre/*
do
if test -f $file ; then
rm $file
fi
done
fi
# construct the rpath
rpath=
for i in $libraries; do
rpath=$rpath''${rpath:+:}$i/lib
done
if test -z "$installjdk"; then
jrePath=$out
else
jrePath=$out/jre
fi
if test -n "$jce"; then
unzip $jce
cp -v jce/*.jar $jrePath/lib/security
fi
rpath=$rpath''${rpath:+:}$jrePath/lib/${architecture}/jli
# set all the dynamic linkers
find $out -type f -perm +100 \
-exec patchelf --interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" \
--set-rpath "$rpath" {} \;
find $out -name "*.so" -exec patchelf --set-rpath "$rpath" {} \;
if test -z "$pluginSupport"; then
rm -f $out/bin/javaws
if test -n "$installjdk"; then
rm -f $out/jre/bin/javaws
fi
fi
mkdir $jrePath/lib/${architecture}/plugins
ln -s $jrePath/lib/${architecture}/libnpjp2.so $jrePath/lib/${architecture}/plugins
'';
inherit installjdk pluginSupport;
/**
* libXt is only needed on amd64
*/
libraries =
[stdenv.gcc.libc] ++
(if swingSupport then [xlibs.libX11 xlibs.libXext xlibs.libXtst xlibs.libXi xlibs.libXp xlibs.libXt] else []);
passthru.mozillaPlugin = if installjdk then "/jre/lib/${architecture}/plugins" else "/lib/${architecture}/plugins";
meta.license = "unfree";
}

4
pkgs/development/libraries/apr-util/default.nix
View File

@ -9,11 +9,11 @@ assert bdbSupport -> db4 != null;
assert ldapSupport -> openldap != null;
stdenv.mkDerivation rec {
name = "apr-util-1.5.2";
name = "apr-util-1.5.3";
src = fetchurl {
url = "mirror://apache/apr/${name}.tar.bz2";
md5 = "89c1348aa79e898d7c34a6206311c9c2";
sha256 = "0s1rpqjy5xr03k9s4xrsm5wvhj5286vlkf6jvqayw99yy5sb3vbq";
};
configureFlags = ''

9
pkgs/development/libraries/aspell/dictionaries.nix
View File

@ -140,6 +140,15 @@ in {
};
};
pt = buildDict {
shortName = "pt-0.50-1";
fullName = "Portuguese";
src = fetchurl {
url = mirror://gnu/aspell/dict/pt/aspell-pt-0.50-1.tar.bz2;
sha256 = "07xzlnxxzadqsapng29p2gdwj0bijv10wpjnqlwzmkxnx6fxzkcy";
};
};
ru = buildDict {
shortName = "ru-0.99f7-1";
fullName = "Russian";

1
pkgs/development/libraries/aterm/2.8.nix
View File

@ -31,5 +31,6 @@ stdenv.mkDerivation {
description = "Library for manipulation of term data structures in C";
platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin;
maintainers = stdenv.lib.maintainers.eelco;
broken = true;
};
}

7
pkgs/development/libraries/avahi/default.nix
View File

@ -37,6 +37,13 @@ stdenv.mkDerivation rec {
avahi-core/socket.c
'';
postInstall = ''
# Maintain compat for mdnsresponder and howl
${if withLibdnssdCompat then "ln -s avahi-compat-libdns_sd/dns_sd.h $out/include/dns_sd.h" else ""}
ln -s avahi-compat-howl $out/include/howl
ln -s avahi-compat-howl.pc $out/lib/pkgconfig/howl.pc
'';
meta = with stdenv.lib; {
description = "mDNS/DNS-SD implementation";
homepage = http://avahi.org;

4
pkgs/development/libraries/faac/default.nix
View File

@ -13,6 +13,8 @@ stdenv.mkDerivation rec {
meta = {
description = "Open source MPEG-4 and MPEG-2 AAC encoder";
homepage = http://www.audiocoding.com/faac.html;
license = "LGPL";
# Incompatible with GPL. Some changes to the base code, included in faac,
# are under LGPL though.
license = "unfree";
};
}

77
pkgs/development/libraries/ffmpeg/0.6.nix Normal file
View File

@ -0,0 +1,77 @@
{ stdenv, fetchurl, pkgconfig, yasm
, mp3Support ? true, lame ? null
, speexSupport ? true, speex ? null
, theoraSupport ? true, libtheora ? null
, vorbisSupport ? true, libvorbis ? null
, vpxSupport ? false, libvpx ? null
, x264Support ? true, x264 ? null
, xvidSupport ? true, xvidcore ? null
, vdpauSupport ? true, libvdpau ? null
, faacSupport ? false, faac ? null
}:
assert speexSupport -> speex != null;
assert theoraSupport -> libtheora != null;
assert vorbisSupport -> libvorbis != null;
assert vpxSupport -> libvpx != null;
assert x264Support -> x264 != null;
assert xvidSupport -> xvidcore != null;
assert vdpauSupport -> libvdpau != null;
assert faacSupport -> faac != null;
stdenv.mkDerivation rec {
name = "ffmpeg-0.6.7";
src = fetchurl {
url = "http://www.ffmpeg.org/releases/${name}.tar.bz2";
sha256 = "13l78gv2qhyw05bl9s6wkmykzsn4p04bb69a849a5c4hiffwz837";
};
# `--enable-gpl' (as well as the `postproc' and `swscale') mean that
# the resulting library is GPL'ed, so it can only be used in GPL'ed
# applications.
configureFlags = [
"--enable-gpl"
"--enable-postproc"
"--enable-swscale"
"--disable-ffserver"
"--disable-ffplay"
"--enable-shared"
"--enable-runtime-cpudetect"
]
++ stdenv.lib.optional mp3Support "--enable-libmp3lame"
++ stdenv.lib.optional speexSupport "--enable-libspeex"
++ stdenv.lib.optional theoraSupport "--enable-libtheora"
++ stdenv.lib.optional vorbisSupport "--enable-libvorbis"
++ stdenv.lib.optional vpxSupport "--enable-libvpx"
++ stdenv.lib.optional x264Support "--enable-libx264"
++ stdenv.lib.optional xvidSupport "--enable-libxvid"
++ stdenv.lib.optional vdpauSupport "--enable-vdpau"
++ stdenv.lib.optional faacSupport "--enable-libfaac --enable-nonfree";
buildInputs = [ pkgconfig lame yasm ]
++ stdenv.lib.optional mp3Support lame
++ stdenv.lib.optional speexSupport speex
++ stdenv.lib.optional theoraSupport libtheora
++ stdenv.lib.optional vorbisSupport libvorbis
++ stdenv.lib.optional vpxSupport libvpx
++ stdenv.lib.optional x264Support x264
++ stdenv.lib.optional xvidSupport xvidcore
++ stdenv.lib.optional vdpauSupport libvdpau
++ stdenv.lib.optional faacSupport faac;
crossAttrs = {
dontSetConfigureCross = true;
configureFlags = configureFlags ++ [
"--cross-prefix=${stdenv.cross.config}-"
"--enable-cross-compile"
"--target_os=linux"
"--arch=${stdenv.cross.arch}"
];
};
meta = {
homepage = http://www.ffmpeg.org/;
description = "A complete, cross-platform solution to record, convert and stream audio and video";
};
}

104
pkgs/development/libraries/ffmpeg/2.x.nix Normal file
View File

@ -0,0 +1,104 @@
{ stdenv, fetchurl, pkgconfig, yasm, zlib, bzip2, alsaLib, texinfo, perl
, mp3Support ? true, lame ? null
, speexSupport ? true, speex ? null
, theoraSupport ? true, libtheora ? null
, vorbisSupport ? true, libvorbis ? null
, vpxSupport ? false, libvpx ? null
, x264Support ? true, x264 ? null
, xvidSupport ? true, xvidcore ? null
, opusSupport ? true, libopus ? null
, vdpauSupport ? true, libvdpau ? null
, vaapiSupport ? true, libva ? null
, faacSupport ? false, faac ? null
, dc1394Support ? false, libdc1394 ? null
, x11grabSupport ? false, libXext ? null, libXfixes ? null
, playSupport ? true, SDL ? null
, freetypeSupport ? true, freetype ? null, fontconfig ? null
}:
assert speexSupport -> speex != null;
assert theoraSupport -> libtheora != null;
assert vorbisSupport -> libvorbis != null;
assert vpxSupport -> libvpx != null;
assert x264Support -> x264 != null;
assert xvidSupport -> xvidcore != null;
assert opusSupport -> libopus != null;
assert vdpauSupport -> libvdpau != null;
assert vaapiSupport -> libva != null;
assert faacSupport -> faac != null;
assert x11grabSupport -> libXext != null && libXfixes != null;
assert playSupport -> SDL != null;
assert freetypeSupport -> freetype != null;
stdenv.mkDerivation rec {
name = "ffmpeg-2.1.1";
src = fetchurl {
url = "http://www.ffmpeg.org/releases/${name}.tar.bz2";
sha256 = "1qnspbpwa6cflsb6mkm84ay4nfx60ism6d7lgvnasidck9dmxydy";
};
# `--enable-gpl' (as well as the `postproc' and `swscale') mean that
# the resulting library is GPL'ed, so it can only be used in GPL'ed
# applications.
configureFlags = [
"--enable-gpl"
"--enable-postproc"
"--enable-swscale"
"--enable-shared"
"--enable-avresample"
"--enable-runtime-cpudetect"
]
++ stdenv.lib.optional mp3Support "--enable-libmp3lame"
++ stdenv.lib.optional speexSupport "--enable-libspeex"
++ stdenv.lib.optional theoraSupport "--enable-libtheora"
++ stdenv.lib.optional vorbisSupport "--enable-libvorbis"
++ stdenv.lib.optional vpxSupport "--enable-libvpx"
++ stdenv.lib.optional x264Support "--enable-libx264"
++ stdenv.lib.optional xvidSupport "--enable-libxvid"
++ stdenv.lib.optional opusSupport "--enable-libopus"
++ stdenv.lib.optional vdpauSupport "--enable-vdpau"
++ stdenv.lib.optional faacSupport "--enable-libfaac --enable-nonfree"
++ stdenv.lib.optional dc1394Support "--enable-libdc1394"
++ stdenv.lib.optional x11grabSupport "--enable-x11grab"
++ stdenv.lib.optional playSupport "--enable-ffplay"
++ stdenv.lib.optional freetypeSupport "--enable-libfreetype --enable-fontconfig";
buildInputs = [ pkgconfig lame yasm zlib bzip2 alsaLib texinfo perl ]
++ stdenv.lib.optional mp3Support lame
++ stdenv.lib.optional speexSupport speex
++ stdenv.lib.optional theoraSupport libtheora
++ stdenv.lib.optional vorbisSupport libvorbis
++ stdenv.lib.optional vpxSupport libvpx
++ stdenv.lib.optional x264Support x264
++ stdenv.lib.optional xvidSupport xvidcore
++ stdenv.lib.optional opusSupport libopus
++ stdenv.lib.optional vdpauSupport libvdpau
++ stdenv.lib.optional vaapiSupport libva
++ stdenv.lib.optional faacSupport faac
++ stdenv.lib.optional dc1394Support libdc1394
++ stdenv.lib.optionals x11grabSupport [ libXext libXfixes ]
++ stdenv.lib.optional playSupport SDL
++ stdenv.lib.optionals freetypeSupport [ freetype fontconfig ];
enableParallelBuilding = true;
crossAttrs = {
dontSetConfigureCross = true;
configureFlags = configureFlags ++ [
"--cross-prefix=${stdenv.cross.config}-"
"--enable-cross-compile"
"--target_os=linux"
"--arch=${stdenv.cross.arch}"
];
};
passthru = {
inherit vdpauSupport;
};
meta = {
homepage = http://www.ffmpeg.org/;
description = "A complete, cross-platform solution to record, convert and stream audio and video";
};
}

10
pkgs/development/libraries/giflib/4.1.nix Normal file
View File

@ -0,0 +1,10 @@
{stdenv, fetchurl}:
stdenv.mkDerivation {
name = "giflib-4.1.6";
src = fetchurl {
url = mirror://sourceforge/giflib/giflib-4.1.6.tar.bz2;
sha256 = "1v9b7ywz7qg8hli0s9vv1b8q9xxb2xvqq2mg1zpr73xwqpcwxhg1";
};
}

6
pkgs/development/libraries/giflib/default.nix
View File

@ -1,10 +1,10 @@
{stdenv, fetchurl, xmlto, docbook_xml_dtd_412, docbook_xsl, libxml2 }:
stdenv.mkDerivation {
name = "giflib-4.2.3";
name = "giflib-5.0.5";
src = fetchurl {
url = mirror://sourceforge/giflib/giflib-4.2.3.tar.bz2;
sha256 = "0rmp7ipzk42r841bggd7bfqk4p8qsssbp4wcck4qnz7p4rkxbj0a";
url = mirror://sourceforge/giflib/giflib-5.0.5.tar.bz2;
sha256 = "02c6pwll9pzw5fhg5gccx2ws56d70ylfryk21nv5lqhwdcv8lvb0";
};
buildInputs = [ xmlto docbook_xml_dtd_412 docbook_xsl libxml2 ];

1
pkgs/development/libraries/haskell/haskell-src/1.0.1.5.nix
View File

@ -6,6 +6,7 @@ cabal.mkDerivation (self: {
sha256 = "1ay3i2sbrp0pzg6fagg8gqrwq5lcnm5jb5sr11frbk274a82cdwz";
buildDepends = [ syb ];
buildTools = [ happy ];
preConfigure = "runhaskell Setup.hs clean";
meta = {
description = "Support for manipulating Haskell source code";
license = self.stdenv.lib.licenses.bsd3;

3
pkgs/development/libraries/libgdiplus/default.nix
View File

@ -10,11 +10,14 @@ stdenv.mkDerivation rec {
sha256 = "0klnbly2q0yx5p0l5z8da9lhqsjj9xqj06kdw2v7rnms4z1vdpkd";
};
NIX_LDFLAGS = "-lgif";
patches =
[ (fetchurl {
url = "https://raw.github.com/MagicGroup/MagicSpecLib/master/libgdiplus/libgdiplus-2.10.1-libpng15.patch";
sha256 = "130r0jm065pjvbz5dkx96w37vj1wqc8fakmi2znribs14g0bl65f";
})
./giflib.patch
];
patchFlags = "-p0";

117
pkgs/development/libraries/libgdiplus/giflib.patch Normal file
View File

@ -0,0 +1,117 @@
diff --git a/src/gifcodec.c b/src/gifcodec.c
index 8dee0eb..564beed 100644
--- src/gifcodec.c
+++ src/gifcodec.c
@@ -39,8 +39,10 @@ GUID gdip_gif_image_format_guid = {0xb96b3cb0U, 0x0728U, 0x11d3U, {0x9d, 0x7b, 0
#include "gifcodec.h"
+#if GIFLIB_MAJOR < 5
/* giflib declares this incorrectly as EgifOpen */
extern GifFileType *EGifOpen(void *userData, OutputFunc writeFunc);
+#endif
/* Data structure used for callback */
typedef struct
@@ -105,7 +107,7 @@ gdip_gif_inputfunc (GifFileType *gif, GifByteType *data, int len)
*/
static int
-AddExtensionBlockMono(SavedImage *New, int Len, BYTE ExtData[])
+AddExtensionBlockMono(SavedImage *New, int Len, int func, BYTE ExtData[])
{
ExtensionBlock *ep;
@@ -129,7 +131,7 @@ AddExtensionBlockMono(SavedImage *New, int Len, BYTE ExtData[])
if (ExtData) {
memcpy(ep->Bytes, ExtData, Len);
- ep->Function = New->Function;
+ ep->Function = func;
}
return (GIF_OK);
@@ -232,20 +234,20 @@ DGifSlurpMono(GifFileType * GifFile, SavedImage *TrailingExtensions)
}
case EXTENSION_RECORD_TYPE: {
- if (DGifGetExtension(GifFile, &temp_save.Function, &ExtData) == GIF_ERROR) {
+ int func;
+ if (DGifGetExtension(GifFile, &func, &ExtData) == GIF_ERROR) {
return (GIF_ERROR);
}
while (ExtData != NULL) {
/* Create an extension block with our data */
- if (AddExtensionBlockMono(&temp_save, ExtData[0], &ExtData[1]) == GIF_ERROR) {
+ if (AddExtensionBlockMono(&temp_save, func, ExtData[0], &ExtData[1]) == GIF_ERROR) {
return (GIF_ERROR);
}
if (DGifGetExtensionNext(GifFile, &ExtData) == GIF_ERROR) {
return (GIF_ERROR);
}
- temp_save.Function = 0;
}
break;
}
@@ -303,12 +305,19 @@ gdip_load_gif_image (void *stream, GpImage **image, BOOL from_file)
result = NULL;
loop_counter = FALSE;
+#if GIFLIB_MAJOR < 5
if (from_file) {
gif = DGifOpen(stream, &gdip_gif_fileinputfunc);
} else {
gif = DGifOpen (stream, &gdip_gif_inputfunc);
}
-
+#else
+ if (from_file)
+ gif = DGifOpen(stream, &gdip_gif_fileinputfunc, NULL);
+ else
+ gif = DGifOpen(stream, &gdip_gif_inputfunc, NULL);
+#endif
+
if (gif == NULL) {
goto error;
}
@@ -660,11 +669,22 @@ gdip_save_gif_image (void *stream, GpImage *image, BOOL from_file)
return InvalidParameter;
}
+#if GIFLIB_MAJOR < 5
if (from_file) {
fp = EGifOpenFileName (stream, 0);
} else {
fp = EGifOpen (stream, gdip_gif_outputfunc);
}
+#else
+ if (from_file)
+ fp = EGifOpenFileName (stream, 0, NULL);
+ else
+ fp = EGifOpen (stream, gdip_gif_outputfunc, NULL);
+#define MakeMapObject GifMakeMapObject
+#define FreeMapObject GifFreeMapObject
+#define QuantizeBuffer GifQuantizeBuffer
+#define BitSize GifBitSize
+#endif
if (!fp) {
return FileNotFound;
@@ -848,8 +868,15 @@ gdip_save_gif_image (void *stream, GpImage *image, BOOL from_file)
Buffer[0] = 1;
Buffer[1] = ptr[0];
Buffer[2] = ptr[1];
+#if GIFLIB_MAJOR < 5
EGifPutExtensionFirst(fp, APPLICATION_EXT_FUNC_CODE, 11, "NETSCAPE2.0");
EGifPutExtensionLast(fp, APPLICATION_EXT_FUNC_CODE, 3, Buffer);
+#else
+ EGifPutExtensionLeader(fp, APPLICATION_EXT_FUNC_CODE);
+ EGifPutExtensionBlock(fp, 11, "NETSCAPE2.0");
+ EGifPutExtensionBlock(fp, 3, Buffer);
+ EGifPutExtensionTrailer(fp);
+#endif
}
}

11
pkgs/development/libraries/libopus/default.nix
View File

@ -1,15 +1,20 @@
{ stdenv, fetchurl, fixedPoint ? false }:
let
version = "1.1";
in
stdenv.mkDerivation rec {
name = "libopus-1.0.2";
name = "libopus-${version}";
src = fetchurl {
url = "http://downloads.xiph.org/releases/opus/opus-1.0.2.tar.gz";
sha256 = "12npbkrcwvh3fl9l18cwrxwg269cg2j6j7876cc9q0axxvdmwqfs";
url = "http://downloads.xiph.org/releases/opus/opus-${version}.tar.gz";
sha256 = "158xprn2086arvdib3vbbygz7z6jqkw2nci7nlywzzwallap0wmr";
};
configureFlags = stdenv.lib.optionalString fixedPoint "--enable-fixed-point";
doCheck = true;
meta = {
description = "Open, royalty-free, highly versatile audio codec";
license = "BSD";

7
pkgs/development/libraries/ntrack/default.nix
View File

@ -18,7 +18,12 @@ stdenv.mkDerivation rec {
configureFlags = "--without-gobject CFLAGS=--std=gnu99";
patchPhase = ''sed -e "s@/usr\(/lib/ntrack/modules/\)@$out&@" -i common/ntrack.c'';
# Remove this patch after version 016
patches = [ ./libnl-fix.patch ];
postPatch = ''
sed -e "s@/usr\(/lib/ntrack/modules/\)@$out&@" -i common/ntrack.c
'';
meta = {
description = "Network Connectivity Tracking library for Desktop Applications";

11
pkgs/development/libraries/ntrack/libnl-fix.patch Normal file
View File

@ -0,0 +1,11 @@
--- ./modules/ntrack-libnl.c.orig 2013-12-02 11:31:54.749215448 -0600
+++ ./modules/ntrack-libnl.c 2013-12-02 11:34:46.597684553 -0600
@@ -530,7 +530,7 @@
op_default_route_disappeared ((struct _ntrack_monitor_arch*) self, nl_info);
} else if (nl_info->topmost_route && topmost_route) {
int diff_bits;
- if ((diff_bits = (route_obj_ops.oo_id_attrs | ROUTE_ATTR_OIF
+ if ((diff_bits = (nl_object_get_id_attrs(OBJ_CAST(topmost_route)) | ROUTE_ATTR_OIF
| ROUTE_ATTR_GATEWAY) &
nl_object_diff (OBJ_CAST (nl_info->topmost_route),
OBJ_CAST (topmost_route)))) {

27
pkgs/development/ocaml-modules/ocamlsdl/default.nix Normal file
View File

@ -0,0 +1,27 @@
{stdenv, fetchurl, ocaml, pkgconfig, findlib, SDL, SDL_image, SDL_mixer, SDL_ttf, SDL_gfx, lablgl }:
let
ocaml_version = (builtins.parseDrvName ocaml.name).version;
pname = "ocamlsdl";
version = "0.9.1";
in
stdenv.mkDerivation {
name = "${pname}-${version}";
src = fetchurl {
url = "http://downloads.sourceforge.net/project/ocamlsdl/OCamlSDL/ocamlsdl-0.9.1/ocamlsdl-0.9.1.tar.gz";
sha256 = "abfb295b263dc11e97fffdd88ea1a28b46df8cc2b196777093e4fe7f509e4f8f";
};
buildInputs = [ocaml pkgconfig findlib SDL SDL_image SDL_mixer SDL_ttf SDL_gfx lablgl];
propagatedBuildInputs = [ SDL SDL_image SDL_mixer SDL_ttf SDL_gfx pkgconfig ];
createFindlibDestdir = true;
meta = {
homepage = http://ocamlsdl.sourceforge.net/;
description = "OCaml bindings for SDL 1.2";
license = "LGPL 2.1";
};
}

0
pkgs/development/tools/build-managers/gnumake-3.80/default.nix → pkgs/development/tools/build-managers/gnumake/3.80/default.nix
View File

0
pkgs/development/tools/build-managers/gnumake-3.80/log.patch → pkgs/development/tools/build-managers/gnumake/3.80/log.patch
View File

0
pkgs/development/tools/build-managers/gnumake/3.81.nix → pkgs/development/tools/build-managers/gnumake/3.81/default.nix
View File

0
pkgs/development/tools/build-managers/gnumake/impure-dirs.patch → pkgs/development/tools/build-managers/gnumake/3.81/impure-dirs.patch
View File

0
pkgs/development/tools/build-managers/gnumake/log-3.81.patch → pkgs/development/tools/build-managers/gnumake/3.81/log-3.81.patch
View File

0
pkgs/development/tools/build-managers/gnumake/MAKEFLAGS-reexec.patch → pkgs/development/tools/build-managers/gnumake/3.82/MAKEFLAGS-reexec.patch
View File

0
pkgs/development/tools/build-managers/gnumake/archives-many-objs.patch → pkgs/development/tools/build-managers/gnumake/3.82/archives-many-objs.patch
View File

0
pkgs/development/tools/build-managers/gnumake/construct-command-line.patch → pkgs/development/tools/build-managers/gnumake/3.82/construct-command-line.patch
View File

0
pkgs/development/tools/build-managers/gnumake/copy-on-expand.patch → pkgs/development/tools/build-managers/gnumake/3.82/copy-on-expand.patch
View File

0
pkgs/development/tools/build-managers/gnumake/darwin-library_search-dylib.patch → pkgs/development/tools/build-managers/gnumake/3.82/darwin-library_search-dylib.patch
View File

0
pkgs/development/tools/build-managers/gnumake/default.nix → pkgs/development/tools/build-managers/gnumake/3.82/default.nix
View File

0
pkgs/development/tools/build-managers/gnumake/glob-speedup.patch → pkgs/development/tools/build-managers/gnumake/3.82/glob-speedup.patch
View File

34
pkgs/development/tools/build-managers/gnumake/3.82/impure-dirs.patch Normal file
View File

@ -0,0 +1,34 @@
diff -rc read.c read.c
*** read.c 2006-03-17 15:24:20.000000000 +0100
--- read.c 2007-05-24 17:16:31.000000000 +0200
***************
*** 99,107 ****
--- 99,109 ----
#endif
INCLUDEDIR,
#ifndef _AMIGA
+ #if 0
"/usr/gnu/include",
"/usr/local/include",
"/usr/include",
+ #endif
#endif
0
};
diff -rc reremake.c
*** remake.c 2006-03-20 03:36:37.000000000 +0100
--- remake.c 2007-05-24 17:06:54.000000000 +0200
***************
*** 1452,1460 ****
--- 1452,1462 ----
static char *dirs[] =
{
#ifndef _AMIGA
+ #if 0
"/lib",
"/usr/lib",
#endif
+ #endif
#if defined(WINDOWS32) && !defined(LIBDIR)
/*
* This is completely up to the user at product install time. Just define

0
pkgs/development/tools/build-managers/gnumake/intermediate-parallel.patch → pkgs/development/tools/build-managers/gnumake/3.82/intermediate-parallel.patch
View File

0
pkgs/development/tools/build-managers/gnumake/log.patch → pkgs/development/tools/build-managers/gnumake/3.82/log.patch
View File

0
pkgs/development/tools/build-managers/gnumake/long-command-line.patch → pkgs/development/tools/build-managers/gnumake/3.82/long-command-line.patch
View File

0
pkgs/development/tools/build-managers/gnumake/memory-corruption.patch → pkgs/development/tools/build-managers/gnumake/3.82/memory-corruption.patch
View File

0
pkgs/development/tools/build-managers/gnumake/oneshell.patch → pkgs/development/tools/build-managers/gnumake/3.82/oneshell.patch
View File

0
pkgs/development/tools/build-managers/gnumake/parallel-remake.patch → pkgs/development/tools/build-managers/gnumake/3.82/parallel-remake.patch
View File

17
pkgs/development/tools/build-managers/gnumake/4.0/darwin-library_search-dylib.patch Normal file
View File

@ -0,0 +1,17 @@
Fixed default libpatttern on Darwin, imported from prefix overlay.
Got merged upstream:
https://savannah.gnu.org/bugs/?37197
--- default.c.orig 2009-05-02 12:25:24 +0200
+++ default.c 2009-05-02 12:25:58 +0200
@@ -509,7 +509,11 @@
#ifdef __MSDOS__
".LIBPATTERNS", "lib%.a $(DJDIR)/lib/lib%.a",
#else
+#ifdef __APPLE__
+ ".LIBPATTERNS", "lib%.dylib lib%.a",
+#else
".LIBPATTERNS", "lib%.so lib%.a",
+#endif
#endif
#endif

49
pkgs/development/tools/build-managers/gnumake/4.0/default.nix Normal file
View File

@ -0,0 +1,49 @@
{stdenv, fetchurl}:
let version = "4.0"; in
stdenv.mkDerivation {
name = "gnumake-${version}";
src = fetchurl {
url = "mirror://gnu/make/make-${version}.tar.bz2";
sha256 = "1nyvn8mknw0mf7727lprva3lisl1y0n03lvar342rrpdmz3qc1p6";
};
/* On Darwin, there are 3 test failures that haven't been investigated
yet. */
doCheck = !stdenv.isDarwin && !stdenv.isFreeBSD;
patches =
[
# Purity: don't look for library dependencies (of the form
# `-lfoo') in /lib and /usr/lib. It's a stupid feature anyway.
# Likewise, when searching for included Makefiles, don't look in
# /usr/include and friends.
./impure-dirs.patch
# a bunch of patches from Gentoo, mostly should be from upstream (unreleased)
./darwin-library_search-dylib.patch
];
patchFlags = "-p0";
meta = {
description = "GNU Make, a program controlling the generation of non-source files from sources";
longDescription =
'' Make is a tool which controls the generation of executables and
other non-source files of a program from the program's source files.
Make gets its knowledge of how to build your program from a file
called the makefile, which lists each of the non-source files and
how to compute it from other files. When you write a program, you
should write a makefile for it, so that it is possible to use Make
to build and install the program.
'';
homepage = http://www.gnu.org/software/make/;
license = "GPLv3+";
maintainers = [ stdenv.lib.maintainers.ludo ];
platforms = stdenv.lib.platforms.all;
};
}

34
pkgs/development/tools/build-managers/gnumake/4.0/impure-dirs.patch Normal file
View File

@ -0,0 +1,34 @@
diff -rc read.c read.c
*** read.c 2006-03-17 15:24:20.000000000 +0100
--- read.c 2007-05-24 17:16:31.000000000 +0200
***************
*** 99,107 ****
--- 99,109 ----
#endif
INCLUDEDIR,
#ifndef _AMIGA
+ #if 0
"/usr/gnu/include",
"/usr/local/include",
"/usr/include",
+ #endif
#endif
0
};
diff -rc reremake.c
*** remake.c 2006-03-20 03:36:37.000000000 +0100
--- remake.c 2007-05-24 17:06:54.000000000 +0200
***************
*** 1452,1460 ****
--- 1452,1462 ----
static char *dirs[] =
{
#ifndef _AMIGA
+ #if 0
"/lib",
"/usr/lib",
#endif
+ #endif
#if defined(WINDOWS32) && !defined(LIBDIR)
/*
* This is completely up to the user at product install time. Just define

2
pkgs/development/tools/build-managers/simple-build-tool/default.nix
View File

@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
cat > $out/bin/sbt << EOF
#!/bin/sh
SBT_OPTS="-Xms512M -Xmx1536M -Xss1M -XX:+CMSClassUnloadingEnabled -XX:MaxPermSize=384M"
${jre}/bin/java $SBT_OPTS -jar ${src} "\$@"
${jre}/bin/java \$SBT_OPTS -jar ${src} "\$@"
EOF
chmod +x $out/bin/sbt
'';

38
pkgs/development/tools/misc/drush/default.nix Normal file
View File

@ -0,0 +1,38 @@
{ stdenv, fetchurl, php, which, makeWrapper, bash, coreutils, ncurses }:
stdenv.mkDerivation rec {
name = "drush-6.1.0";
meta = with stdenv.lib; {
description = "Command-line shell and Unix scripting interface for Drupal";
homepage = http://github.com/drush-ops/drush;
license = licenses.gpl2;
maintainers = with maintainers; [ lovek323 ];
platforms = platforms.all;
};
src = fetchurl {
url = https://github.com/drush-ops/drush/archive/6.1.0.tar.gz;
sha256 = "1jgnc4jjyapyn04iczvcz92ic0vq8d1w8xi55ismqyy5cxhqj6bp";
};
consoleTable = fetchurl {
url = http://download.pear.php.net/package/Console_Table-1.1.3.tgz;
sha256 = "07gbjd7m1fj5dmavr0z20vkqwx1cz2522sj9022p257jifj1yl76";
};
buildInputs = [ php which makeWrapper ];
installPhase = ''
# install libraries
cd lib
tar -xf ${consoleTable}
cd ..
mkdir -p "$out"
cp -r . "$out/src"
mkdir "$out/bin"
wrapProgram "$out/src/drush" --prefix PATH : "${which}/bin:${php}/bin:${bash}/bin:${coreutils}/bin:${ncurses}/bin"
ln -s "$out/src/drush" "$out/bin/drush"
'';
}

5
pkgs/games/anki/default.nix
View File

@ -9,10 +9,10 @@ let
in
stdenv.mkDerivation rec {
name = "anki-2.0.12";
name = "anki-2.0.18";
src = fetchurl {
url = "http://ankisrs.net/download/mirror/${name}.tgz";
sha256 = "1pccws3rgfpyxdx5xph5x72c4a46is0alfz73icn9ppgjdizzipr";
sha256 = "1hpla3bgg7zh05f1dgycs5j4a01hnim66a8q2qzihf1r5zanr50j";
};
pythonPath = [ pyqt4 py.pysqlite py.sqlalchemy py.pyaudio ]
@ -66,6 +66,7 @@ stdenv.mkDerivation rec {
* even practicing guitar chords!
'';
license = "GPLv3";
maintainers = with stdenv.lib.maintainers; [ the-kenny ];
platforms = stdenv.lib.platforms.mesaPlatforms;
};
}

4
pkgs/games/openttd/default.nix
View File

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "openttd-${version}";
version = "1.3.2";
version = "1.3.3";
src = fetchurl {
url = "http://binaries.openttd.org/releases/${version}/${name}-source.tar.xz";
sha256 = "02r7xfq9a5x1y2wpdhqyczaj48z0qan33hs4i2liahsg1k6w1vzn";
sha256 = "0pfagqw8i1c6zrzarlwivrcac8b8ai1inam9qc01hj3h04nfv4b9";
};
buildInputs = [ SDL libpng pkgconfig xz zlib freetype fontconfig ];

4
pkgs/games/spring/springlobby.nix
View File

@ -3,11 +3,11 @@
stdenv.mkDerivation rec {
name = "springlobby-${version}";
version = "0.176";
version = "0.180";
src = fetchurl {
url = "http://www.springlobby.info/tarballs/springlobby-${version}.tar.bz2";
sha256 = "0a5pnd15rlvbkvnz2s0axy3i7m2jlrk91kjpwflnrcqlf42c2rk9";
sha256 = "0v2pwrwiwiggyl95rcyfj3pdlwsss5vcmnyzd40r9swb9gyi55na";
};
buildInputs = [

4
pkgs/games/ultrastardx/default.nix
View File

@ -15,7 +15,9 @@ stdenv.mkDerivation rec {
# The fpc is not properly wrapped to add -rpath. I add this manually.
# I even do a trick on lib/lib64 for libgcc, that I expect it will work.
preBuild = ''
export NIX_LDFLAGS="$NIX_LDFLAGS -rpath ${SDL}/lib -rpath ${SDL_image}/lib -rpath ${libpng}/lib -rpath ${freetype}/lib -rpath ${portaudio}/lib -rpath ${ffmpeg}/lib -rpath ${zlib}/lib -rpath ${sqlite}/lib -rpath ${libX11}/lib -rpath ${pcre}/lib -rpath ${stdenv.gcc.gcc}/lib64 -rpath ${stdenv.gcc.gcc}/lib"
export NIX_LDFLAGS="$NIX_LDFLAGS -rpath ${SDL}/lib -rpath ${SDL_image}/lib -rpath ${libpng}/lib -rpath ${freetype}/lib -rpath ${portaudio}/lib -rpath ${ffmpeg}/lib -rpath ${zlib}/lib -rpath ${sqlite}/lib -rpath ${libX11}/lib -rpath ${pcre}/lib -rpath ${lua}/lib -rpath ${stdenv.gcc.gcc}/lib64 -rpath ${stdenv.gcc.gcc}/lib"
sed -i 414,424d Makefile
'';
# dlopened libgcc requires the rpath not to be shrinked

10
pkgs/misc/emulators/wine/winetricks.nix
View File

@ -1,19 +1,20 @@
{ stdenv, fetchsvn, wine, perl, which, coreutils, zenity, curl, cabextract, unzip, p7zip } :
{ stdenv, fetchsvn, wine, perl, which, coreutils, zenity, curl
, cabextract, unzip, p7zip, gnused, gnugrep, bash } :
stdenv.mkDerivation rec {
rev = "939";
rev = "1078";
name = "winetricks-${rev}";
src = fetchsvn {
url = "http://winetricks.googlecode.com/svn/trunk";
inherit rev;
sha256 = "01v13qw4sxmfm09g9amqycnzy743gdrhvv23rjr9255dzlrj1s8f";
sha256 = "0ipvld0r5h6x2pgqkqa82q0w9flx6fn9aha8fd7axf5ji2gzmidm";
};
buildInputs = [ perl which ];
pathAdd = stdenv.lib.concatStringsSep "/bin:" # coreutils is for sha1sum
[ wine perl which coreutils zenity curl cabextract unzip p7zip ]
[ wine perl which coreutils zenity curl cabextract unzip p7zip gnused gnugrep bash ]
+ "/bin";
patch = ./winetricks.patch;
@ -24,6 +25,7 @@ stdenv.mkDerivation rec {
description = "A script to install DLLs needed to work around problems in Wine";
license = "LGPLv2.1";
homepage = http://code.google.com/p/winetricks/;
maintainers = with stdenv.lib.maintainers; [ the-kenny ];
};
}

59
pkgs/os-specific/linux/alsa-lib/default.nix
View File

@ -11,35 +11,6 @@ stdenv.mkDerivation rec {
sha256 = "068d8c92122hwca5jzhrjp4a131995adlb1d79zgrm7gwy9x63k9";
};
configureFlags = "--disable-xmlto";
# Fix pcm.h file in order to prevent some compilation bugs
# 2: see http://stackoverflow.com/questions/3103400/how-to-overcome-u-int8-t-vs-uint8-t-issue-efficiently
postPatch = ''
sed -i -e 's|//int snd_pcm_mixer_element(snd_pcm_t \*pcm, snd_mixer_t \*mixer, snd_mixer_elem_t \*\*elem);|/\*int snd_pcm_mixer_element(snd_pcm_t \*pcm, snd_mixer_t \*mixer, snd_mixer_elem_t \*\*elem);\*/|' include/pcm.h
sed -i -e '1i#include <stdint.h>' include/pcm.h
sed -i -e 's/u_int\([0-9]*\)_t/uint\1_t/g' include/pcm.h
'';
crossAttrs = {
patchPhase = ''
sed -i s/extern/static/g include/iatomic.h
'';
};
meta = {
description = "ALSA, the Advanced Linux Sound Architecture libraries";
longDescription = ''
The Advanced Linux Sound Architecture (ALSA) provides audio and
MIDI functionality to the Linux-based operating system.
'';
homepage = http://www.alsa-project.org/;
};
patches = [
/* allow specifying alternatives alsa plugin locations using
export ALSA_PLUGIN_DIRS=$(nix-build -A alsaPlugins)/lib/alsa-lib
@ -53,4 +24,34 @@ stdenv.mkDerivation rec {
on mips, because lacks some symbols atomic_add/atomic_sub */
./mips-atomic.patch
];
# Fix pcm.h file in order to prevent some compilation bugs
# 2: see http://stackoverflow.com/questions/3103400/how-to-overcome-u-int8-t-vs-uint8-t-issue-efficiently
postPatch = ''
sed -i -e 's|//int snd_pcm_mixer_element(snd_pcm_t \*pcm, snd_mixer_t \*mixer, snd_mixer_elem_t \*\*elem);|/\*int snd_pcm_mixer_element(snd_pcm_t \*pcm, snd_mixer_t \*mixer, snd_mixer_elem_t \*\*elem);\*/|' include/pcm.h
sed -i -e '1i#include <stdint.h>' include/pcm.h
sed -i -e 's/u_int\([0-9]*\)_t/uint\1_t/g' include/pcm.h
'';
configureFlags = "--disable-xmlto";
crossAttrs = {
patchPhase = ''
sed -i s/extern/static/g include/iatomic.h
'';
};
meta = {
homepage = http://www.alsa-project.org/;
description = "ALSA, the Advanced Linux Sound Architecture libraries";
longDescription = ''
The Advanced Linux Sound Architecture (ALSA) provides audio and
MIDI functionality to the Linux-based operating system.
'';
platforms = stdenv.lib.platforms.linux;
};
}

3
pkgs/os-specific/linux/alsa-oss/default.nix
View File

@ -21,6 +21,7 @@ stdenv.mkDerivation rec {
'';
meta = {
homepage = http://www.alsa-project.org/;
description = "ALSA, the Advanced Linux Sound Architecture alsa-oss emulation";
longDescription = ''
@ -28,6 +29,6 @@ stdenv.mkDerivation rec {
MIDI functionality to the Linux-based operating system.
'';
homepage = http://www.alsa-project.org/;
platforms = stdenv.lib.platforms.linux;
};
}

3
pkgs/os-specific/linux/alsa-utils/default.nix
View File

@ -23,6 +23,7 @@ stdenv.mkDerivation rec {
'';
meta = {
homepage = http://www.alsa-project.org/;
description = "ALSA, the Advanced Linux Sound Architecture utils";
longDescription = ''
@ -30,6 +31,6 @@ stdenv.mkDerivation rec {
MIDI functionality to the Linux-based operating system.
'';
homepage = http://www.alsa-project.org/;
platforms = stdenv.lib.platforms.linux;
};
}

4
pkgs/os-specific/linux/apparmor/default.nix
View File

@ -5,11 +5,11 @@
stdenv.mkDerivation rec {
name = "apparmor-${version}";
version = "2.8.1";
version = "2.8.2";
src = fetchurl {
url = "http://launchpad.net/apparmor/2.8/${version}/+download/${name}.tar.gz";
sha256 = "1r0a5k14jbiik28m5gql0f3dbxl252jya7i120rrsbzqqnvw6nw7";
sha256 = "1fyjvfkvl0fc7agmz64ck8c965940xvcljrczq1z66sydivkybvl";
};
buildInputs = [

4
pkgs/os-specific/linux/kernel/linux-3.12.nix
View File

@ -1,11 +1,11 @@
{ stdenv, fetchurl, ... } @ args:
import ./generic.nix (args // rec {
version = "3.12.2";
version = "3.12.4";
src = fetchurl {
url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz";
sha256 = "19kjhvg65z6l21srghjmlfyrwr0pswbkb02nd095v45lkyi3kwyk";
sha256 = "c56317810e5716dd2be7ad947a6bd174460f7cf9afb33b700a052aa91f73f9bb";
};
features.iwlwifi = true;

4
pkgs/os-specific/linux/kernel/linux-3.2.nix
View File

@ -1,11 +1,11 @@
{ stdenv, fetchurl, ... } @ args:
import ./generic.nix (args // rec {
version = "3.2.52";
version = "3.2.53";
src = fetchurl {
url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz";
sha256 = "1wpr5xs6vg0xjlzrlbkv7bjvv34psw57crkdh4lybghi4rgrmkzl";
sha256 = "1fvg76g3ixyz8spzzmw5gdfr0ni9wzi2g745vphknnd9a9rgwjdm";
};
features.iwlwifi = true;

20
pkgs/os-specific/linux/kernel/patches.nix
View File

@ -124,25 +124,25 @@ rec {
};
grsecurity_3_0_3_2_52 =
{ name = "grsecurity-3.0-3.2.52";
grsecurity_3_0_3_2_53 =
{ name = "grsecurity-3.0-3.2.53";
patch = fetchurl {
url = https://grsecurity.net/stable/grsecurity-3.0-3.2.52-201311261307.patch;
sha256 = "1zmzgjpbq90q2w3yl3dgdc79qan7qkh5w6g3y3nvzr6ww6jl8hqw";
url = https://grsecurity.net/stable/grsecurity-3.0-3.2.53-201312021727.patch;
sha256 = "1ifndcbpz552d0n2dgb38di8lhqd4x2msshdbdx33jlfdl7mk6x4";
};
features.grsecurity = true;
# The grsec kernel patch seems to include the apparmor patches as of 3.0-3.2.52
# The grsec kernel patch seems to include the apparmor patches as of 3.0-3.2.53
features.apparmor = true;
};
grsecurity_3_0_3_12_1 =
{ name = "grsecurity-3.0-3.12.1";
grsecurity_3_0_3_12_2 =
{ name = "grsecurity-3.0-3.12.2";
patch = fetchurl {
url = https://grsecurity.net/test/grsecurity-3.0-3.12.1-201311261309.patch;
sha256 = "129q740m2iivc4i9a465lvzcph9gxlivxzg2p9dsi7c136p42mdz";
url = https://grsecurity.net/test/grsecurity-3.0-3.12.2-201312021733.patch;
sha256 = "0xcsq6778rk9afg3078d772iflz7p4ahvr6wdq5c4s3jyssam783";
};
features.grsecurity = true;
# The grsec kernel patch seems to include the apparmor patches as of 3.0-3.12.1
# The grsec kernel patch seems to include the apparmor patches as of 3.0-3.12.2
features.apparmor = true;
};

4
pkgs/servers/gpsd/default.nix
View File

@ -4,11 +4,11 @@
, libxslt, xmlto, gpsdUser ? "gpsd" }:
stdenv.mkDerivation rec {
name = "gpsd-3.10";
name = "gpsd-2.95";
src = fetchurl {
url = "http://download.berlios.de/gpsd/${name}.tar.gz";
sha256 = "10sqhg4x7hb4vnpq5dnhg62vb5nb3dmqqnbhwjrj5kx7n63jw4h4";
sha256 = "1bjhyjg561kwp6zc2wg58njdvpnsj5yaa2slz8g3ga1176jl68w3";
};
nativeBuildInputs = [ makeWrapper pkgconfig docbook_xml_dtd_412 docbook_xsl

4
pkgs/servers/http/apache-httpd/2.2.nix
View File

@ -12,12 +12,12 @@ assert ldapSupport -> aprutil.ldapSupport && openldap != null;
assert mpm == "prefork" || mpm == "worker" || mpm == "event";
stdenv.mkDerivation rec {
version = "2.2.25";
version = "2.2.26";
name = "apache-httpd-${version}";
src = fetchurl {
url = "mirror://apache/httpd/httpd-${version}.tar.bz2";
sha1 = "e34222d1a8de38825397a1c70949bcc5836a1236";
sha256 = "1dj29cl2bsk8ir8hxw0ajhbpbrrmsh8mwqfc1ipiqgv7slyqx45g";
};
buildInputs = [perl apr aprutil pcre] ++

4
pkgs/servers/http/apache-httpd/2.4.nix
View File

@ -14,12 +14,12 @@ assert sslSupport -> aprutil.sslSupport && openssl != null;
assert ldapSupport -> aprutil.ldapSupport && openldap != null;
stdenv.mkDerivation rec {
version = "2.4.6";
version = "2.4.7";
name = "apache-httpd-${version}";
src = fetchurl {
url = "mirror://apache/httpd/httpd-${version}.tar.bz2";
sha1 = "16d8ec72535ded65d035122b0d944b0e64eaa2a2";
sha256 = "06z7ij0avr8f3rvp6ifk3dn8j73i17cn4avz4fp1as43061qsdk4";
};
buildInputs = [perl] ++

1
pkgs/servers/memcached/default.nix
View File

@ -12,6 +12,7 @@ stdenv.mkDerivation {
meta = {
description = "A distributed memory object caching system";
repositories.git = https://github.com/memcached/memcached.git;
homepage = http://memcached.org/;
license = "bsd";
maintainers = [ stdenv.lib.maintainers.coconnor ];

3
pkgs/tools/archivers/atool/default.nix
View File

@ -12,7 +12,6 @@ stdenv.mkDerivation rec {
meta = {
homepage = http://www.nongnu.org/atool;
description = "Archive command line helper";
platforms = stdenv.lib.platforms.all;
hydraPlatforms = stdenv.lib.platforms.linux;
};
}

9
pkgs/tools/backup/rdiff-backup/default.nix
View File

@ -1,11 +1,11 @@
{stdenv, fetchurl, python, librsync, gnused }:
stdenv.mkDerivation {
name = "rdiff-backup-1.2.8";
name = "rdiff-backup-1.3.3";
src = fetchurl {
url = mirror://savannah/rdiff-backup/rdiff-backup-1.2.8.tar.gz;
sha256 = "1nwmmh816f96h0ff1jxk95ad38ilbhbdl5dgibx1d4cl81dsi48d";
url = mirror://savannah/rdiff-backup/rdiff-backup-1.3.3.tar.gz;
sha256 = "01hcwf5rgqi303fa4kdjkbpa7n8mvvh7h9gpgh2b23nz73k0q0zf";
};
phases = "unpackPhase installPhase";
@ -15,11 +15,12 @@ stdenv.mkDerivation {
"/import sys/ asys.path += [ \"$out/lib/python2.7/site-packages/\" ]"
'';
buildInputs = [python librsync gnused ];
buildInputs = [ python librsync gnused ];
meta = {
description = "backup system trying to combine best a mirror and an incremental backup system";
homepage = http://rdiff-backup.nongnu.org/;
license = "GPL-2";
maintainers = with stdenv.lib.maintainers; [ the-kenny ];
};
}

5
pkgs/tools/filesystems/dosfstools/default.nix
View File

@ -1,17 +1,18 @@
{ stdenv, fetchurl }:
stdenv.mkDerivation rec {
name = "dosfstools-3.0.21";
name = "dosfstools-3.0.24";
src = fetchurl {
url = "http://daniel-baumann.ch/files/software/dosfstools/${name}.tar.xz";
sha256 = "12c9ilcpknm7hg3czkc50azndd0yjdj4jjnvizhwqxy3g0gm2960";
sha256 = "1hblhb98wm9gm60y32psdqm5jprs4a6dqzrapzgb6bw7r3kvf88y";
};
makeFlags = "PREFIX=$(out)";
meta = {
description = "Utilities for creating and checking FAT and VFAT file systems";
repositories.git = git://daniel-baumann.ch/git/software/dosfstools.git;
homepage = http://www.daniel-baumann.ch/software/dosfstools/;
platforms = stdenv.lib.platforms.linux;
};

11
pkgs/tools/filesystems/yandex-disk/default.nix
View File

@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
cp -r -t $out/share usr/share/*
cp -r -t $out/etc etc/*
sed -i 's@have@${which}/bin/which >/dev/null 2>&1@' \
sed -i 's@have@${which}/bin/which >/dev/null 2>\&1@' \
$out/etc/bash_completion.d/yandex-disk-completion.bash
${patchelf}/bin/patchelf \
@ -49,6 +49,15 @@ stdenv.mkDerivation rec {
maintainers = with stdenv.lib.maintainers; [smironov];
platforms = ["i686-linux" "x86_64-linux"];
license = stdenv.lib.licenses.unfree;
longDescription = ''
Yandex.Disk console client for Linux lets you manage files on Disk without
using a window interface or programs that support WebDAV. The advantages
of the console client compared to a WebDAV connection:
* low system resource requirements;
* faster file reading and writing speeds;
* faster syncing with Disk's server;
* no need to be constantly connected to work with files.
'';
};
}

4
pkgs/tools/misc/aescrypt/default.nix
View File

@ -24,11 +24,11 @@ stdenv.mkDerivation rec {
NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isDarwin "-liconv";
meta = with stdenv.lib; {
description = "A file encryption util that uses the industry standard Advanced Encryption Standard (AES) to easily and securely encrypt files";
description = "encrypt files with Advanced Encryption Standard (AES)";
homepage = http://www.aescrypt.com/;
license = licenses.gpl2;
maintainers = with maintainers; [ lovek323 qknight ];
platforms = stdenv.lib.platforms.all;
hydraPlatforms = stdenv.lib.platforms.linux;
};
}

5
pkgs/tools/misc/youtube-dl/default.nix
View File

@ -1,14 +1,14 @@
{ stdenv, fetchurl, python, zip }:
let
version = "2013.10.23.2";
version = "2013.12.08.1";
in
stdenv.mkDerivation rec {
name = "youtube-dl-${version}";
src = fetchurl {
url = "http://youtube-dl.org/downloads/${version}/${name}.tar.gz";
sha256 = "d3f4c9e0da165395856e690314caa5eef4382bd994dd46f041a520bf9747c35d";
sha256 = "0sqdc0fbk6xlfd5d2iy4r9kr5inl0122zzri08zndpl4cbzawhaq";
};
buildInputs = [ python ];
@ -24,6 +24,7 @@ stdenv.mkDerivation rec {
meta = {
homepage = "http://rg3.github.com/youtube-dl/";
repositories.git = https://github.com/rg3/youtube-dl.git;
description = "Command-line tool to download videos from YouTube.com and other sites";
platforms = with stdenv.lib.platforms; linux ++ darwin;

4
pkgs/tools/networking/dropbear/default.nix
View File

@ -2,11 +2,11 @@
sftpPath ? "/var/run/current-system/sw/libexec/sftp-server" }:
stdenv.mkDerivation rec {
name = "dropbear-2013.60";
name = "dropbear-2013.62";
src = fetchurl {
url = "http://matt.ucc.asn.au/dropbear/releases/${name}.tar.bz2";
sha256 = "1fw1hrcavfqjmsn34dhkrzh8w06yfqvfss2rkvvnxnad7d2m432c";
sha256 = "1ylz0zd68cxdgs4x4cpc2y8h75395y10bxb1qflv0m6cpc166rf6";
};
dontDisableStatic = enableStatic;

4
pkgs/tools/networking/p2p/libtorrent/default.nix
View File

@ -1,14 +1,14 @@
{ stdenv, fetchurl, pkgconfig, openssl, libsigcxx }:
let
version = "0.13.2";
version = "0.13.3";
in
stdenv.mkDerivation {
name = "libtorrent-${version}";
src = fetchurl {
url = "http://libtorrent.rakshasa.no/downloads/libtorrent-${version}.tar.gz";
sha256 = "ed2f2dea16c29cac63fa2724f6658786d955f975861fa6811bcf1597ff8a5e4f";
sha256 = "0xsnyd1hnfvfq67y5s0ddhj2lhxmfms4djblaa0d1y5phdkpsc9l";
};
buildInputs = [ pkgconfig openssl libsigcxx ];

24
pkgs/tools/networking/p2p/rtorrent/default.nix
View File

@ -1,24 +1,22 @@
{ stdenv, fetchurl, libtorrent, ncurses, pkgconfig, libsigcxx, curl
, zlib, openssl }:
, zlib, openssl
}:
let
version = "0.9.2";
in
stdenv.mkDerivation {
name = "rtorrent-${version}";
stdenv.mkDerivation rec {
name = "rtorrent-0.9.3";
src = fetchurl {
url = "http://libtorrent.rakshasa.no/downloads/rtorrent-${version}.tar.gz";
sha256 = "5c8f8c780bee376afce3c1cde2f5ecb928f40bac23b2b8171deed5cf3c888c3d";
url = "http://libtorrent.rakshasa.no/downloads/${name}.tar.gz";
sha256 = "043krhsiawigf8yjd5qfkdn5iqrssph1705dsx5fgbxipr0wm4wy";
};
buildInputs = [ libtorrent ncurses pkgconfig libsigcxx curl zlib openssl ];
postInstall = ''
mkdir -p $out/share/man/man1 $out/share/rtorrent
mv doc/rtorrent.1 $out/share/man/man1/rtorrent.1
mv doc/rtorrent.rc $out/share/rtorrent/rtorrent.rc
'';
# postInstall = ''
# mkdir -p $out/share/man/man1 $out/share/rtorrent
# mv doc/rtorrent.1 $out/share/man/man1/rtorrent.1
# mv doc/rtorrent.rc $out/share/rtorrent/rtorrent.rc
# '';
meta = {
homepage = "http://libtorrent.rakshasa.no/";

4
pkgs/tools/security/clamav/default.nix
View File

@ -1,11 +1,11 @@
{ stdenv, fetchurl, zlib, bzip2, libiconv }:
stdenv.mkDerivation rec {
name = "clamav-${version}";
version = "0.97.8";
version = "0.98";
src = fetchurl {
url = "mirror://sourceforge/clamav/clamav-${version}.tar.gz";
sha256 = "04pwm8a84silnvgimn2wi2wgwdzwpskybx72mp10ni1dd7yvswnq";
sha256 = "1dmkaa6sqynv4v74s9izq7m7kk8d78rvwyd123q4gva6gx9m0d0i";
};
buildInputs = [ zlib bzip2 libiconv ];

4
pkgs/tools/text/wgetpaste/default.nix
View File

@ -1,10 +1,10 @@
{stdenv, fetchurl, wget, bash, coreutils}:
stdenv.mkDerivation rec {
version = "2.20";
version = "2.23";
name = "wgetpaste-${version}";
src = fetchurl {
url = "http://wgetpaste.zlin.dk/${name}.tar.bz2";
sha256 = "7a53836d02e07cefc3c2978bb129a037fa1e1222ba0e275c4e818230a6d6fb9e";
sha256 = "1xam745f5pmqi16br72a866117hnmcfwjyvsw1jhg3npbdnm9x6n";
};
# currently zsh-autocompletion support is not installed

69
pkgs/top-level/all-packages.nix
View File

@ -2808,6 +2808,8 @@ let
oraclejdk = pkgs.jdkdistro true false;
oraclejdk7 = pkgs.oraclejdk7distro true false;
oraclejre = lowPrio (pkgs.jdkdistro false false);
jrePlugin = lowPrio (pkgs.jdkdistro false true);
@ -2821,6 +2823,11 @@ let
(if pluginSupport then appendToName "plugin" else x: x)
(callPackage ../development/compilers/jdk/jdk6-linux.nix { });
oraclejdk7distro = installjdk: pluginSupport:
assert supportsJDK;
(if pluginSupport then appendToName "plugin" else x: x)
(callPackage ../development/compilers/jdk/jdk7-linux.nix { inherit installjdk; });
jikes = callPackage ../development/compilers/jikes { };
julia = callPackage ../development/compilers/julia {
@ -2913,6 +2920,7 @@ let
camlimages = callPackage ../development/ocaml-modules/camlimages {
libpng = libpng12;
giflib = giflib_4_1;
};
ocaml_cairo = callPackage ../development/ocaml-modules/ocaml-cairo { };
@ -2969,6 +2977,8 @@ let
ocaml_react = callPackage ../development/ocaml-modules/react { };
ocamlsdl= callPackage ../development/ocaml-modules/ocamlsdl { };
ocaml_sqlite3 = callPackage ../development/ocaml-modules/sqlite3 { };
ocaml_ssl = callPackage ../development/ocaml-modules/ssl { };
@ -2997,6 +3007,7 @@ let
ocamlPackages_3_11_2 = mkOcamlPackages ocaml_3_11_2 pkgs.ocamlPackages_3_11_2;
ocamlPackages_3_12_1 = mkOcamlPackages ocaml_3_12_1 pkgs.ocamlPackages_3_12_1;
ocamlPackages_4_00_1 = mkOcamlPackages ocaml_4_00_1 pkgs.ocamlPackages_4_00_1;
ocamlPackages_4_01_0 = mkOcamlPackages ocaml_4_01_0 pkgs.ocamlPackages_4_01_0;
ocaml_make = callPackage ../development/ocaml-modules/ocamlmake { };
@ -3587,6 +3598,8 @@ let
doxygen_gui = callPackage ../development/tools/documentation/doxygen { };
drush = callPackage ../development/tools/misc/drush { };
eggdbus = callPackage ../development/tools/misc/eggdbus { };
elfutils = callPackage ../development/tools/misc/elfutils { };
@ -3617,10 +3630,11 @@ let
gnum4 = callPackage ../development/tools/misc/gnum4 { };
gnumake = callPackage ../development/tools/build-managers/gnumake { };
gnumake380 = callPackage ../development/tools/build-managers/gnumake-3.80 { };
gnumake381 = callPackage ../development/tools/build-managers/gnumake/3.81.nix { };
gnumake380 = callPackage ../development/tools/build-managers/gnumake/3.80 { };
gnumake381 = callPackage ../development/tools/build-managers/gnumake/3.81 { };
gnumake382 = callPackage ../development/tools/build-managers/gnumake/3.82 { };
gnumake40 = callPackage ../development/tools/build-managers/gnumake/4.0 { };
gnumake = gnumake382;
gob2 = callPackage ../development/tools/misc/gob2 { };
@ -4087,6 +4101,10 @@ let
else stdenv;
};
ffmpeg_0_6 = callPackage ../development/libraries/ffmpeg/0.6.nix {
vpxSupport = !stdenv.isMips;
};
ffmpeg_0_6_90 = callPackage ../development/libraries/ffmpeg/0.6.90.nix {
vpxSupport = !stdenv.isMips;
};
@ -4096,6 +4114,11 @@ let
texinfo = texinfo5;
};
ffmpeg_2 = callPackage ../development/libraries/ffmpeg/2.x.nix {
vpxSupport = !stdenv.isMips;
texinfo = texinfo5;
};
ffms = callPackage ../development/libraries/ffms { };
fftw = callPackage ../development/libraries/fftw {
@ -4297,6 +4320,7 @@ let
glsurf = callPackage ../applications/science/math/glsurf {
inherit (ocamlPackages) lablgl findlib camlimages ocaml_mysql mlgmp;
libpng = libpng12;
giflib = giflib_4_1;
};
gmime = callPackage ../development/libraries/gmime { };
@ -5063,6 +5087,7 @@ let
libupnp = callPackage ../development/libraries/pupnp { };
giflib = callPackage ../development/libraries/giflib { };
giflib_4_1 = callPackage ../development/libraries/giflib/4.1.nix { };
libungif = callPackage ../development/libraries/giflib/libungif.nix { };
@ -5311,9 +5336,7 @@ let
includeTools = true;
};
ntrack = callPackage ../development/libraries/ntrack {
libnl = libnl_3_2_19;
};
ntrack = callPackage ../development/libraries/ntrack { };
ode = builderDefsPackage (import ../development/libraries/ode) { };
@ -5371,7 +5394,9 @@ let
openjpeg = callPackage ../development/libraries/openjpeg { lcms = lcms2; };
openscenegraph = callPackage ../development/libraries/openscenegraph {};
openscenegraph = callPackage ../development/libraries/openscenegraph {
giflib = giflib_4_1;
};
openssl = callPackage ../development/libraries/openssl {
fetchurl = fetchurlBoot;
@ -6681,11 +6706,11 @@ let
# config options you need (e.g. by overriding extraConfig). See list of options here:
# https://en.wikibooks.org/wiki/Grsecurity/Appendix/Grsecurity_and_PaX_Configuration_Options
linux_3_2_grsecurity = lowPrio (lib.overrideDerivation (linux_3_2.override (args: {
kernelPatches = args.kernelPatches ++ [ kernelPatches.grsecurity_3_0_3_2_52 kernelPatches.grsec_path ];
kernelPatches = args.kernelPatches ++ [ kernelPatches.grsecurity_3_0_3_2_53 kernelPatches.grsec_path ];
})) (args: grsecurityOverrider args));
linux_3_12_grsecurity = lowPrio (lib.overrideDerivation (linux_3_12.override (args: {
kernelPatches = args.kernelPatches ++ [ kernelPatches.grsecurity_3_0_3_12_1 kernelPatches.grsec_path ];
kernelPatches = args.kernelPatches ++ [ kernelPatches.grsecurity_3_0_3_12_2 kernelPatches.grsec_path ];
})) (args: grsecurityOverrider args));
linux_3_2_apparmor = lowPrio (linux_3_2.override {
@ -7428,7 +7453,9 @@ let
arora = callPackage ../applications/networking/browsers/arora { };
aseprite = callPackage ../applications/editors/aseprite { };
aseprite = callPackage ../applications/editors/aseprite {
giflib = giflib_4_1;
};
audacious = callPackage ../applications/audio/audacious { };
@ -8459,6 +8486,12 @@ let
jackSupport = config.mumble.jackSupport or false;
};
murmur = callPackage ../applications/networking/mumble/murmur.nix {
avahi = avahi.override {
withLibdnssdCompat = true;
};
};
mutt = callPackage ../applications/networking/mailreaders/mutt { };
ruby_gpgme = callPackage ../development/libraries/ruby_gpgme {
@ -9501,6 +9534,7 @@ let
ultimatestunts = callPackage ../games/ultimatestunts { };
ultrastardx = callPackage ../games/ultrastardx {
ffmpeg = ffmpeg_0_6;
lua = lua5;
};
@ -9560,6 +9594,10 @@ let
### DESKTOP ENVIRONMENTS
cinnamon = recurseIntoAttrs {
cinnamon-translations = callPackage ../desktops/cinnamon/cinnamon-translations.nix { };
};
enlightenment = callPackage ../desktops/enlightenment { };
e17 = recurseIntoAttrs (
@ -9695,14 +9733,16 @@ let
quassel = callPackage ../applications/networking/irc/quassel { };
quasselDaemon = appendToName "daemon" (self.quassel.override {
quasselDaemon = (self.quassel.override {
monolithic = false;
daemon = true;
tag = "-daemon";
});
quasselClient = appendToName "client" (self.quassel.override {
quasselClient = (self.quassel.override {
monolithic = false;
client = true;
tag = "-client";
});
rekonq = callPackage ../applications/networking/browsers/rekonq { };
@ -10155,6 +10195,8 @@ let
inherit (pythonPackages) pexpect paramiko;
};
robomongo = callPackage ../applications/misc/robomongo { };
opkg = callPackage ../tools/package-management/opkg { };
pgadmin = callPackage ../applications/misc/pgadmin { };
@ -10295,6 +10337,7 @@ let
vice = callPackage ../misc/emulators/vice {
libX11 = xlibs.libX11;
giflib = giflib_4_1;
};
viewnior = callPackage ../applications/graphics/viewnior { };

2
pkgs/top-level/haskell-defaults.nix
View File

@ -19,6 +19,8 @@
self : self.haskellPlatformArgs_future self // {
haskellPlatform = null;
extensibleExceptions = self.extensibleExceptions_0_1_1_4;
cabalInstall_1_18_0_2 = self.cabalInstall_1_18_0_2.override { Cabal = null; };
cabalInstall = self.cabalInstall_1_18_0_2.override { Cabal = null; };
};
ghc763Prefs =

1
pkgs/top-level/release.nix
View File

@ -309,7 +309,6 @@ let
vim = linux;
vimHugeX = linux;
VisualBoyAdvance = linux;
vlc = linux;
vncrec = linux;
vorbisTools = linux;
vpnc = linux;