nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-27 09:23:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into stdenv-updates

Browse Source 
Conflicts (simple):
	pkgs/applications/networking/browsers/chromium/default.nix
	pkgs/development/libraries/libsoup/default.nix
	pkgs/os-specific/linux/kernel/manual-config.nix
	pkgs/os-specific/linux/qemu-kvm/default.nix
This commit is contained in:
Vladimír Čunát 2013-03-02 10:41:53 +01:00
commit 26af997d41
101 changed files with 2221 additions and 330 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
pkgs/applications/audio/jalv/default.nix Normal file
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 ];
};
}

44
pkgs/applications/audio/mopidy/default.nix Normal file
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 ];
};
}

44
pkgs/applications/audio/mopidy/git.nix Normal file
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 ];
};
}

13
pkgs/applications/misc/surf/default.nix
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.";

36
pkgs/applications/networking/browsers/chromium/default.nix
View File

@ -13,13 +13,11 @@
, gcc, bison, gperf
, glib, gtk, dbus_glib
, libXScrnSaver, libXcursor, mesa
# dependencies for v25
, libvpx
# dependencies for >= v25
, protobuf
# dependencies for v25 only
, libvpx
# dependencies for >= v26
, speechd, libXdamage
@ -59,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;
@ -76,7 +74,7 @@ let
use_system_skia = false;
use_system_sqlite = false; # http://crbug.com/22208
use_system_v8 = false;
} // optionalAttrs (post24 && !post25) {
} // optionalAttrs pre26 {
use_system_libvpx = true;
use_system_protobuf = true;
};
@ -89,14 +87,8 @@ let
libusb1 libexif
];
post23 = !versionOlder sourceInfo.version "24.0.0.0";
post24 = !versionOlder sourceInfo.version "25.0.0.0";
post25 = !versionOlder sourceInfo.version "26.0.0.0";
only24 = post23 && !post24;
only25 = post24 && !post25;
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}";
@ -119,13 +111,13 @@ 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
++ optionals post24 [ pciutils protobuf ]
++ optional only25 libvpx
++ optional pre26 libvpx
++ optionals post25 [ speechd libXdamage ];
opensslPatches = optional useOpenSSL openssl.patches;
@ -134,14 +126,14 @@ in stdenv.mkDerivation rec {
patches = optional cupsSupport ./cups_allow_deprecated.patch
++ optional pulseSupport ./pulseaudio_array_bounds.patch
++ maybeFixPulseAudioBuild
++ optional post25 ./clone_detached.patch
++ optional post25 ./clone_detached.patch
++ [ ./glibc-2.16-use-siginfo_t.patch ];
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
@ -224,6 +216,4 @@ in stdenv.mkDerivation rec {
license = licenses.bsd3;
platforms = platforms.linux;
};
} // optionalAttrs only25 {
NIX_CFLAGS_COMPILE = "-fno-stack-protector";
}

11
pkgs/applications/networking/browsers/chromium/pulse_audio_fix.patch
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));

18
pkgs/applications/networking/browsers/chromium/sources.nix
View File

@ -1,18 +1,18 @@
# This file is autogenerated from update.sh in the same directory.
{
dev = {
version = "26.0.1410.10";
url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-26.0.1410.10.tar.xz";
sha256 = "1s5c69j0g2nanapvq3fmkc5iv7s53x2q5d8fxgdzd7c5c8pzlbby";
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.84";
url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-25.0.1364.84.tar.bz2";
sha256 = "1p5k7vpk4v2m5yhhdkplq4iq4mm1vv297m9sp7max1sjbngwq6m5";
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.70";
url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-24.0.1312.70.tar.bz2";
sha256 = "01z2xdfrlw2iynh9ink3d7hddldh2krgx3w9qnq9nq9z54vwwzfq";
version = "25.0.1364.97";
url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-25.0.1364.97.tar.bz2";
sha256 = "1r8khcic82m6g5i7669q8fxsfhjrlvp99iggqc5qpihljsz33ghm";
};
}

16
pkgs/applications/networking/browsers/firefox/19.0.nix
View File

@ -1,6 +1,6 @@
{ stdenv, fetchurl, pkgconfig, gtk, pango, perl, python, zip, libIDL
, libjpeg, libpng, zlib, cairo, dbus, dbus_glib, bzip2, xlibs
, freetype, fontconfig, file, alsaLib, nspr, libnotify
, freetype, fontconfig, file, alsaLib, nspr, nss, libnotify
, yasm, mesa, sqlite, unzip, makeWrapper, pysqlite
, # If you want the resulting program to call itself "Firefox" instead
@ -15,9 +15,9 @@ assert stdenv.gcc ? libc && stdenv.gcc.libc != null;
rec {
firefoxVersion = "19.0";
firefoxVersion = "19.0.1";
xulVersion = "19.0"; # 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 = "816d64e8c9432349cd208fd181d210c54f985351";
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"
@ -60,7 +60,7 @@ rec {
[ pkgconfig gtk perl zip libIDL libjpeg libpng zlib cairo bzip2
python dbus dbus_glib pango freetype fontconfig xlibs.libXi
xlibs.libX11 xlibs.libXrender xlibs.libXft xlibs.libXt file
alsaLib nspr libnotify xlibs.pixman yasm mesa
alsaLib nspr nss libnotify xlibs.pixman yasm mesa
xlibs.libXScrnSaver xlibs.scrnsaverproto pysqlite
xlibs.libXext xlibs.xextproto sqlite unzip makeWrapper
];
@ -125,7 +125,7 @@ rec {
buildInputs =
[ pkgconfig gtk perl zip libIDL libjpeg zlib cairo bzip2 python
dbus dbus_glib pango freetype fontconfig alsaLib nspr libnotify
dbus dbus_glib pango freetype fontconfig alsaLib nspr nss libnotify
xlibs.pixman yasm mesa sqlite file unzip pysqlite
];

11
pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-11/default.nix
View File

@ -19,6 +19,7 @@
, cairo
, atk
, gdk_pixbuf
, nss
, debug ? false
/* you have to add ~/mm.cfg :
@ -43,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 {
@ -54,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";
@ -78,7 +79,7 @@ stdenv.mkDerivation {
rpath = stdenv.lib.makeLibraryPath
[ zlib alsaLib curl nspr fontconfig freetype expat libX11
libXext libXrender libXcursor libXt gtk glib pango atk cairo gdk_pixbuf
libvdpau
libvdpau nss
];
buildPhase = ":";

7
pkgs/applications/networking/browsers/vimprobable2/default.nix
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 : \

10
pkgs/applications/networking/sniffers/wireshark/default.nix
View File

@ -3,18 +3,18 @@
, 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
buildInputs =
[ perl pkgconfig gtk libpcap flex bison gnutls libgcrypt
glib zlib libxml2 libxslt adns geoip heimdal python lynx lua5
];

17
pkgs/applications/version-management/git-and-tools/default.nix
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 networkProtocolXmpp 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 {

61
pkgs/applications/version-management/git-and-tools/git-annex/default.nix
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
, networkProtocolXmpp, 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 networkProtocolXmpp
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";

4
pkgs/applications/version-management/git-and-tools/git/default.nix
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 ];

21
pkgs/applications/version-management/git-and-tools/github-backup/default.nix Normal file
View File

@ -0,0 +1,21 @@
{ cabal, extensibleExceptions, filepath, github, hslogger, IfElse
, MissingH, mtl, network, prettyShow
}:
cabal.mkDerivation (self: {
pname = "github-backup";
version = "1.20120314";
sha256 = "07ilb6cg1kbz4id53l4m46wjxzs7yxcmpz6280ym6k885dras5v2";
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;
};
})

22
pkgs/applications/virtualization/virtualbox/build_fix_3.9.0.patch Normal file
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

13
pkgs/applications/virtualization/virtualbox/default.nix
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`

4
pkgs/applications/virtualization/virtualbox/guest-additions/default.nix
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";

68
pkgs/applications/virtualization/virtualbox/strict_types.patch Normal file
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,

26
pkgs/applications/window-managers/fvwm/default.nix Normal file
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+";
};
}

2
pkgs/build-support/release/debian-build.nix
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}";
};
}

2
pkgs/build-support/release/nix-build.nix
View File

@ -111,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}";
};
}

2
pkgs/build-support/release/rpm-build.nix
View File

@ -47,7 +47,7 @@ vmTools.buildRPM (
''; # */
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}";
};
}

2
pkgs/build-support/release/source-tarball.nix
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.

1
pkgs/development/compilers/scala/default.nix
View File

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

41
pkgs/development/interpreters/php/5.3.nix
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,6 +174,12 @@ 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 = ''

15
pkgs/development/interpreters/python/docs/2.6-html.nix Normal file
View File

@ -0,0 +1,15 @@
# This file was generated and will be overwritten by ./generate.sh
{ stdenv, fetchurl }:
stdenv.mkDerivation {
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/
'';
}

15
pkgs/development/interpreters/python/docs/2.6-pdf-a4.nix Normal file
View File

@ -0,0 +1,15 @@
# This file was generated and will be overwritten by ./generate.sh
{ stdenv, fetchurl }:
stdenv.mkDerivation {
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/
'';
}

15
pkgs/development/interpreters/python/docs/2.6-pdf-letter.nix Normal file
View File

@ -0,0 +1,15 @@
# This file was generated and will be overwritten by ./generate.sh
{ stdenv, fetchurl }:
stdenv.mkDerivation {
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/
'';
}

15
pkgs/development/interpreters/python/docs/2.6-text.nix Normal file
View File

@ -0,0 +1,15 @@
# This file was generated and will be overwritten by ./generate.sh
{ stdenv, fetchurl }:
stdenv.mkDerivation {
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/
'';
}

15
pkgs/development/interpreters/python/docs/2.7-html.nix Normal file
View File

@ -0,0 +1,15 @@
# This file was generated and will be overwritten by ./generate.sh
{ stdenv, fetchurl }:
stdenv.mkDerivation {
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/
'';
}

15
pkgs/development/interpreters/python/docs/2.7-pdf-a4.nix Normal file
View File

@ -0,0 +1,15 @@
# This file was generated and will be overwritten by ./generate.sh
{ stdenv, fetchurl }:
stdenv.mkDerivation {
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/
'';
}

15
pkgs/development/interpreters/python/docs/2.7-pdf-letter.nix Normal file
View File

@ -0,0 +1,15 @@
# This file was generated and will be overwritten by ./generate.sh
{ stdenv, fetchurl }:
stdenv.mkDerivation {
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/
'';
}

15
pkgs/development/interpreters/python/docs/2.7-text.nix Normal file
View File

@ -0,0 +1,15 @@
# This file was generated and will be overwritten by ./generate.sh
{ stdenv, fetchurl }:
stdenv.mkDerivation {
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/
'';
}

15
pkgs/development/interpreters/python/docs/3.0-html.nix Normal file
View File

@ -0,0 +1,15 @@
# This file was generated and will be overwritten by ./generate.sh
{ stdenv, fetchurl }:
stdenv.mkDerivation {
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/
'';
}

15
pkgs/development/interpreters/python/docs/3.0-pdf-a4.nix Normal file
View File

@ -0,0 +1,15 @@
# This file was generated and will be overwritten by ./generate.sh
{ stdenv, fetchurl }:
stdenv.mkDerivation {
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/
'';
}

15
pkgs/development/interpreters/python/docs/3.0-pdf-letter.nix Normal file
View File

@ -0,0 +1,15 @@
# This file was generated and will be overwritten by ./generate.sh
{ stdenv, fetchurl }:
stdenv.mkDerivation {
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/
'';
}

15
pkgs/development/interpreters/python/docs/3.0-text.nix Normal file
View File

@ -0,0 +1,15 @@
# This file was generated and will be overwritten by ./generate.sh
{ stdenv, fetchurl }:
stdenv.mkDerivation {
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/
'';
}

15
pkgs/development/interpreters/python/docs/3.1-html.nix Normal file
View File

@ -0,0 +1,15 @@
# This file was generated and will be overwritten by ./generate.sh
{ stdenv, fetchurl }:
stdenv.mkDerivation {
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/
'';
}

15
pkgs/development/interpreters/python/docs/3.1-pdf-a4.nix Normal file
View File

@ -0,0 +1,15 @@
# This file was generated and will be overwritten by ./generate.sh
{ stdenv, fetchurl }:
stdenv.mkDerivation {
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/
'';
}

15
pkgs/development/interpreters/python/docs/3.1-pdf-letter.nix Normal file
View File

@ -0,0 +1,15 @@
# This file was generated and will be overwritten by ./generate.sh
{ stdenv, fetchurl }:
stdenv.mkDerivation {
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/
'';
}

15
pkgs/development/interpreters/python/docs/3.1-text.nix Normal file
View File

@ -0,0 +1,15 @@
# This file was generated and will be overwritten by ./generate.sh
{ stdenv, fetchurl }:
stdenv.mkDerivation {
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/
'';
}

15
pkgs/development/interpreters/python/docs/3.2-html.nix Normal file
View File

@ -0,0 +1,15 @@
# This file was generated and will be overwritten by ./generate.sh
{ stdenv, fetchurl }:
stdenv.mkDerivation {
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/
'';
}

15
pkgs/development/interpreters/python/docs/3.2-pdf-a4.nix Normal file
View File

@ -0,0 +1,15 @@
# This file was generated and will be overwritten by ./generate.sh
{ stdenv, fetchurl }:
stdenv.mkDerivation {
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/
'';
}

15
pkgs/development/interpreters/python/docs/3.2-pdf-letter.nix Normal file
View File

@ -0,0 +1,15 @@
# This file was generated and will be overwritten by ./generate.sh
{ stdenv, fetchurl }:
stdenv.mkDerivation {
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/
'';
}

15
pkgs/development/interpreters/python/docs/3.2-text.nix Normal file
View File

@ -0,0 +1,15 @@
# This file was generated and will be overwritten by ./generate.sh
{ stdenv, fetchurl }:
stdenv.mkDerivation {
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/
'';
}

15
pkgs/development/interpreters/python/docs/3.3-html.nix Normal file
View File

@ -0,0 +1,15 @@
# This file was generated and will be overwritten by ./generate.sh
{ stdenv, fetchurl }:
stdenv.mkDerivation {
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/
'';
}

15
pkgs/development/interpreters/python/docs/3.3-pdf-a4.nix Normal file
View File

@ -0,0 +1,15 @@
# This file was generated and will be overwritten by ./generate.sh
{ stdenv, fetchurl }:
stdenv.mkDerivation {
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/
'';
}

15
pkgs/development/interpreters/python/docs/3.3-pdf-letter.nix Normal file
View File

@ -0,0 +1,15 @@
# This file was generated and will be overwritten by ./generate.sh
{ stdenv, fetchurl }:
stdenv.mkDerivation {
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/
'';
}

15
pkgs/development/interpreters/python/docs/3.3-text.nix Normal file
View File

@ -0,0 +1,15 @@
# This file was generated and will be overwritten by ./generate.sh
{ stdenv, fetchurl }:
stdenv.mkDerivation {
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/
'';
}

77
pkgs/development/interpreters/python/docs/default.nix Normal file
View File

@ -0,0 +1,77 @@
{ stdenv, fetchurl }:
let
pythonDocs = {
python33_html = import ./3.3-html.nix {
inherit stdenv fetchurl;
};
python33_pdf_a4 = import ./3.3-pdf-a4.nix {
inherit stdenv fetchurl;
};
python33_pdf_letter = import ./3.3-pdf-letter.nix {
inherit stdenv fetchurl;
};
python33_text = import ./3.3-text.nix {
inherit stdenv fetchurl;
};
python32_html = import ./3.2-html.nix {
inherit stdenv fetchurl;
};
python32_pdf_a4 = import ./3.2-pdf-a4.nix {
inherit stdenv fetchurl;
};
python32_pdf_letter = import ./3.2-pdf-letter.nix {
inherit stdenv fetchurl;
};
python32_text = import ./3.2-text.nix {
inherit stdenv fetchurl;
};
python31_html = import ./3.1-html.nix {
inherit stdenv fetchurl;
};
python31_pdf_a4 = import ./3.1-pdf-a4.nix {
inherit stdenv fetchurl;
};
python31_pdf_letter = import ./3.1-pdf-letter.nix {
inherit stdenv fetchurl;
};
python31_text = import ./3.1-text.nix {
inherit stdenv fetchurl;
};
python30_html = import ./3.0-html.nix {
inherit stdenv fetchurl;
};
python30_pdf_a4 = import ./3.0-pdf-a4.nix {
inherit stdenv fetchurl;
};
python30_pdf_letter = import ./3.0-pdf-letter.nix {
inherit stdenv fetchurl;
};
python30_text = import ./3.0-text.nix {
inherit stdenv fetchurl;
};
python27_html = import ./2.7-html.nix {
inherit stdenv fetchurl;
};
python27_pdf_a4 = import ./2.7-pdf-a4.nix {
inherit stdenv fetchurl;
};
python27_pdf_letter = import ./2.7-pdf-letter.nix {
inherit stdenv fetchurl;
};
python27_text = import ./2.7-text.nix {
inherit stdenv fetchurl;
};
python26_html = import ./2.6-html.nix {
inherit stdenv fetchurl;
};
python26_pdf_a4 = import ./2.6-pdf-a4.nix {
inherit stdenv fetchurl;
};
python26_pdf_letter = import ./2.6-pdf-letter.nix {
inherit stdenv fetchurl;
};
python26_text = import ./2.6-text.nix {
inherit stdenv fetchurl;
};
}; in pythonDocs

53
pkgs/development/interpreters/python/docs/generate.sh Executable file
View File

@ -0,0 +1,53 @@
#!/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 version in $VERSIONS; do
for type in $TYPES; 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}_$(echo -n ${type} |sed -e "s,-,_,g")
cat >>default.nix <<EOF
${attrname} = import ./${major}.${minor}-${type}.nix {
inherit stdenv fetchurl;
};
EOF
echo "done."
echo
done
done
echo "}; in pythonDocs" >> default.nix

