public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'official/master' into multiple-outputs

Browse Source 
Conflicts:
	pkgs/development/libraries/cairo/default.nix
	pkgs/development/libraries/freetype/default.nix
	pkgs/development/libraries/glib/default.nix
	pkgs/development/libraries/libpng/default.nix
	pkgs/development/libraries/pango/default.nix
	pkgs/tools/typesetting/tex/texlive/default.nix
	pkgs/top-level/all-packages.nix
This commit is contained in:
Mathijs Kwik
2013-09-11 10:53:31 +02:00
parent 2d405ed4d5 aa8e8303e1
commit 1a55c4b89f
567 changed files with 12427 additions and 3449 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/misc/emulators/vice/default.nix
+4 -2
View File
@@ -1,4 +1,4 @@
{ stdenv, fetchurl, lib, perl, gettext, libpng, giflib, libjpeg, alsaLib, readline, mesa
{ stdenv, fetchurl, perl, gettext, libpng, giflib, libjpeg, alsaLib, readline, mesa, libX11
, pkgconfig, gtk, SDL, autoconf, automake, makeDesktopItem
}:
@@ -28,6 +28,8 @@ stdenv.mkDerivation rec {
autoreconf -f -i
'';
NIX_LDFLAGS = "-lX11 -L${libX11}/lib";
postInstall = ''
mkdir -p $out/share/applications
cp ${desktopItem}/share/applications/* $out/share/applications
@@ -37,6 +39,6 @@ stdenv.mkDerivation rec {
description = "Commodore 64, 128 and other emulators";
homepage = http://www.viceteam.org;
license = "GPLv2+";
maintainers = [ lib.maintainers.sander ];
maintainers = [ stdenv.lib.maintainers.sander ];
};
}
pkgs/misc/ghostscript/default.nix
+15 -12
View File
@@ -1,6 +1,7 @@
{ stdenv, fetchurl, libjpeg, libpng, libtiff, zlib, pkgconfig, fontconfig, openssl
, lcms, freetype, libpaper, jbig2dec, expat, libiconvOrEmpty
, x11Support, x11 ? null
{ stdenv, fetchurl, pkgconfig, zlib, expat, openssl
, libjpeg, libpng, libtiff, freetype, fontconfig, lcms2, libpaper, jbig2dec
, libiconvOrEmpty
, x11Support ? false, x11 ? null
, cupsSupport ? false, cups ? null
, gnuFork ? true
}:
@@ -40,10 +41,10 @@ let
};
mainlineSrc = rec {
name = "ghostscript-9.06";
name = "ghostscript-9.10";
src = fetchurl {
url = "http://downloads.ghostscript.com/public/${name}.tar.bz2";
sha256 = "014f10rxn4ihvcr1frby4szd1jvkrwvmdhnbivpp55c9fssx3b05";
sha256 = "106mglk77dhdra1m0ddnmaq645xj1aj45qvlh8izv3xx4cdrv3bc";
};
meta = meta_common // {
homepage = "http://www.ghostscript.com/";
@@ -51,7 +52,7 @@ let
};
preConfigure = ''
rm -R libpng jpeg lcms{,2} tiff freetype jbig2dec expat jasper openjpeg
rm -R libpng jpeg lcms{,2} tiff freetype jbig2dec expat openjpeg
substituteInPlace base/unix-aux.mak --replace "INCLUDE=/usr/include" "INCLUDE=/no-such-path"
sed "s@if ( test -f \$(INCLUDE)[^ ]* )@if ( true )@" -i base/unix-aux.mak
@@ -79,9 +80,9 @@ stdenv.mkDerivation rec {
];
buildInputs = [
libjpeg libpng libtiff zlib pkgconfig fontconfig openssl lcms
libpaper jbig2dec expat
] ++ stdenv.lib.optionals x11Support [x11 freetype]
pkgconfig zlib expat openssl
libjpeg libpng libtiff freetype fontconfig lcms2 libpaper jbig2dec
] ++ stdenv.lib.optional x11Support x11
++ stdenv.lib.optional cupsSupport cups
++ libiconvOrEmpty
# [] # maybe sometimes jpeg2000 support
@@ -101,9 +102,11 @@ stdenv.mkDerivation rec {
makeFlagsArray=(CUPSSERVERBIN=$out/lib/cups CUPSSERVERROOT=$out/etc/cups CUPSDATA=$out/share/cups)
'' + stdenv.lib.optionalString (variant ? preConfigure) variant.preConfigure;
configureFlags = [ "--with-system-libtiff" ] ++
(if x11Support then [ "--with-x" ] else [ "--without-x" ]) ++
(if cupsSupport then [ "--enable-cups" "--with-install-cups" ] else [ "--disable-cups" ]);
configureFlags = [
"--with-system-libtiff"
(if x11Support then "--with-x" else "--without-x")
(if cupsSupport then "--enable-cups" else "--disable-cups")
];
doCheck = true;
pkgs/misc/themes/gtk2/gtk-engine-murrine/default.nix
+18
View File
@@ -0,0 +1,18 @@
{ stdenv, fetchurl, pkgconfig, intltool, gtk2 }:
stdenv.mkDerivation {
name = "gtk-engine-murrine-0.98.2";
src = fetchurl {
url = "mirror://gnome/sources/murrine/0.98/murrine-0.98.2.tar.xz";
sha256 = "129cs5bqw23i76h3nmc29c9mqkm9460iwc8vkl7hs4xr07h8mip9";
};
buildInputs = [ pkgconfig intltool gtk2 ];
meta = {
description = "A very flexible theme engine";
license = stdenv.lib.licenses.lgpl3;
platforms = stdenv.lib.platforms.linux;
};
}
pkgs/misc/themes/mate-icon-theme/default.nix
+20
View File
@@ -0,0 +1,20 @@
{ stdenv, fetchurl, pkgconfig, intltool, gtk2, iconnamingutils }:
stdenv.mkDerivation {
name = "mate-icon-theme-1.6.1";
src = fetchurl {
url = "http://pub.mate-desktop.org/releases/1.6/mate-icon-theme-1.6.1.tar.xz";
sha256 = "154x0mcsvjmz84vi94kjh8hpydny3ab9lbg58wxh1lskmbc2473x";
};
buildInputs = [ pkgconfig intltool gtk2 iconnamingutils ];
meta = {
description = "Icon themes from MATE";
homepage = "http://mate-desktop.org";
license = stdenv.lib.licenses.gpl2;
platforms = stdenv.lib.platforms.linux;
maintainers = with stdenv.lib.maintainers; [ iyzsong ];
};
}
pkgs/misc/themes/mate-themes/default.nix
+20
View File
@@ -0,0 +1,20 @@
{ stdenv, fetchurl, pkgconfig, intltool, iconnamingutils, gtk2 }:
stdenv.mkDerivation {
name = "mate-themes-1.6.1";
src = fetchurl {
url = "http://pub.mate-desktop.org/releases/1.6/mate-themes-1.6.1.tar.xz";
sha256 = "0lm2kvlwj0rpznb0n2g1sh1r6nz0p45i7flbnxivl9gi632wdmfp";
};
buildInputs = [ pkgconfig intltool iconnamingutils gtk2 ];
meta = {
description = "A set of themes from MATE";
homepage = "http://mate-desktop.org";
license = stdenv.lib.licenses.lgpl21;
platforms = stdenv.lib.platforms.linux;
maintainers = with stdenv.lib.maintainers; [ iyzsong ];
};
}
pkgs/misc/vim-plugins/default.nix
+68 -14
View File
@@ -1,4 +1,4 @@
{fetchurl, stdenv, python, cmake, vim, perl, ruby}:
{ fetchurl, stdenv, python, cmake, vim, perl, ruby, unzip }:
/*
About Vim and plugins
@@ -145,12 +145,15 @@ in
};
};
syntastic = simpleDerivation {
name = "vim-syntastic-3.0.0";
syntastic = simpleDerivation rec {
version = "3.1.0";
name = "vim-syntastic-${version}";
src = fetchurl {
url = "https://github.com/scrooloose/syntastic/archive/3.0.0.tar.gz";
sha256 = "0nf69wpa8qa7xcfvywy2khmazs4dn1i2nal9qwjh2bzrbwbbkdyl";
url = "https://github.com/scrooloose/syntastic/archive/${version}.tar.gz";
sha256 = "155zfb5z0gmd1xrpna4varqf502lq0cr41gmxq5v71r6kmb7ql82";
};
path = "syntastic";
};
@@ -164,18 +167,13 @@ in
};
command_T = simpleDerivation {
name = "vim-command-t-1.4";
src = fetchurl {
url = "https://github.com/wincent/Command-T/archive/1.4.tar.gz";
sha256 = "1ka9hwx9n0vj1dd5qsd2l1wq0kriwl76jmmdjzh7zaf0p547v98s";
};
path = "Command-T";
buildInputs = [ perl ruby ];
buildPhase = ''
pushd ruby/command-t
ruby extconf.rb
@@ -184,17 +182,73 @@ in
'';
};
eighties = simpleDerivation {
name = "vim-eighties-1.0.4";
src = fetchurl {
url = "https://github.com/justincampbell/vim-eighties/archive/1.0.4.tar.gz";
sha256 = "0cjd9hbg2qd7jjkvyi15f9ysp7m3aa2sg8nvbf80yb890rfkwaqr";
};
path = "eighties";
meta = with stdenv.lib; {
description = "Automatically resizes your windows to 80 characters";
homepage = https://github.com/justincampbell/vim-eighties;
license = licenses.publicDomain;
maintainers = with maintainers; [ lovek323 ];
platforms = platforms.unix;
};
};
taglist = simpleDerivation {
name = "vim-taglist-4.6";
meta = with stdenv.lib; {
description = "Source code browser plugin";
homepage = "http://www.vim.org/scripts/script.php?script_id=273";
license = licenses.gpl3;
maintainers = with maintainers; [ lovek323 ];
platforms = platforms.unix;
};
src = fetchurl {
url = "http://www.vim.org/scripts/download_script.php?src_id=19574";
name = "taglist_46.zip";
sha256 = "18cbv462vwg7vip2p99qlahm99hswav96cj4ki227kyi05q2lkjj";
};
setSourceRoot = ''
export sourceRoot=taglist
mkdir taglist
mv doc taglist
mv plugin taglist
'';
buildInputs = [ unzip ];
path = "taglist";
};
tagbar = simpleDerivation rec {
version = "2.5";
name = "vim-tagbar-${version}";
meta = with stdenv.lib; {
description = "A vim plugin for browsing the tags of source code files";
homepage = https://github.com/majutsushi/tagbar;
license = licenses.gpl3;
maintainers = with maintainers; [ lovek323 ];
platforms = platforms.unix;
};
src = fetchurl {
url = "https://github.com/majutsushi/tagbar/archive/v${version}.tar.gz";
sha256 = "1s4aic3qbk2ra2cif06g16d0avlmpxhrm96dksrw9qnv4hcjqqxr";
};
path = "tagbar";
};
xdebug = simpleDerivation {
name = "vim-xdebug-a4980fa65f7f159780593ee37c178281691ba2c4";
src = fetchurl {
url = "https://github.com/joonty/vim-xdebug/archive/a4980fa65f7f159780593ee37c178281691ba2c4.tar.gz";
sha256 = "1348gzp0zhc2wifvs5vmf92m9y8ik8ldnvy7bawsxahy8hmhiksk";
};
path = "xdebug";
postInstall = false;
};
}