Author: urkud
Date: Wed Jan 4 09:45:28 2012
New Revision: 31266
URL: https://nixos.org/websvn/nix/?rev=31266&sc=1
Log:
svn merge /path/to/nixpkgs/trunk
Added:
nixpkgs/branches/libpng15/pkgs/applications/misc/librecad/
- copied from r31263, nixpkgs/trunk/pkgs/applications/misc/librecad/
nixpkgs/branches/libpng15/pkgs/tools/networking/modemmanager/
- copied from r31263, nixpkgs/trunk/pkgs/tools/networking/modemmanager/
Replaced:
nixpkgs/branches/libpng15/pkgs/applications/misc/librecad/default.nix
- copied unchanged from r31263,
nixpkgs/trunk/pkgs/applications/misc/librecad/default.nix
nixpkgs/branches/libpng15/pkgs/tools/networking/modemmanager/default.nix
- copied unchanged from r31263,
nixpkgs/trunk/pkgs/tools/networking/modemmanager/default.nix
Modified:
nixpkgs/branches/libpng15/ (props changed)
nixpkgs/branches/libpng15/pkgs/applications/editors/emacs-22/default.nix
nixpkgs/branches/libpng15/pkgs/applications/editors/emacs-23/default.nix
nixpkgs/branches/libpng15/pkgs/applications/editors/emacs-snapshot/default.nix
nixpkgs/branches/libpng15/pkgs/applications/graphics/xscreensaver/default.nix
(props changed)
nixpkgs/branches/libpng15/pkgs/applications/misc/taskwarrior/unstable.nix
nixpkgs/branches/libpng15/pkgs/applications/misc/xneur/0.8.nix (props
changed)
nixpkgs/branches/libpng15/pkgs/applications/networking/browsers/icecat-4/
(props changed)
nixpkgs/branches/libpng15/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-10/
(props changed)
nixpkgs/branches/libpng15/pkgs/build-support/clang-wrapper/ (props changed)
nixpkgs/branches/libpng15/pkgs/build-support/fetchurl/gnome.nix
nixpkgs/branches/libpng15/pkgs/build-support/gcc-wrapper/ (props changed)
nixpkgs/branches/libpng15/pkgs/build-support/release/debian-build.nix
(contents, props changed)
nixpkgs/branches/libpng15/pkgs/build-support/release/nix-build.nix (props
changed)
nixpkgs/branches/libpng15/pkgs/build-support/release/rpm-build.nix (props
changed)
nixpkgs/branches/libpng15/pkgs/build-support/release/source-tarball.nix
(props changed)
nixpkgs/branches/libpng15/pkgs/development/compilers/ghc/6.10.1.nix (props
changed)
nixpkgs/branches/libpng15/pkgs/development/compilers/ghc/6.10.2.nix (props
changed)
nixpkgs/branches/libpng15/pkgs/development/compilers/ghc/6.8.2.nix (props
changed)
nixpkgs/branches/libpng15/pkgs/development/compilers/ghc/6.8.3.nix (props
changed)
nixpkgs/branches/libpng15/pkgs/development/compilers/mono/default.nix
nixpkgs/branches/libpng15/pkgs/development/interpreters/lua-5/default.nix
nixpkgs/branches/libpng15/pkgs/development/libraries/aterm/2.8.nix (props
changed)
nixpkgs/branches/libpng15/pkgs/development/libraries/fltk/fltk13.nix
(props changed)
nixpkgs/branches/libpng15/pkgs/development/libraries/glibc-2.9/ (props
changed)
nixpkgs/branches/libpng15/pkgs/development/libraries/goocanvas/ (props
changed)
nixpkgs/branches/libpng15/pkgs/development/libraries/pcre/default.nix
(props changed)
nixpkgs/branches/libpng15/pkgs/development/libraries/readline/readline6.nix
(props changed)
nixpkgs/branches/libpng15/pkgs/development/tools/misc/autoconf/2.13.nix
(props changed)
nixpkgs/branches/libpng15/pkgs/development/tools/misc/gnum4/default.nix
(props changed)
nixpkgs/branches/libpng15/pkgs/misc/ghostscript/default.nix
nixpkgs/branches/libpng15/pkgs/misc/tex/pgf/1.x.nix (props changed)
nixpkgs/branches/libpng15/pkgs/misc/tex/pgf/2.x.nix (props changed)
nixpkgs/branches/libpng15/pkgs/os-specific/linux/atheros/r3867.nix (props
changed)
nixpkgs/branches/libpng15/pkgs/os-specific/linux/firmware/rt2860/default.nix
nixpkgs/branches/libpng15/pkgs/os-specific/linux/kernel-headers/2.6.28.nix
(props changed)
nixpkgs/branches/libpng15/pkgs/os-specific/linux/kernel-headers/2.6.32.nix
(props changed)
nixpkgs/branches/libpng15/pkgs/os-specific/linux/kernel/generic.nix (props
changed)
nixpkgs/branches/libpng15/pkgs/os-specific/linux/kernel/linux-2.6.25.nix
(props changed)
nixpkgs/branches/libpng15/pkgs/os-specific/linux/kernel/linux-2.6.27.nix
(props changed)
nixpkgs/branches/libpng15/pkgs/os-specific/linux/kernel/linux-2.6.28.nix
(props changed)
nixpkgs/branches/libpng15/pkgs/os-specific/linux/kernel/linux-2.6.29.nix
(props changed)
nixpkgs/branches/libpng15/pkgs/os-specific/linux/kernel/linux-2.6.32-xen.nix
(props changed)
nixpkgs/branches/libpng15/pkgs/os-specific/linux/kernel/linux-2.6.32.nix
(props changed)
nixpkgs/branches/libpng15/pkgs/os-specific/linux/kernel/linux-2.6.33.nix
(props changed)
nixpkgs/branches/libpng15/pkgs/os-specific/linux/kqemu/1.4.0pre1.nix
(props changed)
nixpkgs/branches/libpng15/pkgs/os-specific/linux/qemu-kvm/default.nix
(props changed)
nixpkgs/branches/libpng15/pkgs/os-specific/linux/util-linux-ng/ (props
changed)
nixpkgs/branches/libpng15/pkgs/servers/mail/dovecot/1.1.1.nix (props
changed)
nixpkgs/branches/libpng15/pkgs/shells/bash/4.1.nix (props changed)
nixpkgs/branches/libpng15/pkgs/shells/bash/4.2.nix (props changed)
nixpkgs/branches/libpng15/pkgs/stdenv/generic/setup.sh (props changed)
nixpkgs/branches/libpng15/pkgs/stdenv/linux/make-bootstrap-tools.nix
(props changed)
nixpkgs/branches/libpng15/pkgs/tools/networking/wget/default.nix (props
changed)
nixpkgs/branches/libpng15/pkgs/top-level/all-packages.nix
Modified:
nixpkgs/branches/libpng15/pkgs/applications/editors/emacs-22/default.nix
==============================================================================
--- nixpkgs/branches/libpng15/pkgs/applications/editors/emacs-22/default.nix
Wed Jan 4 09:42:38 2012 (r31265)
+++ nixpkgs/branches/libpng15/pkgs/applications/editors/emacs-22/default.nix
Wed Jan 4 09:45:28 2012 (r31266)
@@ -30,6 +30,16 @@
configureFlags =
stdenv.lib.optional gtkGUI "--with-x-toolkit=gtk";
+ postInstall = ''
+ cat >$out/share/emacs/site-lisp/site-start.el <<EOF
+;; nixos specific load-path
+(when (getenv "NIX_PROFILES") (setq load-path
+ (append (reverse (mapcar (lambda (x) (concat x
"/share/emacs/site-lisp/"))
+ (split-string (getenv
"NIX_PROFILES"))))
+ load-path)))
+EOF
+ '';
+
meta = {
description = "GNU Emacs, *the* text editor";
Modified:
nixpkgs/branches/libpng15/pkgs/applications/editors/emacs-23/default.nix
==============================================================================
--- nixpkgs/branches/libpng15/pkgs/applications/editors/emacs-23/default.nix
Wed Jan 4 09:42:38 2012 (r31265)
+++ nixpkgs/branches/libpng15/pkgs/applications/editors/emacs-23/default.nix
Wed Jan 4 09:45:28 2012 (r31266)
@@ -31,6 +31,16 @@
++ stdenv.lib.optional (stdenv ? glibc)
[ "--with-crt-dir=${stdenv.glibc}/lib" ];
+ postInstall = ''
+ cat >$out/share/emacs/site-lisp/site-start.el <<EOF
+;; nixos specific load-path
+(when (getenv "NIX_PROFILES") (setq load-path
+ (append (reverse (mapcar (lambda (x) (concat x
"/share/emacs/site-lisp/"))
+ (split-string (getenv
"NIX_PROFILES"))))
+ load-path)))
+EOF
+ '';
+
doCheck = true;
meta = {
@@ -56,7 +66,7 @@
homepage = http://www.gnu.org/software/emacs/;
license = "GPLv3+";
- maintainers = [ stdenv.lib.maintainers.ludo stdenv.lib.maintainers.simons
];
+ maintainers = with stdenv.lib.maintainers; [ ludo simons chaoflow ];
platforms = stdenv.lib.platforms.all;
};
}
Modified:
nixpkgs/branches/libpng15/pkgs/applications/editors/emacs-snapshot/default.nix
==============================================================================
---
nixpkgs/branches/libpng15/pkgs/applications/editors/emacs-snapshot/default.nix
Wed Jan 4 09:42:38 2012 (r31265)
+++
nixpkgs/branches/libpng15/pkgs/applications/editors/emacs-snapshot/default.nix
Wed Jan 4 09:45:28 2012 (r31266)
@@ -48,6 +48,16 @@
${if gtkGUI then "--with-x-toolkit=gtk --enable-font-backend --with-xft"
else ""}
";
+ postInstall = ''
+ cat >$out/share/emacs/site-lisp/site-start.el <<EOF
+;; nixos specific load-path
+(when (getenv "NIX_PROFILES") (setq load-path
+ (append (reverse (mapcar (lambda (x) (concat x
"/share/emacs/site-lisp/"))
+ (split-string (getenv
"NIX_PROFILES"))))
+ load-path)))
+EOF
+ '';
+
meta = {
description = "GNU Emacs with Unicode, GTK and Xft support (23.x alpha)";
homepage = http://www.emacswiki.org/cgi-bin/wiki/XftGnuEmacs;
Copied: nixpkgs/branches/libpng15/pkgs/applications/misc/librecad/default.nix
(from r31263, nixpkgs/trunk/pkgs/applications/misc/librecad/default.nix)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ nixpkgs/branches/libpng15/pkgs/applications/misc/librecad/default.nix
Wed Jan 4 09:45:28 2012 (r31266, copy of r31263,
nixpkgs/trunk/pkgs/applications/misc/librecad/default.nix)
@@ -0,0 +1,28 @@
+{ stdenv, fetchurl, qt4}:
+
+stdenv.mkDerivation {
+ name = "librecad-1.0.0";
+
+ src = fetchurl {
+ url = https://github.com/LibreCAD/LibreCAD/tarball/v1.0.0;
+ name = "librecad-1.0.0.tar.gz";
+ sha256 = "0s1ikyvy98zz1vw3xf5la73n3sykib6292cmhh2z738ggwigicc9";
+ };
+
+ patchPhase = ''
+ sed -i -e s,/bin/bash,`type -P bash`, scripts/postprocess-unix.sh
+ '';
+
+ configurePhase = "qmake PREFIX=$out";
+
+ # It builds, but it does not install
+ installPhase = "exit 1";
+
+ buildInputs = [ qt4 ];
+
+ meta = {
+ description = "A 2D CAD package based upon Qt";
+ homepage = http://librecad.org;
+ license = "GPLv2";
+ };
+}
Modified:
nixpkgs/branches/libpng15/pkgs/applications/misc/taskwarrior/unstable.nix
==============================================================================
--- nixpkgs/branches/libpng15/pkgs/applications/misc/taskwarrior/unstable.nix
Wed Jan 4 09:42:38 2012 (r31265)
+++ nixpkgs/branches/libpng15/pkgs/applications/misc/taskwarrior/unstable.nix
Wed Jan 4 09:45:28 2012 (r31266)
@@ -10,7 +10,14 @@
NIX_LDFLAGS = "-ldl";
- buildInputs = [ cmake lua5 ];
+ buildNativeInputs = [ cmake ];
+ buildInputs = [ lua5 ];
+
+ crossAttrs = {
+ preConfigure = ''
+ export NIX_CROSS_LDFLAGS="$NIX_CROSS_LDFLAGS -ldl"
+ '';
+ };
meta = {
description = "Command-line todo list manager";
Modified: nixpkgs/branches/libpng15/pkgs/build-support/fetchurl/gnome.nix
==============================================================================
--- nixpkgs/branches/libpng15/pkgs/build-support/fetchurl/gnome.nix Wed Jan
4 09:42:38 2012 (r31265)
+++ nixpkgs/branches/libpng15/pkgs/build-support/fetchurl/gnome.nix Wed Jan
4 09:45:28 2012 (r31266)
@@ -1,6 +1,6 @@
{ fetchurl }:
-{ project, major, minor, patchlevel, extension ? "bz2", sha256 }:
+{ project, major, minor, patchlevel ? null, extension ? "bz2", sha256 }:
let
baseVersion = "${major}.${minor}";
Modified: nixpkgs/branches/libpng15/pkgs/build-support/release/debian-build.nix
==============================================================================
--- nixpkgs/branches/libpng15/pkgs/build-support/release/debian-build.nix
Wed Jan 4 09:42:38 2012 (r31265)
+++ nixpkgs/branches/libpng15/pkgs/build-support/release/debian-build.nix
Wed Jan 4 09:45:28 2012 (r31266)
@@ -11,6 +11,8 @@
debRequires ? []
, ... } @ args:
+with stdenv.lib;
+
vmTools.runInLinuxImage (stdenv.mkDerivation (
{
@@ -61,13 +63,15 @@
${checkinstall}/sbin/checkinstall --nodoc -y -D \
--fstrans=${if fsTranslation then "yes" else "no"} \
- --requires="${toString debRequires}" \
- --provides="${toString debProvides}" \
+ --requires="${concatStringsSep "," debRequires}" \
+ --provides="${concatStringsSep "," debProvides}" \
make install
ensureDir $out/debs
find . -name "*.deb" -exec cp {} $out/debs \;
+ [ "$(echo $out/debs/*.deb)" != "" ]
+
for i in $out/debs/*.deb; do
header "Generated DEB package: $i"
dpkg-deb --info "$i"
Modified: nixpkgs/branches/libpng15/pkgs/development/compilers/mono/default.nix
==============================================================================
--- nixpkgs/branches/libpng15/pkgs/development/compilers/mono/default.nix
Wed Jan 4 09:42:38 2012 (r31265)
+++ nixpkgs/branches/libpng15/pkgs/development/compilers/mono/default.nix
Wed Jan 4 09:45:28 2012 (r31266)
@@ -1,10 +1,10 @@
{stdenv, fetchurl, bison, pkgconfig, glib, gettext, perl}:
stdenv.mkDerivation {
- name = "mono-2.8";
+ name = "mono-2.10.8.1";
src = fetchurl {
- url = http://ftp.novell.com/pub/mono/sources/mono/mono-2.8.tar.bz2;
- sha256 = "04bivxg90mmihkp72sjshl4ijbjcbl9f6hdgm476zy794g5rwd78";
+ url = http://download.mono-project.com/sources/mono/mono-2.10.8.1.tar.gz;
+ sha256 = "0h4hdj99qg0nsg5260izwaybs59wysf7y399kffhg43fidpndz0x";
};
buildInputs = [bison pkgconfig glib gettext perl];
Modified:
nixpkgs/branches/libpng15/pkgs/development/interpreters/lua-5/default.nix
==============================================================================
--- nixpkgs/branches/libpng15/pkgs/development/interpreters/lua-5/default.nix
Wed Jan 4 09:42:38 2012 (r31265)
+++ nixpkgs/branches/libpng15/pkgs/development/interpreters/lua-5/default.nix
Wed Jan 4 09:45:28 2012 (r31266)
@@ -30,6 +30,7 @@
-e "s/ ranlib/$crossConfig-ranlib/" \
src/Makefile
'';
+ dontStrip = true;
};
meta = {
Modified: nixpkgs/branches/libpng15/pkgs/misc/ghostscript/default.nix
==============================================================================
--- nixpkgs/branches/libpng15/pkgs/misc/ghostscript/default.nix Wed Jan 4
09:42:38 2012 (r31265)
+++ nixpkgs/branches/libpng15/pkgs/misc/ghostscript/default.nix Wed Jan 4
09:45:28 2012 (r31266)
@@ -89,7 +89,11 @@
doCheck = true;
+ preBuild = "make so";
+
postInstall = ''
+ make soinstall
+
for i in $fonts; do
(cd $out/share/ghostscript && tar xvfz $i)
done
Modified:
nixpkgs/branches/libpng15/pkgs/os-specific/linux/firmware/rt2860/default.nix
==============================================================================
---
nixpkgs/branches/libpng15/pkgs/os-specific/linux/firmware/rt2860/default.nix
Wed Jan 4 09:42:38 2012 (r31265)
+++
nixpkgs/branches/libpng15/pkgs/os-specific/linux/firmware/rt2860/default.nix
Wed Jan 4 09:45:28 2012 (r31266)
@@ -1,14 +1,17 @@
-{stdenv, fetchurl, unzip}:
+{stdenv, fetchsvn }:
-stdenv.mkDerivation rec {
+# Upstream is
http://git.kernel.org/?p=linux/kernel/git/firmware/linux-firmware.git
+
+stdenv.mkDerivation {
name = "rt2860-fw-26";
- src = fetchurl {
- url =
"http://www.ralinktech.com/download.php?t=U0wyRnpjMlYwY3k4eU1ERXdMekF6THpNeEwyUnZkMjVzYjJGa01UWTBNamsyTVRBNE1pNTZhWEE5UFQxU1ZESTROakJmUm1seWJYZGhjbVZmVmpJMkM%3D";;
- name = "RT2860_Firmware_V26.zip";
- sha256 = "0kvjd8kfnmh8jj35jd10pnr1z7a00ks4c317dnnzgkd86mmcg4px";
+
+ src = fetchsvn {
+ url = svn://svn.debian.org/kernel/dists/trunk/firmware-nonfree/ralink;
+ rev = 17279;
+ sha256 = "06nc6w3xcrxzcai7gaf27k0v8k2xbq3imzpgc02rbxv5q5flxh65";
};
- buildInputs = [ unzip ];
+ unpackPhase = "true";
buildPhase = "true";
@@ -16,7 +19,11 @@
# says: "Your rights to redistribute the Software shall be
# contingent upon your installation of this Agreement in its
# entirety in the same directory as the Software."
- installPhase = "ensureDir $out/${name}; cp *.bin $out; cp *.txt
$out/${name}";
+ installPhase = ''
+ ensureDir $out
+ cp $src/rt2860.bin $out
+ cp $src/LICENSE $out/rt2860.LICENSE
+ '';
meta = {
description = "Firmware for the Ralink RT2860 wireless cards";
Copied:
nixpkgs/branches/libpng15/pkgs/tools/networking/modemmanager/default.nix (from
r31263, nixpkgs/trunk/pkgs/tools/networking/modemmanager/default.nix)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ nixpkgs/branches/libpng15/pkgs/tools/networking/modemmanager/default.nix
Wed Jan 4 09:45:28 2012 (r31266, copy of r31263,
nixpkgs/trunk/pkgs/tools/networking/modemmanager/default.nix)
@@ -0,0 +1,23 @@
+{ stdenv, fetchurl_gnome, udev, polkit, dbus_glib, ppp, intltool, pkgconfig,
xz }:
+
+stdenv.mkDerivation rec {
+ name = src.pkgname;
+
+ src = fetchurl_gnome {
+ project = "ModemManager";
+ major = "0"; minor = "5"; extension = "xz";
+ sha256 = "0zvwrni4l21d856nq28khigrhwgrq5cc7nh45zidwjj8q7bsxiz7";
+ };
+
+ buildNativeInputs = [ xz intltool pkgconfig ];
+
+ buildInputs = [ udev polkit dbus_glib ppp ];
+
+ configureFlags = "--with-polkit --with-udev-base-dir=$(out)/lib/udev";
+
+ meta = {
+ description = "WWAN modem manager, part of NetworkManager";
+ maintainers = [ stdenv.lib.maintainers.urkud ];
+ platforms = [ stdenv.lib.platforms.linux ];
+ };
+}
Modified: nixpkgs/branches/libpng15/pkgs/top-level/all-packages.nix
==============================================================================
--- nixpkgs/branches/libpng15/pkgs/top-level/all-packages.nix Wed Jan 4
09:42:38 2012 (r31265)
+++ nixpkgs/branches/libpng15/pkgs/top-level/all-packages.nix Wed Jan 4
09:45:28 2012 (r31266)
@@ -988,6 +988,8 @@
mldonkey = callPackage ../applications/networking/p2p/mldonkey { };
+ modemmanager = callPackage ../tools/networking/modemmanager {};
+
monit = builderDefsPackage ../tools/system/monit {
inherit openssl flex bison;
};
@@ -5702,6 +5704,25 @@
#kernelPatches.mips_restart_2_6_36
];
};
+
+ linux_3_2_powertop = linux_3_2.override {
+ extraConfig = ''
+ DEBUG_KERNEL y
+ PM_ADVANCED_DEBUG y
+ PM_RUNTIME y
+ TIMER_STATS y
+ USB_SUSPEND y
+ BACKTRACE_SELF_TEST n
+ CPU_NOTIFIER_ERROR_INJECT n
+ DEBUG_DEVRES n
+ DEBUG_NX_TEST n
+ DEBUG_STACK_USAGE n
+ DEBUG_STACKOVERFLOW n
+ RCU_TORTURE_TEST n
+ SCHEDSTATS n
+ '';
+ };
+
/* Linux kernel modules are inherently tied to a specific kernel. So
rather than provide specific instances of those packages for a
specific kernel, we have a function that builds those packages
@@ -5849,6 +5870,7 @@
linuxPackages_nanonote_jz_2_6_35 = recurseIntoAttrs (linuxPackagesFor
linux_nanonote_jz_2_6_35 pkgs.linuxPackages_nanonote_jz_2_6_35);
linuxPackages_nanonote_jz_2_6_36 = recurseIntoAttrs (linuxPackagesFor
linux_nanonote_jz_2_6_36 pkgs.linuxPackages_nanonote_jz_2_6_36);
linuxPackages_3_2 = recurseIntoAttrs (linuxPackagesFor linux_3_2
pkgs.linuxPackages_3_2);
+ linuxPackages_3_2_powertop = recurseIntoAttrs (linuxPackagesFor
linux_3_2_powertop pkgs.linuxPackages_3_2_powertop);
# The current default kernel / kernel modules.
linux = linuxPackages.kernel;
@@ -6990,6 +7012,8 @@
inherit (gnome) libglade;
};
+ librecad = callPackage ../applications/misc/librecad { };
+
lingot = callPackage ../applications/audio/lingot {
inherit (gnome) libglade;
};
_______________________________________________
nix-commits mailing list
[email protected]
http://lists.science.uu.nl/mailman/listinfo/nix-commits
