3
0
Fork 0
forked from mirrors/nixpkgs

Merge branch 'master' into wayland

Conflicts:
	pkgs/top-level/all-packages.nix
This commit is contained in:
Carles Pagès 2013-03-03 11:58:28 +01:00
commit 8de5d77e3c
382 changed files with 5130 additions and 1142 deletions

View file

@ -1,13 +1,13 @@
{ stdenv, fetchsvn, alsaLib, aubio, boost, cairomm, curl, fftw
, fftwSinglePrec, flac, glib, glibmm, gtk, gtkmm, jackaudio
, fftwSinglePrec, flac, glibc, glibmm, gtk, gtkmm, jackaudio
, libgnomecanvas, libgnomecanvasmm, liblo, libmad, libogg, librdf
, librdf_raptor, librdf_rasqal, libsamplerate, libsigcxx, libsndfile
, libusb, libuuid, libxml2, libxslt, lilv, lv2, makeWrapper, pango
, perl, pkgconfig, python, serd, sord, sratom, suil }:
let
# Ardour 3 Beta 5
rev = "13072";
# Ardour 3 RC2
rev = "14092";
in
stdenv.mkDerivation {
@ -16,35 +16,36 @@ stdenv.mkDerivation {
src = fetchsvn {
url = http://subversion.ardour.org/svn/ardour2/branches/3.0;
inherit rev;
sha256 = "17k990kdb5q17z6jcz5b60imvvfbjw9zfxzy9fk0vg8gd6yq7736";
sha256 = "1zyy74z3xcsdhrzw4g6y1qm1ai2fl3bgabscl0wn7m1kkscr9nzg";
};
buildInputs =
[ alsaLib aubio boost cairomm curl fftw fftwSinglePrec
flac glib glibmm gtk gtkmm jackaudio libgnomecanvas
libgnomecanvasmm liblo libmad libogg librdf librdf_raptor
librdf_rasqal libsamplerate libsigcxx libsndfile libusb libuuid
libxml2 libxslt lilv lv2 pango perl pkgconfig python serd sord
sratom suil
[ alsaLib aubio boost cairomm curl fftw fftwSinglePrec flac glibc
glibmm gtk gtkmm jackaudio libgnomecanvas libgnomecanvasmm liblo
libmad libogg librdf librdf_raptor librdf_rasqal libsamplerate
libsigcxx libsndfile libusb libuuid libxml2 libxslt lilv lv2
makeWrapper pango perl pkgconfig python serd sord sratom suil
];
patchPhase = ''
printf '#include "ardour/svn_revision.h"\nnamespace ARDOUR { const char* svn_revision = \"${rev}\"; }\n' > libs/ardour/svn_revision.cc
sed -e 's|^#!/usr/bin/perl.*$|#!${perl}/bin/perl|g' -i tools/fmt-bindings
sed -e 's|^#!/usr/bin/env.*$|#!${perl}/bin/perl|g' -i tools/*.pl
sed 's|/usr/include/libintl.h|${glibc}/include/libintl.h|' -i wscript
'';
configurePhase = "python waf configure --prefix=$out";
buildPhase = "python waf";
installPhase = "python waf install";
postInstall = ''
mkdir -pv $out/gtk-2.0/2.10.0/engines
mv lib/ardour3/libclearlooks.so $out/gtk-2.0/2.10.0/engines/
wrapProgram $out/bin/ardour3 --prefix GTK_PATH : $out/gtk-2.0
'';
# For the custom ardour clearlooks gtk-engine to work, it must be
# moved to a directory called "engines" and added to GTK_PATH
installPhase = ''
python waf install
mkdir -pv $out/gtk2/engines
mv $out/lib/ardour3/libclearlooks.so $out/gtk2/engines/
wrapProgram $out/bin/ardour3 --prefix GTK_PATH : $out/gtk2
'';
meta = with stdenv.lib; {
description = "Multi-track hard disk recording software";

View file

@ -3,11 +3,11 @@
stdenv.mkDerivation rec {
name = "calf-${version}";
version = "0.0.19-rc7";
version = "0.0.19";
src = fetchurl {
url = "mirror://sourceforge/calf/${name}.tar.gz";
sha256 = "0515pzc7ishrq0j5hza83s0yp3x34r977h776lpky389whcyf45j";
sha256 = "1v1cjbxv5wg6rsa2nfz1f8r7cykcpx6jm5ccqmzx866dggiff1hi";
};
buildInputs = [

View file

@ -0,0 +1,29 @@
{ stdenv, fetchurl, gtk, jackaudio, lilv, lv2, pkgconfig, python
, serd, sord , sratom, suil }:
stdenv.mkDerivation rec {
name = "jalv-${version}";
version = "1.4.0";
src = fetchurl {
url = "http://download.drobilla.net/${name}.tar.bz2";
sha256 = "1hq968fhiz86428krqhjl3vlw71bigc9bsfcv97zgvsjh0fh6qa0";
};
buildInputs = [
gtk jackaudio lilv lv2 pkgconfig python serd sord sratom suil
];
configurePhase = "python waf configure --prefix=$out";
buildPhase = "python waf";
installPhase = "python waf install";
meta = with stdenv.lib; {
description = "A simple but fully featured LV2 host for Jack";
homepage = http://drobilla.net/software/jalv;
license = licenses.isc;
maintainers = [ maintainers.goibhniu ];
};
}

View file

@ -0,0 +1,27 @@
{ stdenv, fetchurl, fftwSinglePrec, lv2, pkgconfig, python }:
stdenv.mkDerivation rec {
name = "mda-lv2-${version}";
version = "1.0.0";
src = fetchurl {
url = "http://download.drobilla.net/${name}.tar.bz2";
sha256 = "1dbgvpz9qvlwsfkq9c0dx45bm223wwrzgiddlyln1agpns3qbf0f";
};
buildInputs = [ fftwSinglePrec lv2 pkgconfig python ];
configurePhase = "python waf configure --prefix=$out";
buildPhase = "python waf";
installPhase = "python waf install";
meta = with stdenv.lib; {
homepage = http://drobilla.net/software/mda-lv2/;
description = "An LV2 port of the MDA plugins by Paul Kellett";
license = licenses.gpl2Plus;
maintainers = [ maintainers.goibhniu ];
platforms = platforms.linux;
};
}

View file

@ -0,0 +1,44 @@
{ stdenv, fetchgit, pythonPackages, pygobject, gst_python
, gst_plugins_good, gst_plugins_base
}:
pythonPackages.buildPythonPackage rec {
name = "mopidy-${version}";
version = "0.11.1";
src = fetchgit {
url = "https://github.com/mopidy/mopidy.git";
rev = "refs/tags/v${version}";
sha256 = "123p9hsnlgwvrw4vzlxjf5f43rqzqa3ynbqha8pyi6r0q3ln7qjn";
};
propagatedBuildInputs = with pythonPackages; [
gst_python pygobject pykka pyspotify pylast
];
# python zip complains about old timestamps
preConfigure = ''
find -print0 | xargs -0 touch
'';
# There are no tests
doCheck = false;
postInstall = ''
for p in $out/bin/mopidy $out/bin/mopidy-scan; do
wrapProgram $p \
--prefix GST_PLUGIN_PATH : ${gst_plugins_good}/lib/gstreamer-0.10 \
--prefix GST_PLUGIN_PATH : ${gst_plugins_base}/lib/gstreamer-0.10
done
'';
meta = {
homepage = http://www.mopidy.com/;
description = ''
A music server which can play music from Spotify and from your
local hard drive.
'';
maintainers = [ stdenv.lib.maintainers.rickynils ];
};
}

View file

@ -0,0 +1,44 @@
{ stdenv, fetchgit, pythonPackages, pygobject, gst_python
, gst_plugins_good, gst_plugins_base
}:
pythonPackages.buildPythonPackage rec {
name = "mopidy-${version}";
version = "git-20130226";
src = fetchgit {
url = "https://github.com/mopidy/mopidy.git";
rev = "86a7c2d7519680c6b9130795d35c4654958f4c04";
sha256 = "00fxcfkpl19nslv4f4bspzw0kvjjp6hhcwag7rknmb8scfinqfac";
};
propagatedBuildInputs = with pythonPackages; [
gst_python pygobject pykka pyspotify pylast
];
# python zip complains about old timestamps
preConfigure = ''
find -print0 | xargs -0 touch
'';
# There are no tests
doCheck = false;
postInstall = ''
for p in $out/bin/mopidy $out/bin/mopidy-scan; do
wrapProgram $p \
--prefix GST_PLUGIN_PATH : ${gst_plugins_good}/lib/gstreamer-0.10 \
--prefix GST_PLUGIN_PATH : ${gst_plugins_base}/lib/gstreamer-0.10
done
'';
meta = {
homepage = http://www.mopidy.com/;
description = ''
A music server which can play music from Spotify and from your
local hard drive.
'';
maintainers = [ stdenv.lib.maintainers.rickynils ];
};
}

View file

@ -0,0 +1,26 @@
{ clangStdenv, fetchgit, llvm, clangUnwrapped }:
clangStdenv.mkDerivation {
name = "emacs-clang-complete-async-20130218";
src = fetchgit {
url = "git://github.com/Golevka/emacs-clang-complete-async.git";
rev = "f01488971ec8b5752780d130fb84de0c16a46f31";
sha256 = "1c8zqi6axbsb951azz9iqx3j52j30nd9ypv396hvids3g02cirrf";
};
buildInputs = [ llvm clangUnwrapped ];
installPhase = ''
mkdir -p $out/bin
mkdir -p $out/share/emacs/site-lisp
install -m 755 clang-complete $out/bin
install -m 644 auto-complete-clang-async.el $out/share/emacs/site-lisp
'';
meta = {
homepage = "https://github.com/Golevka/emacs-clang-complete-async";
description = "An emacs plugin to complete C and C++ code using libclang";
license = "GPLv3+";
};
}

View file

@ -16,6 +16,7 @@ cabal.mkDerivation (self: {
QuickCheck regexBase regexTdfa strict text time transformers
utf8String
];
testDepends = [ Cabal QuickCheck ];
noHaddock = true;
meta = {
homepage = "http://www.leksah.org";

View file

@ -0,0 +1,19 @@
{ stdenv, fetchgit, autoconf, automake, pkgconfig, libxml2 }:
stdenv.mkDerivation rec {
name = "evtest-1.30";
preConfigure = "autoreconf -iv";
buildInputs = [ autoconf automake pkgconfig libxml2 ];
src = fetchgit {
url = "git://anongit.freedesktop.org/evtest";
rev = "1a50f2479c4775e047f234a24d95dda82441bfbd";
};
meta = {
description = "Simple tool for input event debugging";
license = "GPLv2";
};
}

View file

@ -1,11 +1,11 @@
{ stdenv, fetchurl, pkgconfig, gtk, gettext }:
stdenv.mkDerivation rec {
name = "girara-0.1.4";
name = "girara-0.1.5";
src = fetchurl {
url = "http://pwmt.org/projects/girara/download/${name}.tar.gz";
sha256 = "831cf523b131bfa1c182efbf146d68fb642fe62d22ee199caf0cd71408a85739";
sha256 = "1hfi3jmx8ydvrqm3h6p6py2csavh7xx0223vxyca51kjl9mfnbld";
};
buildInputs = [ pkgconfig gtk gettext ];
@ -19,8 +19,9 @@ stdenv.mkDerivation rec {
girara is a library that implements a GTK+ based VIM-like user interface
that focuses on simplicity and minimalism.
'';
license = "free";
license = stdenv.lib.licenses.zlib;
platforms = stdenv.lib.platforms.linux;
maintainers = [ stdenv.lib.maintainers.garbas ];
};
}

View file

@ -1,12 +1,12 @@
{ stdenv, fetchurl, gtk, glib, pkgconfig, libgnome, libgnomeui, vte
, curl, cdparanoia, libid3tag, ncurses, libtool }:
stdenv.mkDerivation {
name = "grip-3.2.0";
stdenv.mkDerivation rec {
name = "grip-3.3.1";
src = fetchurl {
url = http://prdownloads.sourceforge.net/grip/grip-3.2.0.tar.gz;
sha256 = "1jh5x35rq15n8ivlp9wbdx8x9mj6agf5rfdv8sd6gai851zsclas";
url = "mirror://sourceforge/grip/${name}.tar.gz";
sha256 = "1zb6zpq7qmn6bflbgfwisyg3vrjr23yi1c1kqvwndl1f0shr8qyl";
};
buildInputs = [ gtk glib pkgconfig libgnome libgnomeui vte curl cdparanoia
@ -14,9 +14,10 @@ stdenv.mkDerivation {
meta = {
description = "GTK+-based audio CD player/ripper";
homepage = http://nostatic.org/grip;
homepage = "http://nostatic.org/grip";
license = "GPLv2";
maintainers = [ stdenv.lib.maintainers.marcweber ];
#platforms = args.lib.platforms.linux;
maintainers = [ stdenv.lib.maintainers.marcweber stdenv.lib.maintainers.simons ];
platforms = stdenv.lib.platforms.linux;
};
}

View file

@ -1,15 +1,15 @@
{stdenv, fetchurl, gtk, webkit, pkgconfig, glib, libsoup, patches ? null}:
{stdenv, fetchurl, makeWrapper, gtk, webkit, pkgconfig, glib, glib_networking, libsoup, patches ? null}:
stdenv.mkDerivation rec {
name = "surf-${version}";
version="0.5";
version="0.6";
src = fetchurl {
url = "http://dl.suckless.org/surf/surf-${version}.tar.gz";
sha256 = "19qfkwdk6p5hcwnnplscp1kmypz74mga7x6iqy6w3g18s221f2mx";
sha256 = "01b8hq8z2wd7ssym5bypx2b15mrs1lhgkrcgxf700kswxvxcrhgx";
};
buildInputs = [ gtk webkit pkgconfig glib libsoup ];
buildInputs = [ gtk makeWrapper webkit pkgconfig glib libsoup ];
# Allow users set their own list of patches
inherit patches;
@ -19,6 +19,11 @@ stdenv.mkDerivation rec {
# `-lX11' to make sure libX11's store path is in the RPATH
NIX_LDFLAGS = "-lX11";
preConfigure = [ ''sed -i "s@PREFIX = /usr/local@PREFIX = $out@g" config.mk'' ];
installPhase = ''
make PREFIX=/ DESTDIR=$out install
wrapProgram "$out/bin/surf" --prefix GIO_EXTRA_MODULES : \
${glib_networking}/lib/gio/modules
'';
meta = {
description = "surf is a simple web browser based on WebKit/GTK+. It is able to display websites and follow links. It supports the XEmbed protocol which makes it possible to embed it in another application. Furthermore, one can point surf to another URI by setting its XProperties.";

View file

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
version = "0.2.1";
version = "0.2.2";
name = "zathura-core-${version}";
src = fetchurl {
url = "http://pwmt.org/projects/zathura/download/zathura-${version}.tar.gz";
sha256 = "075b9def201c77ca738dc9e15b252bc23c085b7c4671a1810d1d962e8d0bd790";
sha256 = "1ja2j9ygymr259fxf02j1vkvalypac48gpadq8fn3qbclxxj61k5";
};
buildInputs = [ pkgconfig gtk girara gettext ];
@ -18,8 +18,9 @@ stdenv.mkDerivation rec {
meta = {
homepage = http://pwmt.org/projects/zathura/;
description = "A core component for zathura PDF viewer";
license = "free";
license = stdenv.lib.licenses.zlib;
platforms = stdenv.lib.platforms.linux;
maintainers = [ stdenv.lib.maintainers.garbas ];
# Set lower priority in order to provide user with a wrapper script called
# 'zathura' instead of real zathura executable. The wrapper will build

View file

@ -34,7 +34,9 @@ rec {
is an application that provides a minimalistic and space saving interface
as well as an easy usage that mainly focuses on keyboard interaction.
'';
license = "free";
license = stdenv.lib.licenses.zlib;
platforms = stdenv.lib.platforms.linux;
maintainers = [ stdenv.lib.maintainers.garbas ];
};
};
}

View file

@ -21,8 +21,9 @@ stdenv.mkDerivation rec {
The zathura-djvu plugin adds DjVu support to zathura by using the
djvulibre library.
'';
license = "free";
license = stdenv.lib.licenses.zlib;
platforms = stdenv.lib.platforms.linux;
maintainers = [ stdenv.lib.maintainers.garbas ];
};
}

View file

@ -1,11 +1,12 @@
{ stdenv, fetchurl, pkgconfig, zathura_core, girara, poppler, gettext }:
stdenv.mkDerivation rec {
name = "zathura-pdf-poppler-0.2.1";
version = "0.2.2";
name = "zathura-pdf-poppler-${version}";
src = fetchurl {
url = "http://pwmt.org/projects/zathura/plugins/download/${name}.tar.gz";
sha256 = "1c162ea887e52f48d6dc80f8427a773768f2df2e37242dab7efddeb3d2e361cd";
sha256 = "0px59f0bnmb9992n3c9iyzcwd6w7vg8ga069vc8qj4726ljml4c7";
};
buildInputs = [ pkgconfig poppler gettext zathura_core girara ];
@ -19,7 +20,8 @@ stdenv.mkDerivation rec {
The zathura-pdf-poppler plugin adds PDF support to zathura by
using the poppler rendering engine.
'';
license = "free";
license = stdenv.lib.licenses.zlib;
platforms = stdenv.lib.platforms.linux;
maintainers = [ stdenv.lib.maintainers.garbas ];
};
}

View file

@ -21,8 +21,9 @@ stdenv.mkDerivation rec {
The zathura-ps plugin adds PS support to zathura by using the
libspectre library.
'';
license = "free";
license = stdenv.lib.licenses.zlib;
platforms = stdenv.lib.platforms.linux;
maintainers = [ stdenv.lib.maintainers.garbas ];
};
}

View file

@ -0,0 +1,19 @@
From 222f1e980ab84ffd3a21001feaf06dd537570a1a Mon Sep 17 00:00:00 2001
From: Ian Farmer <ian@ianfarmer.net>
Date: Sat, 16 Feb 2013 09:38:10 -0800
Subject: [PATCH] Update Chromium dev channel version to 26.0.1410.5.
This version requires a patch for compatibility with versions
of glibc that support older kernel versions.
--- a/content/common/sandbox_seccomp_bpf_linux.cc 2013-02-15 23:26:06.000000000 -0800
+++ b/content/common/sandbox_seccomp_bpf_linux.cc 2013-02-15 23:26:24.000000000 -0800
@@ -1313,7 +1313,7 @@
return Sandbox::Cond(0, ErrorCode::TP_32BIT, ErrorCode::OP_EQUAL,
CLONE_VM | CLONE_FS | CLONE_FILES | CLONE_SIGHAND |
CLONE_THREAD | CLONE_SYSVSEM | CLONE_SETTLS |
- CLONE_PARENT_SETTID | CLONE_CHILD_CLEARTID,
+ CLONE_PARENT_SETTID | CLONE_CHILD_CLEARTID | CLONE_DETACHED,
ErrorCode(ErrorCode::ERR_ALLOWED),
Sandbox::Trap(ReportCloneFailure, NULL));
} else {

View file

@ -13,6 +13,13 @@
, gcc, bison, gperf
, glib, gtk, dbus_glib
, libXScrnSaver, libXcursor, mesa
, protobuf
# dependencies for v25 only
, libvpx
# dependencies for >= v26
, speechd, libXdamage
# optional dependencies
, libgcrypt ? null # gnomeSupport || cupsSupport
@ -50,7 +57,7 @@ let
use_system_libexpat = true;
use_system_libexif = true;
use_system_libjpeg = true;
use_system_libpng = !post24;
use_system_libpng = false; # PNG dlopen() version conflict
use_system_libusb = true;
use_system_libxml = true;
use_system_speex = true;
@ -59,6 +66,7 @@ let
use_system_xdg_utils = true;
use_system_yasm = true;
use_system_zlib = false; # http://crbug.com/143623
use_system_protobuf = post25;
use_system_harfbuzz = false;
use_system_icu = false;
@ -66,6 +74,9 @@ let
use_system_skia = false;
use_system_sqlite = false; # http://crbug.com/22208
use_system_v8 = false;
} // optionalAttrs pre26 {
use_system_libvpx = true;
use_system_protobuf = true;
};
defaultDependencies = [
@ -76,12 +87,8 @@ let
libusb1 libexif
];
post23 = !versionOlder sourceInfo.version "24.0.0.0";
post24 = !versionOlder sourceInfo.version "25.0.0.0";
only24 = post23 && !post24;
maybeFixPulseAudioBuild = optional (only24 && pulseSupport)
./pulse_audio_fix.patch;
pre26 = versionOlder sourceInfo.version "26.0.0.0";
post25 = !pre26;
in stdenv.mkDerivation rec {
name = "${packageName}-${version}";
@ -104,12 +111,14 @@ in stdenv.mkDerivation rec {
krb5
glib gtk dbus_glib
libXScrnSaver libXcursor mesa
pciutils protobuf
] ++ optional gnomeKeyringSupport libgnome_keyring
++ optionals gnomeSupport [ gconf libgcrypt ]
++ optional enableSELinux libselinux
++ optional cupsSupport libgcrypt
++ optional pulseSupport pulseaudio
++ optional post24 pciutils;
++ optional pre26 libvpx
++ optionals post25 [ speechd libXdamage ];
opensslPatches = optional useOpenSSL openssl.patches;
@ -117,12 +126,17 @@ in stdenv.mkDerivation rec {
patches = optional cupsSupport ./cups_allow_deprecated.patch
++ optional pulseSupport ./pulseaudio_array_bounds.patch
++ maybeFixPulseAudioBuild;
++ optional post25 ./clone_detached.patch
# XXX: Remove after stdenv-updates merge!
++ singleton "/dev/null";
postPatch = optionalString useOpenSSL ''
postPatch = ''
sed -i -r -e 's/-f(stack-protector)(-all)?/-fno-\1/' build/common.gypi
'' + optionalString useOpenSSL ''
cat $opensslPatches | patch -p1 -d third_party/openssl/openssl
'' + optionalString post24 ''
sed -i -r -e "s/-f(stack-protector)(-all)?/-fno-\1/" build/common.gypi
'' + optionalString post25 ''
sed -i -e 's|/usr/bin/gcc|gcc|' \
third_party/WebKit/Source/WebCore/WebCore.gyp/WebCore.gyp
'';
gypFlags = mkGypFlags (gypFlagsUseSystemLibs // {

View file

@ -1,11 +0,0 @@
--- chromium-build/media/audio/pulse/pulse_output.cc.orig 2012-10-26 09:44:38.509209905 -0700
+++ chromium-build/media/audio/pulse/pulse_output.cc 2012-10-26 09:45:32.178819603 -0700
@@ -86,7 +86,7 @@
// All channel maps have the same size array of channel positions.
for (unsigned int channel = 0; channel != CHANNELS_MAX; ++channel) {
- int channel_position = kChannelOrderings[channel_layout][channel];
+ int channel_position = ChannelOrder(channel_layout, static_cast<Channels>(channel));
if (channel_position > -1) {
channel_map.map[channel_position] = ChromiumToPAChannelPosition(
static_cast<Channels>(channel));

View file

@ -1,18 +1,18 @@
# This file is autogenerated from update.sh in the same directory.
{
dev = {
version = "25.0.1364.36";
url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-25.0.1364.36.tar.bz2";
sha256 = "1pn7qv1s6lcx8k26h89x9zdy43rzdq12f92s2l6cfdhr9ls9wv0s";
version = "26.0.1410.12";
url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-26.0.1410.12.tar.xz";
sha256 = "1cfzvlldzgm53jwys5zbrd4rszkinsr4n5ky5rcg6p6nw73b4hmj";
};
beta = {
version = "25.0.1364.68";
url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-25.0.1364.68.tar.bz2";
sha256 = "0ps3dnpih2nxb0zkw251cfrls126ysnp818bjzcbl325cbypcgc9";
version = "26.0.1410.12";
url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-26.0.1410.12.tar.xz";
sha256 = "1cfzvlldzgm53jwys5zbrd4rszkinsr4n5ky5rcg6p6nw73b4hmj";
};
stable = {
version = "24.0.1312.69";
url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-24.0.1312.69.tar.bz2";
sha256 = "1nvnhkky72nywk601vx5bbjp1m2f5dygza9h34y20inz3jgg8nbr";
version = "25.0.1364.97";
url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-25.0.1364.97.tar.bz2";
sha256 = "1r8khcic82m6g5i7669q8fxsfhjrlvp99iggqc5qpihljsz33ghm";
};
}

View file

@ -15,9 +15,9 @@ assert stdenv.gcc ? libc && stdenv.gcc.libc != null;
rec {
firefoxVersion = "18.0.2";
firefoxVersion = "19.0.1";
xulVersion = "18.0.2"; # this attribute is used by other packages
xulVersion = "19.0.1"; # this attribute is used by other packages
src = fetchurl {
@ -27,7 +27,7 @@ rec {
# Fall back to this url for versions not available at releases.mozilla.org.
"ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${firefoxVersion}/source/firefox-${firefoxVersion}.source.tar.bz2"
];
sha1 = "fe5810d61edf6f4dc8bc477a08f9483b955f747b";
sha1 = "6a3a965c165ceda8c5ba038e9fe0136fbd1690ff";
};
commonConfigureFlags =
@ -39,9 +39,9 @@ rec {
"--with-system-zlib"
"--with-system-bz2"
"--with-system-nspr"
# "--with-system-nss" # Too old in nixpkgs
"--with-system-nss"
# "--with-system-png" # <-- "--with-system-png won't work because the system's libpng doesn't have APNG support"
# "--enable-system-cairo" # disabled for the moment because our Cairo is too old
# "--enable-system-cairo" # <-- doesn't build
"--enable-system-sqlite"
"--disable-crashreporter"
"--disable-tests"

View file

@ -3,7 +3,6 @@
, zlib
, alsaLib
, curl
, nss
, nspr
, fontconfig
, freetype
@ -20,6 +19,7 @@
, cairo
, atk
, gdk_pixbuf
, nss
, debug ? false
/* you have to add ~/mm.cfg :
@ -44,9 +44,9 @@ let
throw "no x86_64 debugging version available"
else rec {
# -> http://labs.adobe.com/downloads/flashplayer10.html
version = "11.2.202.262";
version = "11.2.202.273";
url = "http://fpdownload.macromedia.com/get/flashplayer/pdc/${version}/install_flash_player_11_linux.x86_64.tar.gz";
sha256 = "1bfr7ajpqkah4kshhqkmi2c15mm962absrq9ks7gfsfaircp387j";
sha256 = "0c15nszgg7zsv00n2qxha5zf8hmyf8i6byvhalnh5x46mr0rkbv9";
}
else if stdenv.system == "i686-linux" then
if debug then {
@ -55,9 +55,9 @@ let
url = http://fpdownload.macromedia.com/pub/flashplayer/updaters/11/flashplayer_11_plugin_debug.i386.tar.gz;
sha256 = "1z3649lv9sh7jnwl8d90a293nkaswagj2ynhsr4xmwiy7c0jz2lk";
} else rec {
version = "11.2.202.262";
version = "11.2.202.273";
url = "http://fpdownload.macromedia.com/get/flashplayer/pdc/${version}/install_flash_player_11_linux.i386.tar.gz";
sha256 = "0fhslr46apa6qfzdhagmjb8vbl741ryh6j14qy2271nl2q687jsx";
sha256 = "1gb14xv7gbq57qg1hxmrnryaw6xgmkg54ql5hr7q6szplj65wvmd";
}
else throw "Flash Player is not supported on this platform";
@ -77,9 +77,9 @@ stdenv.mkDerivation {
};
rpath = stdenv.lib.makeLibraryPath
[ zlib alsaLib curl nss nspr fontconfig freetype expat libX11
[ zlib alsaLib curl nspr fontconfig freetype expat libX11
libXext libXrender libXcursor libXt gtk glib pango atk cairo gdk_pixbuf
libvdpau
libvdpau nss
];
buildPhase = ":";

View file

@ -7,7 +7,14 @@ stdenv.mkDerivation {
url = "mirror://sourceforge/vimprobable/vimprobable2_1.2.0.tar.bz2";
sha256 = "0fjakrmz1syjwgx01j2icpdv69jgvfl2nlxbj8zxfr8mw0h2wg1f";
};
# Nixos default ca bundle
patchPhase = ''
sed -i s,/etc/ssl/certs/ca-certificates.crt,/etc/ca-bundle.crt, config.h
'';
buildInputs = [ makeWrapper gtk libsoup libX11 perl pkgconfig webkit ];
installPhase = ''
make PREFIX=/ DESTDIR=$out install
wrapProgram "$out/bin/vimprobable2" --prefix GIO_EXTRA_MODULES : \

View file

@ -3,11 +3,11 @@
}:
stdenv.mkDerivation rec {
name = "notmuch-0.14";
name = "notmuch-0.15";
src = fetchurl {
url = "http://notmuchmail.org/releases/${name}.tar.gz";
sha256 = "095e191dc0f3125c4fd98440fdf55050cba01b8e9f68245ffe0190a7f39ca753";
sha256 = "07bi87jxfh761b4fvcwf4svlksd7jlznnzhnsp983gdldkabg60q";
};
buildInputs = [ bash emacs gdb glib gmime gnupg1 pkgconfig talloc xapian ];
@ -65,7 +65,7 @@ stdenv.mkDerivation rec {
description = "Notmuch -- The mail indexer";
longDescription = "";
license = stdenv.lib.licenses.gpl3;
maintainers = with stdenv.lib.maintainers; [ chaoflow ];
maintainers = with stdenv.lib.maintainers; [ chaoflow garbas ];
platforms = stdenv.lib.platforms.gnu;
};
}

View file

@ -3,20 +3,20 @@
, heimdal, python, lynx, lua5
}:
let
version = "1.8.3";
in
let version = "1.8.5"; in
stdenv.mkDerivation {
name = "wireshark-${version}";
src = fetchurl {
url = "mirror://sourceforge/wireshark/wireshark-${version}.tar.bz2";
sha256 = "1crg59kkxb7lw1wpfg52hd4l00hq56pyg7f40c7sgqmm0vsmza43";
sha256 = "0wp33qa5yvi60b08iiz55wflhr1vwd7680sbwx2kqjlp2s17kr6l";
};
buildInputs = [perl pkgconfig gtk libpcap flex bison gnutls libgcrypt
glib zlib libxml2 libxslt adns geoip heimdal python lynx lua5
];
buildInputs =
[ perl pkgconfig gtk libpcap flex bison gnutls libgcrypt
glib zlib libxml2 libxslt adns geoip heimdal python lynx lua5
];
configureFlags = "--disable-usr-local --with-ssl --enable-threads --enable-packet-editor";

View file

@ -19,6 +19,7 @@ cabal.mkDerivation (self: {
mkdir -p $out/etc/bash_completion.d
mv contrib/darcs_completion $out/etc/bash_completion.d/darcs
'';
doCheck = false;
meta = {
homepage = "http://darcs.net/";
description = "a distributed, interactive, smart revision control system";

View file

@ -43,13 +43,16 @@ rec {
});
gitAnnex = lib.makeOverridable (import ./git-annex) {
inherit stdenv fetchurl perl coreutils git libuuid rsync findutils curl ikiwiki which openssh;
inherit (haskellPackages) ghc bloomfilter dataenc editDistance hinotify hS3 hslogger HTTP
blazeBuilder blazeHtml caseInsensitive IfElse json liftedBase MissingH monadControl mtl
network pcreLight SHA stm utf8String networkInfo dbus clientsession cryptoApi dataDefault
extensibleExceptions filepath hamlet httpTypes networkMulticast text time transformers
transformersBase wai waiLogger warp yesod yesodDefault yesodStatic testpack QuickCheck
SafeSemaphore networkPprotocolXmpp async dns DAV uuid Glob;
inherit stdenv fetchurl perl which ikiwiki curl bup git gnupg1 lsof openssh rsync;
inherit (haskellPackages) ghc aeson async blazeBuilder bloomfilter
caseInsensitive clientsession cryptoApi dataDefault dataenc DAV dbus dns
editDistance extensibleExceptions filepath gnutls hamlet hinotify hS3
hslogger httpConduit httpTypes HUnit IfElse json liftedBase MissingH
monadControl mtl network networkInfo networkMulticast networkProtocolXmpp
QuickCheck random regexCompat SafeSemaphore SHA stm text time
transformers transformersBase utf8String uuid wai waiLogger warp
xmlConduit xmlTypes yesod yesodDefault yesodForm yesodStatic testpack
cabalInstall;
};
qgit = import ./qgit {

View file

@ -1,49 +1,50 @@
{ stdenv, ghc, fetchurl, perl, coreutils, git, libuuid, rsync
, findutils, curl, ikiwiki, which, openssh
, blazeBuilder, blazeHtml, bloomfilter, caseInsensitive
, clientsession, cryptoApi, dataDefault, dataenc, dbus
, editDistance, extensibleExceptions, filepath, hamlet, hinotify
, hS3, hslogger, HTTP, httpTypes, IfElse, json, liftedBase
, MissingH, monadControl, mtl, network, networkInfo
, networkMulticast, pcreLight, QuickCheck, SHA, stm, text, time
, transformers, transformersBase, utf8String, wai, waiLogger, warp
, yesod, yesodDefault, yesodStatic, testpack, SafeSemaphore
, networkPprotocolXmpp, async, dns, DAV, uuid, Glob
{ stdenv, fetchurl, perl, which, ikiwiki, ghc, aeson, async, blazeBuilder
, bloomfilter, bup, caseInsensitive, clientsession, cryptoApi, curl, dataDefault
, dataenc, DAV, dbus, dns, editDistance, extensibleExceptions, filepath, git
, gnupg1, gnutls, hamlet, hinotify, hS3, hslogger, httpConduit, httpTypes, HUnit
, IfElse, json, liftedBase, lsof, MissingH, monadControl, mtl, network
, networkInfo, networkMulticast, networkProtocolXmpp, openssh, QuickCheck
, random, regexCompat, rsync, SafeSemaphore, SHA, stm, text, time, transformers
, transformersBase, utf8String, uuid, wai, waiLogger, warp, xmlConduit, xmlTypes
, yesod, yesodDefault, yesodForm, yesodStatic, testpack
, cabalInstall # TODO: remove this build input at the next update
}:
let
version = "3.20130216";
version = "4.20130227";
in
stdenv.mkDerivation {
name = "git-annex-${version}";
src = fetchurl {
url = "http://git.kitenet.net/?p=git-annex.git;a=snapshot;sf=tgz;h=${version}";
sha256 = "1zbxkv9kkfyr8haml0wih1fi2xi6qazwzcxjyv8q65fa80ksskbr";
sha256 = "1zw5kzb08zz43ahbhrazjpq9zn73l3kwnqilp464frf7fg7rwan6";
name = "git-annex-${version}.tar.gz";
};
buildInputs = [ ghc git libuuid rsync findutils curl ikiwiki which
openssh blazeBuilder blazeHtml bloomfilter caseInsensitive
clientsession cryptoApi dataDefault dataenc dbus editDistance
extensibleExceptions filepath hamlet hinotify hS3 hslogger HTTP
httpTypes IfElse json liftedBase MissingH monadControl mtl network
networkInfo networkMulticast pcreLight QuickCheck SHA stm text time
transformers transformersBase utf8String wai waiLogger warp yesod
yesodDefault yesodStatic testpack SafeSemaphore networkPprotocolXmpp
async dns DAV uuid Glob ];
buildInputs = [ ghc aeson async blazeBuilder bloomfilter bup ikiwiki
caseInsensitive clientsession cryptoApi curl dataDefault dataenc DAV dbus
dns editDistance extensibleExceptions filepath git gnupg1 gnutls hamlet
hinotify hS3 hslogger httpConduit httpTypes HUnit IfElse json liftedBase
lsof MissingH monadControl mtl network networkInfo networkMulticast
networkProtocolXmpp openssh QuickCheck random regexCompat rsync
SafeSemaphore SHA stm text time transformers transformersBase utf8String
uuid wai waiLogger warp xmlConduit xmlTypes yesod yesodDefault yesodForm
yesodStatic which perl testpack cabalInstall ];
checkTarget = "test";
doCheck = true;
preConfigure = ''
configurePhase = ''
makeFlagsArray=( PREFIX=$out )
sed -i -e 's|#!/usr/bin/perl|#!${perl}/bin/perl|' Build/mdwn2man
sed -i -e 's|"cp |"${coreutils}/bin/cp |' -e 's|"rm -f |"${coreutils}/bin/rm -f |' test.hs
# Remove this patch after the next update!
sed -i -e '9i #define WITH_OLD_URI' Utility/Url.hs
patchShebangs .
# cabal-install wants to store stuff in $HOME
mkdir ../tmp
export HOME=$PWD/../tmp
cabal configure -f-fast -ftestsuite -f-android -fproduction -fdns -fxmpp -fpairing -fwebapp -fassistant -fdbus -finotify -fwebdav -fs3
'';
checkPhase = "./git-annex test";
meta = {
homepage = "http://git-annex.branchable.com/";
description = "Manage files with git without checking them into git";

View file

@ -10,7 +10,7 @@
let
version = "1.8.1";
version = "1.8.1.3";
svn = subversionClient.override { perlBindings = true; };
@ -21,7 +21,7 @@ stdenv.mkDerivation {
src = fetchurl {
url = "http://git-core.googlecode.com/files/git-${version}.tar.gz";
sha1 = "wfj2pbqf9l56014dm330wb13qgcwx3dc";
sha256 = "1waz35cwgcwhgmgzmc4s00yd2vivhy77p49crgqsl0nqpxyj8lrp";
};
patches = [ ./docbook2texi.patch ];

View file

@ -0,0 +1,25 @@
{ cabal, fetchurl, extensibleExceptions, filepath, github, hslogger, IfElse
, MissingH, mtl, network, prettyShow
}:
cabal.mkDerivation (self: {
pname = "github-backup";
version = "1.20120314";
src = fetchurl {
url = "https://github.com/joeyh/github-backup/archive/1.20120314.tar.gz";
sha256 = "0rmgkylsnxbry02g5bxq5af03azgydfz6dzyvqzbhnkwavhqdlqy";
name = "github-backup-${self.pname}.tar.gz";
};
isLibrary = false;
isExecutable = true;
buildDepends = [
extensibleExceptions filepath github hslogger IfElse MissingH mtl
network prettyShow
];
meta = {
homepage = "https://github.com/joeyh/github-backup";
description = "backs up everything github knows about a repository, to the repository";
license = "GPL";
platforms = self.ghc.meta.platforms;
};
})

View file

@ -152,6 +152,8 @@ stdenv.mkDerivation rec {
NIX_LDFLAGS = stdenv.lib.optionalString x11Support "-lX11 -lXext";
installTargets = [ "install" ] ++ stdenv.lib.optional x11Support "install-gui";
enableParallelBuilding = true;
# Provide a reasonable standard font. Maybe we should symlink here.
@ -159,6 +161,9 @@ stdenv.mkDerivation rec {
''
mkdir -p $out/share/mplayer
cp ${freefont_ttf}/share/fonts/truetype/FreeSans.ttf $out/share/mplayer/subfont.ttf
if test -f $out/share/applications/mplayer.desktop ; then
echo "NoDisplay=True" >> $out/share/applications/mplayer.desktop
fi
'';
crossAttrs = {

View file

@ -0,0 +1,22 @@
commit d725168153e3dc5a383b12e0bf9af9b6244ad3eb
Author: vboxsync <vboxsync@cfe28804-0f27-0410-a406-dd0f0b0b656f>
Date: Thu Feb 28 13:46:12 2013 +0000
Linux 3.9.0 rc0 compile fix
git-svn-id: http://www.virtualbox.org/svn/vbox/trunk@44867 cfe28804-0f27-0410-a406-dd0f0b0b656f
diff --git a/src/VBox/Runtime/r0drv/linux/the-linux-kernel.h b/src/VBox/Runtime/r0drv/linux/the-linux-kernel.h
index ec9b502..7a208d1 100644
--- a/src/VBox/Runtime/r0drv/linux/the-linux-kernel.h
+++ b/src/VBox/Runtime/r0drv/linux/the-linux-kernel.h
@@ -90,6 +90,9 @@
#include <linux/slab.h>
#include <linux/time.h>
#include <linux/sched.h>
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 9, 0)
+# include <linux/sched/rt.h>
+#endif
#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 7)
# include <linux/jiffies.h>
#endif

View file

@ -11,8 +11,8 @@ with stdenv.lib;
let
version = "4.2.6";
extpackRevision = "82870";
version = "4.2.8";
extpackRevision = "83876";
forEachModule = action: ''
for mod in \
@ -35,7 +35,7 @@ let
name = "Oracle_VM_VirtualBox_Extension_Pack-${version}-${extpackRevision}"
+ ".vbox-extpack";
# Has to be base16 because it's used as an input to VBoxExtPackHelperApp!
sha256 = "f0113688a76efa0426c27c5541c78506b18637025c35aa682ecc6eeed5d56582";
sha256 = "fa579416f382b58c4e93d3740d076ceba728e28d987e51aced5865a46cb9111c";
url = "https://www.virtualbox.org/wiki/Downloads";
};
@ -44,7 +44,7 @@ in stdenv.mkDerivation {
src = fetchurl {
url = "http://download.virtualbox.org/virtualbox/${version}/VirtualBox-${version}.tar.bz2";
sha256 = "54526091bc2aa66b88ca878dd9ecc4466f96d607db2f6678a9d673ecf6646ae3";
sha256 = "f336af12244db74e6564dc22e438bbcba70f994aaf0d117fdf70caca9fab1b78";
};
buildInputs =
@ -54,6 +54,11 @@ in stdenv.mkDerivation {
++ optional javaBindings jdk
++ optional pythonBindings python;
patches = [
./strict_types.patch
./build_fix_3.9.0.patch
];
prePatch = ''
set -x
MODULES_BUILD_DIR=`echo ${kernel}/lib/modules/*/build`

View file

@ -2,14 +2,14 @@
, libX11, libXt, libXext, libXmu, libXcomposite, libXfixes, libXrandr, libXcursor
, dbus }:
let version = "4.2.6"; in
let version = "4.2.8"; in
stdenv.mkDerivation {
name = "VirtualBox-GuestAdditions-${version}-${kernel.version}";
src = fetchurl {
url = "http://download.virtualbox.org/virtualbox/${version}/VBoxGuestAdditions_${version}.iso";
sha256 = "1lry4hjjk8p69km1bi3mpmyarlnxz9izs2c0s8pq5rjzv1bd7bxr";
sha256 = "04a5402d8dcdefc83ffb2785351ddc57758781a3759137974469189392ae4ad5";
};
KERN_DIR = "${kernel}/lib/modules/*/build";

View file

@ -0,0 +1,68 @@
diff --git a/src/VBox/HostDrivers/Support/linux/SUPDrv-linux.c b/src/VBox/HostDrivers/Support/linux/SUPDrv-linux.c
index 9cc124c..d86da0c 100644
--- a/src/VBox/HostDrivers/Support/linux/SUPDrv-linux.c
+++ b/src/VBox/HostDrivers/Support/linux/SUPDrv-linux.c
@@ -253,7 +253,11 @@ static struct platform_device gPlatformDevice =
DECLINLINE(RTUID) vboxdrvLinuxUid(void)
{
#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 29)
+# ifdef CONFIG_UIDGID_STRICT_TYPE_CHECKS
+ return from_kuid(current_user_ns(), current_uid());
+# else
return current->cred->uid;
+# endif
#else
return current->uid;
#endif
@@ -262,7 +266,11 @@ DECLINLINE(RTUID) vboxdrvLinuxUid(void)
DECLINLINE(RTGID) vboxdrvLinuxGid(void)
{
#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 29)
+# ifdef CONFIG_UIDGID_STRICT_TYPE_CHECKS
+ return from_kgid(current_user_ns(), current_gid());
+# else
return current->cred->gid;
+# endif
#else
return current->gid;
#endif
@@ -271,7 +279,11 @@ DECLINLINE(RTGID) vboxdrvLinuxGid(void)
DECLINLINE(RTUID) vboxdrvLinuxEuid(void)
{
#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 29)
+# ifdef CONFIG_UIDGID_STRICT_TYPE_CHECKS
+ return from_kuid(current_user_ns(), current_euid());
+# else
return current->cred->euid;
+# endif
#else
return current->euid;
#endif
diff --git a/src/VBox/HostDrivers/VBoxPci/linux/VBoxPci-linux.c b/src/VBox/HostDrivers/VBoxPci/linux/VBoxPci-linux.c
index 575f739..8909e79 100644
--- a/src/VBox/HostDrivers/VBoxPci/linux/VBoxPci-linux.c
+++ b/src/VBox/HostDrivers/VBoxPci/linux/VBoxPci-linux.c
@@ -429,7 +429,11 @@ int vboxPciOsDevDetachHostDriver(PVBOXRAWPCIINS pIns)
if (!pNewCreds)
goto done;
+# ifdef CONFIG_UIDGID_STRICT_TYPE_CHECKS
+ pNewCreds->fsuid = GLOBAL_ROOT_UID;;
+# else
pNewCreds->fsuid = 0;
+# endif
pOldCreds = override_creds(pNewCreds);
#endif
@@ -539,7 +543,11 @@ int vboxPciOsDevReattachHostDriver(PVBOXRAWPCIINS pIns)
if (!pNewCreds)
goto done;
+# ifdef CONFIG_UIDGID_STRICT_TYPE_CHECKS
+ pNewCreds->fsuid = GLOBAL_ROOT_UID;;
+# else
pNewCreds->fsuid = 0;
+# endif
pOldCreds = override_creds(pNewCreds);
#endif
RTStrPrintf(szFileBuf, cMaxBuf,

View file

@ -0,0 +1,26 @@
{ stdenv, fetchurl, pkgconfig
, cairo, fontconfig, freetype, libXft, libXcursor, libXinerama
, libXpm, librsvg, libpng, fribidi, perl
}:
stdenv.mkDerivation rec {
name = "fvwm-2.6.5";
src = fetchurl {
url = "ftp://ftp.fvwm.org/pub/fvwm/version-2/${name}.tar.bz2";
sha256 = "1ks8igvmzm0m0sra05k8xzc8vkqy3gv1qskl6davw1irqnarjm11";
};
buildInputs = [
pkgconfig cairo fontconfig freetype
libXft libXcursor libXinerama libXpm
librsvg libpng fribidi perl
];
meta = {
homepage = "http://fvwm.org";
description = "A multiple large virtual desktop window manager";
license = "GPLv2+";
};
}

View file

@ -8,8 +8,8 @@
# environment overly, but also to keep hash-backwards-compatible with the old cabal.nix.
internalAttrs = [
"internalAttrs" "buildDepends" "buildTools" "extraLibraries" "pkgconfigDepends"
"isLibrary" "isExecutable"
];
"isLibrary" "isExecutable" "testDepends"
] ++ stdenv.lib.optional (!args.doCheck or false) "doCheck";
# Stuff happening after the user preferences have been processed. We remove
# internal attributes and strip null elements from the dependency lists, all
@ -55,6 +55,7 @@
# but often propagatedBuildInputs is preferable anyway
buildInputs = [ghc Cabal] ++ self.extraBuildInputs;
extraBuildInputs = self.buildTools ++
(stdenv.lib.optionals (self.doCheck or false) self.testDepends) ++
(if self.pkgconfigDepends == [] then [] else [pkgconfig]) ++
(if self.isLibrary then [] else self.buildDepends ++ self.extraLibraries ++ self.pkgconfigDepends);
@ -89,7 +90,8 @@
eval "$preConfigure"
${lib.optionalString (lib.attrByPath ["jailbreak"] false self) "${jailbreakCabal}/bin/jailbreak-cabal ${self.pname}.cabal && "
}for i in Setup.hs Setup.lhs; do
}${lib.optionalString (lib.attrByPath ["doCheck"] false self) "configureFlags+=\" --enable-test\" && "
}for i in Setup.hs Setup.lhs; do
test -f $i && ghc --make $i
done
@ -115,7 +117,8 @@
./Setup build
export GHC_PACKAGE_PATH=$(ghc-packages)
${lib.optionalString (lib.attrByPath ["doCheck"] false self) "./Setup test && "
}export GHC_PACKAGE_PATH=$(ghc-packages)
[ -n "$noHaddock" ] || ./Setup haddock
eval "$postBuild"

View file

@ -12,7 +12,7 @@
# `contents = {object = ...; symlink = /init;}' is a typical
# argument.
{stdenv, perl, cpio, contents, ubootChooser}:
{stdenv, perl, cpio, contents, ubootChooser, compressor}:
let
inputsFun = ubootName : [perl cpio]
@ -40,4 +40,5 @@ stdenv.mkDerivation {
buildNativeInputs = inputsFun stdenv.cross.platform.uboot;
makeUInitrd = makeUInitrdFun stdenv.cross.platform.uboot;
};
inherit compressor;
}

View file

@ -36,7 +36,7 @@ storePaths=$(perl $pathsFromGraph closure-*)
# Put the closure in a gzipped cpio archive.
mkdir -p $out
(cd root && find * -print0 | cpio -o -H newc --null | gzip -9 > $out/initrd)
(cd root && find * -print0 | cpio -o -H newc --null | $compressor > $out/initrd)
if [ -n "$makeUInitrd" ]; then
mv $out/initrd $out/initrd.gz

View file

@ -83,7 +83,7 @@ vmTools.runInLinuxImage (stdenv.mkDerivation (
''; # */
meta = (if args ? meta then args.meta else {}) // {
description = "Build of a Deb package on ${diskImage.fullName} (${diskImage.name})";
description = "Deb package for ${diskImage.fullName}";
};
}

View file

@ -77,7 +77,8 @@ stdenv.mkDerivation (
if [ -z "${toString doCoverageAnalysis}" ]; then
for i in $outputs; do
if [ "$i" = out ]; then j=none; else j="$i"; fi
echo "nix-build $j ''${!i}" >> $out/nix-support/hydra-build-products
mkdir -p ''${!i}/nix-support
echo "nix-build $j ''${!i}" >> ''${!i}/nix-support/hydra-build-products
done
fi
'';
@ -110,7 +111,7 @@ stdenv.mkDerivation (
(stdenv.lib.optional doCoverageAnalysis "coverageReportPhase") ++ ["finalPhase"];
meta = (if args ? meta then args.meta else {}) // {
description = if doCoverageAnalysis then "Coverage analysis" else "Native Nix build on ${stdenv.system}";
description = if doCoverageAnalysis then "Coverage analysis" else "Nix package for ${stdenv.system}";
};
}

View file

@ -33,21 +33,21 @@ vmTools.buildRPM (
rpm -Up ''${rpms[*]} --excludepath /nix/store
eval "$postRPMInstall"
echo "uninstalling ''${rpmNames[*]}..."
rpm -e ''${rpmNames[*]} --nodeps
for i in $out/rpms/*/*.src.rpm; do
echo "file srpm $i" >> $out/nix-support/hydra-build-products
done
for rpmdir in $extraRPMs ; do
echo "file rpm-extra $(ls $rpmdir/rpms/*/*.rpm | grep -v 'src\.rpm' | sort | head -1)" >> $out/nix-support/hydra-build-products
done
''; # */
meta = (if args ? meta then args.meta else {}) // {
description = "Build of an RPM package on ${diskImage.fullName} (${diskImage.name})";
description = "RPM package for ${diskImage.fullName}";
};
}

