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

Merge 'staging' into multiple-outputs

Browse Source 
Conflicts:
	pkgs/applications/audio/flac/default.nix
	pkgs/build-support/gcc-wrapper/builder.sh
	pkgs/development/libraries/apr-util/default.nix
	pkgs/development/libraries/apr/default.nix
	pkgs/development/libraries/atk/default.nix
	pkgs/development/libraries/freetype/default.nix
	pkgs/development/libraries/gdk-pixbuf/default.nix
	pkgs/development/libraries/glib/default.nix
	pkgs/development/libraries/glibc/2.17/builder.sh
	pkgs/development/libraries/glibc/2.17/locales.nix
	pkgs/development/libraries/libjpeg/default.nix
	pkgs/development/libraries/libogg/default.nix
	pkgs/development/libraries/libsamplerate/default.nix
	pkgs/development/libraries/libtiff/default.nix
	pkgs/development/libraries/libvorbis/default.nix
	pkgs/development/libraries/mesa/default.nix
	pkgs/development/libraries/pango/default.nix
	pkgs/development/web/nodejs/default.nix
	pkgs/os-specific/linux/pam/default.nix
	pkgs/os-specific/linux/systemd/default.nix
	pkgs/stdenv/generic/setup.sh
	pkgs/stdenv/linux/default.nix
	pkgs/top-level/all-packages.nix
	pkgs/top-level/release-small.nix
