Author: urkud
Date: Tue Jan 3 18:13:10 2012
New Revision: 31250
URL: https://nixos.org/websvn/nix/?rev=31250&sc=1
Log:
svn merge /path/to/nixpkgstrunk; resolve ghostscript as "theirs-full"
Added:
nixpkgs/branches/libpng15/pkgs/development/libraries/libkvkontakte/
- copied from r31249,
nixpkgs/trunk/pkgs/development/libraries/libkvkontakte/
Replaced:
nixpkgs/branches/libpng15/pkgs/development/libraries/libkvkontakte/default.nix
- copied unchanged from r31249,
nixpkgs/trunk/pkgs/development/libraries/libkvkontakte/default.nix
Deleted:
nixpkgs/branches/libpng15/pkgs/misc/ghostscript/builder.sh
nixpkgs/branches/libpng15/pkgs/misc/ghostscript/pstoraster.patch
Modified:
nixpkgs/branches/libpng15/ (props changed)
nixpkgs/branches/libpng15/pkgs/applications/graphics/xscreensaver/default.nix
(props changed)
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/gcc-wrapper/ (props changed)
nixpkgs/branches/libpng15/pkgs/build-support/release/debian-build.nix
(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/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/build-managers/cmake/default.nix
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/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
Copied:
nixpkgs/branches/libpng15/pkgs/development/libraries/libkvkontakte/default.nix
(from r31249,
nixpkgs/trunk/pkgs/development/libraries/libkvkontakte/default.nix)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++
nixpkgs/branches/libpng15/pkgs/development/libraries/libkvkontakte/default.nix
Tue Jan 3 18:13:10 2012 (r31250, copy of r31249,
nixpkgs/trunk/pkgs/development/libraries/libkvkontakte/default.nix)
@@ -0,0 +1,20 @@
+{ stdenv, fetchgit, qjson, kdelibs }:
+
+stdenv.mkDerivation {
+ name = "libkvkonatkte-1.0-pre20120103";
+
+ src = fetchgit {
+ url = git://anongit.kde.org/libkvkontakte;
+ rev = "4024f69cf54625dbe5dc2e2d811a996774a669ff";
+ sha256 = "0ryvjfrsws845k9s76715xid48y01h0ynb5wdx6ln8cm5z5wqj61";
+ };
+
+ buildInputs = [ qjson kdelibs ];
+
+ meta = {
+ homepage = https://projects.kde.org/projects/extragear/libs/libkvkontakte;
+ description = "KDE library for interaction with vkontakte.ru social
network via its open API";
+ maintainers = [ stdenv.lib.maintainers.urkud ];
+ inherit (kdelibs.meta) platforms;
+ };
+}
Modified:
nixpkgs/branches/libpng15/pkgs/development/tools/build-managers/cmake/default.nix
==============================================================================
---
nixpkgs/branches/libpng15/pkgs/development/tools/build-managers/cmake/default.nix
Tue Jan 3 18:04:57 2012 (r31249)
+++
nixpkgs/branches/libpng15/pkgs/development/tools/build-managers/cmake/default.nix
Tue Jan 3 18:13:10 2012 (r31250)
@@ -11,6 +11,7 @@
version = "${majorVersion}.${minorVersion}";
in
+# WARNING: Do NOT upgrade cmake in trunk: it fails to build on i686-linux
stdenv.mkDerivation rec {
name = "cmake-${os useNcurses "cursesUI-"}${os useQt4 "qt4UI-"}${version}";
Modified: nixpkgs/branches/libpng15/pkgs/misc/ghostscript/default.nix
==============================================================================
--- nixpkgs/branches/libpng15/pkgs/misc/ghostscript/default.nix Tue Jan 3
18:04:57 2012 (r31249)
+++ nixpkgs/branches/libpng15/pkgs/misc/ghostscript/default.nix Tue Jan 3
18:13:10 2012 (r31250)
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, libjpeg, libpng, libtiff, zlib, pkgconfig, fontconfig,
openssl
+{ stdenv, fetchurl, libjpeg, libpng, libtiff, zlib, pkgconfig, fontconfig,
openssl, lcms, freetype
, x11Support, x11 ? null
, cupsSupport ? false, cups ? null
, gnuFork ? true
@@ -28,10 +28,10 @@
};
gnuForkData = rec {
- name = "ghostscript-8.71.1";
+ name = "ghostscript-9.04.1";
src = fetchurl {
url = "mirror://gnu/ghostscript/gnu-${name}.tar.bz2";
- sha256 = "0vab9905h6sl5s5miai4vhhwdacjlkxqmykfr42x32sr25wjqgvl";
+ sha256 = "0zqa6ggbkdqiszsywgrra4ij0sddlmrfa50bx2mh568qid4ga0a2";
};
inherit meta;
@@ -56,8 +56,6 @@
stdenv.mkDerivation rec {
inherit (variant) name src meta;
- builder = ./builder.sh;
-
fonts = [
(fetchurl {
url = mirror://gnu/ghostscript/gnu-gs-fonts-std-6.0.tar.gz;
@@ -70,17 +68,30 @@
# ... add other fonts here
];
- buildInputs = [libjpeg libpng libtiff zlib pkgconfig fontconfig openssl]
- ++ stdenv.lib.optional x11Support x11
+ buildInputs = [libjpeg libpng libtiff zlib pkgconfig fontconfig openssl lcms]
+ ++ stdenv.lib.optionals x11Support [x11 freetype]
++ stdenv.lib.optional cupsSupport cups;
- configureFlags =
- if x11Support then [ "--with-x" ] else [ "--without-x" ];
-
CFLAGS = "-fPIC";
+ NIX_LDFLAGS = "-lz -rpath=${freetype}/lib";
+
+ patches = [ ./purity.patch ./urw-font-files.patch ];
- patches = [ ./purity.patch ./urw-font-files.patch ./libpng-1.5.patch ]
- ++ stdenv.lib.optional gnuFork ./pstoraster.patch;
+ preConfigure = ''
+ # "ijs" is impure: it contains symlinks to /usr/share/automake etc.!
+ rm -rf ijs/ltmain.sh
+
+ # Don't install stuff in the Cups store path.
+ makeFlagsArray=(CUPSSERVERBIN=$out/lib/cups CUPSSERVERROOT=$out/etc/cups
CUPSDATA=$out/share/cups)
+ '';
+
+ configureFlags = if x11Support then [ "--with-x" ] else [ "--without-x" ];
doCheck = true;
+
+ postInstall = ''
+ for i in $fonts; do
+ (cd $out/share/ghostscript && tar xvfz $i)
+ done
+ '';
}
Modified: nixpkgs/branches/libpng15/pkgs/top-level/all-packages.nix
==============================================================================
--- nixpkgs/branches/libpng15/pkgs/top-level/all-packages.nix Tue Jan 3
18:04:57 2012 (r31249)
+++ nixpkgs/branches/libpng15/pkgs/top-level/all-packages.nix Tue Jan 3
18:13:10 2012 (r31250)
@@ -8093,6 +8093,8 @@
libktorrent = callPackage ../development/libraries/libktorrent { };
+ libkvkontakte = callPackage ../development/libraries/libkvkontakte { };
+
liblikeback = callPackage ../development/libraries/liblikeback { };
networkmanagement = callPackage ../tools/networking/networkmanagement {
};
_______________________________________________
nix-commits mailing list
[email protected]
http://lists.science.uu.nl/mailman/listinfo/nix-commits
