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

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

Browse Source 
Conflicts:
	pkgs/development/libraries/gtk+/2.x.nix
	pkgs/development/libraries/libsamplerate/default.nix
	pkgs/development/libraries/libsndfile/default.nix
	pkgs/misc/cups/default.nix
	pkgs/top-level/all-packages.nix
This commit is contained in:
Eelco Dolstra
2013-08-21 17:05:30 +02:00
parent 9555f3ba06 77b9f28658
commit 10cb4a8cf2
1087 changed files with 30296 additions and 32019 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/misc/cups/default.nix
+1 -1
View File
@@ -1,5 +1,5 @@
{ stdenv, fetchurl, pkgconfig, zlib, libjpeg, libpng, libtiff, pam, openssl
, dbus, libusb1, acl }:
, dbus, libusb, acl }:
let version = "1.5.4"; in
pkgs/misc/emulators/retroarch/default.nix
+27
View File
@@ -0,0 +1,27 @@
{ stdenv, fetchurl, pkgconfig, which
, SDL, mesa, alsaLib
}:
stdenv.mkDerivation rec {
name = "retroarch-0.9.9";
src = fetchurl {
url = "http://themaister.net/retroarch-dl/${name}.tar.gz";
sha256 = "08xlndpl14c4ccgp752ixx3a7ajf3xp93nawhinwxq0cw801prda";
};
buildInputs = [
pkgconfig which SDL mesa alsaLib
];
preConfigure = ''
configureFlags="--global-config-dir=$out/etc"
'';
meta = {
description = "A cross-platform multi-system emulator";
homepage = "http://themaister.net/retroarch.html";
license = stdenv.lib.licenses.gpl3Plus;
platform = stdenv.lib.platforms.linux;
};
}
pkgs/misc/emulators/wine/default.nix
+22 -8
View File
@@ -6,18 +6,28 @@
assert stdenv.isLinux;
assert stdenv.gcc.gcc != null;
stdenv.mkDerivation rec {
version = "1.5.31";
let gecko = fetchurl {
url = "mirror://sourceforge/wine/wine_gecko-2.21-x86.msi";
sha256 = "1n0zccnvchkg0m896sjx5psk4bxw9if32xyxib1rbfdasykay7zh";
};
gecko64 = fetchurl {
url = "mirror://sourceforge/wine/wine_gecko-2.21-x86_64.msi";
sha256 = "0grc86dkq90i59zw43hakh62ra1ajnk11m64667xjrlzi7f0ndxw";
};
mono = fetchurl {
url = "mirror://sourceforge/wine/wine-mono-0.0.8.msi";
sha256 = "00jl24qp7vh3hlqv7wsw1s529lr5p0ybif6s73jy85chqaxj7z1x";
};
in stdenv.mkDerivation rec {
version = "1.6";
name = "wine-${version}";
src = fetchurl {
url = "mirror://sourceforge/wine/${name}.tar.bz2";
sha256 = "1hlj1r3xi1mbqblkiwrcphvvb8rd50qig25jhyid58qp3r2lf9a6";
};
gecko = fetchurl {
url = "mirror://sourceforge/wine/wine_gecko-1.9-x86.msi";
sha256 = "10p7djsf85xjk8rzg3hgw5fskrn8402y2aijy701xwm4hy9ga79g";
sha256 = "1bj21d94i0mqvkmzxd4971232yniribk7q3fllf23ynbpppk1wg1";
};
buildInputs = [
@@ -44,6 +54,10 @@ stdenv.mkDerivation rec {
postInstall = ''
install -D ${gecko} $out/share/wine/gecko/${gecko.name}
'' + stdenv.lib.optionalString (stdenv.system == "x86_64-linux") ''
install -D ${gecko} $out/share/wine/gecko/${gecko64.name}
'' + ''
install -D ${mono} $out/share/wine/mono/${mono.name}
wrapProgram $out/bin/wine --prefix LD_LIBRARY_PATH : ${stdenv.gcc.gcc}/lib
'';
pkgs/misc/ghostscript/default.nix
+3 -3
View File
@@ -1,5 +1,5 @@
{ stdenv, fetchurl, libjpeg, libpng, libtiff, zlib, pkgconfig, fontconfig, openssl
, lcms2, freetype, libpaper, jbig2dec, expat, libiconvOrEmpty
, lcms, freetype, libpaper, jbig2dec, expat, libiconvOrEmpty
, x11Support, x11 ? null
, cupsSupport ? false, cups ? null
, gnuFork ? true
@@ -25,7 +25,7 @@ let
license = "GPLv3+";
platforms = stdenv.lib.platforms.all;
maintainers = [ stdenv.lib.maintainers.ludo stdenv.lib.maintainers.viric ];
maintainers = [ stdenv.lib.maintainers.viric ];
};
gnuForkSrc = rec {
@@ -79,7 +79,7 @@ stdenv.mkDerivation rec {
];
buildInputs = [
libjpeg libpng libtiff zlib pkgconfig fontconfig openssl lcms2
libjpeg libpng libtiff zlib pkgconfig fontconfig openssl lcms
libpaper jbig2dec expat
] ++ stdenv.lib.optionals x11Support [x11 freetype]
++ stdenv.lib.optional cupsSupport cups
pkgs/misc/themes/gtk2/gtk-engines/default.nix
+18
View File
@@ -0,0 +1,18 @@
{ stdenv, fetchurl, pkgconfig, intltool, gtk2 }:
stdenv.mkDerivation {
name = "gtk-engines-2.20.2";
src = fetchurl {
url = "ftp://ftp.gnome.org/pub/gnome/sources/gtk-engines/2.20/gtk-engines-2.20.2.tar.bz2";
sha256 = "1db65pb0j0mijmswrvpgkdabilqd23x22d95hp5kwxvcramq1dhm";
};
buildInputs = [ pkgconfig intltool gtk2 ];
meta = {
description = "Theme engines for GTK+ 2";
license = stdenv.lib.licenses.lgpl21Plus;
platforms = stdenv.lib.platforms.linux;
};
}
pkgs/misc/themes/gtk2/oxygen-gtk/default.nix
+2 -2
View File
@@ -2,12 +2,12 @@
cmake, dbus_glib, glib, gtk, gdk_pixbuf, pkgconfig, xorg }:
stdenv.mkDerivation rec {
version = "1.3.2.1";
version = "1.3.4";
name = "oxygen-gtk2-${version}";
src = fetchurl {
url = "mirror://kde/stable/oxygen-gtk2/${version}/src/${name}.tar.bz2";
sha256 = "19l0dhjswvm7y99pvbd3qnz37k0p5y2slljy8mm4r8awjff3v4qi";
sha256 = "02q46kq0hhrmzwbjngg31ydl2198ls5bxgnz2si4amdmqii1nlmj";
};
buildInputs = [ cmake dbus_glib glib gtk gdk_pixbuf
pkgs/misc/vim-plugins/default.nix
+70 -40
View File
@@ -1,4 +1,4 @@
{fetchurl, stdenv, python, cmake, vim}:
{fetchurl, stdenv, python, cmake, vim, perl, ruby}:
/*
About Vim and plugins
@@ -11,7 +11,7 @@ typical plugin files:
plugin/P1.vim
autoload/P1.vim
ftplugin/xyz.vim
doc/plugin-documentation.txt
doc/plugin-documentation.txt (traditional documentation)
README(.md) (nowadays thanks to github)
Traditionally plugins were installed into ~/.vim/* so it was your task to keep track
@@ -25,16 +25,16 @@ this to your .vimrc should make most plugins work:
set rtp+=~/.nix-profile/vim-plugins/YouCompleteMe
" or for p in ["YouCompleteMe"] | exec 'set rtp+=~/.nix-profile/vim-plugins/'.p | endfor
Its what
pathogen, vundle, vim-addon-manager (VAM) use.
Its what pathogen, vundle, vim-addon-manager (VAM) use.
VAM's benefits:
- works around after/* directories if they are used in non ~/.vim locations
- allows activating plugins at runtime, eg when you need them. (works around
some au command hooks, eg required for TheNerdTree plugin)
- VAM checkous out all sources (vim.sf.net, git, mercurial, ...)
- runs :helptags on update/installation only. Obviously it cannot do that on
store paths.
- it reads addon-info.json files which can declare dependencies by name
(without version)
VAM is made up of
- the code loading plugins
@@ -63,31 +63,50 @@ How to install VAM? eg provide such a bash function:
EOF
}
IMHO having no plugins listed might be better than having outdated ones.
Marc Weber thinks that having no plugins listed might be better than having
outdated ones.
So which plugins to add here according to what Marc Weber thinks is best?
complicated plugins requiring dependencies, such as YouCompleteMe.
Complicated plugins requiring dependencies, such as YouCompleteMe.
Then its best to symlink ~/.nix-profile/vim-plugins/YouCompleteMe to
~/.vim/{vim-addons,bundle} or whatever plugin management solution you use.
If you feel differently change the comments and proceed.
*/
let vimHelptags = path: ''
${vim}/bin/vim -N -u NONE -i NONE -n -e -s -c "helptags ${path}" +quit!
'';
# provide a function creating tag files for vim help documentation (doc/*.txt)
let vimHelpTags = ''
vimHelpTags(){
if [ -d "$1/doc" ]; then
${vim}/bin/vim -N -u NONE -i NONE -n -e -s -c "helptags $1/doc" +quit!
fi
}
'';
# install a simple standard vim plugin
simpleDerivation = a@{name, src, path, buildPhase ? "", ...} : stdenv.mkDerivation (a // {
inherit buildPhase;
installPhase = ''
target=$out/vim-plugins/$path
ensureDir $out/vim-plugins
ls -l
cp -r . $target
${vimHelpTags}
vimHelpTags $target
'';
});
in
{
#TODO :helptags should be run
vimAddonNix = {
# github.com/MarcWeber/vim-addon-nix provides some additional support for
# editing .nix files
# This is a placeholder, because I think you always should be using latest git version
# This is a placeholder, because I think you always should be using latest
# git version. It also depends on some additional plugins (see addon-info.json)
};
YouCompleteMe = stdenv.mkDerivation {
@@ -100,7 +119,6 @@ in
configurePhase = ":";
buildPhase = ''
set -x
target=$out/vim-plugins/YouCompleteMe
mkdir -p $target
cp -a ./ $target
@@ -110,7 +128,8 @@ in
cmake -G "Unix Makefiles" . $target/cpp -DPYTHON_LIBRARIES:PATH=${python}/lib/libpython2.7.so -DPYTHON_INCLUDE_DIR:PATH=${python}/include/python2.7
make -j -j''${NIX_BUILD_CORES} -l''${NIX_BUILD_CORES}}
${vimHelptags "$out/vim-plugins/YouCompleteMe/doc"}
${vimHelpTags}
vimHelpTags $target
'';
# TODO: implement proper install phase rather than keeping everything in store
@@ -126,45 +145,56 @@ in
};
};
syntastic = stdenv.mkDerivation {
syntastic = simpleDerivation {
name = "vim-syntastic-3.0.0";
src = fetchurl {
url = "https://github.com/scrooloose/syntastic/archive/3.0.0.tar.gz";
sha256 = "0nf69wpa8qa7xcfvywy2khmazs4dn1i2nal9qwjh2bzrbwbbkdyl";
};
buildPhase = "";
installPhase = ''
mkdir -p "$out/vim-plugins"
cp -R autoload "$out/vim-plugins"
cp -R doc "$out/vim-plugins"
cp -R plugin "$out/vim-plugins"
cp -R syntax_checkers "$out/vim-plugins"
'';
path = "syntastic";
};
coffeeScript = stdenv.mkDerivation {
coffeeScript = simpleDerivation {
name = "vim-coffee-script-v002";
src = fetchurl {
url = "https://github.com/vim-scripts/vim-coffee-script/archive/v002.tar.gz";
sha256 = "1xln6i6jbbihcyp5bsdylr2146y41hmp2xf7wi001g2ymj1zdsc0";
};
path = "vim-coffee-script";
};
buildPhase = "";
command_T = simpleDerivation {
installPhase = ''
mkdir -p "$out/vim-plugins"
cp -R after "$out/vim-plugins"
cp -R compiler "$out/vim-plugins"
cp -R doc "$out/vim-plugins"
cp -R ftdetect "$out/vim-plugins"
cp -R ftplugin "$out/vim-plugins"
cp -R indent "$out/vim-plugins"
cp -R syntax "$out/vim-plugins"
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
make
popd
'';
};
}
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;
};
}