This commit is contained in:
Vladimír Čunát
2014-08-23 16:04:53 +02:00
parent db83d9a35b 084626deec
commit 96cec2a7bd
6628 changed files with 165219 additions and 65293 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/misc/beep/default.nix
+24
View File
@@ -0,0 +1,24 @@
{ stdenv, fetchurl }:
# this package is working only as root
# in order to work as a non privileged user you would need to suid the bin
stdenv.mkDerivation {
name = "beep-1.3";
src = fetchurl {
url = http://www.johnath.com/beep/beep-1.3.tar.gz;
md5 = "49c340ceb95dbda3f97b2daafac7892a";
};
makeFlags = "INSTALL_DIR=\${out}/bin/ MAN_DIR=\${out}/man/man1/";
preInstall = ''
mkdir -p $out/bin
mkdir -p $out/man/man1
'';
meta = {
description = "The advanced PC speaker beeper";
homepage = http://www.johnath.com/beep/;
license = stdenv.lib.licenses.gpl2;
};
}
pkgs/misc/cups/drivers/cups-bjnp/default.nix
+2 -2
View File
@@ -1,11 +1,11 @@
{stdenv, fetchurl, cups}:
stdenv.mkDerivation rec {
name = "cups-bjnp-0.5.4";
name = "cups-bjnp-1.2.1";
src = fetchurl {
url = "mirror://sourceforge/cups-bjnp/${name}.tar.gz";
sha256 = "1q5npis0jgs44yvczrr6pz87glk1d9lv3vr2s4nqrk3l0q4xplf6";
sha256 = "0fjpp0mmmwfcr790hfjs0brsxxb7dz7v2xab6wc30rwzkqmgz95x";
};
preConfigure = ''configureFlags="--with-cupsbackenddir=$out/lib/cups/backend"'';
pkgs/misc/cups/pdf-filter.nix
+1 -1
View File
@@ -32,7 +32,7 @@ stdenv.mkDerivation {
meta = {
homepage = http://www.cups.org/;
description = "Image and pdf filters for CUPS";
license = "GPLv2";
license = stdenv.lib.licenses.gpl2;
maintainers = [ stdenv.lib.maintainers.urkud ];
platforms = stdenv.lib.platforms.linux;
};
pkgs/misc/drivers/foomatic-filters/default.nix
+2 -2
View File
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, pkgconfig, perl, cups, dbus }:
stdenv.mkDerivation rec {
name = "foomatic-filters-4.0.12";
name = "foomatic-filters-4.0.17";
src = fetchurl {
url = "http://www.openprinting.org/download/foomatic/${name}.tar.gz";
sha256 = "17w26r15094j4fqifa7f7i7jad4gsy9zdlq69kffrykcw31qx3q8";
sha256 = "1qrkgbm5jay2r7sh9qbyf0aiyrsl1mdc844hxf7fhw95a0zfbqm2";
};
buildInputs = [ pkgconfig perl cups dbus ];
pkgs/misc/drivers/gutenprint/default.nix
+8 -4
View File
@@ -1,9 +1,9 @@
# this package was called gimp-print in the past
{ fetchurl, stdenv, pkgconfig, composableDerivation, cups
, libtiff, libpng, openssl, gimp }:
, libtiff, libpng, makeWrapper, openssl, gimp }:
let
version = "5.2.7";
version = "5.2.9";
inherit (composableDerivation) edf wwf;
in
@@ -12,11 +12,11 @@ composableDerivation.composableDerivation {} {
src = fetchurl {
url = "mirror://sourceforge/gimp-print/gutenprint-${version}.tar.bz2";
sha256 = "1lgf7d9vsszv0bzgsd8j3x5smby1lpk07d8x7isv1sz34y98jk0i";
sha256 = "185wai9hk0z0144hpxn5mqncy6xikc4bdv49vxqh5lrjdzqf89sb";
};
# gimp, gui is still not working (TODO)
buildInputs = [ openssl pkgconfig ];
buildInputs = [ makeWrapper openssl pkgconfig ];
configureFlags = ["--enable-static-genppd"];
NIX_CFLAGS_COMPILE="-include stdio.h";
@@ -37,6 +37,10 @@ composableDerivation.composableDerivation {} {
installPhase = ''
eval "make install $installArgs"
mkdir -p $out/lib/cups
ln -s $out/filter $out/lib/cups/
wrapProgram $out/filter/rastertogutenprint.5.2 --prefix LD_LIBRARY_PATH : $out/lib
wrapProgram $out/sbin/cups-genppd.5.2 --prefix LD_LIBRARY_PATH : $out/lib
'';
meta = {
pkgs/misc/drivers/hplip/default.nix
+68 -16
View File
@@ -1,26 +1,34 @@
{stdenv, fetchurl, cups, zlib, libjpeg, libusb, pythonPackages, saneBackends, dbus
, pkgconfig, polkit, qtSupport ? true, qt4, pythonDBus, pyqt4, net_snmp
{ stdenv, fetchurl, automake, pkgconfig
, cups, zlib, libjpeg, libusb1, pythonPackages, saneBackends, dbus
, polkit, qtSupport ? true, qt4, pythonDBus, pyqt4, net_snmp
, withPlugin ? false
}:
stdenv.mkDerivation rec {
name = "hplip-3.11.1";
name = "hplip-3.14.4";
src = fetchurl {
url = "mirror://sourceforge/hplip/${name}.tar.gz";
sha256 = "0y68s4xm5d0kv7p5j41qq0xglp4vdbjwbrjs89b4a21wwn69hp9g";
sha256 = "1j8h44f8igl95wqypj4rk9awcw513hlps980jmcnkx60xghc4l6f";
};
#preBuild=''
# makeFlags="V=1 DISABLE_JBIG=1 CUPSFILTER=$out/lib/cups/filter CUPSPPD=$out/share/cups/model"
#'';
plugin = fetchurl {
url = "http://www.openprinting.org/download/printdriver/auxfiles/HP/plugins/${name}-plugin.run";
sha256 = "0k1vpmy7babbm3c5v4dcbhq0jgyr8as722nylfs8zx0dy7kr8874";
};
hplip_state = ./hplip.state;
prePatch = ''
sed -i s,/etc/sane.d,$out/etc/sane.d/, Makefile.in
sed -i s,/etc/hp/,$out/etc/hp/, base/g.py
# HPLIP hardcodes absolute paths everywhere. Nuke from orbit.
find . -type f -exec sed -i s,/etc/hp,$out/etc/hp, {} \;
find . -type f -exec sed -i s,/etc/sane.d,$out/etc/sane.d, {} \;
find . -type f -exec sed -i s,/usr/include/libusb-1.0,${libusb1}/include/libusb-1.0, {} \;
find . -type f -exec sed -i s,/usr/share/hal/fdi/preprobe/10osvendor,$out/share/hal/fdi/preprobe/10osvendor, {} \;
find . -type f -exec sed -i s,/usr/lib/systemd/system,$out/lib/systemd/system, {} \;
find . -type f -exec sed -i s,/var/lib/hp,$out/var/lib/hp, {} \;
'';
# --disable-network-build Until we have snmp
preConfigure = ''
export configureFlags="$configureFlags
--with-cupsfilterdir=$out/lib/cups/filter
@@ -33,23 +41,64 @@ stdenv.mkDerivation rec {
export makeFlags="
halpredir=$out/share/hal/fdi/preprobe/10osvendor
hplip_statedir=$out/var
rulesdir=$out/etc/udev/rules.d
policykit_dir=$out/share/polkit-1/actions
policykit_dbus_etcdir=$out/etc/dbus-1/system.d
policykit_dbus_sharedir=$out/share/dbus-1/system-services
hplip_confdir=$out/etc/hp
hplip_statedir=$out/var/lib/hp
";
'';
postInstall = ''
postInstall =
''
wrapPythonPrograms
'';
''
+ (stdenv.lib.optionalString withPlugin
(let hplip_arch =
if stdenv.system == "i686-linux" then "x86_32"
else if stdenv.system == "x86_64-linux" then "x86_64"
else abort "Platform must be i686-linux or x86_64-linux!";
in
''
sh ${plugin} --noexec --keep
cd plugin_tmp
cp plugin.spec $out/share/hplip/
mkdir -p $out/share/hplip/data/firmware
cp *.fw.gz $out/share/hplip/data/firmware
mkdir -p $out/share/hplip/data/plugins
cp license.txt $out/share/hplip/data/plugins
mkdir -p $out/share/hplip/prnt/plugins
for plugin in lj hbpl1; do
cp $plugin-${hplip_arch}.so $out/share/hplip/prnt/plugins
ln -s $out/share/hplip/prnt/plugins/$plugin-${hplip_arch}.so \
$out/share/hplip/prnt/plugins/$plugin.so
done
mkdir -p $out/share/hplip/scan/plugins
for plugin in bb_soap bb_marvell bb_soapht fax_marvell; do
cp $plugin-${hplip_arch}.so $out/share/hplip/scan/plugins
ln -s $out/share/hplip/scan/plugins/$plugin-${hplip_arch}.so \
$out/share/hplip/scan/plugins/$plugin.so
done
mkdir -p $out/var/lib/hp
cp ${hplip_state} $out/var/lib/hp/hplip.state
mkdir -p $out/etc/sane.d/dll.d
mv $out/etc/sane.d/dll.conf $out/etc/sane.d/dll.d/hpaio.conf
rm $out/etc/udev/rules.d/56-hpmud.rules
''));
buildInputs = [
libjpeg
cups
libusb
libusb1
pythonPackages.python
pythonPackages.wrapPython
saneBackends
@@ -59,15 +108,18 @@ stdenv.mkDerivation rec {
] ++ stdenv.lib.optional qtSupport qt4;
pythonPath = with pythonPackages; [
pillow
pythonDBus
pygobject
recursivePthLoader
reportlab
] ++ stdenv.lib.optional qtSupport pyqt4;
meta = with stdenv.lib; {
description = "Print, scan and fax HP drivers for Linux";
homepage = http://hplipopensource.com/;
license = "free"; # MIT/BSD/GPL
license = if withPlugin then licenses.unfree else "free"; # MIT/BSD/GPL
platforms = platforms.linux;
maintainers = with maintainers; [ ttuegel ];
};
}
pkgs/misc/drivers/hplip/hplip.state
+4
View File
@@ -0,0 +1,4 @@
[plugin]
installed=1
eula=1
version=3.14.4
pkgs/misc/drivers/xboxdrv/default.nix
+28
View File
@@ -0,0 +1,28 @@
{ stdenv, fetchurl, scons, libX11, pkgconfig
, libusb1, boost, glib, dbus_glib }:
let
version = "0.8.5";
in stdenv.mkDerivation {
name = "xboxdrv-${version}";
src = fetchurl {
url = "https://github.com/Grumbel/xboxdrv/archive/v${version}.tar.gz";
sha256 = "0xg2dhfsk3i693rgwr1pr532b3hk3zmjxlx55g6bplslr94bibi2";
};
patchPhase = ''
substituteInPlace Makefile --replace /usr/local "$out"
'';
buildInputs = [ scons libX11 pkgconfig libusb1 boost glib dbus_glib];
meta = with stdenv.lib; {
homepage = "http://pingus.seul.org/~grumbel/xboxdrv/";
description =
"Xbox/Xbox360 (and more) gamepad driver for Linux that works in userspace.";
license = licenses.gpl3Plus;
maintainers = [ maintainers.fuuzetsu ];
};
}
pkgs/misc/emulators/VisualBoyAdvance/default.nix
+3 -2
View File
@@ -13,11 +13,12 @@ stdenv.mkDerivation {
sed -i -e "s|char \* p = strrchr|const char * p = strrchr|g" src/Util.cpp
'';
buildInputs = [ zlib libpng SDL ] ++ stdenv.lib.optional (stdenv.system == "i686-linux") nasm;
meta = {
description = "A Game Boy/Game Boy Color/Game Boy Advance Emulator";
license = "GPLv2+";
license = stdenv.lib.licenses.gpl2Plus;
maintainers = [ stdenv.lib.maintainers.sander ];
homepage = http://vba.ngemu.com;
broken = true;
};
}
pkgs/misc/emulators/atari800/default.nix
+3 -3
View File
@@ -1,11 +1,11 @@
{stdenv, fetchurl, unzip, zlib, SDL}:
stdenv.mkDerivation {
name = "atari800-2.0.2";
name = "atari800-2.2.1";
builder = ./builder.sh;
src = fetchurl {
url = mirror://sourceforge/atari800/atari800-2.0.2.tar.gz;
md5 = "a81f8a5ace5fd89eb6094faef7c936af";
url = mirror://sourceforge/atari800/atari800-2.2.1.tar.gz;
sha256 = "0gkhlb3jc0rd7fcqjm41877fsqr7als3a0n552qmnjzrlcczf5yz";
};
rom = fetchurl {
url = mirror://sourceforge/atari800/xf25.zip;
pkgs/misc/emulators/bsod/default.nix
+2 -2
View File
@@ -11,7 +11,7 @@ stdenv.mkDerivation {
buildInputs = [ ncurses ];
installPhase = ''
ensureDir $out/bin
mkdir -p $out/bin
cp bsod $out/bin
'';
@@ -23,7 +23,7 @@ stdenv.mkDerivation {
blue screen of death on the console. Errors and drivers causing the
error are selected randomly from a large set of examples.";
homepage = "http://www.vanheusden.com/bsod/";
license = "GPLv2";
license = stdenv.lib.licenses.gpl2;
platforms = stdenv.lib.platforms.unix;
maintainers = [ stdenv.lib.maintainers.antono ];
};
pkgs/misc/emulators/dlx/default.nix
+1 -1
View File
@@ -23,6 +23,6 @@ stdenv.mkDerivation {
meta = {
homepage = "http://www.davidviner.com/dlx.php";
description = "DLX Simulator";
license = "GPL-2";
license = stdenv.lib.licenses.gpl2;
};
}
pkgs/misc/emulators/fakenes/default.nix
+1 -1
View File
@@ -22,7 +22,7 @@ stdenv.mkDerivation {
meta = {
homepage = http://fakenes.sourceforge.net/;
license = "GPLv2+";
license = stdenv.lib.licenses.gpl2Plus;
description = "Portable Open Source NES Emulator";
};
}
pkgs/misc/emulators/fceux/default.nix
+34
View File
@@ -0,0 +1,34 @@
{stdenv, fetchurl, scons, zlib, SDL, lua5, pkgconfig}:
stdenv.mkDerivation {
name = "fceux-2.2.2";
src = fetchurl {
url = mirror://sourceforge/fceultra/Source%20Code/2.2.2%20src/fceux-2.2.2.src.tar.gz;
sha256 = "1qg5bygla8ka30b7wqvq6dv84xc7pq0jspffh2jz75d1njyi2kc0";
};
buildInputs = [
scons zlib SDL lua5 pkgconfig
];
phases = "unpackPhase buildPhase";
# sed allows scons to find libraries in nix.
# mkdir is a hack to make scons succeed. It still doesn't
# actually put the files in there due to a bug in the SConstruct file.
# OPENGL doesn't work because fceux dlopens the library.
buildPhase = ''
sed -e 's/env *= *Environment *.*/&; env['"'"'ENV'"'"']=os.environ;/' -i SConstruct
export CC="gcc"
export CXX="g++"
mkdir -p "$out" "$out/share/applications" "$out/share/pixmaps"
scons --prefix="$out" OPENGL=false GTK=false CREATE_AVI=false LOGO=false SYSTEM_LUA=false install
'';
meta = {
description = "A Nintendo Entertainment System (NES) Emulator";
license = stdenv.lib.licenses.gpl2;
homepage = http://www.fceux.com/;
};
}
pkgs/misc/emulators/hatari/default.nix
+2 -2
View File
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
meta = {
homepage = "http://hatari.tuxfamily.org/";
description = "Atari ST/STE/TT/Falcon emulator";
license = "GPLv2+";
platforms = with stdenv.lib.platforms; all;
license = stdenv.lib.licenses.gpl2Plus;
platforms = stdenv.lib.platforms.linux;
};
}
pkgs/misc/emulators/mednafen/default.nix
+35
View File
@@ -0,0 +1,35 @@
{ stdenv, fetchurl, pkgconfig
, libX11, mesa, freeglut
, jack2, libcdio, libsndfile, libsamplerate
, SDL, SDL_net, zlib
}:
stdenv.mkDerivation rec {
name = "mednafen-${version}";
version = "0.9.36.3";
src = fetchurl {
url = "http://downloads.sourceforge.net/project/mednafen/Mednafen/${version}/${name}.tar.bz2";
sha256 = "00byql2p28l4476mvzmv5ysclb6yv9f4qrf6vz0x7ii648rp97in";
};
buildInputs = with stdenv.lib;
[ pkgconfig libX11 mesa freeglut jack2 libcdio libsndfile libsamplerate SDL SDL_net zlib ];
# Install docs
postInstall = ''
mkdir -p $out/share/doc/$name
cd Documentation
install -m 644 -t $out/share/doc/$name *.css *.def *.html *.php *.png *.txt
'';
meta = {
description = "A portable, CLI-driven, SDL+OpenGL-based, multi-system emulator";
homepage = http://mednafen.sourceforge.net/;
license = stdenv.lib.licenses.gpl2;
maintainers = [ stdenv.lib.maintainers.AndersonTorres ];
platforms = stdenv.lib.platforms.linux;
};
}
pkgs/misc/emulators/mednafen/server.nix
+25
View File
@@ -0,0 +1,25 @@
{ stdenv, fetchurl }:
stdenv.mkDerivation rec {
name = "mednafen-server-${version}";
version = "0.5.1";
src = fetchurl {
url = "http://downloads.sourceforge.net/project/mednafen/Mednafen-Server/${version}/${name}.tar.gz";
sha256="0c5wvg938y3h4n5lb0dl8pvmjzphhkbba34r6ikpvdahq166ps4j";
};
postInstall = ''
mkdir -p $out/share/$name
install -m 644 -t $out/share/$name standard.conf
'';
meta = {
description = "Netplay server for Mednafen";
homepage = http://mednafen.sourceforge.net/;
license = stdenv.lib.licenses.gpl2;
maintainers = [ stdenv.lib.maintainers.AndersonTorres ];
platforms = stdenv.lib.platforms.linux;
};
}
pkgs/misc/emulators/mupen64plus/1.5.nix
+1 -1
View File
@@ -26,7 +26,7 @@ stdenv.mkDerivation {
meta = {
description = "A Nintendo 64 Emulator";
license = "GPLv2+";
license = stdenv.lib.licenses.gpl2Plus;
homepage = http://code.google.com/p/mupen64plus;
maintainers = [ stdenv.lib.maintainers.sander ];
};
pkgs/misc/emulators/mupen64plus/default.nix
+1 -1
View File
@@ -26,7 +26,7 @@ stdenv.mkDerivation {
meta = {
description = "A Nintendo 64 Emulator";
license = "GPLv2+";
license = stdenv.lib.licenses.gpl2Plus;
homepage = http://code.google.com/p/mupen64plus;
maintainers = [ stdenv.lib.maintainers.sander ];
};
pkgs/misc/emulators/ppsspp/default.nix
+31
View File
@@ -0,0 +1,31 @@
{ stdenv, fetchgit, zlib, libpng, qt4, pkgconfig
, withGamepads ? true, SDL # SDL is used for gamepad functionality
}:
let
version = "0.9.9";
fstat = x: fn: "-D" + fn + "=" + (if x then "ON" else "OFF");
in stdenv.mkDerivation {
name = "PPSSPP-${version}";
src = fetchgit {
url = "https://github.com/hrydgard/ppsspp.git";
sha256 = "1m7awac87wrwys22qwbr0589im1ilm0dv30wp945xg30793rivvj";
rev = "b421e29391b34d997b2c99ce2bdc74a0df5bb472";
fetchSubmodules = true;
};
buildInputs = [ zlib libpng pkgconfig qt4 ]
++ (if withGamepads then [ SDL ] else [ ]);
configurePhase = "cd Qt && qmake PPSSPPQt.pro";
installPhase = "mkdir -p $out/bin && cp PPSSPPQt $out/bin";
meta = with stdenv.lib; {
homepage = "http://www.ppsspp.org/";
description = "A PSP emulator, the Qt4 version.";
license = licenses.gpl2Plus;
maintainers = [ maintainers.fuuzetsu ];
platforms = platforms.linux ++ platforms.darwin ++ platforms.cygwin;
};
}
pkgs/misc/emulators/retroarch/default.nix
+13 -9
View File
@@ -1,27 +1,31 @@
{ stdenv, fetchurl, pkgconfig, which
{ stdenv, fetchgit, pkgconfig, which
, SDL, mesa, alsaLib
, libXxf86vm, libXinerama, libXv
}:
stdenv.mkDerivation rec {
name = "retroarch-0.9.9";
name = "retroarch-0.9.9.7";
src = fetchurl {
url = "http://themaister.net/retroarch-dl/${name}.tar.gz";
sha256 = "08xlndpl14c4ccgp752ixx3a7ajf3xp93nawhinwxq0cw801prda";
src = fetchgit {
url = "https://github.com/libretro/RetroArch.git";
rev = "ea0c4880556e0f9d1fe8253ddc713bc743b00e1b";
sha256 = "1jhyh7f8ijy67fxslxqsp8pjl2lwayjljp06hp4n5cn33yajpbd7";
};
buildInputs = [
pkgconfig which SDL mesa alsaLib
libXxf86vm libXinerama libXv
];
preConfigure = ''
configureFlags="--global-config-dir=$out/etc"
'';
meta = {
description = "A cross-platform multi-system emulator";
homepage = "http://themaister.net/retroarch.html";
description = "Modular multi-system game/emulator system";
homepage = "http://www.libretro.com/";
license = stdenv.lib.licenses.gpl3Plus;
platform = stdenv.lib.platforms.linux;
platforms = stdenv.lib.platforms.linux;
maintainers = with stdenv.lib.maintainers; [ iyzsong ];
};
}
pkgs/misc/emulators/snes9x-gtk/default.nix
+30
View File
@@ -0,0 +1,30 @@
{stdenv, fetchurl, nasm, SDL, zlib, libpng, ncurses, mesa, intltool, gtk, pkgconfig, libxml2, x11, pulseaudio}:
stdenv.mkDerivation rec {
name = "snes9x-gtk-${version}";
version = "1.53";
src = fetchurl {
url = "http://files.ipherswipsite.com/snes9x/snes9x-${version}-src.tar.bz2";
sha256 = "9f7c5d2d0fa3fe753611cf94e8879b73b8bb3c0eab97cdbcb6ab7376efa78dc3";
};
buildInputs = [ nasm SDL zlib libpng ncurses mesa intltool gtk pkgconfig libxml2 x11 pulseaudio];
sourceRoot = "snes9x-${version}-src/gtk";
configureFlags = "--prefix=$out/ --with-opengl";
installPhase = ''
mkdir -p $out/bin
cp snes9x-gtk $out/bin
'';
meta = {
description = "a portable, freeware Super Nintendo Entertainment System (SNES) emulator";
longDescription = "Snes9x is a portable, freeware Super Nintendo Entertainment System (SNES) emulator. It basically allows you to play most games designed for the SNES and Super Famicom Nintendo game systems on your PC or Workstation; which includes some real gems that were only ever released in Japan.";
license = stdenv.lib.licenses.lgpl2;
maintainers = [ stdenv.lib.maintainers.qknight ];
homepage = http://www.snes9x.com/;
};
}
pkgs/misc/emulators/uae/default.nix
+1 -1
View File
@@ -11,7 +11,7 @@ stdenv.mkDerivation {
meta = {
description = "Ultimate/Unix/Unusuable Amiga Emulator";
license = "GPLv2+";
license = stdenv.lib.licenses.gpl2Plus;
homepage = http://www.amigaemulator.org;
maintainers = [ stdenv.lib.maintainers.sander ];
};
pkgs/misc/emulators/vice/default.nix
+1 -1
View File
@@ -38,7 +38,7 @@ stdenv.mkDerivation rec {
meta = {
description = "Commodore 64, 128 and other emulators";
homepage = http://www.viceteam.org;
license = "GPLv2+";
license = stdenv.lib.licenses.gpl2Plus;
maintainers = [ stdenv.lib.maintainers.sander ];
};
}
pkgs/misc/emulators/wine/stable.nix
+13 -9
View File
@@ -1,18 +1,18 @@
{ stdenv, fetchurl, xlibs, flex, bison, mesa, alsaLib
, ncurses, libpng, libjpeg, lcms, freetype, fontconfig, fontforge
{ stdenv, fetchurl, pkgconfig, xlibs, flex, bison, mesa, mesa_noglu, alsaLib
, ncurses, libpng, libjpeg, lcms2, freetype, fontconfig, fontforge
, libxml2, libxslt, openssl, gnutls, cups, libdrm, makeWrapper
}:
assert stdenv.isLinux;
assert stdenv.gcc.gcc != null;
let
version = "1.6";
let
version = "1.6.2";
name = "wine-${version}";
src = fetchurl {
url = "mirror://sourceforge/wine/${name}.tar.bz2";
sha256 = "1bj21d94i0mqvkmzxd4971232yniribk7q3fllf23ynbpppk1wg1";
sha256 = "1gmc0ljgfz3qy50mdxcwwjcr2yrpz54jcs2hdszsrk50wpnrxazh";
};
gecko = fetchurl {
@@ -34,10 +34,11 @@ in stdenv.mkDerivation rec {
inherit version name src;
buildInputs = [
xlibs.xlibs flex bison xlibs.libXi mesa
pkgconfig
xlibs.xlibs flex bison xlibs.libXi mesa mesa_noglu.osmesa
xlibs.libXcursor xlibs.libXinerama xlibs.libXrandr
xlibs.libXrender xlibs.libXxf86vm xlibs.libXcomposite
alsaLib ncurses libpng libjpeg lcms fontforge
alsaLib ncurses libpng libjpeg lcms2 fontforge
libxml2 libxslt openssl gnutls cups makeWrapper
];
@@ -45,7 +46,7 @@ in stdenv.mkDerivation rec {
# them to the RPATH so that the user doesn't have to set them in
# LD_LIBRARY_PATH.
NIX_LDFLAGS = map (path: "-rpath ${path}/lib ") [
freetype fontconfig stdenv.gcc.gcc mesa libdrm
freetype fontconfig stdenv.gcc.gcc mesa mesa_noglu.osmesa libdrm
xlibs.libXinerama xlibs.libXrender xlibs.libXrandr
xlibs.libXcursor xlibs.libXcomposite libpng libjpeg
openssl gnutls cups
@@ -61,6 +62,9 @@ in stdenv.mkDerivation rec {
install -D ${gecko} $out/share/wine/gecko/${gecko64.name}
'' + ''
install -D ${mono} $out/share/wine/mono/${mono.name}
paxmark psmr $out/bin/wine{,-preloader}
wrapProgram $out/bin/wine --prefix LD_LIBRARY_PATH : ${stdenv.gcc.gcc}/lib
'';
@@ -71,7 +75,7 @@ in stdenv.mkDerivation rec {
license = "LGPL";
inherit version;
description = "An Open Source implementation of the Windows API on top of X, OpenGL, and Unix";
maintainers = [stdenv.lib.maintainers.raskin stdenv.lib.maintainers.simons];
maintainers = [stdenv.lib.maintainers.raskin];
platforms = stdenv.lib.platforms.linux;
};
}
pkgs/misc/emulators/wine/unstable.nix
+14 -13
View File
@@ -1,4 +1,4 @@
{ stdenv, fetchurl, xlibs, flex, bison, mesa, alsaLib
{ stdenv, fetchurl, pkgconfig, xlibs, flex, bison, mesa, mesa_noglu, alsaLib
, ncurses, libpng, libjpeg, lcms, freetype, fontconfig, fontforge
, libxml2, libxslt, openssl, gnutls, cups, libdrm, makeWrapper
}:
@@ -6,35 +6,36 @@
assert stdenv.isLinux;
assert stdenv.gcc.gcc != null;
let
version = "1.7.4";
let
version = "1.7.23";
name = "wine-${version}";
src = fetchurl {
url = "mirror://sourceforge/wine/${name}.tar.bz2";
sha256 = "0sb9zfrvlrjx1icfb94clgac239i9yfhyv48zv9iddgmvdjk8ysi";
sha256 = "012ww1yifayakw9n2m23sx83dc3i2xiq3bn5n9iprppdhwxpp76v";
};
gecko = fetchurl {
url = "mirror://sourceforge/wine/wine_gecko-2.21-x86.msi";
sha256 = "1n0zccnvchkg0m896sjx5psk4bxw9if32xyxib1rbfdasykay7zh";
url = "mirror://sourceforge/wine/wine_gecko-2.24-x86.msi";
sha256 = "0b10f55q3sldlcywscdlw3kd7vl9izlazw7jx30y4rpahypaqf3f";
};
gecko64 = fetchurl {
url = "mirror://sourceforge/wine/wine_gecko-2.21-x86_64.msi";
sha256 = "0grc86dkq90i59zw43hakh62ra1ajnk11m64667xjrlzi7f0ndxw";
url = "mirror://sourceforge/wine/wine_gecko-2.24-x86_64.msi";
sha256 = "1j4wdlhzvjrabzr9igcnx0ivm5mcb8kp7bwkpfpfsanbifk7sma7";
};
mono = fetchurl {
url = "mirror://sourceforge/wine/wine-mono-0.0.8.msi";
sha256 = "00jl24qp7vh3hlqv7wsw1s529lr5p0ybif6s73jy85chqaxj7z1x";
url = "mirror://sourceforge/wine/wine-mono-4.5.2.msi";
sha256 = "1bgasysf3qacxgh5rlk7qlw47ar5zgd1k9gb22pihi5s87dlw4nr";
};
in stdenv.mkDerivation rec {
inherit version name src;
buildInputs = [
xlibs.xlibs flex bison xlibs.libXi mesa
pkgconfig
xlibs.xlibs flex bison xlibs.libXi mesa mesa_noglu.osmesa
xlibs.libXcursor xlibs.libXinerama xlibs.libXrandr
xlibs.libXrender xlibs.libXxf86vm xlibs.libXcomposite
alsaLib ncurses libpng libjpeg lcms fontforge
@@ -45,7 +46,7 @@ in stdenv.mkDerivation rec {
# them to the RPATH so that the user doesn't have to set them in
# LD_LIBRARY_PATH.
NIX_LDFLAGS = map (path: "-rpath ${path}/lib ") [
freetype fontconfig stdenv.gcc.gcc mesa libdrm
freetype fontconfig stdenv.gcc.gcc mesa mesa_noglu.osmesa libdrm
xlibs.libXinerama xlibs.libXrender xlibs.libXrandr
xlibs.libXcursor xlibs.libXcomposite libpng libjpeg
openssl gnutls cups
@@ -71,7 +72,7 @@ in stdenv.mkDerivation rec {
license = "LGPL";
inherit version;
description = "An Open Source implementation of the Windows API on top of X, OpenGL, and Unix";
maintainers = [stdenv.lib.maintainers.raskin stdenv.lib.maintainers.simons];
maintainers = [stdenv.lib.maintainers.raskin];
platforms = stdenv.lib.platforms.linux;
};
}
pkgs/misc/emulators/wine/winetricks.nix
+7 -6
View File
@@ -1,19 +1,20 @@
{ stdenv, fetchsvn, wine, perl, which, coreutils, zenity, curl, cabextract, unzip, p7zip } :
{ stdenv, fetchsvn, wine, perl, which, coreutils, zenity, curl
, cabextract, unzip, p7zip, gnused, gnugrep, bash } :
stdenv.mkDerivation rec {
rev = "939";
rev = "1199";
name = "winetricks-${rev}";
src = fetchsvn {
url = "http://winetricks.googlecode.com/svn/trunk";
inherit rev;
sha256 = "01v13qw4sxmfm09g9amqycnzy743gdrhvv23rjr9255dzlrj1s8f";
sha256 = "1kji1n6ps09g8xnl9m7vqk3vkl03abzwnc43c52i8p0adnv06khb";
};
buildInputs = [ perl which ];
pathAdd = stdenv.lib.concatStringsSep "/bin:" # coreutils is for sha1sum
[ wine perl which coreutils zenity curl cabextract unzip p7zip ]
[ wine perl which coreutils zenity curl cabextract unzip p7zip gnused gnugrep bash ]
+ "/bin";
patch = ./winetricks.patch;
@@ -22,8 +23,8 @@ stdenv.mkDerivation rec {
meta = {
description = "A script to install DLLs needed to work around problems in Wine";
license = "LGPLv2.1";
license = stdenv.lib.licenses.lgpl21;
homepage = http://code.google.com/p/winetricks/;
maintainers = with stdenv.lib.maintainers; [ the-kenny ];
};
}
pkgs/misc/emulators/wxmupen64plus/default.nix
+1 -1
View File
@@ -22,7 +22,7 @@ stdenv.mkDerivation {
meta = {
description = "GUI for the Mupen64Plus 2.0 emulator";
license = "GPLv2+";
license = stdenv.lib.licenses.gpl2Plus;
homepage = https://bitbucket.org/auria/wxmupen64plus/wiki/Home;
};
}
pkgs/misc/emulators/zsnes/default.nix
+15 -20
View File
@@ -2,37 +2,32 @@
stdenv.mkDerivation {
name = "zsnes-1.51";
src = fetchurl {
url = mirror://sourceforge/zsnes/zsnes151src.tar.bz2;
sha256 = "08s64qsxziv538vmfv38fg1rfrz5k95dss5zdkbfxsbjlbdxwmi8";
};
# copied from arch linux, fixes gcc-4.8 compatibility
patches = [ ./zsnes.patch ];
postPatch = ''
patch -p0 < ${./zsnes-1.51-libpng15.patch}
'';
buildInputs = [ nasm SDL zlib libpng ncurses mesa ];
preConfigure = ''
cd src
# Fix for undefined strncasecmp()
echo '#include <strings.h>' > tmp.cpp
cat tmp.cpp tools/strutil.h > tools/strutil.h.new
mv tools/strutil.h.new tools/strutil.h
# Fix for undefined system()
echo '#include <stdlib.h>' > tmp.cpp
cat tmp.cpp tools/depbuild.cpp > tools/depbuild.cpp.new
mv tools/depbuild.cpp.new tools/depbuild.cpp
# Fix for lots of undefined strcmp, strncmp etc.
echo '#include <string.h>' > tmp.cpp
cat tmp.cpp parsegen.cpp > parsegen.cpp.new
mv parsegen.cpp.new parsegen.cpp
sed -i "/^STRIP/d" configure
'';
configureFlags = "--enable-release";
meta = {
description = "A Super Nintendo Entertainment System Emulator";
license = "GPLv2+";
license = stdenv.lib.licenses.gpl2Plus;
maintainers = [ stdenv.lib.maintainers.sander ];
homepage = http://www.zsnes.com;
};
}
}
pkgs/misc/emulators/zsnes/zsnes-1.51-libpng15.patch
+12
View File
@@ -0,0 +1,12 @@
Use existing png_set_IHDR() and stop accessing PNG structure members directly
--- src/zip/zpng.c
+++ src/zip/zpng.c
@@ -129,7 +129,6 @@
png_set_IHDR(png_ptr, info_ptr, width, height, 8,
PNG_COLOR_TYPE_RGB, PNG_INTERLACE_NONE,
PNG_COMPRESSION_TYPE_DEFAULT, PNG_FILTER_TYPE_DEFAULT);
- info_ptr->color_type = PNG_COLOR_TYPE_RGB;
//Allocate an array of scanline pointers
row_pointers = (png_bytep*)malloc(height*sizeof(png_bytep));
pkgs/misc/emulators/zsnes/zsnes.patch
+80
View File
@@ -0,0 +1,80 @@
diff -aur zsnes_1_51//src/Makefile.in zsnes_1_51_new//src/Makefile.in
--- zsnes_1_51//src/Makefile.in 2007-01-24 21:54:12.000000000 +0100
+++ zsnes_1_51_new//src/Makefile.in 2010-09-06 00:03:04.715810431 +0200
@@ -95,7 +95,7 @@
%.o: %.cpp
@CXX@ @CXXFLAGS@ -o $@ -c $<
%.o %.h: %.psr $(PSR)
- ./$(PSR) @PSRFLAGS@ -gcc @CC@ -compile -flags "@CFLAGS@ -O1" -cheader $*.h -fname $* $*.o $<
+ ./$(PSR) @PSRFLAGS@ -gcc "@CC@" -compile -flags "@CFLAGS@ -O1 -D_FORTIFY_SOURCE=0" -cheader $*.h -fname $* $*.o $<
default: main
all: main tools
@@ -133,7 +133,7 @@
include makefile.dep
makefile.dep: $(TOOL_D)/depbuild Makefile
- $(TOOL_D)/depbuild @CC@ "@CFLAGS@" @NASMPATH@ "@NFLAGS@" $(Z_OBJS) > makefile.dep
+ $(TOOL_D)/depbuild "@CC@" "@CFLAGS@" "@NASMPATH@" "@NFLAGS@" $(Z_OBJS) > makefile.dep
Makefile: Makefile.in config.status
./config.status
diff -aur zsnes_1_51//src/parsegen.cpp zsnes_1_51_new//src/parsegen.cpp
--- zsnes_1_51//src/parsegen.cpp 2007-10-31 05:30:26.000000000 +0100
+++ zsnes_1_51_new//src/parsegen.cpp 2010-09-05 15:48:36.903333444 +0200
@@ -19,6 +19,9 @@
Config file handler creator by Nach (C) 2005-2007
*/
+#include <cstring>
+#include <cstdlib>
+
#if !defined(__GNUC__) && !defined(_MSC_VER)
#error You are using an unsupported compiler
#endif
@@ -1822,7 +1825,7 @@
}
}
-int main(size_t argc, const char *const *const argv)
+int main(int argc, const char *const *const argv)
{
const char *cheader_file = 0;
bool compile = false;
diff -aur zsnes_1_51//src/tools/depbuild.cpp zsnes_1_51_new//src/tools/depbuild.cpp
--- zsnes_1_51//src/tools/depbuild.cpp 2006-12-27 12:04:05.000000000 +0100
+++ zsnes_1_51_new//src/tools/depbuild.cpp 2010-09-05 15:48:36.903333444 +0200
@@ -183,7 +183,7 @@
}
}
-int main(size_t argc, const char *const *const argv)
+int main(int argc, const char *const *const argv)
{
if (argc < 5)
{
diff -aur zsnes_1_51//src/tools/strutil.h zsnes_1_51_new//src/tools/strutil.h
--- zsnes_1_51//src/tools/strutil.h 2006-12-27 12:04:05.000000000 +0100
+++ zsnes_1_51_new//src/tools/strutil.h 2010-09-05 15:48:36.903333444 +0200
@@ -15,6 +15,9 @@
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
+#include <cstring>
+#include <cstdlib>
+
/*
This is part of a toolkit used to assist in ZSNES development
*/
diff -u -r zsnes_1_51/src/tools/depbuild.cpp zsnes_1_51-fix/src/tools/depbuild.cpp
--- zsnes_1_51/src/tools/depbuild.cpp 2006-12-27 12:04:05.000000000 +0100
+++ zsnes_1_51-fix/src/tools/depbuild.cpp 2012-07-14 16:20:17.759886250 +0200
@@ -26,6 +26,8 @@
#include <cstdio>
using namespace std;
+#include <unistd.h>
+
#include "fileutil.h"
#include "strutil.h"
pkgs/misc/foldingathome/default.nix
+1 -1
View File
@@ -32,6 +32,6 @@ stdenv.mkDerivation {
meta = {
homepage = http://folding.stanford.edu/;
description = "Folding@home distributed computing client";
license = "unfree";
license = stdenv.lib.licenses.unfree;
};
}
pkgs/misc/freestyle/default.nix
+1 -1
View File
@@ -48,6 +48,6 @@ stdenv.mkDerivation {
meta = {
description = "Non-Photorealistic Line Drawing rendering from 3D scenes";
homepage = http://freestyle.sourceforge.net;
license = "GPL2";
license = stdenv.lib.licenses.gpl2;
};
}
pkgs/misc/ghostscript/default.nix
+1 -1
View File
@@ -23,7 +23,7 @@ let
of output drivers for various file formats and printers.
'';
license = "GPLv3+";
license = stdenv.lib.licenses.gpl3Plus;
platforms = stdenv.lib.platforms.all;
maintainers = [ stdenv.lib.maintainers.viric ];
pkgs/misc/jackaudio/default.nix
+1 -1
View File
@@ -5,7 +5,7 @@
assert firewireSupport -> ffado != null;
stdenv.mkDerivation rec {
name = "jackdbus-${version}";
name = "jack2-${version}";
version = "1.9.9.5";
src = fetchurl {
pkgs/misc/jackaudio/jack1.nix
+5 -5
View File
@@ -1,15 +1,15 @@
{ stdenv, fetchurl, pkgconfig, alsaLib
{ stdenv, fetchurl, pkgconfig, alsaLib, db, libuuid
, firewireSupport ? false, ffado ? null }:
assert firewireSupport -> ffado != null;
stdenv.mkDerivation rec {
name = "jack-${version}";
version = "0.121.3";
name = "jack1-${version}";
version = "0.124.1";
src = fetchurl {
url = "http://jackaudio.org/downloads/jack-audio-connection-kit-${version}.tar.gz";
sha256 = "1ypa3gjwy4vmaskin0vczmmdwybckkl42wmkfabx3v5yx8yms2dp";
sha256 = "1mk1wnx33anp6haxfjjkfhwbaknfblsvj35nxvz0hvspcmhdyhpb";
};
preBuild = "echo ok";
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
'';
buildInputs =
[ pkgconfig alsaLib
[ pkgconfig alsaLib db libuuid
] ++ (stdenv.lib.optional firewireSupport ffado);
meta = {
pkgs/misc/lilypond/default.nix
+6 -5
View File
@@ -1,7 +1,8 @@
{ stdenv, fetchurl, ghostscript, texinfo, imagemagick, texi2html, guile
, python, gettext, flex, perl, bison, pkgconfig, texLive, dblatex
, fontconfig, freetype, pango, fontforge, help2man, zip, netpbm, groff
, fetchsvn, makeWrapper }:
, fontconfig, freetype, pango, fontforge, help2man, zip, netpbm, groff
, fetchsvn, makeWrapper, t1utils
}:
stdenv.mkDerivation rec{
majorVersion="2.16";
@@ -24,7 +25,7 @@ stdenv.mkDerivation rec{
'';
postInstall = ''
for f in "$out"/bin/*; do
for f in "$out/bin/"*; do
wrapProgram "$f" --set GUILE_AUTO_COMPILE 0 \
--set PATH "${ghostscript}/bin"
done
@@ -35,10 +36,10 @@ stdenv.mkDerivation rec{
buildInputs =
[ ghostscript texinfo imagemagick texi2html guile dblatex zip netpbm
python gettext flex perl bison pkgconfig texLive fontconfig freetype pango
fontforge help2man groff makeWrapper
fontforge help2man groff makeWrapper t1utils
];
meta = {
meta = {
description = "Music typesetting system";
homepage = http://lilypond.org/;
license = "GPL";
pkgs/misc/maven/default.nix
+19 -10
View File
@@ -1,15 +1,24 @@
{stdenv, fetchurl, jdk, makeWrapper}:
{ stdenv, fetchurl, jdk, makeWrapper }:
assert jdk != null;
stdenv.mkDerivation {
name = "apache-maven-3.0.4";
builder = ./builder.sh;
src = fetchurl {
url = mirror://apache/maven/binaries/apache-maven-3.0.4-bin.tar.gz;
sha256 = "0bxa7x8ifm8590nxifhsh3sxzm6aicbczyx21vibg3606ih8fnnk";
};
buildInputs = [makeWrapper];
inherit jdk;
name = "apache-maven-3.1.1";
builder = ./builder.sh;
src = fetchurl {
url = mirror://apache/maven/binaries/apache-maven-3.1.1-bin.tar.gz;
sha256 = "06ymc5y8bp5crcz74z2m9pf58aid5q11v2klnjmxb4ar8mkd8zh7";
};
buildInputs = [ makeWrapper ];
inherit jdk;
meta = with stdenv.lib; {
description = "Build automation tool (used primarily for Java projects)";
homepage = http://maven.apache.org/;
license = licenses.asl20;
};
}
pkgs/misc/my-env/loadenv.sh
+6 -1
View File
@@ -6,9 +6,14 @@ source @myenvpath@
PATH="$PATH:$OLDPATH"
export PS1="\n@name@:[\u@\h:\w]\$ "
export NIX_MYENV_NAME="@name@"
export buildInputs
export NIX_STRIP_DEBUG=0
export TZ="$OLDTZ"
@shell@
if test $# -gt 0; then
exec "$@"
else
exec @shell@
fi
pkgs/misc/screensavers/slock/default.nix
+2 -2
View File
@@ -1,9 +1,9 @@
{ stdenv, fetchurl, xproto, libX11, libXext }:
stdenv.mkDerivation rec {
name = "slock-1.0";
name = "slock-1.1";
src = fetchurl {
url = "http://dl.suckless.org/tools/${name}.tar.gz";
sha256 = "b4e44ff1660f6f7eb270a0575d6ae1e0fbffcf0cdd96860a1695d57e89ae2df9";
sha256 = "1r70s3npmp0nyrfdsxz8cw1i1z8n9phqdlw02wjphv341h3yajp0";
};
buildInputs = [ xproto libX11 libXext ];
installFlags = "DESTDIR=\${out} PREFIX=";
pkgs/misc/screensavers/vlock/default.nix
+4 -1
View File
@@ -16,7 +16,10 @@ stdenv.mkDerivation {
buildInputs = [ pam ];
meta = {
meta = with stdenv.lib; {
description = "Virtual console locking program";
license = licenses.gpl2;
maintainers = [ maintainers.lethalman ];
platforms = platforms.linux;
};
}
pkgs/misc/screensavers/xlockmore/default.nix
+2 -2
View File
@@ -2,10 +2,10 @@
stdenv.mkDerivation rec {
name = "xlockmore-5.38";
name = "xlockmore-5.43";
src = fetchurl {
url = "http://www.tux.org/~bagleyd/xlock/${name}/${name}.tar.bz2";
sha256 = "15x5l43zdjn881xf2m9psz9s2hvd2l8py2kzdhdh1v9m4ml20nf4";
sha256 = "1l36n8x51j7lwdalv6yi37cil290vzd3djjqydhsm0pnm8hiz499";
};
# Optionally, it can use GTK+.
pkgs/misc/screensavers/xscreensaver/default.nix
+5 -5
View File
@@ -1,21 +1,21 @@
{ stdenv, fetchurl, pkgconfig, bc, perl, pam, libXext, libXScrnSaver, libX11
, libXrandr, libXmu, libXxf86vm, libXrender, libXxf86misc, libjpeg, mesa, gtk
, libxml2, libglade
, libxml2, libglade, intltool
}:
stdenv.mkDerivation rec {
version = "5.19";
version = "5.29";
name = "xscreensaver-${version}";
src = fetchurl {
url = "http://www.jwz.org/xscreensaver/${name}.tar.gz";
sha256 = "fd62ea0f996abe1bea3770dd7141681454521b49302f9bced8af9c2ee428c0e0";
sha256 = "157jy1mh84h6p4mpzsgcadv6c660c212rmjgdpgpidcn0rsza664";
};
buildInputs =
[ pkgconfig bc perl libjpeg mesa gtk libxml2 libglade pam
libXext libXScrnSaver libX11 libXrandr libXmu libXxf86vm libXrender
libXxf86misc
libXxf86misc intltool
];
patchPhase =
@@ -40,6 +40,6 @@ stdenv.mkDerivation rec {
homepage = "http://www.jwz.org/xscreensaver/";
description = "A set of screensavers";
maintainers = with stdenv.lib.maintainers; [ raskin urkud ];
platforms = stdenv.lib.platforms.allBut "i686-cygwin";
platforms = with stdenv.lib.platforms; allBut cygwin;
};
}
pkgs/misc/seafile-shared/default.nix
+41
View File
@@ -0,0 +1,41 @@
{stdenv, fetchurl, which, automake, autoconf, pkgconfig, libtool, vala, python, intltool, fuse, ccnet}:
stdenv.mkDerivation rec
{
version = "3.0.4";
name = "seafile-shared-${version}";
src = fetchurl
{
url = "https://github.com/haiwen/seafile/archive/v${version}.tar.gz";
sha256 = "0a0yj9k2rr3q42swwzn1js3r8bld9wcysw6p9415rw5jabcm1af0";
};
buildInputs = [ which automake autoconf pkgconfig libtool vala python intltool fuse ];
propagatedBuildInputs = [ ccnet ];
preConfigure = ''
sed -ie 's|/bin/bash|/bin/sh|g' ./autogen.sh
./autogen.sh
'';
configureFlags = "--disable-server --disable-console";
buildPhase = "make -j1";
postInstall = ''
# Remove seafile binary
rm -rf "$out/bin/seafile"
# Remove cli client binary
rm -rf "$out/bin/seaf-cli"
'';
meta =
{
homepage = "https://github.com/haiwen/seafile";
description = "Shared components of Seafile: seafile-daemon, libseafile, libseafile python bindings, manuals, and icons";
license = stdenv.lib.licenses.gpl3;
platforms = stdenv.lib.platforms.linux;
maintainers = [ stdenv.lib.maintainers.calrama ];
};
}
pkgs/misc/solfege/default.nix
+7 -8
View File
@@ -5,11 +5,11 @@
}:
stdenv.mkDerivation rec {
name = "solfege-3.22.0";
name = "solfege-3.22.2";
src = fetchurl {
url = "mirror://sourceforge/solfege/${name}.tar.gz";
sha256 = "10klrhdb1n67xd4bndk6z6idyf0pvwz7hcdg9ibalms7ywl3b23x";
sha256 = "1r4g93ka7i8jh5glii5nza0zq0wy4sw0gfzpvkcrhj9yr1h0jsp4";
};
buildInputs = [ pkgconfig python pygtk gettext texinfo
@@ -28,17 +28,16 @@ stdenv.mkDerivation rec {
postInstall = ''
set -x
find "${librsvg}" "${gdk_pixbuf}" -name loaders.cache -print0 | xargs -0 cat > "$out/gdk-pixbuf.loaders"
wrapProgram "$out/bin/solfege" \
--prefix PYTHONPATH ':' "$PYTHONPATH" \
--set GDK_PIXBUF_MODULE_FILE "$out/gdk-pixbuf.loaders"
--set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE"
'';
meta = {
meta = with stdenv.lib; {
description = "Ear training program";
homepage = http://www.solfege.org/;
license = stdenv.lib.licenses.gpl3;
platforms = stdenv.lib.platforms.linux;
maintainers = with stdenv.lib.maintainers; [ bjornfor ];
license = licenses.gpl3;
platforms = platforms.linux;
maintainers = [ maintainers.bjornfor ];
};
}
pkgs/misc/source-and-tags/default.nix
+7 -2
View File
@@ -56,8 +56,13 @@ args: with args; {
tagCmd = "
srcs=\"`find . -type f -name \"*.*hs\"; find . -type f -name \"*.*hs*\";`\"
[ -z \"$srcs\" ] || {
${toString hasktags}/bin/hasktags-modified --ignore-close-implementation --ctags $srcs
sort tags > \$TAG_FILE
# without this creating tag files for lifted-base fails
export LC_ALL=en_US.UTF-8
export LANG=en_US.UTF-8
${if args.stdenv.isLinux then "export LOCALE_ARCHIVE=${args.pkgs.glibcLocales}/lib/locale/locale-archive;" else ""}
${toString hasktags}/bin/hasktags --ignore-close-implementation --ctags .
mv tags \$TAG_FILE
}";
}
];
pkgs/misc/themes/gnome-themes-standard/default.nix
-15
View File
@@ -1,15 +0,0 @@
{ stdenv, fetchurl, intltool, gtk3, librsvg, pkgconfig, pango, atk, gtk2, gdk_pixbuf }:
stdenv.mkDerivation {
name = "gnome-themes-standard";
src = fetchurl {
url = "http://ftp.gnome.org/pub/GNOME/sources/gnome-themes-standard/3.7/gnome-themes-standard-3.7.92.tar.xz";
sha256 = "0a1ed83c07f57b5b45b8f3817ca0ca14feecb56de505243c086fb306c88da8de";
};
buildInputs = [ intltool gtk3 librsvg pkgconfig pango atk gtk2 gdk_pixbuf ];
preConfigure = ''
cat ${gdk_pixbuf}/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache ${librsvg}/lib/gdk-pixbuf/loaders.cache > loaders.cache
export GDK_PIXBUF_MODULE_FILE=`readlink -e loaders.cache`
'';
}
pkgs/misc/themes/gtk2/oxygen-gtk/default.nix
+3 -2
View File
@@ -2,12 +2,12 @@
cmake, dbus_glib, glib, gtk, gdk_pixbuf, pkgconfig, xorg }:
stdenv.mkDerivation rec {
version = "1.3.4";
version = "1.4.5";
name = "oxygen-gtk2-${version}";
src = fetchurl {
url = "mirror://kde/stable/oxygen-gtk2/${version}/src/${name}.tar.bz2";
sha256 = "02q46kq0hhrmzwbjngg31ydl2198ls5bxgnz2si4amdmqii1nlmj";
sha256 = "00ykq4aafakdkvww7kz84bvg9wc2gdji4m7z87f49hj1jxm84v2v";
};
buildInputs = [ cmake dbus_glib glib gtk gdk_pixbuf
@@ -19,5 +19,6 @@ stdenv.mkDerivation rec {
homepage = https://projects.kde.org/projects/playground/artwork/oxygen-gtk;
license = licenses.lgpl2;
maintainers = [ maintainers.goibhniu ];
platforms = platforms.linux;
};
}
pkgs/misc/themes/mate-icon-theme/default.nix
+3 -3
View File
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, pkgconfig, intltool, gtk2, iconnamingutils }:
stdenv.mkDerivation {
name = "mate-icon-theme-1.6.1";
name = "mate-icon-theme-1.6.3";
src = fetchurl {
url = "http://pub.mate-desktop.org/releases/1.6/mate-icon-theme-1.6.1.tar.xz";
sha256 = "154x0mcsvjmz84vi94kjh8hpydny3ab9lbg58wxh1lskmbc2473x";
url = "http://pub.mate-desktop.org/releases/1.6/mate-icon-theme-1.6.3.tar.xz";
sha256 = "1r3qkx4k9svmxdg453r9d3hs47cgagxsngzi8rp6yry0c9bw5r5w";
};
buildInputs = [ pkgconfig intltool gtk2 iconnamingutils ];
pkgs/misc/themes/mate-themes/default.nix
+3 -3
View File
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, pkgconfig, intltool, iconnamingutils, gtk2 }:
stdenv.mkDerivation {
name = "mate-themes-1.6.1";
name = "mate-themes-1.6.3";
src = fetchurl {
url = "http://pub.mate-desktop.org/releases/1.6/mate-themes-1.6.1.tar.xz";
sha256 = "0lm2kvlwj0rpznb0n2g1sh1r6nz0p45i7flbnxivl9gi632wdmfp";
url = "http://pub.mate-desktop.org/releases/1.6/mate-themes-1.6.3.tar.xz";
sha256 = "1wakr9z3byw1yvnbaxg8cpfhp1bp1fmnaz742738m0fx6bzznj9i";
};
buildInputs = [ pkgconfig intltool iconnamingutils gtk2 ];
pkgs/misc/themes/qtcurve/default.nix
+43
View File
@@ -0,0 +1,43 @@
{ stdenv, fetchurl, cmake, gettext, pkgconfig # Build tools
, gtk2, kde_workspace, kdelibs # Toolkit dependencies
, libpthreadstubs, libXdmcp, libxcb, xlibs # X11 dependencies
}:
stdenv.mkDerivation {
name = "qtcurve-1.8.18";
src = fetchurl {
url = "https://github.com/QtCurve/qtcurve/archive/1.8.18.tar.gz";
sha256 = "19kk11hgi6md1cl0hr0pklcczbl66jczahlkf5fr8j59ljgpr6c5";
};
buildInputs = [
cmake
gettext
gtk2
kde_workspace
kdelibs
libpthreadstubs
libXdmcp
libxcb
pkgconfig
xlibs.libxshmfence
];
patches = [
./qtcurve-1.8.18-install-paths.patch
./qtcurve-1.8.18-toolbar-alpha.patch
];
cmakeFlags = ''
-DENABLE_QT5=OFF
-DQTC_QT4_ENABLE_KWIN=ON
'';
meta = with stdenv.lib; {
homepage = https://github.com/QtCurve/qtcurve;
description = "Widget styles for Qt4/KDE4 and gtk2";
platforms = platforms.linux;
license = licenses.lgpl21Plus;
maintainers = [ maintainers.ttuegel ];
};
}
pkgs/misc/themes/qtcurve/qtcurve-1.8.18-install-paths.patch
+24
View File
@@ -0,0 +1,24 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index b2be588..4cb9115 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -116,6 +116,7 @@ if(ENABLE_GTK2)
find_package(PkgConfig REQUIRED)
unset(__pkg_config_checked_GTK2 CACHE)
pkg_check_modules(GTK2 REQUIRED gtk+-2.0)
+ set(GTK2_THEME_PREFIX "${CMAKE_INSTALL_PREFIX}")
if(GTK2_THEME_PREFIX)
set(GTK2_PREFIX "${GTK2_THEME_PREFIX}")
elseif(NOT GTK2_PREFIX)
diff --git a/gtk2/style/CMakeLists.txt b/gtk2/style/CMakeLists.txt
index 01e8891..a2c767e 100644
--- a/gtk2/style/CMakeLists.txt
+++ b/gtk2/style/CMakeLists.txt
@@ -88,6 +88,6 @@ target_link_libraries(qtcurve-gtk2
qtcurve-utils qtcurve-cairo m)
install(TARGETS qtcurve-gtk2 LIBRARY DESTINATION
- ${GTK2_LIBDIR}/gtk-2.0/${GTK2_BIN_VERSION}/engines)
+ lib/gtk-2.0/${GTK2_BIN_VERSION}/engines)
install(FILES gtkrc icons3 icons4 map_kde_icons.pl kdeglobals
DESTINATION ${GTK2_THEME_DIR}/gtk-2.0)
pkgs/misc/themes/qtcurve/qtcurve-1.8.18-toolbar-alpha.patch
+34
View File
@@ -0,0 +1,34 @@
diff --git a/qt4/style/qtcurve.cpp b/qt4/style/qtcurve.cpp
index d7659f5..aede882 100644
--- a/qt4/style/qtcurve.cpp
+++ b/qt4/style/qtcurve.cpp
@@ -12436,7 +12436,12 @@ Style::drawMenuOrToolBarBackground(const QWidget *widget, QPainter *p,
if (!qtcIsCustomBgnd(&opts) || !qtcIsFlat(app) ||
(menu && SHADE_NONE != opts.shadeMenubars)) {
p->save();
+#if 0
+ // Revert for now
+ // This is necessary for correct opacity on the menubar but may
+ // break transparent gradient.
p->setCompositionMode(QPainter::CompositionMode_Source);
+#endif
QRect rx(r);
QColor col(menu && (option->state & State_Enabled ||
SHADE_NONE != opts.shadeMenubars) ?
diff --git a/qt5/style/qtcurve.cpp b/qt5/style/qtcurve.cpp
index c43b8a3..135eddc 100644
--- a/qt5/style/qtcurve.cpp
+++ b/qt5/style/qtcurve.cpp
@@ -3398,7 +3398,12 @@ Style::drawMenuOrToolBarBackground(const QWidget *widget, QPainter *p,
if (!qtcIsCustomBgnd(&opts) || !qtcIsFlat(app) ||
(menu && opts.shadeMenubars != SHADE_NONE)) {
p->save();
+#if 0
+ // Revert for now
+ // This is necessary for correct opacity on the menubar but may
+ // break transparent gradient.
p->setCompositionMode(QPainter::CompositionMode_Source);
+#endif
QRect rx(r);
QColor col(menu && (option->state & State_Enabled ||
opts.shadeMenubars != SHADE_NONE) ?
pkgs/misc/uboot/guruplug.nix
+1 -1
View File
@@ -10,7 +10,7 @@ let
rev = "f106056095049c2c748c2a2797e5353295240e04";
in
stdenv.mkDerivation {
name = "uboot-guruplug-0.0pre${rev}";
name = "uboot-guruplug-0.0-pre-${stdenv.lib.strings.substring 0 7 rev}";
src = fetchgit {
url = "git://git.denx.de/u-boot-marvell.git";
pkgs/misc/vim-plugins/default.nix
+349 -28
View File
@@ -1,4 +1,4 @@
{ fetchurl, stdenv, python, cmake, vim, perl, ruby, unzip, which }:
{ fetchurl, bash, stdenv, python, cmake, vim, perl, ruby, unzip, which, fetchgit, clang }:
/*
About Vim and plugins
@@ -88,8 +88,8 @@ let vimHelpTags = ''
inherit buildPhase;
installPhase = ''
target=$out/vim-plugins/$path
ensureDir $out/vim-plugins
target=$out/share/vim-plugins/${path}
mkdir -p $out/share/vim-plugins
cp -r . $target
${vimHelpTags}
vimHelpTags $target
@@ -109,23 +109,28 @@ in rec
};
YouCompleteMe = stdenv.mkDerivation {
# REGION AUTO UPDATE: { name="youcompleteme"; type="git"; url="git://github.com/Valloric/YouCompleteMe"; }
src = (fetchurl { url = "http://mawercer.de/~nix/repos/youcompleteme-git-97306.tar.bz2"; sha256 = "b9b892f5a723370c2034491dc72a4ca722c6cf1e5de4d60501141bba151bc719"; });
name = "youcompleteme-git-97306";
# END
buildInputs = [ python cmake ];
src = fetchgit {
url = "https://github.com/Valloric/YouCompleteMe.git";
rev = "67288080ea7057ea3111cb4c863484e3b150e738";
sha256 = "1a3rwdl458z1yrp50jdwp629j4al0zld21n15sad28g51m8gw5ka";
};
name = "youcompleteme-git-6728808";
buildInputs = [ python cmake clang.clang ];
configurePhase = ":";
buildPhase = ''
target=$out/vim-plugins/YouCompleteMe
target=$out/share/vim-plugins/YouCompleteMe
mkdir -p $target
cp -a ./ $target
mkdir $target/build
cd $target/build
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}}
cmake -G "Unix Makefiles" . $target/third_party/ycmd/cpp -DPYTHON_LIBRARIES:PATH=${python}/lib/libpython2.7.so -DPYTHON_INCLUDE_DIR:PATH=${python}/include/python2.7 -DUSE_CLANG_COMPLETER=ON -DUSE_SYSTEM_LIBCLANG=ON
make ycm_support_libs -j''${NIX_BUILD_CORES} -l''${NIX_BUILD_CORES}}
${bash}/bin/bash $target/install.sh --clang-completer
${vimHelpTags}
vimHelpTags $target
@@ -145,12 +150,12 @@ in rec
};
syntastic = simpleDerivation rec {
version = "3.1.0";
version = "3.4.0";
name = "vim-syntastic-${version}";
src = fetchurl {
url = "https://github.com/scrooloose/syntastic/archive/${version}.tar.gz";
sha256 = "155zfb5z0gmd1xrpna4varqf502lq0cr41gmxq5v71r6kmb7ql82";
sha256 = "0h8vfs6icpfwc41qx6n6rc1m35haxp2gaswg9fhcki2w2ikp6knb";
};
path = "syntastic";
@@ -165,11 +170,12 @@ in rec
path = "vim-coffee-script";
};
command_T = simpleDerivation {
name = "vim-command-t-1.4";
command_T = simpleDerivation rec {
version = "1.8";
name = "vim-command-t-${version}";
src = fetchurl {
url = "https://github.com/wincent/Command-T/archive/1.4.tar.gz";
sha256 = "1ka9hwx9n0vj1dd5qsd2l1wq0kriwl76jmmdjzh7zaf0p547v98s";
url = "https://github.com/wincent/Command-T/archive/${version}.tar.gz";
sha256 = "ad8664292e6eee40fbe195d856d20d93a8630e8c0149317ad72cc39423630800";
};
path = "Command-T";
buildInputs = [ perl ruby ];
@@ -181,10 +187,11 @@ in rec
'';
};
eighties = simpleDerivation {
name = "vim-eighties-1.0.4";
eighties = simpleDerivation rec {
version = "1.0.4";
name = "vim-eighties-${version}";
src = fetchurl {
url = "https://github.com/justincampbell/vim-eighties/archive/1.0.4.tar.gz";
url = "https://github.com/justincampbell/vim-eighties/archive/${version}.tar.gz";
sha256 = "0cjd9hbg2qd7jjkvyi15f9ysp7m3aa2sg8nvbf80yb890rfkwaqr";
};
path = "eighties";
@@ -197,6 +204,23 @@ in rec
};
};
golang = simpleDerivation {
name = "vim-golang-20131127";
src = fetchgit {
url = "https://github.com/jnwhiteh/vim-golang.git";
rev = "832d64e5a813511ed52217aa24f0255c49671bab";
sha256 = "6858eb674be132477c5dc7f7d3cbe550371f90d1aba480547a614965412a7b3c";
};
path = "golang";
meta = with stdenv.lib; {
description = "Vim plugins for Go";
homepage = https://github.com/jnwhiteh/vim-golang;
license = licenses.publicDomain;
maintainers = with maintainers; [ lovek323 ];
platforms = platforms.unix;
};
};
ipython = simpleDerivation {
name = "vim-ipython-ff8f88f3fe518851a91dc88aaa5a75f8f352a960";
src = fetchurl {
@@ -239,7 +263,7 @@ in rec
};
tagbar = simpleDerivation rec {
version = "2.5";
version = "2.6.1";
name = "vim-tagbar-${version}";
meta = with stdenv.lib; {
@@ -252,7 +276,7 @@ in rec
src = fetchurl {
url = "https://github.com/majutsushi/tagbar/archive/v${version}.tar.gz";
sha256 = "1s4aic3qbk2ra2cif06g16d0avlmpxhrm96dksrw9qnv4hcjqqxr";
sha256 = "c061a7e0a45a166f4558b31e6c47b9fd701f5fa1319527b65a268ea054dea5fb";
};
path = "tagbar";
@@ -290,7 +314,7 @@ in rec
preBuild = ''
sed -ie '1 i\
set runtimepath+=${vimproc}/vim-plugins/vimproc\
set runtimepath+=${vimproc}/share/vim-plugins/vimproc\
' autoload/vimshell.vim
'';
@@ -298,7 +322,7 @@ in rec
};
vimproc = simpleDerivation rec {
version = "5cf4c6bfe9bf0649159b5648d736d54c96e99b3e";
version = "7788b5f934bc7460c1e9134b51fe5690b21de83c";
name = "vimproc-${version}";
meta = with stdenv.lib; {
@@ -310,10 +334,11 @@ in rec
platforms = platforms.unix;
};
src = fetchurl {
url = "${meta.homepage}/archive/${version}.tar.gz";
sha256 = "0f76mc7v3656sf9syaq1rxzk3dqz6i5w190wgj15sjjnapzd956p";
};
src = fetchgit {
url = "https://github.com/Shougo/vimproc.vim.git";
rev = "${version}";
sha256 = "0ahmnzccf5rv8rwg7b6pfgxh8pcmq955aznjv64slyh0mjqmh6jl";
};
buildInputs = [ which ];
@@ -324,4 +349,300 @@ in rec
path = "vimproc";
};
colorsamplerpack = simpleDerivation rec {
version = "2012.10.28";
name = "vim-colorsamplerpack-${version}";
setSourceRoot = "sourceRoot=.";
src = fetchurl {
url = "http://www.vim.org/scripts/download_script.php?src_id=18915";
name = "colorsamplerpack.zip";
sha256 = "1wsrb3vpqn9fncnalfpvc8r92wk1mcskm4shb3s2h9x5dyihf2rd";
};
buildInputs = [ unzip ];
path = "colorsamplerpack";
};
yankring = simpleDerivation rec {
version = "18.0";
name = "vim-yankring-${version}";
setSourceRoot = "sourceRoot=.";
src = fetchurl {
url = "http://www.vim.org/scripts/download_script.php?src_id=20842";
name = "yankring_180.zip";
sha256 = "0bsq4pxagy12jqxzs7gcf25k5ahwif13ayb9k8clyhm0jjdkf0la";
};
buildInputs = [ unzip ];
path = "yankring";
};
ctrlp = simpleDerivation rec {
version = "1.79";
name = "vim-ctrlp-${version}";
setSourceRoot = "sourceRoot=.";
src = fetchurl {
url = "http://www.vim.org/scripts/download_script.php?src_id=19448";
name = "ctrlp_180.zip";
sha256 = "1x9im8g0g27mxc3c9k7v0jg5bb1dmnbjygmqif5bizab5g69n2mi";
};
buildInputs = [ unzip ];
path = "ctrlp";
};
alternate = stdenv.mkDerivation rec {
version = "2.18";
name = "vim-a-${version}";
src = fetchurl {
url = "http://www.vim.org/scripts/download_script.php?src_id=7218";
name = "a.vim";
sha256 = "1q22vfkv60sshp9yj3mmfc8azavgzz7rpmaf72iznzq4wccy6gac";
};
unpackPhase = ":";
installPhase = ''
mkdir -p $out/share/vim-plugins/vim-a
cp ${src} $out/share/vim-plugins/vim-a/a.vim
'';
};
vundle = simpleDerivation {
name = "vundle-vim-git-0b28e334";
src = fetchgit {
url = "https://github.com/gmarik/Vundle.vim.git";
rev = "0b28e334e65b6628b0a61c412fcb45204a2f2bab";
sha256 = "9681d471d1391626cb9ad22b2b469003d9980cd23c5c3a8d34666376447e6204";
};
path = "vundle";
};
tslime = simpleDerivation {
name = "tslime-vim-git-e801a32b";
src = fetchgit {
url = "https://github.com/jgdavey/tslime.vim.git";
rev = "e801a32b27d83cb5d91afbf7c3d71bb6220f32bd";
sha256 = "47fb7165c1dcc444285cdff6fa89bbd4ace82ca79ec14ba0da6091c5f78d1251";
};
path = "tslime";
};
supertab = simpleDerivation {
name = "supertab-git-23db5585";
src = fetchgit {
url = "https://github.com/ervandew/supertab.git";
rev = "23db558596d4a73e4afa8fbedcde23b95bf72251";
sha256 = "21fa675969f4cfd2686ab3b63cba632fa55d62481e61d36193403bea9c02ebde";
};
path = "supertab";
buildInputs = [ vim ];
};
fugitive = simpleDerivation {
name = "vim-fugitive-git-90ee6fb5";
src = fetchgit {
url = "https://github.com/tpope/vim-fugitive.git";
rev = "90ee6fb5d255d14d9f12f2469f92ee50149f5b44";
sha256 = "0297512f7fee62af601a99a68617591ecb2e244475ff0d79ebee9c7e6eff2eaf";
};
path = "fugitive";
};
extradite = simpleDerivation {
name = "vim-extradite-git-af4f3a51";
src = fetchgit {
url = "https://github.com/int3/vim-extradite.git";
rev = "af4f3a51b6b654d655121b93c0cd9d8fe9a0c85d";
sha256 = "d1d29cfbc654134be383747f2cd6b14b7a87de75f997af6a041f14d7ef61ade6";
};
path = "extradite";
};
nerdtree = simpleDerivation {
name = "nerdtree-git-4f1e6ecb";
src = fetchgit {
url = "https://github.com/scrooloose/nerdtree.git";
rev = "4f1e6ecb057fc0bac189171c1430d71ef25f6bb1";
sha256 = "67ff2e7b9a7f39e58e9e334b1b79343a4c11aae10a657ab4fece289d8fe59300";
};
path = "nerdtree";
};
airline = simpleDerivation {
name = "vim-airline-git-2114e702";
src = fetchgit {
url = "https://github.com/bling/vim-airline.git";
rev = "2114e7025188a941e5c63b1f942d576adb98d8a4";
sha256 = "b6fc4d0545f8b7e107c5f80b94cf536a2b1fdd55d9f2484a29a007911e96130f";
};
path = "airline";
};
ultisnips = simpleDerivation {
name = "ultisnips-git-279d6e63";
src = fetchgit {
url = "https://github.com/SirVer/ultisnips.git";
rev = "279d6e63c9a8dbaa20ffc43c3c5f057dfc8f1121";
sha256 = "f8d93849ef2bce798aa599ba860694ced37d12450010a48dd6bd3004bc52b503";
};
path = "ultisnips";
};
align = simpleDerivation {
name = "align-git-787662fe";
src = fetchgit {
url = "https://github.com/vim-scripts/Align.git";
rev = "787662fe90cd057942bc5b682fd70c87e1a9dd77";
sha256 = "f7b5764357370f03546556bd45558837f3790b0e86afadb63cd04d714a668a29";
};
path = "align";
};
gundo = simpleDerivation {
name = "gundo-git-f443470b";
src = fetchgit {
url = "https://github.com/vim-scripts/Gundo.git";
rev = "f443470b96364c24a775629418a6b2562ec9173e";
sha256 = "b7a949167e59c936d6eae0d23635b87491b2cd2f46a197683b171d30165a90f9";
};
path = "gundo";
};
commentary = simpleDerivation {
name = "vim-commentary-git-8b4df6ca";
src = fetchgit {
url = "https://github.com/tpope/vim-commentary.git";
rev = "8b4df6ca0ba9cd117d97a8fd26b44b2439d5e3f1";
sha256 = "5496ed31706552957d4caa76669ecd04e9b2853cf7a7e40bd0164726b21fcca0";
};
path = "commentary";
};
tabular = simpleDerivation {
name = "tabular-git-60f25648";
src = fetchgit {
url = "https://github.com/godlygeek/tabular.git";
rev = "60f25648814f0695eeb6c1040d97adca93c4e0bb";
sha256 = "28c860ad621587f2c3213fae47d1a3997746527c17d51e9ab94c209eb7bfeb0f";
};
path = "tabular";
};
vim2hs = simpleDerivation {
name = "vim2hs-git-f2afd557";
src = fetchgit {
url = "https://github.com/dag/vim2hs.git";
rev = "f2afd55704bfe0a2d66e6b270d247e9b8a7b1664";
sha256 = "485fc58595bb4e50f2239bec5a4cbb0d8f5662aa3f744e42c110cd1d66b7e5b0";
};
path = "vim2hs";
};
hasksyn = simpleDerivation {
name = "hasksyn-git-175cd460";
src = fetchgit {
url = "https://github.com/travitch/hasksyn.git";
rev = "175cd4605afa5d9b9c75758112c8159fd118c631";
sha256 = "3488e38d1f45a9a3363da62c1c946591621151a0a9cdaedd22b3fe8f666bbdb9";
};
path = "hasksyn";
};
haskellConceal = simpleDerivation {
name = "vim-haskellConceal-git-73a8d712";
src = fetchgit {
url = "https://github.com/begriffs/vim-haskellConceal.git";
rev = "73a8d712d3342b2ffdc087b12924f1cf81053860";
sha256 = "be60ca030e2d39e972a8c71c0ab3b75b893589d26d5dd78a20cd6779f1f5cfa8";
};
path = "haskellConceal";
};
ghcmod = simpleDerivation {
name = "ghcmod-vim-git-0c4e9428";
src = fetchgit {
url = "https://github.com/eagletmt/ghcmod-vim.git";
rev = "0c4e94281e57c475752e799adc261f7d5e4ab124";
sha256 = "f6a085f7b8198747fae3fff0bc38e4d030e5c97aaeb84958fbf96fa658bbe862";
};
path = "ghcmod";
};
necoGhc = simpleDerivation {
name = "neco-ghc-git-0311f31b";
src = fetchgit {
url = "https://github.com/eagletmt/neco-ghc.git";
rev = "0311f31b3acaccec5b651ae7089d627a3a49239b";
sha256 = "302f29f54c56e9cee647745a8355aeafe323c4efe2f3593d5e4f586acc1c06a5";
};
path = "neco-ghc";
};
hoogle = simpleDerivation {
name = "vim-hoogle-git-81f28318";
src = fetchgit {
url = "https://github.com/Twinside/vim-hoogle.git";
rev = "81f28318b0d4174984c33df99db7752891c5c4e9";
sha256 = "0f96f3badb6218cac87d0f7027ff032ecc74f08ad3ada542898278ce11cbd5a0";
};
path = "hoogle";
};
hdevtools = simpleDerivation {
name = "vim-hdevtools-git-474947c5";
src = fetchgit {
url = "https://github.com/bitc/vim-hdevtools.git";
rev = "474947c52ff9c93dd36f3c49de90bd9a78f0baa1";
sha256 = "bf5f096b665c51ce611c6c1bfddc3267c4b2f94af84b04482b07272a6a5a92f3";
};
path = "hdevtools";
};
stylishHaskell = simpleDerivation {
name = "vim-stylish-haskell-git-453fd203";
src = fetchgit {
url = "https://github.com/nbouscal/vim-stylish-haskell.git";
rev = "453fd203aee3d7305ea8e4088ff53bd1f5933d75";
sha256 = "c0e5010e1e8e56b179ce500387afb569f051c45b37ce92feb4350f293df96a8c";
};
path = "stylish-haskell";
};
wombat256 = simpleDerivation {
name = "wombat256-vim-git-8734ba45";
src = fetchgit {
url = "https://github.com/vim-scripts/wombat256.vim.git";
rev = "8734ba45dcf5e38c4d2686b35c94f9fcb30427e2";
sha256 = "2feb7d57ab0a9f2ea44ccd606e540db64ab3285956398a50ecc562d7b8dbcd05";
};
path = "wombat256";
};
tmuxNavigator = simpleDerivation {
name = "vim-tmux-navigator-git-3de98bfc";
src = fetchgit {
url = "https://github.com/christoomey/vim-tmux-navigator.git";
rev = "3de98bfcee1289ce8edc6daf9a18f243180c7168";
sha256 = "3843f92e0a21fe5ccf613f8a561abd06c822b2ee98bd82c98937548144e4e8df";
};
path = "tmux-navigator";
};
pathogen = simpleDerivation {
name = "vim-pathogen-git-3de98bfc";
src = fetchgit {
url = "https://github.com/tpope/vim-pathogen.git";
rev = "91e6378908721d20514bbe5d18d292a0a15faf0c";
sha256 = "24c1897d6b58576b2189c90050a7f8ede72a51343c752e9d030e833dbe5cac6f";
};
path = "pathogen";
};
}