forked from mirrors/nixpkgs
Merge remote-tracking branch 'origin/master' into stdenv-updates.
This commit is contained in:
Peter Simons
commit
22fb1ad99e
|
|
@ -1,4 +1,4 @@
|
|||
{ stdenv, fetchsvn, alsaLib, aubio, boost, cairomm, curl, fftw
|
||||
{ stdenv, fetchgit, alsaLib, aubio, boost, cairomm, curl, fftw
|
||||
, fftwSinglePrec, flac, glibc, glibmm, gtk, gtkmm, jackaudio
|
||||
, libgnomecanvas, libgnomecanvasmm, liblo, libmad, libogg, librdf
|
||||
, librdf_raptor, librdf_rasqal, libsamplerate, libsigcxx, libsndfile
|
||||
|
|
@ -6,17 +6,17 @@
|
|||
, perl, pkgconfig, python, serd, sord, sratom, suil }:
|
||||
|
||||
let
|
||||
# Ardour 3 RC2
|
||||
rev = "14092";
|
||||
# Ardour 3.0 tag
|
||||
rev = "79db9422";
|
||||
in
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "ardour3-svn-${rev}";
|
||||
name = "ardour3";
|
||||
|
||||
src = fetchsvn {
|
||||
url = http://subversion.ardour.org/svn/ardour2/branches/3.0;
|
||||
src = fetchgit {
|
||||
url = git://git.ardour.org/ardour/ardour.git;
|
||||
inherit rev;
|
||||
sha256 = "1zyy74z3xcsdhrzw4g6y1qm1ai2fl3bgabscl0wn7m1kkscr9nzg";
|
||||
sha256 = "cdbe4ca6d4b639fcd66a3d1cf9c2816b4755655c9d81bdd2417263f413aa7096";
|
||||
};
|
||||
|
||||
buildInputs =
|
||||
|
|
|
|||
|
|
@ -2,17 +2,17 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "cmus-${version}";
|
||||
version = "2.3.3";
|
||||
version = "2.5.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/cmus/cmus-v${version}.tar.bz2";
|
||||
sha256 = "1pwd3jifv12yr0yr77hsv5c9y8ay6kn2b5a3s5i8v2c882vgl890";
|
||||
};
|
||||
|
||||
configurePhase = "./configure prefix=$out";
|
||||
|
||||
buildInputs = [ ncurses pkgconfig alsaLib flac libmad ffmpeg libvorbis mpc mp4v2 ];
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/cmus/cmus-v${version}.tar.bz2";
|
||||
sha256 = "13hc5d7h2ayjwnip345hc59rpjj9fgrp1i5spjw3s14prdqr733v";
|
||||
};
|
||||
|
||||
meta = {
|
||||
description = "cmus is a small, fast and powerful console music player for Linux and *BSD";
|
||||
homepage = http://cmus.sourceforge.net;
|
||||
|
|
|
|||
|
|
@ -1,10 +1,10 @@
|
|||
{stdenv, fetchurl, libogg, libao, pkgconfig, libopus}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "opus-tools-0.1.5";
|
||||
name = "opus-tools-0.1.6";
|
||||
src = fetchurl {
|
||||
url = "http://downloads.xiph.org/releases/opus/${name}.tar.gz";
|
||||
sha256 = "0184zfamg3qcjknk4liz4smws3mbv77gjhq2pn9xgcx9nw78srvn";
|
||||
sha256 = "1hd2ych34y3qy4rj4hd5cp29ixy891afizlsxphsfvfplk1dp1nc";
|
||||
};
|
||||
|
||||
buildInputs = [ libogg libao pkgconfig libopus ];
|
||||
|
|
|
|||
35
pkgs/applications/graphics/viewnior/default.nix
Normal file
35
pkgs/applications/graphics/viewnior/default.nix
Normal file
|
|
@ -0,0 +1,35 @@
|
|||
{ stdenv, fetchurl, pkgconfig, gtk2, libpng, exiv2, lcms
|
||||
, intltool, gettext, shared_mime_info, glib, gdk_pixbuf, perl}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "viewnior-1.3";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://cloud.github.com/downloads/xsisqox/Viewnior/${name}.tar.gz";
|
||||
sha256 = "46c97c1a85361519b42fe008cfb8911e66f709f3a3a988c11047ab3726889f10";
|
||||
};
|
||||
|
||||
buildInputs =
|
||||
[ pkgconfig gtk2 libpng exiv2 lcms intltool gettext
|
||||
shared_mime_info glib gdk_pixbuf perl
|
||||
];
|
||||
|
||||
meta = {
|
||||
description = "Viewnior is a fast and simple image viewer for GNU/Linux";
|
||||
longDescription =
|
||||
'' Viewnior is insipred by big projects like Eye of Gnome, because of it's
|
||||
usability and richness,and by GPicView, because of it's lightweight design and
|
||||
minimal interface. So here comes Viewnior - small and light, with no compromise
|
||||
with the quality of it's functions. The program is made with better integration
|
||||
in mind (follows Gnome HIG2).
|
||||
'';
|
||||
|
||||
license = "GPLv3";
|
||||
|
||||
homepage = http://xsisqox.github.com/Viewnior;
|
||||
|
||||
maintainers = [ stdenv.lib.maintainers.smironov ];
|
||||
|
||||
platforms = stdenv.lib.platforms.gnu;
|
||||
};
|
||||
}
|
||||
|
|
@ -1,14 +1,14 @@
|
|||
{ stdenv, fetchurl, Xaw3d, ghostscriptX, perl }:
|
||||
|
||||
let
|
||||
name = "gv-3.7.3";
|
||||
name = "gv-3.7.4";
|
||||
in
|
||||
stdenv.mkDerivation {
|
||||
inherit name;
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnu/gv/${name}.tar.gz";
|
||||
sha256 = "ee01ba96e3a5c319eb4658357372a118dbb0e231891b360edecbdebd449d1c2b";
|
||||
sha256 = "0q8s43z14vxm41pfa8s5h9kyyzk1fkwjhkiwbf2x70alm6rv6qi1";
|
||||
};
|
||||
|
||||
buildInputs = [ Xaw3d ghostscriptX perl ];
|
||||
|
|
|
|||
|
|
@ -1,5 +1,8 @@
|
|||
{ stdenv, fetchurl, python, perl, ncurses, x11, bzip2, zlib, openssl
|
||||
, spidermonkey, guile, gpm }:
|
||||
, spidermonkey, gpm
|
||||
, enableGuile ? true, guile ? null }:
|
||||
|
||||
assert enableGuile -> guile != null;
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "elinks-0.12pre5";
|
||||
|
|
@ -11,14 +14,15 @@ stdenv.mkDerivation rec {
|
|||
|
||||
patches = [ ./gc-init.patch ];
|
||||
|
||||
buildInputs = [ python perl ncurses x11 bzip2 zlib openssl spidermonkey guile gpm ];
|
||||
buildInputs = [ python perl ncurses x11 bzip2 zlib openssl spidermonkey gpm ]
|
||||
++ stdenv.lib.optional enableGuile guile;
|
||||
|
||||
configureFlags =
|
||||
''
|
||||
--enable-finger --enable-html-highlight --with-guile
|
||||
--enable-finger --enable-html-highlight
|
||||
--with-perl --with-python --enable-gopher --enable-cgi --enable-bittorrent
|
||||
--enable-nntp --with-openssl=${openssl}
|
||||
'';
|
||||
'' + stdenv.lib.optionalString enableGuile " --with-guile";
|
||||
|
||||
crossAttrs = {
|
||||
propagatedBuildInputs = [ ncurses.crossDrv zlib.crossDrv openssl.crossDrv ];
|
||||
|
|
|
|||
|
|
@ -3,11 +3,11 @@
|
|||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "notmuch-0.15";
|
||||
name = "notmuch-0.15.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://notmuchmail.org/releases/${name}.tar.gz";
|
||||
sha256 = "07bi87jxfh761b4fvcwf4svlksd7jlznnzhnsp983gdldkabg60q";
|
||||
sha256 = "03cwylm0y9xld0hn753v0hn62f96nagdmzxv8jlz8vdbh9iszs56";
|
||||
};
|
||||
|
||||
buildInputs = [ bash emacs gdb glib gmime gnupg1 pkgconfig talloc xapian ];
|
||||
|
|
|
|||
41
pkgs/applications/networking/p2p/transmission/2.60.nix
Normal file
41
pkgs/applications/networking/p2p/transmission/2.60.nix
Normal file
|
|
@ -0,0 +1,41 @@
|
|||
{ stdenv, fetchurl, pkgconfig, openssl, curl, intltool, libevent,
|
||||
file, inotifyTools, gtk ? null }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "transmission-2.60"; # transmission >= 2.61 requires gtk3
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://download.transmissionbt.com/files/${name}.tar.xz";
|
||||
sha256 = "1ramdliyy8j7qqpkxg643lda11ynxwfhq6qcs31fr3h9x72l0rg4";
|
||||
};
|
||||
|
||||
buildInputs = [ pkgconfig openssl curl intltool libevent
|
||||
file inotifyTools gtk ];
|
||||
|
||||
preConfigure = ''
|
||||
sed -i -e 's|/usr/bin/file|${file}/bin/file|g' configure
|
||||
'';
|
||||
|
||||
postInstall = ''
|
||||
rm -f $out/share/icons/hicolor/icon-theme.cache
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "A fast, easy and free BitTorrent client";
|
||||
longDescription = ''
|
||||
Transmission is a BitTorrent client which features a simple interface
|
||||
on top of a cross-platform back-end.
|
||||
Feature spotlight:
|
||||
* Uses fewer resources than other clients
|
||||
* Native Mac, GTK+ and Qt GUI clients
|
||||
* Daemon ideal for servers, embedded systems, and headless use
|
||||
* All these can be remote controlled by Web and Terminal clients
|
||||
* Bluetack (PeerGuardian) blocklists with automatic updates
|
||||
* Full encryption, DHT, and PEX support
|
||||
'';
|
||||
homepage = http://www.transmissionbt.com/;
|
||||
license = [ "GPLv2" ];
|
||||
maintainers = [ stdenv.lib.maintainers.astsmtl ];
|
||||
platforms = stdenv.lib.platforms.linux;
|
||||
};
|
||||
}
|
||||
|
|
@ -1,21 +1,27 @@
|
|||
{ stdenv, fetchurl, pkgconfig, openssl, curl, intltool, libevent,
|
||||
file, inotifyTools, gtk ? null }:
|
||||
{ stdenv, fetchurl, pkgconfig, openssl, curl, intltool, libevent
|
||||
, file, inotifyTools
|
||||
, enableGtk ? false, gtk ? null }:
|
||||
|
||||
assert enableGtk -> gtk != null;
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "transmission-2.60"; # transmission >= 2.61 requires gtk3
|
||||
name = "transmission-2.77"; # transmission >= 2.61 requires gtk3
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://download.transmissionbt.com/files/${name}.tar.xz";
|
||||
sha256 = "1ramdliyy8j7qqpkxg643lda11ynxwfhq6qcs31fr3h9x72l0rg4";
|
||||
sha256 = "1phzhj4wds6r2ziclva1b5l6l9xjsx5ji7s3m4xia44aq4znbcam";
|
||||
};
|
||||
|
||||
buildInputs = [ pkgconfig openssl curl intltool libevent
|
||||
file inotifyTools gtk ];
|
||||
file inotifyTools ]
|
||||
++ stdenv.lib.optional enableGtk gtk;
|
||||
|
||||
preConfigure = ''
|
||||
sed -i -e 's|/usr/bin/file|${file}/bin/file|g' configure
|
||||
'';
|
||||
|
||||
configureFlags = stdenv.lib.optionalString enableGtk "--with-gtk";
|
||||
|
||||
postInstall = ''
|
||||
rm -f $out/share/icons/hicolor/icon-theme.cache
|
||||
'';
|
||||
|
|
|
|||
|
|
@ -49,10 +49,9 @@ rec {
|
|||
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
|
||||
QuickCheck random regexCompat SafeSemaphore SHA stm text time regexTdfa
|
||||
transformers transformersBase utf8String uuid wai waiLogger warp
|
||||
xmlConduit xmlTypes yesod yesodDefault yesodForm yesodStatic testpack
|
||||
cabalInstall;
|
||||
xmlConduit xmlTypes yesod yesodDefault yesodForm yesodStatic testpack;
|
||||
};
|
||||
|
||||
qgit = import ./qgit {
|
||||
|
|
@ -72,7 +71,7 @@ rec {
|
|||
};
|
||||
|
||||
topGit = lib.makeOverridable (import ./topgit) {
|
||||
inherit stdenv fetchurl unzip;
|
||||
inherit stdenv fetchurl;
|
||||
};
|
||||
|
||||
tig = import ./tig {
|
||||
|
|
|
|||
|
|
@ -6,19 +6,18 @@
|
|||
, 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
|
||||
, yesod, yesodDefault, yesodForm, yesodStatic, testpack, regexTdfa
|
||||
}:
|
||||
|
||||
let
|
||||
version = "4.20130227";
|
||||
version = "4.20130314";
|
||||
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 = "1zw5kzb08zz43ahbhrazjpq9zn73l3kwnqilp464frf7fg7rwan6";
|
||||
sha256 = "0rwirg9qdbd75c7wl6413blv9045sbxmw20idvbm47qc4q14gzv9";
|
||||
name = "git-annex-${version}.tar.gz";
|
||||
};
|
||||
|
||||
|
|
@ -30,20 +29,21 @@ stdenv.mkDerivation {
|
|||
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 ];
|
||||
yesodStatic which perl testpack regexTdfa ];
|
||||
|
||||
configurePhase = ''
|
||||
makeFlagsArray=( PREFIX=$out )
|
||||
makeFlagsArray=( PREFIX=$out CABAL=./Setup )
|
||||
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
|
||||
ghc -O2 --make Setup
|
||||
./Setup configure -ftestsuite -f-android -fproduction -fdns -fxmpp -fpairing -fwebapp -fassistant -fdbus -finotify -fwebdav -fs3
|
||||
'';
|
||||
|
||||
checkPhase = "./git-annex test";
|
||||
doCheck = true;
|
||||
checkPhase = ''
|
||||
export HOME="$NIX_BUILD_TOP/tmp"
|
||||
mkdir "$HOME"
|
||||
./git-annex test
|
||||
'';
|
||||
|
||||
meta = {
|
||||
homepage = "http://git-annex.branchable.com/";
|
||||
|
|
|
|||
|
|
@ -1,33 +1,26 @@
|
|||
{ stdenv, fetchurl, unzip }:
|
||||
{ stdenv, fetchurl }:
|
||||
|
||||
let
|
||||
version = "0.8-45-gd279e29";
|
||||
lib = stdenv.lib;
|
||||
in
|
||||
stdenv.mkDerivation {
|
||||
name = "topgit-${version}";
|
||||
stdenv.mkDerivation rec {
|
||||
name = "topgit-0.9";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://repo.or.cz/w/topgit.git/snapshot/topgit-${version}.zip";
|
||||
sha256 = "0vzrng1w2k7m4z0x9h6zbrcf33dx08ly8fnbxzz3ms2k2dbsmpl6";
|
||||
url = "https://github.com/greenrd/topgit/archive/${name}.tar.gz";
|
||||
sha256 = "1z9x42a0cmn8n2n961qcfl522nd6j9a3dpx1jbqfp24ddrk5zd94";
|
||||
};
|
||||
|
||||
buildInputs = [unzip];
|
||||
configurePhase = "export prefix=$out";
|
||||
configurePhase = "makeFlags=prefix=$out";
|
||||
|
||||
postInstall = ''
|
||||
mkdir -p "$out/share/doc/topgit-${version}"
|
||||
cp README "$out/share/doc/topgit-${version}/"
|
||||
mkdir -p "$out/etc/bash_completion.d"
|
||||
make prefix="$out" install
|
||||
mv "contrib/tg-completion.bash" "$out/etc/bash_completion.d/"
|
||||
mkdir -p "$out/share/doc/${name}" "$out/etc/bash_completion.d/"
|
||||
mv README "$out/share/doc/${name}/"
|
||||
mv contrib/tg-completion.bash "$out/etc/bash_completion.d/"
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "TopGit aims to make handling of large amount of interdependent topic branches easier";
|
||||
maintainers = [ lib.maintainers.marcweber lib.maintainers.ludo lib.maintainers.simons ];
|
||||
homepage = http://repo.or.cz/w/topgit.git;
|
||||
homepage = "https://github.com/greenrd/topgit";
|
||||
description = "TopGit manages large amount of interdependent topic branches";
|
||||
license = "GPLv2";
|
||||
platforms = stdenv.lib.platforms.unix;
|
||||
maintainers = with stdenv.lib.maintainers; [ marcweber ludo simons ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,21 +1,20 @@
|
|||
{ fetchurl, stdenv, which, pkgconfig, libxcb, xcbutilkeysyms, xcbutil, bison,
|
||||
xcbutilwm, libstartup_notification, libX11, pcre, libev, yajl, flex,
|
||||
libXcursor, coreutils, perl }:
|
||||
{ fetchurl, stdenv, which, pkgconfig, libxcb, xcbutilkeysyms, xcbutil,
|
||||
xcbutilwm, libstartup_notification, libX11, pcre, libev, yajl,
|
||||
libXcursor, coreutils, perl, pango }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "i3-${version}";
|
||||
version = "4.4";
|
||||
version = "4.5.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://i3wm.org/downloads/${name}.tar.bz2";
|
||||
sha256 = "06s8gzcxxh06zp1586kp4bxaj8yj5i9jacwg0nizbmmnx94mg1wr";
|
||||
sha256 = "bae55f1c7c4a21d71aae182e4fab6038ba65ba4be5d1ceff9e269f4f74b823f2";
|
||||
};
|
||||
|
||||
buildInputs = [ which pkgconfig libxcb xcbutilkeysyms xcbutil bison xcbutilwm
|
||||
libstartup_notification libX11 pcre libev yajl flex libXcursor perl ];
|
||||
buildInputs = [ which pkgconfig libxcb xcbutilkeysyms xcbutil xcbutilwm
|
||||
libstartup_notification libX11 pcre libev yajl libXcursor perl pango ];
|
||||
|
||||
patchPhase = ''
|
||||
sed -i -e '/^# Pango/,/^$/d' common.mk
|
||||
patchShebangs .
|
||||
'';
|
||||
|
||||
|
|
|
|||
|
|
@ -2,11 +2,11 @@
|
|||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "i3status-2.6";
|
||||
name = "i3status-2.7";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://i3wm.org/i3status/${name}.tar.bz2";
|
||||
sha256 = "e7e710cc271887bcd22757269e1b00a5618fb53abdb3455140116b3d38797bce";
|
||||
sha256 = "0cm6fhsc7hzsqni8pwhjl2l0rfd458paabn54cgzqnmwwdflwgq7";
|
||||
};
|
||||
|
||||
buildInputs = [ confuse yajl alsaLib wirelesstools ];
|
||||
|
|
|
|||
|
|
@ -4,8 +4,8 @@
|
|||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "xmonad-contrib";
|
||||
version = "0.11";
|
||||
sha256 = "188brys16b3wmxd22j4284wnpasm8bixdjfxl1jr2q2xi45nzks0";
|
||||
version = "0.11.1";
|
||||
sha256 = "1356dn8ipw7fgn2xijppn69f64zg36gcxbw9qndxbbmml5gq0zrl";
|
||||
buildDepends = [
|
||||
extensibleExceptions mtl random utf8String X11 X11Xft xmonad
|
||||
];
|
||||
|
|
|
|||
33
pkgs/data/sgml+xml/schemas/sgml-dtd/docbook/3.1.nix
Normal file
33
pkgs/data/sgml+xml/schemas/sgml-dtd/docbook/3.1.nix
Normal file
|
|
@ -0,0 +1,33 @@
|
|||
{ stdenv, fetchurl, unzip }:
|
||||
|
||||
let
|
||||
|
||||
src = fetchurl {
|
||||
url = http://www.oasis-open.org/docbook/sgml/3.1/docbk31.zip;
|
||||
sha256 = "0f25ch7bywwhdxb1qa0hl28mgq1blqdap3rxzamm585rf4kis9i0";
|
||||
};
|
||||
|
||||
isoents = fetchurl {
|
||||
url = http://www.oasis-open.org/cover/ISOEnts.zip;
|
||||
sha256 = "1clrkaqnvc1ja4lj8blr0rdlphngkcda3snm7b9jzvcn76d3br6w";
|
||||
};
|
||||
|
||||
in
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "docbook-sgml-3.1";
|
||||
|
||||
unpackPhase = "true";
|
||||
|
||||
buildInputs = [ unzip ];
|
||||
|
||||
installPhase =
|
||||
''
|
||||
o=$out/sgml/dtd/docbook-3.1
|
||||
mkdir -p $o
|
||||
cd $o
|
||||
unzip ${src}
|
||||
unzip ${isoents}
|
||||
sed -e "s/iso-/ISO/" -e "s/.gml//" -i docbook.cat
|
||||
'';
|
||||
}
|
||||
|
|
@ -10,12 +10,12 @@ else
|
|||
throw "Unsupported architecture";
|
||||
|
||||
edk2 = stdenv.mkDerivation {
|
||||
name = "edk2-2012-03-13";
|
||||
name = "edk2-2013-03-19";
|
||||
|
||||
src = fetchsvn {
|
||||
url = https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2;
|
||||
rev = "13783";
|
||||
sha256 = "18sx0nwcnghij7737xdnmgwk5vm0ax4p0v3ybggqqs8cdhzfghil";
|
||||
rev = "14211";
|
||||
sha256 = "1rhrv7cyazb1d4gw3s8fv0c245iankvb9pqx6nngbkkxkcswvnw7";
|
||||
};
|
||||
|
||||
buildInputs = [ libuuid pythonFull ];
|
||||
|
|
|
|||
|
|
@ -35,7 +35,7 @@ EOF
|
|||
cd ../build
|
||||
|
||||
configureScript=../$sourceRoot/configure
|
||||
configureFlags="--enable-languages=$langs"
|
||||
configureFlags="--enable-languages=$langs --disable-multilib"
|
||||
}
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -15,7 +15,12 @@ stdenv.mkDerivation {
|
|||
url = http://ftp.gnu.org/gnu/gcc/gcc-3.3.6/gcc-3.3.6.tar.bz2;
|
||||
md5 = "6936616a967da5a0b46f1e7424a06414";
|
||||
};
|
||||
|
||||
|
||||
# inspiration: https://aur.archlinux.org/packages/g77/
|
||||
postPatch = ''
|
||||
substituteInPlace gcc/config/i386/linux.h --replace 'struct siginfo' siginfo_t
|
||||
'';
|
||||
|
||||
inherit noSysDirs langC langCC langFortran;
|
||||
|
||||
meta = {
|
||||
|
|
|
|||
|
|
@ -15,7 +15,12 @@ stdenv.mkDerivation {
|
|||
md5 = "4a21ac777d4b5617283ce488b808da7b";
|
||||
};
|
||||
|
||||
patches = if noSysDirs then [./no-sys-dirs.patch] else [];
|
||||
patches = stdenv.lib.optional noSysDirs ./no-sys-dirs.patch;
|
||||
|
||||
# inspiration: https://aur.archlinux.org/packages/g77/
|
||||
postPatch = ''
|
||||
substituteInPlace gcc/config/i386/linux.h --replace 'struct siginfo' siginfo_t
|
||||
'';
|
||||
|
||||
inherit noSysDirs profiledCompiler;
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ stdenv, fetchurl, bison, glibc, bash, coreutils, makeWrapper}:
|
||||
{ stdenv, fetchurl, bison, glibc, bash, coreutils, makeWrapper, tzdata}:
|
||||
|
||||
let
|
||||
loader386 = "${glibc}/lib/ld-linux.so.2";
|
||||
|
|
@ -35,7 +35,7 @@ stdenv.mkDerivation {
|
|||
sed -i 's,/lib/ld-linux.so.2,${loader386},' src/cmd/8l/asm.c
|
||||
sed -i 's,/lib64/ld-linux-x86-64.so.2,${loaderAmd64},' src/cmd/6l/asm.c
|
||||
sed -i 's,/lib64/ld-linux-x86-64.so.3,${loaderArm},' src/cmd/5l/asm.c
|
||||
sed -i 's,/usr/share/zoneinfo/,${glibc}/share/zoneinfo/,' src/pkg/time/zoneinfo_unix.go
|
||||
sed -i 's,/usr/share/zoneinfo/,${tzdata}/share/zoneinfo/,' src/pkg/time/zoneinfo_unix.go
|
||||
|
||||
#sed -i -e 's,/bin/cat,${coreutils}/bin/cat,' \
|
||||
# -e 's,/bin/echo,${coreutils}/bin/echo,' \
|
||||
|
|
|
|||
|
|
@ -3,14 +3,14 @@ libX11, graphicsmagick, pcre, liblapack, texLive, pkgconfig, mesa, fltk,
|
|||
fftw, fftwSinglePrec, zlib, curl, qrupdate }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "octave-3.6.3";
|
||||
name = "octave-3.6.4";
|
||||
src = fetchurl {
|
||||
url = "mirror://gnu/octave/${name}.tar.bz2";
|
||||
sha256 = "11i82vyf514rvdqcgdanw0ppvag8lcm6198rars0dd0w1xahjzg3";
|
||||
sha256 = "0qn9s7jrjmrn6w3rvp8d7vfnymyv0spnxzrp9l7p8p8zb7wms67s";
|
||||
};
|
||||
|
||||
buildInputs = [ gfortran readline ncurses perl flex texinfo qhull libX11
|
||||
graphicsmagick pcre liblapack texLive pkgconfig mesa fltk zlib curl
|
||||
graphicsmagick pcre liblapack pkgconfig mesa fltk zlib curl
|
||||
fftw fftwSinglePrec qrupdate ];
|
||||
|
||||
doCheck = true;
|
||||
|
|
|
|||
|
|
@ -6,11 +6,13 @@
|
|||
, vpxSupport ? false, libvpx ? null
|
||||
, x264Support ? true, x264 ? null
|
||||
, xvidSupport ? true, xvidcore ? null
|
||||
, opusSupport ? true, libopus ? null
|
||||
, vdpauSupport ? true, libvdpau ? null
|
||||
, vaapiSupport ? true, libva ? null
|
||||
, faacSupport ? false, faac ? null
|
||||
, dc1394Support ? false, libdc1394 ? null
|
||||
, x11grabSupport ? false, libXext ? null, libXfixes ? null
|
||||
, playSupport ? true, SDL ? null
|
||||
}:
|
||||
|
||||
assert speexSupport -> speex != null;
|
||||
|
|
@ -19,10 +21,12 @@ assert vorbisSupport -> libvorbis != null;
|
|||
assert vpxSupport -> libvpx != null;
|
||||
assert x264Support -> x264 != null;
|
||||
assert xvidSupport -> xvidcore != null;
|
||||
assert opusSupport -> libopus != null;
|
||||
assert vdpauSupport -> libvdpau != null;
|
||||
assert vaapiSupport -> libva != null;
|
||||
assert faacSupport -> faac != null;
|
||||
assert x11grabSupport -> libXext != null && libXfixes != null;
|
||||
assert playSupport -> SDL != null;
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "ffmpeg-1.1.3";
|
||||
|
|
@ -39,7 +43,6 @@ stdenv.mkDerivation rec {
|
|||
"--enable-gpl"
|
||||
"--enable-postproc"
|
||||
"--enable-swscale"
|
||||
"--disable-ffplay"
|
||||
"--enable-shared"
|
||||
"--enable-avresample"
|
||||
"--enable-runtime-cpudetect"
|
||||
|
|
@ -51,10 +54,12 @@ stdenv.mkDerivation rec {
|
|||
++ stdenv.lib.optional vpxSupport "--enable-libvpx"
|
||||
++ stdenv.lib.optional x264Support "--enable-libx264"
|
||||
++ stdenv.lib.optional xvidSupport "--enable-libxvid"
|
||||
++ stdenv.lib.optional opusSupport "--enable-libopus"
|
||||
++ stdenv.lib.optional vdpauSupport "--enable-vdpau"
|
||||
++ stdenv.lib.optional faacSupport "--enable-libfaac --enable-nonfree"
|
||||
++ stdenv.lib.optional dc1394Support "--enable-libdc1394"
|
||||
++ stdenv.lib.optional x11grabSupport "--enable-x11grab";
|
||||
++ stdenv.lib.optional x11grabSupport "--enable-x11grab"
|
||||
++ stdenv.lib.optional playSupport "--enable-ffplay";
|
||||
|
||||
buildInputs = [ pkgconfig lame yasm zlib bzip2 alsaLib ]
|
||||
++ stdenv.lib.optional mp3Support lame
|
||||
|
|
@ -64,11 +69,13 @@ stdenv.mkDerivation rec {
|
|||
++ stdenv.lib.optional vpxSupport libvpx
|
||||
++ stdenv.lib.optional x264Support x264
|
||||
++ stdenv.lib.optional xvidSupport xvidcore
|
||||
++ stdenv.lib.optional opusSupport libopus
|
||||
++ stdenv.lib.optional vdpauSupport libvdpau
|
||||
++ stdenv.lib.optional vaapiSupport libva
|
||||
++ stdenv.lib.optional faacSupport faac
|
||||
++ stdenv.lib.optional dc1394Support libdc1394
|
||||
++ stdenv.lib.optionals x11grabSupport [ libXext libXfixes ];
|
||||
++ stdenv.lib.optionals x11grabSupport [ libXext libXfixes ]
|
||||
++ stdenv.lib.optional playSupport SDL;
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
|
|
|
|||
|
|
@ -2,10 +2,10 @@
|
|||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "Boolean";
|
||||
version = "0.1.2";
|
||||
sha256 = "07mhg9zf98hlm7qq9gdbrq68a8rpvdby1jwmgrvf3nv2k47dimx6";
|
||||
version = "0.2";
|
||||
sha256 = "1r8qvsfbfjfp453pdy9ci9w584ad9bm4xv0ynx4b1yny34ag3zr3";
|
||||
meta = {
|
||||
description = "Generalized booleans";
|
||||
description = "Generalized booleans and numbers";
|
||||
license = self.stdenv.lib.licenses.bsd3;
|
||||
platforms = self.ghc.meta.platforms;
|
||||
maintainers = [ self.stdenv.lib.maintainers.andres ];
|
||||
|
|
|
|||
18
pkgs/development/libraries/haskell/GLUT/2.4.0.0.nix
Normal file
18
pkgs/development/libraries/haskell/GLUT/2.4.0.0.nix
Normal file
|
|
@ -0,0 +1,18 @@
|
|||
{ cabal, freeglut, libICE, libSM, libXi, libXmu, mesa, OpenGL
|
||||
, OpenGLRaw
|
||||
}:
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "GLUT";
|
||||
version = "2.4.0.0";
|
||||
sha256 = "1g6bnj2p9hj6c04pmkjwlw9brp7rrva1fyylr2q2dbfz4kbz438h";
|
||||
buildDepends = [ OpenGL OpenGLRaw ];
|
||||
extraLibraries = [ freeglut libICE libSM libXi libXmu mesa ];
|
||||
meta = {
|
||||
homepage = "http://www.haskell.org/haskellwiki/Opengl";
|
||||
description = "A binding for the OpenGL Utility Toolkit";
|
||||
license = self.stdenv.lib.licenses.bsd3;
|
||||
platforms = self.ghc.meta.platforms;
|
||||
maintainers = [ self.stdenv.lib.maintainers.andres ];
|
||||
};
|
||||
})
|
||||
|
|
@ -4,8 +4,8 @@
|
|||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "HStringTemplate";
|
||||
version = "0.7.0";
|
||||
sha256 = "0xxxikgjw1dhx7kx3mjyvgh70m9avcd1kbp2bpig6gjwswk0mmai";
|
||||
version = "0.7.1";
|
||||
sha256 = "0hqc1496xazihlww8j90m1cwzj7cihqbfjdly9s8kjf8d5my64ld";
|
||||
buildDepends = [
|
||||
blazeBuilder deepseq filepath mtl parsec syb text time utf8String
|
||||
void
|
||||
|
|
|
|||
16
pkgs/development/libraries/haskell/OpenGL/2.8.0.0.nix
Normal file
16
pkgs/development/libraries/haskell/OpenGL/2.8.0.0.nix
Normal file
|
|
@ -0,0 +1,16 @@
|
|||
{ cabal, GLURaw, libX11, mesa, OpenGLRaw }:
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "OpenGL";
|
||||
version = "2.8.0.0";
|
||||
sha256 = "1wb5772dhh4a81ks9zxz8adpfxa97hcna9s263h9cl2vny6ksxff";
|
||||
buildDepends = [ GLURaw OpenGLRaw ];
|
||||
extraLibraries = [ libX11 mesa ];
|
||||
meta = {
|
||||
homepage = "http://www.haskell.org/haskellwiki/Opengl";
|
||||
description = "A binding for the OpenGL graphics system";
|
||||
license = self.stdenv.lib.licenses.bsd3;
|
||||
platforms = self.ghc.meta.platforms;
|
||||
maintainers = [ self.stdenv.lib.maintainers.andres ];
|
||||
};
|
||||
})
|
||||
|
|
@ -1,9 +1,12 @@
|
|||
{ cabal, libX11, libXext, libXinerama, libXrandr, libXrender }:
|
||||
{ cabal, dataDefault, libX11, libXext, libXinerama, libXrandr
|
||||
, libXrender
|
||||
}:
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "X11";
|
||||
version = "1.6.0.2";
|
||||
sha256 = "0z1g93k2zbkb9is2zy6pfwp13bv11cvs30b9cz253wjv2liphshw";
|
||||
version = "1.6.1.1";
|
||||
sha256 = "1bkfnxcmf8qia0l3x5n3j4f1zakjwnlq0mhdnbpp6v3q2g37brbw";
|
||||
buildDepends = [ dataDefault ];
|
||||
extraLibraries = [
|
||||
libX11 libXext libXinerama libXrandr libXrender
|
||||
];
|
||||
|
|
|
|||
|
|
@ -0,0 +1,21 @@
|
|||
{ cabal, base64Bytestring, blazeBuilder, blazeBuilderConduit
|
||||
, conduit, cryptoPubkeyTypes, dataDefault, httpConduit, httpTypes
|
||||
, monadControl, random, resourcet, RSA, SHA, time, transformers
|
||||
}:
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "authenticate-oauth";
|
||||
version = "1.4.0.5";
|
||||
sha256 = "0yic95glkc0j35sdq04z5n2607ch0k64vyi3y0kfji31qzd3d44x";
|
||||
buildDepends = [
|
||||
base64Bytestring blazeBuilder blazeBuilderConduit conduit
|
||||
cryptoPubkeyTypes dataDefault httpConduit httpTypes monadControl
|
||||
random resourcet RSA SHA time transformers
|
||||
];
|
||||
meta = {
|
||||
homepage = "http://github.com/yesodweb/authenticate";
|
||||
description = "Library to authenticate with OAuth for Haskell web applications";
|
||||
license = self.stdenv.lib.licenses.bsd3;
|
||||
platforms = self.ghc.meta.platforms;
|
||||
};
|
||||
})
|
||||
|
|
@ -4,8 +4,8 @@
|
|||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "bson";
|
||||
version = "0.2.1";
|
||||
sha256 = "1g5xvkpn5j2yn9figxiv5dindwv6gg90np56k235hy9cwmdicmwq";
|
||||
version = "0.2.2";
|
||||
sha256 = "043lbaj4rrvh4a1yc033np51vi8xlbczflbhyx2bsiryzbi27waf";
|
||||
buildDepends = [
|
||||
binary cryptohash dataBinaryIeee754 mtl network text time
|
||||
];
|
||||
|
|
|
|||
|
|
@ -0,0 +1,15 @@
|
|||
{ cabal, cereal, conduit, HUnit, mtl, resourcet, transformers }:
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "cereal-conduit";
|
||||
version = "0.7";
|
||||
sha256 = "0cf0lp47qiilrdrzmn58hwh3q7fh7g55f2a1r1bw31xapp1cvbix";
|
||||
buildDepends = [ cereal conduit transformers ];
|
||||
testDepends = [ cereal conduit HUnit mtl resourcet transformers ];
|
||||
meta = {
|
||||
homepage = "https://github.com/litherum/cereal-conduit";
|
||||
description = "Turn Data.Serialize Gets and Puts into Sources, Sinks, and Conduits";
|
||||
license = self.stdenv.lib.licenses.bsd3;
|
||||
platforms = self.ghc.meta.platforms;
|
||||
};
|
||||
})
|
||||
|
|
@ -4,8 +4,8 @@
|
|||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "classy-prelude";
|
||||
version = "0.5.3";
|
||||
sha256 = "0xlhdxkxvrzj9y8wdl2f1pz94zz2gfa9vfbia9prhr7skirxvsad";
|
||||
version = "0.5.4";
|
||||
sha256 = "1p30f1inp0kj2dsvqnxaplxl83kd8bv41jmszvbdbf3vijjpk6kr";
|
||||
buildDepends = [
|
||||
basicPrelude hashable liftedBase systemFilepath text transformers
|
||||
unorderedContainers vector
|
||||
|
|
|
|||
|
|
@ -1,10 +1,11 @@
|
|||
{ cabal, semigroups, transformers }:
|
||||
{ cabal, doctest, filepath, semigroups, transformers }:
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "comonad";
|
||||
version = "3.0.1.1";
|
||||
sha256 = "01zqxrqxy6x6nf6rynzmncbhlgbbpshhw10pkimnw5isg3b8qhc2";
|
||||
version = "3.0.2";
|
||||
sha256 = "0ryyifcxc5rmjrf9323zzj357709mah1hdsrnrbakd5ck7grjfay";
|
||||
buildDepends = [ semigroups transformers ];
|
||||
testDepends = [ doctest filepath ];
|
||||
meta = {
|
||||
homepage = "http://github.com/ekmett/comonad/";
|
||||
description = "Haskell 98 compatible comonads";
|
||||
|
|
|
|||
|
|
@ -1,13 +1,13 @@
|
|||
{ cabal, doctest, hspec, liftedBase, monadControl, QuickCheck
|
||||
, resourcet, text, transformers, transformersBase, void
|
||||
{ cabal, doctest, hspec, liftedBase, mmorph, monadControl
|
||||
, QuickCheck, resourcet, text, transformers, transformersBase, void
|
||||
}:
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "conduit";
|
||||
version = "1.0.3";
|
||||
sha256 = "1jvbm5v25h1m5a9gd0f417mhpabp3kcfzsjm8887gcyimp2d0z07";
|
||||
version = "1.0.4";
|
||||
sha256 = "1y97wc273i3qvq4nqp9kr3bgl8mca257hv92f3lbq2wzqkr5vahk";
|
||||
buildDepends = [
|
||||
liftedBase monadControl resourcet text transformers
|
||||
liftedBase mmorph monadControl resourcet text transformers
|
||||
transformersBase void
|
||||
];
|
||||
testDepends = [
|
||||
|
|
|
|||
|
|
@ -4,8 +4,8 @@
|
|||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "doctest";
|
||||
version = "0.9.5";
|
||||
sha256 = "073q56gyhkb7r4f94b9nx341dkmgapy8gig7f668jkghv2zci5ws";
|
||||
version = "0.9.5.1";
|
||||
sha256 = "0phakf605pdwp89y522wm17n1bflxlgqkgahklnf10wnywxwm7cs";
|
||||
isLibrary = true;
|
||||
isExecutable = true;
|
||||
buildDepends = [ deepseq filepath ghcPaths syb transformers ];
|
||||
|
|
@ -13,7 +13,6 @@ cabal.mkDerivation (self: {
|
|||
baseCompat deepseq filepath ghcPaths hspec HUnit QuickCheck setenv
|
||||
silently stringbuilder syb transformers
|
||||
];
|
||||
jailbreak = true;
|
||||
doCheck = false;
|
||||
meta = {
|
||||
homepage = "https://github.com/sol/doctest-haskell#readme";
|
||||
|
|
|
|||
|
|
@ -4,8 +4,8 @@
|
|||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "ghc-mod";
|
||||
version = "1.12.2";
|
||||
sha256 = "0kwf1szw26iz4sw2slv10birpngf1cfy9jzmllzr0nvybh1pv7a9";
|
||||
version = "1.12.3";
|
||||
sha256 = "1dc919xbq7aqvpayqh9czvpzz4w4j082d1fjv0n9b7i4a780xghv";
|
||||
isLibrary = false;
|
||||
isExecutable = true;
|
||||
buildDepends = [
|
||||
|
|
|
|||
|
|
@ -4,8 +4,8 @@
|
|||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "hS3";
|
||||
version = "0.5.6";
|
||||
sha256 = "1cd6dzvhfkfp0lzw8lwfcr0wn8wqi2hm8pgb5idp4vg4z00yf2zc";
|
||||
version = "0.5.7";
|
||||
sha256 = "1p5p6vwazqi5kpi3i0msbgcdf6flp25b2v1an6lvj7y8dx1pk6f2";
|
||||
isLibrary = true;
|
||||
isExecutable = true;
|
||||
buildDepends = [
|
||||
|
|
|
|||
|
|
@ -4,8 +4,8 @@
|
|||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "hamlet";
|
||||
version = "1.1.6.3";
|
||||
sha256 = "1kpj8j47licmdf364n0fn5908hsl6ib1wkiqhcx3m0nimb7pjnss";
|
||||
version = "1.1.6.4";
|
||||
sha256 = "1cjv32sajwq9lhgh3a8xb0z6j89121k8ndp6g21lmbdzc9fhpws0";
|
||||
buildDepends = [
|
||||
blazeBuilder blazeHtml blazeMarkup failure parsec shakespeare text
|
||||
];
|
||||
|
|
|
|||
|
|
@ -4,8 +4,8 @@
|
|||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "hspec-meta";
|
||||
version = "1.4.4";
|
||||
sha256 = "1p1miiaa38rd92bz695znlwd6wyvs8zpp2idyw5pkzvhqi8w10a1";
|
||||
version = "1.4.5";
|
||||
sha256 = "0k50vwzg3ka4727bj63y4gsvw4g80gnalj31rsbvj3afl9gikkk7";
|
||||
isLibrary = true;
|
||||
isExecutable = true;
|
||||
buildDepends = [
|
||||
|
|
|
|||
|
|
@ -5,8 +5,8 @@
|
|||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "hspec";
|
||||
version = "1.4.4";
|
||||
sha256 = "09wrvdlqzpa3vjcnirnzpj8nsvqnn5xbilnxaqmjm2agbl8xfj5r";
|
||||
version = "1.4.5";
|
||||
sha256 = "1dfwc1gjsawafi6k19hsw4kd5ahp8a9hdkyrm7nhjp4kjzgd2ymf";
|
||||
isLibrary = true;
|
||||
isExecutable = true;
|
||||
buildDepends = [
|
||||
|
|
|
|||
|
|
@ -9,8 +9,8 @@
|
|||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "http-conduit";
|
||||
version = "1.9.2.1";
|
||||
sha256 = "1zzw9gdljn7pmp0d6k051gp1wiw9412c3gdbpwbpng6m5jhk079i";
|
||||
version = "1.9.2.2";
|
||||
sha256 = "16njcgdnzs2la5xvs1pqs3zcjyzqlk3yfis89h9x7qg2w8hq8pxf";
|
||||
buildDepends = [
|
||||
asn1Data base64Bytestring blazeBuilder blazeBuilderConduit
|
||||
caseInsensitive certificate conduit cookie cprngAes dataDefault
|
||||
|
|
|
|||
13
pkgs/development/libraries/haskell/mmorph/default.nix
Normal file
13
pkgs/development/libraries/haskell/mmorph/default.nix
Normal file
|
|
@ -0,0 +1,13 @@
|
|||
{ cabal, transformers }:
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "mmorph";
|
||||
version = "1.0.0";
|
||||
sha256 = "10r8frcn6ar56n1vxy8rkys8j52f8xkqan8qxqanka1150k6khqk";
|
||||
buildDepends = [ transformers ];
|
||||
meta = {
|
||||
description = "Monad morphisms";
|
||||
license = self.stdenv.lib.licenses.bsd3;
|
||||
platforms = self.ghc.meta.platforms;
|
||||
};
|
||||
})
|
||||
|
|
@ -6,8 +6,8 @@
|
|||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "monad-par";
|
||||
version = "0.3.4";
|
||||
sha256 = "1j1xskd8smpfi2dpiwnpwakw0hs0i2yn1lrs9l06wz4b148hwc4k";
|
||||
version = "0.3.4.1";
|
||||
sha256 = "0v0gnxzv49zvmgm2cb20dlb8m7mn4chpwrc61g4zp69nabjpwwm8";
|
||||
buildDepends = [
|
||||
abstractDeque abstractPar deepseq monadParExtras mtl mwcRandom
|
||||
parallel
|
||||
18
pkgs/development/libraries/haskell/netwire/default.nix
Normal file
18
pkgs/development/libraries/haskell/netwire/default.nix
Normal file
|
|
@ -0,0 +1,18 @@
|
|||
{ cabal, bifunctors, deepseq, liftedBase, monadControl, mtl
|
||||
, profunctors, random, semigroups, tagged, time, vectorSpace
|
||||
}:
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "netwire";
|
||||
version = "4.0.7";
|
||||
sha256 = "035jz7j19c7n4za9xi8vj6yl9m2b2v6d53mp711gf8609wv0cx0c";
|
||||
buildDepends = [
|
||||
bifunctors deepseq liftedBase monadControl mtl profunctors random
|
||||
semigroups tagged time vectorSpace
|
||||
];
|
||||
meta = {
|
||||
description = "Flexible wire arrows for FRP";
|
||||
license = self.stdenv.lib.licenses.bsd3;
|
||||
platforms = self.ghc.meta.platforms;
|
||||
};
|
||||
})
|
||||
|
|
@ -8,8 +8,8 @@
|
|||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "pandoc";
|
||||
version = "1.11";
|
||||
sha256 = "1v32z6fmfkllwf5y64sjbk3ckss2kfcs71b64a7fjdhp82m4i4yh";
|
||||
version = "1.11.1";
|
||||
sha256 = "0b23vrgkm1csykx1zrldkg5ka816j6m7a5fhs4cxffalifq91c7b";
|
||||
isLibrary = true;
|
||||
isExecutable = true;
|
||||
buildDepends = [
|
||||
|
|
@ -24,7 +24,6 @@ cabal.mkDerivation (self: {
|
|||
testFrameworkQuickcheck2 text
|
||||
];
|
||||
configureFlags = "-fblaze_html_0_5";
|
||||
patchPhase = "sed -i -e 's|QuickCheck >= 2.4 && < 2.6,|QuickCheck,|' pandoc.cabal";
|
||||
doCheck = false;
|
||||
meta = {
|
||||
homepage = "http://johnmacfarlane.net/pandoc";
|
||||
|
|
|
|||
|
|
@ -4,8 +4,8 @@
|
|||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "persistent-template";
|
||||
version = "1.1.2.5";
|
||||
sha256 = "142b02ini1b5c566rzhykv45n4byzvhp9r6yyavy4zyvgdj7ligj";
|
||||
version = "1.1.3";
|
||||
sha256 = "1jvr71qfjv2f4vx4xbz78x5a325zkdpg2qvcbglizz10xwrm5j9d";
|
||||
buildDepends = [ aeson monadControl persistent text transformers ];
|
||||
testDepends = [ aeson hspec persistent QuickCheck text ];
|
||||
meta = {
|
||||
|
|
|
|||
|
|
@ -1,13 +1,13 @@
|
|||
{ cabal, hspec, liftedBase, monadControl, mtl, transformers
|
||||
{ cabal, hspec, liftedBase, mmorph, monadControl, mtl, transformers
|
||||
, transformersBase
|
||||
}:
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "resourcet";
|
||||
version = "0.4.5";
|
||||
sha256 = "1i2n0y4ridlzi2fn319f8jg1whb10gajgyvbz0rx2mwxj15bbgni";
|
||||
version = "0.4.7";
|
||||
sha256 = "0cmh9hhiy0qksigm2rvycyaw58r8357fl6xhv8x465ykw1va0by8";
|
||||
buildDepends = [
|
||||
liftedBase monadControl mtl transformers transformersBase
|
||||
liftedBase mmorph monadControl mtl transformers transformersBase
|
||||
];
|
||||
testDepends = [ hspec liftedBase transformers ];
|
||||
meta = {
|
||||
|
|
|
|||
|
|
@ -4,8 +4,8 @@
|
|||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "shake";
|
||||
version = "0.9.1";
|
||||
sha256 = "19jpnf7794ii1v0rfafmcrs71flwz6hmz72ng529ll12iy64xwkv";
|
||||
version = "0.10.1";
|
||||
sha256 = "0k8hk5aw5xk4aq7g8yjlkn1rjhcdy3jd5mna9phjs23kmfsmayk6";
|
||||
isLibrary = true;
|
||||
isExecutable = true;
|
||||
buildDepends = [
|
||||
|
|
|
|||
14
pkgs/development/libraries/haskell/stm-chans/default.nix
Normal file
14
pkgs/development/libraries/haskell/stm-chans/default.nix
Normal file
|
|
@ -0,0 +1,14 @@
|
|||
{ cabal, stm }:
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "stm-chans";
|
||||
version = "1.3.1";
|
||||
sha256 = "15agd0d3r3zmya72hpi9pkmzqw7mj6l84946dhds0hsb6d12r6qj";
|
||||
buildDepends = [ stm ];
|
||||
meta = {
|
||||
homepage = "http://code.haskell.org/~wren/";
|
||||
description = "Additional types of channels for STM";
|
||||
license = self.stdenv.lib.licenses.bsd3;
|
||||
platforms = self.ghc.meta.platforms;
|
||||
};
|
||||
})
|
||||
21
pkgs/development/libraries/haskell/stm-conduit/default.nix
Normal file
21
pkgs/development/libraries/haskell/stm-conduit/default.nix
Normal file
|
|
@ -0,0 +1,21 @@
|
|||
{ cabal, conduit, HUnit, QuickCheck, resourcet, stm, stmChans
|
||||
, testFramework, testFrameworkHunit, testFrameworkQuickcheck2
|
||||
, transformers
|
||||
}:
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "stm-conduit";
|
||||
version = "1.0.0";
|
||||
sha256 = "1kkx3x3qdqw5jp9vn9kxbxmmb8x0wdbp8jch08azw45pwjh3ga7v";
|
||||
buildDepends = [ conduit resourcet stm stmChans transformers ];
|
||||
testDepends = [
|
||||
conduit HUnit QuickCheck stm stmChans testFramework
|
||||
testFrameworkHunit testFrameworkQuickcheck2 transformers
|
||||
];
|
||||
meta = {
|
||||
homepage = "https://github.com/wowus/stm-conduit";
|
||||
description = "Introduces conduits to channels, and promotes using conduits concurrently";
|
||||
license = self.stdenv.lib.licenses.bsd3;
|
||||
platforms = self.ghc.meta.platforms;
|
||||
};
|
||||
})
|
||||
|
|
@ -2,8 +2,8 @@
|
|||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "tagged";
|
||||
version = "0.4.4";
|
||||
sha256 = "0bc88q33pyz4sx429awhxmnjzvmsg7vwwsqi2w7yf8lrmz5ph08x";
|
||||
version = "0.4.5";
|
||||
sha256 = "1ipj7ff2ya3r3w39clcrxs766hm568lj2kb2kd3npg87jj05wgv0";
|
||||
meta = {
|
||||
homepage = "http://github.com/ekmett/tagged";
|
||||
description = "Haskell 98 phantom types to avoid unsafely passing dummy arguments";
|
||||
|
|
|
|||
|
|
@ -2,8 +2,8 @@
|
|||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "uu-parsinglib";
|
||||
version = "2.7.4.2";
|
||||
sha256 = "10ddm6x9km3lzs9ahqpsl9krvslsn9glimwzq4hspgsp6izd1dmq";
|
||||
version = "2.7.4.3";
|
||||
sha256 = "0q907gfxia7i63wc1p0zfmp102f5xpanhrq5pa259mp1nwqq6lyg";
|
||||
buildDepends = [ ListLike time ];
|
||||
meta = {
|
||||
homepage = "http://www.cs.uu.nl/wiki/bin/view/HUT/ParserCombinators";
|
||||
|
|
|
|||
|
|
@ -11,6 +11,7 @@ cabal.mkDerivation (self: {
|
|||
buildDepends = [
|
||||
filepath mtl QuickCheck random regexBase stm text time vector vty
|
||||
];
|
||||
jailbreak = true;
|
||||
meta = {
|
||||
homepage = "http://jtdaugherty.github.com/vty-ui/";
|
||||
description = "An interactive terminal user interface library for Vty";
|
||||
|
|
|
|||
|
|
@ -1,14 +1,15 @@
|
|||
{ cabal, blazeBuilder, blazeBuilderConduit, caseInsensitive
|
||||
, conduit, cookie, httpTypes, HUnit, text, transformers, wai
|
||||
, conduit, cookie, httpTypes, HUnit, network, text, transformers
|
||||
, wai
|
||||
}:
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "wai-test";
|
||||
version = "1.3.0.4";
|
||||
sha256 = "1si54frsn8s8r0ykqc9h571rqbapf82jcvbz8bd49bbylv4j6yy0";
|
||||
version = "1.3.0.5";
|
||||
sha256 = "0v0x1sk7q36xy8syinc96y1jsyjvw6756cich4hxq86l2jfbgccw";
|
||||
buildDepends = [
|
||||
blazeBuilder blazeBuilderConduit caseInsensitive conduit cookie
|
||||
httpTypes HUnit text transformers wai
|
||||
httpTypes HUnit network text transformers wai
|
||||
];
|
||||
meta = {
|
||||
homepage = "http://www.yesodweb.com/book/web-application-interface";
|
||||
|
|
|
|||
|
|
@ -6,8 +6,8 @@
|
|||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "warp";
|
||||
version = "1.3.7.4";
|
||||
sha256 = "0z043v1fjblbvkn44hzp7j8iawqzbwf67qxq7gsv7jfq1q58xbrx";
|
||||
version = "1.3.7.5";
|
||||
sha256 = "1y6xnlrqfd763s5r79f53vlbk4iirnci6wpaicrm14f791w2mppc";
|
||||
buildDepends = [
|
||||
blazeBuilder blazeBuilderConduit caseInsensitive conduit hashable
|
||||
httpTypes liftedBase network networkConduit simpleSendfile
|
||||
|
|
|
|||
|
|
@ -1,11 +1,11 @@
|
|||
{ stdenv, fetchurl, fixedPoint ? false }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "libopus-1.0.1";
|
||||
name = "libopus-1.0.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://downloads.xiph.org/releases/opus/opus-1.0.1.tar.gz";
|
||||
sha256 = "1vs133z6c03xi1a7b8bkqxlb6ipwchawwb52z1lgvh1amwy5ryl0";
|
||||
url = "http://downloads.xiph.org/releases/opus/opus-1.0.2.tar.gz";
|
||||
sha256 = "12npbkrcwvh3fl9l18cwrxwg269cg2j6j7876cc9q0axxvdmwqfs";
|
||||
};
|
||||
|
||||
configureFlags = stdenv.lib.optionalString fixedPoint "--enable-fixed-point";
|
||||
|
|
|
|||
|
|
@ -1,14 +1,19 @@
|
|||
{stdenv, fetchurl, openssl, cyrus_sasl, db4, groff}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "openldap-2.4.31";
|
||||
name = "openldap-2.4.34";
|
||||
|
||||
src = fetchurl {
|
||||
url = "ftp://ftp.nl.uu.net/pub/unix/db/openldap/openldap-release/${name}.tgz";
|
||||
sha256 = "bde845840df4794b869a6efd6a6b1086f80989038e4844b2e4d7d6b57b39c5b6";
|
||||
sha256 = "01h6zq6zki9b1k07pbyps5vxj9w39ybzjvkyz5h9xk09dd54raza";
|
||||
};
|
||||
|
||||
buildInputs = [openssl cyrus_sasl db4 groff];
|
||||
buildInputs = [ openssl cyrus_sasl db4 groff ];
|
||||
|
||||
configureFlags =
|
||||
[ "--enable-overlays"
|
||||
] ++ stdenv.lib.optional (openssl == null) "--without-tls"
|
||||
++ stdenv.lib.optional (cyrus_sasl == null) "--without-cyrus-sasl";
|
||||
|
||||
dontPatchELF = 1; # !!!
|
||||
|
||||
|
|
|
|||
|
|
@ -2,10 +2,10 @@
|
|||
openssl, libpng, lua5}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "podofo-0.9.1";
|
||||
name = "podofo-0.9.2";
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/podofo/${name}.tar.gz";
|
||||
sha256 = "0icpxh1l1dpviq2zwy764dhg8y03zwyf4pgw4s7kb165nvh9v5kv";
|
||||
sha256 = "1wx3s0718rmhdzdwyi8hgpf2s92sk3hijy8f4glrmnjpiihr2la6";
|
||||
};
|
||||
propagatedBuildInputs = [ zlib freetype libjpeg libtiff fontconfig openssl libpng ];
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
|
|
|||
|
|
@ -1,11 +1,11 @@
|
|||
{ fetchurl, stdenv }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "cppi-1.16";
|
||||
name = "cppi-1.18";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnu/cppi/${name}.tar.xz";
|
||||
sha256 = "16i4j80wam7p189xc9i2ijrcgjn684296rym6ja3nlqv8rv90lm8";
|
||||
sha256 = "1jk42cjaggk71rimjnx3qpmb6hivps0917vl3z7wbxk3i2whb98j";
|
||||
};
|
||||
|
||||
doCheck = true;
|
||||
|
|
|
|||
|
|
@ -27,13 +27,13 @@ let
|
|||
sha256 = "5421559aa12b4debffef947f7e1039c22e9dffd87a4aa68445a687a20764ae81";
|
||||
};
|
||||
opam = fetchurl {
|
||||
url = "https://github.com/OCamlPro/opam/archive/0.9.5.zip";
|
||||
sha256 = "2ec706330a3283b4d057abc562c6078351988d0ae98ad507fe51cae598b43afd";
|
||||
url = "https://github.com/OCamlPro/opam/archive/1.0.0.zip";
|
||||
sha256 = "f8d94a91c2b8d110fa5e3b0a87c512a860acbae110654498a164c5c888c40bda";
|
||||
};
|
||||
};
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
name = "opam-0.9.5";
|
||||
name = "opam-1.0.0";
|
||||
|
||||
buildInputs = [unzip curl ncurses ocaml];
|
||||
|
||||
|
|
|
|||
|
|
@ -25,8 +25,8 @@ stdenv.mkDerivation rec {
|
|||
rm $out/bin/gogoc.conf.sample
|
||||
|
||||
substituteInPlace "$out/template/linux.sh" \
|
||||
--replace "/sbin/ifconfig" "${nettools}/sbin/ifconfig" \
|
||||
--replace "/sbin/route" "${nettools}/sbin/route" \
|
||||
--replace "/sbin/ifconfig" "${nettools}/bin/ifconfig" \
|
||||
--replace "/sbin/route" "${nettools}/bin/route" \
|
||||
--replace "/sbin/ip" "${iproute}/sbin/ip" \
|
||||
--replace "/sbin/sysctl" "${procps}/sbin/sysctl"
|
||||
sed -i -e 's/^.*Exec \$route -A.*$/& metric 128/' $out/template/linux.sh
|
||||
|
|
|
|||
|
|
@ -1,24 +1,41 @@
|
|||
{ stdenv, fetchurl, libsysfs, openssl }:
|
||||
{ stdenv, fetchurl, libsysfs, gnutls, openssl, libcap, sp, docbook_sgml_dtd_31
|
||||
, SGMLSpm }:
|
||||
|
||||
assert stdenv ? glibc;
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "iputils-20101006";
|
||||
let
|
||||
time = "20121221";
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
name = "iputils-${time}";
|
||||
|
||||
src = fetchurl {
|
||||
url = http://www.skbuff.net/iputils/iputils-s20101006.tar.bz2;
|
||||
sha256 = "1rvfvdnmzlmgy9a6xv5v4n785zmn10v2l7yaq83rdfgbh1ng8fpx";
|
||||
url = "http://www.skbuff.net/iputils/iputils-s${time}.tar.bz2";
|
||||
sha256 = "17riqp8dh8dvx32zv3hyrghpxz6xnxa6vai9b4yc485nqngm83s5";
|
||||
};
|
||||
|
||||
buildInputs = [ libsysfs openssl ];
|
||||
prePatch = ''
|
||||
sed -i s/sgmlspl/sgmlspl.pl/ doc/Makefile
|
||||
'';
|
||||
|
||||
# Urgh, it uses Make's `-l' dependency "feature".
|
||||
makeFlags = "VPATH=${libsysfs}/lib:${stdenv.glibc}/lib:${openssl}/lib";
|
||||
buildInputs = [ libsysfs gnutls openssl libcap sp docbook_sgml_dtd_31 SGMLSpm ];
|
||||
|
||||
buildFlags = "man all ninfod";
|
||||
|
||||
# Stdenv doesn't handle symlinks well for that
|
||||
dontGzipMan = true;
|
||||
|
||||
installPhase =
|
||||
''
|
||||
mkdir -p $out/sbin
|
||||
cp -p arping ping ping6 rdisc tracepath tracepath6 traceroute6 $out/sbin/
|
||||
mkdir -p $out/sbin $out/bin
|
||||
cp -p ping ping6 tracepath tracepath6 traceroute6 $out/bin/
|
||||
cp -p clockdiff arping rdisc ninfod/ninfod $out/sbin/
|
||||
|
||||
mkdir -p $out/share/man/man8
|
||||
cp -p doc/clockdiff.8 doc/arping.8 doc/ping.8 doc/rdisc.8 \
|
||||
doc/tracepath.8 doc/ninfod.8 $out/share/man/man8
|
||||
ln -s $out/share/man/man8/{ping,ping6}.8
|
||||
ln -s $out/share/man/man8/{tracepath,tracepath6}.8
|
||||
'';
|
||||
|
||||
meta = {
|
||||
|
|
|
|||
|
|
@ -251,7 +251,7 @@ in
|
|||
import ./generic.nix (
|
||||
|
||||
rec {
|
||||
version = "3.8.2";
|
||||
version = "3.8.3";
|
||||
testing = false;
|
||||
|
||||
preConfigure = ''
|
||||
|
|
@ -260,7 +260,7 @@ import ./generic.nix (
|
|||
|
||||
src = fetchurl {
|
||||
url = "mirror://kernel/linux/kernel/v3.x/${if testing then "testing/" else ""}linux-${version}.tar.xz";
|
||||
sha256 = "1i7r89ba79x6irr95gq1b0cnkbmdz3llh72vdamn83s3zh6cy1fv";
|
||||
sha256 = "15jdsnsswpah8936xmq6r1jpfsp1kbq643i4l0bgc6n749f512ig";
|
||||
};
|
||||
|
||||
config = configWithPlatform stdenv.platform;
|
||||
|
|
|
|||
|
|
@ -251,8 +251,8 @@ in
|
|||
import ./generic.nix (
|
||||
|
||||
rec {
|
||||
version = "3.9-rc1";
|
||||
modDirVersion = "3.9.0-rc1";
|
||||
version = "3.9-rc3";
|
||||
modDirVersion = "3.9.0-rc3";
|
||||
testing = true;
|
||||
|
||||
preConfigure = ''
|
||||
|
|
@ -261,7 +261,7 @@ import ./generic.nix (
|
|||
|
||||
src = fetchurl {
|
||||
url = "mirror://kernel/linux/kernel/v3.x/${if testing then "testing/" else ""}linux-${version}.tar.xz";
|
||||
sha256 = "1bm4fdk1v3dlhcqrzwzrf6fscvq7p7493f5ld5lbspaw8vb08690";
|
||||
sha256 = "1fbg952zzn6nkch2fpd1fzkwc6xsf66fnmkxrmc77yz8d29qddi5";
|
||||
};
|
||||
|
||||
config = configWithPlatform stdenv.platform;
|
||||
|
|
|
|||
30
pkgs/tools/misc/cloc/default.nix
Normal file
30
pkgs/tools/misc/cloc/default.nix
Normal file
|
|
@ -0,0 +1,30 @@
|
|||
{ stdenv, fetchurl, perl, AlgorithmDiff, RegexpCommon }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
|
||||
name = "cloc-${version}";
|
||||
|
||||
version = "1.58";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/cloc/cloc-${version}.tar.gz";
|
||||
sha256 = "1k92jldy4m717lh1xd6yachx3l2hhpx76qhj1ipnx12hsxw1zc8w";
|
||||
};
|
||||
|
||||
buildInputs = [ perl AlgorithmDiff RegexpCommon ];
|
||||
|
||||
unpackPhase = ''
|
||||
mkdir ${name}
|
||||
tar xf $src -C ${name}
|
||||
cd ${name}
|
||||
'';
|
||||
|
||||
makeFlags = [ "prefix=" "DESTDIR=$(out)" "INSTALL=install" ];
|
||||
|
||||
meta = {
|
||||
description = "A program that counts lines of source code";
|
||||
homepage = http://cloc.sourceforge.net;
|
||||
license = stdenv.lib.licenses.gpl2;
|
||||
};
|
||||
|
||||
}
|
||||
|
|
@ -8,6 +8,9 @@ stdenv.mkDerivation rec {
|
|||
sha256 = "0xvckv1ia5pjxk7fs4za6gz2njwmfd54sc464n8ab13096qxbw3q";
|
||||
};
|
||||
|
||||
patches = [ ./screen-4.0.3-caption-colors.patch
|
||||
./screen-4.0.3-long-term.patch ];
|
||||
|
||||
preConfigure = ''
|
||||
configureFlags="--enable-telnet --enable-pam --infodir=$out/share/info --mandir=$out/share/man --with-sys-screenrc=/etc/screenrc"
|
||||
sed -i -e "s|/usr/local|/non-existent|g" -e "s|/usr|/non-existent|g" configure Makefile.in */Makefile.in
|
||||
|
|
|
|||
25
pkgs/tools/misc/screen/screen-4.0.3-caption-colors.patch
Normal file
25
pkgs/tools/misc/screen/screen-4.0.3-caption-colors.patch
Normal file
|
|
@ -0,0 +1,25 @@
|
|||
# Source:
|
||||
# https://projects.archlinux.org/svntogit/packages.git/plain/screen/trunk/screen-4.0.3-caption-colors.patch
|
||||
# modified by hand for nixpkgs
|
||||
|
||||
From e6a28cf8bfdac15faa6c267bf476ddcaddf48d67 Mon Sep 17 00:00:00 2001
|
||||
From: Sadrul Habib Chowdhury <sadrul@users.sourceforge.net>
|
||||
Date: Tue, 26 Jan 2010 20:17:26 +0000
|
||||
Subject: Accommodate more color changes in the caption.
|
||||
|
||||
---
|
||||
diff --git a/src/screen.c b/src/screen.c
|
||||
index b1c3dfb..2cceae0 100644
|
||||
--- a/screen.c
|
||||
+++ b/screen.c
|
||||
@@ -2204,7 +2204,7 @@ static const char months[] = "JanFebMarAprMayJunJulAugSepOctNovDec";
|
||||
#endif
|
||||
|
||||
static char winmsg_buf[MAXSTR];
|
||||
-#define MAX_WINMSG_REND 16 /* rendition changes */
|
||||
+#define MAX_WINMSG_REND 256 /* rendition changes */
|
||||
static int winmsg_rend[MAX_WINMSG_REND];
|
||||
static int winmsg_rendpos[MAX_WINMSG_REND];
|
||||
static int winmsg_numrend;
|
||||
--
|
||||
cgit v0.8.3.4
|
||||
29
pkgs/tools/misc/screen/screen-4.0.3-long-term.patch
Normal file
29
pkgs/tools/misc/screen/screen-4.0.3-long-term.patch
Normal file
|
|
@ -0,0 +1,29 @@
|
|||
# Source:
|
||||
# https://projects.archlinux.org/svntogit/packages.git/plain/screen/trunk/screen-4.0.3-long-term.patch
|
||||
|
||||
# This fixes long terminal names handling, e.g. TERM=rxvt-unicode-256colors works
|
||||
# as expected.
|
||||
diff -Naur screen-4.0.3-orig//display.h screen-4.0.3/display.h
|
||||
--- screen-4.0.3-orig//display.h 2003-07-02 00:01:42.000000000 +1000
|
||||
+++ screen-4.0.3/display.h 2010-12-03 20:19:23.826671689 +1000
|
||||
@@ -85,7 +85,7 @@
|
||||
struct win *d_other; /* pointer to other window */
|
||||
int d_nonblock; /* -1 don't block if obufmax reached */
|
||||
/* >0: block after nonblock secs */
|
||||
- char d_termname[20 + 1]; /* $TERM */
|
||||
+ char d_termname[40 + 1]; /* $TERM */
|
||||
char *d_tentry; /* buffer for tgetstr */
|
||||
char d_tcinited; /* termcap inited flag */
|
||||
int d_width, d_height; /* width/height of the screen */
|
||||
diff -Naur screen-4.0.3-orig//screen.h screen-4.0.3/screen.h
|
||||
--- screen-4.0.3-orig//screen.h 2003-08-22 22:28:43.000000000 +1000
|
||||
+++ screen-4.0.3/screen.h 2010-12-03 20:19:43.163338333 +1000
|
||||
@@ -202,7 +202,7 @@
|
||||
char preselect[20];
|
||||
int esc; /* his new escape character unless -1 */
|
||||
int meta_esc; /* his new meta esc character unless -1 */
|
||||
- char envterm[20 + 1]; /* terminal type */
|
||||
+ char envterm[40 + 1]; /* terminal type */
|
||||
int encoding; /* encoding of display */
|
||||
}
|
||||
attach;
|
||||
|
|
@ -30,9 +30,9 @@ stdenv.mkDerivation rec {
|
|||
sed -i "3iexport PYTHONPATH=\$PYTHONPATH\$\{PYTHONPATH:+:\}$(toPythonPath $out):$(toPythonPath ${pygobject}):$(toPythonPath ${pythonDBus})" in/scripts=wicd.in
|
||||
sed -i "4iexport LC_ALL=\\\"${locale}\\\"" in/scripts=wicd.in
|
||||
sed -i "2iexport PATH=\$PATH\$\{PATH:+:\}${python}/bin" in/scripts=wicd-client.in
|
||||
sed -i "3iexport PYTHONPATH=\$PYTHONPATH\$\{PYTHONPATH:+:\}$(toPythonPath $out):$(toPythonPath ${pyGtkGlade})/gtk-2.0:$(toPythonPath ${pygobject}):$(toPythonPath ${pycairo}):$(toPythonPath ${pythonDBus})" in/scripts=wicd-client.in
|
||||
sed -i "3iexport PYTHONPATH=\$PYTHONPATH\$\{PYTHONPATH:+:\}$(toPythonPath $out):$(toPythonPath ${pyGtkGlade})/gtk-2.0:$(toPythonPath ${pygobject}):$(toPythonPath ${pygobject})/gtk-2.0:$(toPythonPath ${pycairo}):$(toPythonPath ${pythonDBus})" in/scripts=wicd-client.in
|
||||
sed -i "2iexport PATH=\$PATH\$\{PATH:+:\}${python}/bin" in/scripts=wicd-gtk.in
|
||||
sed -i "3iexport PYTHONPATH=\$PYTHONPATH\$\{PYTHONPATH:+:\}$(toPythonPath $out):$(toPythonPath ${pyGtkGlade})/gtk-2.0:$(toPythonPath ${pygobject}):$(toPythonPath ${pycairo}):$(toPythonPath ${pythonDBus})" in/scripts=wicd-gtk.in
|
||||
sed -i "3iexport PYTHONPATH=\$PYTHONPATH\$\{PYTHONPATH:+:\}$(toPythonPath $out):$(toPythonPath ${pyGtkGlade})/gtk-2.0:$(toPythonPath ${pygobject}):$(toPythonPath ${pygobject})/gtk-2.0:$(toPythonPath ${pycairo}):$(toPythonPath ${pythonDBus})" in/scripts=wicd-gtk.in
|
||||
sed -i "2iexport PATH=\$PATH\$\{PATH:+:\}${python}/bin" in/scripts=wicd-cli.in
|
||||
sed -i "3iexport PYTHONPATH=\$PYTHONPATH\$\{PYTHONPATH:+:\}$(toPythonPath $out):$(toPythonPath ${pyGtkGlade})/gtk-2.0:$(toPythonPath ${pygobject}):$(toPythonPath ${pycairo}):$(toPythonPath ${pythonDBus})" in/scripts=wicd-cli.in
|
||||
'';
|
||||
|
|
|
|||
|
|
@ -5,11 +5,11 @@
|
|||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "nix-1.4pre3056_79a3ba7";
|
||||
name = "nix-1.5.2pre3079_c3fc60d";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://hydra.nixos.org/build/4070551/download/5/${name}.tar.xz";
|
||||
sha256 = "7478fd6fea91ec094645e8487b9ef001abd300703d79e04743f4d212469cf13d";
|
||||
url = "http://hydra.nixos.org/build/4445767/download/5/${name}.tar.xz";
|
||||
sha256 = "0422ceb1439cf1140e86f86514bdcb04b0706881ea31a9f6ee5206b9faad009b";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ perl pkgconfig ];
|
||||
|
|
|
|||
|
|
@ -2,17 +2,17 @@
|
|||
|
||||
let
|
||||
driverdb = fetchurl {
|
||||
url = "http://smartmontools.svn.sourceforge.net/viewvc/smartmontools/trunk/smartmontools/drivedb.h?revision=3781";
|
||||
sha256 = "0m39ji2kf80dsws5ksg2pmkpn8x00lrlvl5nlc6ldjfss7sjvc9x";
|
||||
url = "http://smartmontools.svn.sourceforge.net/viewvc/smartmontools/trunk/smartmontools/drivedb.h?revision=3797";
|
||||
sha256 = "01ycm3vffxpfvfga9vp1d38jy3lqpkpxnxf78pidc8q1nn8bpdyz";
|
||||
name = "smartmontools-drivedb.h";
|
||||
};
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
name = "smartmontools-6.0";
|
||||
name = "smartmontools-6.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/smartmontools/${name}.tar.gz";
|
||||
sha256 = "9fe4ff2b7bcd00fde19db82bba168f5462ed6e857d3ef439495e304e3231d3a6";
|
||||
sha256 = "01yfv6hqsqandg6x8mnwa4g42hhqvc7dfxnfb3v849n8rj5kn059";
|
||||
};
|
||||
|
||||
patchPhase = ''
|
||||
|
|
|
|||
45
pkgs/tools/system/storebrowse/default.nix
Normal file
45
pkgs/tools/system/storebrowse/default.nix
Normal file
|
|
@ -0,0 +1,45 @@
|
|||
{ stdenv, fetchurl, fetchhg, go, sqlite}:
|
||||
|
||||
assert stdenv.isLinux && (stdenv.isi686 || stdenv.isx86_64 || stdenv.isArm);
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "storebrowse-20130318212204";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://viric.name/cgi-bin/storebrowse/tarball/storebrowse-775928f68e53.tar.gz?uuid=775928f68e53";
|
||||
name = "${name}.tar.gz";
|
||||
sha256 = "1yb8qbw95d9561s10k12a6lwv3my8h52arsbfcpizx74dwfsv7in";
|
||||
};
|
||||
|
||||
# This source has license BSD
|
||||
srcGoSqlite = fetchhg {
|
||||
url = "https://code.google.com/p/gosqlite/";
|
||||
tag = "5baefb109e18";
|
||||
sha256 = "0mqfnx06jj15cs8pq9msny2z18x99hgk6mchnaxpg343nzdiz4zk";
|
||||
};
|
||||
|
||||
buildPhase = ''
|
||||
PATH=${go}/bin:$PATH
|
||||
mkdir $TMPDIR/go
|
||||
export GOPATH=$TMPDIR/go
|
||||
|
||||
${stdenv.lib.optionalString (stdenv.system == "armv5tel-linux") "export GOARM=5"}
|
||||
|
||||
GOSQLITE=$GOPATH/src/code.google.com/p/gosqlite
|
||||
mkdir -p $GOSQLITE
|
||||
cp -R $srcGoSqlite/* $GOSQLITE/
|
||||
export CGO_CFLAGS=-I${sqlite}/include
|
||||
export CGO_LDFLAGS=-L${sqlite}/lib
|
||||
go build -ldflags "-r ${sqlite}/lib" -o storebrowse
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
ensureDir $out/bin
|
||||
cp storebrowse $out/bin
|
||||
'';
|
||||
|
||||
meta = {
|
||||
homepage = http://viric.name/cgi-bin/storebrowse;
|
||||
license = "AGPLv3+";
|
||||
};
|
||||
}
|
||||
|
|
@ -3,13 +3,17 @@
|
|||
stdenv.mkDerivation {
|
||||
name = "sp-compat-${builtins.substring 7 100 opensp.name}";
|
||||
|
||||
buildCommand = ''
|
||||
phases = [ "fixupPhase" "installPhase" ];
|
||||
|
||||
installPhase = ''
|
||||
mkdir -pv $out/bin
|
||||
for i in ${opensp}/bin/o*; do
|
||||
ln -sv $i $out/bin/''${i#${opensp}/bin/o}
|
||||
done
|
||||
'';
|
||||
|
||||
setupHook = opensp.setupHook;
|
||||
|
||||
meta.description =
|
||||
"Compatibility wrapper for old programs looking for original sp programs";
|
||||
}
|
||||
|
|
|
|||
|
|
@ -13,6 +13,8 @@ stdenv.mkDerivation {
|
|||
docsrc/*.xml
|
||||
'';
|
||||
|
||||
setupHook = ./setup-hook.sh;
|
||||
|
||||
buildInputs = [ xmlto docbook_xml_dtd_412 libxslt docbook_xsl ];
|
||||
|
||||
meta = {
|
||||
|
|
|
|||
22
pkgs/tools/text/sgml/opensp/setup-hook.sh
Normal file
22
pkgs/tools/text/sgml/opensp/setup-hook.sh
Normal file
|
|
@ -0,0 +1,22 @@
|
|||
addSGMLCatalogs () {
|
||||
if test -d $1/sgml/dtd; then
|
||||
for i in $(find $1/sgml/dtd -name docbook.cat); do
|
||||
export SGML_CATALOG_FILES="${SGML_CATALOG_FILES:+:}$i"
|
||||
done
|
||||
fi
|
||||
}
|
||||
|
||||
if test -z "$sgmlHookDone"; then
|
||||
sgmlHookDone=1
|
||||
|
||||
# Set http_proxy and ftp_proxy to a invalid host to prevent
|
||||
# xmllint and xsltproc from trying to download DTDs from the
|
||||
# network even when --nonet is not given. That would be impure.
|
||||
# (Note that .invalid is a reserved domain guaranteed not to
|
||||
# work.)
|
||||
export http_proxy=http://nodtd.invalid/
|
||||
export ftp_proxy=http://nodtd.invalid/
|
||||
|
||||
export SGML_CATALOG_FILES
|
||||
envHooks=(${envHooks[@]} addSGMLCatalogs)
|
||||
fi
|
||||
|
|
@ -66,7 +66,7 @@ rec {
|
|||
else if dep.type == "tex" then [".tex" ""]
|
||||
else [""];
|
||||
fn = pkgs.lib.findFirst (fn: builtins.pathExists fn) null
|
||||
(map (ext: "${dirOf key}/${dep.name}${ext}") exts);
|
||||
(map (ext: dirOf key + ("/" + dep.name + ext)) exts);
|
||||
in if fn != null then [{key = fn;}] ++ xs
|
||||
else xs;
|
||||
|
||||
|
|
@ -90,8 +90,8 @@ rec {
|
|||
{ src = key; }
|
||||
"${pkgs.stdenv.bash}/bin/bash ${./find-lhs2tex-includes.sh}");
|
||||
|
||||
in pkgs.lib.concatMap (x : if builtins.pathExists x then [{key = x;}] else [])
|
||||
(map (x : "${dirOf key}/${x}") deps);
|
||||
in pkgs.lib.concatMap (x: if builtins.pathExists x then [{key = x;}] else [])
|
||||
(map (x: dirOf key + ("/" + x)) deps);
|
||||
};
|
||||
|
||||
dot2pdf =
|
||||
|
|
|
|||
|
|
@ -587,6 +587,10 @@ let
|
|||
|
||||
clamav = callPackage ../tools/security/clamav { };
|
||||
|
||||
cloc = callPackage ../tools/misc/cloc {
|
||||
inherit (perlPackages) perl AlgorithmDiff RegexpCommon;
|
||||
};
|
||||
|
||||
cloog = callPackage ../development/libraries/cloog { };
|
||||
|
||||
cloogppl = callPackage ../development/libraries/cloog-ppl { };
|
||||
|
|
@ -1279,7 +1283,9 @@ let
|
|||
|
||||
opendkim = callPackage ../development/libraries/opendkim { };
|
||||
|
||||
openjade = callPackage ../tools/text/sgml/openjade { };
|
||||
openjade = callPackage ../tools/text/sgml/openjade {
|
||||
perl = perl510;
|
||||
};
|
||||
|
||||
openobex = callPackage ../tools/bluetooth/openobex { };
|
||||
|
||||
|
|
@ -1565,6 +1571,8 @@ let
|
|||
inherit (gnome) libgnomeui scrollkeeper;
|
||||
};
|
||||
|
||||
storebrowse = callPackage ../tools/system/storebrowse { };
|
||||
|
||||
fusesmb = callPackage ../tools/filesystems/fusesmb { };
|
||||
|
||||
socat = callPackage ../tools/networking/socat { };
|
||||
|
|
@ -5741,7 +5749,10 @@ let
|
|||
|
||||
iproute = callPackage ../os-specific/linux/iproute { };
|
||||
|
||||
iputils = callPackage ../os-specific/linux/iputils { };
|
||||
iputils = callPackage ../os-specific/linux/iputils {
|
||||
sp = spCompat;
|
||||
inherit (perlPackages) SGMLSpm;
|
||||
};
|
||||
|
||||
iptables = callPackage ../os-specific/linux/iptables { };
|
||||
|
||||
|
|
@ -6425,6 +6436,8 @@ let
|
|||
|
||||
docbook5 = callPackage ../data/sgml+xml/schemas/docbook-5.0 { };
|
||||
|
||||
docbook_sgml_dtd_31 = callPackage ../data/sgml+xml/schemas/sgml-dtd/docbook/3.1.nix { };
|
||||
|
||||
docbook_sgml_dtd_41 = callPackage ../data/sgml+xml/schemas/sgml-dtd/docbook/4.1.nix { };
|
||||
|
||||
docbook_xml_dtd_412 = callPackage ../data/sgml+xml/schemas/xml-dtd/docbook/4.1.2.nix { };
|
||||
|
|
@ -7858,6 +7871,9 @@ let
|
|||
wrapPython = pythonPackages.wrapPython;
|
||||
};
|
||||
|
||||
# This builds the gtk client
|
||||
transmission_260 = callPackage ../applications/networking/p2p/transmission/2.60.nix { };
|
||||
|
||||
transmission = callPackage ../applications/networking/p2p/transmission { };
|
||||
|
||||
transmission_remote_gtk = callPackage ../applications/networking/p2p/transmission-remote-gtk {};
|
||||
|
|
@ -8892,14 +8908,10 @@ 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 { };
|
||||
|
||||
|
|
@ -9054,6 +9066,8 @@ let
|
|||
|
||||
vice = callPackage ../misc/emulators/vice { };
|
||||
|
||||
viewnior = callPackage ../applications/graphics/viewnior { };
|
||||
|
||||
vimprobable2 = callPackage ../applications/networking/browsers/vimprobable2 {
|
||||
inherit (gnome) libsoup;
|
||||
webkit = webkit_gtk2;
|
||||
|
|
|
|||
|
|
@ -135,14 +135,14 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
|
|||
async = self.async_2_0_1_4; # 7.6 ok
|
||||
cgi = self.cgi_3001_1_8_3; # 7.6 ok
|
||||
fgl = self.fgl_5_4_2_4; # 7.6 ok
|
||||
GLUT = self.GLUT_2_3_1_0; # 7.6 ok
|
||||
GLUT = self.GLUT_2_4_0_0; # 7.6 ok
|
||||
haskellSrc = self.haskellSrc_1_0_1_5; # 7.6 ok
|
||||
html = self.html_1_0_1_2; # 7.6 ok
|
||||
HTTP = self.HTTP_4000_2_8; # 7.6 ok
|
||||
HUnit = self.HUnit_1_2_5_1; # 7.6 ok
|
||||
mtl = self.mtl_2_1_2; # 7.6 ok
|
||||
network = self.network_2_4_1_2; # 7.6 ok
|
||||
OpenGL = self.OpenGL_2_6_0_1; # 7.6 ok
|
||||
OpenGL = self.OpenGL_2_8_0_0; # 7.6 ok
|
||||
parallel = self.parallel_3_2_0_3; # 7.6 ok
|
||||
parsec = self.parsec_3_1_3; # 7.6 ok
|
||||
QuickCheck = self.QuickCheck_2_6; # 7.6 ok
|
||||
|
|
@ -489,6 +489,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
|
|||
|
||||
authenticate = callPackage ../development/libraries/haskell/authenticate {};
|
||||
|
||||
authenticateOauth = callPackage ../development/libraries/haskell/authenticate-oauth {};
|
||||
|
||||
base16Bytestring = callPackage ../development/libraries/haskell/base16-bytestring {};
|
||||
|
||||
base64String = callPackage ../development/libraries/haskell/base64-string {};
|
||||
|
|
@ -583,6 +585,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
|
|||
|
||||
cereal = callPackage ../development/libraries/haskell/cereal {};
|
||||
|
||||
cerealConduit = callPackage ../development/libraries/haskell/cereal-conduit {};
|
||||
|
||||
certificate = callPackage ../development/libraries/haskell/certificate {};
|
||||
|
||||
cgi_3001_1_7_1 = callPackage ../development/libraries/haskell/cgi/3001.1.7.1.nix {};
|
||||
|
|
@ -924,7 +928,10 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
|
|||
GLUT_2_3_1_0 = callPackage ../development/libraries/haskell/GLUT/2.3.1.0.nix {
|
||||
OpenGL = self.OpenGL_2_6_0_1;
|
||||
};
|
||||
GLUT = self.GLUT_2_3_1_0;
|
||||
GLUT_2_4_0_0 = callPackage ../development/libraries/haskell/GLUT/2.4.0.0.nix {
|
||||
OpenGL = self.OpenGL_2_8_0_0;
|
||||
};
|
||||
GLUT = self.GLUT_2_4_0_0;
|
||||
|
||||
gnuidn = callPackage ../development/libraries/haskell/gnuidn {};
|
||||
|
||||
|
|
@ -1258,8 +1265,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
|
|||
monadLogger = callPackage ../development/libraries/haskell/monad-logger {};
|
||||
|
||||
monadPar_0_1_0_3 = callPackage ../development/libraries/haskell/monad-par/0.1.0.3.nix {};
|
||||
monadPar_0_3_4 = callPackage ../development/libraries/haskell/monad-par/0.3.4.nix {};
|
||||
monadPar = self.monadPar_0_3_4;
|
||||
monadPar_0_3_4_1 = callPackage ../development/libraries/haskell/monad-par/0.3.4.1.nix {};
|
||||
monadPar = self.monadPar_0_3_4_1;
|
||||
|
||||
monadParExtras = callPackage ../development/libraries/haskell/monad-par-extras {};
|
||||
|
||||
|
|
@ -1275,6 +1282,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
|
|||
|
||||
mongoDB = callPackage ../development/libraries/haskell/mongoDB {};
|
||||
|
||||
mmorph = callPackage ../development/libraries/haskell/mmorph {};
|
||||
|
||||
mpppc = callPackage ../development/libraries/haskell/mpppc {};
|
||||
|
||||
mtl_1_1_0_2 = callPackage ../development/libraries/haskell/mtl/1.1.0.2.nix {};
|
||||
|
|
@ -1318,6 +1327,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
|
|||
|
||||
netlistToVhdl = callPackage ../development/libraries/haskell/netlist-to-vhdl {};
|
||||
|
||||
netwire = callPackage ../development/libraries/haskell/netwire {};
|
||||
|
||||
network_2_2_1_4 = callPackage ../development/libraries/haskell/network/2.2.1.4.nix {};
|
||||
network_2_2_1_7 = callPackage ../development/libraries/haskell/network/2.2.1.7.nix {};
|
||||
network_2_3_0_2 = callPackage ../development/libraries/haskell/network/2.3.0.2.nix {};
|
||||
|
|
@ -1368,7 +1379,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
|
|||
OpenGL_2_2_3_1 = callPackage ../development/libraries/haskell/OpenGL/2.2.3.1.nix {};
|
||||
OpenGL_2_4_0_2 = callPackage ../development/libraries/haskell/OpenGL/2.4.0.2.nix {};
|
||||
OpenGL_2_6_0_1 = callPackage ../development/libraries/haskell/OpenGL/2.6.0.1.nix {};
|
||||
OpenGL = self.OpenGL_2_6_0_1;
|
||||
OpenGL_2_8_0_0 = callPackage ../development/libraries/haskell/OpenGL/2.8.0.0.nix {};
|
||||
OpenGL = self.OpenGL_2_8_0_0;
|
||||
|
||||
OpenGLRaw = callPackage ../development/libraries/haskell/OpenGLRaw {};
|
||||
|
||||
|
|
@ -1687,6 +1699,10 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
|
|||
stm_2_4_2 = callPackage ../development/libraries/haskell/stm/2.4.2.nix {};
|
||||
stm = self.stm_2_4_2;
|
||||
|
||||
stmChans = callPackage ../development/libraries/haskell/stm-chans {};
|
||||
|
||||
stmConduit = callPackage ../development/libraries/haskell/stm-conduit {};
|
||||
|
||||
storableComplex = callPackage ../development/libraries/haskell/storable-complex {};
|
||||
|
||||
storableRecord = callPackage ../development/libraries/haskell/storable-record {};
|
||||
|
|
|
|||
|
|
@ -4179,6 +4179,14 @@ rec {
|
|||
};
|
||||
};
|
||||
|
||||
SGMLSpm = buildPerlPackage {
|
||||
name = "SGMLSpm-1.1";
|
||||
src = fetchurl {
|
||||
url = mirror://cpan/authors/id/R/RA/RAAB/SGMLSpm-1.1.tar.gz;
|
||||
sha256 = "1gdjf3mcz2bxir0l9iljxiz6qqqg3a9gg23y5wjg538w552r432m";
|
||||
};
|
||||
};
|
||||
|
||||
Socket6 = buildPerlPackage rec {
|
||||
name = "Socket6-0.23";
|
||||
src = fetchurl {
|
||||
|
|
|
|||
|
|
@ -124,13 +124,13 @@ pythonPackages = python.modules // rec {
|
|||
|
||||
|
||||
alot = buildPythonPackage rec {
|
||||
rev = "c765ebd6041a845a800cc9fd30705102ae2d040f";
|
||||
name = "alot-0.3.3_${rev}";
|
||||
rev = "d3c1880a60ddd8ded397d92cddf310a948b97fdc";
|
||||
name = "alot-0.3.4_${rev}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/pazz/alot/tarball/${rev}";
|
||||
name = "${name}.tar.bz";
|
||||
sha256 = "0yyp3nz5n1zfwf0l4rkkphq5l6prd988b57ighnmi2samzqa9yv4";
|
||||
sha256 = "049fzxs83zry5xr3al5wjvh7bcjq63wilf9wxh2c6sjmg96kpvvl";
|
||||
};
|
||||
|
||||
# error: invalid command 'test'
|
||||
|
|
@ -1049,17 +1049,18 @@ pythonPackages = python.modules // rec {
|
|||
|
||||
|
||||
flake8 = buildPythonPackage (rec {
|
||||
name = "flake8-1.7.0";
|
||||
name = "flake8-2.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://pypi.python.org/packages/source/f/flake8/${name}.tar.gz";
|
||||
md5 = "a7830d1a6c23e889bc1fcaa4a87f53bd";
|
||||
md5 = "176c6b3613777122721db181560aa1e3";
|
||||
};
|
||||
|
||||
buildInputs = [ nose ];
|
||||
propagatedBuildInputs = [ pyflakes pep8 mccabe ];
|
||||
|
||||
# 3 failing tests
|
||||
doCheck = false;
|
||||
#doCheck = false;
|
||||
|
||||
meta = {
|
||||
description = "code checking using pep8 and pyflakes.";
|
||||
|
|
@ -1321,11 +1322,11 @@ pythonPackages = python.modules // rec {
|
|||
});
|
||||
|
||||
httplib2 = buildPythonPackage rec {
|
||||
name = "httplib2-0.7.7";
|
||||
name = "httplib2-0.8";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://httplib2.googlecode.com/files/${name}.tar.gz";
|
||||
sha256 = "2e2ce18092c32d1ec54f8a447e14e33585e30f240b883bfeeca65f12b3bcfaf6";
|
||||
sha256 = "0gww8axb4j1vysbk9kfsk5vrws9a403gh30dxchmga8hrg1rns5g";
|
||||
};
|
||||
|
||||
meta = {
|
||||
|
|
@ -1388,6 +1389,16 @@ pythonPackages = python.modules // rec {
|
|||
propagatedBuildInputs = [ ipython ];
|
||||
};
|
||||
|
||||
ipdbplugin = buildPythonPackage {
|
||||
name = "ipdbplugin-1.2";
|
||||
src = fetchurl {
|
||||
url = "https://pypi.python.org/packages/source/i/ipdbplugin/ipdbplugin-1.2.tar.gz";
|
||||
md5 = "39169b00a2186b99469249c5b0613753";
|
||||
};
|
||||
propagatedBuildInputs = [ nose ipython ];
|
||||
};
|
||||
|
||||
|
||||
jedi = buildPythonPackage (rec {
|
||||
name = "jedi-0.5b5";
|
||||
|
||||
|
|
@ -1651,6 +1662,25 @@ pythonPackages = python.modules // rec {
|
|||
});
|
||||
|
||||
|
||||
mccabe = buildPythonPackage (rec {
|
||||
name = "mccabe-0.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://pypi.python.org/packages/source/m/mccabe/${name}.tar.gz";
|
||||
md5 = "c1012c7c24081471f45aab864d4e3805";
|
||||
};
|
||||
|
||||
buildInputs = [ ];
|
||||
|
||||
meta = {
|
||||
description = "McCabe checker, plugin for flake8";
|
||||
homepage = "https://github.com/flintwork/mccabe";
|
||||
license = pkgs.lib.licenses.mit;
|
||||
maintainers = [ stdenv.lib.maintainers.garbas ];
|
||||
};
|
||||
});
|
||||
|
||||
|
||||
mechanize = buildPythonPackage (rec {
|
||||
name = "mechanize-0.1.11";
|
||||
|
||||
|
|
@ -2183,17 +2213,32 @@ pythonPackages = python.modules // rec {
|
|||
|
||||
pep8 = buildPythonPackage rec {
|
||||
name = "pep8-${version}";
|
||||
version = "1.3.3";
|
||||
version = "1.4.5";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://pypi.python.org/packages/source/p/pep8/${name}.tar.gz";
|
||||
md5 = "093a99ced0cc3b58c01549d7350f5a73";
|
||||
md5 = "055dbd22ac5669232fdba752612e9686";
|
||||
};
|
||||
|
||||
#======================================================================
|
||||
#FAIL: test_check_simple (testsuite.test_shell.ShellTestCase)
|
||||
#----------------------------------------------------------------------
|
||||
#Traceback (most recent call last):
|
||||
# File "/tmp/nix-build-python-pep8-1.4.5.drv-0/pep8-1.4.5/testsuite/test_shell.py", line 84, in test_check_simple
|
||||
# self.assertTrue(config_filename.endswith('tox.ini'))
|
||||
#AssertionError: False is not true
|
||||
#
|
||||
#----------------------------------------------------------------------
|
||||
#Ran 21 tests in 0.711s
|
||||
#
|
||||
#FAILED (failures=1)
|
||||
doCheck = false;
|
||||
|
||||
meta = {
|
||||
homepage = http://pypi.python.org/pypi/pep8/;
|
||||
homepage = "http://pep8.readthedocs.org/";
|
||||
description = "Python style guide checker";
|
||||
license = pkgs.lib.licenses.mit;
|
||||
maintainers = [ stdenv.lib.maintainers.garbas ];
|
||||
};
|
||||
};
|
||||
|
||||
|
|
@ -2530,6 +2575,24 @@ pythonPackages = python.modules // rec {
|
|||
};
|
||||
};
|
||||
|
||||
pyflakes = buildPythonPackage rec {
|
||||
name = "pyflakes-0.6.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://pypi.python.org/packages/source/p/pyflakes/${name}.tar.gz";
|
||||
md5 = "00debd2280b962e915dfee552a675915";
|
||||
};
|
||||
|
||||
buildInputs = [ unittest2 ];
|
||||
|
||||
meta = {
|
||||
homepage = "https://launchpad.net/pyflakes";
|
||||
description = "A simple program which checks Python source files for errors.";
|
||||
license = pkgs.lib.licenses.mit;
|
||||
maintainers = [ stdenv.lib.maintainers.garbas ];
|
||||
};
|
||||
};
|
||||
|
||||
pyglet = buildPythonPackage rec {
|
||||
name = "pyglet-1.1.4";
|
||||
|
||||
|
|
@ -3641,11 +3704,11 @@ pythonPackages = python.modules // rec {
|
|||
|
||||
|
||||
turses = buildPythonPackage (rec {
|
||||
name = "turses-0.2.12";
|
||||
name = "turses-0.2.13";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://pypi.python.org/packages/source/t/turses/${name}.tar.gz";
|
||||
sha256 = "016fw2ch1gy3rrlfjsdpd6y11mkrbjw4h84h7954k2vhc84l1gm0";
|
||||
sha256 = "0sygm40z04zifcfqwby8wwwnj3i1bpl41r7xgnjcipxwirjmnp2k";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ oauth2 urwid tweepy ] ++ optional isPy26 argparse;
|
||||
|
|
|
|||
Loading…
Reference in a new issue