From b15381fcf64cce388556936fafae92adc49c7f6c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Wed, 4 Jan 2012 09:29:52 +0000 Subject: [PATCH 01/32] Adding pngtoico. svn path=/nixpkgs/trunk/; revision=31264 --- pkgs/tools/graphics/pngtoico/default.nix | 23 +++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 25 insertions(+) create mode 100644 pkgs/tools/graphics/pngtoico/default.nix diff --git a/pkgs/tools/graphics/pngtoico/default.nix b/pkgs/tools/graphics/pngtoico/default.nix new file mode 100644 index 00000000000..df1046cb750 --- /dev/null +++ b/pkgs/tools/graphics/pngtoico/default.nix @@ -0,0 +1,23 @@ +{ stdenv, fetchurl, libpng }: + +stdenv.mkDerivation rec { + name = "pngtoico-1.0"; + + src = fetchurl { + url = mirror://kernel/software/graphics/pngtoico/pngtoico-1.0.tar.gz; + sha256 = "1xb4aa57sjvgqfp01br3dm72hf7q0gb2ad144s1ifrs09215fgph"; + }; + + configurePhase = '' + sed -i s,/usr/local,$out, Makefile + ''; + + buildInputs = [ libpng ]; + + meta = { + homepage = http://www.kernel.org/pub/software/graphics/pngtoico/; + description = "Small utility to convert a set of PNG images to Microsoft ICO format"; + license = "GPLv2+"; + platforms = with stdenv.lib.platforms; linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index bab49f41245..e5437286794 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1203,6 +1203,8 @@ let pngnq = callPackage ../tools/graphics/pngnq { }; + pngtoico = callPackage ../tools/graphics/pngtoico { }; + polipo = callPackage ../servers/polipo { }; polkit_gnome = callPackage ../tools/security/polkit-gnome { }; From 8fadcd285aaed8534617cef3e2af6e4ee22f4e87 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Wed, 4 Jan 2012 09:42:38 +0000 Subject: [PATCH 02/32] Adding icoutils svn path=/nixpkgs/trunk/; revision=31265 --- pkgs/tools/graphics/icoutils/default.nix | 19 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 21 insertions(+) create mode 100644 pkgs/tools/graphics/icoutils/default.nix diff --git a/pkgs/tools/graphics/icoutils/default.nix b/pkgs/tools/graphics/icoutils/default.nix new file mode 100644 index 00000000000..69d35fec162 --- /dev/null +++ b/pkgs/tools/graphics/icoutils/default.nix @@ -0,0 +1,19 @@ +{ stdenv, fetchurl, libpng }: + +stdenv.mkDerivation rec { + name = "icoutils-0.29.1"; + + src = fetchurl { + url = "mirror://savannah/icoutils/${name}.tar.bz2"; + sha256 = "180yqv41yc3fi6ggx7azhmaciqzadj0ir87wajigmcpgxkjk6v34"; + }; + + buildInputs = [ libpng ]; + + meta = { + homepage = http://www.nongnu.org/icoutils/ + description = "Set of programs to deal with Microsoft Windows(R) icon and cursor files";; + license = "GPLv3+"; + platforms = with stdenv.lib.platforms; linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e5437286794..c5e1de2532a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -852,6 +852,8 @@ let iasl = callPackage ../development/compilers/iasl { }; + icoutils = callPackage ../tools/graphics/icoutils { }; + idutils = callPackage ../tools/misc/idutils { }; iftop = callPackage ../tools/networking/iftop { }; From 855e8f45a4f46e409a911715add088d0a8873274 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Wed, 4 Jan 2012 09:47:22 +0000 Subject: [PATCH 03/32] Fixing a typo in the icoutils file. svn path=/nixpkgs/trunk/; revision=31267 --- pkgs/tools/graphics/icoutils/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/graphics/icoutils/default.nix b/pkgs/tools/graphics/icoutils/default.nix index 69d35fec162..5abc909ea30 100644 --- a/pkgs/tools/graphics/icoutils/default.nix +++ b/pkgs/tools/graphics/icoutils/default.nix @@ -11,8 +11,8 @@ stdenv.mkDerivation rec { buildInputs = [ libpng ]; meta = { - homepage = http://www.nongnu.org/icoutils/ - description = "Set of programs to deal with Microsoft Windows(R) icon and cursor files";; + homepage = http://www.nongnu.org/icoutils/; + description = "Set of programs to deal with Microsoft Windows(R) icon and cursor files"; license = "GPLv3+"; platforms = with stdenv.lib.platforms; linux; }; From 07de46c2fab8a82aacd153166678999b3c9cc5b0 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Wed, 4 Jan 2012 10:31:49 +0000 Subject: [PATCH 04/32] Update E prover svn path=/nixpkgs/trunk/; revision=31269 --- pkgs/applications/science/logic/eProver/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/science/logic/eProver/default.nix b/pkgs/applications/science/logic/eProver/default.nix index 138995036a6..327a5d3a623 100644 --- a/pkgs/applications/science/logic/eProver/default.nix +++ b/pkgs/applications/science/logic/eProver/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, which, texLive }: stdenv.mkDerivation { - name = "EProver-1.2"; + name = "EProver-1.4"; src = fetchurl { - name = "E-1.2.tar.gz"; - url = "http://www4.informatik.tu-muenchen.de/~schulz/WORK/E_DOWNLOAD/V_1.2/E.tgz"; - sha256 = "14sbpmh8vg376lrrq7i364aa8g5aacq344ihivxn6w4ydh9138nq"; + name = "E-1.4.tar.gz"; + url = "http://www4.informatik.tu-muenchen.de/~schulz/WORK/E_DOWNLOAD/V_1.4/E.tgz"; + sha256 = "1hxkr21xqkkh4bzqip6qf70w9xvvb8p20zzkvyin631ffgvyvr93"; }; buildInputs = [which texLive]; From 8046598a800dd8a5c9b84ef0db3e5e01c9b5102d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Wed, 4 Jan 2012 13:37:54 +0000 Subject: [PATCH 05/32] Make gnome panel 2.28 build - it missed libtool as buildInputs. svn path=/nixpkgs/trunk/; revision=31275 --- pkgs/desktops/gnome-2/desktop/gnome-panel/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome-2/desktop/gnome-panel/default.nix b/pkgs/desktops/gnome-2/desktop/gnome-panel/default.nix index 774b1ff508b..db9b08c3728 100644 --- a/pkgs/desktops/gnome-2/desktop/gnome-panel/default.nix +++ b/pkgs/desktops/gnome-2/desktop/gnome-panel/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, pkgconfig, dbus_glib, dbus, cairo, popt, which, libxml2Python, libxslt, bzip2, python , glib, gtk, pango, atk, libXau , intltool, ORBit2, libglade, libgnome, libgnomeui, libbonobo, libbonoboui, GConf, gnome_menus, gnome_desktop -, libwnck, librsvg, libgweather, gnome_doc_utils, libgnomecanvas, libart_lgpl, libtasn1}: +, libwnck, librsvg, libgweather, gnome_doc_utils, libgnomecanvas, libart_lgpl, libtasn1, libtool}: stdenv.mkDerivation { name = "gnome-panel-2.28.0"; @@ -11,7 +11,7 @@ stdenv.mkDerivation { }; buildInputs = [ pkgconfig gtk dbus_glib popt which libxml2Python libxslt bzip2 python libXau intltool ORBit2 libglade libgnome libgnomeui libbonobo libbonoboui GConf gnome_menus gnome_desktop - libwnck librsvg libgweather gnome_doc_utils libtasn1 ]; + libwnck librsvg libgweather gnome_doc_utils libtasn1 libtool ]; configureFlags = "--disable-scrollkeeper"; CPPFLAGS = "-I${glib}/include/glib-2.0 -I${glib}/include/gio-unix-2.0 -I${glib}/lib/glib-2.0/include -I${dbus_glib}/include/dbus-1.0 -I${dbus.libs}/include/dbus-1.0 "+ "-I${gtk}/include/gtk-2.0 -I${gtk}/lib/gtk-2.0/include -I${cairo}/include/cairo -I${pango}/include/pango-1.0 "+ From 25db5f1a9d49666486b49014d1eb7d9325172545 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Wed, 4 Jan 2012 13:55:54 +0000 Subject: [PATCH 06/32] Adding libgdiplus for mono, and making mono reference it. svn path=/nixpkgs/trunk/; revision=31276 --- pkgs/development/compilers/mono/default.nix | 6 ++++-- pkgs/development/libraries/libgdiplus/default.nix | 15 +++++++++++++++ pkgs/top-level/all-packages.nix | 3 +++ 3 files changed, 22 insertions(+), 2 deletions(-) create mode 100644 pkgs/development/libraries/libgdiplus/default.nix diff --git a/pkgs/development/compilers/mono/default.nix b/pkgs/development/compilers/mono/default.nix index 471f0d5b36d..8b85400f780 100644 --- a/pkgs/development/compilers/mono/default.nix +++ b/pkgs/development/compilers/mono/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, bison, pkgconfig, glib, gettext, perl}: +{stdenv, fetchurl, bison, pkgconfig, glib, gettext, perl, libgdiplus}: stdenv.mkDerivation { name = "mono-2.10.8.1"; @@ -7,7 +7,7 @@ stdenv.mkDerivation { sha256 = "0h4hdj99qg0nsg5260izwaybs59wysf7y399kffhg43fidpndz0x"; }; - buildInputs = [bison pkgconfig glib gettext perl]; + buildInputs = [bison pkgconfig glib gettext perl libgdiplus]; propagatedBuildInputs = [glib]; NIX_LDFLAGS = "-lgcc_s" ; @@ -15,6 +15,8 @@ stdenv.mkDerivation { # To overcome the bug https://bugzilla.novell.com/show_bug.cgi?id=644723 dontDisableStatic = true; + configureFlags = "--with-libgdiplus=${libgdiplus}/lib/libgdiplus.so"; + # Attempt to fix this error when running "mcs --version": # The file /nix/store/xxx-mono-2.4.2.1/lib/mscorlib.dll is an invalid CIL image dontStrip = true; diff --git a/pkgs/development/libraries/libgdiplus/default.nix b/pkgs/development/libraries/libgdiplus/default.nix new file mode 100644 index 00000000000..27745cc209a --- /dev/null +++ b/pkgs/development/libraries/libgdiplus/default.nix @@ -0,0 +1,15 @@ +{ stdenv, fetchurl, pkgconfig, glib, cairo, fontconfig +, libtiff, giflib, libungif, libjpeg, libpng, monoDLLFixer, +libXrender, libexif }: + +stdenv.mkDerivation { + name = "libgdiplus-2.10"; + + src = fetchurl { + url = http://download.mono-project.com/sources/libgdiplus/libgdiplus-2.10.tar.bz2; + sha256 = "190j6yvfbpg6bda4n7pdcf2dbqdvrb4dmz5abs2yv0smxybh77id"; + }; + + buildInputs = [ pkgconfig glib cairo fontconfig libtiff giflib libungif + libjpeg libpng libXrender libexif ]; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c5e1de2532a..debee6f072e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3936,6 +3936,9 @@ let libgcrypt = callPackage ../development/libraries/libgcrypt { }; + libgdiplus = callPackage ../development/libraries/libgdiplus { + }; + libgpgerror = callPackage ../development/libraries/libgpg-error { }; libgphoto2 = callPackage ../development/libraries/libgphoto2 { }; From 0348f11e22b9575873d831cbc3a9bdcc08adbb33 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 4 Jan 2012 14:23:41 +0000 Subject: [PATCH 07/32] * DBD::SQLite updated to 1.35. svn path=/nixpkgs/trunk/; revision=31277 --- pkgs/development/perl-modules/DBD-SQLite/default.nix | 6 +++--- pkgs/top-level/perl-packages.nix | 10 +--------- 2 files changed, 4 insertions(+), 12 deletions(-) diff --git a/pkgs/development/perl-modules/DBD-SQLite/default.nix b/pkgs/development/perl-modules/DBD-SQLite/default.nix index b37dd422ee6..8e1faf900a0 100644 --- a/pkgs/development/perl-modules/DBD-SQLite/default.nix +++ b/pkgs/development/perl-modules/DBD-SQLite/default.nix @@ -1,14 +1,14 @@ {fetchurl, buildPerlPackage, DBI, sqlite}: buildPerlPackage rec { - name = "DBD-SQLite-1.31"; + name = "DBD-SQLite-1.35"; src = fetchurl { url = "mirror://cpan/authors/id/A/AD/ADAMK/${name}.tar.gz"; - sha256 = "1xi9bfxfndb4kajixc1y7rrz2sjjv2z7vcm5msrxznx3vr358zlq"; + sha256 = "0zdwnj0jmkaqb2grkh451g1jc8nsdy4sf6lhn8xd0my0a3pd227z"; }; - propagatedBuildInputs = [DBI]; + propagatedBuildInputs = [ DBI ]; makeMakerFlags = "SQLITE_LOCATION=${sqlite}"; diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 8b591231820..421c03ea0af 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -1101,15 +1101,7 @@ rec { DBDSQLite = import ../development/perl-modules/DBD-SQLite { inherit fetchurl buildPerlPackage DBI; - - # sqlite-3.7.9 breaks DBDSQLite, overriding locally for now - sqlite = pkgs.lib.overrideDerivation pkgs.sqlite (args: { - name = "sqlite-3.7.7.1"; - src = fetchurl { - url = http://www.sqlite.org/sqlite-autoconf-3070701.tar.gz; - sha256 = "1pvf72gb6yidc4zjml3k6kwhlvvhbgmbm8hfin9y5jvvbyr3dk3x"; - }; - }); + inherit (pkgs) sqlite; }; DBDmysql = import ../development/perl-modules/DBD-mysql { From 7fcf771c2ae9ce88b18605565a96bd3f8abff33f Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 4 Jan 2012 15:06:21 +0000 Subject: [PATCH 08/32] * Handle the attributes added by the multiple outputs branch. svn path=/nixpkgs/trunk/; revision=31278 --- pkgs/lib/customisation.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/lib/customisation.nix b/pkgs/lib/customisation.nix index d2af4814628..b914d4ca603 100644 --- a/pkgs/lib/customisation.nix +++ b/pkgs/lib/customisation.nix @@ -34,7 +34,7 @@ rec { overrideDerivation = drv: f: let # Filter out special attributes. - drop = ["meta" "passthru" "outPath" "drvPath" "hostDrv" "buildDrv" "type" "override" "deepOverride" "origArgs"] + drop = [ "meta" "passthru" "outPath" "drvPath" "hostDrv" "buildDrv" "type" "override" "deepOverride" "origArgs" "drvAttrs" "outputName" "all" "out" ] # also drop functions such as .merge .override etc ++ lib.filter (n: isFunction (getAttr n drv)) (attrNames drv); attrs = removeAttrs drv drop; From 3ca658287487cf6747236835de0c7a816e187270 Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Wed, 4 Jan 2012 15:10:27 +0000 Subject: [PATCH 09/32] ppp-2.4.5, a few patches svn path=/nixpkgs/trunk/; revision=31279 --- pkgs/tools/networking/ppp/default.nix | 49 +++++++++------------- pkgs/tools/networking/ppp/nix-purity.patch | 22 ++++++++++ pkgs/tools/networking/ppp/nonpriv.patch | 13 ++++++ pkgs/top-level/all-packages.nix | 4 +- 4 files changed, 56 insertions(+), 32 deletions(-) create mode 100644 pkgs/tools/networking/ppp/nix-purity.patch create mode 100644 pkgs/tools/networking/ppp/nonpriv.patch diff --git a/pkgs/tools/networking/ppp/default.nix b/pkgs/tools/networking/ppp/default.nix index 08097b4f5b3..9034c09acc8 100644 --- a/pkgs/tools/networking/ppp/default.nix +++ b/pkgs/tools/networking/ppp/default.nix @@ -1,41 +1,32 @@ -a : -let - fetchurl = a.fetchurl; +{ stdenv, fetchurl, substituteAll, libpcap }: + +stdenv.mkDerivation rec { + name = "ppp-2.4.5"; - version = a.lib.attrByPath ["version"] "2.4.4" a; - buildInputs = with a; [ - - ]; -in -rec { src = fetchurl { - url = "http://ppp.samba.org/ftp/ppp/ppp-${version}.tar.gz"; - sha256 = "1sli1s478k85vmjdbrqm39nn5r20x9qgg3a0lbp2dwz50zy4bbsq"; + url = "${meta.homepage}ftp/ppp/${name}.tar.gz"; + sha256 = "019m00q85nrgdpjlhb9021a3iw3pr4a0913gp4h9k7r9r7z7lca3"; }; - inherit buildInputs; - configureFlags = []; + patches = + [ ( substituteAll { + src = ./nix-purity.patch; + inherit libpcap; + glibc = stdenv.gcc.libc; + }) + ./nonpriv.patch + ]; - phaseNames = ["exportVars" "patchPrivileged" "doConfigure" "doMakeInstall"]; + postPatch = "rm -v include/linux/if_pppol2tp.h"; - exportVars = a.noDepEntry('' - export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -lcrypt " - ''); + buildInputs = [ libpcap ]; - /* We want to run it as far as we can with our current permissions - For example, dependent builds would prefer to run --version - without ever using setuid pppd. We are not setuid anyway, so.. */ - patchPrivileged = a.fullDepEntry('' - sed -e '/privileged =/aprivileged = 1;' -i pppd/main.c - sed -e '/SH DESCRIPTION/a WARNING: Patched version unsuitable to be setuid root' -i pppd/pppd.8 - '') ["minInit" "doUnpack"]; + postInstall = "chmod -v -R +rw $out"; - passthru = { - inherit version; - }; - - name = "ppp-" + version; meta = { + homepage = http://ppp.samba.org/; description = "Point-to-point implementation for Linux and Solaris"; + platforms = stdenv.lib.platforms.linux; + maintainers = [ stdenv.lib.maintainers.urkud ]; }; } diff --git a/pkgs/tools/networking/ppp/nix-purity.patch b/pkgs/tools/networking/ppp/nix-purity.patch new file mode 100644 index 00000000000..c74935c0ec8 --- /dev/null +++ b/pkgs/tools/networking/ppp/nix-purity.patch @@ -0,0 +1,22 @@ +diff --git a/pppd/Makefile.linux b/pppd/Makefile.linux +index 060db6a..c151c62 100644 +--- a/pppd/Makefile.linux ++++ b/pppd/Makefile.linux +@@ -117,7 +117,7 @@ CFLAGS += -DHAS_SHADOW + #LIBS += -lshadow $(LIBS) + endif + +-ifneq ($(wildcard /usr/include/crypt.h),) ++ifneq ($(wildcard @glibc@/include/crypt.h),) + CFLAGS += -DHAVE_CRYPT_H=1 + LIBS += -lcrypt + endif +@@ -169,7 +169,7 @@ LIBS += -ldl + endif + + ifdef FILTER +-ifneq ($(wildcard /usr/include/pcap-bpf.h),) ++ifneq ($(wildcard @libpcap@/include/pcap-bpf.h),) + LIBS += -lpcap + CFLAGS += -DPPP_FILTER + endif diff --git a/pkgs/tools/networking/ppp/nonpriv.patch b/pkgs/tools/networking/ppp/nonpriv.patch new file mode 100644 index 00000000000..df6faaf8383 --- /dev/null +++ b/pkgs/tools/networking/ppp/nonpriv.patch @@ -0,0 +1,13 @@ +diff --git a/pppd/main.c b/pppd/main.c +index 014d614..6661d33 100644 +--- a/pppd/main.c ++++ b/pppd/main.c +@@ -334,7 +334,7 @@ main(argc, argv) + umask(umask(0777) | 022); + + uid = getuid(); +- privileged = uid == 0; ++ privileged = (uid == 0) || (geteuid() != 0); + slprintf(numbuf, sizeof(numbuf), "%d", uid); + script_setenv("ORIG_UID", numbuf, 0); + diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index debee6f072e..a0d8b17df96 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1217,9 +1217,7 @@ let ppl0_11 = callPackage ../development/libraries/ppl/0.11.nix { }; - /* WARNING: this version is unsuitable for using with a setuid wrapper */ - ppp = builderDefsPackage (import ../tools/networking/ppp) { - }; + ppp = callPackage ../tools/networking/ppp { }; pptp = callPackage ../tools/networking/pptp {}; From 3b4451ade5c4c7d931ab35de9155dddaaf19f8a1 Mon Sep 17 00:00:00 2001 From: Alexander Tsamutali Date: Wed, 4 Jan 2012 16:46:25 +0000 Subject: [PATCH 10/32] games/tremulous: Removed rust. svn path=/nixpkgs/trunk/; revision=31282 --- pkgs/games/tremulous/default.nix | 9 ++++++++- pkgs/games/tremulous/parse.patch | 21 +++++++++++++++++++++ 2 files changed, 29 insertions(+), 1 deletion(-) create mode 100644 pkgs/games/tremulous/parse.patch diff --git a/pkgs/games/tremulous/default.nix b/pkgs/games/tremulous/default.nix index 0124e2f448b..a4a887e2ed3 100644 --- a/pkgs/games/tremulous/default.nix +++ b/pkgs/games/tremulous/default.nix @@ -25,6 +25,12 @@ stdenv.mkDerivation rec { tar xvf $src3 cd .. ''; + patches = [ ./parse.patch ]; + patchFlags = "-p 0"; + NIX_LD_FLAGS = '' + -rpath ${stdenv.gcc}/lib + -rpath ${stdenv.gcc}/lib64 + ''; buildPhase = '' cd Release_1.011 make @@ -45,11 +51,12 @@ stdenv.mkDerivation rec { cat << EOF > $out/bin/$b #!/bin/sh cd $out/opt/tremulous - ./$b.$arch "$@" + exec ./$b.$arch "\$@" EOF chmod +x $out/bin/$b done ''; + dontPatchELF = true; meta = { description = "A game that blends a team based FPS with elements of an RTS"; longDescription = '' diff --git a/pkgs/games/tremulous/parse.patch b/pkgs/games/tremulous/parse.patch new file mode 100644 index 00000000000..12a73138c09 --- /dev/null +++ b/pkgs/games/tremulous/parse.patch @@ -0,0 +1,21 @@ +diff -ruN Release_1.011-old/src/qcommon/parse.c Release_1.011/src/qcommon/parse.c +--- Release_1.011-old/src/qcommon/parse.c 2011-12-02 19:11:49.307368651 -0500 ++++ Release_1.011/src/qcommon/parse.c 2011-12-02 19:13:27.556836387 -0500 +@@ -981,7 +981,7 @@ + { + if (*string == '\"') + { +- strcpy(string, string+1); ++ memmove(string, string+1, strlen(string)); + } + if (string[strlen(string)-1] == '\"') + { +@@ -1784,7 +1784,7 @@ + if ((*ptr == '\\' || *ptr == '/') && + (*(ptr+1) == '\\' || *(ptr+1) == '/')) + { +- strcpy(ptr, ptr+1); ++ memmove(ptr, ptr+1, strlen(ptr)); + } + else + { From aac6654ed531a9ed977cff5950f592c40edb0207 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 4 Jan 2012 17:48:32 +0000 Subject: [PATCH 11/32] haskell-vector: updated to version 0.9.1 svn path=/nixpkgs/trunk/; revision=31283 --- .../libraries/haskell/vector/{0.9.nix => 0.9.1.nix} | 4 ++-- pkgs/top-level/haskell-packages.nix | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) rename pkgs/development/libraries/haskell/vector/{0.9.nix => 0.9.1.nix} (82%) diff --git a/pkgs/development/libraries/haskell/vector/0.9.nix b/pkgs/development/libraries/haskell/vector/0.9.1.nix similarity index 82% rename from pkgs/development/libraries/haskell/vector/0.9.nix rename to pkgs/development/libraries/haskell/vector/0.9.1.nix index 549eaa4ae60..c5c06fe93e5 100644 --- a/pkgs/development/libraries/haskell/vector/0.9.nix +++ b/pkgs/development/libraries/haskell/vector/0.9.1.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "vector"; - version = "0.9"; - sha256 = "0m8sfp924sw5dwr9a63jgsbj98qm9nyy903842x6ii4ljb1cpynz"; + version = "0.9.1"; + sha256 = "1m6p9dy48fwh2y21y7r6svhzs86a1yijkjil7ch1mdn86gv0f9as"; buildDepends = [ primitive ]; meta = { homepage = "http://code.haskell.org/vector"; diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index dc5e772df0f..2c182e461f4 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1344,10 +1344,10 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); vector_0_7_1 = callPackage ../development/libraries/haskell/vector/0.7.1.nix { primitive = self.primitive_0_3_1; }; - vector_0_9 = callPackage ../development/libraries/haskell/vector/0.9.nix { + vector_0_9_1 = callPackage ../development/libraries/haskell/vector/0.9.1.nix { primitive = self.primitive_0_4_0_1; }; - vector = self.vector_0_9; + vector = self.vector_0_9_1; vectorAlgorithms = callPackage ../development/libraries/haskell/vector-algorithms {}; From 2f3cb61b985471987a88f63be64a34caa7705f75 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 4 Jan 2012 17:48:36 +0000 Subject: [PATCH 12/32] haskell-sendfile: updated to version 0.7.4 svn path=/nixpkgs/trunk/; revision=31284 --- pkgs/development/libraries/haskell/sendfile/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/sendfile/default.nix b/pkgs/development/libraries/haskell/sendfile/default.nix index 94244755b73..b2c24da5b1b 100644 --- a/pkgs/development/libraries/haskell/sendfile/default.nix +++ b/pkgs/development/libraries/haskell/sendfile/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "sendfile"; - version = "0.7.3"; - sha256 = "0xa5ryyznw7cizdqjnisvyhirdljw5z7aydwv5m9lv9hkx3bs6l0"; + version = "0.7.4"; + sha256 = "1h02fjdivsb3divdn3wg2skmw3jcd0n4axhlpgmrrbf92c3m35rq"; buildDepends = [ network ]; meta = { homepage = "http://patch-tag.com/r/mae/sendfile"; From 660701471cf67a6866f75d8a5c4d6c6053e2c0bb Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 4 Jan 2012 17:48:40 +0000 Subject: [PATCH 13/32] Dropped obsolete versions of haskell-primitive and haskell-vector. svn path=/nixpkgs/trunk/; revision=31285 --- .../libraries/haskell/primitive/0.3.1.nix | 17 ----------------- .../primitive/{0.4.0.1.nix => default.nix} | 0 .../libraries/haskell/vector/0.7.1.nix | 18 ------------------ .../haskell/vector/{0.9.1.nix => default.nix} | 0 pkgs/top-level/haskell-packages.nix | 12 ++---------- 5 files changed, 2 insertions(+), 45 deletions(-) delete mode 100644 pkgs/development/libraries/haskell/primitive/0.3.1.nix rename pkgs/development/libraries/haskell/primitive/{0.4.0.1.nix => default.nix} (100%) delete mode 100644 pkgs/development/libraries/haskell/vector/0.7.1.nix rename pkgs/development/libraries/haskell/vector/{0.9.1.nix => default.nix} (100%) diff --git a/pkgs/development/libraries/haskell/primitive/0.3.1.nix b/pkgs/development/libraries/haskell/primitive/0.3.1.nix deleted file mode 100644 index 6e7b485eece..00000000000 --- a/pkgs/development/libraries/haskell/primitive/0.3.1.nix +++ /dev/null @@ -1,17 +0,0 @@ -{ cabal }: - -cabal.mkDerivation (self: { - pname = "primitive"; - version = "0.3.1"; - sha256 = "1903hx88ax4dgyyx00a0k86jy4mkqrprpn7arfy19dqqyfpb2ikj"; - meta = { - homepage = "http://code.haskell.org/primitive"; - description = "Wrappers for primitive operations"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; - }; -}) diff --git a/pkgs/development/libraries/haskell/primitive/0.4.0.1.nix b/pkgs/development/libraries/haskell/primitive/default.nix similarity index 100% rename from pkgs/development/libraries/haskell/primitive/0.4.0.1.nix rename to pkgs/development/libraries/haskell/primitive/default.nix diff --git a/pkgs/development/libraries/haskell/vector/0.7.1.nix b/pkgs/development/libraries/haskell/vector/0.7.1.nix deleted file mode 100644 index 8762d148e28..00000000000 --- a/pkgs/development/libraries/haskell/vector/0.7.1.nix +++ /dev/null @@ -1,18 +0,0 @@ -{ cabal, primitive }: - -cabal.mkDerivation (self: { - pname = "vector"; - version = "0.7.1"; - sha256 = "1cdbkabw49pgc1j5h96inpmhn8ly230885d22smmynrq369pmg07"; - buildDepends = [ primitive ]; - meta = { - homepage = "http://code.haskell.org/vector"; - description = "Efficient Arrays"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; - }; -}) diff --git a/pkgs/development/libraries/haskell/vector/0.9.1.nix b/pkgs/development/libraries/haskell/vector/default.nix similarity index 100% rename from pkgs/development/libraries/haskell/vector/0.9.1.nix rename to pkgs/development/libraries/haskell/vector/default.nix diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 2c182e461f4..b4fdbe46329 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1055,9 +1055,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); prettyShow = callPackage ../development/libraries/haskell/pretty-show {}; - primitive_0_3_1 = callPackage ../development/libraries/haskell/primitive/0.3.1.nix {}; - primitive_0_4_0_1 = callPackage ../development/libraries/haskell/primitive/0.4.0.1.nix {}; - primitive = self.primitive_0_4_0_1; + primitive = callPackage ../development/libraries/haskell/primitive {}; processLeksah = callPackage ../development/libraries/haskell/leksah/process-leksah.nix {}; @@ -1341,13 +1339,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); Vec = callPackage ../development/libraries/haskell/Vec {}; - vector_0_7_1 = callPackage ../development/libraries/haskell/vector/0.7.1.nix { - primitive = self.primitive_0_3_1; - }; - vector_0_9_1 = callPackage ../development/libraries/haskell/vector/0.9.1.nix { - primitive = self.primitive_0_4_0_1; - }; - vector = self.vector_0_9_1; + vector = callPackage ../development/libraries/haskell/vector {}; vectorAlgorithms = callPackage ../development/libraries/haskell/vector-algorithms {}; From 883ae24a70732c5811631d76f4328b43294ba29c Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 4 Jan 2012 17:48:44 +0000 Subject: [PATCH 14/32] haskell-conduit: updated to version 0.0.0.2 svn path=/nixpkgs/trunk/; revision=31286 --- pkgs/development/libraries/haskell/conduit/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/conduit/default.nix b/pkgs/development/libraries/haskell/conduit/default.nix index 76a7130ecb1..75289459385 100644 --- a/pkgs/development/libraries/haskell/conduit/default.nix +++ b/pkgs/development/libraries/haskell/conduit/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "conduit"; - version = "0.0.0.1"; - sha256 = "0l3q9jj0dpbn2ixjx6d9m6ss92dmfgd5xc7wgfpb9d0kfk2li0sv"; + version = "0.0.0.2"; + sha256 = "1fngrlly5q2l0j3fil4cx3zj2h4sxnh20i0r84l4qhl8s0x5ba5z"; buildDepends = [ liftedBase monadControl text transformers transformersBase ]; From 9bd85d5cf23a7cc04c74b396745f6c6541ca0234 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 4 Jan 2012 17:48:47 +0000 Subject: [PATCH 15/32] haskell-continued-fractions: updated to version 0.9.1.1 svn path=/nixpkgs/trunk/; revision=31287 --- .../libraries/haskell/continued-fractions/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/continued-fractions/default.nix b/pkgs/development/libraries/haskell/continued-fractions/default.nix index 71801a324c3..26b683c1969 100755 --- a/pkgs/development/libraries/haskell/continued-fractions/default.nix +++ b/pkgs/development/libraries/haskell/continued-fractions/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "continued-fractions"; - version = "0.9.1.0"; - sha256 = "07g6ms68xfzd25zr2k2fpg4f4pynmq4mn7djkzrg3gbfh9gfq37q"; + version = "0.9.1.1"; + sha256 = "0gqp1yazmmmdf04saa306jdsf8r5s98fll9rnm8ff6jzr87nvnnh"; meta = { homepage = "/dev/null"; description = "Continued fractions"; From cde76888f96015775d4eccccb3dfe82b509fbcbf Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 4 Jan 2012 17:48:50 +0000 Subject: [PATCH 16/32] haskell-gamma: updated to version 0.9.0.2 svn path=/nixpkgs/trunk/; revision=31288 --- pkgs/development/libraries/haskell/gamma/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/gamma/default.nix b/pkgs/development/libraries/haskell/gamma/default.nix index 7a068a25eee..2853fbca768 100755 --- a/pkgs/development/libraries/haskell/gamma/default.nix +++ b/pkgs/development/libraries/haskell/gamma/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "gamma"; - version = "0.9.0.1"; - sha256 = "02s9m2vlrnfg26c7921x60xxmawzzk27y3czcnvs8hlk01mb1xv7"; + version = "0.9.0.2"; + sha256 = "09z4m0qsf1aa2al7x3gl7z3xy6r4m0xqhnz8b917dxa104zw6flq"; buildDepends = [ continuedFractions converge vector ]; meta = { homepage = "https://github.com/mokus0/gamma"; From 18bf57c213bae39cefd1236fd594d9b3e593509e Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 4 Jan 2012 17:48:53 +0000 Subject: [PATCH 17/32] haskell-haskeline: updated to version 0.6.4.6 svn path=/nixpkgs/trunk/; revision=31289 --- pkgs/development/libraries/haskell/haskeline/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/haskeline/default.nix b/pkgs/development/libraries/haskell/haskeline/default.nix index 2b15fa562bf..f3cd0fd4aed 100644 --- a/pkgs/development/libraries/haskell/haskeline/default.nix +++ b/pkgs/development/libraries/haskell/haskeline/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "haskeline"; - version = "0.6.4.5"; - sha256 = "1blhbh53p6di3q3gldzmg3i8f4w3ahipai3di49i4rdcnjry0j5b"; + version = "0.6.4.6"; + sha256 = "136h71rb50sypkdbnk849mbcgfzx3y4hfxmx2c7kf90zpmsx5wmj"; buildDepends = [ extensibleExceptions mtl terminfo utf8String ]; meta = { homepage = "http://trac.haskell.org/haskeline"; From b515072dbe7ec774216a2456abd9ca1bef8cce7f Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 4 Jan 2012 17:48:55 +0000 Subject: [PATCH 18/32] haskell-http-conduit: updated to version 1.0.0.1 svn path=/nixpkgs/trunk/; revision=31290 --- pkgs/development/libraries/haskell/http-conduit/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/http-conduit/default.nix b/pkgs/development/libraries/haskell/http-conduit/default.nix index ab011d5c87b..9a2ac22721c 100644 --- a/pkgs/development/libraries/haskell/http-conduit/default.nix +++ b/pkgs/development/libraries/haskell/http-conduit/default.nix @@ -7,8 +7,8 @@ cabal.mkDerivation (self: { pname = "http-conduit"; - version = "1.0.0"; - sha256 = "1ix2qx6zqp8g7hjg2ygwivzg4hhz2ac22rbybh9adzvzw0q2yvgk"; + version = "1.0.0.1"; + sha256 = "0yag65ariakvbvsrr3kd16bags4caw8n3qlcwpzrblprgjrv06vm"; isLibrary = true; isExecutable = true; buildDepends = [ From 35807a138dcd10a929100099fe49041a9fc1d86b Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 4 Jan 2012 17:48:58 +0000 Subject: [PATCH 19/32] haskell-http-enumerator: updated to version 0.7.2.2 svn path=/nixpkgs/trunk/; revision=31291 --- .../development/libraries/haskell/http-enumerator/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/http-enumerator/default.nix b/pkgs/development/libraries/haskell/http-enumerator/default.nix index 2a285965f9c..c29489e1d9f 100644 --- a/pkgs/development/libraries/haskell/http-enumerator/default.nix +++ b/pkgs/development/libraries/haskell/http-enumerator/default.nix @@ -7,8 +7,8 @@ cabal.mkDerivation (self: { pname = "http-enumerator"; - version = "0.7.2.1"; - sha256 = "1qbarxi9268yzb3phnfgvnszbkzs6r63gqzy63h69kpi0k0wl84i"; + version = "0.7.2.2"; + sha256 = "0s0mjws2sgpbydx4cv9waz71lpylgbbyk0wmvypyjvfhxd9d01hf"; isLibrary = true; isExecutable = true; buildDepends = [ From e822279529b4e4fc8b267b41c48fb055409fe522 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 4 Jan 2012 17:49:01 +0000 Subject: [PATCH 20/32] haskell-xml-enumerator: updated to version 0.4.4.1 svn path=/nixpkgs/trunk/; revision=31292 --- .../libraries/haskell/xml-enumerator/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/haskell/xml-enumerator/default.nix b/pkgs/development/libraries/haskell/xml-enumerator/default.nix index 698279be5c6..c891096c205 100644 --- a/pkgs/development/libraries/haskell/xml-enumerator/default.nix +++ b/pkgs/development/libraries/haskell/xml-enumerator/default.nix @@ -5,15 +5,15 @@ cabal.mkDerivation (self: { pname = "xml-enumerator"; - version = "0.4.4"; - sha256 = "1xz37gzk3kk9sqkcbyspcdyz7rk3afkv33g7q45ih5fbd7zkd5gm"; + version = "0.4.4.1"; + sha256 = "0vwn6s7x626970b8lgyhmngkqv5n5kvv0qikrvi9sjzq5rjyx1zj"; buildDepends = [ attoparsec attoparsecEnumerator blazeBuilder blazeBuilderEnumerator dataDefault enumerator failure text transformers xmlTypes ]; meta = { homepage = "http://github.com/snoyberg/xml"; - description = "Pure-Haskell utilities for dealing with XML with the enumerator package"; + description = "Pure-Haskell utilities for dealing with XML with the enumerator package. (deprecated)"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; maintainers = [ From a227e558ee870f6b3c7052b7b0c02cb6c1de88e7 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 4 Jan 2012 17:49:04 +0000 Subject: [PATCH 21/32] haskell-numeric-prelude: updated to version 0.3 svn path=/nixpkgs/trunk/; revision=31293 --- .../libraries/haskell/numeric-prelude/default.nix | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/haskell/numeric-prelude/default.nix b/pkgs/development/libraries/haskell/numeric-prelude/default.nix index cef5347e758..ef3ffbddf1a 100644 --- a/pkgs/development/libraries/haskell/numeric-prelude/default.nix +++ b/pkgs/development/libraries/haskell/numeric-prelude/default.nix @@ -1,15 +1,16 @@ -{ cabal, nonNegative, parsec, QuickCheck, random, storableRecord -, utilityHt +{ cabal, deepseq, nonNegative, parsec, QuickCheck, random +, storableRecord, utilityHt }: cabal.mkDerivation (self: { pname = "numeric-prelude"; - version = "0.2.2.1"; - sha256 = "12b2h103f43rlrfk3zck6mzbvw6v4jf8g4kxz1k14v201lrvb2da"; + version = "0.3"; + sha256 = "0zxqfsgyg7gf051qjzv57bb1cvrbzlvvyyl2d3gmikyy6h3pis1f"; isLibrary = true; isExecutable = true; buildDepends = [ - nonNegative parsec QuickCheck random storableRecord utilityHt + deepseq nonNegative parsec QuickCheck random storableRecord + utilityHt ]; meta = { homepage = "http://www.haskell.org/haskellwiki/Numeric_Prelude"; From 8869873f106c4ce947cefa99a909f0b4e1b37555 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 4 Jan 2012 17:49:07 +0000 Subject: [PATCH 22/32] haskell-random-fu: updated to version 0.2.1.1 svn path=/nixpkgs/trunk/; revision=31294 --- pkgs/development/libraries/haskell/random-fu/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/random-fu/default.nix b/pkgs/development/libraries/haskell/random-fu/default.nix index a094ee687e6..653a4c8534d 100644 --- a/pkgs/development/libraries/haskell/random-fu/default.nix +++ b/pkgs/development/libraries/haskell/random-fu/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "random-fu"; - version = "0.2.1.0"; - sha256 = "0jm91xjrlzj25f3giiv2ka5r8bn1ircj56d5lpqixi7c7r9dc804"; + version = "0.2.1.1"; + sha256 = "034pnmagly3akmmcli018258fnyqlyz79av21dqqklfixvw3yja7"; buildDepends = [ erf gamma monadLoops mtl randomShuffle randomSource rvar syb transformers vector From 961ad6a31402d335b5b4d94d8fbedd71b33203cc Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 4 Jan 2012 19:04:09 +0000 Subject: [PATCH 23/32] * rp-pppoe requires a version attribute in ppp. svn path=/nixpkgs/trunk/; revision=31295 --- pkgs/tools/networking/ppp/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/networking/ppp/default.nix b/pkgs/tools/networking/ppp/default.nix index 9034c09acc8..2ca22fb1da7 100644 --- a/pkgs/tools/networking/ppp/default.nix +++ b/pkgs/tools/networking/ppp/default.nix @@ -1,7 +1,8 @@ { stdenv, fetchurl, substituteAll, libpcap }: stdenv.mkDerivation rec { - name = "ppp-2.4.5"; + version = "2.4.5"; + name = "ppp-${version}"; src = fetchurl { url = "${meta.homepage}ftp/ppp/${name}.tar.gz"; From ca73b1fb3396d9f41bccdc2790e3e1f7f7720ee6 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 4 Jan 2012 19:48:08 +0000 Subject: [PATCH 24/32] =?UTF-8?q?*=20Resolve=20a=20collision=20between=20O?= =?UTF-8?q?penSSL=20and=20man-pages=20=20=20(in=20=E2=80=98share/man/man3/?= =?UTF-8?q?err.3=E2=80=99).?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit svn path=/nixpkgs/trunk/; revision=31296 --- pkgs/development/libraries/openssl/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/openssl/default.nix b/pkgs/development/libraries/openssl/default.nix index 01f9eca15bb..dd5e03c33f9 100644 --- a/pkgs/development/libraries/openssl/default.nix +++ b/pkgs/development/libraries/openssl/default.nix @@ -70,5 +70,6 @@ stdenv.mkDerivation { description = "A cryptographic library that implements the SSL and TLS protocols"; platforms = stdenv.lib.platforms.all; maintainers = [ stdenv.lib.maintainers.simons ]; + priority = 10; # resolves collision with ‘man-pages’ }; } From 4b4022a4e041823c0ec027c3497f7174cf39eee9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Wed, 4 Jan 2012 21:18:50 +0000 Subject: [PATCH 25/32] Add meta for mono. svn path=/nixpkgs/trunk/; revision=31297 --- pkgs/development/compilers/mono/default.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/pkgs/development/compilers/mono/default.nix b/pkgs/development/compilers/mono/default.nix index 8b85400f780..2f257fccc52 100644 --- a/pkgs/development/compilers/mono/default.nix +++ b/pkgs/development/compilers/mono/default.nix @@ -15,6 +15,8 @@ stdenv.mkDerivation { # To overcome the bug https://bugzilla.novell.com/show_bug.cgi?id=644723 dontDisableStatic = true; + # In fact I think this line does not help at all to what I + # wanted to achieve: have mono to find libgdiplus automatically configureFlags = "--with-libgdiplus=${libgdiplus}/lib/libgdiplus.so"; # Attempt to fix this error when running "mcs --version": @@ -27,4 +29,12 @@ stdenv.mkDerivation { makeFlagsArray=(INSTALL=`type -tp install`) patchShebangs ./ "; + + meta = { + homepage = http://mono-project.com/; + description = "Cross platform, open source .NET development framework"; + platforms = with stdenv.lib.platforms; linux; + maintainers = with stdenv.lib.maintainers; [viric]; + license = "free"; # Combination of LGPL/X11/GPL ? + }; } From 95b42b8134d7793d54b1cee286935e80705eddf4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Wed, 4 Jan 2012 21:34:03 +0000 Subject: [PATCH 26/32] Updating linux to 2.6.32.52 and 3.1.7 svn path=/nixpkgs/trunk/; revision=31299 --- pkgs/os-specific/linux/kernel/linux-2.6.32.nix | 4 ++-- pkgs/os-specific/linux/kernel/linux-3.1.nix | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-2.6.32.nix b/pkgs/os-specific/linux/kernel/linux-2.6.32.nix index 1c2e1fb5e30..d47ad8f65ce 100644 --- a/pkgs/os-specific/linux/kernel/linux-2.6.32.nix +++ b/pkgs/os-specific/linux/kernel/linux-2.6.32.nix @@ -198,11 +198,11 @@ in import ./generic.nix ( rec { - version = "2.6.32.45"; + version = "2.6.32.52"; src = fetchurl { url = "mirror://kernel/linux/kernel/v2.6/longterm/v2.6.32/linux-${version}.tar.bz2"; - sha256 = "1lyp0zl8hk2nz93n803iwfkg5g2dcd18hg0ifszg2rik8svvbbrs"; + sha256 = "0a3ws6m8942p972jjlixr5v0sh6ll0hlzxwdikb666nppjcgqiz7"; }; config = configWithPlatform stdenv.platform; diff --git a/pkgs/os-specific/linux/kernel/linux-3.1.nix b/pkgs/os-specific/linux/kernel/linux-3.1.nix index 0a44676b4a8..f1f1aa7f8fc 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.1.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.1.nix @@ -215,7 +215,7 @@ in import ./generic.nix ( rec { - version = "3.1.5"; + version = "3.1.7"; preConfigure = '' substituteInPlace scripts/depmod.sh --replace '-b "$INSTALL_MOD_PATH"' "" @@ -223,7 +223,7 @@ import ./generic.nix ( src = fetchurl { url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.bz2"; - sha256 = "0wdcpfjv56r5cc67ddhprc9vhjxj2qibhp0bl96p3hbqjjpwfpl6"; + sha256 = "1l4imli1mykcda2vvdvfr6c3h9ys9km4s0wsy778d58vcs68pc89"; }; config = configWithPlatform stdenv.platform; From d0321537d93b896a8a893ea079b739835285d521 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Wed, 4 Jan 2012 22:05:26 +0000 Subject: [PATCH 27/32] Updating dwm to 6.0. svn path=/nixpkgs/trunk/; revision=31301 --- pkgs/applications/window-managers/dwm/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/window-managers/dwm/default.nix b/pkgs/applications/window-managers/dwm/default.nix index 1427eec54f6..db469268350 100644 --- a/pkgs/applications/window-managers/dwm/default.nix +++ b/pkgs/applications/window-managers/dwm/default.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl, libX11, libXinerama, patches ? []}: stdenv.mkDerivation rec { - name = "dwm-5.9"; + name = "dwm-6.0"; src = fetchurl { url = "http://dl.suckless.org/dwm/${name}.tar.gz"; - sha256 = "0cp25zqgaqj5k1mlvgxnc5jqi252chqjc5v0fzpqbhrklaidbk9d"; + sha256 = "0mpbivy9j80l1jqq4bd4g4z8s5c54fxrjj44avmfwncjwqylifdj"; }; buildInputs = [ libX11 libXinerama ]; @@ -19,8 +19,8 @@ stdenv.mkDerivation rec { meta = { homepage = "www.suckless.org"; - description = "dynamic window manager for X"; - license="MIT"; + description = "Dynamic window manager for X"; + license = "MIT"; maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; all; }; From b1ba53e50d9f93f1114e146563d727e25e13ee9f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Wed, 4 Jan 2012 22:12:43 +0000 Subject: [PATCH 28/32] Adding vimprobable2. Patch by Alexander Forenmy. svn path=/nixpkgs/trunk/; revision=31303 --- .../browsers/vimprobable2/default.nix | 35 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 6 ++++ 2 files changed, 41 insertions(+) create mode 100644 pkgs/applications/networking/browsers/vimprobable2/default.nix diff --git a/pkgs/applications/networking/browsers/vimprobable2/default.nix b/pkgs/applications/networking/browsers/vimprobable2/default.nix new file mode 100644 index 00000000000..924139dc32e --- /dev/null +++ b/pkgs/applications/networking/browsers/vimprobable2/default.nix @@ -0,0 +1,35 @@ +{stdenv, fetchurl, makeWrapper, perl, pkgconfig, webkit, gtk, libX11, libsoup, +glib_networking}: + +stdenv.mkDerivation { + name = "vimprobable2-0.9.11.2"; + src = fetchurl { + url = "mirror://sourceforge/vimprobable/vimprobable2_0.9.11.2.tar.bz2"; + sha256 = "017qwhndchmpsn2g38v85rjx00fss69aa1nmgj3v85k5zskv7z65"; + }; + buildInputs = [ makeWrapper perl pkgconfig libX11 libsoup webkit gtk ]; + installPhase = '' + make PREFIX=/ DESTDIR=$out install + wrapProgram "$out/bin/vimprobable2" --prefix GIO_EXTRA_MODULES : \ + ${glib_networking}/lib/gio/modules + ''; + + meta = { + description = '' + Vimprobable is a web browser that behaves like the Vimperator plugin + available for Mozilla Firefox + ''; + longDescription = '' + Vimprobable is a web browser that behaves like the Vimperator plugin + available for Mozilla Firefox. It is based on the WebKit engine (using + GTK bindings). The goal of Vimprobable is to build a completely + keyboard-driven, efficient and pleasurable browsing-experience. Its + featureset might be considered "minimalistic", but not as minimalistic as + being completely featureless. + ''; + homepage = "http://sourceforge.net/apps/trac/vimprobable"; + license = "MIT"; + maintainers = ["Alexander Foremny "]; + }; +} + diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a0d8b17df96..4c0dece1a05 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8627,6 +8627,12 @@ let vice = callPackage ../misc/emulators/vice { }; + vimprobable2 = callPackage ../applications/networking/browsers/vimprobable2 { + inherit stdenv fetchurl makeWrapper perl pkgconfig webkit gtk; + inherit (xlibs) libX11; + inherit (gnome) libsoup glib_networking; + }; + VisualBoyAdvance = callPackage ../misc/emulators/VisualBoyAdvance { }; # Wine cannot be built in 64-bit; use a 32-bit build instead. From 2c9461ebddfb19633c1266aed9e2cb6cb47e239e Mon Sep 17 00:00:00 2001 From: Florian Friesdorf Date: Wed, 4 Jan 2012 23:05:41 +0000 Subject: [PATCH 29/32] freeglut-2.8.0 svn path=/nixpkgs/trunk/; revision=31304 --- ...1-remove-typedefs-now-living-in-mesa.patch | 43 +++++++++++++++++++ .../libraries/freeglut/default.nix | 12 +++--- 2 files changed, 49 insertions(+), 6 deletions(-) create mode 100644 pkgs/development/libraries/freeglut/0001-remove-typedefs-now-living-in-mesa.patch diff --git a/pkgs/development/libraries/freeglut/0001-remove-typedefs-now-living-in-mesa.patch b/pkgs/development/libraries/freeglut/0001-remove-typedefs-now-living-in-mesa.patch new file mode 100644 index 00000000000..b11a50a9de1 --- /dev/null +++ b/pkgs/development/libraries/freeglut/0001-remove-typedefs-now-living-in-mesa.patch @@ -0,0 +1,43 @@ +From 9df489c765921d8d3ff96a13c01592d9209431bb Mon Sep 17 00:00:00 2001 +From: Florian Friesdorf +Date: Wed, 4 Jan 2012 23:12:44 +0100 +Subject: [PATCH] remove typedefs now living in mesa + +--- + progs/demos/smooth_opengl3/smooth_opengl3.c | 20 -------------------- + 1 files changed, 0 insertions(+), 20 deletions(-) + +diff --git a/progs/demos/smooth_opengl3/smooth_opengl3.c b/progs/demos/smooth_opengl3/smooth_opengl3.c +index abbdfb5..1172615 100755 +--- a/progs/demos/smooth_opengl3/smooth_opengl3.c ++++ b/progs/demos/smooth_opengl3/smooth_opengl3.c +@@ -98,26 +98,6 @@ typedef char ourGLchar; + #define APIENTRY + #endif + +-typedef void (APIENTRY *PFNGLGENBUFFERSPROC) (GLsizei n, GLuint *buffers); +-typedef void (APIENTRY *PFNGLBINDBUFFERPROC) (GLenum target, GLuint buffer); +-typedef void (APIENTRY *PFNGLBUFFERDATAPROC) (GLenum target, ourGLsizeiptr size, const GLvoid *data, GLenum usage); +-typedef GLuint (APIENTRY *PFNGLCREATESHADERPROC) (GLenum type); +-typedef void (APIENTRY *PFNGLSHADERSOURCEPROC) (GLuint shader, GLsizei count, const ourGLchar **string, const GLint *length); +-typedef void (APIENTRY *PFNGLCOMPILESHADERPROC) (GLuint shader); +-typedef GLuint (APIENTRY *PFNGLCREATEPROGRAMPROC) (void); +-typedef void (APIENTRY *PFNGLATTACHSHADERPROC) (GLuint program, GLuint shader); +-typedef void (APIENTRY *PFNGLLINKPROGRAMPROC) (GLuint program); +-typedef void (APIENTRY *PFNGLUSEPROGRAMPROC) (GLuint program); +-typedef void (APIENTRY *PFNGLGETSHADERIVPROC) (GLuint shader, GLenum pname, GLint *params); +-typedef void (APIENTRY *PFNGLGETSHADERINFOLOGPROC) (GLuint shader, GLsizei bufSize, GLsizei *length, ourGLchar *infoLog); +-typedef void (APIENTRY *PFNGLGETPROGRAMIVPROC) (GLenum target, GLenum pname, GLint *params); +-typedef void (APIENTRY *PFNGLGETPROGRAMINFOLOGPROC) (GLuint program, GLsizei bufSize, GLsizei *length, ourGLchar *infoLog); +-typedef GLint (APIENTRY *PFNGLGETATTRIBLOCATIONPROC) (GLuint program, const ourGLchar *name); +-typedef void (APIENTRY *PFNGLVERTEXATTRIBPOINTERPROC) (GLuint index, GLint size, GLenum type, GLboolean normalized, GLsizei stride, const GLvoid *pointer); +-typedef void (APIENTRY *PFNGLENABLEVERTEXATTRIBARRAYPROC) (GLuint index); +-typedef GLint (APIENTRY *PFNGLGETUNIFORMLOCATIONPROC) (GLuint program, const ourGLchar *name); +-typedef void (APIENTRY *PFNGLUNIFORMMATRIX4FVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value); +- + PFNGLGENBUFFERSPROC gl_GenBuffers; + PFNGLBINDBUFFERPROC gl_BindBuffer; + PFNGLBUFFERDATAPROC gl_BufferData; +-- +1.7.8 + diff --git a/pkgs/development/libraries/freeglut/default.nix b/pkgs/development/libraries/freeglut/default.nix index a225ca748a2..9d599560fc8 100644 --- a/pkgs/development/libraries/freeglut/default.nix +++ b/pkgs/development/libraries/freeglut/default.nix @@ -1,15 +1,15 @@ -{stdenv, fetchurl, x11, mesa}: +{ stdenv, fetchurl, libXi, libXrandr, libXxf86vm, mesa, x11 }: stdenv.mkDerivation { - name = "freeglut-2.4.0"; + name = "freeglut-2.8.0"; src = fetchurl { - url = mirror://sourceforge/freeglut/freeglut-2.4.0.tar.gz; - sha256 = "0lmhh5p19rw4wisr0jsl7nsa2hxdaasj0vxk5ri83crhp982v7r6"; + url = mirror://sourceforge/freeglut/freeglut-2.8.0.tar.gz; + sha256 = "197293ff886abe613bc9eb4a762d9161b0c9e64b3e8e613ed7c5e353974fba05"; }; configureFlags = "--" + (if stdenv.isDarwin then "disable" else "enable") + "-warnings"; - buildInputs = [x11 mesa]; - patches = ./freeglut-gcc-4.2.patch; + buildInputs = [ libXi libXrandr libXxf86vm mesa x11 ]; + patches = [ ./0001-remove-typedefs-now-living-in-mesa.patch ]; } From 68db88bbf80ca068f856ad4cb09a5977d9a4ff1f Mon Sep 17 00:00:00 2001 From: Florian Friesdorf Date: Wed, 4 Jan 2012 23:05:51 +0000 Subject: [PATCH 30/32] wip: privateer svn path=/nixpkgs/trunk/; revision=31305 --- .../0001-fix-VSFile-constructor.patch | 25 +++++++++++++++++ pkgs/games/privateer/default.nix | 28 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 3 files changed, 55 insertions(+) create mode 100644 pkgs/games/privateer/0001-fix-VSFile-constructor.patch create mode 100644 pkgs/games/privateer/default.nix diff --git a/pkgs/games/privateer/0001-fix-VSFile-constructor.patch b/pkgs/games/privateer/0001-fix-VSFile-constructor.patch new file mode 100644 index 00000000000..05b02fe5d73 --- /dev/null +++ b/pkgs/games/privateer/0001-fix-VSFile-constructor.patch @@ -0,0 +1,25 @@ +From e779a2b8d53e7e4721ce5ddb8e8b1caa753b66dd Mon Sep 17 00:00:00 2001 +From: Florian Friesdorf +Date: Wed, 4 Jan 2012 23:32:19 +0100 +Subject: [PATCH] fix VSFile constructor + +--- + src/vsfilesystem.h | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/src/vsfilesystem.h b/src/vsfilesystem.h +index 4bb7a66..71bf9b9 100644 +--- a/src/vsfilesystem.h ++++ b/src/vsfilesystem.h +@@ -291,7 +291,7 @@ namespace VSFileSystem + VSFile(); + VSFile( const char * buffer, long size, VSFileType type=ZoneBuffer, VSFileMode=ReadOnly); + VSFile( const char * filename, VSFileType type=UnknownFile, VSFileMode=ReadOnly); +- VSFile( const string &filename, VSFileType type=UnknownFile) { VSFile::VSFile( filename.c_str(), type); } ++ VSFile( const string &filename, VSFileType type=UnknownFile) { VSFile( filename.c_str(), type); } + ~VSFile(); + + FILE * GetFP() { return this->fp; } // This is still needed for special cases (when loading PNG files) +-- +1.7.8 + diff --git a/pkgs/games/privateer/default.nix b/pkgs/games/privateer/default.nix new file mode 100644 index 00000000000..bed61567d4b --- /dev/null +++ b/pkgs/games/privateer/default.nix @@ -0,0 +1,28 @@ +{ stdenv, fetchsvn, boost, cmake, ffmpeg, freeglut, glib, + gtk, libjpeg, libpng, libpthreadstubs, libvorbis, libXau, libXdmcp, + libXmu, mesa, openal, pixman, pkgconfig, python27Full, SDL }: + +stdenv.mkDerivation { + name = "privateer-1.03"; + + src = fetchsvn { + #url = "mirror://sourceforge/project/privateer/Wing%20Commander%20Privateer/Privateer%20Gemini%20Gold%201.03/PrivateerGold1.03.bz2.bin"; + url = "https://privateer.svn.sourceforge.net/svnroot/privateer/privgold/trunk/engine"; + rev = 294; + sha256 = "e1759087d4565d3fc95e5c87d0f6ddf36b2cd5befec5695ec56ed5f3cd144c63"; + }; + + buildInputs = + [ boost cmake ffmpeg freeglut glib gtk libjpeg libpng + libpthreadstubs libvorbis libXau libXdmcp libXmu mesa openal + pixman pkgconfig python27Full SDL ]; + + patches = [ ./0001-fix-VSFile-constructor.patch ]; + + meta = { + homepage = http://privateer.sourceforge.net/; + longDescription = ""; + maintainers = with stdenv.lib.maintainers; [ chaoflow ]; + platforms = stdenv.lib.platforms.gnu; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4c0dece1a05..31cf2a4834b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1262,6 +1262,8 @@ let radvd = callPackage ../tools/networking/radvd { }; + privateer = callPackage ../games/privateer { }; + rtmpdump = callPackage ../tools/video/rtmpdump { }; recutils = callPackage ../tools/misc/recutils { }; From da6b6a93324c6b9d5bdaf3ad82f07e6684bceae7 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Thu, 5 Jan 2012 07:24:37 +0000 Subject: [PATCH 31/32] Update Linux 3.2 to release svn path=/nixpkgs/trunk/; revision=31306 --- pkgs/os-specific/linux/kernel/linux-3.2.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-3.2.nix b/pkgs/os-specific/linux/kernel/linux-3.2.nix index 8a4fa9648b1..1969ad4f5ac 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.2.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.2.nix @@ -214,18 +214,18 @@ in import ./generic.nix ( rec { - version = "3.2-rc7"; + version = "3.2"; + testing = false; - modDirVersion = "3.2.0-rc7"; + modDirVersion = "3.2.0"; preConfigure = '' substituteInPlace scripts/depmod.sh --replace '-b "$INSTALL_MOD_PATH"' "" ''; src = fetchurl { - #url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.bz2"; - url = "mirror://kernel/linux/kernel/v3.0/testing/linux-${version}.tar.bz2"; - sha256 = "0phakj1c97n2fdz9lh5gmpg6c5g45z2xpgrz3q2z2y9w9dgk3mqd"; + url = "mirror://kernel/linux/kernel/v3.0/${if testing then "testing/" else ""}linux-${version}.tar.bz2"; + sha256 = "0qylk7b6w7x3a47mvzbn3yj47q3x79i49aiq8p5af3fgacmzr0f8"; }; config = configWithPlatform stdenv.platform; From e0488019665c24a7694ce31a3d70c284ff519caa Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Thu, 5 Jan 2012 11:56:32 +0000 Subject: [PATCH 32/32] Update chipmunk svn path=/nixpkgs/trunk/; revision=31310 --- pkgs/development/libraries/chipmunk/default.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/chipmunk/default.nix b/pkgs/development/libraries/chipmunk/default.nix index f0613834364..5dbb31e9bce 100644 --- a/pkgs/development/libraries/chipmunk/default.nix +++ b/pkgs/development/libraries/chipmunk/default.nix @@ -4,7 +4,8 @@ let fetchurl = args.fetchurl; fullDepEntry = args.fullDepEntry; - version = lib.attrByPath ["version"] "4.1.0" args; + version = lib.attrByPath ["version"] "6.0.3" args; + majorVersion = lib.attrByPath ["majorVersion"] "6" args; buildInputs = with args; [ cmake freeglut mesa libX11 xproto inputproto libXi libXmu @@ -12,8 +13,8 @@ let in rec { src = fetchurl { - url = "http://files.slembcke.net/chipmunk/release/Chipmunk-${version}.tgz"; - sha256 = "0ry17lf4kdcac91bpavks2cswch3izsmmam0yhczk7rayj9cvqsh"; + url = "http://files.slembcke.net/chipmunk/release/Chipmunk-${majorVersion}.x/Chipmunk-${version}.tgz"; + sha256 = "c6f550454bc1c63a2a63e0ff8febecb4781a528ab6d6b657a17933a6f567541a"; }; inherit buildInputs; @@ -28,7 +29,7 @@ rec { demoInstall = fullDepEntry('' ensureDir $out/bin - cp chipmunk_demos $out/bin + cp Demo/chipmunk_demos $out/bin '') ["doMakeInstall" "defEnsureDir"]; name = "chipmunk-" + version;