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

Updating from trunk.

Browse Source 
svn path=/nixpkgs/branches/stdenv-updates/; revision=19139
This commit is contained in:
Lluís Batlle i Rossell 2009-12-28 11:40:34 +00:00
commit d864771e26
56 changed files with 522 additions and 154 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/applications/editors/nano/default.nix
View File

@ -1,13 +1,13 @@
args: with args;
stdenv.mkDerivation (rec {
pname = "nano";
version = "2.0.7";
version = "2.2.1";
name = "${pname}-${version}";
src = fetchurl {
url = "mirror://gnu/nano/${name}.tar.gz";
sha256 = "5dc783c412c4d1ff463c450d2a2f9e1ea53a43d9ba1dda92bbf5182f60db532f";
sha256 = "1xqldl7ipsmz5x8q3fw9s6yshxfp39kly96kb15l1kawng1wfcfq";
};
buildInputs = [ncurses gettext];
# configureFlags = "--enable-tiny";

10
pkgs/applications/graphics/dia/default.nix
View File

@ -1,13 +1,13 @@
{stdenv, fetchurl, gtk, pkgconfig, glib, perl, perlXMLParser, libxml2, gettext, python, libxml2Python, docbook5, docbook_xsl, libxslt }:
{stdenv, fetchurl, gtk, pkgconfig, glib, perl, perlXMLParser, libxml2, gettext, python, libxml2Python, docbook5, docbook_xsl, libxslt, intltool }:
stdenv.mkDerivation {
name = "dia-0.96";
name = "dia-0.97";
src = fetchurl {
url = http://ftp.gnome.org.nyud.net:8080/pub/gnome/sources/dia/0.96/dia-0.96.1.tar.bz2;
md5 = "7b81b22baa2df55efe4845865dddc7b6";
url = mirror://gnome/pub/gnome/sources/dia/0.97/dia-0.97.tar.bz2;
sha256 = "0nngdjklap3x1b7cxnwawh29axbwk8siyq7w4iinsns3slmki0wh";
};
buildInputs = [gtk glib perl pkgconfig perlXMLParser libxml2 gettext python libxml2Python docbook5 libxslt docbook_xsl];
buildInputs = [gtk glib perl pkgconfig perlXMLParser libxml2 gettext python libxml2Python docbook5 libxslt docbook_xsl intltool];
meta = {
description = "Gnome Diagram drawing software.";

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

@ -3,11 +3,11 @@
glew, libXmu, libXi }:
stdenv.mkDerivation rec {
name = "hugin-2009.2.0";
name = "hugin-2009.4.0";
src = fetchurl {
url = "mirror://sourceforge/hugin/${name}.tar.gz";
sha256 = "1z5hb1sfkpk6d1xnzqh8vy6rs7fhfjs5196pz98hwnx6wfi8w3k2";
sha256 = "1xa7rnpwlv68wfkikmlrs74hqylpkh837p3narqljr2a7fxf04r9";
};
# patches = [ ./levmar-64-bit-alignment.patch ];

8
pkgs/applications/graphics/xaos/default.nix
View File

@ -2,7 +2,7 @@ a :
let
fetchurl = a.fetchurl;
version = a.lib.attrByPath ["version"] "3.4" a;
version = a.lib.attrByPath ["version"] "3.5" a;
buildInputs = with a; [
aalib gsl libpng libX11 xproto libXext xextproto
libXt zlib gettext intltool perl
@ -10,8 +10,8 @@ let
in
rec {
src = fetchurl {
url = "http://prdownloads.sourceforge.net/xaos/XaoS-${version}.tar.gz";
sha256 = "004cdb0xv14shyixs79bf95s52s7aidr5bqfn9wb49gpasrsknrc";
url = "mirror://sourceforge/xaos/xaos-${version}.tar.gz";
sha256 = "0hj8sxya4s9rc1m4xvxj00jgiczi3ljf2zvrhx34r3ja2m9af7s7";
};
inherit buildInputs;
@ -27,6 +27,8 @@ rec {
name = "xaos-" + version;
meta = {
homepage = http://xaos.sourceforge.net/;
description = "XaoS - fractal viewer";
license = "GPLv2+";
};
}

12
pkgs/applications/misc/googleearth/default.nix
View File

@ -6,11 +6,11 @@ zlib, patchelf05 }:
assert stdenv.system == "i686-linux";
stdenv.mkDerivation {
name = "googleearth-5.1.3509.4636";
name = "googleearth-5.1.3533.1731";
src = fetchurl {
url = http://dl.google.com/earth/client/current/GoogleEarthLinux.bin;
sha256 = "6c948c64eed5f30adb67019c0d26c148b9ad7a821891018548da650fe812dca8";
sha256 = "1sxs1nwb2zh2j8dbwm65r04byn66yn79kpzhilhswly6r8d7yivg";
};
buildInputs = [
@ -65,8 +65,10 @@ stdenv.mkDerivation {
'';
meta = {
description = "A world sphere viewer";
homepage = http://earth.google.com;
license = "unfree";
description = "A world sphere viewer";
homepage = http://earth.google.com;
license = "unfree";
maintainers = with stdenv.lib.maintainers; [viric];
platforms = with stdenv.lib.platforms; linux;
};
}

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

@ -1,15 +1,15 @@
{ fetchurl, stdenv, pkgconfig, gettext, gtk, gconf
, curl, libexif, sqlite }:
, curl, libexif, sqlite, libxml2 }:
stdenv.mkDerivation rec {
name = "tangogps-0.9.6";
name = "tangogps-0.99.2";
src = fetchurl {
url = "http://www.tangogps.org/downloads/${name}.tar.gz";
sha256 = "04vfbr7skjcfadv9206q2pxbm74i8yypkjwzldsc5a6ybhr7fsp5";
sha256 = "15q2kkrv4mfsivfdzjgpxr7s2amw7d501q2ayjl3ff4vmvfn5516";
};
buildInputs = [ pkgconfig gettext gtk gconf curl libexif sqlite ];
buildInputs = [ pkgconfig gettext gtk gconf curl libexif sqlite libxml2 ];
meta = {
description = "tangoGPS, a user friendly map and GPS user interface";

30
pkgs/applications/misc/xfontsel/default.nix Normal file
View File

@ -0,0 +1,30 @@
# This program used to come with xorg releases, but now I could only find it
# at http://www.x.org/releases/individual/.
# That is why this expression is not inside pkgs.xorg
{stdenv, fetchurl, libX11, pkgconfig, libXaw}:
stdenv.mkDerivation rec {
name = "xfontsel-1.0.2";
src = fetchurl {
url = "http://www.x.org/releases/individual/app/${name}.tar.bz2";
sha256 = "1a86a08sf0wjrki9ydh7hr5qf6hrixc4ljlxizakjzmx20wvlrks";
};
buildInputs = [libX11 pkgconfig libXaw];
# This will not make xfontsel find its app-defaults, but at least the $out
# directory will contain them.
# hack: Copying the XFontSel app-defaults file to $HOME makes xfontsel work.
preInstall = ''
installFlags="appdefaultdir=$out/share/X11/app-defaults"
'';
meta = {
homepage = http://www.x.org/;
description = "Allows testing the fonts available in an X server";
licesnse = "free";
maintainers = with stdenv.lib.maintainers; [viric];
platforms = with stdenv.lib.platforms; linux;
};
}

23
pkgs/applications/misc/xlsfonts/default.nix Normal file
View File

@ -0,0 +1,23 @@
# This program used to come with xorg releases, but now I could only find it
# at http://www.x.org/releases/individual/.
# That is why this expression is not inside pkgs.xorg
{stdenv, fetchurl, libX11, pkgconfig}:
stdenv.mkDerivation rec {
name = "xlsfonts-1.0.2";
src = fetchurl {
url = "http://www.x.org/releases/individual/app/${name}.tar.bz2";
sha256 = "070iym754g3mf9x6xczl4gdnpvlk6rdyl1ndwhpjl21vg2dm2vnc";
};
buildInputs = [libX11 pkgconfig];
meta = {
homepage = http://www.x.org/;
description = "Lists the fonts available in the X server";
licesnse = "free";
maintainers = with stdenv.lib.maintainers; [viric];
platforms = with stdenv.lib.platforms; linux;
};
}

6
pkgs/applications/networking/browsers/firefox/3.5.nix
View File

@ -12,14 +12,14 @@
rec {
firefoxVersion = "3.5.5";
firefoxVersion = "3.5.6";
xulVersion = "1.9.1.5"; # this attribute is used by other packages
xulVersion = "1.9.1.6"; # this attribute is used by other packages
src = fetchurl {
url = "http://releases.mozilla.org/pub/mozilla.org/firefox/releases/${firefoxVersion}/source/firefox-${firefoxVersion}.source.tar.bz2";
sha1 = "a2146fb6dc8e879a78fa13849f187c14d41442ca";
sha1 = "fc1de4ddb9c20c7ba9e297737f926e9d8e32eed4";
};

6
pkgs/applications/networking/browsers/lynx/default.nix
View File

@ -5,10 +5,10 @@
assert sslSupport -> openssl != null;
stdenv.mkDerivation {
name = "lynx-2.8.6";
name = "lynx-2.8.7";
src = fetchurl {
url = http://lynx.isc.org/lynx2.8.6/lynx2.8.6.tar.bz2;
sha256 = "0kbnxg01w1hczii6yqkx05dcx6yfcpqadrsavjyq3h68birc366w";
url = http://lynx.isc.org/lynx2.8.7/lynx2.8.7.tar.bz2;
sha256 = "1baxwpdvak6nalr943g22z67r1d3fbibbkqvkvvar9xlvrs9gv20";
};
configureFlags = (if sslSupport then "--with-ssl" else "");
buildInputs = [ncurses (if sslSupport then openssl else null)];

21
pkgs/applications/networking/instant-messengers/pidgin/default.nix
View File

@ -11,32 +11,33 @@
* - doxygen
*/
{ stdenv, fetchurl, pkgconfig, gtk, gtkspell, aspell,
GStreamer, startupnotification, gettext,
perl, perlXMLParser, libxml2, nss, nspr,
libXScrnSaver, ncurses, avahi, dbus, dbus_glib, intltool
GStreamer, gstPluginsBase, startupnotification, gettext,
perl, perlXMLParser, libxml2, nss, nspr, farsight2,
libXScrnSaver, ncurses, avahi, dbus, dbus_glib, intltool, libidn
, lib
, openssl ? null
, gnutls ? null
, voice ? null
} :
stdenv.mkDerivation {
name = "pidgin-2.5.6";
name = "pidgin-2.6.4";
src = fetchurl {
url = mirror://sourceforge/pidgin/pidgin-2.5.6.tar.bz2;
sha256 = "00lsb0pmz1zn37xzwji91izzklr9famm100al612m4hy0i37yh4v";
url = mirror://sourceforge/pidgin/pidgin-2.6.4.tar.bz2;
sha256 = "04dyr2g45i3wr67zsn04pjl6vyvic8dchb73pajf823pa377m47s";
};
inherit nss ncurses;
buildInputs = [
gtkspell aspell
GStreamer startupnotification
GStreamer gstPluginsBase startupnotification
libxml2]
++ (lib.optional (openssl != null) openssl)
++ (lib.optional (gnutls != null) gnutls)
++
[nss nspr
[nss nspr farsight2
libXScrnSaver ncurses
avahi dbus dbus_glib intltool
avahi dbus dbus_glib intltool libidn
]
;
@ -44,6 +45,8 @@ stdenv.mkDerivation {
pkgconfig gtk perl perlXMLParser gettext
];
patches = [./pidgin-makefile.patch];
configureFlags="--with-nspr-includes=${nspr}/include/nspr --with-nspr-libs=${nspr}/lib --with-nss-includes=${nss}/include/nss --with-nss-libs=${nss}/lib --with-ncurses-headers=${ncurses}/include --disable-meanwhile --disable-nm --disable-tcl"
+ (lib.optionalString (gnutls != null) " --enable-gnutls=yes --enable-nss=no")
;

60
pkgs/applications/networking/instant-messengers/pidgin/pidgin-makefile.patch Normal file
View File

@ -0,0 +1,60 @@
diff -ru pidgin-2.6.4/pidgin/Makefile.am pidgin-2.6.4.new/pidgin/Makefile.am
--- pidgin-2.6.4/pidgin/Makefile.am 2009-11-30 04:13:54.000000000 +0100
+++ pidgin-2.6.4.new/pidgin/Makefile.am 2009-12-27 17:30:58.000000000 +0100
@@ -200,6 +200,7 @@
$(GLIB_LIBS) \
$(DBUS_LIBS) \
$(GSTREAMER_LIBS) \
+ $(GSTINTERFACES_LIBS) \
$(XSS_LIBS) \
$(SM_LIBS) \
$(INTLLIBS) \
@@ -224,6 +225,7 @@
-I$(top_srcdir) \
$(GLIB_CFLAGS) \
$(GSTREAMER_CFLAGS) \
+ $(GSTINTERFACES_CFLAGS) \
$(DEBUG_CFLAGS) \
$(GTK_CFLAGS) \
$(DBUS_CFLAGS) \
diff -ru pidgin-2.6.4/pidgin/Makefile.in pidgin-2.6.4.new/pidgin/Makefile.in
--- pidgin-2.6.4/pidgin/Makefile.in 2009-11-30 05:12:21.000000000 +0100
+++ pidgin-2.6.4.new/pidgin/Makefile.in 2009-12-27 17:30:36.000000000 +0100
@@ -645,6 +645,7 @@
@ENABLE_GTK_TRUE@ $(GLIB_LIBS) \
@ENABLE_GTK_TRUE@ $(DBUS_LIBS) \
@ENABLE_GTK_TRUE@ $(GSTREAMER_LIBS) \
+@ENABLE_GTK_TRUE@ $(GSTINTERFACES_LIBS) \
@ENABLE_GTK_TRUE@ $(XSS_LIBS) \
@ENABLE_GTK_TRUE@ $(SM_LIBS) \
@ENABLE_GTK_TRUE@ $(INTLLIBS) \
@@ -666,6 +667,7 @@
@ENABLE_GTK_TRUE@ -I$(top_srcdir) \
@ENABLE_GTK_TRUE@ $(GLIB_CFLAGS) \
@ENABLE_GTK_TRUE@ $(GSTREAMER_CFLAGS) \
+@ENABLE_GTK_TRUE@ $(GSTINTERFACES_CFLAGS) \
@ENABLE_GTK_TRUE@ $(DEBUG_CFLAGS) \
@ENABLE_GTK_TRUE@ $(GTK_CFLAGS) \
@ENABLE_GTK_TRUE@ $(DBUS_CFLAGS) \
diff -ru pidgin-2.6.4/pidgin/plugins/Makefile.am pidgin-2.6.4.new/pidgin/plugins/Makefile.am
--- pidgin-2.6.4/pidgin/plugins/Makefile.am 2009-11-30 04:13:57.000000000 +0100
+++ pidgin-2.6.4.new/pidgin/plugins/Makefile.am 2009-12-27 16:58:50.000000000 +0100
@@ -137,6 +137,7 @@
$(DEBUG_CFLAGS) \
$(GTK_CFLAGS) \
$(GSTREAMER_CFLAGS) \
+ $(GSTINTERFACES_CFLAGS) \
$(PLUGIN_CFLAGS)
#
diff -ru pidgin-2.6.4/pidgin/plugins/Makefile.in pidgin-2.6.4.new/pidgin/plugins/Makefile.in
--- pidgin-2.6.4/pidgin/plugins/Makefile.in 2009-11-30 05:12:22.000000000 +0100
+++ pidgin-2.6.4.new/pidgin/plugins/Makefile.in 2009-12-27 16:59:13.000000000 +0100
@@ -644,6 +644,7 @@
$(DEBUG_CFLAGS) \
$(GTK_CFLAGS) \
$(GSTREAMER_CFLAGS) \
+ $(GSTINTERFACES_CFLAGS) \
$(PLUGIN_CFLAGS)

4
pkgs/applications/networking/irc/irssi/default.nix
View File

@ -1,11 +1,11 @@
{stdenv, fetchurl, pkgconfig, ncurses, glib, openssl}:
stdenv.mkDerivation rec {
name = "irssi-0.8.13";
name = "irssi-0.8.14";
src = fetchurl {
url = "http://irssi.org/files/${name}.tar.bz2";
sha256 = "0dfp0lmnw5ndl2a9lj2rc8rg1lylcjrqlrg26h4jj8blhfn42rc9";
sha256 = "0a6zizpqb4yyk7c9sxvqcj8jx20qrnfr2kwqbsckryz63kmp1sk3";
};
buildInputs = [pkgconfig ncurses glib openssl];

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

@ -12,7 +12,7 @@ stdenv.mkDerivation {
meta = {
description = "An IRC client for KDE";
homepage = http://www.konversation.org;
homepage = http://konversation.kde.org/;
license = "GPLv2";
};
}

10
pkgs/applications/networking/mailreaders/mutt/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, ncurses, which
{ stdenv, fetchurl, ncurses, which, perl
, sslSupport ? true
, imapSupport ? true
, headerCache ? true
@ -10,13 +10,13 @@ assert headerCache -> gdbm != null;
assert sslSupport -> openssl != null;
stdenv.mkDerivation {
name = "mutt-1.5.16";
name = "mutt-1.5.20";
src = fetchurl {
url = ftp://ftp.mutt.org/mutt/devel/mutt-1.5.16.tar.gz;
sha256 = "825e920b394db6f56fa8deb45977c061331f59d953944e27ff595625bbad3e83";
url = ftp://ftp.mutt.org/mutt/devel/mutt-1.5.20.tar.gz;
sha256 = "15m7m419r82awx4mr4nam25m0kpg0bs9vw1z4a4mrzvlkl3zqycm";
};
buildInputs = [
ncurses which
ncurses which perl
(if headerCache then gdbm else null)
(if sslSupport then openssl else null)
];

6
pkgs/applications/networking/mailreaders/sylpheed/default.nix
View File

@ -9,11 +9,11 @@ assert sslSupport -> openssl != null;
assert gpgSupport -> gpgme != null;
stdenv.mkDerivation {
name = "sylpheed-2.5.0";
name = "sylpheed-2.7.1";
src = fetchurl {
url = http://sylpheed.sraoss.jp/sylpheed/v2.5/sylpheed-2.5.0.tar.bz2;
sha256 = "0qc7sgcb23x16y6qhyrbv3hphqkmk5s9nr6xfxv5rqi6272qv2ni";
url = http://sylpheed.sraoss.jp/sylpheed/v2.7/sylpheed-2.7.1.tar.bz2;
sha256 = "08sfz159y8hi3lky98m6p4nkfiima749lza8gf3s3vp2niylbdlb";
};
buildInputs = [

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

@ -1,10 +1,10 @@
{stdenv, fetchurl, perl, pkgconfig, gtk, libpcap, flex, bison}:
stdenv.mkDerivation {
name = "wireshark-1.3.0";
name = "wireshark-1.3.2";
src = fetchurl {
url = http://www.wireshark.org/download/src/wireshark-1.3.0.tar.gz;
sha256 = "06vn6yklbg2ajh0gs0j58d4fwkkjxz8xn5f8xlpfkffs2m80aw2r";
url = http://www.wireshark.org/download/src/wireshark-1.3.2.tar.gz;
sha256 = "0sq0mk0iqsgcgd2gqspyfmjiql00d3ghq43qxywd8qb2jxfv1q5r";
};
configureFlags = "--with-pcap=${libpcap}";
buildInputs = [perl pkgconfig gtk libpcap flex bison];

6
pkgs/applications/networking/sync/rsync/default.nix
View File

@ -5,11 +5,11 @@
assert enableACLs -> acl != null;
stdenv.mkDerivation {
name = "rsync-3.0.5";
name = "rsync-3.0.6";
src = fetchurl {
url = http://rsync.samba.org/ftp/rsync/src/rsync-3.0.5.tar.gz;
sha256 = "1js36yv5s9dic524s7jczqk5myzp67bp24rqhbnikg6lh6pj1b20";
url = http://rsync.samba.org/ftp/rsync/src/rsync-3.0.6.tar.gz;
sha256 = "1cz1adlshjwwi41yqhw7wph7vq58a73b4zgs8piv6rnbcj9rdk1k";
};
buildInputs = stdenv.lib.optional enableACLs acl;

13
pkgs/applications/office/abiword/default.nix
View File

@ -1,16 +1,15 @@
{stdenv, fetchurl, pkgconfig, gtk, libglade, libgnomeprint,
libgnomeprintui, libgnomecanvas, fribidi, libpng, popt, libgsf,
enchant, wv
{stdenv, fetchurl, pkgconfig, gtk, libglade, libgnomecanvas, fribidi, libpng, popt, libgsf,
enchant, wv, librsvg, bzip2
}:
stdenv.mkDerivation {
name = "abiword-2.6.8";
name = "abiword-2.8.1";
src = fetchurl {
url = http://www.abisource.org/downloads/abiword/2.6.8/source/abiword-2.6.8.tar.gz;
sha256 = "14vfp668srjgy6wd22h4a93safp1iyfwhdr6y0sb751xl46nlrdn";
url = http://www.abisource.org/downloads/abiword/2.8.1/source/abiword-2.8.1.tar.gz;
sha256 = "1v6jkjd5ivaarhv41nkniqycx3k33p9r7q7dyyjn7kq2295n26zm";
};
buildInputs = [pkgconfig gtk libglade libgnomeprint libgnomeprintui
buildInputs = [pkgconfig gtk libglade librsvg bzip2
libgnomecanvas fribidi libpng popt libgsf enchant wv
];
}

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

@ -4,11 +4,11 @@
}:
stdenv.mkDerivation {
name = "vlc-0.9.9";
name = "vlc-1.0.4";
src = fetchurl {
url = http://download.videolan.org/pub/videolan/vlc/0.9.9/vlc-0.9.9.tar.bz2;
sha256 = "0jg9sgwzz1p9mwnzrnfg9gpkcjd549gnkw0zjp9v2q2cclg2jknh";
url = http://download.videolan.org/pub/videolan/vlc/1.0.4/vlc-1.0.4.tar.bz2;
sha256 = "15lqirz99dcghqdqsqlgb8fa2xs45a7r32zxhlzk5930rnh0pzyv";
};
buildInputs = [

1
pkgs/build-support/gcc-wrapper2/default.nix
View File

@ -12,6 +12,7 @@
assert nativeTools -> nativePrefix != "";
assert !nativeTools -> gcc != null && binutils != null;
assert !nativeLibc -> libc != null;
assert gcc != null;
let

2
pkgs/desktops/kde-4.3/default.nix
View File

@ -215,7 +215,7 @@ pkgs.recurseIntoAttrs (rec {
inherit (pkgs) stdenv fetchurl lib cmake qt4 qtscriptgenerator perl gettext;
inherit (pkgs) curl mysql libxml2 taglib taglib_extras loudmouth;
inherit kdelibs;
inherit automoc4 phonon strigi soprano;
inherit automoc4 phonon strigi soprano qca2;
};
filelight = import ./extragear/filelight {

10
pkgs/desktops/kde-4.3/extragear/amarok/default.nix
View File

@ -1,18 +1,18 @@
{ stdenv, fetchurl, lib, cmake, qt4, qtscriptgenerator, perl, gettext, curl, libxml2, mysql, taglib, taglib_extras, loudmouth
, kdelibs, automoc4, phonon, strigi, soprano}:
, kdelibs, automoc4, phonon, strigi, soprano, qca2}:
stdenv.mkDerivation {
name = "amarok-2.1.1";
name = "amarok-2.2.1";
src = fetchurl {
url = mirror://kde/stable/amarok/2.1.1/src/amarok-2.1.1.tar.bz2;
sha256 = "0z0irnb86f00w8d0iapbdwygwm5vr83jhfmjd1xdldsyjrz65mi7";
url = mirror://kde/stable/amarok/2.2.1/src/amarok-2.2.1.tar.bz2;
sha256 = "020srkfhly2nz3vp2xb5cd02j27r16ygm46z05vpil2csrbv5nzk";
};
includeAllQtDirs=true;
inherit mysql loudmouth;
QT_PLUGIN_PATH="${qtscriptgenerator}/lib/qt4/plugins";
builder = ./builder.sh;
buildInputs = [ cmake qt4 qtscriptgenerator perl stdenv.gcc.libc gettext curl libxml2 mysql taglib taglib_extras loudmouth
kdelibs automoc4 phonon strigi soprano ];
kdelibs automoc4 phonon strigi soprano qca2];
meta = {
description = "Popular music player for KDE";
license = "GPL";

6
pkgs/desktops/kde-4.3/extragear/ktorrent/default.nix
View File

@ -2,10 +2,10 @@
kdelibs, kdepimlibs, kdebase_workspace, automoc4, phonon, qca2}:
stdenv.mkDerivation {
name = "ktorrent-3.3.1";
name = "ktorrent-3.3.2";
src = fetchurl {
url = http://ktorrent.org/downloads/3.3.1/ktorrent-3.3.1.tar.bz2;
sha256 = "15cyq9bixism15qb3g196ga47q6iyw68sizclcn43nw91g0xl9r1";
url = http://ktorrent.org/downloads/3.3.2/ktorrent-3.3.2.tar.bz2;
sha256 = "08s67nz6wml5bx595czw2gcvrfb09hw1n1rzbj1n8iprr1abcpz1";
};
includeAllQtDirs=true;
CMAKE_PREFIX_PATH=kdepimlibs;

2
pkgs/desktops/kde-4.3/support/qca2/default.nix
View File

@ -1,7 +1,7 @@
{stdenv, fetchurl, lib, which, qt4}:
stdenv.mkDerivation {
name = "qca-2.0.1";
name = "qca-2.0.2";
src = fetchurl {
url = http://delta.affinix.com/download/qca/2.0/qca-2.0.2.tar.bz2;
sha256 = "49b5474450104a2298747c243de1451ab7a6aeed4bf7df43ffa4b7128a2837b8";

21
pkgs/development/libraries/farsight2/default.nix Normal file
View File

@ -0,0 +1,21 @@
{stdenv, fetchurl, libnice, pkgconfig, python, glib, gstreamer, gstPluginsBase}:
stdenv.mkDerivation {
name = "farsight2-0.0.16";
src = fetchurl {
url = http://farsight.freedesktop.org/releases/farsight2/farsight2-0.0.16.tar.gz;
sha256 = "07yjndkx1p7ij1ifxsnbqbr8943wmq768x4812khka7dx6ii1sv9";
};
buildInputs = [ libnice pkgconfig python glib gstreamer gstPluginsBase ];
configureFlags = "--disable-python";
patches = [./makefile.patch];
meta = {
homepage = http://farsight.freedesktop.org/wiki/;
description = "Audio/Video Communications Framework";
};
}

37
pkgs/development/libraries/farsight2/makefile.patch Normal file
View File

@ -0,0 +1,37 @@
diff -ru farsight2-0.0.16/gst/rtcpfilter/Makefile.am farsight2-0.0.16.new/gst/rtcpfilter/Makefile.am
--- farsight2-0.0.16/gst/rtcpfilter/Makefile.am 2009-05-08 23:34:14.000000000 +0200
+++ farsight2-0.0.16.new/gst/rtcpfilter/Makefile.am 2009-12-27 16:17:32.000000000 +0100
@@ -7,12 +7,14 @@
libfsrtcpfilter_la_CFLAGS = \
$(FS2_CFLAGS) \
$(GST_BASE_CFLAGS) \
+ $(GST_PLUGINS_BASE_CFLAGS) \
$(GST_CFLAGS)
libfsrtcpfilter_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
libfsrtcpfilter_la_LIBADD = \
$(FS2_LIBS) \
-lgstrtp-@GST_MAJORMINOR@ \
$(GST_BASE_LIBS) \
+ $(GST_PLUGINS_BASE_LIBS) \
$(GST_LIBS)
diff -ru farsight2-0.0.16/gst/rtcpfilter/Makefile.in farsight2-0.0.16.new/gst/rtcpfilter/Makefile.in
--- farsight2-0.0.16/gst/rtcpfilter/Makefile.in 2009-10-06 20:24:00.000000000 +0200
+++ farsight2-0.0.16.new/gst/rtcpfilter/Makefile.in 2009-12-27 16:23:36.000000000 +0100
@@ -314,13 +314,14 @@
libfsrtcpfilter_la_CFLAGS = \
$(FS2_CFLAGS) \
$(GST_BASE_CFLAGS) \
+ $(GST_PLUGINS_BASE_CFLAGS) \
$(GST_CFLAGS)
libfsrtcpfilter_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
libfsrtcpfilter_la_LIBADD = \
$(FS2_LIBS) \
-lgstrtp-@GST_MAJORMINOR@ \
- $(GST_BASE_LIBS) \
+ $(GST_PLUGINS_BASE_LIBS) \
$(GST_LIBS)
glib_enum_define = FS_RTCP_FILTER

4
pkgs/development/libraries/gstreamer/gst-plugins-base/default.nix
View File

@ -4,14 +4,14 @@
, liboil, gtk, which, gtkdoc, ... }:
stdenv.mkDerivation rec {
name = "gst-plugins-base-0.10.22";
name = "gst-plugins-base-0.10.25";
src = fetchurl {
urls = [
"${meta.homepage}/src/gst-plugins-base/${name}.tar.bz2"
"mirror://gentoo/distfiles/${name}.tar.bz2"
];
sha256 = "1yfmkji12gn8cl2nmgs8bbdadnc5hrywn0zwfsi3izpb0gnmlk0q";
sha256 = "01s61nm1svs2lqlpjlp3yywa3m39p81awklwx4dszrqqv3hzgcha";
};
patchPhase = "sed -i 's@/bin/echo@echo@g' configure";

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

@ -2,14 +2,14 @@
, which, gtkdoc, glib, libxml2, ... }:
stdenv.mkDerivation rec {
name = "gstreamer-0.10.22";
name = "gstreamer-0.10.25";
src = fetchurl {
urls = [
"${meta.homepage}/src/gstreamer/${name}.tar.bz2"
"mirror://gentoo/distfiles/${name}.tar.bz2"
];
sha256 = "17iqgsnh1v43ai9m9iyqv6dds7iwqw2445b0qxnjwdmij80rwj31";
sha256 = "0y35a9b2m66rsxlkksakdbimfxy2j5q1wim9k3czd3gs7dxvmcir";
};
buildInputs = [perl bison flex pkgconfig python which gtkdoc ];

16
pkgs/development/libraries/libnice/default.nix Normal file
View File

@ -0,0 +1,16 @@
{stdenv, fetchurl, pkgconfig, glib}:
stdenv.mkDerivation {
name = "libnice-0.0.10";
src = fetchurl {
url = http://nice.freedesktop.org/releases/libnice-0.0.10.tar.gz;
sha256 = "04r7syk67ihw8gzy83f603kmwvqv2dpd1mrfzpk4p72vjqrqidl6";
};
buildInputs = [ pkgconfig glib ];
meta = {
homepage = http://nice.freedesktop.org/wiki/;
};
}

2
pkgs/development/libraries/qt-4.5/default.nix
View File

@ -72,7 +72,7 @@ stdenv.mkDerivation {
meta = {
homepage = http://www.qtsoftware.com/downloads/opensource/appdev/linux-x11-cpp;
description = "A cross-platform application framework for C++";
license = "QPL/GPL/LGPL";
license = "GPL/LGPL";
maintainers = [ lib.maintainers.sander ];
};
}

78
pkgs/development/libraries/qt-4.6/default.nix Normal file
View File

@ -0,0 +1,78 @@
{ stdenv, fetchurl, lib
, libXft, libXrender, randrproto, xextproto, libXinerama, xineramaproto, libXcursor, libXmu
, libXext, libXfixes, inputproto, fixesproto, libXrandr, freetype, fontconfig
, zlib, libjpeg, mysql, libpng, which, mesa, openssl, dbus, cups, pkgconfig, libtiff, glib
, buildDemos ? false, buildExamples ? false, keepDocumentation ? false}:
stdenv.mkDerivation {
name = "qt-4.6.0";
src = fetchurl {
url = ftp://ftp.qt.nokia.com/qt/source/qt-everywhere-opensource-src-4.6.0.tar.gz;
sha256 = "12c5s9am0wd7a9fkpgizssv21hq17vra46j4ply3ixi46f0rq9am";
};
setupHook = ./setup-hook.sh;
propagatedBuildInputs = [
libXft
libXrender
libXrandr
randrproto
xextproto
libXinerama
xineramaproto
libXcursor
zlib
libjpeg
mysql
libpng
which
mesa
libXmu
openssl
dbus.libs
cups
pkgconfig
libXext
freetype
fontconfig
inputproto
fixesproto
libXfixes
glib
libtiff
];
prefixKey = "-prefix ";
configureFlags = ''
-v -no-separate-debug-info -release
-system-zlib -system-libpng -system-libjpeg -fast
-qt-gif -confirm-license -opensource
-opengl -xrender -xrandr -xinerama -xcursor -qt-sql-mysql
-qdbus -cups -glib -xfixes -dbus-linked
-fontconfig -I${freetype}/include/freetype2
${if buildDemos == true then "" else "-nomake demos"}
${if buildExamples == true then "" else "-nomake examples"}
'';
patchPhase = ''
substituteInPlace configure --replace /bin/pwd pwd
sed -e 's@/usr@/FOO@' -i config.tests/*/*.test -i mkspecs/*/*.conf
'';
# Remove the documentation: it takes up >= 130 MB, which is more
# than half of the installed size. Ideally we should put this in a
# separate package (as well as the Qt Designer).
postInstall = ''
${if keepDocumentation == false then "rm -rf $out/doc" else ""}
'';
meta = {
homepage = http://www.qtsoftware.com/downloads/opensource/appdev/linux-x11-cpp;
description = "A cross-platform application framework for C++";
license = "GPL/LGPL";
maintainers = [ lib.maintainers.sander ];
};
}

9
pkgs/development/libraries/qt-4.6/setup-hook.sh Normal file
View File

@ -0,0 +1,9 @@
export QTDIR=@out@
if [ -n "$includeAllQtDirs" ]; then
# This helps for g++, but not for moc. And no qt4 package should expect
# having all qt4 header files dirs into -I.
for d in @out@/include/*; do
export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I$d"
done
fi

6
pkgs/development/libraries/taglib-extras/default.nix
View File

@ -1,10 +1,10 @@
{stdenv, fetchurl, cmake, taglib}:
stdenv.mkDerivation {
name = "taglib-extras-0.1.7";
name = "taglib-extras-1.0.1";
src = fetchurl {
url = http://www.kollide.net/~jefferai/taglib-extras-0.1.7.tar.gz;
sha256 = "0n8nq218d2cni9sf67kggrzv1h60hn395yy99fdj6i6n97mwcsr0";
url = http://www.kollide.net/~jefferai/taglib-extras-1.0.1.tar.gz;
sha256 = "0cln49ws9svvvals5fzxjxlzqm0fzjfymn7yfp4jfcjz655nnm7y";
};
buildInputs = [ cmake taglib ];
}

8
pkgs/development/libraries/taglib/default.nix
View File

@ -1,13 +1,15 @@
{stdenv, fetchurl, zlib}:
stdenv.mkDerivation {
name = "taglib-1.5";
name = "taglib-1.6.1";
src = fetchurl {
url = http://developer.kde.org/~wheeler/files/src/taglib-1.5.tar.gz;
sha256 = "1hhfap06zqrn17zh1cl3qlh3i598jw3qs01y2dc4i7akxhb0fqds";
url = http://developer.kde.org/~wheeler/files/src/taglib-1.6.1.tar.gz;
sha256 = "0i5s3n6i8ac5q7gqdnynrmi75as24nhy76y0q0v764llw82jlxcf";
};
configureFlags = "--enable-asf --enable-mp4";
buildInputs = [zlib];
meta = {

4
pkgs/development/python-modules/setuptools/default.nix
View File

@ -2,7 +2,7 @@ a :
let
fetchurl = a.fetchurl;
version = a.lib.attrByPath ["version"] "0.6c9" a;
version = a.lib.attrByPath ["version"] "0.6c11" a;
buildInputs = with a; [
python makeWrapper
];
@ -12,7 +12,7 @@ rec {
src = fetchurl {
url = "http://pypi.python.org/packages/source/s/setuptools/${name}.tar.gz";
sha256 = "1n5k6hf9nn69fnprgsnr9hdxzj2j6ir76qcy9d4b2v0v62bh86g6";
sha256 = "1lx1hwxkhipyh206bgl90ddnfcnb68bzcvyawczbf833fadyl3v3";
};
inherit buildInputs;

21
pkgs/development/tools/misc/help2man/help2man-1.36.4.nix
View File

@ -1,21 +0,0 @@
{stdenv, fetchurl, perl, gettext, perlLocaleGettext}:
stdenv.mkDerivation {
name = "help2man-1.36.4";
src = fetchurl {
url = mirror://gnu/help2man/help2man-1.36.4.tar.gz;
md5 = "d31a0a38c2ec71faa06723f6b8bd3076";
};
buildInputs = [
perl
gettext
perlLocaleGettext
];
# So that configure can find `preloadable_libintl.so'.
LD_LIBRARY_PATH = gettext + "/lib";
inherit gettext;
}

6
pkgs/games/scummvm/default.nix
View File

@ -1,11 +1,11 @@
{stdenv, fetchurl, SDL, zlib, mpeg2dec}:
stdenv.mkDerivation {
name = "scummvm-0.13.1";
name = "scummvm-1.0.0";
src = fetchurl {
url = mirror://sourceforge/scummvm/scummvm-0.13.1.tar.bz2;
sha256 = "1nd089673w775xs6hk9z780l18a008z0srli3cf16aq2a8rh1s23";
url = mirror://sourceforge/scummvm/scummvm-1.0.0.tar.bz2;
sha256 = "1v00ikxn9j7vid0jrf7hh7wvk8scv69isif26ngh3jngs2wk42cj";
};
buildInputs = [SDL zlib mpeg2dec];

19
pkgs/games/ultimatestunts/default.nix Normal file
View File

@ -0,0 +1,19 @@
{stdenv, fetchurl, SDL, mesa, SDL_image, freealut}:
stdenv.mkDerivation rec {
name = "ultimate-stunts-0.7.5.1";
src = fetchurl {
url = mirror://sourceforge/ultimatestunts/ultimatestunts-srcdata-0751.tar.gz;
sha256 = "1s4xkaw0i6vqkjhi63plmrbrhhr408i3pv36qkpchpiiiw5bb7lv";
};
buildInputs = [ SDL mesa SDL_image freealut ];
meta = {
homepage = http://www.ultimatestunts.nl/;
description = "Remake of the popular racing DOS-game Stunts";
license = "GPLv2+";
maintainers = with stdenv.lib.maintainers; [viric];
platforms = with stdenv.lib.platforms; linux;
};
}

8
pkgs/games/wesnoth/default.nix
View File

@ -2,16 +2,16 @@ args: with args;
stdenv.mkDerivation rec {
pname = "wesnoth";
version = "1.4.1";
version = "1.6.5";
name = "${pname}-${version}";
src = fetchurl {
url = "http://surfnet.dl.sourceforge.net/sourceforge/${pname}/${name}.tar.bz2";
sha256 = "c5b7b478553dc8994d99024e14b48b3f64e2c328631bd5b05904509b499fa68c";
url = "mirror://sourceforge/sourceforge/${pname}/${name}.tar.bz2";
sha256 = "1mrhgwp8iw27ifpavnf4y69zf9fqfy7j4sfwkfzsay226sp4gw3y";
};
buildInputs = [SDL SDL_image SDL_mixer SDL_net gettext zlib boost freetype];
buildInputs = [SDL SDL_image SDL_mixer SDL_net SDL_ttf pango gettext zlib boost freetype libpng pkgconfig];
configureFlags = "--with-preferences-dir=.${name} --program-suffix=-${version} --with-datadir-name=${name} --with-boost=${boost}/include --disable-python";

12
pkgs/games/xmoto/64bit-ftbs.patch Normal file
View File

@ -0,0 +1,12 @@
From debian: https://launchpad.net/ubuntu/karmic/+source/xmoto/0.5.2-2
--- a/src/Replay.cpp
+++ b/src/Replay.cpp
@@ -156,7 +156,7 @@
v_replay.writeBuf(pcData, nDataSize);
/* Chunks */
- v_replay << m_Chunks.size();
+ v_replay << (unsigned int)m_Chunks.size();
for(unsigned int i=0;i<m_Chunks.size();i++) {
v_replay << m_Chunks[i]->nNumStates;
v_replay.writeBuf(m_Chunks[i]->pcChunkData, m_nStateSize * m_Chunks[i]->nNumStates);

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

@ -15,12 +15,15 @@ rec {
configureFlags = [];
/* doConfigure should be removed if not needed */
phaseNames = ["doConfigure" "doMakeInstall"];
phaseNames = [ "doPatch" "doConfigure" "doMakeInstall"];
patches = [ ./64bit-ftbs.patch ];
meta = {
description = "X-Moto - obstacled race game";
maintainers = [
a.lib.maintainers.raskin
a.lib.maintainers.viric
];
platforms = with a.lib.platforms;
linux ++ freebsd;

6
pkgs/misc/lilypond/default.nix
View File

@ -2,7 +2,7 @@
args: with args;
stdenv.mkDerivation {
name = "lilypond-2.13.3";
name = "lilypond-2.13.9";
/*
# REGION AUTO UPDATE: { name="lilypond"; type = "git"; url = "git://git.sv.gnu.org/lilypond.git"; }
@ -13,8 +13,8 @@ stdenv.mkDerivation {
*/
src = fetchurl {
url = http://download.linuxaudio.org/lilypond/sources/v2.13/lilypond-2.13.3.tar.gz;
sha256 = "1ihnkgpd19q3sns7k6wvx4x1ccb1cw9ins3qasfs5n7srhc3cvac";
url = http://download.linuxaudio.org/lilypond/sources/v2.13/lilypond-2.13.9.tar.gz;
sha256 = "1x3jz0zbhly4rc07nry3ia3ydd6vislz81gg0ivwfm6f6q0ssk57";
};
configureFlags = [ "--disable-documentation" "--with-ncsb-dir=${ghostscript}/share/ghostscript/fonts"];

6
pkgs/misc/sane-backends/default.nix
View File

@ -4,11 +4,11 @@
assert hotplugSupport -> stdenv.system == "i686-linux";
stdenv.mkDerivation {
name = "sane-backends-1.0.18";
name = "sane-backends-1.0.20";
src = fetchurl {
url = ftp://ftp.sane-project.org/pub/sane/sane-backends-1.0.18/sane-backends-1.0.18.tar.gz;
md5 = "7ca7e2908e24721471de92cf40c75e60";
url = ftp://ftp.sane-project.org/pub/sane/sane-backends-1.0.20/sane-backends-1.0.20.tar.gz;
sha256 = "0fixmq3jbz77zcy2cikb882kz8bq3n40n0jaykiczfcjc4g57ccg";
};
udevSupport = hotplugSupport;

6
pkgs/misc/xsane/default.nix
View File

@ -1,11 +1,11 @@
{stdenv, fetchurl, saneBackends, saneFrontends,
libX11, gtk, pkgconfig, libusb ? null}:
stdenv.mkDerivation {
name = "xsane-0.995";
name = "xsane-0.996";
src = fetchurl {
url = ftp://ftp.sane-project.org/pub/sane/xsane/xsane-0.995.tar.gz;
sha256 = "02rl5bkk3z3k6s04ki14l12vsl5jnx4mri66m1hl799m7hjl5836";
url = ftp://ftp.sane-project.org/pub/sane/xsane/xsane-0.996.tar.gz;
sha256 = "0zddar0y76iv4c55qzfmnm819z5hzisr2jwjb60x36v6bdrhcjx5";
};
buildInputs = [saneBackends saneFrontends libX11 gtk pkgconfig ] ++

31
pkgs/os-specific/linux/firmware/iwlwifi-1000-ucode/default.nix Normal file
View File

@ -0,0 +1,31 @@
{stdenv, fetchurl}:
stdenv.mkDerivation rec {
name = "iwlwifi-1000-ucode-128.50.3.1";
src = fetchurl {
url = "http://intellinuxwireless.org/iwlwifi/downloads/${name}.tgz";
sha256 = "7e81ddad18acec19364c9df22496e8afae99a2e1490b2b178e420b52d443728d";
};
buildPhase = "true";
installPhase = ''
ensureDir "$out"
chmod -x *
cp * "$out"
'';
meta = {
description = "Firmware for the Intel 1000 wireless card";
longDescription = ''
This package provides version 3 of the Intel wireless card
firmware, for Linux up to 2.6.26. It contains the
`iwlwifi-1000-3.ucode' file, which is loaded by the `iwlagn'
driver found in recent kernels.
'';
homepage = http://intellinuxwireless.org/;
};
}

6
pkgs/os-specific/linux/firmware/iwlwifi-5000-ucode/default.nix
View File

@ -1,11 +1,11 @@
{stdenv, fetchurl}:
stdenv.mkDerivation rec {
name = "iwlwifi-5000-ucode-5.4.A.11";
name = "iwlwifi-5000-ucode-8.24.2.12";
src = fetchurl {
url = "http://intellinuxwireless.org/iwlwifi/downloads/${name}.tar.gz";
sha256 = "0mbxfl2phjv5wa6ngml4yg6wn8yjva843i91532fr75rd6z78fxl";
url = "http://intellinuxwireless.org/iwlwifi/downloads/${name}.tgz";
sha256 = "0h47cmpxa9cmysz0g42ga9da8qjfzqdf0w43fqx1cbnr8yg12ac1";
};
buildPhase = "true";

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

@ -1,11 +1,11 @@
{stdenv, fetchurl}:
stdenv.mkDerivation rec {
name = "iptables-1.4.4";
name = "iptables-1.4.6";
src = fetchurl {
url = "http://www.netfilter.org/projects/iptables/files/${name}.tar.bz2";
sha256 = "0vsv3011cssra1cj9rag3z6m9ca7jaikphr26hvj0qnijbcp90pk";
sha256 = "193jdplnkzikrmk0y313d9alc4kp5gi55aikw3b668fnrac2fwvf";
};
meta = {

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

@ -3,11 +3,11 @@ args @ { stdenv, fetchurl, userModeLinux ? false, extraConfig ? "", ... }:
import ./generic.nix (
rec {
version = "2.6.27.41";
version = "2.6.27.42";
src = fetchurl {
url = "mirror://kernel/linux/kernel/v2.6/linux-${version}.tar.bz2";
sha256 = "1a26yycbry64214pf1z96rz3jyrylqh0barsdsw7m1x15v7s6gn8";
sha256 = "0nsjhikswqrag44wablsr02kl03p8jwd0j50brg6gpjwb3485zaz";
};
features.iwlwifi = true;

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

@ -4,11 +4,11 @@ args @ { stdenv, fetchurl, platform, userModeLinux ? false, extraConfig ? ""
import ./generic.nix (
rec {
version = "2.6.32.1";
version = "2.6.32.2";
src = fetchurl {
url = "mirror://kernel/linux/kernel/v2.6/linux-${version}.tar.bz2";
sha256 = "1kjmvbjrfygy2lpxs7cqcg4q690swa67r70kv9nypkn5vb2s0vpm";
sha256 = "16fyfcj6cgd5b1n0qnf2lgx5v806xycr3w1nhyys1qc0ffy2iccj";
};
features.iwlwifi = true;

6
pkgs/os-specific/linux/wireless-tools/default.nix
View File

@ -1,11 +1,11 @@
{stdenv, fetchurl}:
stdenv.mkDerivation {
name = "wireless-tools-29-pre21";
name = "wireless-tools-29";
src = fetchurl {
url = http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux/wireless_tools.29.pre21.tar.gz;
sha256 = "1agk4i3jvwzdiin7c19ixn8ipi4f2vg71lp3mzcjqmghph9lhwch";
url = http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux/wireless_tools.29.tar.gz;
sha256 = "18g5wa3rih89i776nc2n2s50gcds4611gi723h9ki190zqshkf3g";
};
preBuild = "

11
pkgs/tools/archivers/cromfs/default.nix
View File

@ -1,18 +1,19 @@
{stdenv, fetchurl, pkgconfig, fuse, perl}:
stdenv.mkDerivation {
name = "cromfs-1.5.8.6";
stdenv.mkDerivation rec {
name = "cromfs-1.5.9";
src = fetchurl {
url = http://bisqwit.iki.fi/src/arch/cromfs-1.5.8.6.tar.bz2;
sha256 = "00m362q0b7z1688pjhvnbr14y3p1lgaymq5k9r42z3blzw8mgmay";
url = "http://bisqwit.iki.fi/src/arch/${name}.tar.bz2";
sha256 = "0vdpgx0g6yrhqsg50fhksdaaid4gf2gifrxd0xs3idhwg4jmg4ik";
};
patchPhase = ''sed -i 's@/bin/bash@/bin/sh@g' configure; set -x'';
meta = {
description = "FUSE Compressed ROM filesystem with lzma" ;
homepage = http://bisqwit.iki.fi/source/cromfs.html;
maintainers = with stdenv.lib.maintainers; [viric];
platforms = with stdenv.lib.platforms; linux;
};
# Removing the static linking, as it doesn't compile in x86_64.

6
pkgs/tools/graphics/dcraw/default.nix
View File

@ -1,11 +1,11 @@
{stdenv, fetchurl, libjpeg, lcms, gettext }:
stdenv.mkDerivation {
name = "dcraw-8.93";
name = "dcraw-8.98";
src = fetchurl {
url = http://www.cybercom.net/~dcoffin/dcraw/archive/dcraw-8.93.tar.gz;
sha256 = "1vjqfpqr0pczrf8ap3jpar1f98gik9is9v34sv1ridcxx87rniqz";
url = http://www.cybercom.net/~dcoffin/dcraw/archive/dcraw-8.98.tar.gz;
sha256 = "0vb375m1s5b1d72d9a5apcyxz2b9zl0pycj700yhy2zsfx804kmp";
};
buildInputs = [ libjpeg lcms gettext ];

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

@ -4,11 +4,11 @@
}:
stdenv.mkDerivation (rec {
name = "nmap-4.75";
name = "nmap-5.00";
src = fetchurl {
url = "http://nmap.org/dist/${name}.tar.bz2";
sha256 = "0k4ylwlkn06zl6pfr2ig8340qrmfsbdh5rqqlnhpj55likbgrl37";
sha256 = "0k91x31js5kzfxhil3m53k2ylks1pvbccllc99n31vc1dryri2xq";
};
postInstall =''

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

@ -3376,6 +3376,12 @@ let
inherit fetchurl stdenv;
};
farsight2 = import ../development/libraries/farsight2 {
inherit fetchurl stdenv libnice pkgconfig python;
inherit (gnome) glib;
inherit (gst_all) gstreamer gstPluginsBase;
};
fcgi = import ../development/libraries/fcgi {
inherit fetchurl stdenv;
};
@ -4048,6 +4054,11 @@ let
inherit stdenv fetchurl perl;
};
libnice = import ../development/libraries/libnice {
inherit stdenv fetchurl pkgconfig;
inherit (gnome) glib;
};
libQGLViewer = import ../development/libraries/libqglviewer {
inherit fetchurl stdenv;
inherit qt4;
@ -4547,6 +4558,14 @@ let
inherit (gnome) glib;
};
qt46 = import ../development/libraries/qt-4.6 {
inherit fetchurl stdenv lib zlib libjpeg libpng which mysql mesa openssl cups dbus
fontconfig freetype pkgconfig libtiff;
inherit (xlibs) xextproto libXft libXrender libXrandr randrproto
libXmu libXinerama xineramaproto libXcursor libXext
inputproto fixesproto libXfixes;
inherit (gnome) glib;
};
qtscriptgenerator = import ../development/libraries/qtscriptgenerator {
inherit stdenv fetchurl;
qt4 = qt45;
@ -5506,6 +5525,10 @@ let
inherit fetchurl stdenv;
};
iwlwifi1000ucode = import ../os-specific/linux/firmware/iwlwifi-1000-ucode {
inherit fetchurl stdenv;
};
iwlwifi3945ucode = import ../os-specific/linux/firmware/iwlwifi-3945-ucode {
inherit fetchurl stdenv;
};
@ -6086,7 +6109,9 @@ let
};
wesnoth = import ../games/wesnoth {
inherit fetchurl stdenv SDL SDL_image SDL_mixer SDL_net gettext zlib boost freetype;
inherit fetchurl stdenv SDL SDL_image SDL_mixer SDL_net SDL_ttf
gettext zlib boost freetype libpng pkgconfig;
inherit (gtkLibs) pango;
};
wirelesstools = import ../os-specific/linux/wireless-tools {
@ -6311,9 +6336,9 @@ let
};
abiword = import ../applications/office/abiword {
inherit fetchurl stdenv pkgconfig fribidi libpng popt libgsf enchant wv;
inherit fetchurl stdenv pkgconfig fribidi libpng popt libgsf enchant wv librsvg bzip2;
inherit (gtkLibs) gtk;
inherit (gnome) libglade libgnomeprint libgnomeprintui libgnomecanvas;
inherit (gnome) libglade libgnomecanvas;
};
adobeReader = import ../applications/misc/adobe-reader {
@ -6597,7 +6622,7 @@ let
dia = import ../applications/graphics/dia {
inherit stdenv fetchurl pkgconfig perl perlXMLParser
libxml2 gettext python libxml2Python docbook5 docbook_xsl
libxslt;
libxslt intltool;
inherit (gtkLibs) gtk glib;
};
@ -6902,6 +6927,15 @@ let
inherit (xlibs) libX11 libXxf86vm;
};
xfontsel = import ../applications/misc/xfontsel {
inherit fetchurl stdenv pkgconfig;
inherit (xlibs) libX11 libXaw;
};
xlsfonts = import ../applications/misc/xlsfonts {
inherit fetchurl stdenv pkgconfig;
inherit (xlibs) libX11;
};
fspot = import ../applications/graphics/f-spot {
inherit fetchurl stdenv perl perlXMLParser pkgconfig mono
libexif libjpeg sqlite lcms libgphoto2 monoDLLFixer;
@ -7353,7 +7387,7 @@ let
};
mutt = import ../applications/networking/mailreaders/mutt {
inherit fetchurl stdenv ncurses which openssl gdbm;
inherit fetchurl stdenv ncurses which openssl gdbm perl;
};
msmtp = import ../applications/networking/msmtp {
@ -7427,14 +7461,15 @@ let
};
pidgin = import ../applications/networking/instant-messengers/pidgin {
inherit fetchurl stdenv pkgconfig perl perlXMLParser libxml2 nss nspr
gtkspell aspell gettext ncurses avahi dbus dbus_glib lib intltool;
inherit fetchurl stdenv pkgconfig perl perlXMLParser libxml2 nss nspr farsight2
gtkspell aspell gettext ncurses avahi dbus dbus_glib lib intltool libidn;
openssl = if (getConfig ["pidgin" "openssl"] true) then openssl else null;
gnutls = if (getConfig ["pidgin" "gnutls"] false) then gnutls else null;
GStreamer = gst_all.gstreamer;
inherit (gtkLibs) gtk;
inherit (gnome) startupnotification;
inherit (xlibs) libXScrnSaver;
inherit (gst_all) gstPluginsBase;
};
pidginlatex = composedArgsAndFun (import ../applications/networking/instant-messengers/pidgin-plugins/pidgin-latex) {
@ -7633,7 +7668,7 @@ let
};
tangogps = import ../applications/misc/tangogps {
inherit fetchurl stdenv pkgconfig gettext curl libexif sqlite;
inherit fetchurl stdenv pkgconfig gettext curl libexif sqlite libxml2;
inherit (gtkLibs) gtk;
gconf = gnome.GConf;
};
@ -8158,6 +8193,10 @@ let
python24 = python;
};*/
ultimatestunts = import ../games/ultimatestunts {
inherit stdenv fetchurl SDL mesa SDL_image freealut;
};
ut2004demo = import ../games/ut2004demo {
inherit fetchurl stdenv xlibs mesa;
};

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

@ -325,6 +325,7 @@ in {
qt3 = allBut "i686-cygwin";
qt4 = linux;
qt45 = linux;
qt46 = linux;
quake3demo = linux;
readline = all;
reiserfsprogs = linux;