15
pkgs/development/interpreters/python/docs/template.nix Normal file
View File

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

101
pkgs/development/interpreters/ruby/generated.nix
View File

@ -13,25 +13,27 @@ 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_3;
builder = g.builder_3_1_4;
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_2_4;
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_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_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;
@ -56,7 +58,7 @@ g: # Get dependencies from patched gems
rake = g.rake_10_0_3;
rb_fsevent = g.rb_fsevent_0_9_3;
rdiscount = g.rdiscount_2_0_7;
rdoc = g.rdoc_3_12_1;
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;
@ -64,7 +66,7 @@ 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;
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;
@ -80,7 +82,7 @@ g: # Get dependencies from patched gems
websocket = g.websocket_1_0_7;
xml_simple = g.xml_simple_1_1_1;
};
gem_nix_args = [ ''autotest-rails'' ''aws-sdk'' ''buildr'' ''fakes3'' ''foreman'' ''jsduck'' ''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'';
@ -231,16 +233,27 @@ rails support and extra plugins for migrations and fixtures.'';
requiredGems = [ g.ZenTest_4_9_0 ];
sha256 = ''1wkb5jayb39yx0i8ly7sibygf9f9c3w24jg2z1qgm135zlb070v4'';
};
aws_sdk_1_8_3 = {
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.3'';
name = ''aws-sdk-1.8.3.1'';
requiredGems = [ g.uuidtools_2_1_3 g.nokogiri_1_5_6 g.json_1_7_7 ];
sha256 = ''0ggvwiya4swyjyswfgwhzw09hap2slz7djp0svq22y7j0xci1axy'';
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'';
@ -274,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.'';
@ -286,9 +299,9 @@ 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_10 = {
basename = ''buildr'';
@ -303,19 +316,19 @@ for those one-off tasks, with a language that's a joy to use.
'';
};
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_2_4 ];
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_4 = {
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.4'';
name = ''bundler-1.3.0'';
requiredGems = [ ];
sha256 = ''0p90abn29wvg6ic1230f4dj7zs55r9r772b0xq02fwqd0ry3pdgl'';
sha256 = ''16ss4fh97wbg5n5l00wkinxdsj7bjgqzv9h6yhygv45wi8rbf8zp'';
};
childprocess_0_3_8 = {
basename = ''childprocess'';
@ -364,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 = {
@ -414,7 +438,7 @@ 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_4_0 = {
@ -439,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 = {
@ -518,16 +557,16 @@ For extra goodness, see: http://seattlerb.rubyforge.org/hoe/Hoe.pdf'';
requiredGems = [ ];
sha256 = ''1kgqsn0bagr41gf5kbqaxbs38a7s5bm85m0pdx4qz7d70v9nc9cl'';
};
jsduck_4_6_1 = {
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.1'';
requiredGems = [ g.rdiscount_2_0_7 g.json_1_7_7 g.parallel_0_6_2 g.therubyracer_0_10_2 ];
sha256 = ''01bws3jfsym531znwsd6qjaymf1mrsss1bj8csvj3vhnv728qbyh'';
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'';
@ -824,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_4 ];
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 = {
@ -835,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 = {
@ -892,7 +931,7 @@ request helpers feature.'';
requiredGems = [ ];
sha256 = ''1cj9dn59xqjaglvzvd1ninid62xmih74az0glqqb90n2p42s2zs1'';
};
rdoc_3_12_1 = {
rdoc_3_12_2 = {
basename = ''rdoc'';
meta = {
description = ''RDoc produces HTML and command-line documentation for Ruby projects'';
@ -903,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'';
@ -1003,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.'';
@ -1014,9 +1053,9 @@ 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_30_0 = {
basename = ''selenium_webdriver'';

57
pkgs/development/interpreters/ruby/ruby-2.0.nix Normal file
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}";
};
}

31
pkgs/development/libraries/apache-activemq/default.nix Normal file
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;
};
}

5
pkgs/development/libraries/haskell/DAV/default.nix
View File

@ -5,15 +5,14 @@
cabal.mkDerivation (self: {
pname = "DAV";
version = "0.3";
sha256 = "16qbq59g79a0a1n6vblndj1fknj9fvd0anhrsz9czwl3k3lk5cx8";
version = "0.3.1";
sha256 = "0ql6sf61gq55iyn189papnid91n4ab5s2i24zvkqrgixjz7998rd";
isLibrary = true;
isExecutable = true;
buildDepends = [
caseInsensitive cmdargs httpConduit httpTypes lens liftedBase mtl
network resourcet transformers xmlConduit xmlHamlet
];
jailbreak = true;
meta = {
homepage = "http://floss.scru.org/hDAV";
description = "RFC 4918 WebDAV support";

13
pkgs/development/libraries/haskell/Safe/default.nix
View File

@ -1,13 +0,0 @@
{ cabal }:
cabal.mkDerivation (self: {
pname = "Safe";
version = "0.1";
sha256 = "0ybi5r4635yjx41ig54bm426fbdzrivc5kn8fwqxmzm62ai0v623";
meta = {
homepage = "http://www-users.cs.york.ac.uk/~ndm/projects/libraries.php";
description = "Library for safe (pattern match free) functions";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
};
})

4
pkgs/development/libraries/haskell/basic-prelude/default.nix
View File

@ -4,8 +4,8 @@
cabal.mkDerivation (self: {
pname = "basic-prelude";
version = "0.3.2.0";
sha256 = "1sdwkh9xrsx8v96d06jll7cqc0p6ykv2y9gnjzpbfx0k3ns69kcj";
version = "0.3.3.0";
sha256 = "1b3fydswi7sj2j5d3jfynd9r5qg8pzlv1qdb9xp56ig01ig18cyv";
buildDepends = [
hashable liftedBase ReadArgs systemFilepath text transformers
unorderedContainers vector

4
pkgs/development/libraries/haskell/classy-prelude-conduit/default.nix
View File

@ -4,8 +4,8 @@
cabal.mkDerivation (self: {
pname = "classy-prelude-conduit";
version = "0.5.1";
sha256 = "1vwcxwrbnczchq2b773kjjr3ysc47widak8qj0kwi26nf3jics4k";
version = "0.5.2";
sha256 = "11krzhy78z0srjy5g6h8ssv5n3ml8ryx92x0zdjigqxw4zq9ic72";
buildDepends = [
classyPrelude conduit monadControl resourcet transformers void
xmlConduit

4
pkgs/development/libraries/haskell/classy-prelude/default.nix
View File

@ -4,8 +4,8 @@
cabal.mkDerivation (self: {
pname = "classy-prelude";
version = "0.5.1";
sha256 = "0kgnffqvh13adadp85iw4ybbs5jpa5hwrr2dsi2aj9p8lvzac1jy";
version = "0.5.2";
sha256 = "1nmhx6fs783v67b5ygdlmpxbsj41brj32i1sx9gyjyhfvr40wiw5";
buildDepends = [
basicPrelude hashable liftedBase systemFilepath text transformers
unorderedContainers vector

4
pkgs/development/libraries/haskell/cmdargs/default.nix
View File

@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "cmdargs";
version = "0.10.1";
sha256 = "0p7fzh65asn1bpzp137vfww97in2mkqfwwsk8hxzsdx32zi1nfz8";
version = "0.10.2";
sha256 = "0vn7c569akyabij2bh9myyvnx08w67dwdvx5g5q36b3ixzp0lrg4";
isLibrary = true;
isExecutable = true;
buildDepends = [ filepath transformers ];

4
pkgs/development/libraries/haskell/conduit/default.nix
View File

@ -4,8 +4,8 @@
cabal.mkDerivation (self: {
pname = "conduit";
version = "1.0.0";
sha256 = "1sx7s3awzb7y51prmmvrx9gxhd5068rbzwl719lfx3r50k94r00d";
version = "1.0.1";
sha256 = "1r3d30cap4f7qxi9v2ab5w31w9ay19z848d4l8klf1np9xs27hki";
buildDepends = [
liftedBase monadControl resourcet text transformers
transformersBase void

12
pkgs/development/libraries/haskell/digestive-functors-heist/default.nix
View File

@ -1,11 +1,13 @@
{ cabal, digestiveFunctors, heist, mtl, text, xmlhtml }:
{ cabal, blazeBuilder, digestiveFunctors, heist, mtl, text, xmlhtml
}:
cabal.mkDerivation (self: {
pname = "digestive-functors-heist";
version = "0.6.0.0";
sha256 = "17qndqsk09fvnvyhhw3xbbjjhfyyp4sivc898vqllyyky0wqmrdk";
buildDepends = [ digestiveFunctors heist mtl text xmlhtml ];
jailbreak = true;
version = "0.6.1.0";
sha256 = "08h883731cb5kqsv33f6dpf2lgh1r6qn9maqjkn5766vqf7m28nx";
buildDepends = [
blazeBuilder digestiveFunctors heist mtl text xmlhtml
];
meta = {
homepage = "http://github.com/jaspervdj/digestive-functors";
description = "Heist frontend for the digestive-functors library";

10
pkgs/development/libraries/haskell/ghc-mod/default.nix
View File

@ -1,17 +1,21 @@
{ cabal, Cabal, convertible, emacs, filepath, ghcPaths, ghcSybUtils
, hlint, ioChoice, regexPosix, syb, time, transformers
, hlint, hspec, ioChoice, regexPosix, syb, time, transformers
}:
cabal.mkDerivation (self: {
pname = "ghc-mod";
version = "1.11.4";
sha256 = "1bxmpvad415ayzwyijjm0zsck0z8aa1nfjixwb6l80i6lbxi4rfg";
version = "1.11.5";
sha256 = "0lcq4ffmv017pdy58p91qn5d4hmcxcqzk8dvnmh7m4m7saslqivp";
isLibrary = false;
isExecutable = true;
buildDepends = [
Cabal convertible filepath ghcPaths ghcSybUtils hlint ioChoice
regexPosix syb time transformers
];
testDepends = [
Cabal convertible filepath ghcPaths ghcSybUtils hlint hspec
ioChoice regexPosix syb time transformers
];
buildTools = [ emacs ];
postInstall = ''
cd $out/share/$pname-$version

20
pkgs/development/libraries/haskell/github/default.nix Normal file
View File

@ -0,0 +1,20 @@
{ cabal, aeson, attoparsec, caseInsensitive, conduit, dataDefault
, failure, HTTP, httpConduit, httpTypes, network, text, time
, unorderedContainers, vector
}:
cabal.mkDerivation (self: {
pname = "github";
version = "0.5.0";
sha256 = "1zq9cwvpd6s8xd1ki2ifsj79vd4rm8vab9731f2p8zdm8g7mh5gd";
buildDepends = [
aeson attoparsec caseInsensitive conduit dataDefault failure HTTP
httpConduit httpTypes network text time unorderedContainers vector
];
meta = {
homepage = "https://github.com/mike-burns/github";
description = "Access to the Github API, v3";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
};
})

5
pkgs/development/libraries/haskell/heist/default.nix
View File

@ -5,14 +5,13 @@
cabal.mkDerivation (self: {
pname = "heist";
version = "0.11.0.1";
sha256 = "0d5nn0kfs7hbgs4b77i8c8pq2q5hldqk08dacva7xlxvjrlxsyn6";
version = "0.11.1";
sha256 = "17d6jycgxx5fz8sd3wnln53im29vz8l9847qsqbpyx8adrcg7rjh";
buildDepends = [
aeson attoparsec blazeBuilder blazeHtml directoryTree dlist errors
filepath hashable MonadCatchIOTransformers mtl random text time
unorderedContainers vector xmlhtml
];
jailbreak = true;
meta = {
homepage = "http://snapframework.com/";
description = "An Haskell template system supporting both HTML5 and XML";

34
pkgs/development/libraries/haskell/http-conduit/default.nix
View File

@ -1,29 +1,29 @@
{ cabal, asn1Data, attoparsec, attoparsecConduit, base64Bytestring
, blazeBuilder, blazeBuilderConduit, caseInsensitive, certificate
, conduit, cookie, cprngAes, dataDefault, deepseq, failure
, filepath, hspec, httpTypes, HUnit, liftedBase, mimeTypes
, monadControl, mtl, network, networkConduit, random, regexCompat
{ cabal, asn1Data, base64Bytestring, blazeBuilder
, blazeBuilderConduit, caseInsensitive, certificate, conduit
, cookie, cprngAes, dataDefault, deepseq, failure, filepath, hspec
, httpTypes, HUnit, liftedBase, mimeTypes, monadControl, mtl
, network, networkConduit, publicsuffixlist, random, regexCompat
, resourcet, socks, text, time, tls, tlsExtra, transformers
, transformersBase, utf8String, void, wai, warp, zlibConduit
}:
cabal.mkDerivation (self: {
pname = "http-conduit";
version = "1.8.9";
sha256 = "0v99nc29h4qm1dbs7bwk4nwhxwk22vzl4ghrq9r3vishi6gwr7hb";
version = "1.9.0";
sha256 = "1b6f2sg96fddk5ywbfvbvj9z81695d35qymf31idpkyshcp9argk";
buildDepends = [
asn1Data attoparsec attoparsecConduit base64Bytestring blazeBuilder
blazeBuilderConduit caseInsensitive certificate conduit cookie
cprngAes dataDefault deepseq failure filepath httpTypes liftedBase
mimeTypes monadControl mtl network random regexCompat resourcet
socks text time tls tlsExtra transformers transformersBase
utf8String void zlibConduit
asn1Data base64Bytestring blazeBuilder blazeBuilderConduit
caseInsensitive certificate conduit cookie cprngAes dataDefault
deepseq failure filepath httpTypes liftedBase mimeTypes
monadControl mtl network publicsuffixlist random regexCompat
resourcet socks text time tls tlsExtra transformers
transformersBase utf8String void zlibConduit
];
testDepends = [
asn1Data attoparsec attoparsecConduit base64Bytestring blazeBuilder
blazeBuilderConduit caseInsensitive certificate conduit cookie
cprngAes dataDefault deepseq failure filepath hspec httpTypes HUnit
liftedBase mimeTypes monadControl mtl network networkConduit random
asn1Data base64Bytestring blazeBuilder blazeBuilderConduit
caseInsensitive certificate conduit cookie cprngAes dataDefault
deepseq failure filepath hspec httpTypes HUnit liftedBase mimeTypes
monadControl mtl network networkConduit publicsuffixlist random
regexCompat resourcet socks text time tls tlsExtra transformers
transformersBase utf8String void wai warp zlibConduit
];

8
pkgs/development/libraries/haskell/iproute/default.nix
View File

@ -1,14 +1,14 @@
{ cabal, appar, byteorder, doctest, hspec, network, QuickCheck
, Safe
, safe
}:
cabal.mkDerivation (self: {
pname = "iproute";
version = "1.2.10";
sha256 = "1ni91llvq1mfdsjmw1laqhk964y4vlpyk5s25j8klsfn27mq6c68";
version = "1.2.11";
sha256 = "14f96sb41f5m14186900rz84vwv7idjiylp8m5nsm6gganvh4sh4";
buildDepends = [ appar byteorder network ];
testDepends = [
appar byteorder doctest hspec network QuickCheck Safe
appar byteorder doctest hspec network QuickCheck safe
];
meta = {
homepage = "http://www.mew.org/~kazu/proj/iproute/";

4
pkgs/development/libraries/haskell/persistent-sqlite/default.nix
View File

@ -4,8 +4,8 @@
cabal.mkDerivation (self: {
pname = "persistent-sqlite";
version = "1.1.4";
sha256 = "1xllj5bq7rw9v32ddm515705nviarw0hp4yxj0z8jf5q5jdz2vz0";
version = "1.1.4.1";
sha256 = "0rhvbbzlzgzx4na7ffa2jx2zinzbb6b1jxf8964hcxx7iyzcycjj";
buildDepends = [
aeson conduit monadControl monadLogger persistent text transformers
];

5
pkgs/development/libraries/haskell/testpack/default.nix
View File

@ -2,10 +2,11 @@
cabal.mkDerivation (self: {
pname = "testpack";
version = "2.1.2";
sha256 = "12dhl8svy0wmdwlvkp0p0j6wr6vgv4hrjcpdv48kc5rcwjvh8xif";
version = "2.1.2.1";
sha256 = "1fm4dy9vs2whc48cr00ncqqzz6r5yp7bvgil86idbbgi8igld5j0";
buildDepends = [ HUnit mtl QuickCheck random ];
patches = [ ./support-recent-quickcheck.patch ];
jailbreak = true;
meta = {
homepage = "http://hackage.haskell.org/cgi-bin/hackage-scripts/package/testpack";
description = "Test Utililty Pack for HUnit and QuickCheck";

4
pkgs/development/libraries/haskell/time-compat/default.nix
View File

@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "time-compat";
version = "0.1.0.2";
sha256 = "0687bxkvqs22p7skqb8n289k9nv7cafg8jyx32sswn2h11m7dihb";
version = "0.1.0.3";
sha256 = "0zqgzr8yjn36rn6gflwh5s0c92vl44xzxiw0jz8d5h0h8lhi21sr";
buildDepends = [ time ];
meta = {
homepage = "http://hub.darcs.net/dag/time-compat";

14
pkgs/development/libraries/haskell/wl-pprint-extras/default.nix Normal file
View File

@ -0,0 +1,14 @@
{ cabal, nats, semigroupoids, semigroups, utf8String }:
cabal.mkDerivation (self: {
pname = "wl-pprint-extras";
version = "3.3";
sha256 = "1q3wiw62k53yl9ny9l54b281zprrnshw94pd52rlcxbw9cgj8xzx";
buildDepends = [ nats semigroupoids semigroups utf8String ];
meta = {
homepage = "http://github.com/ekmett/wl-pprint-extras/";
description = "A free monad based on the Wadler/Leijen pretty printer";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
};
})

17
pkgs/development/libraries/haskell/wl-pprint-terminfo/default.nix Normal file
View File

@ -0,0 +1,17 @@
{ cabal, nats, semigroups, terminfo, transformers, wlPprintExtras
}:
cabal.mkDerivation (self: {
pname = "wl-pprint-terminfo";
version = "3.4";
sha256 = "1wnlm74fwcn171a533bv15bvlhabrzh192wabala0wyvwgl8hwzk";
buildDepends = [
nats semigroups terminfo transformers wlPprintExtras
];
meta = {
homepage = "http://github.com/ekmett/wl-pprint-terminfo/";
description = "A color pretty printer with terminfo support";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
};
})

12
pkgs/development/libraries/haskell/wl-pprint/default.nix Normal file
View File

@ -0,0 +1,12 @@
{ cabal }:
cabal.mkDerivation (self: {
pname = "wl-pprint";
version = "1.1";
sha256 = "16kp3fkh0x9kgzk6fdqrm8m0v7b5cgbv0m3x63ybbp5vxbhand06";
meta = {
description = "The Wadler/Leijen Pretty Printer";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
};
})

4
pkgs/development/libraries/haskell/yesod-test/default.nix
View File

@ -6,8 +6,8 @@
cabal.mkDerivation (self: {
pname = "yesod-test";
version = "0.3.3.2";
sha256 = "0skr710fqqnna17gywaj30kpj352px2d17fwwqb832j7mj92bmv5";
version = "0.3.4";
sha256 = "18sz1blnrgijcq6psqk2b5zxbizpgam1cy1vcxc4nrfryfscr42b";
buildDepends = [
attoparsec blazeBuilder blazeHtml blazeMarkup caseInsensitive
cookie hspec htmlConduit httpTypes HUnit monadControl network

4
pkgs/development/libraries/haskell/yesod/default.nix
View File

@ -12,8 +12,8 @@
cabal.mkDerivation (self: {
pname = "yesod";
version = "1.1.9";
sha256 = "0fcvf0bg7dsrka639q20dncinqq0fdv21zyvwpx63qfcmilhmjlm";
version = "1.1.9.1";
sha256 = "0kysj3akf2pvhsiy6f8yfs41mrya86b8ddskqzzibjmdyipiqksj";
isLibrary = true;
isExecutable = true;
buildDepends = [

14
pkgs/development/libraries/haskell/zlib/0.5.4.1.nix Normal file
View File

@ -0,0 +1,14 @@
{ cabal, zlib }:
cabal.mkDerivation (self: {
pname = "zlib";
version = "0.5.4.1";
sha256 = "0l550l2qw4gx530h1yjjpdh6rkm59l9l6jbmlm0vx41cqpj6b8yc";
extraLibraries = [ zlib ];
meta = {
description = "Compression and decompression in the gzip and zlib formats";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
maintainers = [ self.stdenv.lib.maintainers.andres ];
};
})

9
pkgs/development/libraries/libmcrypt/default.nix
View File

@ -1,4 +1,6 @@
{ stdenv, fetchurl }:
{ stdenv, fetchurl, disablePosixThreads ? false }:
with stdenv.lib;
stdenv.mkDerivation rec {
name = "libmcrypt-2.5.8";
@ -10,7 +12,12 @@ stdenv.mkDerivation rec {
buildInputs = [];
configureFlags = optional disablePosixThreads
[ "--disable-posix-threads" ];
meta = {
description = "MCrypt is a replacement for the old crypt() package and crypt(1) command, with extensions.";
homepage = http://mcrypt.sourceforge.net;
license = "GPL";
};
}

16
pkgs/development/libraries/libsoup/default.nix
View File

@ -1,29 +1,23 @@
{ stdenv, fetchurl, glib, libxml2, pkgconfig, intltool, python
{ stdenv, fetchurl, glib, libxml2, pkgconfig
, gnomeSupport ? true, libgnome_keyring, sqlite, glib_networking }:
stdenv.mkDerivation {
name = "libsoup-2.40.3";
name = "libsoup-2.38.1";
src = fetchurl {
url = mirror://gnome/sources/libsoup/2.40/libsoup-2.40.3.tar.xz;
sha256 = "82c92f1f6f4cbfd501df783ed87e7de9410b4a12a3bb0b19c64722e185d2bbc9";
url = mirror://gnome/sources/libsoup/2.38/libsoup-2.38.1.tar.xz;
sha256 = "16iza4y8pmc4sn90iid88fgminvgcqypy3s2qnmzkzm5qwzr5f3i";
};
nativeBuildInputs = [ pkgconfig intltool python ];
nativeBuildInputs = [ pkgconfig ];
propagatedBuildInputs = [ glib libxml2 ]
++ stdenv.lib.optionals gnomeSupport [ libgnome_keyring sqlite ];
passthru.propagatedUserEnvPackages = [ glib_networking ];
# glib_networking is a runtime dependency, not a compile-time dependency
configureFlags = "--disable-tls-check";
preConfigure = ''
substituteInPlace libsoup/tld-parser.py \
--replace "/usr/bin/env python" ${python}/bin/python
'';
meta = {
inherit (glib.meta) maintainers platforms;
};

24
pkgs/development/libraries/nss/default.nix
View File

@ -22,11 +22,11 @@ let
in stdenv.mkDerivation rec {
name = "nss-${version}";
version = "3.14";
version = "3.14.3";
src = fetchurl {
url = "http://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_3_14_RTM/src/${name}.tar.gz";
sha1 = "ace3642fb2ca67854ea7075d053ca01a6d81e616";
url = "http://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_3_14_3_RTM/src/${name}.tar.gz";
sha1 = "94d8781d1fa29cfbd37453dda3e9488709b82c4c";
};
buildInputs = [ nspr perl zlib sqlite ];
@ -38,14 +38,28 @@ in stdenv.mkDerivation rec {
'';
patches = [
./nss-3.12.5-gentoo-fixups.diff
./nss-3.14.1-gentoo-fixups-r1.patch
secLoadPatch
./nix_secload_fixup.patch
./sync-up-with-upstream-softokn-changes.patch
];
postPatch = ''
sed -i -e 's/^DIRS.*$/& pem/' mozilla/security/nss/lib/ckfw/manifest.mn
sed -i -e "/^PREFIX =/s:= /usr:= $out:" mozilla/security/nss/config/Makefile
# Fix up the patch from Gentoo
sed -i \
-e "/^PREFIX =/s|= /usr|= $out|" \
-e '/@libdir@/s|gentoo/nss|lib|' \
-e '/ln -sf/d' \
mozilla/security/nss/config/Makefile
# Note for spacing/tab nazis: The TAB characters are intentional!
cat >> mozilla/security/nss/config/Makefile <<INSTALL_TARGET
install:
mkdir -p \$(DIST)/lib/pkgconfig
cp nss.pc \$(DIST)/lib/pkgconfig
INSTALL_TARGET
'';
preConfigure = "cd mozilla/security/nss";

62
pkgs/development/libraries/nss/nss-3.12.5-gentoo-fixups.diff → pkgs/development/libraries/nss/nss-3.14.1-gentoo-fixups-r1.patch
View File

@ -1,7 +1,7 @@
diff -urN nss-3.12.5-orig/mozilla/security/nss/config/Makefile nss-3.12.5/mozilla/security/nss/config/Makefile
--- nss-3.12.5-orig/mozilla/security/nss/config/Makefile 1969-12-31 18:00:00.000000000 -0600
+++ nss-3.12.5/mozilla/security/nss/config/Makefile 2009-09-14 21:45:45.619639265 -0500
@@ -0,0 +1,42 @@
diff -urN a/mozilla/security/nss/config/Makefile b/mozilla/security/nss/config/Makefile
--- a/mozilla/security/nss/config/Makefile 1969-12-31 18:00:00.000000000 -0600
+++ b/mozilla/security/nss/config/Makefile 2012-12-15 07:27:20.650148987 -0600
@@ -0,0 +1,40 @@
+CORE_DEPTH = ../..
+DEPTH = ../..
+
@ -16,15 +16,17 @@ diff -urN nss-3.12.5-orig/mozilla/security/nss/config/Makefile nss-3.12.5/mozill
+
+export:
+ # Create the nss.pc file
+ mkdir -p $(DIST)/lib/pkgconfig
+ sed -e "s,@prefix@,$(PREFIX)," \
+ -e "s,@exec_prefix@,\$${prefix}," \
+ -e "s,@libdir@,\$${prefix}/lib," \
+ -e "s,@libdir@,\$${prefix}/gentoo/nss," \
+ -e "s,@includedir@,\$${prefix}/include/nss," \
+ -e "s,@NSS_MAJOR_VERSION@,$(NSS_MAJOR_VERSION),g" \
+ -e "s,@NSS_MINOR_VERSION@,$(NSS_MINOR_VERSION)," \
+ -e "s,@NSS_PATCH_VERSION@,$(NSS_PATCH_VERSION)," \
+ nss.pc.in > nss.pc
+ chmod 0644 nss.pc
+ ln -sf ../../../../../security/nss/config/nss.pc $(DIST)/lib/pkgconfig
+
+ # Create the nss-config script
+ mkdir -p $(DIST)/bin
@ -34,19 +36,15 @@ diff -urN nss-3.12.5-orig/mozilla/security/nss/config/Makefile nss-3.12.5/mozill
+ -e "s,@NSS_PATCH_VERSION@,$(NSS_PATCH_VERSION)," \
+ nss-config.in > nss-config
+ chmod 0755 nss-config
+ # ln -sf ../../../../security/nss/config/nss-config $(DIST)/bin
+ ln -sf ../../../../security/nss/config/nss-config $(DIST)/bin
+
+libs:
+
+dummy: all export libs
+
+install:
+ mkdir -p $(DIST)/lib/pkgconfig
+ cp nss.pc $(DIST)/lib/pkgconfig
+
diff -urN nss-3.12.5-orig/mozilla/security/nss/config/nss-config.in nss-3.12.5/mozilla/security/nss/config/nss-config.in
--- nss-3.12.5-orig/mozilla/security/nss/config/nss-config.in 1969-12-31 18:00:00.000000000 -0600
+++ nss-3.12.5/mozilla/security/nss/config/nss-config.in 2009-09-14 21:47:45.190638078 -0500
diff -urN a/mozilla/security/nss/config/nss-config.in b/mozilla/security/nss/config/nss-config.in
--- a/mozilla/security/nss/config/nss-config.in 1969-12-31 18:00:00.000000000 -0600
+++ b/mozilla/security/nss/config/nss-config.in 2012-12-15 07:27:20.651148959 -0600
@@ -0,0 +1,145 @@
+#!/bin/sh
+
@ -177,7 +175,7 @@ diff -urN nss-3.12.5-orig/mozilla/security/nss/config/nss-config.in nss-3.12.5/m
+fi
+
+if test "$echo_libs" = "yes"; then
+ libdirs="-Wl,-R$libdir -L$libdir"
+ libdirs=""
+ if test -n "$lib_ssl"; then
+ libdirs="$libdirs -lssl${major_version}"
+ fi
@ -193,9 +191,9 @@ diff -urN nss-3.12.5-orig/mozilla/security/nss/config/nss-config.in nss-3.12.5/m
+ echo $libdirs
+fi
+
diff -urN nss-3.12.5-orig/mozilla/security/nss/config/nss.pc.in nss-3.12.5/mozilla/security/nss/config/nss.pc.in
--- nss-3.12.5-orig/mozilla/security/nss/config/nss.pc.in 1969-12-31 18:00:00.000000000 -0600
+++ nss-3.12.5/mozilla/security/nss/config/nss.pc.in 2009-09-14 21:45:45.653637310 -0500
diff -urN a/mozilla/security/nss/config/nss.pc.in b/mozilla/security/nss/config/nss.pc.in
--- a/mozilla/security/nss/config/nss.pc.in 1969-12-31 18:00:00.000000000 -0600
+++ b/mozilla/security/nss/config/nss.pc.in 2012-12-15 07:27:20.651148959 -0600
@@ -0,0 +1,12 @@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
@ -206,13 +204,13 @@ diff -urN nss-3.12.5-orig/mozilla/security/nss/config/nss.pc.in nss-3.12.5/mozil
+Description: Network Security Services
+Version: @NSS_MAJOR_VERSION@.@NSS_MINOR_VERSION@.@NSS_PATCH_VERSION@
+Requires: nspr >= 4.8
+Libs: -L${libdir} -lssl3 -lsmime3 -lnssutil3 -lnss3 -Wl,-R${libdir}
+Libs: -lssl3 -lsmime3 -lnss3 -lnssutil3
+Cflags: -I${includedir}
+
diff -urN nss-3.12.5-orig/mozilla/security/nss/Makefile nss-3.12.5/mozilla/security/nss/Makefile
--- nss-3.12.5-orig/mozilla/security/nss/Makefile 2008-12-02 17:24:39.000000000 -0600
+++ nss-3.12.5/mozilla/security/nss/Makefile 2009-09-14 21:45:45.678657145 -0500
@@ -78,7 +78,7 @@
diff -urN a/mozilla/security/nss/Makefile b/mozilla/security/nss/Makefile
--- a/mozilla/security/nss/Makefile 2012-11-13 19:14:07.000000000 -0600
+++ b/mozilla/security/nss/Makefile 2012-12-15 07:27:57.235162137 -0600
@@ -44,7 +44,7 @@
# (7) Execute "local" rules. (OPTIONAL). #
#######################################################################
@ -221,27 +219,25 @@ diff -urN nss-3.12.5-orig/mozilla/security/nss/Makefile nss-3.12.5/mozilla/secur
nss_clean_all: clobber_coreconf clobber_nspr clobber_dbm clobber
@@ -140,12 +140,6 @@
@@ -106,12 +106,6 @@
--with-dist-prefix='$(NSPR_PREFIX)' \
--with-dist-includedir='$(NSPR_PREFIX)/include'
-build_nspr: $(NSPR_CONFIG_STATUS)
- cd $(CORE_DEPTH)/../nsprpub/$(OBJDIR_NAME) ; $(MAKE)
- $(MAKE) -C $(CORE_DEPTH)/../nsprpub/$(OBJDIR_NAME)
-
-clobber_nspr: $(NSPR_CONFIG_STATUS)
- cd $(CORE_DEPTH)/../nsprpub/$(OBJDIR_NAME) ; $(MAKE) clobber
- $(MAKE) -C $(CORE_DEPTH)/../nsprpub/$(OBJDIR_NAME) clobber
-
build_dbm:
ifndef NSS_DISABLE_DBM
cd $(CORE_DEPTH)/dbm ; $(MAKE) export libs
diff -urN nss-3.12.5-orig/mozilla/security/nss/manifest.mn nss-3.12.5/mozilla/security/nss/manifest.mn
--- nss-3.12.5-orig/mozilla/security/nss/manifest.mn 2008-04-04 15:36:59.000000000 -0500
+++ nss-3.12.5/mozilla/security/nss/manifest.mn 2009-09-14 21:45:45.703656167 -0500
@@ -42,6 +42,6 @@
ifdef NSS_DISABLE_DBM
@echo "skipping the build of DBM"
diff -urN a/mozilla/security/nss/manifest.mn b/mozilla/security/nss/manifest.mn
--- a/mozilla/security/nss/manifest.mn 2012-03-20 09:46:49.000000000 -0500
+++ b/mozilla/security/nss/manifest.mn 2012-12-15 07:27:20.652148933 -0600
@@ -10,6 +10,6 @@
RELEASE = nss
-DIRS = lib cmd
+DIRS = lib cmd config

406
pkgs/development/libraries/nss/sync-up-with-upstream-softokn-changes.patch Normal file
View File

@ -0,0 +1,406 @@
From d6dbecfea317a468be12423595e584f43d84d8ec Mon Sep 17 00:00:00 2001
From: Elio Maldonado <emaldona@redhat.com>
Date: Sat, 9 Feb 2013 17:11:00 -0500
Subject: [PATCH] Sync up with upstream softokn changes
- Disable RSA OEP case in FormatBlock, RSA_OAEP support is experimental and in a state of flux
- Numerous change upstream due to the work for TLS/DTLS 'Lucky 13' vulnerability CVE-2013-0169
- It now compiles with the NSS_3_14_3_BETA1 source
---
mozilla/security/nss/lib/ckfw/pem/rsawrapr.c | 338 +++++++-------------------
1 files changed, 82 insertions(+), 256 deletions(-)
diff --git a/mozilla/security/nss/lib/ckfw/pem/rsawrapr.c b/mozilla/security/nss/lib/ckfw/pem/rsawrapr.c
index 5ac4f39..3780d30 100644
--- a/mozilla/security/nss/lib/ckfw/pem/rsawrapr.c
+++ b/mozilla/security/nss/lib/ckfw/pem/rsawrapr.c
@@ -46,6 +46,7 @@
#include "sechash.h"
#include "base.h"
+#include "lowkeyi.h"
#include "secerr.h"
#define RSA_BLOCK_MIN_PAD_LEN 8
@@ -54,9 +55,8 @@
#define RSA_BLOCK_PRIVATE_PAD_OCTET 0xff
#define RSA_BLOCK_AFTER_PAD_OCTET 0x00
-#define OAEP_SALT_LEN 8
-#define OAEP_PAD_LEN 8
-#define OAEP_PAD_OCTET 0x00
+/* Needed for RSA-PSS functions */
+static const unsigned char eightZeros[] = { 0, 0, 0, 0, 0, 0, 0, 0 };
#define FLAT_BUFSIZE 512 /* bytes to hold flattened SHA1Context. */
@@ -78,127 +78,39 @@ pem_PublicModulusLen(NSSLOWKEYPublicKey *pubk)
return 0;
}
-static SHA1Context *SHA1_CloneContext(SHA1Context * original)
-{
- SHA1Context *clone = NULL;
- unsigned char *pBuf;
- int sha1ContextSize = SHA1_FlattenSize(original);
- SECStatus frv;
- unsigned char buf[FLAT_BUFSIZE];
-
- PORT_Assert(sizeof buf >= sha1ContextSize);
- if (sizeof buf >= sha1ContextSize) {
- pBuf = buf;
- } else {
- pBuf = nss_ZAlloc(NULL, sha1ContextSize);
- if (!pBuf)
- goto done;
- }
-
- frv = SHA1_Flatten(original, pBuf);
- if (frv == SECSuccess) {
- clone = SHA1_Resurrect(pBuf, NULL);
- memset(pBuf, 0, sha1ContextSize);
- }
- done:
- if (pBuf != buf)
- nss_ZFreeIf(pBuf);
- return clone;
+/* Constant time comparison of a single byte.
+ * Returns 1 iff a == b, otherwise returns 0.
+ * Note: For ranges of bytes, use constantTimeCompare.
+ */
+static unsigned char constantTimeEQ8(unsigned char a, unsigned char b) {
+ unsigned char c = ~(a - b | b - a);
+ c >>= 7;
+ return c;
}
-/*
- * Modify data by XORing it with a special hash of salt.
+/* Constant time comparison of a range of bytes.
+ * Returns 1 iff len bytes of a are identical to len bytes of b, otherwise
+ * returns 0.
*/
-static SECStatus
-oaep_xor_with_h1(unsigned char *data, unsigned int datalen,
- unsigned char *salt, unsigned int saltlen)
-{
- SHA1Context *sha1cx;
- unsigned char *dp, *dataend;
- unsigned char end_octet;
-
- sha1cx = SHA1_NewContext();
- if (sha1cx == NULL) {
- return SECFailure;
- }
-
- /*
- * Get a hash of salt started; we will use it several times,
- * adding in a different end octet (x00, x01, x02, ...).
- */
- SHA1_Begin(sha1cx);
- SHA1_Update(sha1cx, salt, saltlen);
- end_octet = 0;
-
- dp = data;
- dataend = data + datalen;
-
- while (dp < dataend) {
- SHA1Context *sha1cx_h1;
- unsigned int sha1len, sha1off;
- unsigned char sha1[SHA1_LENGTH];
-
- /*
- * Create hash of (salt || end_octet)
- */
- sha1cx_h1 = SHA1_CloneContext(sha1cx);
- SHA1_Update(sha1cx_h1, &end_octet, 1);
- SHA1_End(sha1cx_h1, sha1, &sha1len, sizeof(sha1));
- SHA1_DestroyContext(sha1cx_h1, PR_TRUE);
- PORT_Assert(sha1len == SHA1_LENGTH);
-
- /*
- * XOR that hash with the data.
- * When we have fewer than SHA1_LENGTH octets of data
- * left to xor, use just the low-order ones of the hash.
- */
- sha1off = 0;
- if ((dataend - dp) < SHA1_LENGTH)
- sha1off = SHA1_LENGTH - (dataend - dp);
- while (sha1off < SHA1_LENGTH)
- *dp++ ^= sha1[sha1off++];
-
- /*
- * Bump for next hash chunk.
- */
- end_octet++;
- }
-
- SHA1_DestroyContext(sha1cx, PR_TRUE);
- return SECSuccess;
+static unsigned char constantTimeCompare(const unsigned char *a,
+ const unsigned char *b,
+ unsigned int len) {
+ unsigned char tmp = 0;
+ unsigned int i;
+ for (i = 0; i < len; ++i, ++a, ++b)
+ tmp |= *a ^ *b;
+ return constantTimeEQ8(0x00, tmp);
}
-/*
- * Modify salt by XORing it with a special hash of data.
+/* Constant time conditional.
+ * Returns a if c is 1, or b if c is 0. The result is undefined if c is
+ * not 0 or 1.
*/
-static SECStatus
-oaep_xor_with_h2(unsigned char *salt, unsigned int saltlen,
- unsigned char *data, unsigned int datalen)
+static unsigned int constantTimeCondition(unsigned int c,
+ unsigned int a,
+ unsigned int b)
{
- unsigned char sha1[SHA1_LENGTH];
- unsigned char *psalt, *psha1, *saltend;
- SECStatus rv;
-
- /*
- * Create a hash of data.
- */
- rv = SHA1_HashBuf(sha1, data, datalen);
- if (rv != SECSuccess) {
- return rv;
- }
-
- /*
- * XOR the low-order octets of that hash with salt.
- */
- PORT_Assert(saltlen <= SHA1_LENGTH);
- saltend = salt + saltlen;
- psalt = salt;
- psha1 = sha1 + SHA1_LENGTH - saltlen;
- while (psalt < saltend) {
- *psalt++ ^= *psha1++;
- }
-
- return SECSuccess;
+ return (~(c - 1) & a) | ((c - 1) & b);
}
/*
@@ -212,7 +124,7 @@ static unsigned char *rsa_FormatOneBlock(unsigned modulusLen,
unsigned char *block;
unsigned char *bp;
int padLen;
- int i;
+ int i, j;
SECStatus rv;
block = (unsigned char *) nss_ZAlloc(NULL, modulusLen);
@@ -260,124 +172,58 @@ static unsigned char *rsa_FormatOneBlock(unsigned modulusLen,
*/
case RSA_BlockPublic:
- /*
- * 0x00 || BT || Pad || 0x00 || ActualData
- * 1 1 padLen 1 data->len
- * Pad is all non-zero random bytes.
- */
- padLen = modulusLen - data->len - 3;
- PORT_Assert(padLen >= RSA_BLOCK_MIN_PAD_LEN);
- if (padLen < RSA_BLOCK_MIN_PAD_LEN) {
- nss_ZFreeIf(block);
- return NULL;
- }
- for (i = 0; i < padLen; i++) {
- /* Pad with non-zero random data. */
- do {
- rv = RNG_GenerateGlobalRandomBytes(bp + i, 1);
- } while (rv == SECSuccess
- && bp[i] == RSA_BLOCK_AFTER_PAD_OCTET);
- if (rv != SECSuccess) {
- nss_ZFreeIf(block);
- return NULL;
- }
- }
- bp += padLen;
- *bp++ = RSA_BLOCK_AFTER_PAD_OCTET;
- nsslibc_memcpy(bp, data->data, data->len);
-
- break;
-
- /*
- * Blocks intended for public-key operation, using
- * Optimal Asymmetric Encryption Padding (OAEP).
- */
- case RSA_BlockOAEP:
- /*
- * 0x00 || BT || Modified2(Salt) || Modified1(PaddedData)
- * 1 1 OAEP_SALT_LEN OAEP_PAD_LEN + data->len [+ N]
- *
- * where:
- * PaddedData is "Pad1 || ActualData [|| Pad2]"
- * Salt is random data.
- * Pad1 is all zeros.
- * Pad2, if present, is random data.
- * (The "modified" fields are all the same length as the original
- * unmodified values; they are just xor'd with other values.)
- *
- * Modified1 is an XOR of PaddedData with a special octet
- * string constructed of iterated hashing of Salt (see below).
- * Modified2 is an XOR of Salt with the low-order octets of
- * the hash of Modified1 (see farther below ;-).
- *
- * Whew!
- */
-
-
- /*
- * Salt
- */
- rv = RNG_GenerateGlobalRandomBytes(bp, OAEP_SALT_LEN);
- if (rv != SECSuccess) {
- nss_ZFreeIf(block);
- return NULL;
- }
- bp += OAEP_SALT_LEN;
-
- /*
- * Pad1
- */
- nsslibc_memset(bp, OAEP_PAD_OCTET, OAEP_PAD_LEN);
- bp += OAEP_PAD_LEN;
-
- /*
- * Data
- */
- nsslibc_memcpy(bp, data->data, data->len);
- bp += data->len;
-
- /*
- * Pad2
- */
- if (bp < (block + modulusLen)) {
- rv = RNG_GenerateGlobalRandomBytes(bp,
- block - bp + modulusLen);
- if (rv != SECSuccess) {
- nss_ZFreeIf(block);
- return NULL;
- }
- }
-
- /*
- * Now we have the following:
- * 0x00 || BT || Salt || PaddedData
- * (From this point on, "Pad1 || Data [|| Pad2]" is treated
- * as the one entity PaddedData.)
- *
- * We need to turn PaddedData into Modified1.
- */
- if (oaep_xor_with_h1(block + 2 + OAEP_SALT_LEN,
- modulusLen - 2 - OAEP_SALT_LEN,
- block + 2, OAEP_SALT_LEN) != SECSuccess) {
- nss_ZFreeIf(block);
- return NULL;
- }
-
- /*
- * Now we have:
- * 0x00 || BT || Salt || Modified1(PaddedData)
- *
- * The remaining task is to turn Salt into Modified2.
- */
- if (oaep_xor_with_h2(block + 2, OAEP_SALT_LEN,
- block + 2 + OAEP_SALT_LEN,
- modulusLen - 2 - OAEP_SALT_LEN) !=
- SECSuccess) {
- nss_ZFreeIf(block);
- return NULL;
- }
-
- break;
+ /*
+ * 0x00 || BT || Pad || 0x00 || ActualData
+ * 1 1 padLen 1 data->len
+ * Pad is all non-zero random bytes.
+ *
+ * Build the block left to right.
+ * Fill the entire block from Pad to the end with random bytes.
+ * Use the bytes after Pad as a supply of extra random bytes from
+ * which to find replacements for the zero bytes in Pad.
+ * If we need more than that, refill the bytes after Pad with
+ * new random bytes as necessary.
+ */
+ padLen = modulusLen - (data->len + 3);
+ PORT_Assert (padLen >= RSA_BLOCK_MIN_PAD_LEN);
+ if (padLen < RSA_BLOCK_MIN_PAD_LEN) {
+ nss_ZFreeIf (block);
+ return NULL;
+ }
+ j = modulusLen - 2;
+ rv = RNG_GenerateGlobalRandomBytes(bp, j);
+ if (rv == SECSuccess) {
+ for (i = 0; i < padLen; ) {
+ unsigned char repl;
+ /* Pad with non-zero random data. */
+ if (bp[i] != RSA_BLOCK_AFTER_PAD_OCTET) {
+ ++i;
+ continue;
+ }
+ if (j <= padLen) {
+ rv = RNG_GenerateGlobalRandomBytes(bp + padLen,
+ modulusLen - (2 + padLen));
+ if (rv != SECSuccess)
+ break;
+ j = modulusLen - 2;
+ }
+ do {
+ repl = bp[--j];
+ } while (repl == RSA_BLOCK_AFTER_PAD_OCTET && j > padLen);
+ if (repl != RSA_BLOCK_AFTER_PAD_OCTET) {
+ bp[i++] = repl;
+ }
+ }
+ }
+ if (rv != SECSuccess) {
+ /*sftk_fatalError = PR_TRUE;*/
+ nss_ZFreeIf (block);
+ return NULL;
+ }
+ bp += padLen;
+ *bp++ = RSA_BLOCK_AFTER_PAD_OCTET;
+ nsslibc_memcpy(bp, data->data, data->len);
+ break;
default:
PORT_Assert(0);
@@ -427,26 +273,6 @@ rsa_FormatBlock(SECItem * result, unsigned modulusLen,
break;
- case RSA_BlockOAEP:
- /*
- * 0x00 || BT || M1(Salt) || M2(Pad1||ActualData[||Pad2])
- *
- * The "2" below is the first octet + the second octet.
- * (The other fields do not contain the clear values, but are
- * the same length as the clear values.)
- */
- PORT_Assert(data->len <= (modulusLen - (2 + OAEP_SALT_LEN
- + OAEP_PAD_LEN)));
-
- result->data = rsa_FormatOneBlock(modulusLen, blockType, data);
- if (result->data == NULL) {
- result->len = 0;
- return SECFailure;
- }
- result->len = modulusLen;
-
- break;
-
case RSA_BlockRaw:
/*
* Pad || ActualData
--
1.7.1

37
pkgs/development/perl-modules/catalyst-plugin-static-simple-etag.patch Normal file
View File

@ -0,0 +1,37 @@
Send an ETag header, and honour the If-None-Match request header
diff -ru -x '*~' Catalyst-Plugin-Static-Simple-0.30-orig/lib/Catalyst/Plugin/Static/Simple.pm Catalyst-Plugin-Static-Simple-0.30/lib/Catalyst/Plugin/Static/Simple.pm
--- Catalyst-Plugin-Static-Simple-0.30-orig/lib/Catalyst/Plugin/Static/Simple.pm 2012-05-04 18:49:30.000000000 +0200
+++ Catalyst-Plugin-Static-Simple-0.30/lib/Catalyst/Plugin/Static/Simple.pm 2013-02-25 22:57:18.667150181 +0100
@@ -187,16 +187,27 @@
my $type = $c->_ext_to_type( $full_path );
my $stat = stat $full_path;
- $c->res->headers->content_type( $type );
- $c->res->headers->content_length( $stat->size );
- $c->res->headers->last_modified( $stat->mtime );
# Tell Firefox & friends its OK to cache, even over SSL:
- $c->res->headers->header('Cache-control' => 'public');
+ #$c->res->headers->header('Cache-control' => 'public');
+
+ $c->res->headers->last_modified( $stat->mtime );
# Optionally, set a fixed expiry time:
if ($config->{expires}) {
$c->res->headers->expires(time() + $config->{expires});
}
+ if ($config->{send_etag}) {
+ my $etag = '"' . $stat->mtime . '-' . $stat->ino . '-'. $stat->size . '"';
+ $c->res->headers->header('ETag' => $etag);
+ if (($c->req->header('If-None-Match') // "") eq $etag) {
+ $c->res->status(304);
+ return 1;
+ }
+ }
+
+ $c->res->headers->content_type( $type );
+ $c->res->headers->content_length( $stat->size );
+
my $fh = IO::File->new( $full_path, 'r' );
if ( defined $fh ) {
binmode $fh;

16
pkgs/development/tools/haskell/packunused/default.nix Normal file
View File

@ -0,0 +1,16 @@
{ cabal, Cabal, cmdargs, filepath, haskellSrcExts }:
cabal.mkDerivation (self: {
pname = "packunused";
version = "0.1.0.0";
sha256 = "131x99id3jcxglj24p5sjb6mnhphj925pp4jdjy09y6ai7wss3rs";
isLibrary = false;
isExecutable = true;
buildDepends = [ Cabal cmdargs filepath haskellSrcExts ];
meta = {
homepage = "https://github.com/hvr/packunused";
description = "Tool for detecting redundant Cabal package dependencies";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
};
})

37
pkgs/development/tools/selenium/chromedriver/default.nix Normal file
View File

@ -0,0 +1,37 @@
{ stdenv, fetchurl, cairo, fontconfig, freetype, gdk_pixbuf, glib
, glibc, gtk, libX11, makeWrapper, nspr, nss, pango, unzip
}:
# note: there is a i686 version available as well
assert stdenv.system == "x86_64-linux";
stdenv.mkDerivation rec {
name = "chromedriver_linux64_26.0.1383.0";
src = fetchurl {
url = "http://chromedriver.googlecode.com/files/${name}.zip";
sha256 = "0fh4r2rcpjc3nfrdyj256kjlyc0b6mhxqwxcah73q4vm1kjax8rs";
};
buildInputs = [
cairo fontconfig freetype gdk_pixbuf glib gtk libX11 makeWrapper
nspr nss pango unzip
];
unpackPhase = "unzip $src";
installPhase = ''
mkdir -p $out/bin
mv chromedriver $out/bin
patchelf --set-interpreter ${glibc}/lib/ld-linux-x86-64.so.2 $out/bin/chromedriver
wrapProgram "$out/bin/chromedriver" \
--prefix LD_LIBRARY_PATH : "$(cat ${stdenv.gcc}/nix-support/orig-gcc)/lib64:${cairo}/lib:${fontconfig}/lib:${freetype}/lib:${gdk_pixbuf}/lib:${glib}/lib:${gtk}/lib:${libX11}/lib:${nspr}/lib:${nss}/lib:${pango}/lib:\$LD_LIBRARY_PATH"
'';
meta = with stdenv.lib; {
homepage = http://code.google.com/p/chromedriver/;
description = "A WebDriver server for running Selenium tests on Chrome";
license = licenses.bsd3;
maintainers = [ maintainers.goibhniu ];
};
}

2
pkgs/lib/meta.nix
View File

@ -43,6 +43,6 @@ rec {
/* Increase the nix-env priority of the package, i.e., this
version/variant of the package will be preferred.
*/
hiPrio = drv: addMetaAttrs { priority = "110"; } drv;
hiPrio = drv: addMetaAttrs { priority = "-10"; } drv;
}

7
pkgs/os-specific/linux/kernel/linux-3.2.nix
View File

@ -239,8 +239,7 @@ in
import ./generic.nix (
rec {
version = "3.2.38";
testing = false;
version = "3.2.39";
modDirVersion = version;
@ -249,8 +248,8 @@ import ./generic.nix (
'';
src = fetchurl {
url = "mirror://kernel/linux/kernel/v3.0/${if testing then "testing/" else ""}linux-${version}.tar.xz";
sha256 = "10hm4cy56xjl5ckv3jj3grw31qfhwrgia0wq71c34dw0mv3bix8w";
url = "mirror://kernel/linux/kernel/v3.0/linux-${version}.tar.xz";
sha256 = "066vgyz37jxxwmdskwzazg7xa09mirk4krlyxpvsx68ai5rjf826";
};
config = configWithPlatform stdenv.platform;

4
pkgs/os-specific/linux/kernel/manual-config.nix
View File

@ -1,4 +1,4 @@
{ stdenv, runCommand, nettools, perl, kmod, writeTextFile }:
{ stdenv, runCommand, nettools, bc, perl, kmod, writeTextFile }:
with stdenv.lib;
@ -122,7 +122,7 @@ stdenv.mkDerivation {
runHook postConfigure
'';
nativeBuildInputs = [ perl nettools ];
nativeBuildInputs = [ perl bc nettools ];
makeFlags = commonMakeFlags ++ [
"INSTALLKERNEL=${installkernel stdenv.platform.kernelTarget}"

33
pkgs/os-specific/linux/qemu-kvm/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchurl, attr, zlib, SDL, alsaLib, pkgconfig, pciutils, libuuid, vde2
, libjpeg, libpng, ncurses, python, glib, libaio, mesa
, libjpeg, libpng, ncurses, python, glib, libaio, mesa, perl, texinfo
, spice, spice_protocol, spiceSupport ? false }:
assert stdenv.isLinux;
@ -16,17 +16,13 @@ stdenv.mkDerivation rec {
patches = [ ./fix-librt-check.patch ];
postPatch =
'' for i in $(find . -type f)
do
sed -i "$i" \
-e 's|/bin/bash|/bin/sh|g ;
s|/usr/bin/python|${python}/bin/python|g ;
s|/bin/rm|rm|g'
done
'' + stdenv.lib.optionalString spiceSupport ''
for i in configure spice-qemu-char.c ui/spice-input.c ui/spice-core.c ui/qemu-spice.h
do
buildInputs =
[ attr zlib SDL alsaLib pkgconfig pciutils libuuid vde2 libjpeg libpng
ncurses python glib libaio mesa texinfo perl
] ++ stdenv.lib.optionals spiceSupport [ spice_protocol spice ];
patchPhase = "patchShebangs ." + stdenv.lib.optionalString spiceSupport ''
for i in configure spice-qemu-char.c ui/spice-input.c ui/spice-core.c ui/qemu-spice.h; do
substituteInPlace $i --replace '#include <spice.h>' '#include <spice/spice.h>'
done
'';
@ -34,15 +30,10 @@ stdenv.mkDerivation rec {
configureFlags =
[ "--audio-drv-list=alsa"
"--smbd=smbd" # use `smbd' from $PATH
"--enable-docs"
"--python=${python}/bin/python"
] ++ stdenv.lib.optional spiceSupport "--enable-spice";
enableParallelBuilding = true;
buildInputs =
[ attr zlib SDL alsaLib pkgconfig pciutils libuuid vde2 libjpeg libpng
ncurses python glib libaio mesa
] ++ stdenv.lib.optionals spiceSupport [ spice_protocol spice ];
postInstall =
''
# Libvirt expects us to be called `qemu-kvm'. Otherwise it will
@ -51,6 +42,10 @@ stdenv.mkDerivation rec {
ln -sv $(cd $out/bin && echo qemu-system-*) $out/bin/qemu-kvm
'';
doCheck = true;
enableParallelBuilding = true;
meta = {
homepage = http://www.linux-kvm.org/;
description = "A full virtualization solution for Linux on x86 hardware containing virtualization extensions";

4
pkgs/os-specific/linux/xf86-input-wacom/default.nix
View File

@ -3,11 +3,11 @@
, ncurses, pkgconfig, randrproto, xorgserver, xproto, udev, libXinerama, pixman }:
stdenv.mkDerivation rec {
name = "xf86-input-wacom-0.16.0";
name = "xf86-input-wacom-0.19.0";
src = fetchurl {
url = "mirror://sourceforge/linuxwacom/${name}.tar.bz2";
sha256 = "0sc0hmbs3l3ad68iwglbwjv9lg1vd333n1lv72j4nqmk7g57yrii";
sha256 = "1lkvhirjysx0d2154jrwqc2i8jrqdjrlzjv7grbnm2cg5vpg7n53";
};
buildInputs = [ inputproto libX11 libXext libXi libXrandr libXrender

4
pkgs/servers/http/apache-httpd/2.4.nix
View File

@ -14,12 +14,12 @@ assert sslSupport -> aprutil.sslSupport && openssl != null;
assert ldapSupport -> aprutil.ldapSupport && openldap != null;
stdenv.mkDerivation rec {
version = "2.4.3";
version = "2.4.4";
name = "apache-httpd-${version}";
src = fetchurl {
url = "mirror://apache/httpd/httpd-${version}.tar.bz2";
sha256 = "17i4zdcjfvxks0p1fbqvab37kr8d6zscqaqan8pqkw8iq6wh48fq";
sha256 = "0p35jy6mkb1q48bia719qxs5bwxv0wadyhxi61rsr93nrbgbvalj";
};
buildInputs = [perl] ++

5
pkgs/servers/x11/xorg/default.nix
View File

@ -1724,8 +1724,9 @@ let
url = mirror://xorg/X11R7.7/src/everything/xf86-video-vmware-12.0.2.tar.bz2;
sha256 = "0isiwx516gww8hfk3vy7js83yziyjym9mq2zjadyq1a8v5gqf9y8";
};
buildInputs = [pkgconfig fontsproto libdrm libpciaccess randrproto renderproto videoproto libX11 libXext xextproto xineramaproto xorgserver xproto ];
})) // {inherit fontsproto libdrm libpciaccess randrproto renderproto videoproto libX11 libXext xextproto xineramaproto xorgserver xproto ;};
CFLAGS = "-I${pixman}/include/pixman-1";
buildInputs = [pkgconfig fontsproto libdrm libpciaccess randrproto renderproto videoproto libX11 libXext xextproto xineramaproto xorgserver xproto pixman ];
})) // {inherit fontsproto libdrm libpciaccess randrproto renderproto videoproto libX11 libXext xextproto xineramaproto xorgserver xproto pixman ;};
xf86videovoodoo = (stdenv.mkDerivation ((if overrides ? xf86videovoodoo then overrides.xf86videovoodoo else x: x) {
name = "xf86-video-voodoo-1.2.4";

10
pkgs/tools/X11/virtualgl/default.nix
View File

@ -2,19 +2,19 @@
, libjpeg_turbo, cmake }:
let
libDir = if stdenv.is64bit then "lib64" else "lib";
version = "2.3.2";
in
stdenv.mkDerivation {
name = "virtualgl-2.1.4";
name = "virtualgl-${version}";
src = fetchurl {
url = mirror://sourceforge/virtualgl/VirtualGL-2.3.tar.gz;
sha256 = "2f00c4eb20b0ae88e957a23fb66882e4ade2faa208abd30aa8c4f61570ecd4b9";
url = "mirror://sourceforge/virtualgl/VirtualGL-${version}.tar.gz";
sha256 = "062lrhd8yr13ch4wpgzxdabqs92j4q7fcl3a0c3sdlav4arspqmy";
};
patches = [ ./xshm.patch ./fixturbopath.patch ];
prePatch = ''
sed -i s,LD_PRELOAD=lib,LD_PRELOAD=$out/${libDir}/lib, rr/vglrun
sed -i s,LD_PRELOAD=lib,LD_PRELOAD=$out/lib/lib, server/vglrun
'';
cmakeFlags = [ "-DTJPEG_LIBRARY=${libjpeg_turbo}/lib/libturbojpeg.so" ];

4
pkgs/tools/package-management/nix/default.nix
View File

@ -5,11 +5,11 @@
}:
stdenv.mkDerivation rec {
name = "nix-1.3";
name = "nix-1.5.1";
src = fetchurl {
url = "http://nixos.org/releases/nix/${name}/${name}.tar.xz";
sha256 = "32cba96df0e02d6627f5625a441fdd4ea0db718dd5bfd50044cdfd3c606d4852";
sha256 = "c53ec8a5518445bea658e1edb4e3be8c315b583aefc55d6969f2bf6f6c805239";
};
nativeBuildInputs = [ perl pkgconfig ];

28
pkgs/tools/security/mkpasswd/default.nix Normal file
View File

@ -0,0 +1,28 @@
{ stdenv, fetchurl
}:
stdenv.mkDerivation rec {
name = "mkpasswd-${version}";
version = "5.0.20";
src = fetchurl {
url = "http://ftp.debian.org/debian/pool/main/w/whois/whois_${version}.tar.xz";
sha256 = "1kwf5pwc7w8dw40nrd4m4637mz7pbhc4c1v78j56nqj38sak50w1";
};
preConfigure = ''
substituteInPlace Makefile --replace "prefix = /usr" "prefix = $out"
'';
buildPhase = "make mkpasswd";
installPhase = "make install-mkpasswd";
meta = {
homepage = http://ftp.debian.org/debian/pool/main/w/whois/;
description = ''
Overfeatured front end to crypt, from the Debian whois package.
'';
};
}

24
pkgs/top-level/all-packages.nix
View File

@ -1132,6 +1132,8 @@ let
mkcue = callPackage ../tools/cd-dvd/mkcue { };
mkpasswd = callPackage ../tools/security/mkpasswd { };
mktemp = callPackage ../tools/security/mktemp { };
modemmanager = callPackage ../tools/networking/modemmanager {};
@ -2848,6 +2850,10 @@ let
inherit (python27Packages) recursivePthLoader;
};
pythonDocs = recurseIntoAttrs (import ../development/interpreters/python/docs {
inherit stdenv fetchurl;
});
pythonLinkmeWrapper = callPackage ../development/interpreters/python/python-linkme-wrapper.nix { };
pyrex = pyrex095;
@ -2864,6 +2870,7 @@ let
ruby18 = callPackage ../development/interpreters/ruby/ruby-18.nix { };
ruby19 = callPackage ../development/interpreters/ruby/ruby-19.nix { };
ruby2 = lowPrio (callPackage ../development/interpreters/ruby/ruby-2.0.nix { });
ruby = ruby19;
@ -3027,6 +3034,8 @@ let
cgdb = callPackage ../development/tools/misc/cgdb { };
chromedriver = callPackage ../development/tools/selenium/chromedriver { };
complexity = callPackage ../development/tools/misc/complexity { };
ctags = callPackage ../development/tools/misc/ctags { };
@ -3333,6 +3342,8 @@ let
acl = callPackage ../development/libraries/acl { };
activemq = callPackage ../development/libraries/apache-activemq { };
adns = callPackage ../development/libraries/adns { };
afflib = callPackage ../development/libraries/afflib {};
@ -6015,7 +6026,7 @@ let
# A function to build a manually-configured kernel
linuxManualConfig = import ../os-specific/linux/kernel/manual-config.nix {
inherit (pkgs) stdenv runCommand nettools perl kmod writeTextFile;
inherit (pkgs) stdenv runCommand nettools bc perl kmod writeTextFile;
};
keyutils = callPackage ../os-specific/linux/keyutils { };
@ -6897,6 +6908,8 @@ let
fossil = callPackage ../applications/version-management/fossil { };
fvwm = callPackage ../applications/window-managers/fvwm { };
geany = callPackage ../applications/editors/geany { };
goldendict = callPackage ../applications/misc/goldendict { };
@ -7228,6 +7241,8 @@ let
jackmeter = callPackage ../applications/audio/jackmeter { };
jalv = callPackage ../applications/audio/jalv { };
jedit = callPackage ../applications/editors/jedit { };
jigdo = callPackage ../applications/misc/jigdo { };
@ -7392,6 +7407,9 @@ let
inherit (gnome) libgnomecanvas;
};
mopidy = callPackage ../applications/audio/mopidy { };
mopidy_git = callPackage ../applications/audio/mopidy/git.nix { };
mozilla = callPackage ../applications/networking/browsers/mozilla {
inherit (gnome) libIDL;
};
@ -8814,10 +8832,14 @@ let
stateDir = config.nix.stateDir or "/nix/var";
};
nixUnstable = nixStable;
/*
nixUnstable = callPackage ../tools/package-management/nix/unstable.nix {
storeDir = config.nix.storeDir or "/nix/store";
stateDir = config.nix.stateDir or "/nix/var";
};
*/
nut = callPackage ../applications/misc/nut { };

21
pkgs/top-level/haskell-packages.nix
View File

@ -145,7 +145,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
transformers = self.transformers_0_3_0_0; # 7.6 ok
vector = self.vector_0_10_0_1; # 7.6 ok
xhtml = self.xhtml_3000_2_1; # 7.6 ok
zlib = self.zlib_0_5_4_0; # 7.6 ok
zlib = self.zlib_0_5_4_1; # 7.6 ok
cabalInstall = self.cabalInstall_1_16_0_2; # 7.6 ok
alex = self.alex_3_0_4; # 7.6 ok
haddock = self.haddock_2_13_1; # 7.6 ok
@ -871,6 +871,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
gio = callPackage ../development/libraries/haskell/gio {};
github = callPackage ../development/libraries/haskell/github {};
gitit = callPackage ../development/libraries/haskell/gitit {};
glade = callPackage ../development/libraries/haskell/glade {
@ -1550,8 +1552,6 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
safe = callPackage ../development/libraries/haskell/safe {};
Safe = callPackage ../development/libraries/haskell/Safe {};
SafeSemaphore = callPackage ../development/libraries/haskell/SafeSemaphore {};
sendfile = callPackage ../development/libraries/haskell/sendfile {};
@ -1863,6 +1863,12 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
CouchDB = callPackage ../development/libraries/haskell/CouchDB {};
wlPprint = callPackage ../development/libraries/haskell/wl-pprint {};
wlPprintExtras = callPackage ../development/libraries/haskell/wl-pprint-extras {};
wlPprintTerminfo = callPackage ../development/libraries/haskell/wl-pprint-terminfo {};
wlPprintText = callPackage ../development/libraries/haskell/wl-pprint-text {};
word8 = callPackage ../development/libraries/haskell/word8 {};
@ -1956,7 +1962,10 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
zlib_0_5_4_0 = callPackage ../development/libraries/haskell/zlib/0.5.4.0.nix {
inherit (pkgs) zlib;
};
zlib = self.zlib_0_5_4_0;
zlib_0_5_4_1 = callPackage ../development/libraries/haskell/zlib/0.5.4.1.nix {
inherit (pkgs) zlib;
};
zlib = self.zlib_0_5_4_1;
zlibBindings = callPackage ../development/libraries/haskell/zlib-bindings {};
@ -2077,12 +2086,16 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
cabalInstall_1_16_0_2 = callPackage ../tools/package-management/cabal-install/1.16.0.2.nix {};
cabalInstall = self.cabalInstall_1_16_0_2;
githubBackup = callPackage ../applications/version-management/git-and-tools/github-backup {};
jailbreakCabal = callPackage ../development/tools/haskell/jailbreak-cabal {};
lhs2tex = callPackage ../tools/typesetting/lhs2tex {};
myhasktags = callPackage ../tools/misc/myhasktags {};
packunused = callPackage ../development/tools/haskell/packunused {};
splot = callPackage ../development/tools/haskell/splot {};
timeplot = callPackage ../development/tools/haskell/timeplot {};

265
pkgs/top-level/node-packages.nix
View File

@ -17,10 +17,10 @@ let self = {
"abbrev" = self."abbrev-1";
"abbrev-1" = self.buildNodePackage rec {
name = "abbrev-1.0.3";
name = "abbrev-1.0.4";
src = fetchurl {
url = "http://registry.npmjs.org/abbrev/-/${name}.tgz";
sha256 = "d444c07f411418828a5e81ac85569afe638e6441a562086faa0209ec7bdf55f2";
sha256 = "8dc0f480571a4a19e74f1abd4f31f6a70f94953d1ccafa16ed1a544a19a6f3a8";
};
deps = [
@ -40,6 +40,21 @@ let self = {
];
};
amdefine = "amdefine-0.0.4";
"amdefine->=0.0.4" = self."amdefine-0.0.4";
"amdefine-0.0.4" = self.buildNodePackage rec {
name = "amdefine-0.0.4";
src = fetchurl {
url = "http://registry.npmjs.org/amdefine/-/${name}.tgz";
sha256 = "10sdb85mb6fvkglqwg7icdh58sng9pm8655npmsbv18gsbcnmbg4";
};
deps = [
];
};
"ansi" = self."ansi-~0.1.2";
"ansi-~0.1.2" = self.buildNodePackage rec {
@ -53,6 +68,19 @@ let self = {
];
};
"asn1" = self."asn1-0.1.11";
"asn1-0.1.11" = self.buildNodePackage rec {
name = "asn1-0.1.11";
src = fetchurl {
url = "http://registry.npmjs.org/asn1/-/${name}.tgz";
sha256 = "7206eadc8a9344e484bcce979e22a12c9fa64c1395aa0544b8b767808b268f43";
};
deps = [
];
};
"async" = self."async-0.1.22";
"async-0.1.22" = self.buildNodePackage rec {
@ -148,6 +176,32 @@ let self = {
];
};
"bunyan" = self."bunyan-0.8.0";
"bunyan-0.8.0" = self.buildNodePackage rec {
name = "bunyan-0.8.0";
src = fetchurl {
url = "http://registry.npmjs.org/bunyan/-/${name}.tgz";
sha256 = "059b8948dd34d371d39aa87227d26d62180c365afeb6625c07187c8f0ad29f27";
};
deps = [
];
};
"byline" = self."byline-2.0.2";
"byline-2.0.2" = self.buildNodePackage rec {
name = "byline-2.0.2";
src = fetchurl {
url = "http://registry.npmjs.org/byline/-/${name}.tgz";
sha256 = "a916ffde5ee385f7d682c13028907a96fe33cdeed6d72cea903d09fb154dae50";
};
deps = [
];
};
"bytes" = self."bytes-0.1.0";
"bytes-0.1.0" = self.buildNodePackage rec {
@ -299,6 +353,30 @@ let self = {
];
};
"ctype" = self."ctype->=0.0.2";
"ctype->=0.0.2" = self.buildNodePackage rec {
name = "ctype-0.5.2";
src = fetchurl {
url = "http://registry.npmjs.org/ctype/-/${name}.tgz";
sha256 = "4a7224a74f19dc6a1206fa1c04ae1a4ab795cd4ba842466e2f511fa714f82c60";
};
deps = [
];
};
"ctype-0.5.0" = self.buildNodePackage rec {
name = "ctype-0.5.0";
src = fetchurl {
url = "http://registry.npmjs.org/ctype/-/${name}.tgz";
sha256 = "50157e6c5e44d1c833bfc239a7a337ee08fd6f3c5a15f7ef5cee5571a86b0378";
};
deps = [
];
};
"datetime" = self."datetime-0.0.3";
"datetime-0.0.3" = self.buildNodePackage rec {
@ -338,6 +416,19 @@ let self = {
];
};
"dtrace-provider" = self."dtrace-provider-0.0.6";
"dtrace-provider-0.0.6" = self.buildNodePackage rec {
name = "dtrace-provider-0.0.6";
src = fetchurl {
url = "http://registry.npmjs.org/dtrace-provider/-/${name}.tgz";
sha256 = "ce48363aefa9e8afb3c8e8e5ce8d321a5d5a7eecbb28eaa997c48c5e9d502508";
};
deps = [
];
};
"escape-html" = self."escape-html-0.0.1";
"escape-html-0.0.1" = self.buildNodePackage rec {
@ -478,6 +569,20 @@ let self = {
];
};
"http-signature" = self."http-signature-0.9.9";
"http-signature-0.9.9" = self.buildNodePackage rec {
name = "http-signature-0.9.9";
src = fetchurl {
url = "http://registry.npmjs.org/http-signature/-/${name}.tgz";
sha256 = "c1e193f1195028f2cc8a8f402c7755fc215552a81f6bebbdf6f21de9390a438e";
};
deps = [
self."asn1-0.1.11"
self."ctype-0.5.0"
];
};
"inherits" = self."inherits-1.0.0";
"inherits-1" = self."inherits-1.0.0";
"inherits-1.x" = self."inherits-1.0.0";
@ -535,6 +640,17 @@ let self = {
"lru-cache" = self."lru-cache-~2.0.0";
"lru-cache-1.1.0" = self.buildNodePackage rec {
name = "lru-cache-1.1.0";
src = fetchurl {
url = "http://registry.npmjs.org/lru-cache/-/${name}.tgz";
sha256 = "735898f87ba800d6f2f3517ab92b631f03976c9d3fbaedb6ce357cfe3813ee8b";
};
deps = [
];
};
"lru-cache-~2.0.0" = self.buildNodePackage rec {
name = "lru-cache-2.0.1";
src = fetchurl {
@ -550,6 +666,17 @@ let self = {
"mime->= 0.0.1" = self."mime-*";
"mime-1.2.5" = self.buildNodePackage rec {
name = "mime-1.2.5";
src = fetchurl {
url = "http://registry.npmjs.org/mime/-/${name}.tgz";
sha256 = "ccf05a6c47146e8acb9d0671eee09d2eb077cf9ddd1f7e8eccf49dbf969d6c72";
};
deps = [
];
};
"mime-1.2.6" = self.buildNodePackage rec {
name = "mime-1.2.6";
src = fetchurl {
@ -624,6 +751,19 @@ let self = {
];
};
"nijs" = self."nijs-0.0.3";
"nijs-0.0.3" = self.buildNodePackage rec {
name = "nijs-0.0.3";
src = fetchurl {
url = "http://registry.npmjs.org/nijs/-/${name}.tgz";
sha256 = "0rcqycb4nigfasxfjw1ngh556r5ik1qr58938nx6qbxzkrm0k1ip";
};
deps = [
self."optparse"
];
};
"node-expat" = self."node-expat-*";
"node-expat-*" = self.buildNodePackage rec {
@ -678,6 +818,17 @@ let self = {
"nopt" = self."nopt-2";
"nopt-1.0.10" = self.buildNodePackage rec {
name = "nopt-1.0.10";
src = fetchurl {
url = "http://registry.npmjs.org/nopt/-/${name}.tgz";
sha256 = "426562943bfbbfc059eac83575ade5b78c6c01e5c1000a90a7defecfe2334927";
};
deps = [
self."abbrev-1"
];
};
"nopt-2" = self.buildNodePackage rec {
name = "nopt-2.0.0";
src = fetchurl {
@ -718,11 +869,14 @@ let self = {
"optimist" = self."optimist-*";
"optimist-*" = self.buildNodePackage rec {
name = "optimist-0.3.4";
"optimist-*" = self."optimist-0.3.5";
"optimist-~0.3.5" = self."optimist-0.3.5";
"optimist-0.3.5" = self.buildNodePackage rec {
name = "optimist-0.3.5";
src = fetchurl {
url = "http://registry.npmjs.org/optimist/-/${name}.tgz";
sha256 = "add88b473a660ad8a9ff88a3eec49a74d9c64f592acbcd219ff4c0d7249f4d60";
sha256 = "17d06n3y9difknq9j340qksj2zllal6sg0pj4clj9ja5jxf721x4";
};
deps = [
self."wordwrap-~0.0.2"
@ -911,6 +1065,43 @@ let self = {
];
};
"restify" = self."restify-1.4.3";
"restify-1.4.3" = self.buildNodePackage rec {
name = "restify-1.4.3";
src = fetchurl {
url = "http://registry.npmjs.org/restify/-/${name}.tgz";
sha256 = "7c95b1e58d6effab3b947409892a20260b6d1142aefec9c3eb1e46165363d64e";
};
deps = [
self."async-0.1.22"
self."bunyan-0.8.0"
self."byline-2.0.2"
self."formidable-1.0.11"
self."dtrace-provider-0.0.6"
self."http-signature-0.9.9"
self."lru-cache-1.1.0"
self."mime-1.2.5"
self."node-uuid-1.3.3"
self."qs-0.5.0"
self."retry-0.6.0"
self."semver-1.0.14"
];
};
"retry" = self."retry-0.6.0";
"retry-0.6.0" = self.buildNodePackage rec {
name = "retry-0.6.0";
src = fetchurl {
url = "http://registry.npmjs.org/retry/-/${name}.tgz";
sha256 = "983e676af24ff4dcbac396420fca3c195ce3b1de5f731f697888b4fe6b7bbd2a";
};
deps = [
];
};
"rimraf" = self."rimraf-2";
"rimraf-2" = self.buildNodePackage rec {
@ -926,7 +1117,9 @@ let self = {
"semver" = self."semver-1";
"semver-1" = self.buildNodePackage rec {
"semver-1" = self."semver-1.0.14";
"semver-1.0.14" = self.buildNodePackage rec {
name = "semver-1.0.14";
src = fetchurl {
url = "http://registry.npmjs.org/semver/-/${name}.tgz";
@ -966,6 +1159,37 @@ let self = {
];
};
"smartdc" = self."smartdc-*";
"smartdc-*" = self.buildNodePackage rec {
name = "smartdc-6.5.6";
src = fetchurl {
url = "http://registry.npmjs.org/smartdc/-/${name}.tgz";
sha256 = "a5d7ba965a863a411b52f0321a9fa1be350cb6af807175beb16529e4282dff4d";
};
deps = [
self."http-signature-0.9.9"
self."lru-cache-1.1.0"
self."nopt-1.0.10"
self."restify-1.4.3"
self."bunyan-0.8.0"
self."ssh-agent-0.1.0"
];
};
"ssh-agent" = self."ssh-agent-0.1.0";
"ssh-agent-0.1.0" = self.buildNodePackage rec {
name = "ssh-agent-0.1.0";
src = fetchurl {
url = "http://registry.npmjs.org/ssh-agent/-/${name}.tgz";
sha256 = "62860d09a84d0bf1250d8c90aae3d0a922a7812591a9f4243330178774eb87b5";
};
deps = [
self."ctype->=0.0.2"
];
};
"socket.io" = self."socket.io-0.9.6";
"socket.io-0.9.6" = self.buildNodePackage rec {
@ -1012,7 +1236,20 @@ let self = {
];
};
"source-map" = self."source-map-0.1.2";
"source-map" = self."source-map-0.1.7";
"source-map-~0.1.7" = self."source-map-0.1.7";
"source-map-0.1.7" = self.buildNodePackage rec {
name = "source-map-0.1.7";
src = fetchurl {
url = "http://registry.npmjs.org/source-map/-/${name}.tgz";
sha256 = "041skhq60kwpx319iy0m33zcgc7q2ddlfl3vvmwl5ssl9p46g8x2";
};
deps = [
self."amdefine->=0.0.4"
];
};
"source-map-0.1.2" = self.buildNodePackage rec {
name = "source-map-0.1.2";
@ -1092,7 +1329,19 @@ let self = {
];
};
"uglify-js" = self."uglify-js-1.2.6";
"uglify-js" = self."uglify-js-2.2.5";
"uglify-js-2.2.5" = self.buildNodePackage rec {
name = "uglify-js-2.2.5";
src = fetchurl {
url = "http://registry.npmjs.org/uglify-js/-/${name}.tgz";
sha256 = "18ic581gjyvfl4gvlcdmzw4vrcbvn698i2rznnba70f8lk6ndlgr";
};
deps = [
self."source-map-~0.1.7"
self."optimist-~0.3.5"
];
};
"uglify-js-1.2.5" = self.buildNodePackage rec {
name = "uglify-js-1.2.5";

45
pkgs/top-level/perl-packages.nix
View File

@ -510,6 +510,18 @@ rec {
};
};
CatalystPluginCaptcha = buildPerlPackage {
name = "Catalyst-Plugin-Captcha-0.04";
src = fetchurl {
url = mirror://cpan/authors/id/D/DI/DIEGOK/Catalyst-Plugin-Captcha-0.04.tar.gz;
sha256 = "0llyj3v5nx9cx46jdbbvxf1lc9s9cxq5ml22xmx3wkb201r5qgaa";
};
propagatedBuildInputs = [ CatalystRuntime CatalystPluginSession GDSecurityImage HTTPDate ];
meta = {
description = "Create and validate Captcha for Catalyst";
};
};
CatalystPluginConfigLoader = buildPerlPackage rec {
name = "Catalyst-Plugin-ConfigLoader-0.30";
src = fetchurl {
@ -590,6 +602,7 @@ rec {
url = mirror://cpan/authors/id/A/AB/ABRAXXA/Catalyst-Plugin-Static-Simple-0.30.tar.gz;
sha256 = "18zar1n4imgnv7b4dr5sxyikry4668ngqgc6f0dr210bqafvwv7w";
};
patches = [ ../development/perl-modules/catalyst-plugin-static-simple-etag.patch ];
propagatedBuildInputs = [ CatalystRuntime MIMETypes Moose MooseXTypes namespaceautoclean ];
meta = {
description = "Make serving static pages painless";
@ -655,6 +668,7 @@ rec {
meta = {
description = "Replace the development server with Starman";
license = "perl";
platforms = stdenv.lib.platforms.linux;
};
};
@ -2011,6 +2025,19 @@ rec {
makeMakerFlags = "--lib_png_path=${pkgs.libpng} --lib_jpeg_path=${pkgs.libjpeg} --lib_zlib_path=${pkgs.zlib} --lib_ft_path=${pkgs.freetype} --lib_fontconfig_path=${pkgs.fontconfig} --lib_xpm_path=${pkgs.xlibs.libXpm}";
};
GDSecurityImage = buildPerlPackage {
name = "GD-SecurityImage-1.72";
src = fetchurl {
url = mirror://cpan/authors/id/B/BU/BURAK/GD-SecurityImage-1.72.tar.gz;
sha256 = "07a025krdaml5ls7gyssfdcsif6cnsnksrxkqk48n9dmv7rz7q1r";
};
propagatedBuildInputs = [ GD ];
meta = {
description = "Security image (captcha) generator";
license = "perl5";
};
};
GeoIP = buildPerlPackage rec {
name = "Geo-IP-1.39";
src = fetchurl {
@ -4812,18 +4839,18 @@ rec {
};
};
TestWWWMechanizeCatalyst = buildPerlPackage rec {
name = "Test-WWW-Mechanize-Catalyst-0.55";
TestWWWMechanizeCatalyst = buildPerlPackage {
name = "Test-WWW-Mechanize-Catalyst-0.58";
src = fetchurl {
url = "mirror://cpan/modules/by-module/Test/${name}.tar.gz";
sha256 = "0zdg4sxx231dj3qgbr58i63927gl4qzh0krignqxp8q6ck3hr63f";
url = mirror://cpan/authors/id/B/BO/BOBTFISH/Test-WWW-Mechanize-Catalyst-0.58.tar.gz;
sha256 = "1pa2m064skxfwsm93hffxcyky4kcn2q418vnw2fn79ich6wrcijd";
};
propagatedBuildInputs =
[ CatalystRuntime TestWWWMechanize WWWMechanize
CatalystPluginSessionStateCookie HTMLForm
];
buildInputs = [ TestPod ];
doCheck = false; # listens on an external port
propagatedBuildInputs = [ CatalystRuntime LWP Moose namespaceclean TestWWWMechanize WWWMechanize ];
meta = {
description = "Test::WWW::Mechanize for Catalyst";
license = "perl";
};
};
TestWWWMechanizePSGI = buildPerlPackage {

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