svn merge /path/to/nixpkgs/trunk

svn path=/nixpkgs/branches/libpng15/; revision=31266
This commit is contained in:
Yury G. Kudryashov 2012-01-04 09:45:28 +00:00
commit bdb01cc707
13 changed files with 144 additions and 16 deletions

View file

@ -30,6 +30,16 @@ stdenv.mkDerivation rec {
configureFlags = configureFlags =
stdenv.lib.optional gtkGUI "--with-x-toolkit=gtk"; 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 = { meta = {
description = "GNU Emacs, *the* text editor"; description = "GNU Emacs, *the* text editor";

View file

@ -31,6 +31,16 @@ stdenv.mkDerivation rec {
++ stdenv.lib.optional (stdenv ? glibc) ++ stdenv.lib.optional (stdenv ? glibc)
[ "--with-crt-dir=${stdenv.glibc}/lib" ]; [ "--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; doCheck = true;
meta = { meta = {
@ -56,7 +66,7 @@ stdenv.mkDerivation rec {
homepage = http://www.gnu.org/software/emacs/; homepage = http://www.gnu.org/software/emacs/;
license = "GPLv3+"; license = "GPLv3+";
maintainers = [ stdenv.lib.maintainers.ludo stdenv.lib.maintainers.simons ]; maintainers = with stdenv.lib.maintainers; [ ludo simons chaoflow ];
platforms = stdenv.lib.platforms.all; platforms = stdenv.lib.platforms.all;
}; };
} }

View file

@ -48,6 +48,16 @@ stdenv.mkDerivation {
${if gtkGUI then "--with-x-toolkit=gtk --enable-font-backend --with-xft" else ""} ${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 = { meta = {
description = "GNU Emacs with Unicode, GTK and Xft support (23.x alpha)"; description = "GNU Emacs with Unicode, GTK and Xft support (23.x alpha)";
homepage = http://www.emacswiki.org/cgi-bin/wiki/XftGnuEmacs; homepage = http://www.emacswiki.org/cgi-bin/wiki/XftGnuEmacs;

View file

@ -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";
};
}

View file

@ -10,7 +10,14 @@ stdenv.mkDerivation {
NIX_LDFLAGS = "-ldl"; NIX_LDFLAGS = "-ldl";
buildInputs = [ cmake lua5 ]; buildNativeInputs = [ cmake ];
buildInputs = [ lua5 ];
crossAttrs = {
preConfigure = ''
export NIX_CROSS_LDFLAGS="$NIX_CROSS_LDFLAGS -ldl"
'';
};
meta = { meta = {
description = "Command-line todo list manager"; description = "Command-line todo list manager";

View file

@ -1,6 +1,6 @@
{ fetchurl }: { fetchurl }:
{ project, major, minor, patchlevel, extension ? "bz2", sha256 }: { project, major, minor, patchlevel ? null, extension ? "bz2", sha256 }:
let let
baseVersion = "${major}.${minor}"; baseVersion = "${major}.${minor}";

View file

@ -11,6 +11,8 @@
debRequires ? [] debRequires ? []
, ... } @ args: , ... } @ args:
with stdenv.lib;
vmTools.runInLinuxImage (stdenv.mkDerivation ( vmTools.runInLinuxImage (stdenv.mkDerivation (
{ {
@ -61,13 +63,15 @@ vmTools.runInLinuxImage (stdenv.mkDerivation (
${checkinstall}/sbin/checkinstall --nodoc -y -D \ ${checkinstall}/sbin/checkinstall --nodoc -y -D \
--fstrans=${if fsTranslation then "yes" else "no"} \ --fstrans=${if fsTranslation then "yes" else "no"} \
--requires="${toString debRequires}" \ --requires="${concatStringsSep "," debRequires}" \
--provides="${toString debProvides}" \ --provides="${concatStringsSep "," debProvides}" \
make install make install
ensureDir $out/debs ensureDir $out/debs
find . -name "*.deb" -exec cp {} $out/debs \; find . -name "*.deb" -exec cp {} $out/debs \;
[ "$(echo $out/debs/*.deb)" != "" ]
for i in $out/debs/*.deb; do for i in $out/debs/*.deb; do
header "Generated DEB package: $i" header "Generated DEB package: $i"
dpkg-deb --info "$i" dpkg-deb --info "$i"

View file

@ -1,10 +1,10 @@
{stdenv, fetchurl, bison, pkgconfig, glib, gettext, perl}: {stdenv, fetchurl, bison, pkgconfig, glib, gettext, perl}:
stdenv.mkDerivation { stdenv.mkDerivation {
name = "mono-2.8"; name = "mono-2.10.8.1";
src = fetchurl { src = fetchurl {
url = http://ftp.novell.com/pub/mono/sources/mono/mono-2.8.tar.bz2; url = http://download.mono-project.com/sources/mono/mono-2.10.8.1.tar.gz;
sha256 = "04bivxg90mmihkp72sjshl4ijbjcbl9f6hdgm476zy794g5rwd78"; sha256 = "0h4hdj99qg0nsg5260izwaybs59wysf7y399kffhg43fidpndz0x";
}; };
buildInputs = [bison pkgconfig glib gettext perl]; buildInputs = [bison pkgconfig glib gettext perl];

View file

@ -30,6 +30,7 @@ stdenv.mkDerivation {
-e "s/ ranlib/$crossConfig-ranlib/" \ -e "s/ ranlib/$crossConfig-ranlib/" \
src/Makefile src/Makefile
''; '';
dontStrip = true;
}; };
meta = { meta = {

View file

@ -89,7 +89,11 @@ stdenv.mkDerivation rec {
doCheck = true; doCheck = true;
preBuild = "make so";
postInstall = '' postInstall = ''
make soinstall
for i in $fonts; do for i in $fonts; do
(cd $out/share/ghostscript && tar xvfz $i) (cd $out/share/ghostscript && tar xvfz $i)
done done

View file

@ -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"; name = "rt2860-fw-26";
src = fetchurl {
url = "http://www.ralinktech.com/download.php?t=U0wyRnpjMlYwY3k4eU1ERXdMekF6THpNeEwyUnZkMjVzYjJGa01UWTBNamsyTVRBNE1pNTZhWEE5UFQxU1ZESTROakJmUm1seWJYZGhjbVZmVmpJMkM%3D"; src = fetchsvn {
name = "RT2860_Firmware_V26.zip"; url = svn://svn.debian.org/kernel/dists/trunk/firmware-nonfree/ralink;
sha256 = "0kvjd8kfnmh8jj35jd10pnr1z7a00ks4c317dnnzgkd86mmcg4px"; rev = 17279;
sha256 = "06nc6w3xcrxzcai7gaf27k0v8k2xbq3imzpgc02rbxv5q5flxh65";
}; };
buildInputs = [ unzip ]; unpackPhase = "true";
buildPhase = "true"; buildPhase = "true";
@ -16,7 +19,11 @@ stdenv.mkDerivation rec {
# says: "Your rights to redistribute the Software shall be # says: "Your rights to redistribute the Software shall be
# contingent upon your installation of this Agreement in its # contingent upon your installation of this Agreement in its
# entirety in the same directory as the Software." # 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 = { meta = {
description = "Firmware for the Ralink RT2860 wireless cards"; description = "Firmware for the Ralink RT2860 wireless cards";

View file

@ -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 ];
};
}

View file

@ -988,6 +988,8 @@ let
mldonkey = callPackage ../applications/networking/p2p/mldonkey { }; mldonkey = callPackage ../applications/networking/p2p/mldonkey { };
modemmanager = callPackage ../tools/networking/modemmanager {};
monit = builderDefsPackage ../tools/system/monit { monit = builderDefsPackage ../tools/system/monit {
inherit openssl flex bison; inherit openssl flex bison;
}; };
@ -5702,6 +5704,25 @@ let
#kernelPatches.mips_restart_2_6_36 #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 /* Linux kernel modules are inherently tied to a specific kernel. So
rather than provide specific instances of those packages for a rather than provide specific instances of those packages for a
specific kernel, we have a function that builds those packages specific kernel, we have a function that builds those packages
@ -5849,6 +5870,7 @@ let
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_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_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 = 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. # The current default kernel / kernel modules.
linux = linuxPackages.kernel; linux = linuxPackages.kernel;
@ -6990,6 +7012,8 @@ let
inherit (gnome) libglade; inherit (gnome) libglade;
}; };
librecad = callPackage ../applications/misc/librecad { };
lingot = callPackage ../applications/audio/lingot { lingot = callPackage ../applications/audio/lingot {
inherit (gnome) libglade; inherit (gnome) libglade;
}; };