View file

@ -126,7 +126,7 @@ stdenv.mkDerivation (
};
meta = (if args ? meta then args.meta else {}) // {
description = "Build of a source distribution from a checkout";
description = "Source distribution";
# Tarball builds are generally important, so give them a high
# default priority.

View file

@ -1,9 +1,9 @@
{stdenv, fetchurl}:
stdenv.mkDerivation {
name = "libart_lgpl-2.3.20";
stdenv.mkDerivation rec {
name = "libart_lgpl-2.3.21";
src = fetchurl {
url = mirror://gnome/sources/libart_lgpl/2.3/libart_lgpl-2.3.20.tar.bz2;
sha256 = "0iyqsc517lj8xnidchnk0fxa6aqvss4hv8p9fk6bba86lbiillym";
url = "mirror://gnome/sources/libart_lgpl/2.3/${name}.tar.bz2";
sha256 = "1yknfkyzgz9s616is0l9gp5aray0f2ry4dw533jgzj8gq5s1xhgx";
};
}

View file

@ -4,8 +4,8 @@
cabal.mkDerivation (self: {
pname = "idris";
version = "0.9.6";
sha256 = "1yml1k4bis210hgi898hgs4wj5p34ainlj7vwy5lh7bjkvrksgq1";
version = "0.9.6.1";
sha256 = "1wy79rrm5pvg77i9nvwkcg6swsdbmg2izch48n4lj4idj0ga5g62";
isLibrary = false;
isExecutable = true;
buildDepends = [

View file

@ -28,5 +28,6 @@ stdenv.mkDerivation rec {
'';
homepage = http://www.scala-lang.org/;
license = "BSD";
platforms = stdenv.lib.platforms.all;
};
}

View file

@ -1,58 +1,32 @@
x@{builderDefsPackage
, lua5, mpg123, physfs, freetype, libdevil, openal, SDL, libvorbis
, libogg, flac, mesa, libtiff, libpng, libjpeg, libmodplug
, ...}:
builderDefsPackage
(a :
let
helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++
[];
{ stdenv, fetchurl, pkgconfig
, SDL, mesa, openal, lua5
, libdevil, freetype, physfs
, libmodplug, mpg123, libvorbis, libogg
}:
buildInputs = map (n: builtins.getAttr n x)
(builtins.attrNames (builtins.removeAttrs x helperArgNames));
sourceInfo = rec {
baseName="love";
version="0.7.2";
name="${baseName}-${version}";
url="https://bitbucket.org/rude/love/downloads/${name}-linux-src.tar.gz";
hash="0s7jywkvydlshlgy11ilzngrnybmq5xlgzp2v2dhlffwrfqdqym5";
};
in
rec {
src = a.fetchurl {
url = sourceInfo.url;
sha256 = sourceInfo.hash;
stdenv.mkDerivation rec {
name = "love-0.8.0";
src = fetchurl {
url = "https://bitbucket.org/rude/love/downloads/${name}-linux-src.tar.gz";
sha256 = "1k4fcsa8zzi04ja179bmj24hvqcbm3icfvrvrzyz2gw9qwfclrwi";
};
inherit (sourceInfo) name version;
inherit buildInputs;
buildInputs = [
pkgconfig SDL mesa openal lua5
libdevil freetype physfs libmodplug mpg123 libvorbis libogg
];
/* doConfigure should be removed if not needed */
phaseNames = ["setVars" "fixSrc" "doConfigure" "doMakeInstall"];
fixSrc =a.fullDepEntry ''
sed -e '/typedef void (\*__GLXextFuncPtr)/d' -i src/modules/graphics/opengl/GLee.h
'' ["minInit" "doUnpack"];
setVars = a.noDepEntry ''
export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${SDL}/include/SDL"
export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${freetype}/include/freetype2"
NIX_CFLAGS_COMPILE = ''
-I${SDL}/include/SDL
-I${freetype}include/freetype2
'';
meta = {
homepage = "http://love2d.org";
description = "A Lua-based 2D game engine/scripting language";
maintainers = with a.lib.maintainers;
[
raskin
];
platforms = with a.lib.platforms;
linux;
license = a.lib.licenses.zlib;
};
passthru = {
updateInfo = {
downloadPage = "http://love2d.org/";
};
};
}) x
license = "zlib";
platforms = stdenv.lib.platforms.linux;
maintainers = [ stdenv.lib.maintainers.raskin ];
};
}

View file

@ -1,6 +1,11 @@
{ stdenv, fetchurl, composableDerivation, autoconf, automake, flex, bison
, apacheHttpd, mysql, libxml2, readline, zlib, curl, gd, postgresql, gettext
, openssl, pkgconfig, sqlite, config, libiconv, libjpeg, libpng, freetype }:
, openssl, pkgconfig, sqlite, config, libiconv, libjpeg, libpng, freetype
, libxslt, libmcrypt, bzip2, icu }:
let
libmcryptOverride = libmcrypt.override { disablePosixThreads = true; };
in
composableDerivation.composableDerivation {} ( fixed : let inherit (fixed.fixed) version; in {
@ -110,6 +115,34 @@ composableDerivation.composableDerivation {} ( fixed : let inherit (fixed.fixed)
buildInputs = [gettext];
};
intl = {
configureFlags = ["--enable-intl"];
buildInputs = [icu];
};
exif = {
configureFlags = ["--enable-exif"];
};
xsl = {
configureFlags = ["--with-xsl=${libxslt}"];
buildInputs = [libxslt];
};
mcrypt = {
configureFlags = ["--with-mcrypt=${libmcrypt}"];
buildInputs = [libmcryptOverride];
};
bz2 = {
configureFlags = ["--with-bz2=${bzip2}"];
buildInputs = [bzip2];
};
zip = {
configureFlags = ["--enable-zip"];
};
/*
php is build within this derivation in order to add the xdebug lines to the php.ini.
So both Apache and command line php both use xdebug without having to configure anything.
@ -141,12 +174,18 @@ composableDerivation.composableDerivation {} ( fixed : let inherit (fixed.fixed)
opensslSupport = config.php.openssl or true;
mbstringSupport = config.php.mbstring or true;
gdSupport = config.php.gd or true;
intlSupport = config.php.intl or true;
exifSupport = config.php.exif or true;
xslSupport = config.php.xsl or false;
mcryptSupport = config.php.mcrypt or false;
bz2Support = config.php.bz2 or false;
zipSupport = config.php.zip or true;
};
configurePhase = ''
iniFile=$out/etc/php-recommended.ini
[[ -z "$libxml2" ]] || export PATH=$PATH:$libxml2/bin
./configure --with-config-file-scan-dir=/etc --with-config-file-path=$out/etc --prefix=$out $configureFlags
./configure --with-config-file-scan-dir=/etc --with-config-file-path=$out/etc --prefix=$out $configureFlags
echo configurePhase end
'';

View file

@ -0,0 +1,18 @@
# This file was generated and will be overwritten by ./generate.sh
{ stdenv, fetchurl }:
stdenv.mkDerivation rec {
name = "python26-docs-html-2.6.8";
src = fetchurl {
url = http://docs.python.org/ftp/python/doc/2.6.8/python-2.6.8-docs-html.tar.bz2;
sha256 = "09kznik9ahmnrqw9gkr7mjv3b3zr258f2fm27n12hrrwwsaszkni";
};
installPhase = ''
mkdir -p $out/share/docs
cp -R ./ $out/share/docs/${name}
'';
meta = {
maintainers = [ lib.maintainers.chaoflow ];
};
}

View file

@ -0,0 +1,18 @@
# This file was generated and will be overwritten by ./generate.sh
{ stdenv, fetchurl }:
stdenv.mkDerivation rec {
name = "python26-docs-pdf-a4-2.6.8";
src = fetchurl {
url = http://docs.python.org/ftp/python/doc/2.6.8/python-2.6.8-docs-pdf-a4.tar.bz2;
sha256 = "07k8n9zhd59s1yn8ahsizkaqnv969p0f2c2acxgxrxhhyy842pp8";
};
installPhase = ''
mkdir -p $out/share/docs
cp -R ./ $out/share/docs/${name}
'';
meta = {
maintainers = [ lib.maintainers.chaoflow ];
};
}

View file

@ -0,0 +1,18 @@
# This file was generated and will be overwritten by ./generate.sh
{ stdenv, fetchurl }:
stdenv.mkDerivation rec {
name = "python26-docs-pdf-letter-2.6.8";
src = fetchurl {
url = http://docs.python.org/ftp/python/doc/2.6.8/python-2.6.8-docs-pdf-letter.tar.bz2;
sha256 = "01r87m8hb7f9ql4j9zcjcrr9150nsk23sj8cy02vygr83sc1ldmq";
};
installPhase = ''
mkdir -p $out/share/docs
cp -R ./ $out/share/docs/${name}
'';
meta = {
maintainers = [ lib.maintainers.chaoflow ];
};
}

View file

@ -0,0 +1,18 @@
# This file was generated and will be overwritten by ./generate.sh
{ stdenv, fetchurl }:
stdenv.mkDerivation rec {
name = "python26-docs-text-2.6.8";
src = fetchurl {
url = http://docs.python.org/ftp/python/doc/2.6.8/python-2.6.8-docs-text.tar.bz2;
sha256 = "05wsdh6ilgkclgak09fq7fsx5kflkmqq8dyxi2rpydx289cw3a8c";
};
installPhase = ''
mkdir -p $out/share/docs
cp -R ./ $out/share/docs/${name}
'';
meta = {
maintainers = [ lib.maintainers.chaoflow ];
};
}

View file

@ -0,0 +1,18 @@
# This file was generated and will be overwritten by ./generate.sh
{ stdenv, fetchurl }:
stdenv.mkDerivation rec {
name = "python27-docs-html-2.7.3";
src = fetchurl {
url = http://docs.python.org/ftp/python/doc/2.7.3/python-2.7.3-docs-html.tar.bz2;
sha256 = "1hg92n0mzl9w6j33b2h0bf2vy6fsxnpxfdc3qw760vcm0y00155j";
};
installPhase = ''
mkdir -p $out/share/docs
cp -R ./ $out/share/docs/${name}
'';
meta = {
maintainers = [ lib.maintainers.chaoflow ];
};
}

View file

@ -0,0 +1,18 @@
# This file was generated and will be overwritten by ./generate.sh
{ stdenv, fetchurl }:
stdenv.mkDerivation rec {
name = "python27-docs-pdf-a4-2.7.3";
src = fetchurl {
url = http://docs.python.org/ftp/python/doc/2.7.3/python-2.7.3-docs-pdf-a4.tar.bz2;
sha256 = "13da88panq5b6qfhf8k4dgqgxkg4ydcac5cx69a3f35s1w90xdjr";
};
installPhase = ''
mkdir -p $out/share/docs
cp -R ./ $out/share/docs/${name}
'';
meta = {
maintainers = [ lib.maintainers.chaoflow ];
};
}

View file

@ -0,0 +1,18 @@
# This file was generated and will be overwritten by ./generate.sh
{ stdenv, fetchurl }:
stdenv.mkDerivation rec {
name = "python27-docs-pdf-letter-2.7.3";
src = fetchurl {
url = http://docs.python.org/ftp/python/doc/2.7.3/python-2.7.3-docs-pdf-letter.tar.bz2;
sha256 = "0x41phsdrpivhzkchswsliyx3a10n7gzc9irkrw6rz22j81bfydg";
};
installPhase = ''
mkdir -p $out/share/docs
cp -R ./ $out/share/docs/${name}
'';
meta = {
maintainers = [ lib.maintainers.chaoflow ];
};
}

View file

@ -0,0 +1,18 @@
# This file was generated and will be overwritten by ./generate.sh
{ stdenv, fetchurl }:
stdenv.mkDerivation rec {
name = "python27-docs-text-2.7.3";
src = fetchurl {
url = http://docs.python.org/ftp/python/doc/2.7.3/python-2.7.3-docs-text.tar.bz2;
sha256 = "1rxlb3jhh3892y65i45nk1y2lx981fr22a5hmfkp9gvjvdykjnzp";
};
installPhase = ''
mkdir -p $out/share/docs
cp -R ./ $out/share/docs/${name}
'';
meta = {
maintainers = [ lib.maintainers.chaoflow ];
};
}

View file

@ -0,0 +1,18 @@
# This file was generated and will be overwritten by ./generate.sh
{ stdenv, fetchurl }:
stdenv.mkDerivation rec {
name = "python30-docs-html-3.0.1";
src = fetchurl {
url = http://docs.python.org/ftp/python/doc/3.0.1/python-3.0.1-docs-html.tar.bz2;
sha256 = "0ybjnhg8qfr9kc4axm5xlghkz9dmsg6b1caj6m4gz28q89vggv3c";
};
installPhase = ''
mkdir -p $out/share/docs
cp -R ./ $out/share/docs/${name}
'';
meta = {
maintainers = [ lib.maintainers.chaoflow ];
};
}

View file

@ -0,0 +1,18 @@
# This file was generated and will be overwritten by ./generate.sh
{ stdenv, fetchurl }:
stdenv.mkDerivation rec {
name = "python30-docs-pdf-a4-3.0.1";
src = fetchurl {
url = http://docs.python.org/ftp/python/doc/3.0.1/python-3.0.1-docs-pdf-a4.tar.bz2;
sha256 = "1qgcydqxxhy317lkzzs2v5as4hcwcblir8y3mdr173qsg51iggra";
};
installPhase = ''
mkdir -p $out/share/docs
cp -R ./ $out/share/docs/${name}
'';
meta = {
maintainers = [ lib.maintainers.chaoflow ];
};
}

View file

@ -0,0 +1,18 @@
# This file was generated and will be overwritten by ./generate.sh
{ stdenv, fetchurl }:
stdenv.mkDerivation rec {
name = "python30-docs-pdf-letter-3.0.1";
src = fetchurl {
url = http://docs.python.org/ftp/python/doc/3.0.1/python-3.0.1-docs-pdf-letter.tar.bz2;
sha256 = "1x59q0k6fv55vvpsgr5xcq66k5zsd0f142cp6aa4rb6c81i31yml";
};
installPhase = ''
mkdir -p $out/share/docs
cp -R ./ $out/share/docs/${name}
'';
meta = {
maintainers = [ lib.maintainers.chaoflow ];
};
}

View file

@ -0,0 +1,18 @@
# This file was generated and will be overwritten by ./generate.sh
{ stdenv, fetchurl }:
stdenv.mkDerivation rec {
name = "python30-docs-text-3.0.1";
src = fetchurl {
url = http://docs.python.org/ftp/python/doc/3.0.1/python-3.0.1-docs-text.tar.bz2;
sha256 = "12qlh9ywbnw50wk5siq7lmhr935dd16q3vjbii6gfv0g80b1byzx";
};
installPhase = ''
mkdir -p $out/share/docs
cp -R ./ $out/share/docs/${name}
'';
meta = {
maintainers = [ lib.maintainers.chaoflow ];
};
}

View file

@ -0,0 +1,18 @@
# This file was generated and will be overwritten by ./generate.sh
{ stdenv, fetchurl }:
stdenv.mkDerivation rec {
name = "python31-docs-html-3.1.5";
src = fetchurl {
url = http://docs.python.org/ftp/python/doc/3.1.5/python-3.1.5-docs-html.tar.bz2;
sha256 = "187shb92218k0i07hj9ak1kqbqjcxkivmwxlzj18v791l7x7qcpz";
};
installPhase = ''
mkdir -p $out/share/docs
cp -R ./ $out/share/docs/${name}
'';
meta = {
maintainers = [ lib.maintainers.chaoflow ];
};
}

View file

@ -0,0 +1,18 @@
# This file was generated and will be overwritten by ./generate.sh
{ stdenv, fetchurl }:
stdenv.mkDerivation rec {
name = "python31-docs-pdf-a4-3.1.5";
src = fetchurl {
url = http://docs.python.org/ftp/python/doc/3.1.5/python-3.1.5-docs-pdf-a4.tar.bz2;
sha256 = "0kbj6b43gnwlb1czkzmirasmc31j10plq0rlb9s9rh8phqnbmhx1";
};
installPhase = ''
mkdir -p $out/share/docs
cp -R ./ $out/share/docs/${name}
'';
meta = {
maintainers = [ lib.maintainers.chaoflow ];
};
}

View file

@ -0,0 +1,18 @@
# This file was generated and will be overwritten by ./generate.sh
{ stdenv, fetchurl }:
stdenv.mkDerivation rec {
name = "python31-docs-pdf-letter-3.1.5";
src = fetchurl {
url = http://docs.python.org/ftp/python/doc/3.1.5/python-3.1.5-docs-pdf-letter.tar.bz2;
sha256 = "0s202vrjfa8dnp3vpfjb21bmqym9wyj8jn2glgwjzk63z6fwb60i";
};
installPhase = ''
mkdir -p $out/share/docs
cp -R ./ $out/share/docs/${name}
'';
meta = {
maintainers = [ lib.maintainers.chaoflow ];
};
}

View file

@ -0,0 +1,18 @@
# This file was generated and will be overwritten by ./generate.sh
{ stdenv, fetchurl }:
stdenv.mkDerivation rec {
name = "python31-docs-text-3.1.5";
src = fetchurl {
url = http://docs.python.org/ftp/python/doc/3.1.5/python-3.1.5-docs-text.tar.bz2;
sha256 = "1jsfgfgdi1i2l3lhdk7ss5gwrcg3qhhh8syfrwz8xrv2klmmmn9b";
};
installPhase = ''
mkdir -p $out/share/docs
cp -R ./ $out/share/docs/${name}
'';
meta = {
maintainers = [ lib.maintainers.chaoflow ];
};
}

View file

@ -0,0 +1,18 @@
# This file was generated and will be overwritten by ./generate.sh
{ stdenv, fetchurl }:
stdenv.mkDerivation rec {
name = "python32-docs-html-3.2.3";
src = fetchurl {
url = http://docs.python.org/ftp/python/doc/3.2.3/python-3.2.3-docs-html.tar.bz2;
sha256 = "058pryg0gn0rlpswkj1z0xvpr39s3ymx3dwqfhhf83w0mlysdm0x";
};
installPhase = ''
mkdir -p $out/share/docs
cp -R ./ $out/share/docs/${name}
'';
meta = {
maintainers = [ lib.maintainers.chaoflow ];
};
}

View file

@ -0,0 +1,18 @@
# This file was generated and will be overwritten by ./generate.sh
{ stdenv, fetchurl }:
stdenv.mkDerivation rec {
name = "python32-docs-pdf-a4-3.2.3";
src = fetchurl {
url = http://docs.python.org/ftp/python/doc/3.2.3/python-3.2.3-docs-pdf-a4.tar.bz2;
sha256 = "1lw1sbk3nx70k2zxgjc36ryvyzlxndzsvhrxyzdy9sjfhasyd807";
};
installPhase = ''
mkdir -p $out/share/docs
cp -R ./ $out/share/docs/${name}
'';
meta = {
maintainers = [ lib.maintainers.chaoflow ];
};
}

View file

@ -0,0 +1,18 @@
# This file was generated and will be overwritten by ./generate.sh
{ stdenv, fetchurl }:
stdenv.mkDerivation rec {
name = "python32-docs-pdf-letter-3.2.3";
src = fetchurl {
url = http://docs.python.org/ftp/python/doc/3.2.3/python-3.2.3-docs-pdf-letter.tar.bz2;
sha256 = "199ibzslw3zrwjd49582vc5q6ghp5ig8zalvslawz0xkz1226wg2";
};
installPhase = ''
mkdir -p $out/share/docs
cp -R ./ $out/share/docs/${name}
'';
meta = {
maintainers = [ lib.maintainers.chaoflow ];
};
}

View file

@ -0,0 +1,18 @@
# This file was generated and will be overwritten by ./generate.sh
{ stdenv, fetchurl }:
stdenv.mkDerivation rec {
name = "python32-docs-text-3.2.3";
src = fetchurl {
url = http://docs.python.org/ftp/python/doc/3.2.3/python-3.2.3-docs-text.tar.bz2;
sha256 = "1jdc9rj2b4vsbvg5mq6vcdfa2b72avhhvjw7rn7k3kl521cvxs09";
};
installPhase = ''
mkdir -p $out/share/docs
cp -R ./ $out/share/docs/${name}
'';
meta = {
maintainers = [ lib.maintainers.chaoflow ];
};
}

View file

@ -0,0 +1,18 @@
# This file was generated and will be overwritten by ./generate.sh
{ stdenv, fetchurl }:
stdenv.mkDerivation rec {
name = "python33-docs-html-3.3.0";
src = fetchurl {
url = http://docs.python.org/ftp/python/doc/3.3.0/python-3.3.0-docs-html.tar.bz2;
sha256 = "0vv24b9qi7gznv687ik0pa2w1rq9grqivy44znvj2ysjfg7mc2c1";
};
installPhase = ''
mkdir -p $out/share/docs
cp -R ./ $out/share/docs/${name}
'';
meta = {
maintainers = [ lib.maintainers.chaoflow ];
};
}

View file

@ -0,0 +1,18 @@
# This file was generated and will be overwritten by ./generate.sh
{ stdenv, fetchurl }:
stdenv.mkDerivation rec {
name = "python33-docs-pdf-a4-3.3.0";
src = fetchurl {
url = http://docs.python.org/ftp/python/doc/3.3.0/python-3.3.0-docs-pdf-a4.tar.bz2;
sha256 = "1y6n13bxlw8a11khy3ynfbz8z0kpf2lvh32dvy8scyw3hrk6wdxp";
};
installPhase = ''
mkdir -p $out/share/docs
cp -R ./ $out/share/docs/${name}
'';
meta = {
maintainers = [ lib.maintainers.chaoflow ];
};
}

View file

@ -0,0 +1,18 @@
# This file was generated and will be overwritten by ./generate.sh
{ stdenv, fetchurl }:
stdenv.mkDerivation rec {
name = "python33-docs-pdf-letter-3.3.0";
src = fetchurl {
url = http://docs.python.org/ftp/python/doc/3.3.0/python-3.3.0-docs-pdf-letter.tar.bz2;
sha256 = "0mcj1i47nx81fc9zk1cic4c4p139qjcqlzf4hnnkzvb3jcgy5z6k";
};
installPhase = ''
mkdir -p $out/share/docs
cp -R ./ $out/share/docs/${name}
'';
meta = {
maintainers = [ lib.maintainers.chaoflow ];
};
}

View file

@ -0,0 +1,18 @@
# This file was generated and will be overwritten by ./generate.sh
{ stdenv, fetchurl }:
stdenv.mkDerivation rec {
name = "python33-docs-text-3.3.0";
src = fetchurl {
url = http://docs.python.org/ftp/python/doc/3.3.0/python-3.3.0-docs-text.tar.bz2;
sha256 = "10vk2fixg1aglqmsf89kn98rlirrbhnrk1285vzfbynf2iavxw0n";
};
installPhase = ''
mkdir -p $out/share/docs
cp -R ./ $out/share/docs/${name}
'';
meta = {
maintainers = [ lib.maintainers.chaoflow ];
};
}

View file

@ -0,0 +1,85 @@
{ stdenv, fetchurl }:
let
pythonDocs = {
html = {
python33 = import ./3.3-html.nix {
inherit stdenv fetchurl;
};
python32 = import ./3.2-html.nix {
inherit stdenv fetchurl;
};
python31 = import ./3.1-html.nix {
inherit stdenv fetchurl;
};
python30 = import ./3.0-html.nix {
inherit stdenv fetchurl;
};
python27 = import ./2.7-html.nix {
inherit stdenv fetchurl;
};
python26 = import ./2.6-html.nix {
inherit stdenv fetchurl;
};
};
pdf_a4 = {
python33 = import ./3.3-pdf-a4.nix {
inherit stdenv fetchurl;
};
python32 = import ./3.2-pdf-a4.nix {
inherit stdenv fetchurl;
};
python31 = import ./3.1-pdf-a4.nix {
inherit stdenv fetchurl;
};
python30 = import ./3.0-pdf-a4.nix {
inherit stdenv fetchurl;
};
python27 = import ./2.7-pdf-a4.nix {
inherit stdenv fetchurl;
};
python26 = import ./2.6-pdf-a4.nix {
inherit stdenv fetchurl;
};
};
pdf_letter = {
python33 = import ./3.3-pdf-letter.nix {
inherit stdenv fetchurl;
};
python32 = import ./3.2-pdf-letter.nix {
inherit stdenv fetchurl;
};
python31 = import ./3.1-pdf-letter.nix {
inherit stdenv fetchurl;
};
python30 = import ./3.0-pdf-letter.nix {
inherit stdenv fetchurl;
};
python27 = import ./2.7-pdf-letter.nix {
inherit stdenv fetchurl;
};
python26 = import ./2.6-pdf-letter.nix {
inherit stdenv fetchurl;
};
};
text = {
python33 = import ./3.3-text.nix {
inherit stdenv fetchurl;
};
python32 = import ./3.2-text.nix {
inherit stdenv fetchurl;
};
python31 = import ./3.1-text.nix {
inherit stdenv fetchurl;
};
python30 = import ./3.0-text.nix {
inherit stdenv fetchurl;
};
python27 = import ./2.7-text.nix {
inherit stdenv fetchurl;
};
python26 = import ./2.6-text.nix {
inherit stdenv fetchurl;
};
};
}; in pythonDocs

View file

@ -0,0 +1,55 @@
#!/usr/bin/env bash
TYPES="html pdf-a4 pdf-letter text"
URL=http://docs.python.org/ftp/python/doc/VERSION/python-VERSION-docs-TYPE.tar.bz2
VERSIONS=$(curl http://www.python.org/download/releases/ 2>/dev/null | grep "releases/[123456789]"| cut -d/ -f4 |grep -v "^[12].[012345]" |grep -v "^1.6.1")
echo "Generating expressions for:
${VERSIONS}
"
cat >default.nix <<EOF
{ stdenv, fetchurl }:
let
pythonDocs = {
EOF
for type in $TYPES; do
echo " ${type/-/_} = {" >> default.nix
for version in $VERSIONS; do
major=$(echo -n ${version}| cut -d. -f1)
minor=$(echo -n ${version}| cut -d. -f2)
outfile=${major}.${minor}-${type}.nix
hash=
if [ -e ${outfile} ]; then
currentversion=$(grep "url =" ${outfile} |cut -d/ -f7)
if [ ${version} = ${currentversion} ]; then
hash=$(grep sha256 ${outfile} | cut -d'"' -f2)
fi
fi
echo "Generating ${outfile}"
url=$(echo -n $URL |sed -e "s,VERSION,${version},g" -e "s,TYPE,${type},")
sha=$(nix-prefetch-url ${url} ${hash})
sed -e "s,VERSION,${version}," \
-e "s,MAJOR,${major}," \
-e "s,MINOR,${minor}," \
-e "s,TYPE,${type}," \
-e "s,URL,${url}," \
-e "s,SHA,${sha}," < template.nix > ${outfile}
attrname=python${major}${minor}
cat >>default.nix <<EOF
${attrname} = import ./${major}.${minor}-${type}.nix {
inherit stdenv fetchurl;
};
EOF
echo "done."
echo
done
echo " };" >> default.nix
done
echo "}; in pythonDocs" >> default.nix

View file

@ -0,0 +1,18 @@
# This file was generated and will be overwritten by ./generate.sh
{ stdenv, fetchurl }:
stdenv.mkDerivation rec {
name = "pythonMAJORMINOR-docs-TYPE-VERSION";
src = fetchurl {
url = URL;
sha256 = "SHA";
};
installPhase = ''
mkdir -p $out/share/docs
cp -R ./ $out/share/docs/${name}
'';
meta = {
maintainers = [ lib.maintainers.chaoflow ];
};
}

View file

@ -13,35 +13,40 @@ g: # Get dependencies from patched gems
arel = g.arel_3_0_2;
atoulme_Antwrap = g.atoulme_Antwrap_0_7_4;
autotest_rails = g.autotest_rails_4_1_2;
aws_sdk = g.aws_sdk_1_8_1_2;
builder = g.builder_3_1_4;
buildr = g.buildr_1_4_9;
bundler = g.bundler_1_2_3;
aws_sdk = g.aws_sdk_1_8_3_1;
bitbucket_backup = g.bitbucket_backup_0_2_2;
builder = g.builder_3_2_0;
buildr = g.buildr_1_4_10;
bundler = g.bundler_1_3_0;
childprocess = g.childprocess_0_3_8;
daemons = g.daemons_1_1_9;
diff_lcs = g.diff_lcs_1_1_3;
dimensions = g.dimensions_1_2_0;
erubis = g.erubis_2_7_0;
eventmachine = g.eventmachine_1_0_0;
fakes3 = g.fakes3_0_1_5;
ffi = g.ffi_1_3_1;
ffi = g.ffi_1_4_0;
foreman = g.foreman_0_61_0;
highline = g.highline_1_6_2;
highline = g.highline_1_6_15;
hike = g.hike_1_2_1;
hoe = g.hoe_3_1_0;
i18n = g.i18n_0_6_1;
journey = g.journey_1_0_4;
jruby_pageant = g.jruby_pageant_1_1_1;
jsduck = g.jsduck_4_6_2;
json = g.json_1_7_7;
json_pure = g.json_pure_1_7_7;
libv8 = g.libv8_3_3_10_4_x86_64_linux;
macaddr = g.macaddr_1_6_1;
mail = g.mail_2_4_4;
mime_types = g.mime_types_1_21;
minitar = g.minitar_0_5_3;
multi_json = g.multi_json_1_5_1;
multi_json = g.multi_json_1_6_1;
net_sftp = g.net_sftp_2_0_5;
net_ssh = g.net_ssh_2_6_5;
nix = g.nix_0_1_1;
nokogiri = g.nokogiri_1_5_6;
parallel = g.parallel_0_6_2;
polyglot = g.polyglot_0_3_3;
rack = g.rack_1_5_2;
rack_cache = g.rack_cache_1_2;
@ -52,7 +57,8 @@ g: # Get dependencies from patched gems
railties = g.railties_3_2_12;
rake = g.rake_10_0_3;
rb_fsevent = g.rb_fsevent_0_9_3;
rdoc = g.rdoc_3_12_1;
rdiscount = g.rdiscount_2_0_7;
rdoc = g.rdoc_3_12_2;
rjb = g.rjb_1_4_6;
rspec = g.rspec_2_11_0;
rspec_core = g.rspec_core_2_11_1;
@ -60,22 +66,23 @@ g: # Get dependencies from patched gems
rspec_mocks = g.rspec_mocks_2_11_3;
rubyforge = g.rubyforge_2_0_4;
rubyzip = g.rubyzip_0_9_9;
sass = g.sass_3_2_5;
selenium_webdriver = g.selenium_webdriver_2_29_0;
sass = g.sass_3_2_6;
selenium_webdriver = g.selenium_webdriver_2_30_0;
sinatra = g.sinatra_1_3_2;
sprockets = g.sprockets_2_2_2;
systemu = g.systemu_2_5_2;
therubyracer = g.therubyracer_0_10_2;
thin = g.thin_1_5_0;
thor = g.thor_0_17_0;
tilt = g.tilt_1_3_3;
treetop = g.treetop_1_4_12;
tzinfo = g.tzinfo_0_3_35;
uuid = g.uuid_2_3_6;
uuid = g.uuid_2_3_7;
uuidtools = g.uuidtools_2_1_3;
websocket = g.websocket_1_0_7;
xml_simple = g.xml_simple_1_1_1;
};
gem_nix_args = [ ''autotest-rails'' ''aws-sdk'' ''buildr'' ''fakes3'' ''foreman'' ''nix'' ''rails'' ''rake'' ''rb-fsevent'' ''sass'' ''selenium-webdriver'' ''sinatra-1.3.2'' ''thin'' ''uuid'' ];
gem_nix_args = [ ''autotest-rails'' ''aws-sdk'' ''bitbucket-backup'' ''buildr'' ''fakes3'' ''foreman'' ''jsduck'' ''nix'' ''rails'' ''rake'' ''rb-fsevent'' ''sass'' ''selenium-webdriver'' ''sinatra-1.3.2'' ''thin'' ''uuid'' ];
gems = {
ZenTest_4_9_0 = {
basename = ''ZenTest'';
@ -171,7 +178,7 @@ installed versions.'';
longDescription = ''A toolkit of support libraries and Ruby core extensions extracted from the Rails framework. Rich support for multibyte strings, internationalization, time zones, and testing.'';
};
name = ''activesupport-3.2.12'';
requiredGems = [ g.i18n_0_6_1 g.multi_json_1_5_1 ];
requiredGems = [ g.i18n_0_6_1 g.multi_json_1_6_1 ];
sha256 = ''1giqkprxjf5gyfyhn5nz9q8a5gi3v8irxhkpqr00zc5fw1azllsg'';
};
arel_3_0_2 = {
@ -226,16 +233,27 @@ rails support and extra plugins for migrations and fixtures.'';
requiredGems = [ g.ZenTest_4_9_0 ];
sha256 = ''1wkb5jayb39yx0i8ly7sibygf9f9c3w24jg2z1qgm135zlb070v4'';
};
aws_sdk_1_8_1_2 = {
aws_sdk_1_8_3_1 = {
basename = ''aws_sdk'';
meta = {
description = ''AWS SDK for Ruby'';
homepage = ''http://aws.amazon.com/sdkforruby'';
longDescription = ''AWS SDK for Ruby'';
};
name = ''aws-sdk-1.8.1.2'';
name = ''aws-sdk-1.8.3.1'';
requiredGems = [ g.uuidtools_2_1_3 g.nokogiri_1_5_6 g.json_1_7_7 ];
sha256 = ''0z3ins8rd8v3r40sn70kg21f5di58lqjfxppl19hi3pdjxgdrr7x'';
sha256 = ''1yiv2skrrwqw8ihznnqqznh4yax75hbv497xqllp7b5qqmnrpvy4'';
};
bitbucket_backup_0_2_2 = {
basename = ''bitbucket_backup'';
meta = {
description = ''A tool to backup Bitbucket repos.'';
homepage = ''https://bitbucket.org/seth/bitbucket-backup'';
longDescription = ''A tool to backup Bitbucket repos.'';
};
name = ''bitbucket-backup-0.2.2'';
requiredGems = [ g.highline_1_6_15 g.json_1_7_7 ];
sha256 = ''1kzg6pkzw04n96i6mhb74gpg4c899wly5fc2m1y6m2xvn71qksys'';
};
builder_3_0_4 = {
basename = ''builder'';
@ -269,7 +287,7 @@ simple to do. Currently the following builder objects are supported:
requiredGems = [ ];
sha256 = ''0w6xsq9vyvzdy0xb52sajgipr9ml2bbpivk6dxm69c6987dk7him'';
};
builder_3_1_4 = {
builder_3_2_0 = {
basename = ''builder'';
meta = {
description = ''Builders for MarkUp.'';
@ -281,11 +299,11 @@ simple to do. Currently the following builder objects are supported:
* XML Events
'';
};
name = ''builder-3.1.4'';
name = ''builder-3.2.0'';
requiredGems = [ ];
sha256 = ''1p0bjy1vb0zbswd6bsh5qda0f0br53p8vak8cm7hls62094r405p'';
sha256 = ''0f2cpfx6lpazb1wrz3lf06qp6f0qf0gdq5z8xnhkplc3fz3kslb0'';
};
buildr_1_4_9 = {
buildr_1_4_10 = {
basename = ''buildr'';
meta = {
description = ''Build like you code'';
@ -297,20 +315,20 @@ to do, and it takes care of the rest. But also something we can easily extend
for those one-off tasks, with a language that's a joy to use.
'';
};
name = ''buildr-1.4.9'';
requiredGems = [ g.rake_0_9_2_2 g.builder_3_1_3 g.net_ssh_2_6_0 g.net_sftp_2_0_5 g.rubyzip_0_9_9 g.highline_1_6_2 g.json_pure_1_7_5 g.rubyforge_2_0_4 g.hoe_3_1_0 g.rjb_1_4_2 g.atoulme_Antwrap_0_7_4 g.diff_lcs_1_1_3 g.rspec_expectations_2_11_3 g.rspec_mocks_2_11_3 g.rspec_core_2_11_1 g.rspec_2_11_0 g.xml_simple_1_1_1 g.minitar_0_5_3 ];
sha256 = ''1ws8cdc7ylfq0aqbcmgwj3d8jxh8lp8zgxx0w0a7ippvvjjxb7az'';
name = ''buildr-1.4.10'';
requiredGems = [ g.rake_0_9_2_2 g.builder_3_1_3 g.net_ssh_2_6_0 g.net_sftp_2_0_5 g.rubyzip_0_9_9 g.highline_1_6_2 g.json_pure_1_7_5 g.rubyforge_2_0_4 g.hoe_3_1_0 g.rjb_1_4_2 g.atoulme_Antwrap_0_7_4 g.diff_lcs_1_1_3 g.rspec_expectations_2_11_3 g.rspec_mocks_2_11_3 g.rspec_core_2_11_1 g.rspec_2_11_0 g.xml_simple_1_1_1 g.minitar_0_5_3 g.bundler_1_3_0 ];
sha256 = ''1x192r8ab5zr9rlp1i9b3pi3y74f9pj2w491wkgshgwj22akh6vn'';
};
bundler_1_2_3 = {
bundler_1_3_0 = {
basename = ''bundler'';
meta = {
description = ''The best way to manage your application's dependencies'';
homepage = ''http://gembundler.com'';
longDescription = ''Bundler manages an application's dependencies through its entire life, across many machines, systematically and repeatably'';
};
name = ''bundler-1.2.3'';
name = ''bundler-1.3.0'';
requiredGems = [ ];
sha256 = ''0bf6ync0901d9q4cg5ws4ra0qh9ssw2xgsip8dka34sbm59kav4w'';
sha256 = ''16ss4fh97wbg5n5l00wkinxdsj7bjgqzv9h6yhygv45wi8rbf8zp'';
};
childprocess_0_3_8 = {
basename = ''childprocess'';
@ -320,7 +338,7 @@ for those one-off tasks, with a language that's a joy to use.
longDescription = ''This gem aims at being a simple and reliable solution for controlling external programs running in the background on any Ruby / OS combination.'';
};
name = ''childprocess-0.3.8'';
requiredGems = [ g.ffi_1_3_1 ];
requiredGems = [ g.ffi_1_4_0 ];
sha256 = ''08rp4krw0g60567ih4w51ndlq2pg92al0dycy0bs0m3msq68nlq4'';
};
daemons_1_1_9 = {
@ -359,6 +377,17 @@ is the MIT license.'';
requiredGems = [ ];
sha256 = ''15wqs3md9slif6ag43vp6gw63r3a2zdqiyfapnnzkb7amgg930pv'';
};
dimensions_1_2_0 = {
basename = ''dimensions'';
meta = {
description = ''Pure Ruby dimension measurement for GIF, PNG, JPEG and TIFF images'';
homepage = ''https://github.com/sstephenson/dimensions'';
longDescription = ''A pure Ruby library for measuring the dimensions and rotation angles of GIF, PNG, JPEG and TIFF images.'';
};
name = ''dimensions-1.2.0'';
requiredGems = [ ];
sha256 = ''1pqb7yzjcpbgbyi196ifqbd1wy570cn12bkzcvpcha4xilhajja0'';
};
erubis_2_7_0 = {
basename = ''erubis'';
meta = {
@ -409,19 +438,19 @@ using TCP/IP, especially if custom protocols are required.'';
longDescription = ''Use FakeS3 to test basic S3 functionality without actually connecting to S3'';
};
name = ''fakes3-0.1.5'';
requiredGems = [ g.thor_0_17_0 g.builder_3_1_4 ];
requiredGems = [ g.thor_0_17_0 g.builder_3_2_0 ];
sha256 = ''1na5wrbarla6s414svqmr5spbpv6vmcgpswal444x4clcpmadhib'';
};
ffi_1_3_1 = {
ffi_1_4_0 = {
basename = ''ffi'';
meta = {
description = ''Ruby FFI'';
homepage = ''http://wiki.github.com/ffi/ffi'';
longDescription = ''Ruby FFI library'';
};
name = ''ffi-1.3.1'';
name = ''ffi-1.4.0'';
requiredGems = [ ];
sha256 = ''0hbrfwgaw3ilmb47lvg9gzdnnfs0q0dzp6dki7rphcvsgirhp0sb'';
sha256 = ''06a29qvg487yk9pyi7wzyj5700mf7s3mjdqc6dsrh0467mjj9768'';
};
foreman_0_61_0 = {
basename = ''foreman'';
@ -434,6 +463,21 @@ using TCP/IP, especially if custom protocols are required.'';
requiredGems = [ g.thor_0_17_0 ];
sha256 = ''1h9dmzq1cwz87qyzx2ibpjghsxjnnqbh485l3sdxyfh5k3v79k7z'';
};
highline_1_6_15 = {
basename = ''highline'';
meta = {
description = ''HighLine is a high-level command-line IO library.'';
homepage = ''http://highline.rubyforge.org'';
longDescription = ''A high-level IO library that provides validation, type conversion, and more for
command-line interfaces. HighLine also includes a complete menu system that can
crank out anything from simple list selection to complete shells with just
minutes of work.
'';
};
name = ''highline-1.6.15'';
requiredGems = [ ];
sha256 = ''1ilwlgylv92md9dnw6hqhrw8hiwk3f4k8qz6airqjp1rq9r594m1'';
};
highline_1_6_2 = {
basename = ''highline'';
meta = {
@ -513,6 +557,17 @@ For extra goodness, see: http://seattlerb.rubyforge.org/hoe/Hoe.pdf'';
requiredGems = [ ];
sha256 = ''1kgqsn0bagr41gf5kbqaxbs38a7s5bm85m0pdx4qz7d70v9nc9cl'';
};
jsduck_4_6_2 = {
basename = ''jsduck'';
meta = {
description = ''Simple JavaScript Duckumentation generator'';
homepage = ''https://github.com/senchalabs/jsduck'';
longDescription = ''Documentation generator for Sencha JS frameworks'';
};
name = ''jsduck-4.6.2'';
requiredGems = [ g.rdiscount_2_0_7 g.json_1_7_7 g.parallel_0_6_2 g.therubyracer_0_10_2 g.dimensions_1_2_0 ];
sha256 = ''035w4igfa6yy6234ff4zbiqfjn0bhwqs6k8kji52l7gzgskwmzln'';
};
json_1_7_7 = {
basename = ''json'';
meta = {
@ -546,6 +601,17 @@ For extra goodness, see: http://seattlerb.rubyforge.org/hoe/Hoe.pdf'';
requiredGems = [ ];
sha256 = ''0jxp0amx9xhka0ixnhvfgwc5ydr82hkxp81pvw32z31arx7jrwl6'';
};
libv8_3_3_10_4_x86_64_linux = {
basename = ''libv8'';
meta = {
description = ''Distribution of the V8 JavaScript engine'';
homepage = ''http://github.com/fractaloop/libv8'';
longDescription = ''Distributes the V8 JavaScript engine in binary and source forms in order to support fast builds of The Ruby Racer'';
};
name = ''libv8-3.3.10.4-x86_64-linux'';
requiredGems = [ ];
sha256 = ''13lnmkm9z3xqyi8rlsycfd7wybv044pxcisrkyq0cx7ig91a0dmc'';
};
macaddr_1_6_1 = {
basename = ''macaddr'';
meta = {
@ -611,16 +677,16 @@ added from the the {LTSW collection}[http://www.ltsw.se/knbase/internet/mime.htp
requiredGems = [ ];
sha256 = ''035vs1knnnjsb8arfp8vx75warvwcdpiljjwv38lqljai9v8fq53'';
};
multi_json_1_5_1 = {
multi_json_1_6_1 = {
basename = ''multi_json'';
meta = {
description = ''A gem to provide swappable JSON backends.'';
homepage = ''http://github.com/intridea/multi_json'';
longDescription = ''A gem to provide easy switching between different JSON backends, including Oj, Yajl, the JSON gem (with C-extensions), the pure-Ruby JSON gem, and OkJson.'';
};
name = ''multi_json-1.5.1'';
name = ''multi_json-1.6.1'';
requiredGems = [ ];
sha256 = ''0c2jxjg6lx811515s35vnyjl9m9rsb2adw6yj2fxgqkc7yx1fjsz'';
sha256 = ''0p33swcl9i97wvv0cq9jkdl8q7xbc3j07apy35vsgldnhw99krcg'';
};
net_sftp_2_0_5 = {
basename = ''net_sftp'';
@ -681,6 +747,16 @@ enough of it.'';
requiredGems = [ ];
sha256 = ''1235h8k242f6yi5qgb8rfcx6gp7g99djwqgrz0vb6w12pbp9kar8'';
};
parallel_0_6_2 = {
basename = ''parallel'';
meta = {
description = ''Run any kind of code in parallel processes'';
homepage = ''http://github.com/grosser/parallel'';
};
name = ''parallel-0.6.2'';
requiredGems = [ ];
sha256 = ''05rdbb1jqv0179wjfj74a1739rsqv7ijf4jp1i5s6lzh878c6l6p'';
};
polyglot_0_3_3 = {
basename = ''polyglot'';
meta = {
@ -787,7 +863,7 @@ request helpers feature.'';
longDescription = ''Ruby on Rails is a full-stack web framework optimized for programmer happiness and sustainable productivity. It encourages beautiful code by favoring convention over configuration.'';
};
name = ''rails-3.2.12'';
requiredGems = [ g.activesupport_3_2_12 g.actionpack_3_2_12 g.activerecord_3_2_12 g.activeresource_3_2_12 g.actionmailer_3_2_12 g.railties_3_2_12 g.bundler_1_2_3 ];
requiredGems = [ g.activesupport_3_2_12 g.actionpack_3_2_12 g.activerecord_3_2_12 g.activeresource_3_2_12 g.actionmailer_3_2_12 g.railties_3_2_12 g.bundler_1_3_0 ];
sha256 = ''1jjnm74nzl5v3461c0mrbpa471yd6s8hnkmnxb64c2rm95c61wxz'';
};
railties_3_2_12 = {
@ -798,7 +874,7 @@ request helpers feature.'';
longDescription = ''Rails internals: application bootup, plugins, generators, and rake tasks.'';
};
name = ''railties-3.2.12'';
requiredGems = [ g.rake_10_0_3 g.rack_ssl_1_3_3 g.thor_0_17_0 g.rdoc_3_12_1 g.activesupport_3_2_12 g.actionpack_3_2_12 ];
requiredGems = [ g.rake_10_0_3 g.rack_ssl_1_3_3 g.thor_0_17_0 g.rdoc_3_12_2 g.activesupport_3_2_12 g.actionpack_3_2_12 ];
sha256 = ''0d8wy1n591x12bigj3jh8c9djzi8k68vh14342mc22raxwp5rwdw'';
};
rake_0_9_2_2 = {
@ -845,7 +921,17 @@ request helpers feature.'';
requiredGems = [ ];
sha256 = ''0bdnxwdxj4r1kdxfi5nszbsb126njrr81p912g64xxs2bgxd1bp1'';
};
rdoc_3_12_1 = {
rdiscount_2_0_7 = {
basename = ''rdiscount'';
meta = {
description = ''Fast Implementation of Gruber's Markdown in C'';
homepage = ''http://github.com/rtomayko/rdiscount'';
};
name = ''rdiscount-2.0.7'';
requiredGems = [ ];
sha256 = ''1cj9dn59xqjaglvzvd1ninid62xmih74az0glqqb90n2p42s2zs1'';
};
rdoc_3_12_2 = {
basename = ''rdoc'';
meta = {
description = ''RDoc produces HTML and command-line documentation for Ruby projects'';
@ -856,9 +942,9 @@ documentation.
See RDoc for a description of RDoc's markup and basic use.'';
};
name = ''rdoc-3.12.1'';
name = ''rdoc-3.12.2'';
requiredGems = [ g.json_1_7_7 ];
sha256 = ''1hflgw2v0lyx38kdwj71jyibc14j6ghb6zmp2l3g47v7d2m47z4g'';
sha256 = ''1v9k4sp5yzj2bshngckdvivj6bszciskk1nd2r3wri2ygs7vgqm8'';
};
rjb_1_4_2 = {
basename = ''rjb'';
@ -956,7 +1042,7 @@ See RDoc for a description of RDoc's markup and basic use.'';
requiredGems = [ ];
sha256 = ''1khf6d903agnwd8965f5f8b353rzmfvygxp53z1199rqzw8h46q2'';
};
sass_3_2_5 = {
sass_3_2_6 = {
basename = ''sass'';
meta = {
description = ''A powerful but elegant CSS compiler that makes CSS fun again.'';
@ -967,20 +1053,20 @@ See RDoc for a description of RDoc's markup and basic use.'';
command line tool or a web-framework plugin.
'';
};
name = ''sass-3.2.5'';
name = ''sass-3.2.6'';
requiredGems = [ ];
sha256 = ''1ys7pfadw61dm09yyk28zrssi8zsyj99fyq6bdf2xmi8yp1avs6k'';
sha256 = ''10xy6k663399r881cj30fapbdsrq8jwzvnp97y8n3mhxmrvzpq28'';
};
selenium_webdriver_2_29_0 = {
selenium_webdriver_2_30_0 = {
basename = ''selenium_webdriver'';
meta = {
description = ''The next generation developer focused tool for automated testing of webapps'';
homepage = ''http://selenium.googlecode.com'';
longDescription = ''WebDriver is a tool for writing automated tests of websites. It aims to mimic the behaviour of a real user, and as such interacts with the HTML of the application.'';
};
name = ''selenium-webdriver-2.29.0'';
requiredGems = [ g.multi_json_1_5_1 g.rubyzip_0_9_9 g.childprocess_0_3_8 g.websocket_1_0_7 ];
sha256 = ''0c5fybp19mawq07h59b16h736pz8sz017m1pwalb6mcyliqmlwcj'';
name = ''selenium-webdriver-2.30.0'';
requiredGems = [ g.multi_json_1_6_1 g.rubyzip_0_9_9 g.childprocess_0_3_8 g.websocket_1_0_7 ];
sha256 = ''1ybx8v9m5y8ykbdbldd1mglz0xhg30iv0708ig0vzjl2522sg6v1'';
};
sinatra_1_3_2 = {
basename = ''sinatra'';
@ -1001,7 +1087,7 @@ See RDoc for a description of RDoc's markup and basic use.'';
longDescription = ''Sprockets is a Rack-based asset packaging system that concatenates and serves JavaScript, CoffeeScript, CSS, LESS, Sass, and SCSS.'';
};
name = ''sprockets-2.2.2'';
requiredGems = [ g.hike_1_2_1 g.multi_json_1_5_1 g.rack_1_5_2 g.tilt_1_3_3 ];
requiredGems = [ g.hike_1_2_1 g.multi_json_1_6_1 g.rack_1_5_2 g.tilt_1_3_3 ];
sha256 = ''15ngw3bjbyr31ygzmmdxxa30ylah6pdn8akgdy9w30vfx2vr7s7s'';
};
systemu_2_5_2 = {
@ -1015,6 +1101,17 @@ See RDoc for a description of RDoc's markup and basic use.'';
requiredGems = [ ];
sha256 = ''0h834ajdg9w4xrijp31fn98pjfj08gi08xjvp5xh3i6hz9a25fhr'';
};
therubyracer_0_10_2 = {
basename = ''therubyracer'';
meta = {
description = ''Embed the V8 Javascript interpreter into Ruby'';
homepage = ''http://github.com/cowboyd/therubyracer'';
longDescription = ''Call javascript code and manipulate javascript objects from ruby. Call ruby code and manipulate ruby objects from javascript.'';
};
name = ''therubyracer-0.10.2'';
requiredGems = [ g.libv8_3_3_10_4_x86_64_linux ];
sha256 = ''111hm2l613v06sy7pzjzmnyi4x11rg3c2syhnpv8fn0wnn9rdiyb'';
};
thin_1_5_0 = {
basename = ''thin'';
meta = {
@ -1069,7 +1166,7 @@ See RDoc for a description of RDoc's markup and basic use.'';
requiredGems = [ ];
sha256 = ''1c52ndjqcxpgxhlclbxf98clcpni216xk5zgrkcd4px84riyjbmp'';
};
uuid_2_3_6 = {
uuid_2_3_7 = {
basename = ''uuid'';
meta = {
description = ''UUID generator'';
@ -1078,9 +1175,9 @@ See RDoc for a description of RDoc's markup and basic use.'';
(http://www.ietf.org/rfc/rfc4122.txt).
'';
};
name = ''uuid-2.3.6'';
name = ''uuid-2.3.7'';
requiredGems = [ g.macaddr_1_6_1 ];
sha256 = ''194xznnxncfgr0nx84l11gnafvkfzr1nj1swnwas75q0ld0ri2l8'';
sha256 = ''04q10an3v40zwjihvdwm23fw6vl39fbkhdiwfw78a51ym9airnlp'';
};
uuidtools_2_1_3 = {
basename = ''uuidtools'';

View file

@ -0,0 +1,57 @@
{ stdenv, fetchurl
, zlib, zlibSupport ? true
, openssl, opensslSupport ? true
, gdbm, gdbmSupport ? true
, ncurses, readline, cursesSupport ? false
, groff, docSupport ? false
, libyaml, yamlSupport ? true
}:
let
op = stdenv.lib.optional;
ops = stdenv.lib.optionals;
in
stdenv.mkDerivation rec {
version = with passthru; "${majorVersion}.${minorVersion}-p${patchLevel}";
name = "ruby-${version}";
src = fetchurl {
url = "ftp://ftp.ruby-lang.org/pub/ruby/2.0/${name}.tar.bz2";
sha256 = "0pr9jf01cfap93xcngyd5zpns67ffjsgaxkm0qr1r464rj9d7066";
};
# Have `configure' avoid `/usr/bin/nroff' in non-chroot builds.
NROFF = "${groff}/bin/nroff";
buildInputs = (ops cursesSupport [ ncurses readline ] )
++ (op docSupport groff )
++ (op zlibSupport zlib)
++ (op opensslSupport openssl)
++ (op gdbmSupport gdbm)
++ (op yamlSupport libyaml);
enableParallelBuilding = true;
configureFlags = ["--enable-shared" ];
installFlags = stdenv.lib.optionalString docSupport "install-doc";
# Bundler tries to create this directory
postInstall = "mkdir -pv $out/${passthru.gemPath}";
meta = {
license = "Ruby";
homepage = "http://www.ruby-lang.org/en/";
description = "The Ruby language";
platforms = stdenv.lib.platforms.all;
};
passthru = rec {
majorVersion = "2.0";
minorVersion = "0";
patchLevel = "0";
libPath = "lib/ruby/${majorVersion}";
gemPath = "lib/ruby/gems/${majorVersion}";
};
}

View file

@ -0,0 +1,31 @@
{ stdenv, fetchurl }:
stdenv.mkDerivation rec {
name = "apache-activemq-${version}";
version = "5.8.0";
src = fetchurl {
url = "mirror://apache/activemq/apache-activemq/${version}/${name}-bin.tar.gz";
sha256 = "12a1lmmqapviqdgw307jm07vw1z5q53r56pkbp85w9wnqwspjrbk";
};
phases = [ "unpackPhase" "installPhase" ];
installPhase = ''
ensureDir $out
mv * $out/
for j in `find $out/lib -name "*.jar"`; do
cp="''${cp:+"$cp:"}$j";
done
echo "CLASSPATH=$cp" > $out/lib/classpath.env
'';
meta = {
homepage = http://activemq.apache.org/;
description = ''
Messaging and Integration Patterns server written in Java.
'';
license = stdenv.lib.licenses.asl20;
};
}

View file

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "lilv-${version}";
version = "0.14.2";
version = "0.16.0";
src = fetchurl {
url = "http://download.drobilla.net/${name}.tar.bz2";
sha256 = "0g9sg5f8xkkvsad0c6rh4j1k2b2hwsh83yg66f4qznxh43np7zlx";
sha256 = "1ddrcikypi7gfmj5cqn975axzrgv7mhzif4h0ni9w5b4v64rvcyg";
};
buildInputs = [ lv2 pkgconfig python serd sord sratom ];

View file

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "lv2-${version}";
version = "1.0.0";
version = "1.4.0";
src = fetchurl {
url = "http://lv2plug.in/spec/${name}.tar.bz2";
sha256 = "0lfp7679wwqd49k4mjxwqslpfx5fz2q7akxqayg400zqn70whzl5";
sha256 = "035hlfva2mij698nj3z1mz9g4mj4z5jx9axs6ww47jgyjcq38asz";
};
buildInputs = [ gtk libsndfile pkgconfig python ];

View file

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "sratom-${version}";
version = "0.2.0";
version = "0.4.2";
src = fetchurl {
url = "http://download.drobilla.net/${name}.tar.bz2";
sha256 = "12wi0ycjnn6mlddcp476wzr6k2bb4ig1489gg8h1k7v0w7d6ry1a";
sha256 = "16i5snknl9frz638mgr58lp11ap1xmkbrkb3l6f0ad8ddqpcjm3i";
};
buildInputs = [ lv2 pkgconfig python serd sord ];

View file

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "suil-${version}";
version = "0.6.4";
version = "0.6.10";
src = fetchurl {
url = "http://download.drobilla.net/${name}.tar.bz2";
sha256 = "12pz2w74rhhi6gsskfs6l71vw8qfz8906kbjf5w6jyy1x4kkdca2";
sha256 = "1y7zgfciphr3icamikdfv2gh8xwix5blpq4npl426399i8f4ya5y";
};
buildInputs = [ gtk lv2 pkgconfig python qt4 serd sord sratom ];

View file

@ -1,24 +0,0 @@
{ stdenv, fetchurl, pkgconfig, glib, libsigcxx }:
stdenv.mkDerivation rec {
name = "glibmm-2.30.1";
src = fetchurl {
url = mirror://gnome/sources/glibmm/2.30/glibmm-2.30.1.tar.xz;
sha256 = "15zqgx6rashyhxk89qjqq05p6m40akpgzyjk8bfb3jk68rc2nn39";
};
buildNativeInputs = [pkgconfig];
propagatedBuildInputs = [glib libsigcxx];
meta = {
description = "C++ interface to the GLib library";
homepage = http://gtkmm.org/;
license = "LGPLv2+";
maintainers = with stdenv.lib.maintainers; [urkud raskin];
platforms = stdenv.lib.platforms.linux;
};
}

View file

@ -0,0 +1,24 @@
{ stdenv, fetchurl, pkgconfig, glib, gdk_pixbuf, libsigcxx }:
stdenv.mkDerivation rec {
name = "glibmm-2.34.1";
src = fetchurl {
url = "mirror://gnome/sources/glibmm/2.34/${name}.tar.xz";
sha256 = "1i4jsvahva2q0mig7kjnpsw0r3fnpybm8b6hzymfm2hpgqnaa9dl";
};
buildNativeInputs = [ pkgconfig ];
propagatedBuildInputs = [ glib gdk_pixbuf libsigcxx ];
meta = {
description = "C++ interface to the GLib library";
homepage = http://gtkmm.org/;
license = "LGPLv2+";
maintainers = with stdenv.lib.maintainers; [urkud raskin];
platforms = stdenv.lib.platforms.linux;
};
}

View file

@ -1,10 +1,16 @@
{ cabal, filepath }:
{ cabal, extensibleExceptions, filepath, HUnit, QuickCheck
, testFramework, testFrameworkHunit, testFrameworkQuickcheck2
}:
cabal.mkDerivation (self: {
pname = "Cabal";
version = "1.14.0";
sha256 = "1r5b4x1ham5gdg9m9l8idpvr9czlk1q21vqmg0di4adkp2fhlm3j";
buildDepends = [ filepath ];
testDepends = [
extensibleExceptions filepath HUnit QuickCheck testFramework
testFrameworkHunit testFrameworkQuickcheck2
];
meta = {
homepage = "http://www.haskell.org/cabal/";
description = "A framework for packaging Haskell software";

View file

@ -1,10 +1,16 @@
{ cabal, filepath }:
{ cabal, extensibleExceptions, filepath, HUnit, QuickCheck
, testFramework, testFrameworkHunit, testFrameworkQuickcheck2
}:
cabal.mkDerivation (self: {
pname = "Cabal";
version = "1.16.0.3";
sha256 = "11lzqgdjaix8n7nabmafl3jf9gisb04c025cmdycfihfajfn49zg";
buildDepends = [ filepath ];
testDepends = [
extensibleExceptions filepath HUnit QuickCheck testFramework
testFrameworkHunit testFrameworkQuickcheck2
];
meta = {
homepage = "http://www.haskell.org/cabal/";
description = "A framework for packaging Haskell software";

View file

@ -0,0 +1,15 @@
{ cabal, mtl, QuickCheck, random, syb }:
cabal.mkDerivation (self: {
pname = "ChasingBottoms";
version = "1.3.0.5";
sha256 = "0g3c52c8gpm0xlnxxdgazz0f7zpnjvdx5vffsv1zr3vcn3kp1xy0";
isLibrary = true;
isExecutable = true;
buildDepends = [ mtl QuickCheck random syb ];
meta = {
description = "For testing partial and infinite values";
license = "unknown";
platforms = self.ghc.meta.platforms;
};
})

View file

@ -1,10 +1,11 @@
{ cabal, HTTP, json, mtl, network, utf8String }:
{ cabal, HTTP, HUnit, json, mtl, network, utf8String }:
cabal.mkDerivation (self: {
pname = "CouchDB";
version = "1.2";
sha256 = "0a9g0iblfyqppcy1ni3ac8f3yv5km95bfblhwqlsk6khydi5ka98";
buildDepends = [ HTTP json mtl network utf8String ];
testDepends = [ HTTP HUnit json mtl network utf8String ];
meta = {
homepage = "http://github.com/arjunguha/haskell-couchdb/";
description = "CouchDB interface";

View file

@ -5,8 +5,8 @@
cabal.mkDerivation (self: {
pname = "DAV";
version = "0.3";
sha256 = "16qbq59g79a0a1n6vblndj1fknj9fvd0anhrsz9czwl3k3lk5cx8";
version = "0.3.1";
sha256 = "0ql6sf61gq55iyn189papnid91n4ab5s2i24zvkqrgixjz7998rd";
isLibrary = true;
isExecutable = true;
buildDepends = [

View file

@ -5,6 +5,7 @@ cabal.mkDerivation (self: {
version = "4000.0.6";
sha256 = "75af1ac4dc21b10c8a1a54a33179ea822e591887bab7278360a3d6b38304d39b";
buildDepends = [ mtl network parsec ];
doCheck = false;
meta = {
homepage = "http://projects.haskell.org/http/";
description = "A library for client-side HTTP";

View file

@ -5,6 +5,7 @@ cabal.mkDerivation (self: {
version = "4000.0.9";
sha256 = "1e2b4a8b782ad1417c8755bb0d248851bc142b351366ed460e07f2945a5e95ba";
buildDepends = [ mtl network parsec ];
doCheck = false;
meta = {
homepage = "http://projects.haskell.org/http/";
description = "A library for client-side HTTP";

View file

@ -5,6 +5,7 @@ cabal.mkDerivation (self: {
version = "4000.1.1";
sha256 = "09khx5fb673a0d7m3bl39xjdxvc60m52rmm4865cha2mby0zidy3";
buildDepends = [ mtl network parsec ];
doCheck = false;
meta = {
homepage = "http://projects.haskell.org/http/";
description = "A library for client-side HTTP";

View file

@ -5,6 +5,7 @@ cabal.mkDerivation (self: {
version = "4000.1.2";
sha256 = "19vcy8xinrvn01caly6sg1p1yvbbf7nwq10kxmnwqssnl4h5cwn8";
buildDepends = [ mtl network parsec ];
doCheck = false;
meta = {
homepage = "http://projects.haskell.org/http/";
description = "A library for client-side HTTP";

View file

@ -1,10 +1,16 @@
{ cabal, mtl, network, parsec }:
{ cabal, httpdShed, HUnit, mtl, network, parsec, split
, testFramework, testFrameworkHunit
}:
cabal.mkDerivation (self: {
pname = "HTTP";
version = "4000.2.1";
sha256 = "01076rk7ly5228pszn54x4nqc6rqq1xw11ij9ajvhzf419islh0a";
buildDepends = [ mtl network parsec ];
testDepends = [
httpdShed HUnit network split testFramework testFrameworkHunit
];
doCheck = false;
meta = {
homepage = "https://github.com/haskell/HTTP";
description = "A library for client-side HTTP";

View file

@ -1,10 +1,16 @@
{ cabal, mtl, network, parsec }:
{ cabal, httpdShed, HUnit, mtl, network, parsec, split
, testFramework, testFrameworkHunit
}:
cabal.mkDerivation (self: {
pname = "HTTP";
version = "4000.2.2";
sha256 = "0qrr9wdj25sdfxifppmw0w14g8skpgf42ic4iqcqylxxzfa8v7vh";
buildDepends = [ mtl network parsec ];
testDepends = [
httpdShed HUnit network split testFramework testFrameworkHunit
];
doCheck = false;
meta = {
homepage = "https://github.com/haskell/HTTP";
description = "A library for client-side HTTP";

View file

@ -1,10 +1,16 @@
{ cabal, mtl, network, parsec }:
{ cabal, httpdShed, HUnit, mtl, network, parsec, split
, testFramework, testFrameworkHunit
}:
cabal.mkDerivation (self: {
pname = "HTTP";
version = "4000.2.3";
sha256 = "1z7s5rkyljwdl95cwqbqg64i207wjwxgpksrdmvcv82k39srzx80";
buildDepends = [ mtl network parsec ];
testDepends = [
httpdShed HUnit network split testFramework testFrameworkHunit
];
doCheck = false;
meta = {
homepage = "https://github.com/haskell/HTTP";
description = "A library for client-side HTTP";

Some files were not shown because too many files have changed in this diff Show more