svn merge ^/nixpkgs/trunk
svn path=/nixpkgs/branches/libpng15/; revision=31987
This commit is contained in:
Yury G. Kudryashov
commit
df037ddafd
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
assert stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux";
|
||||
|
||||
let version = "0.6.2.291"; in
|
||||
let version = "0.6.6.10"; in
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "spotify-${version}";
|
||||
|
|
@ -10,13 +10,13 @@ stdenv.mkDerivation {
|
|||
src =
|
||||
if stdenv.system == "i686-linux" then
|
||||
fetchurl {
|
||||
url = "http://repository.spotify.com/pool/non-free/s/spotify/spotify-client-qt_${version}.gcccc1f5.116-1_i386.deb";
|
||||
sha256 = "164ka9xry9nbnv77w71kzi7bjidlmccw8wnn4fyzavi8pbrpmj08";
|
||||
url = "http://repository.spotify.com/pool/non-free/s/spotify/spotify-client-qt_${version}.gbd39032.58-1_i386.deb";
|
||||
sha256 = "184wvw2jqihw7bbmd7pgz51nkzvk777imz9pvknv52mggai61523";
|
||||
}
|
||||
else if stdenv.system == "x86_64-linux" then
|
||||
fetchurl {
|
||||
url = "http://repository.spotify.com/pool/non-free/s/spotify/spotify-client-qt_${version}.gcccc1f5.116-1_amd64.deb";
|
||||
sha256 = "08snnpqd5ldiqv98pwx3fjrhdlwp4arbgda9xnsy92wfk0s85lv8";
|
||||
url = "http://repository.spotify.com/pool/non-free/s/spotify/spotify-client-qt_${version}.gbd39032.58-1_amd64.deb";
|
||||
sha256 = "0qy4dgcl4y8ymqk8i9vgabik7mq0niqpbkwl3sk8z66znax4am4c";
|
||||
}
|
||||
else throw "Spotify not supported on this platform.";
|
||||
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load Diff
|
|
@ -1,21 +0,0 @@
|
|||
{stdenv, fetchurl, alsaLib, esound, libogg, libvorbis, glib, gtk}:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "xmms-1.2.10";
|
||||
|
||||
src = fetchurl {
|
||||
url = http://nixos.org/tarballs/xmms-1.2.10.tar.bz2;
|
||||
md5 = "03a85cfc5e1877a2e1f7be4fa1d3f63c";
|
||||
};
|
||||
|
||||
# Patch borrowed from SuSE 10.0 to fix pause/continue on ALSA.
|
||||
patches = [./alsa.patch];
|
||||
|
||||
buildInputs = [alsaLib esound libogg libvorbis glib gtk];
|
||||
|
||||
meta = {
|
||||
description = "A music player very similar to Winamp";
|
||||
homepage = http://www.xmms.org;
|
||||
platforms = stdenv.lib.platforms.linux;
|
||||
};
|
||||
}
|
||||
|
|
@ -3,13 +3,13 @@
|
|||
assert stdenv.system == "i686-linux";
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "adobe-reader-9.4.2-1";
|
||||
name = "adobe-reader-9.4.7-1";
|
||||
|
||||
builder = ./builder.sh;
|
||||
|
||||
src = fetchurl {
|
||||
url = http://ardownload.adobe.com/pub/adobe/reader/unix/9.x/9.4.2/enu/AdbeRdr9.4.2-1_i486linux_enu.tar.bz2;
|
||||
sha256 = "0xm8ngr7lslhxli9ly1g2w7ichip88vpf7lfx1ma0liaw4m2gv0h";
|
||||
url = http://ardownload.adobe.com/pub/adobe/reader/unix/9.x/9.4.7/enu/AdbeRdr9.4.7-1_i486linux_enu.tar.bz2;
|
||||
sha256 = "0bzx1rcwc9bi5jkh8f8hjb354zxlvvx37lhm0l2r0mjxj8fimfb5";
|
||||
};
|
||||
|
||||
# !!! Adobe Reader contains copies of OpenSSL, libcurl, and libicu.
|
||||
|
|
|
|||
|
|
@ -13,14 +13,14 @@ assert monotoneSupport -> (monotone != null);
|
|||
|
||||
let
|
||||
name = "ikiwiki";
|
||||
version = "3.20120109";
|
||||
version = "3.20120115";
|
||||
in
|
||||
stdenv.mkDerivation {
|
||||
name = "${name}-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://ftp.de.debian.org/debian/pool/main/i/ikiwiki/${name}_${version}.tar.gz";
|
||||
sha256 = "0a47135c039f3dfd62162dd3b250397fcdab2dbb4bf4cf0433099f6e48d6f3e8";
|
||||
sha256 = "3145372b3d86068f90348a96f9daf3a3b438d747be0e977358d82ee752499c1f";
|
||||
};
|
||||
|
||||
buildInputs = [ perl TextMarkdown URI HTMLParser HTMLScrubber HTMLTemplate
|
||||
|
|
|
|||
|
|
@ -40,17 +40,17 @@ library, use the 'NOGUI' parameter:
|
|||
$ make NOGUI=1
|
||||
*/
|
||||
|
||||
{ fetchurl, stdenv, pkgconfig, fuse, wxGTK, devicemapper,
|
||||
{ fetchurl, stdenv, pkgconfig, nasm, fuse, wxGTK, devicemapper,
|
||||
wxGUI ? true
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "truecrypt-6.3a";
|
||||
name = "truecrypt-7.1";
|
||||
builder = ./builder.sh;
|
||||
|
||||
src = fetchurl {
|
||||
url = http://www.sfr-fresh.com/unix/misc/TrueCrypt_6.3a_Source.tar.gz;
|
||||
sha256 = "1vwnzay9gjlldqbdb20rhq2arhyzhdy347qc00hkpqmv2b8z070y";
|
||||
url = http://fossies.org/unix/misc/TrueCrypt-7.1-Source.tar.gz;
|
||||
sha256 = "1x6rdxcvklb3zpmgfc3mg5h71gzki1q55ljkzjab2vzkf9n5v0cl";
|
||||
};
|
||||
|
||||
pkcs11h = fetchurl {
|
||||
|
|
@ -68,7 +68,7 @@ stdenv.mkDerivation {
|
|||
sha256 = "5ae6a4f32ca737e02def3bf314c9842fb89be82bf00b6f4022a97d8d565522b8";
|
||||
};
|
||||
|
||||
buildInputs = [ pkgconfig fuse devicemapper wxGTK ];
|
||||
buildInputs = [ pkgconfig fuse devicemapper wxGTK nasm ];
|
||||
makeFlags = if (wxGUI) then "" else "NOGUI=1";
|
||||
|
||||
meta = {
|
||||
|
|
|
|||
|
|
@ -15,14 +15,14 @@ assert stdenv.gcc ? libc && stdenv.gcc.libc != null;
|
|||
|
||||
rec {
|
||||
|
||||
firefoxVersion = "8.0.1";
|
||||
firefoxVersion = "10.0";
|
||||
|
||||
xulVersion = "8.0.1"; # this attribute is used by other packages
|
||||
xulVersion = "10.0"; # this attribute is used by other packages
|
||||
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://releases.mozilla.org/pub/mozilla.org/firefox/releases/${firefoxVersion}/source/firefox-${firefoxVersion}.source.tar.bz2";
|
||||
sha1 = "0dd207c5cee9d53114c55aa23eeca36b754bc128";
|
||||
sha1 = "cbf1fb0efe0a3a2b2dafaa324b136736e93de70c";
|
||||
};
|
||||
|
||||
commonConfigureFlags =
|
||||
|
|
@ -139,7 +139,7 @@ rec {
|
|||
[ "--enable-application=browser"
|
||||
"--with-libxul-sdk=${xulrunner}/lib/xulrunner-devel-${xulrunner.version}"
|
||||
"--enable-chrome-format=jar"
|
||||
"--disable-elf-hack"
|
||||
"--disable-elf-hack"
|
||||
]
|
||||
++ commonConfigureFlags
|
||||
++ stdenv.lib.optional enableOfficialBranding "--enable-official-branding";
|
||||
|
|
@ -1,33 +1,44 @@
|
|||
a :
|
||||
let
|
||||
s = import ./src-for-default.nix;
|
||||
buildInputs = with a; [
|
||||
libpng libjpeg bzip2 zlib libtiff
|
||||
libX11 libXau xproto gpm
|
||||
openssl libXt pkgconfig
|
||||
];
|
||||
in
|
||||
rec {
|
||||
src = a.fetchUrlFromSrcInfo s;
|
||||
{ stdenv, fetchurl
|
||||
, gpm, openssl, pkgconfig # Misc.
|
||||
, libpng, libjpeg, libtiff # graphic formats
|
||||
, bzip2, zlib, xz # Transfer encodings
|
||||
, enableFB ? true
|
||||
, enableDirectFB ? false, directfb
|
||||
, enableX11 ? true, libX11, libXt, libXau # GUI support
|
||||
}:
|
||||
|
||||
inherit (s) name;
|
||||
inherit buildInputs;
|
||||
configureFlags = [
|
||||
"--enable-graphics"
|
||||
"--with-ssl"
|
||||
"--with-x"
|
||||
"--with-fb"
|
||||
];
|
||||
stdenv.mkDerivation rec {
|
||||
version = "2.5";
|
||||
name = "links2-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "${meta.homepage}/download/links-${version}.tar.bz2";
|
||||
sha256 = "1wlmj8s6bxgznh0pnawihyvhffzryciz3lkagcxhf7fp64zz5izm";
|
||||
};
|
||||
|
||||
buildInputs =
|
||||
[ libpng libjpeg libtiff gpm openssl xz bzip2 zlib ]
|
||||
++ stdenv.lib.optionals enableX11 [ libX11 libXau libXt ]
|
||||
++ stdenv.lib.optional enableDirectFB [ directfb ];
|
||||
|
||||
buildNativeInputs = [ pkgconfig ];
|
||||
|
||||
configureFlags = [ "--with-ssl" ]
|
||||
++ stdenv.lib.optional (enableX11 || enableFB || enableDirectFB) "--enable-graphics"
|
||||
++ stdenv.lib.optional enableX11 "--with-x"
|
||||
++ stdenv.lib.optional enableFB "--with-fb"
|
||||
++ stdenv.lib.optional enableDirectFB "--with-directfb";
|
||||
|
||||
crossAttrs = {
|
||||
preConfigure = ''
|
||||
export CC=$crossConfig-gcc
|
||||
'';
|
||||
};
|
||||
|
||||
/* doConfigure should be removed if not needed */
|
||||
phaseNames = ["doConfigure" "doMakeInstall"];
|
||||
|
||||
meta = {
|
||||
homepage = http://links.twibright.com/;
|
||||
description = "A small browser with some graphics support";
|
||||
maintainers = [
|
||||
a.lib.maintainers.raskin
|
||||
];
|
||||
platforms = with a.lib.platforms;
|
||||
linux;
|
||||
maintainers = with stdenv.lib.maintainers; [ raskin urkud viric ];
|
||||
platforms = stdenv.lib.platforms.linux;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,9 +0,0 @@
|
|||
rec {
|
||||
version="2.2";
|
||||
name="links2-2.2";
|
||||
hash="188y37rw4s9brl55ncc12q1b45w0caxcnsq1gqyby9byw1sawnq9";
|
||||
url="http://links.twibright.com/download/links-${version}.tar.gz";
|
||||
advertisedUrl="http://links.twibright.com/download/links-2.2.tar.gz";
|
||||
|
||||
|
||||
}
|
||||
|
|
@ -1,4 +0,0 @@
|
|||
{
|
||||
downloadPage = "http://links.twibright.com/download.php";
|
||||
baseName = "links2";
|
||||
}
|
||||
|
|
@ -1,41 +0,0 @@
|
|||
{ stdenv, fetchurl, libpng, libjpeg, bzip2, zlib, libtiff, gpm, openssl, pkgconfig, directfb
|
||||
, enableX11 ? true, libX11, libXau, xproto, libXt }:
|
||||
|
||||
let
|
||||
version="2.2";
|
||||
name="links2-2.2";
|
||||
hash="188y37rw4s9brl55ncc12q1b45w0caxcnsq1gqyby9byw1sawnq9";
|
||||
url="http://links.twibright.com/download/links-${version}.tar.gz";
|
||||
advertisedUrl="http://links.twibright.com/download/links-2.2.tar.gz";
|
||||
in
|
||||
|
||||
stdenv.mkDerivation {
|
||||
inherit name;
|
||||
|
||||
src = fetchurl {
|
||||
inherit url;
|
||||
sha256 = hash;
|
||||
};
|
||||
|
||||
buildInputs = [ libpng libjpeg bzip2 zlib libtiff gpm openssl pkgconfig directfb ]
|
||||
++ stdenv.lib.optionals enableX11 [ libX11 libXau xproto libXt ];
|
||||
|
||||
configureFlags = [
|
||||
"--enable-graphics"
|
||||
"--with-ssl"
|
||||
"--with-fb"
|
||||
] ++ stdenv.lib.optional enableX11 "--with-x";
|
||||
|
||||
crossAttrs = {
|
||||
preConfigure = ''
|
||||
export CC=$crossConfig-gcc
|
||||
'';
|
||||
};
|
||||
|
||||
meta = {
|
||||
description = "A small browser with some graphics support";
|
||||
maintainers = [
|
||||
stdenv.lib.maintainers.viric
|
||||
];
|
||||
};
|
||||
}
|
||||
|
|
@ -1,6 +1,6 @@
|
|||
{ stdenv, fetchurl, alsaLib, libXv, libXi, libXrender, libXrandr, zlib, glib
|
||||
, libXext, libX11, libXScrnSaver, libSM, qt4, libICE, freetype, fontconfig
|
||||
, pulseaudio }:
|
||||
, pulseaudio, usePulseAudio, lib }:
|
||||
|
||||
assert stdenv.system == "i686-linux";
|
||||
|
||||
|
|
@ -12,9 +12,9 @@ stdenv.mkDerivation rec {
|
|||
sha256 = "157ba3ci12bq0nv2m8wlsab45ib5sccqagyna8nixnhqw9q72sxm";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
buildInputs =
|
||||
lib.optional usePulseAudio pulseaudio ++ [
|
||||
alsaLib
|
||||
pulseaudio
|
||||
stdenv.glibc
|
||||
stdenv.gcc.gcc
|
||||
libXv
|
||||
|
|
|
|||
|
|
@ -9,11 +9,11 @@ let
|
|||
in
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "hol_light-20120109";
|
||||
name = "hol_light-20120129";
|
||||
src = fetchsvn {
|
||||
url = http://hol-light.googlecode.com/svn/trunk;
|
||||
rev = "118";
|
||||
sha256 = "97e72dad731338328c031421512c26d440a989ea083f3ae34820eb8413aff495";
|
||||
rev = "122";
|
||||
sha256 = "d837ba5fe941af9595540691ba4be34e58174ba9a9c7e1ce57620e5cd4385769";
|
||||
};
|
||||
|
||||
buildInputs = [ ocaml findlib camlp5 ];
|
||||
|
|
|
|||
|
|
@ -166,5 +166,6 @@ stdenv.mkDerivation rec {
|
|||
homepage = "http://mplayerhq.hu";
|
||||
license = "GPL";
|
||||
maintainers = [ stdenv.lib.maintainers.eelco stdenv.lib.maintainers.urkud ];
|
||||
platforms = stdenv.lib.platforms.linux;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,5 +1,6 @@
|
|||
{ stdenv, fetchurl, alsaLib, boost, cmake, gtkmm, libXau, libXdmcp,
|
||||
libXv, libav, pixman, libpthreadstubs, pkgconfig }:
|
||||
{ stdenv, fetchurl, alsaLib, boost, cmake, gtkmm, libXau, libXdmcp
|
||||
, libXv, libav, pixman, libpthreadstubs, pkgconfig
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "dvswitch-${version}";
|
||||
|
|
@ -15,13 +16,12 @@ stdenv.mkDerivation rec {
|
|||
libpthreadstubs pixman pkgconfig
|
||||
];
|
||||
|
||||
installPhase = "
|
||||
ensureDir $out
|
||||
cp src/dv* $out/
|
||||
";
|
||||
patchPhase = ''
|
||||
sed -e "s@prefix /usr/local@prefix $out@" -i CMakeLists.txt
|
||||
'';
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "digital video mixer intended for interactive live mixing of several incoming DV video streams";
|
||||
description = "interactive live video mixer for DV streams";
|
||||
homepage = "http://dvswitch.alioth.debian.org";
|
||||
license = licenses.gpl2Plus;
|
||||
maintainers = [ maintainers.goibhniu ];
|
||||
|
|
|
|||
|
|
@ -16,6 +16,8 @@ stdenv.mkDerivation rec {
|
|||
sha256 = "0yw813d8amrl0n1fvdiyznxah92wcylj9kj1qhjc6h73d827h6na";
|
||||
};
|
||||
|
||||
NIX_LDFLAGS = "-lfontconfig";
|
||||
|
||||
# The fuloong2f is not supported by 1.3.6 still
|
||||
#
|
||||
# Don't know whether 1.3.7 supports fuloong2f and don't know how to test it
|
||||
|
|
|
|||
|
|
@ -0,0 +1,34 @@
|
|||
# given a pakcage with a $name.desktop file, makes a copy
|
||||
# as autostart item.
|
||||
|
||||
{stdenv, lib}:
|
||||
{ name # name of the desktop file (without .desktop)
|
||||
, package # package where the desktop file resides in
|
||||
, after ? null
|
||||
, condition ? null
|
||||
, phase ? "2"
|
||||
}:
|
||||
|
||||
# the builder requires that
|
||||
# $package/share/applications/$name.desktop
|
||||
# exists as file.
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "autostart-${name}";
|
||||
priority = 5;
|
||||
|
||||
buildCommand = ''
|
||||
ensureDir $out/share/autostart
|
||||
target=${name}.desktop
|
||||
cp ${package}/share/applications/${name}.desktop $target
|
||||
chmod +rw $target
|
||||
echo "X-KDE-autostart-phase=${phase}" >> $target
|
||||
${lib.optionalString (after != null) ''echo "${after}" >> $target''}
|
||||
${lib.optionalString (condition != null) ''echo "${condition}" >> $target''}
|
||||
cp $target $out/share/autostart
|
||||
'';
|
||||
|
||||
# this will automatically put 'package' in the environment when you
|
||||
# put its startup item in there.
|
||||
propagatedBuildInputs = [ package ];
|
||||
}
|
||||
|
|
@ -76,8 +76,9 @@ for (my $i = 0; $i < scalar(@packagesFiles); $i++) {
|
|||
my $earlierPkg = $pkgs{$pkg->{name}};
|
||||
print STDERR "WARNING: duplicate occurrence of package $pkg->{name}\n";
|
||||
# <version epoch="0" ver="1.28.0" rel="2.el6"/>
|
||||
if (rpmvercmp($pkg->{'version'}->{ver}, $earlierPkg->{'version'}->{ver}) >= 0) {
|
||||
print STDERR "WARNING: replaced package $pkg->{name} with newer one\n";
|
||||
my $cmp = rpmvercmp($pkg->{'version'}->{ver}, $earlierPkg->{'version'}->{ver});
|
||||
if ($cmp > 0 || ($cmp == 0 && rpmvercmp($pkg->{'version'}->{rel}, $earlierPkg->{'version'}->{rel})>0)) {
|
||||
print STDERR "WARNING: replaced package $pkg->{name} (".$earlierPkg->{'version'}->{ver}." ".$earlierPkg->{'version'}->{rel}.") with newer one (".$pkg->{'version'}->{ver}." ".$pkg->{'version'}->{rel}.")\n";
|
||||
$pkg->{urlPrefix} = $urlPrefixes[$i];
|
||||
$pkgs{$pkg->{name}} = $pkg;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,13 +1,13 @@
|
|||
{stdenv, fetchurl, ghc, perl, gmp, ncurses, darwinInstallNameToolUtility}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "7.4.0.20111219";
|
||||
version = "7.4.0.20120126";
|
||||
|
||||
name = "ghc-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://haskell.org/ghc/dist/7.4.1-rc1/${name}-src.tar.bz2";
|
||||
sha256 = "11imfag07wr9s5vf12yh6bz4hjfbw20i1c7n8py9fa4vx7va676n";
|
||||
url = "http://haskell.org/ghc/dist/7.4.1-rc2/${name}-src.tar.bz2";
|
||||
sha256 = "0arnvzhwjzk2z3m2891b4z13p4v1c84f31jgyj13a1fbfpylgs64";
|
||||
};
|
||||
|
||||
buildInputs = [ghc perl gmp ncurses] ++
|
||||
|
|
|
|||
|
|
@ -7,11 +7,11 @@
|
|||
else stdenv.mkDerivation)
|
||||
|
||||
rec {
|
||||
name = "guile-2.0.3";
|
||||
name = "guile-2.0.5";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnu/guile/${name}.tar.xz";
|
||||
sha256 = "14rhlpxxa4v5y3gl992l7lnd5qnqawx0a84idnwq0w2qviwcvsyj";
|
||||
sha256 = "1lycm10x316jzlv1nyag7x9gisn4d3dz8jcmbi6lbdn0z6a9skc2";
|
||||
};
|
||||
|
||||
buildNativeInputs = [ xz makeWrapper gawk pkgconfig ];
|
||||
|
|
|
|||
|
|
@ -3,24 +3,26 @@
|
|||
g: # Get dependencies from patched gems
|
||||
{
|
||||
aliases = {
|
||||
actionmailer = g.actionmailer_3_2_0;
|
||||
actionpack = g.actionpack_3_2_0;
|
||||
activemodel = g.activemodel_3_2_0;
|
||||
activerecord = g.activerecord_3_2_0;
|
||||
activeresource = g.activeresource_3_2_0;
|
||||
activesupport = g.activesupport_3_2_0;
|
||||
actionmailer = g.actionmailer_3_2_1;
|
||||
actionpack = g.actionpack_3_2_1;
|
||||
activemodel = g.activemodel_3_2_1;
|
||||
activerecord = g.activerecord_3_2_1;
|
||||
activeresource = g.activeresource_3_2_1;
|
||||
activesupport = g.activesupport_3_2_1;
|
||||
arel = g.arel_3_0_0;
|
||||
atoulme_Antwrap = g.atoulme_Antwrap_0_7_1;
|
||||
builder = g.builder_3_0_0;
|
||||
buildr = g.buildr_1_4_6;
|
||||
bundler = g.bundler_1_0_21;
|
||||
childprocess = g.childprocess_0_3_0;
|
||||
diff_lcs = g.diff_lcs_1_1_3;
|
||||
erubis = g.erubis_2_7_0;
|
||||
ffi = g.ffi_1_0_11;
|
||||
highline = g.highline_1_5_1;
|
||||
hike = g.hike_1_2_1;
|
||||
hoe = g.hoe_2_3_3;
|
||||
i18n = g.i18n_0_6_0;
|
||||
journey = g.journey_1_0_0;
|
||||
journey = g.journey_1_0_1;
|
||||
json = g.json_1_6_5;
|
||||
json_pure = g.json_pure_1_6_5;
|
||||
mail = g.mail_2_4_1;
|
||||
|
|
@ -35,19 +37,20 @@ g: # Get dependencies from patched gems
|
|||
rack_cache = g.rack_cache_1_1;
|
||||
rack_ssl = g.rack_ssl_1_3_2;
|
||||
rack_test = g.rack_test_0_6_1;
|
||||
rails = g.rails_3_2_0;
|
||||
railties = g.railties_3_2_0;
|
||||
rails = g.rails_3_2_1;
|
||||
railties = g.railties_3_2_1;
|
||||
rake = g.rake_0_9_2_2;
|
||||
rb_fsevent = g.rb_fsevent_0_4_3_1;
|
||||
rb_fsevent = g.rb_fsevent_0_9_0;
|
||||
rdoc = g.rdoc_3_12;
|
||||
rjb = g.rjb_1_3_8;
|
||||
rjb = g.rjb_1_3_9;
|
||||
rspec = g.rspec_2_1_0;
|
||||
rspec_core = g.rspec_core_2_1_0;
|
||||
rspec_expectations = g.rspec_expectations_2_1_0;
|
||||
rspec_mocks = g.rspec_mocks_2_1_0;
|
||||
rubyforge = g.rubyforge_2_0_4;
|
||||
rubyzip = g.rubyzip_0_9_4;
|
||||
rubyzip = g.rubyzip_0_9_5;
|
||||
sass = g.sass_3_1_12;
|
||||
selenium_webdriver = g.selenium_webdriver_2_18_0;
|
||||
sprockets = g.sprockets_2_1_2;
|
||||
thor = g.thor_0_14_6;
|
||||
tilt = g.tilt_1_3_3;
|
||||
|
|
@ -55,73 +58,73 @@ g: # Get dependencies from patched gems
|
|||
tzinfo = g.tzinfo_0_3_31;
|
||||
xml_simple = g.xml_simple_1_0_12;
|
||||
};
|
||||
gem_nix_args = [ ''buildr'' ''nix'' ''rails'' ''rake'' ''rb-fsevent'' ''sass'' ];
|
||||
gem_nix_args = [ ''buildr'' ''nix'' ''rails'' ''rake'' ''rb-fsevent'' ''sass'' ''selenium-webdriver'' ];
|
||||
gems = {
|
||||
actionmailer_3_2_0 = {
|
||||
actionmailer_3_2_1 = {
|
||||
basename = ''actionmailer'';
|
||||
meta = {
|
||||
description = ''Email composition, delivery, and receiving framework (part of Rails).'';
|
||||
homepage = ''http://www.rubyonrails.org'';
|
||||
longDescription = ''Email on Rails. Compose, deliver, receive, and test emails using the familiar controller/view pattern. First-class support for multipart email and attachments.'';
|
||||
};
|
||||
name = ''actionmailer-3.2.0'';
|
||||
name = ''actionmailer-3.2.1'';
|
||||
requiredGems = [ g.mail_2_4_1 ];
|
||||
sha256 = ''0fhvdbxw93y00awz4xfkyzn78zfca210zwqx7xvaizipaq5rs8d6'';
|
||||
sha256 = ''02xxyz3r3cfhiynx73y2ybabdhf9x9vxfqj215p8477w6cm2sh47'';
|
||||
};
|
||||
actionpack_3_2_0 = {
|
||||
actionpack_3_2_1 = {
|
||||
basename = ''actionpack'';
|
||||
meta = {
|
||||
description = ''Web-flow and rendering framework putting the VC in MVC (part of Rails).'';
|
||||
homepage = ''http://www.rubyonrails.org'';
|
||||
longDescription = ''Web apps on Rails. Simple, battle-tested conventions for building and testing MVC web applications. Works with any Rack-compatible server.'';
|
||||
};
|
||||
name = ''actionpack-3.2.0'';
|
||||
requiredGems = [ g.activemodel_3_2_0 g.rack_cache_1_1 g.rack_test_0_6_1 g.journey_1_0_0 g.sprockets_2_1_2 g.erubis_2_7_0 ];
|
||||
sha256 = ''08fghqa01x6bkcnyik36jaxdd6jp05sh1mnxgqaw4snjwrl5b4ki'';
|
||||
name = ''actionpack-3.2.1'';
|
||||
requiredGems = [ g.activemodel_3_2_1 g.rack_cache_1_1 g.rack_test_0_6_1 g.journey_1_0_1 g.sprockets_2_1_2 g.erubis_2_7_0 ];
|
||||
sha256 = ''0yz5h8c4m1a8590kdsx2akg3jmbrsjf9wbd950lv19c3sm3sahzx'';
|
||||
};
|
||||
activemodel_3_2_0 = {
|
||||
activemodel_3_2_1 = {
|
||||
basename = ''activemodel'';
|
||||
meta = {
|
||||
description = ''A toolkit for building modeling frameworks (part of Rails).'';
|
||||
homepage = ''http://www.rubyonrails.org'';
|
||||
longDescription = ''A toolkit for building modeling frameworks like Active Record and Active Resource. Rich support for attributes, callbacks, validations, observers, serialization, internationalization, and testing.'';
|
||||
};
|
||||
name = ''activemodel-3.2.0'';
|
||||
name = ''activemodel-3.2.1'';
|
||||
requiredGems = [ g.builder_3_0_0 ];
|
||||
sha256 = ''1785g6b1daqncgsyc1kjwhxypx6xk9m3pw5vhipfv2bvygan3y9z'';
|
||||
sha256 = ''1m639mdhkjwxw7szl3r7ay4s8yjwbh2sfjyv2d4wrkiq4wpz694m'';
|
||||
};
|
||||
activerecord_3_2_0 = {
|
||||
activerecord_3_2_1 = {
|
||||
basename = ''activerecord'';
|
||||
meta = {
|
||||
description = ''Object-relational mapper framework (part of Rails).'';
|
||||
homepage = ''http://www.rubyonrails.org'';
|
||||
longDescription = ''Databases on Rails. Build a persistent domain model by mapping database tables to Ruby classes. Strong conventions for associations, validations, aggregations, migrations, and testing come baked-in.'';
|
||||
};
|
||||
name = ''activerecord-3.2.0'';
|
||||
name = ''activerecord-3.2.1'';
|
||||
requiredGems = [ g.arel_3_0_0 g.tzinfo_0_3_31 ];
|
||||
sha256 = ''065yyv3y1wkzm3ykdxd43hmz3q4gadc9qb3psjydqalgii0dr1ww'';
|
||||
sha256 = ''0xch76nqfgyx750z89lsxkvgshci1y49f4h7xmgiq9nmr4gfxxmv'';
|
||||
};
|
||||
activeresource_3_2_0 = {
|
||||
activeresource_3_2_1 = {
|
||||
basename = ''activeresource'';
|
||||
meta = {
|
||||
description = ''REST modeling framework (part of Rails).'';
|
||||
homepage = ''http://www.rubyonrails.org'';
|
||||
longDescription = ''REST on Rails. Wrap your RESTful web app with Ruby classes and work with them like Active Record models.'';
|
||||
};
|
||||
name = ''activeresource-3.2.0'';
|
||||
name = ''activeresource-3.2.1'';
|
||||
requiredGems = [ ];
|
||||
sha256 = ''0lklbgmf1in8cm3w1xl9nxc5yjr9a884fjslyjca42kc7j90mbr7'';
|
||||
sha256 = ''0fvsi8kikmp287dym3s4y1np9s0sxm0q65kx0idgsp9bi89wpl0d'';
|
||||
};
|
||||
activesupport_3_2_0 = {
|
||||
activesupport_3_2_1 = {
|
||||
basename = ''activesupport'';
|
||||
meta = {
|
||||
description = ''A toolkit of support libraries and Ruby core extensions extracted from the Rails framework.'';
|
||||
homepage = ''http://www.rubyonrails.org'';
|
||||
longDescription = ''A toolkit of support libraries and Ruby core extensions extracted from the Rails framework. Rich support for multibyte strings, internationalization, time zones, and testing.'';
|
||||
};
|
||||
name = ''activesupport-3.2.0'';
|
||||
name = ''activesupport-3.2.1'';
|
||||
requiredGems = [ g.i18n_0_6_0 g.multi_json_1_0_4 ];
|
||||
sha256 = ''07x0jl4fnjgiblffbwmjnqzly765l55y9zmyad8divcaa1qjqwmb'';
|
||||
sha256 = ''0ajkzsa7467jp7lxgjcsl94nqkvw9d0h492rypljs0f8f1fn744v'';
|
||||
};
|
||||
arel_3_0_0 = {
|
||||
basename = ''arel'';
|
||||
|
|
@ -160,7 +163,7 @@ database compatibility and query generation.'';
|
|||
check out Buildr!'';
|
||||
};
|
||||
name = ''atoulme-Antwrap-0.7.1'';
|
||||
requiredGems = [ g.rjb_1_3_8 ];
|
||||
requiredGems = [ g.rjb_1_3_9 ];
|
||||
sha256 = ''0r9jy2asyma8h0878nhjfbi00qvb4yapc8glngvmkkj21zbx2mfy'';
|
||||
};
|
||||
builder_2_1_2 = {
|
||||
|
|
@ -217,6 +220,17 @@ for those one-off tasks, with a language that's a joy to use.
|
|||
requiredGems = [ ];
|
||||
sha256 = ''0lcxz75vvgqib43wxzv6021qs5d7bxhnds4j4q27hzqs982cn0s6'';
|
||||
};
|
||||
childprocess_0_3_0 = {
|
||||
basename = ''childprocess'';
|
||||
meta = {
|
||||
description = ''This gem aims at being a simple and reliable solution for controlling external programs running in the background on any Ruby / OS combination.'';
|
||||
homepage = ''http://github.com/jarib/childprocess'';
|
||||
longDescription = ''This gem aims at being a simple and reliable solution for controlling external programs running in the background on any Ruby / OS combination.'';
|
||||
};
|
||||
name = ''childprocess-0.3.0'';
|
||||
requiredGems = [ g.ffi_1_0_11 ];
|
||||
sha256 = ''1bvx6nkc1m24wjjybk943x1vjr51c98l0pwj73hj1r237307jyb4'';
|
||||
};
|
||||
diff_lcs_1_1_2 = {
|
||||
basename = ''diff_lcs'';
|
||||
meta = {
|
||||
|
|
@ -276,6 +290,21 @@ is the MIT license.'';
|
|||
requiredGems = [ ];
|
||||
sha256 = ''1fj827xqjs91yqsydf0zmfyw9p4l2jz5yikg3mppz6d7fi8kyrb3'';
|
||||
};
|
||||
ffi_1_0_11 = {
|
||||
basename = ''ffi'';
|
||||
meta = {
|
||||
description = ''Ruby-FFI is a ruby extension for programmatically loading dynamic libraries, binding functions within them, and calling those functions from Ruby code'';
|
||||
homepage = ''http://wiki.github.com/ffi/ffi'';
|
||||
longDescription = ''Ruby-FFI is a ruby extension for programmatically loading dynamic
|
||||
libraries, binding functions within them, and calling those functions
|
||||
from Ruby code. Moreover, a Ruby-FFI extension works without changes
|
||||
on Ruby and JRuby. Discover why should you write your next extension
|
||||
using Ruby-FFI here[http://wiki.github.com/ffi/ffi/why-use-ffi].'';
|
||||
};
|
||||
name = ''ffi-1.0.11'';
|
||||
requiredGems = [ ];
|
||||
sha256 = ''177v6bwslyb7n961nw11i8x9j43k796s11bs98kynl58n0a3n99b'';
|
||||
};
|
||||
highline_1_5_1 = {
|
||||
basename = ''highline'';
|
||||
meta = {
|
||||
|
|
@ -339,16 +368,16 @@ See class rdoc for help. Hint: ri Hoe'';
|
|||
requiredGems = [ ];
|
||||
sha256 = ''1pgmfhmh2wv409g7kla30mkp8jpslvp25vcmmim1figl87wpn3j0'';
|
||||
};
|
||||
journey_1_0_0 = {
|
||||
journey_1_0_1 = {
|
||||
basename = ''journey'';
|
||||
meta = {
|
||||
description = ''Journey is a router'';
|
||||
homepage = ''http://github.com/tenderlove/journey'';
|
||||
longDescription = ''Journey is a router. It routes requests.'';
|
||||
};
|
||||
name = ''journey-1.0.0'';
|
||||
name = ''journey-1.0.1'';
|
||||
requiredGems = [ ];
|
||||
sha256 = ''0xphcsxksy0m78j1mphzp0lyj7bgrabdnlgs18lrkwivs0gryhdd'';
|
||||
sha256 = ''1fccxnc9ji6j2p1avfph701b0lf2rzsksyipfavhv8kjwlzvsglx'';
|
||||
};
|
||||
json_1_6_5 = {
|
||||
basename = ''json'';
|
||||
|
|
@ -554,27 +583,27 @@ request helpers feature.'';
|
|||
requiredGems = [ ];
|
||||
sha256 = ''0hq5q8fjhbb7szzrj7k0l21z025c4qsxqzd5qmgivikhymw10ws0'';
|
||||
};
|
||||
rails_3_2_0 = {
|
||||
rails_3_2_1 = {
|
||||
basename = ''rails'';
|
||||
meta = {
|
||||
description = ''Full-stack web application framework.'';
|
||||
homepage = ''http://www.rubyonrails.org'';
|
||||
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.0'';
|
||||
requiredGems = [ g.activesupport_3_2_0 g.actionpack_3_2_0 g.activerecord_3_2_0 g.activeresource_3_2_0 g.actionmailer_3_2_0 g.railties_3_2_0 g.bundler_1_0_21 ];
|
||||
sha256 = ''10jc4ri60ivd5z54k0i4l1pdqbmswwhh05ydca7axpd9d1ss1jzh'';
|
||||
name = ''rails-3.2.1'';
|
||||
requiredGems = [ g.activesupport_3_2_1 g.actionpack_3_2_1 g.activerecord_3_2_1 g.activeresource_3_2_1 g.actionmailer_3_2_1 g.railties_3_2_1 g.bundler_1_0_21 ];
|
||||
sha256 = ''0fx5pmywvh0s263dd6qv34rbc4qxnla5qzh8r30zrip24j6w0nr5'';
|
||||
};
|
||||
railties_3_2_0 = {
|
||||
railties_3_2_1 = {
|
||||
basename = ''railties'';
|
||||
meta = {
|
||||
description = ''Tools for creating, working with, and running Rails applications.'';
|
||||
homepage = ''http://www.rubyonrails.org'';
|
||||
longDescription = ''Rails internals: application bootup, plugins, generators, and rake tasks.'';
|
||||
};
|
||||
name = ''railties-3.2.0'';
|
||||
name = ''railties-3.2.1'';
|
||||
requiredGems = [ g.thor_0_14_6 g.rack_ssl_1_3_2 g.rdoc_3_12 ];
|
||||
sha256 = ''0zwdjj6kfgpslqywyhc171pfp9zc26hs4z0fx0hysyvvc961qhb3'';
|
||||
sha256 = ''13ya1jryzz8s1j1vh1qw44y282vjjk72nf3a6dzsna9z8yx4278h'';
|
||||
};
|
||||
rake_0_8_7 = {
|
||||
basename = ''rake'';
|
||||
|
|
@ -598,16 +627,16 @@ request helpers feature.'';
|
|||
requiredGems = [ ];
|
||||
sha256 = ''19n4qp5gzbcqy9ajh56kgwqv9p9w2hnczhyvaqz0nlvk9diyng6q'';
|
||||
};
|
||||
rb_fsevent_0_4_3_1 = {
|
||||
rb_fsevent_0_9_0 = {
|
||||
basename = ''rb_fsevent'';
|
||||
meta = {
|
||||
description = ''Very simple & usable FSEvents API'';
|
||||
homepage = ''http://rubygems.org/gems/rb-fsevent'';
|
||||
longDescription = ''FSEvents API with Signals catching (without RubyCocoa)'';
|
||||
};
|
||||
name = ''rb-fsevent-0.4.3.1'';
|
||||
name = ''rb-fsevent-0.9.0'';
|
||||
requiredGems = [ ];
|
||||
sha256 = ''043w4695j7f9n0hawy9y0yci36linivsbp23v52v2qg64ji7hsiw'';
|
||||
sha256 = ''1sk7y6bxq8p4vh2cv4zk320xlxrbs15n2knyyvdd1bj89wmmiryy'';
|
||||
};
|
||||
rdoc_3_12 = {
|
||||
basename = ''rdoc'';
|
||||
|
|
@ -636,7 +665,7 @@ See RDoc for a description of RDoc's markup and basic use.'';
|
|||
requiredGems = [ ];
|
||||
sha256 = ''0jhj1y84yzdr11li784m255jvc191vs8d3zck21rfqv4z4zpifz6'';
|
||||
};
|
||||
rjb_1_3_8 = {
|
||||
rjb_1_3_9 = {
|
||||
basename = ''rjb'';
|
||||
meta = {
|
||||
description = ''Ruby Java bridge'';
|
||||
|
|
@ -644,9 +673,9 @@ See RDoc for a description of RDoc's markup and basic use.'';
|
|||
longDescription = ''RJB is a bridge program that connect between Ruby and Java with Java Native Interface.
|
||||
'';
|
||||
};
|
||||
name = ''rjb-1.3.8'';
|
||||
name = ''rjb-1.3.9'';
|
||||
requiredGems = [ ];
|
||||
sha256 = ''0cwc3zh9ydwzvc176vjin7jpf8riisyjdwbywrmvc426kjyrrwwr'';
|
||||
sha256 = ''0iimwg22jacbidc43lngqndbnvgv4f9zppxzy008gi88pqgargsd'';
|
||||
};
|
||||
rspec_2_1_0 = {
|
||||
basename = ''rspec'';
|
||||
|
|
@ -738,6 +767,16 @@ See RDoc for a description of RDoc's markup and basic use.'';
|
|||
requiredGems = [ ];
|
||||
sha256 = ''1lc67ssqyz49rm1jms5sdvy6x41h070razxlmvj4j5q6w3qixx41'';
|
||||
};
|
||||
rubyzip_0_9_5 = {
|
||||
basename = ''rubyzip'';
|
||||
meta = {
|
||||
description = ''rubyzip is a ruby module for reading and writing zip files'';
|
||||
homepage = ''http://github.com/aussiegeek/rubyzip'';
|
||||
};
|
||||
name = ''rubyzip-0.9.5'';
|
||||
requiredGems = [ ];
|
||||
sha256 = ''1744bds6lc46d1kjfgapf34p2574s70hcyz63877qkry4db2jb54'';
|
||||
};
|
||||
sass_3_1_12 = {
|
||||
basename = ''sass'';
|
||||
meta = {
|
||||
|
|
@ -753,6 +792,17 @@ See RDoc for a description of RDoc's markup and basic use.'';
|
|||
requiredGems = [ ];
|
||||
sha256 = ''10n2aic53290xsa3y3d63523s8xc78w5q5gqpns6cbljkdwb0ndy'';
|
||||
};
|
||||
selenium_webdriver_2_18_0 = {
|
||||
basename = ''selenium_webdriver'';
|
||||
meta = {
|
||||
description = ''The next generation developer focused tool for automated testing of webapps'';
|
||||
homepage = ''http://selenium.googlecode.com'';
|
||||
longDescription = ''WebDriver is a tool for writing automated tests of websites. It aims to mimic the behaviour of a real user, and as such interacts with the HTML of the application.'';
|
||||
};
|
||||
name = ''selenium-webdriver-2.18.0'';
|
||||
requiredGems = [ g.rubyzip_0_9_5 g.childprocess_0_3_0 ];
|
||||
sha256 = ''17am2b6bjv62s02n1bfmhg9wz5n7sppzh7dx1llp28ivj2hdfbg9'';
|
||||
};
|
||||
sprockets_2_1_2 = {
|
||||
basename = ''sprockets'';
|
||||
meta = {
|
||||
|
|
|
|||
|
|
@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
|
|||
|
||||
src = fetchurl {
|
||||
url = "ftp://ftp.ruby-lang.org/pub/ruby/1.8/${name}.tar.gz";
|
||||
sha256 = "0qf50wa1ziziagnxarj8z6yrsivrhchq1j9017ff3z2z7d31l9kc";
|
||||
sha256 = "0b4n9d1idmsl47cq3mw6zhi94yp048ljlfgg9qdblbkvnd7arp1g";
|
||||
};
|
||||
|
||||
# Have `configure' avoid `/usr/bin/nroff' in non-chroot builds.
|
||||
|
|
@ -45,7 +45,7 @@ stdenv.mkDerivation rec {
|
|||
passthru = rec {
|
||||
majorVersion = "1.8";
|
||||
minorVersion = "7";
|
||||
patchLevel = "330";
|
||||
patchLevel = "357";
|
||||
libPath = "lib/ruby/${majorVersion}";
|
||||
gemPath = "lib/ruby/gems/${majorVersion}";
|
||||
};
|
||||
|
|
|
|||
|
|
@ -22,6 +22,7 @@ let
|
|||
|
||||
meta = {
|
||||
description = "Aspell dictionary for ${fullName}";
|
||||
platforms = stdenv.lib.platforms.all;
|
||||
};
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -18,11 +18,11 @@ assert xvidSupport -> xvidcore != null;
|
|||
assert faacSupport -> faac != null;
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "ffmpeg-0.8.1";
|
||||
name = "ffmpeg-0.10";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://www.ffmpeg.org/releases/${name}.tar.bz2";
|
||||
sha256 = "0vdq6bmrsi55p1l3dddiwyqsspb3l5dgqb87lysf5cz3sjxcfw2v";
|
||||
sha256 = "1ybzw6d5axr807141izvm2yf4pa0hc1zcywj89nsn3qsdnknlna3";
|
||||
};
|
||||
|
||||
# `--enable-gpl' (as well as the `postproc' and `swscale') mean that
|
||||
|
|
|
|||
|
|
@ -1,12 +0,0 @@
|
|||
{stdenv, fetchurl}:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "glib-1.2.10";
|
||||
src = fetchurl {
|
||||
url = ftp://ftp.gtk.org/pub/gtk/v1.2/glib-1.2.10.tar.gz;
|
||||
md5 = "6fe30dad87c77b91b632def29dd69ef9";
|
||||
};
|
||||
# Patch for gcc 3.4 compatibility. Based on
|
||||
# http://cvs.openpkg.org/chngview?cn=16208.
|
||||
patches = [./gcc34.patch];
|
||||
}
|
||||
|
|
@ -1,20 +0,0 @@
|
|||
diff -rc glib-orig/glib.h glib-1.2.10/glib.h
|
||||
*** glib-orig/glib.h 2001-02-27 04:44:38.000000000 +0100
|
||||
--- glib-1.2.10/glib.h 2004-09-22 10:22:01.000000000 +0200
|
||||
***************
|
||||
*** 272,278 ****
|
||||
/* Wrap the gcc __PRETTY_FUNCTION__ and __FUNCTION__ variables with
|
||||
* macros, so we can refer to them as strings unconditionally.
|
||||
*/
|
||||
! #ifdef __GNUC__
|
||||
#define G_GNUC_FUNCTION __FUNCTION__
|
||||
#define G_GNUC_PRETTY_FUNCTION __PRETTY_FUNCTION__
|
||||
#else /* !__GNUC__ */
|
||||
--- 272,278 ----
|
||||
/* Wrap the gcc __PRETTY_FUNCTION__ and __FUNCTION__ variables with
|
||||
* macros, so we can refer to them as strings unconditionally.
|
||||
*/
|
||||
! #if defined(__GNUC__) && (__GNUC__ == 3 && __GNUC_MINOR__ < 4)
|
||||
#define G_GNUC_FUNCTION __FUNCTION__
|
||||
#define G_GNUC_PRETTY_FUNCTION __PRETTY_FUNCTION__
|
||||
#else /* !__GNUC__ */
|
||||
|
|
@ -5,11 +5,11 @@ let
|
|||
in
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "gmp-5.0.1";
|
||||
name = "gmp-5.0.3";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnu/gmp/${name}.tar.bz2";
|
||||
sha256 = "1yrr14l6vvhm1g27y8nb3c75j0i4ii4k1gw7ik08safk3zq119m2";
|
||||
sha256 = "dcafe9989c7f332b373e1f766af8e9cd790fc802fdec422a1910a6ef783480e3";
|
||||
};
|
||||
|
||||
buildNativeInputs = [m4];
|
||||
|
|
@ -55,7 +55,7 @@ stdenv.mkDerivation rec {
|
|||
homepage = http://gmplib.org/;
|
||||
license = "LGPLv3+";
|
||||
|
||||
maintainers = [ stdenv.lib.maintainers.ludo ];
|
||||
maintainers = [ stdenv.lib.maintainers.ludo stdenv.lib.maintainers.simons ];
|
||||
platforms = stdenv.lib.platforms.all;
|
||||
};
|
||||
}
|
||||
|
|
@ -1,12 +0,0 @@
|
|||
{stdenv, fetchurl, x11, glib}:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "gtk+-1.2.10";
|
||||
|
||||
src = fetchurl {
|
||||
url = ftp://ftp.gtk.org/pub/gtk/v1.2/gtk+-1.2.10.tar.gz;
|
||||
md5 = "4d5cb2fc7fb7830e4af9747a36bfce20";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [x11 glib];
|
||||
}
|
||||
|
|
@ -1,13 +1,13 @@
|
|||
{ cabal, cairo, colour, dataAccessor, dataAccessorTemplate, gtk
|
||||
, mtl, time
|
||||
{ cabal, cairo, colour, dataAccessor, dataAccessorTemplate, mtl
|
||||
, time
|
||||
}:
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "Chart";
|
||||
version = "0.14";
|
||||
sha256 = "0ji81j4c2by5zyrdhx1s17j6kqsi3ngr9y1zh7hr9wv7jsrj3rf2";
|
||||
version = "0.15";
|
||||
sha256 = "1357gqn2ifalknl85n2z9ysf195dnaxm175rp0kmmzbf4vik9gc4";
|
||||
buildDepends = [
|
||||
cairo colour dataAccessor dataAccessorTemplate gtk mtl time
|
||||
cairo colour dataAccessor dataAccessorTemplate mtl time
|
||||
];
|
||||
meta = {
|
||||
homepage = "http://www.dockerz.net/software/chart.html";
|
||||
|
|
|
|||
|
|
@ -2,8 +2,8 @@
|
|||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "blaze-builder";
|
||||
version = "0.3.0.2";
|
||||
sha256 = "009njfm9g0fs7kg6q9c7qqfl69msw9q3d07xh3xg7layh09khsdb";
|
||||
version = "0.3.1.0";
|
||||
sha256 = "192pqmr6mcjnflqpvp93nycfbdi0ifab8ifvrxvmwbrdkiidvai6";
|
||||
buildDepends = [ text ];
|
||||
meta = {
|
||||
homepage = "http://github.com/meiersi/blaze-builder";
|
||||
|
|
|
|||
|
|
@ -2,12 +2,12 @@
|
|||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "bytestring-lexing";
|
||||
version = "0.2.1";
|
||||
sha256 = "0pibn4phfp346i6i8zwic5zlbq9lqa6ifyx6bdl3p5c8jy3v23r9";
|
||||
version = "0.3.0";
|
||||
sha256 = "1jrhmljy7m84imcmvsarv74i3hcm60ja9pl1ww3lm0zgi0rrddqd";
|
||||
buildTools = [ alex ];
|
||||
meta = {
|
||||
homepage = "http://code.haskell.org/~dons/code/bytestring-lexing";
|
||||
description = "Parse literals efficiently from bytestrings";
|
||||
homepage = "http://code.haskell.org/~wren/";
|
||||
description = "Parse literals efficiently from strict or lazy bytestrings";
|
||||
license = self.stdenv.lib.licenses.bsd3;
|
||||
platforms = self.ghc.meta.platforms;
|
||||
maintainers = [
|
||||
|
|
|
|||
|
|
@ -4,8 +4,8 @@
|
|||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "citeproc-hs";
|
||||
version = "0.3.3";
|
||||
sha256 = "0yhzqxrr7jn1h0r2vy1jmlrf0z64qcr2fl37i04rpiwzb3nc16r4";
|
||||
version = "0.3.4";
|
||||
sha256 = "17w6fpmlhbfd8jxxz4s6ybz3dswf0i96fjjbs05ykh4i97rs62nv";
|
||||
buildDepends = [
|
||||
hsBibutils HTTP json mtl network pandocTypes parsec syb time
|
||||
utf8String xml
|
||||
|
|
|
|||
|
|
@ -4,14 +4,14 @@
|
|||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "clientsession";
|
||||
version = "0.7.3.6";
|
||||
sha256 = "04cvws7h2pm3rk8p2yj1pqkf9vjqq65hxg9sjldg7zhxdjgq1hgc";
|
||||
version = "0.7.4";
|
||||
sha256 = "050mg3rzyld4v2b9v1pc1q563sp7sffiapvr8ks8f46ibl17lvss";
|
||||
buildDepends = [
|
||||
base64Bytestring cereal cprngAes cryptoApi cryptocipher entropy
|
||||
skein tagged
|
||||
];
|
||||
meta = {
|
||||
homepage = "http://github.com/snoyberg/clientsession/tree/master";
|
||||
homepage = "http://github.com/yesodweb/clientsession/tree/master";
|
||||
description = "Securely store session data in a client-side cookie";
|
||||
license = self.stdenv.lib.licenses.bsd3;
|
||||
platforms = self.ghc.meta.platforms;
|
||||
|
|
|
|||
|
|
@ -2,8 +2,8 @@
|
|||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "cmdargs";
|
||||
version = "0.8";
|
||||
sha256 = "0yhjg6rck1aj8gq07i9dcfxyjffxlr4lxnir2brkyahpfx5iyw9k";
|
||||
version = "0.9.2";
|
||||
sha256 = "1c0xy4g9b5jqy51qhgq7djafqz27z6q7ya31pgy186pfgl7604kr";
|
||||
isLibrary = true;
|
||||
isExecutable = true;
|
||||
buildDepends = [ transformers ];
|
||||
|
|
|
|||
|
|
@ -4,8 +4,8 @@
|
|||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "conduit";
|
||||
version = "0.0.4";
|
||||
sha256 = "1sc14nh21ba85azm4my5qnllnlbmsq5j6h1yd1mdsk2z3fb0x5zz";
|
||||
version = "0.1.1.1";
|
||||
sha256 = "0gqkk5q329xbw565xd9xc0pz2ha66jkdbbjgwadvrjw1n52vaqg5";
|
||||
buildDepends = [
|
||||
liftedBase monadControl text transformers transformersBase
|
||||
];
|
||||
|
|
|
|||
|
|
@ -2,8 +2,8 @@
|
|||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "crypto-api";
|
||||
version = "0.8";
|
||||
sha256 = "1fwkafb9v2348vr1a4xnlmkgs4kh85az4f3wnrl9cbqwxf3cc328";
|
||||
version = "0.9";
|
||||
sha256 = "11372brnpiqdm6fdfp95wyyl8nvhbagnq0q2bdhn4xsskpnp4hnp";
|
||||
buildDepends = [ cereal entropy largeword tagged ];
|
||||
meta = {
|
||||
homepage = "http://trac.haskell.org/crypto-api/wiki";
|
||||
|
|
|
|||
|
|
@ -4,8 +4,8 @@
|
|||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "data-object-yaml";
|
||||
version = "0.3.4.1";
|
||||
sha256 = "04mpa59gyfkqi5s94ps3qhphw4csiasb3lj6kf6rhhmd5yx52dnp";
|
||||
version = "0.3.4.2";
|
||||
sha256 = "18a9r4wfpb7icjb6nji9iy3abq6sxafmsnfwqpnm1nn2nn3fm1ap";
|
||||
isLibrary = true;
|
||||
isExecutable = true;
|
||||
buildDepends = [
|
||||
|
|
|
|||
|
|
@ -2,8 +2,8 @@
|
|||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "email-validate";
|
||||
version = "0.2.7";
|
||||
sha256 = "13zam197ph431f351g8srsxwqchjdwx1c1bizmildsc1zxm2nm3q";
|
||||
version = "0.2.8";
|
||||
sha256 = "04cz1nm1zkb46kdxs43pmkxli2xm5nqlh951nn0mdgy6hqhkpkqd";
|
||||
buildDepends = [ parsec ranges ];
|
||||
meta = {
|
||||
homepage = "http://porg.es/blog/email-address-validation-simpler-faster-more-correct";
|
||||
|
|
|
|||
|
|
@ -0,0 +1,20 @@
|
|||
{ cabal, transformers }:
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "explicit-exception";
|
||||
version = "0.1.6";
|
||||
sha256 = "0pgdbaav952bwcmbfwg0fgvc15k57rlnw131bs3pnp8rqdbxfv39";
|
||||
isLibrary = true;
|
||||
isExecutable = true;
|
||||
buildDepends = [ transformers ];
|
||||
meta = {
|
||||
homepage = "http://www.haskell.org/haskellwiki/Exception";
|
||||
description = "Exceptions which are explicit in the type signature";
|
||||
license = self.stdenv.lib.licenses.bsd3;
|
||||
platforms = self.ghc.meta.platforms;
|
||||
maintainers = [
|
||||
self.stdenv.lib.maintainers.andres
|
||||
self.stdenv.lib.maintainers.simons
|
||||
];
|
||||
};
|
||||
})
|
||||
|
|
@ -2,8 +2,8 @@
|
|||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "fast-logger";
|
||||
version = "0.0.1";
|
||||
sha256 = "19ff2dhkh62i1ljsl90wnsblzk30dz0yx4kw5gk1hb22md7hakim";
|
||||
version = "0.0.2";
|
||||
sha256 = "1pwxhgcy4lmc63dnr9fihkmiclf60hrnsv8wzbsdg0jcj4qi0zr7";
|
||||
buildDepends = [ blazeBuilder ];
|
||||
meta = {
|
||||
description = "A fast logging system";
|
||||
|
|
|
|||
|
|
@ -4,8 +4,8 @@
|
|||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "happstack-util";
|
||||
version = "6.0.2";
|
||||
sha256 = "03qlnclpg72iflry1xlkd0sxqm6nybvx113la9r0cmsnz17y546a";
|
||||
version = "6.0.3";
|
||||
sha256 = "0hqssd5wzir6rxn46q8r3hdp3nl7v5m7w322j39120xpg2bhiphh";
|
||||
isLibrary = true;
|
||||
isExecutable = true;
|
||||
buildDepends = [
|
||||
|
|
|
|||
|
|
@ -11,6 +11,9 @@ cabal.mkDerivation (self: {
|
|||
buildDepends = [
|
||||
Chart cmdargs colour hledger hledgerLib HUnit safe time
|
||||
];
|
||||
patchPhase = ''
|
||||
sed -i hledger-chart.cabal -e 's|Chart >= 0.11 && < 0.15|Chart|g'
|
||||
'';
|
||||
meta = {
|
||||
homepage = "http://hledger.org";
|
||||
description = "A pie chart image generator for the hledger accounting tool";
|
||||
|
|
|
|||
|
|
@ -4,8 +4,8 @@
|
|||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "hledger-lib";
|
||||
version = "0.16.1";
|
||||
sha256 = "15imhdkzfnxr72lsghrbsfisc7c2al4jkzcp72yf4hhra4zym1sd";
|
||||
version = "0.17";
|
||||
sha256 = "0dlm3hjbcf48nzz597ag1q9y0phsc09062wvzpmfkhk4hsijpds4";
|
||||
buildDepends = [
|
||||
cmdargs HUnit mtl parsec regexpr safe split time utf8String
|
||||
];
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
{ cabal, aesonNative, blazeHtml, cabalFileTh, clientsession
|
||||
, cmdargs, dataObject, dataObjectYaml, failure, fileEmbed, hamlet
|
||||
, hledger, hledgerLib, HUnit, ioStorage, parsec, regexpr, safe
|
||||
{ cabal, aeson, blazeHtml, cabalFileTh, clientsession, cmdargs
|
||||
, dataObject, dataObjectYaml, failure, fileEmbed, hamlet, hledger
|
||||
, hledgerLib, HUnit, ioStorage, parsec, regexpr, safe
|
||||
, shakespeareCss, shakespeareJs, shakespeareText, text, time
|
||||
, transformers, wai, waiExtra, warp, yesod, yesodCore, yesodForm
|
||||
, yesodJson, yesodStatic
|
||||
|
|
@ -8,12 +8,12 @@
|
|||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "hledger-web";
|
||||
version = "0.16.5";
|
||||
sha256 = "0gqhmyl62jkz156gypzxwj46xrh5as3wrvkwrg04wfmpqrac5n06";
|
||||
version = "0.17";
|
||||
sha256 = "1b5k76p27pvxc91gns3aimy3zcy6m366nnpwzbm214v6ka82imfi";
|
||||
isLibrary = true;
|
||||
isExecutable = true;
|
||||
buildDepends = [
|
||||
aesonNative blazeHtml cabalFileTh clientsession cmdargs dataObject
|
||||
aeson blazeHtml cabalFileTh clientsession cmdargs dataObject
|
||||
dataObjectYaml failure fileEmbed hamlet hledger hledgerLib HUnit
|
||||
ioStorage parsec regexpr safe shakespeareCss shakespeareJs
|
||||
shakespeareText text time transformers wai waiExtra warp yesod
|
||||
|
|
|
|||
|
|
@ -1,16 +1,16 @@
|
|||
{ cabal, cmdargs, csv, haskeline, hledgerLib, HUnit, mtl, parsec
|
||||
, regexpr, safe, split, time, utf8String
|
||||
{ cabal, cabalFileTh, cmdargs, csv, haskeline, hledgerLib, HUnit
|
||||
, mtl, parsec, regexpr, safe, split, time, utf8String
|
||||
}:
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "hledger";
|
||||
version = "0.16.1";
|
||||
sha256 = "182a5qlcxbh9q8hzrmgm99hcgvxjq8j5xq202iff14p1yqv0irs2";
|
||||
version = "0.17";
|
||||
sha256 = "0ah01d10hvz12zwkprk6sb3by8azz9fhm772440arhd7r9fn6232";
|
||||
isLibrary = true;
|
||||
isExecutable = true;
|
||||
buildDepends = [
|
||||
cmdargs csv haskeline hledgerLib HUnit mtl parsec regexpr safe
|
||||
split time utf8String
|
||||
cabalFileTh cmdargs csv haskeline hledgerLib HUnit mtl parsec
|
||||
regexpr safe split time utf8String
|
||||
];
|
||||
meta = {
|
||||
homepage = "http://hledger.org";
|
||||
|
|
|
|||
|
|
@ -2,8 +2,8 @@
|
|||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "hmatrix";
|
||||
version = "0.13.0.0";
|
||||
sha256 = "1jlibgg2nrgajw2ny0dq88f5mhrffi7kda9bb8sp9szf4a0kd4wd";
|
||||
version = "0.13.1.0";
|
||||
sha256 = "0pl5z6zsxyvbdfdng77r2c4isq6d4wbyzx2qs9r8rbn6glaxwrmp";
|
||||
buildDepends = [ binary storableComplex vector ];
|
||||
extraLibraries = [ blas gsl liblapack ];
|
||||
configureFlags = "-fvector";
|
||||
|
|
|
|||
|
|
@ -7,8 +7,8 @@
|
|||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "http-conduit";
|
||||
version = "1.1.2.2";
|
||||
sha256 = "049gidxmrw4zri2zkibl2298glhapzzh1kg001dn563594bbiccz";
|
||||
version = "1.2.0";
|
||||
sha256 = "1s3qrvglhymwvr0cp32mi95dijic40lphhsfr4hm63qjphfc8dpi";
|
||||
buildDepends = [
|
||||
asn1Data attoparsec attoparsecConduit base64Bytestring blazeBuilder
|
||||
blazeBuilderConduit caseInsensitive certificate conduit cprngAes
|
||||
|
|
|
|||
|
|
@ -2,8 +2,8 @@
|
|||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "mime-mail";
|
||||
version = "0.4.1.0";
|
||||
sha256 = "1czjxxpv2w8zvwm6nkv0rr47rdl84s5f5xvf3r4kjaw44a6jfgg0";
|
||||
version = "0.4.1.1";
|
||||
sha256 = "01dshc6ysjkab9hl851948l6k0lwgm1fqmyk97zy7wckb252w6y4";
|
||||
buildDepends = [ base64Bytestring blazeBuilder random text ];
|
||||
meta = {
|
||||
homepage = "http://github.com/snoyberg/mime-mail";
|
||||
|
|
|
|||
|
|
@ -0,0 +1,22 @@
|
|||
{ cabal, explicitException, QuickCheck, text, transformers
|
||||
, utf8String
|
||||
}:
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "multiarg";
|
||||
version = "0.1.0.0";
|
||||
sha256 = "010mph49fq0rdr5dmm4pdlbmfmaaas8wffa9p1cgprs2ic1hnx3g";
|
||||
buildDepends = [
|
||||
explicitException QuickCheck text transformers utf8String
|
||||
];
|
||||
meta = {
|
||||
homepage = "https://github.com/massysett/multiarg";
|
||||
description = "Combinators to build command line parsers";
|
||||
license = self.stdenv.lib.licenses.mit;
|
||||
platforms = self.ghc.meta.platforms;
|
||||
maintainers = [
|
||||
self.stdenv.lib.maintainers.andres
|
||||
self.stdenv.lib.maintainers.simons
|
||||
];
|
||||
};
|
||||
})
|
||||
|
|
@ -2,8 +2,8 @@
|
|||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "neither";
|
||||
version = "0.3.0.1";
|
||||
sha256 = "1vr8zap3vp28dr48s510lfrbfhw5yz25vng6wyk20582lv4j2mz8";
|
||||
version = "0.3.1";
|
||||
sha256 = "1n00v2xs2ghm273barc3bbi67wgpvyihhgl1ij7qczyp9fhqlyfk";
|
||||
buildDepends = [ failure transformers ];
|
||||
meta = {
|
||||
homepage = "http://github.com/snoyberg/neither";
|
||||
|
|
|
|||
|
|
@ -0,0 +1,22 @@
|
|||
{ cabal, dataObject, monadControl, neither, persistent, text
|
||||
, transformers
|
||||
}:
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "persistent-sqlite";
|
||||
version = "0.6.2.1";
|
||||
sha256 = "10sqmkd7vnrrpr8phcswbxcvn8vjipgy96nk2jj3g96j3cfwfpk0";
|
||||
buildDepends = [
|
||||
dataObject monadControl neither persistent text transformers
|
||||
];
|
||||
meta = {
|
||||
homepage = "http://www.yesodweb.com/book/persistent";
|
||||
description = "Backend for the persistent library using sqlite3";
|
||||
license = self.stdenv.lib.licenses.bsd3;
|
||||
platforms = self.ghc.meta.platforms;
|
||||
maintainers = [
|
||||
self.stdenv.lib.maintainers.andres
|
||||
self.stdenv.lib.maintainers.simons
|
||||
];
|
||||
};
|
||||
})
|
||||
|
|
@ -2,8 +2,8 @@
|
|||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "pool-conduit";
|
||||
version = "0.0.0";
|
||||
sha256 = "0cbs7swb1ay3l1hlbirys171ybqg887csnp6yiy9biq11q5mhsml";
|
||||
version = "0.0.0.1";
|
||||
sha256 = "1im5fpwadg9hmajay6dkwmlzbp5rzn8hh9wh01iy23jgivkqk2q0";
|
||||
buildDepends = [ conduit resourcePool transformers ];
|
||||
meta = {
|
||||
homepage = "http://www.yesodweb.com/book/persistent";
|
||||
|
|
|
|||
|
|
@ -2,8 +2,8 @@
|
|||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "skein";
|
||||
version = "0.1.0.4";
|
||||
sha256 = "1m910kvm1ba9cl3ghr6j393xf1lvxb4ms55nipnzc5zg7r2xzh96";
|
||||
version = "0.1.0.5";
|
||||
sha256 = "12hyyydznss802v4pwfcpjr0y7241114a9z82xxq60q8dval8fyb";
|
||||
buildDepends = [ cereal cryptoApi tagged ];
|
||||
meta = {
|
||||
description = "Skein, a family of cryptographic hash functions. Includes Skein-MAC as well.";
|
||||
|
|
|
|||
|
|
@ -0,0 +1,18 @@
|
|||
{ cabal, cereal, network }:
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "socks";
|
||||
version = "0.4.0";
|
||||
sha256 = "0181qyxn7n47i7dqzw9yymbf73yr5v91iqjq01iyy43b4vab2ha8";
|
||||
buildDepends = [ cereal network ];
|
||||
meta = {
|
||||
homepage = "http://github.com/vincenthz/hs-socks";
|
||||
description = "Socks proxy (version 5) implementation";
|
||||
license = self.stdenv.lib.licenses.bsd3;
|
||||
platforms = self.ghc.meta.platforms;
|
||||
maintainers = [
|
||||
self.stdenv.lib.maintainers.andres
|
||||
self.stdenv.lib.maintainers.simons
|
||||
];
|
||||
};
|
||||
})
|
||||
|
|
@ -2,8 +2,8 @@
|
|||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "string-combinators";
|
||||
version = "0.6.0.2";
|
||||
sha256 = "1bsnli6376nq5dmcx8da2fakj7h73plqz6v1myzhkz1f6r3qcjfi";
|
||||
version = "0.6.0.3";
|
||||
sha256 = "18jawxqvcj7zpvb0wf1zln12s03mp6nglhv5ccywrkb5x0r0557j";
|
||||
buildDepends = [ baseUnicodeSymbols ];
|
||||
meta = {
|
||||
homepage = "https://github.com/basvandijk/string-combinators";
|
||||
|
|
|
|||
|
|
@ -4,8 +4,8 @@
|
|||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "test-framework";
|
||||
version = "0.4.2.1";
|
||||
sha256 = "1021drmg1k4b844rwsjfbvajai4irrxc9aa7g6rk5n246a2nh9if";
|
||||
version = "0.5";
|
||||
sha256 = "19zm9xdhyjhqi2ryd2gkwi7m92s88mmiw1b6b91hjfhfw3c1qlzz";
|
||||
isLibrary = true;
|
||||
isExecutable = true;
|
||||
buildDepends = [
|
||||
|
|
|
|||
|
|
@ -4,8 +4,8 @@
|
|||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "web-routes";
|
||||
version = "0.26.2";
|
||||
sha256 = "0v7vkd53jf9zf2m0lbiq10qp39ghlnxwafs1hixbz2qfcgsns10j";
|
||||
version = "0.26.3";
|
||||
sha256 = "1ldi4gjraga57qj9drknwp19vmy30fhcp6vw3y7xqcrarvp5n2mx";
|
||||
buildDepends = [
|
||||
blazeBuilder httpTypes mtl network parsec text utf8String
|
||||
];
|
||||
|
|
|
|||
|
|
@ -5,8 +5,8 @@
|
|||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "xml-conduit";
|
||||
version = "0.5.1.2";
|
||||
sha256 = "0ww018aj4fy0hngjsj1lc5m7sw36kdc1z2p8nxp4pgsmhj0ccm36";
|
||||
version = "0.5.2";
|
||||
sha256 = "0wr9xbx2dwv0kmnx9jwlm1734a22mc79ydg4sh61335fdjvchfnd";
|
||||
buildDepends = [
|
||||
attoparsec attoparsecConduit blazeBuilder blazeBuilderConduit
|
||||
conduit dataDefault failure systemFilepath text transformers
|
||||
|
|
|
|||
|
|
@ -0,0 +1,23 @@
|
|||
{ cabal, cmdargs, dataObject, dataObjectYaml, shakespeareCss
|
||||
, shakespeareJs, text, transformers, wai, waiExtra, warp, yesodCore
|
||||
}:
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "yesod-default";
|
||||
version = "0.5.0";
|
||||
sha256 = "02j9567nmyxr68q8p8ihbig9b6f9p9ciif8nlp03mfkbq10hwrm3";
|
||||
buildDepends = [
|
||||
cmdargs dataObject dataObjectYaml shakespeareCss shakespeareJs text
|
||||
transformers wai waiExtra warp yesodCore
|
||||
];
|
||||
meta = {
|
||||
homepage = "http://www.yesodweb.com/";
|
||||
description = "Default config and main functions for your yesod application";
|
||||
license = self.stdenv.lib.licenses.bsd3;
|
||||
platforms = self.ghc.meta.platforms;
|
||||
maintainers = [
|
||||
self.stdenv.lib.maintainers.andres
|
||||
self.stdenv.lib.maintainers.simons
|
||||
];
|
||||
};
|
||||
})
|
||||
|
|
@ -2,8 +2,8 @@
|
|||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "zlib-bindings";
|
||||
version = "0.0.3";
|
||||
sha256 = "0hi74pc9lc11j7bvaka2fpy3cdql2z7232nxpjffjk7prqrc0q8d";
|
||||
version = "0.0.3.1";
|
||||
sha256 = "1j1z797zi5svxyv5ssfx8lyhmzlc2j7iad4b01aw0jvyp3ad4qan";
|
||||
buildDepends = [ zlib ];
|
||||
meta = {
|
||||
homepage = "http://github.com/snoyberg/zlib-bindings";
|
||||
|
|
|
|||
|
|
@ -1,17 +0,0 @@
|
|||
{ cabal, zlib }:
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "zlib";
|
||||
version = "0.5.3.2";
|
||||
sha256 = "1a5xr59bw7hpgd7fwkpgkrpib7i46dsip7285pccvi2934k0628q";
|
||||
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
|
||||
self.stdenv.lib.maintainers.simons
|
||||
];
|
||||
};
|
||||
})
|
||||
|
|
@ -1,5 +1,6 @@
|
|||
{ stdenv, fetchurl
|
||||
, libjpeg ? null, libpng ? null, libmng ? null, lcms1 ? null, libtiff ? null, openexr ? null, mesa ? null, xlibs ? null }:
|
||||
{ stdenv, fetchurl, libjpeg, libpng, libmng, lcms1, libtiff, openexr, mesa
|
||||
, libX11, pkgconfig }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
|
||||
name ="libdevil-${version}";
|
||||
|
|
@ -10,14 +11,24 @@ stdenv.mkDerivation rec {
|
|||
sha256 = "1zd850nn7nvkkhasrv7kn17kzgslr5ry933v6db62s4lr0zzlbv8";
|
||||
};
|
||||
|
||||
buildInputs = [ libjpeg libpng libmng lcms1 libtiff openexr mesa xlibs.libX11 ];
|
||||
buildInputs = [ libjpeg libpng libmng lcms1 libtiff openexr mesa libX11 ];
|
||||
buildNativeInputs = [ pkgconfig ];
|
||||
|
||||
configureFlags = [ "--enable-ILU" "--enable-ILUT" ];
|
||||
|
||||
patches =
|
||||
[ ( fetchurl {
|
||||
url = http://patch-tracker.debian.org/patch/series/dl/devil/1.7.8-6.1/03_CVE-2009-3994.diff;
|
||||
sha256 = "0qkx2qfv02igbrmsn6z5a3lbrbwjfh3rb0c2sj54wy0j1f775hbc";
|
||||
} )
|
||||
./ftbfs-libpng15.patch
|
||||
];
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
homepage = http://openil.sourceforge.net/;
|
||||
description = "An image library which can can load, save, convert, manipulate,
|
||||
filter and display a wide variety of image formats.";
|
||||
description = "An image library which can can load, save, convert, manipulate, filter and display a wide variety of image formats";
|
||||
license = licenses.lgpl2;
|
||||
maintainers = [ maintainers.phreedom ];
|
||||
platforms = platforms.all;
|
||||
maintainers = [ maintainers.phreedom maintainers.urkud ];
|
||||
};
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -0,0 +1,31 @@
|
|||
Source: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=649554
|
||||
--- devil-1.7.8.orig/src-IL/src/il_icon.c
|
||||
+++ devil-1.7.8/src-IL/src/il_icon.c
|
||||
@@ -525,7 +525,11 @@
|
||||
|
||||
// Expand low-bit-depth grayscale images to 8 bits
|
||||
if (ico_color_type == PNG_COLOR_TYPE_GRAY && bit_depth < 8) {
|
||||
+#if PNG_LIBPNG_VER_MAJOR >= 1 && PNG_LIBPNG_VER_MINOR >= 4
|
||||
+ png_set_expand_gray_1_2_4_to_8(ico_png_ptr);
|
||||
+#else
|
||||
png_set_gray_1_2_4_to_8(ico_png_ptr);
|
||||
+#endif
|
||||
}
|
||||
|
||||
// Expand RGB images with transparency to full alpha channels
|
||||
only in patch2:
|
||||
unchanged:
|
||||
--- devil-1.7.8.orig/src-IL/src/il_png.c
|
||||
+++ devil-1.7.8/src-IL/src/il_png.c
|
||||
@@ -278,7 +278,11 @@
|
||||
|
||||
// Expand low-bit-depth grayscale images to 8 bits
|
||||
if (png_color_type == PNG_COLOR_TYPE_GRAY && bit_depth < 8) {
|
||||
+#if PNG_LIBPNG_VER_MAJOR >= 1 && PNG_LIBPNG_VER_MINOR >= 4
|
||||
+ png_set_expand_gray_1_2_4_to_8(png_ptr);
|
||||
+#else
|
||||
png_set_gray_1_2_4_to_8(png_ptr);
|
||||
+#endif
|
||||
}
|
||||
|
||||
// Expand RGB images with transparency to full alpha channels
|
||||
|
|
@ -0,0 +1,19 @@
|
|||
{ stdenv, fetchurl, popt }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "libnatspec-0.2.6";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/natspec/${name}.tar.bz2";
|
||||
sha256 = "0zvm9afh1skxgdv62ylrpwyykpjhhskxj0zv7yrdf7jhfdriz0y3";
|
||||
};
|
||||
|
||||
buildInputs = [ popt ];
|
||||
|
||||
meta = {
|
||||
homepage = http://natspec.sourceforge.net/ ;
|
||||
description = "A library intended to smooth national specificities in using of programs";
|
||||
platforms = stdenv.lib.platforms.unix;
|
||||
maintainers = [ stdenv.lib.maintainers.urkud ];
|
||||
};
|
||||
}
|
||||
|
|
@ -1,16 +1,16 @@
|
|||
{stdenv, fetchurl, bash, yasm, which}:
|
||||
{stdenv, fetchurl, bash, yasm, which, perl}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "libvpx-0.9.6";
|
||||
name = "libvpx-1.0.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = http://webm.googlecode.com/files/libvpx-v0.9.6.tar.bz2;
|
||||
sha256 = "0wxay9wss4lawrcmnwqkpy0rdnaih1k7ilzh284mgyqnya78mg98";
|
||||
url = http://webm.googlecode.com/files/libvpx-v1.0.0.tar.bz2;
|
||||
sha256 = "08gyx90ndv0v8dhbhp3jdh6g37pmcjlfwljzsy0nskm4345dpkh7";
|
||||
};
|
||||
|
||||
patchPhase = ''
|
||||
sed -e 's,/bin/bash,${bash}/bin/bash,' -i configure build/make/version.sh \
|
||||
examples/gen_example_code.sh
|
||||
examples/gen_example_code.sh build/make/gen_asm_deps.sh
|
||||
sed -e '/enable linux/d' -i configure
|
||||
'';
|
||||
|
||||
|
|
@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
|
|||
make quiet=false DIST_DIR=$out install
|
||||
'';
|
||||
|
||||
buildInputs = [ yasm which ];
|
||||
buildInputs = [ yasm which perl ];
|
||||
|
||||
meta = {
|
||||
description = "VP8 video encoder";
|
||||
|
|
|
|||
|
|
@ -1,12 +1,12 @@
|
|||
{stdenv, fetchurl, yasm}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "snapshot-20110724-2245-stable";
|
||||
version = "snapshot-20120129-2245-stable";
|
||||
name = "x264-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "ftp://ftp.videolan.org/pub/videolan/x264/snapshots/x264-${version}.tar.bz2";
|
||||
sha256 = "07bylkh8cwcmj01sr41hhrvfbciyixhw1irdpj01kz9d0h8dhhpz";
|
||||
sha256 = "1i63xsa46a5l0ys3mqbcqr4gr5kpaf9fs05cbf0782iir5k07pcr";
|
||||
};
|
||||
|
||||
patchPhase = ''
|
||||
|
|
|
|||
|
|
@ -55,7 +55,7 @@ stdenv.mkDerivation rec {
|
|||
meta = {
|
||||
homepage = http://www.cmake.org/;
|
||||
description = "Cross-Platform Makefile Generator";
|
||||
platforms = if useQt4 then qt4.meta.platforms else stdenv.lib.platforms.unix;
|
||||
platforms = if useQt4 then qt4.meta.platforms else stdenv.lib.platforms.all;
|
||||
maintainers = [ stdenv.lib.maintainers.urkud ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2,8 +2,8 @@
|
|||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "cabal-ghci";
|
||||
version = "0.2.0";
|
||||
sha256 = "0920q103g626f8syvn73bwqnix8x6q58xyazys6yinhr7dgi2x6m";
|
||||
version = "0.2.1";
|
||||
sha256 = "0za0bf59f4a3v5zvyy7h1xvxskrazdga4j1cs6psfv9fv80qig9r";
|
||||
isLibrary = true;
|
||||
isExecutable = true;
|
||||
meta = {
|
||||
|
|
|
|||
|
|
@ -2,8 +2,8 @@
|
|||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "cabal2nix";
|
||||
version = "1.23";
|
||||
sha256 = "1rnvnzwb4n89hq4wpyq1h6x773r7y23clqj5slsfnas7j3alzz8c";
|
||||
version = "1.24";
|
||||
sha256 = "1k0dqj64z08n1kgdjgdk3ra3l8xw1bg7yh0s8s4pv5g2ajwj2f83";
|
||||
isLibrary = false;
|
||||
isExecutable = true;
|
||||
buildDepends = [ hackageDb HTTP mtl nixosTypes regexPosix ];
|
||||
|
|
|
|||
|
|
@ -1,21 +1,35 @@
|
|||
{stdenv, fetchurl, perl, gettext, LocaleGettext}:
|
||||
{ stdenv, fetchurl, perl, gettext, LocaleGettext, makeWrapper }:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "help2man-1.36.1";
|
||||
stdenv.mkDerivation rec {
|
||||
name = "help2man-1.40.5";
|
||||
|
||||
src = fetchurl {
|
||||
url = http://ftp.gnu.org/gnu/help2man/help2man-1.36.1.tar.gz;
|
||||
sha256 = "13w20lfvggzhvzs9dinxbhwdd61svsacfv9d78zfl9lf1syb5i1f";
|
||||
url = "mirror://gnu/help2man/${name}.tar.gz";
|
||||
sha256 = "1d1wn9krvf9mp97c224710n1pcfh73p7w7na65zn2a06124rln8k";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
perl
|
||||
gettext
|
||||
LocaleGettext
|
||||
];
|
||||
buildInputs = [ makeWrapper perl gettext LocaleGettext ];
|
||||
|
||||
# So that configure can find `preloadable_libintl.so'.
|
||||
LD_LIBRARY_PATH = "${gettext}/lib";
|
||||
doCheck = false; # target `check' is missing
|
||||
|
||||
inherit gettext;
|
||||
postInstall =
|
||||
'' wrapProgram "$out/bin/help2man" \
|
||||
--prefix PERL5LIB : "$(echo ${LocaleGettext}/lib/perl*/site_perl)"
|
||||
'';
|
||||
|
||||
|
||||
meta = {
|
||||
description = "GNU help2man generates man pages from `--help' output";
|
||||
|
||||
longDescription =
|
||||
'' help2man produces simple manual pages from the ‘--help’ and
|
||||
‘--version’ output of other commands.
|
||||
'';
|
||||
|
||||
homepage = http://www.gnu.org/software/help2man/;
|
||||
|
||||
license = "GPLv3+";
|
||||
platforms = stdenv.lib.platforms.gnu; # arbitrary choice
|
||||
maintainers = [ stdenv.lib.maintainers.ludo ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -19,6 +19,7 @@ stdenv.mkDerivation (rec {
|
|||
meta = {
|
||||
description = "A tool that allows packages to find out information about other packages";
|
||||
homepage = http://pkg-config.freedesktop.org/wiki/;
|
||||
platforms = stdenv.lib.platforms.all;
|
||||
};
|
||||
|
||||
} // (if stdenv.system == "mips64el-linux" then
|
||||
|
|
|
|||
|
|
@ -0,0 +1,74 @@
|
|||
{ stdenv, getConfig, fetchurl, libX11, libXext, libXinerama, libXrandr
|
||||
, libXrender, fontconfig, freetype, openal }:
|
||||
stdenv.mkDerivation {
|
||||
name = "oilrush";
|
||||
src =
|
||||
let
|
||||
url = getConfig [ "oilrush" "url" ] null;
|
||||
sha256 = getConfig [ "oilrush" "sha256" ] null;
|
||||
in
|
||||
assert url != null && sha256 != null;
|
||||
fetchurl { inherit url sha256; };
|
||||
shell = stdenv.shell;
|
||||
arch = if stdenv.system == "x86_64-linux" then "x64"
|
||||
else if stdenv.system == "i686-linux" then "x86"
|
||||
else "";
|
||||
unpackPhase = ''
|
||||
mkdir oilrush
|
||||
cd oilrush
|
||||
"$shell" "$src" --tar xf
|
||||
'';
|
||||
patchPhase = ''
|
||||
cd bin
|
||||
for f in launcher_$arch libQtCoreUnigine_$arch.so.4 OilRush_$arch
|
||||
do
|
||||
patchelf --set-interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" $f
|
||||
done
|
||||
patchelf --set-rpath ${stdenv.gcc.gcc}/lib64:${stdenv.gcc.gcc}/lib:${libX11}/lib:${libXext}/lib:${libXrender}/lib:${fontconfig}/lib:${freetype}/lib\
|
||||
launcher_$arch
|
||||
patchelf --set-rpath ${stdenv.gcc.gcc}/lib64:${stdenv.gcc.gcc}/lib\
|
||||
libNetwork_$arch.so
|
||||
patchelf --set-rpath ${stdenv.gcc.gcc}/lib64:${stdenv.gcc.gcc}/lib\
|
||||
libQtCoreUnigine_$arch.so.4
|
||||
patchelf --set-rpath ${stdenv.gcc.gcc}/lib64:${stdenv.gcc.gcc}/lib:${libX11}/lib:${libXext}/lib:${libXrender}/lib:${fontconfig}/lib:${freetype}/lib\
|
||||
libQtGuiUnigine_$arch.so.4
|
||||
patchelf --set-rpath ${stdenv.gcc.gcc}/lib64:${stdenv.gcc.gcc}/lib\
|
||||
libQtNetworkUnigine_$arch.so.4
|
||||
patchelf --set-rpath ${stdenv.gcc.gcc}/lib64:${stdenv.gcc.gcc}/lib:${libX11}/lib:${libXext}/lib:${libXrender}/lib:${fontconfig}/lib:${freetype}/lib\
|
||||
libQtWebKitUnigine_$arch.so.4
|
||||
patchelf --set-rpath ${stdenv.gcc.gcc}/lib64:${stdenv.gcc.gcc}/lib\
|
||||
libQtXmlUnigine_$arch.so.4
|
||||
patchelf --set-rpath ${stdenv.gcc.gcc}/lib64:${stdenv.gcc.gcc}/lib\
|
||||
libRakNet_$arch.so
|
||||
patchelf --set-rpath ${stdenv.gcc.gcc}/lib64:${stdenv.gcc.gcc}/lib:${libX11}/lib:${libXext}/lib:${libXinerama}/lib:${libXrandr}/lib\
|
||||
libUnigine_$arch.so
|
||||
patchelf --set-rpath ${stdenv.gcc.gcc}/lib64:${stdenv.gcc.gcc}/lib:${libX11}/lib:${libXext}/lib:${libXinerama}/lib:${libXrandr}/lib\
|
||||
OilRush_$arch
|
||||
'';
|
||||
installPhase = ''
|
||||
cd ..
|
||||
mkdir -p "$out/opt/oilrush"
|
||||
cp -r * "$out/opt/oilrush"
|
||||
mkdir -p "$out/bin"
|
||||
cat << EOF > "$out/bin/oilrush"
|
||||
#! /bin/sh
|
||||
LD_LIBRARY_PATH=.:${openal}/lib:\$LD_LIBRARY_PATH
|
||||
cd "$out/opt/oilrush"
|
||||
exec ./launcher_$arch.sh "\$@"
|
||||
EOF
|
||||
chmod +x "$out/bin/oilrush"
|
||||
'';
|
||||
meta = {
|
||||
description = "A naval strategy game";
|
||||
longDescription = ''
|
||||
Oil Rush is a real-time naval strategy game based on group control. It
|
||||
combines the strategic challenge of a classical RTS with the sheer fun
|
||||
of Tower Defense.
|
||||
'';
|
||||
homepage = http://oilrush-game.com/;
|
||||
license = [ "proprietary" ];
|
||||
#maintainers = with stdenv.lib.maintainers; [ astsmtl ];
|
||||
#platforms = with stdenv.lib.platforms; linux;
|
||||
};
|
||||
|
||||
}
|
||||
|
|
@ -1,13 +0,0 @@
|
|||
{stdenv, fetchurl, gtk, SDL, nasm, zlib, bzip2, libjpeg}:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "generator-0.35-cbiere-r3";
|
||||
src = fetchurl {
|
||||
url = http://www.ghostwhitecrab.com/generator/generator-0.35-cbiere-r3.tar.bz2;
|
||||
sha256 = "0jw2ibbjyms9sklapnb6pzkmk680zsqq9pd51r2n4957zv1f36jd";
|
||||
};
|
||||
configureFlags = "--with-gtk --with-raze --with-sdl-audio";
|
||||
buildInputs = [gtk SDL nasm zlib bzip2 libjpeg];
|
||||
# Only required when not using SDL audio.
|
||||
# patches = [./soundcard.patch];
|
||||
}
|
||||
|
|
@ -1,20 +0,0 @@
|
|||
diff -rc generator-orig/main/gensoundp-unix.c generator-0.35-cbiere/main/gensoundp-unix.c
|
||||
*** generator-orig/main/gensoundp-unix.c 2004-09-26 19:07:44.000000000 +0200
|
||||
--- generator-0.35-cbiere/main/gensoundp-unix.c 2004-09-26 19:07:56.000000000 +0200
|
||||
***************
|
||||
*** 196,202 ****
|
||||
#include <soundcard.h>
|
||||
#else
|
||||
|
||||
! #ifdef HAVE_SOUNDCARD_H
|
||||
#include <sys/soundcard.h>
|
||||
#endif
|
||||
|
||||
--- 196,202 ----
|
||||
#include <soundcard.h>
|
||||
#else
|
||||
|
||||
! #ifdef HAVE_SYS_SOUNDCARD_H
|
||||
#include <sys/soundcard.h>
|
||||
#endif
|
||||
|
||||
|
|
@ -0,0 +1,28 @@
|
|||
{ stdenv, fetchurl }:
|
||||
|
||||
let version = "20111110";
|
||||
num = "20728";
|
||||
in stdenv.mkDerivation {
|
||||
name = "microcode-intel-${version}";
|
||||
src = fetchurl {
|
||||
url = "http://downloadmirror.intel.com/${num}/eng/microcode-${version}.tgz";
|
||||
sha256 = "16f532cdf9cce03e01e714619ad9406a465aa965bbd1288035398db79921cbc1";
|
||||
};
|
||||
|
||||
# setSourceRoot = ''
|
||||
# sourceRoot=.
|
||||
# '';
|
||||
|
||||
sourceRoot = ".";
|
||||
|
||||
dontBuild = true;
|
||||
installPhase = ''
|
||||
ensureDir $out
|
||||
cp microcode.dat "$out/"
|
||||
'';
|
||||
|
||||
meta = {
|
||||
homepage = http://www.intel.com;
|
||||
description = "Microcode for Intel processors";
|
||||
};
|
||||
}
|
||||
|
|
@ -89,5 +89,10 @@ gui = stdenv.mkDerivation {
|
|||
mkdir -pv $out/share/icons
|
||||
cp -av icons/hicolor $out/share/icons
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "Qt4 wpa_supplicant client";
|
||||
inherit (qt4.meta) platforms;
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,14 +1,14 @@
|
|||
{stdenv, fetchurl, binutilsCross ? null, gccCross ? null, onlyHeaders ? false}:
|
||||
|
||||
let
|
||||
name = "mingwrt-3.18";
|
||||
name = "mingwrt-3.20";
|
||||
in
|
||||
stdenv.mkDerivation (rec {
|
||||
inherit name;
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/mingw/${name}-mingw32-src.tar.gz";
|
||||
sha256 = "0hmxgkxnf6an70g07gmyik46sw1qm204izh6sp923szddvypjjfy";
|
||||
url = "mirror://sourceforge/mingw/MinGW/Base/mingw-rt/${name}-mingw32-src.tar.gz";
|
||||
sha256 = "02pydg1m8y35nxb4k34nlb5c341y2waq76z42mgdzlcf661r91pi";
|
||||
};
|
||||
|
||||
} //
|
||||
|
|
|
|||
|
|
@ -0,0 +1,53 @@
|
|||
{ fetchurl, stdenv, mingw_headers }:
|
||||
|
||||
# This file is tweaked for cross-compilation only.
|
||||
assert stdenv ? cross;
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "pthread-w32-1.10.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "ftp://sourceware.org/pub/pthreads-win32/pthreads-w32-1-10-0-release.tar.gz";
|
||||
sha256 = "1vllxxfa9a7mssb1x98a2r736vsv5ll3sjizbr7a8hw8j9p18j7n";
|
||||
};
|
||||
|
||||
configurePhase =
|
||||
'' sed -i GNUmakefile \
|
||||
-e 's/CC=gcc/CC=i686-pc-mingw32-gcc/g ;
|
||||
s/windres/i686-pc-mingw32-windres/g ;
|
||||
s/dlltool/i686-pc-mingw32-dlltool/g'
|
||||
'';
|
||||
|
||||
buildInputs = [ mingw_headers ];
|
||||
|
||||
buildPhase = "make GC"; # to build the GNU C dll with C cleanup code
|
||||
|
||||
installPhase =
|
||||
'' mkdir -p "$out" "$out/include" "$out/lib"
|
||||
cp -v *pthread*{dll,a} "$out/lib"
|
||||
cp -v pthread.h semaphore.h sched.h "$out/include"
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "POSIX threads for Woe32";
|
||||
|
||||
longDescription =
|
||||
'' The POSIX 1003.1-2001 standard defines an application programming
|
||||
interface (API) for writing multithreaded applications. This
|
||||
interface is known more commonly as pthreads. A good number of
|
||||
modern operating systems include a threading library of some kind:
|
||||
Solaris (UI) threads, Win32 threads, DCE threads, DECthreads, or any
|
||||
of the draft revisions of the pthreads standard. The trend is that
|
||||
most of these systems are slowly adopting the pthreads standard API,
|
||||
with application developers following suit to reduce porting woes.
|
||||
|
||||
Woe32 does not, and is unlikely to ever, support pthreads natively.
|
||||
This project seeks to provide a freely available and high-quality
|
||||
solution to this problem.
|
||||
'';
|
||||
|
||||
homepage = http://sourceware.org/pthreads-win32/;
|
||||
|
||||
license = "LGPLv2.1+";
|
||||
};
|
||||
}
|
||||
|
|
@ -1,16 +1,19 @@
|
|||
{stdenv, fetchurl, binutilsCross ? null, gccCross ? null, onlyHeaders ? false}:
|
||||
{ stdenv, fetchurl, xz, binutilsCross ? null
|
||||
, gccCross ? null, onlyHeaders ? false }:
|
||||
|
||||
let
|
||||
name = "w32api-3.14";
|
||||
name = "w32api-3.17-2";
|
||||
in
|
||||
stdenv.mkDerivation ({
|
||||
inherit name;
|
||||
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/mingw/${name}-mingw32-src.tar.gz";
|
||||
sha256 = "128ax8a4dlspxsi5fi7bi1aslppqx3kczr1ibzj1z1az48bvwp21";
|
||||
url = "mirror://sourceforge/mingw/MinGW/Base/w32api/w32api-3.17/${name}-mingw32-src.tar.lzma";
|
||||
sha256 = "09rhnl6zikmdyb960im55jck0rdy5z9nlg3akx68ixn7khf3j8wb";
|
||||
};
|
||||
|
||||
buildNativeInputs = [ xz ];
|
||||
|
||||
} //
|
||||
(if onlyHeaders then {
|
||||
name = name + "-headers";
|
||||
|
|
|
|||
|
|
@ -1,6 +1,7 @@
|
|||
{ stdenv, fetchurl, bzip2 }:
|
||||
{ stdenv, fetchurl, bzip2
|
||||
, enableNLS ? false, libnatspec }:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
stdenv.mkDerivation ({
|
||||
name = "unzip-6.0";
|
||||
|
||||
src = fetchurl {
|
||||
|
|
@ -8,11 +9,11 @@ stdenv.mkDerivation {
|
|||
sha256 = "0dxx11knh3nk95p2gg2ak777dd11pr7jx5das2g49l262scrcv83";
|
||||
};
|
||||
|
||||
buildInputs = [ bzip2 ];
|
||||
buildInputs = [ bzip2 ] ++ stdenv.lib.optional enableNLS libnatspec;
|
||||
|
||||
makefile = "unix/Makefile";
|
||||
|
||||
NIX_LDFLAGS = "-lbz2";
|
||||
NIX_LDFLAGS = [ "-lbz2" ] ++ stdenv.lib.optional enableNLS "-lnatspec";
|
||||
|
||||
buildFlags = "generic D_USE_BZ2=-DUSE_BZIP2 L_BZ2=-lbz2";
|
||||
|
||||
|
|
@ -24,4 +25,13 @@ stdenv.mkDerivation {
|
|||
license = "free"; # http://www.info-zip.org/license.html
|
||||
meta.platforms = stdenv.lib.platforms.all;
|
||||
};
|
||||
}
|
||||
} // (if enableNLS then {
|
||||
patches =
|
||||
[ ( fetchurl {
|
||||
url =
|
||||
"http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/app-arch/unzip/files/unzip-6.0-natspec.patch?revision=1.1";
|
||||
name = "unzip-6.0-natspec.patch";
|
||||
sha256 = "67ab260ae6adf8e7c5eda2d1d7846929b43562943ec4aff629bd7018954058b1";
|
||||
})
|
||||
];
|
||||
} else {}))
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{stdenv, fetchurl}:
|
||||
{ stdenv, fetchurl, libnatspec }:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "zip-3.0";
|
||||
|
|
@ -12,8 +12,14 @@ stdenv.mkDerivation {
|
|||
|
||||
installFlags="-f unix/Makefile prefix=$(out) INSTALL=cp";
|
||||
|
||||
patches = [ ./natspec-gentoo.patch.bz2 ];
|
||||
|
||||
buildInputs = [ libnatspec ];
|
||||
|
||||
meta = {
|
||||
homepage = http://www.info-zip.org;
|
||||
platforms = stdenv.lib.platforms.all;
|
||||
maintainer = [ stdenv.lib.maintainers.urkud ];
|
||||
};
|
||||
}
|
||||
|
||||
|
|
|
|||
Binary file not shown.
|
|
@ -0,0 +1,18 @@
|
|||
{ stdenv, fetchurl, perl }:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "cowsay-3.03";
|
||||
src = fetchurl {
|
||||
url = http://www.nog.net/~tony/warez/cowsay-3.03.tar.gz;
|
||||
sha256 = "1bxj802na2si2bk5zh7n0b7c33mg8a5n2wnvh0vihl9bmjkp51hb";
|
||||
};
|
||||
buildInputs = [perl];
|
||||
installPhase = ''
|
||||
bash ./install.sh $out
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "cowsay is a program which generates ASCII pictures of a cow with a message.";
|
||||
homepage = http://www.nog.net/~tony/warez/cowsay.shtml;
|
||||
};
|
||||
}
|
||||
|
|
@ -6,18 +6,18 @@
|
|||
let
|
||||
|
||||
hpnSrc = fetchurl {
|
||||
url = http://www.psc.edu/networking/projects/hpn-ssh/openssh-5.8p1-hpn13v11.diff.gz;
|
||||
sha256 = "1xwx2m2sihpy57mwdnc9km3c72hxfdjyp5mmr1vcx2c8kp901db2";
|
||||
url = http://www.psc.edu/networking/projects/hpn-ssh/openssh-5.9p1-hpn13v12.diff.gz;
|
||||
sha256 = "0h1h45vic4zks5bc5mvkc50rlgy2c219vn3rmpmalgm5hws9qjbl";
|
||||
};
|
||||
|
||||
in
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "openssh-5.8p2";
|
||||
name = "openssh-5.9p1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "ftp://ftp.nl.uu.net/pub/OpenBSD/OpenSSH/portable/${name}.tar.gz";
|
||||
sha1 = "64798328d310e4f06c9f01228107520adbc8b3e5";
|
||||
sha256 = "1mbpfyq3kjc4p8pc631iqgvcqhwhm6vdwvzsdmd54jzhdxmqngld";
|
||||
};
|
||||
|
||||
prePatch = stdenv.lib.optionalString hpnSupport
|
||||
|
|
|
|||
|
|
@ -0,0 +1,37 @@
|
|||
{ fetchurl, stdenv }:
|
||||
|
||||
let
|
||||
rev = "269cc6";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://pkgs.fedoraproject.org/gitweb/?p=hardlink.git;a=blob_plain;f=hardlink.c;hb=${rev}";
|
||||
sha256 = "721c54e653772e11bf0d30fb02aa21b96b147a1b68c0acb4f05cb87e7718bc12";
|
||||
name = "hardlink.c";
|
||||
};
|
||||
|
||||
man = fetchurl {
|
||||
url = "pkgs.fedoraproject.org/gitweb/?p=hardlink.git;a=blob_plain;f=hardlink.1;hb=${rev}";
|
||||
sha256 = "2f7e18a0259a2ceae316592e8b18bee525eb7e83fe3bb6b881e5dafa24747f2d";
|
||||
name = "hardlink.1";
|
||||
};
|
||||
in
|
||||
stdenv.mkDerivation {
|
||||
name = "hardlink-2010.1.${rev}";
|
||||
|
||||
phases = ["buildPhase"];
|
||||
|
||||
buildPhase = ''
|
||||
mkdir -p $out/bin $out/share/man/man1
|
||||
gcc -O2 ${src} -o $out/bin/hardlink
|
||||
install -m 444 ${man} $out/share/man/man1/hardlink.1
|
||||
'';
|
||||
|
||||
meta = {
|
||||
homepage = "http://pkgs.fedoraproject.org/gitweb/?p=hardlink.git;a=summary";
|
||||
description = "consolidate duplicate files via hardlinks";
|
||||
license = stdenv.lib.licenses.gpl2Plus;
|
||||
|
||||
platforms = stdenv.lib.platforms.unix;
|
||||
maintainers = [ stdenv.lib.maintainers.simons ];
|
||||
};
|
||||
}
|
||||
|
|
@ -313,6 +313,11 @@ let
|
|||
inherit stdenv;
|
||||
};
|
||||
|
||||
makeAutostartItem = import ../build-support/make-startupitem {
|
||||
inherit stdenv;
|
||||
inherit lib;
|
||||
};
|
||||
|
||||
makeInitrd = {contents}: import ../build-support/kernel/make-initrd.nix {
|
||||
inherit stdenv perl cpio contents ubootChooser;
|
||||
};
|
||||
|
|
@ -505,6 +510,8 @@ let
|
|||
|
||||
convertlit = callPackage ../tools/text/convertlit { };
|
||||
|
||||
cowsay = callPackage ../tools/misc/cowsay { };
|
||||
|
||||
unifdef = callPackage ../development/tools/misc/unifdef { };
|
||||
|
||||
usb_modeswitch = callPackage ../development/tools/misc/usb-modeswitch { };
|
||||
|
|
@ -830,6 +837,8 @@ let
|
|||
|
||||
pigz = callPackage ../tools/compression/pigz { };
|
||||
|
||||
hardlink = callPackage ../tools/system/hardlink { };
|
||||
|
||||
halibut = callPackage ../tools/typesetting/halibut { };
|
||||
|
||||
hddtemp = callPackage ../tools/misc/hddtemp { };
|
||||
|
|
@ -1526,6 +1535,8 @@ let
|
|||
|
||||
unzip = unzip60;
|
||||
|
||||
unzipNLS = unzip.override { enableNLS = true; };
|
||||
|
||||
unzip552 = callPackage ../tools/archivers/unzip/5.52.nix { };
|
||||
|
||||
unzip60 = callPackage ../tools/archivers/unzip/6.0.nix { };
|
||||
|
|
@ -3073,7 +3084,6 @@ let
|
|||
|
||||
omake = callPackage ../development/tools/ocaml/omake { };
|
||||
|
||||
|
||||
openocd = callPackage ../development/tools/misc/openocd { };
|
||||
|
||||
oprofile = import ../development/tools/profiling/oprofile {
|
||||
|
|
@ -3632,6 +3642,8 @@ let
|
|||
cxx = false;
|
||||
};
|
||||
|
||||
gmp5 = callPackage ../development/libraries/gmp/5.0.3.nix { };
|
||||
|
||||
gmpxx = appendToName "with-cxx" (gmp.override { cxx = true; });
|
||||
|
||||
gobjectIntrospection = callPackage ../development/libraries/gobject-introspection { };
|
||||
|
|
@ -3686,19 +3698,11 @@ let
|
|||
|
||||
gtkmathview = callPackage ../development/libraries/gtkmathview { };
|
||||
|
||||
gtkLibs = pkgs.gtkLibs224;
|
||||
gtkLibs = recurseIntoAttrs pkgs.gtkLibs224;
|
||||
|
||||
inherit (pkgs.gtkLibs) glib gtk pango cairo gdk_pixbuf;
|
||||
|
||||
gtkLibs1x = recurseIntoAttrs (let callPackage = newScope pkgs.gtkLibs1x; in {
|
||||
|
||||
glib = callPackage ../development/libraries/glib/1.2.x.nix { };
|
||||
|
||||
gtk = callPackage ../development/libraries/gtk+/1.2.x.nix { };
|
||||
|
||||
});
|
||||
|
||||
gtkLibs224 = recurseIntoAttrs (let callPackage = pkgs.newScope pkgs.gtkLibs224; in {
|
||||
gtkLibs224 = let callPackage = pkgs.newScope pkgs.gtkLibs224; in {
|
||||
|
||||
glib = callPackage ../development/libraries/glib/2.28.x.nix { };
|
||||
|
||||
|
|
@ -3722,7 +3726,7 @@ let
|
|||
|
||||
gob2 = callPackage ../development/tools/misc/gob2 { };
|
||||
|
||||
});
|
||||
};
|
||||
|
||||
gtkLibs3x = let callPackage = newScope pkgs.gtkLibs3x; in {
|
||||
glib = callPackage ../development/libraries/glib/2.30.x.nix { };
|
||||
|
|
@ -4038,6 +4042,8 @@ let
|
|||
|
||||
libmtp = callPackage ../development/libraries/libmtp { };
|
||||
|
||||
libnatspec = callPackage ../development/libraries/libnatspec { };
|
||||
|
||||
libnice = callPackage ../development/libraries/libnice {
|
||||
inherit (gnome) glib;
|
||||
};
|
||||
|
|
@ -5265,6 +5271,8 @@ let
|
|||
|
||||
alsaUtils = callPackage ../os-specific/linux/alsa-utils { };
|
||||
|
||||
microcodeIntel = callPackage ../os-specific/linux/microcode/intel.nix { };
|
||||
|
||||
bcm43xx = callPackage ../os-specific/linux/firmware/bcm43xx { };
|
||||
|
||||
bluez = callPackage ../os-specific/linux/bluez { };
|
||||
|
|
@ -6266,6 +6274,10 @@ let
|
|||
paths = [ w32api mingw_runtime ];
|
||||
};
|
||||
|
||||
pthreads = callPackage ../os-specific/windows/pthread-w32 {
|
||||
mingw_headers = mingw_headers2;
|
||||
};
|
||||
|
||||
wxMSW = callPackage ../os-specific/windows/wxMSW-2.8 { };
|
||||
};
|
||||
|
||||
|
|
@ -6277,8 +6289,7 @@ let
|
|||
|
||||
wirelesstools = callPackage ../os-specific/linux/wireless-tools { };
|
||||
|
||||
wpa_supplicant = callPackage ../os-specific/linux/wpa_supplicant {
|
||||
};
|
||||
wpa_supplicant = callPackage ../os-specific/linux/wpa_supplicant { };
|
||||
|
||||
wpa_supplicant_gui = pkgs.wpa_supplicant.gui;
|
||||
|
||||
|
|
@ -6834,13 +6845,6 @@ let
|
|||
|
||||
firefox36Wrapper = wrapFirefox { browser = firefox36Pkgs.firefox; };
|
||||
|
||||
firefox80Pkgs = callPackage ../applications/networking/browsers/firefox/8.0.nix {
|
||||
inherit (gtkLibs) gtk pango;
|
||||
inherit (gnome) libIDL;
|
||||
};
|
||||
|
||||
firefox80Wrapper = wrapFirefox { browser = firefox80Pkgs.firefox; };
|
||||
|
||||
firefox90Pkgs = callPackage ../applications/networking/browsers/firefox/9.0.nix {
|
||||
inherit (gtkLibs) gtk pango;
|
||||
inherit (gnome) libIDL;
|
||||
|
|
@ -6848,6 +6852,13 @@ let
|
|||
|
||||
firefox90Wrapper = wrapFirefox { browser = firefox90Pkgs.firefox; };
|
||||
|
||||
firefox100Pkgs = callPackage ../applications/networking/browsers/firefox/10.0.nix {
|
||||
inherit (gtkLibs) gtk pango;
|
||||
inherit (gnome) libIDL;
|
||||
};
|
||||
|
||||
firefox100Wrapper = wrapFirefox { browser = firefox100Pkgs.firefox; };
|
||||
|
||||
flac = callPackage ../applications/audio/flac { };
|
||||
|
||||
flashplayer = flashplayer11;
|
||||
|
|
@ -7153,13 +7164,7 @@ let
|
|||
ledger = callPackage ../applications/office/ledger/2.6.3.nix { };
|
||||
ledger3 = callPackage ../applications/office/ledger/3.0.nix { };
|
||||
|
||||
links2 = (builderDefsPackage ../applications/networking/browsers/links2) {
|
||||
inherit fetchurl stdenv bzip2 zlib libjpeg libpng libtiff
|
||||
gpm openssl SDL SDL_image SDL_net pkgconfig;
|
||||
inherit (xlibs) libX11 libXau xproto libXt;
|
||||
};
|
||||
|
||||
links2Stdenv = callPackage ../applications/networking/browsers/links2/stdenv.nix { };
|
||||
links2 = callPackage ../applications/networking/browsers/links2 { };
|
||||
|
||||
linphone = callPackage ../applications/networking/linphone {
|
||||
inherit (gnome) libglade gtk;
|
||||
|
|
@ -7483,7 +7488,9 @@ let
|
|||
|
||||
siproxd = callPackage ../applications/networking/siproxd { };
|
||||
|
||||
skype_linux = callPackage_i686 ../applications/networking/skype { };
|
||||
skype_linux = callPackage_i686 ../applications/networking/skype {
|
||||
usePulseAudio = getConfig [ "pulseaudio" ] false; # disabled by default (the 100% cpu bug)
|
||||
};
|
||||
|
||||
slim = callPackage ../applications/display-managers/slim { };
|
||||
|
||||
|
|
@ -7772,12 +7779,6 @@ let
|
|||
|
||||
xineUI = callPackage ../applications/video/xine-ui { };
|
||||
|
||||
xmms = callPackage ../applications/audio/xmms {
|
||||
inherit (gnome) esound;
|
||||
inherit (gtkLibs1x) glib gtk;
|
||||
stdenv = overrideGCC stdenv gcc34; # due to problems with gcc 4.x
|
||||
};
|
||||
|
||||
xneur = callPackage ../applications/misc/xneur {
|
||||
GStreamer=gst_all.gstreamer;
|
||||
inherit (gtkLibs) glib gtk pango atk gdk_pixbuf;
|
||||
|
|
@ -7966,6 +7967,8 @@ let
|
|||
|
||||
njam = callPackage ../games/njam { };
|
||||
|
||||
oilrush = callPackage ../games/oilrush { };
|
||||
|
||||
openttd = callPackage ../games/openttd {
|
||||
zlib = zlibStatic;
|
||||
};
|
||||
|
|
@ -8541,10 +8544,6 @@ let
|
|||
python = pythonFull;
|
||||
};
|
||||
|
||||
generator = callPackage ../misc/emulators/generator {
|
||||
inherit (gtkLibs1x) gtk;
|
||||
};
|
||||
|
||||
gensgs = callPackage_i686 ../misc/emulators/gens-gs { };
|
||||
|
||||
ghostscript = callPackage ../misc/ghostscript {
|
||||
|
|
@ -8701,7 +8700,6 @@ let
|
|||
texLiveFull = lib.setName "texlive-full" (texLiveAggregationFun {
|
||||
paths = [ texLive texLiveExtra lmodern texLiveCMSuper texLiveLatexXColor
|
||||
texLivePGF texLiveBeamer texLiveModerncv ];
|
||||
|
||||
});
|
||||
|
||||
/* Look in configurations/misc/raskin.nix for usage example (around revisions
|
||||
|
|
|
|||
|
|
@ -151,7 +151,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
|
|||
stm = self.stm_2_2_0_1; # 7.2 ok, 7.3 ok
|
||||
syb = self.syb_0_3_6; # 7.2 ok, 7.3 ok
|
||||
xhtml = self.xhtml_3000_2_0_1; # 7.2 ok, 7.3 ok
|
||||
zlib = self.zlib_0_5_3_2; # 7.2 ok, 7.3 ok
|
||||
zlib = self.zlib_0_5_3_1; # 7.2 ok, 7.3 ok
|
||||
HTTP = self.HTTP_4000_2_2; # 7.2 ok, 7.3 ok
|
||||
deepseq = self.deepseq_1_1_0_2; # 7.2 ok, 7.3 ok
|
||||
text = self.text_0_11_1_13; # 7.2 ok, 7.3 ok
|
||||
|
|
@ -210,7 +210,6 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
|
|||
haskellPlatform = self.haskellPlatform_2011_4_0_0;
|
||||
mtl1 = self.mtl_1_1_1_1;
|
||||
repaExamples = null; # don't pick this version of 'repa-examples' during nix-env -u
|
||||
zlib_0_5_3_2 = null; # don't pick this version of 'zlib' during nix-env -u
|
||||
};
|
||||
|
||||
haskellPlatform_2011_4_0_0 =
|
||||
|
|
@ -253,7 +252,6 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
|
|||
haskellPlatform = self.haskellPlatform_2011_2_0_1;
|
||||
mtl1 = self.mtl_1_1_1_1;
|
||||
repaExamples = null; # don't pick this version of 'repa-examples' during nix-env -u
|
||||
zlib_0_5_3_2 = null; # don't pick this version of 'zlib' during nix-env -u
|
||||
};
|
||||
|
||||
haskellPlatform_2011_2_0_1 =
|
||||
|
|
@ -296,7 +294,6 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
|
|||
haskellPlatform = self.haskellPlatform_2011_2_0_0;
|
||||
mtl1 = self.mtl_1_1_1_1;
|
||||
repaExamples = null; # don't pick this version of 'repa-examples' during nix-env -u
|
||||
zlib_0_5_3_2 = null; # don't pick this version of 'zlib' during nix-env -u
|
||||
};
|
||||
|
||||
haskellPlatform_2011_2_0_0 =
|
||||
|
|
@ -335,7 +332,6 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
|
|||
self : self.haskellPlatformArgs_2010_2_0_0 self // {
|
||||
haskellPlatform = self.haskellPlatform_2010_2_0_0;
|
||||
repaExamples = null; # don't pick this version of 'repa-examples' during nix-env -u
|
||||
zlib_0_5_3_2 = null; # don't pick this version of 'zlib' during nix-env -u
|
||||
deepseq = self.deepseq_1_1_0_2;
|
||||
# deviating from Haskell platform here, to make some packages (notably statistics) compile
|
||||
};
|
||||
|
|
@ -375,7 +371,6 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
|
|||
haskellPlatform = self.haskellPlatform_2010_1_0_0;
|
||||
extensibleExceptions = self.extensibleExceptions_0_1_1_0;
|
||||
repaExamples = null; # don't pick this version of 'repa-examples' during nix-env -u
|
||||
zlib_0_5_3_2 = null; # don't pick this version of 'zlib' during nix-env -u
|
||||
};
|
||||
|
||||
haskellPlatform_2010_1_0_0 =
|
||||
|
|
@ -415,7 +410,6 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
|
|||
extensibleExceptions = self.extensibleExceptions_0_1_1_0;
|
||||
text = self.text_0_11_0_6;
|
||||
repaExamples = null; # don't pick this version of 'repa-examples' during nix-env -u
|
||||
zlib_0_5_3_2 = null; # don't pick this version of 'zlib' during nix-env -u
|
||||
};
|
||||
|
||||
haskellPlatform_2009_2_0_2 =
|
||||
|
|
@ -647,6 +641,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
|
|||
|
||||
erf = callPackage ../development/libraries/haskell/erf {};
|
||||
|
||||
explicitException = callPackage ../development/libraries/haskell/explicit-exception {};
|
||||
|
||||
filepath = callPackage ../development/libraries/haskell/filepath {};
|
||||
|
||||
extensibleExceptions_0_1_1_0 = callPackage ../development/libraries/haskell/extensible-exceptions/0.1.1.0.nix {};
|
||||
|
|
@ -829,8 +825,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
|
|||
|
||||
hledger = callPackage ../development/libraries/haskell/hledger {};
|
||||
hledgerLib = callPackage ../development/libraries/haskell/hledger-lib {};
|
||||
hledgerVty = callPackage ../development/libraries/haskell/hledger-vty {};
|
||||
hledgerChart = callPackage ../development/libraries/haskell/hledger-chart {};
|
||||
#hledgerVty = callPackage ../development/libraries/haskell/hledger-vty {};
|
||||
#hledgerChart = callPackage ../development/libraries/haskell/hledger-chart {};
|
||||
hledgerInterest = callPackage ../applications/office/hledger-interest {};
|
||||
hledgerWeb = callPackage ../development/libraries/haskell/hledger-web {};
|
||||
|
||||
|
|
@ -991,7 +987,9 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
|
|||
mtl2 = self.mtl_2_0_1_0;
|
||||
mtl = self.mtl1;
|
||||
|
||||
mtlparse = callPackage ../development/libraries/haskell/mtlparse {};
|
||||
mtlparse = callPackage ../development/libraries/haskell/mtlparse {};
|
||||
|
||||
multiarg = callPackage ../development/libraries/haskell/multiarg {};
|
||||
|
||||
multiplate = callPackage ../development/libraries/haskell/multiplate {};
|
||||
|
||||
|
|
@ -1044,7 +1042,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
|
|||
pathPieces_0_1_0 = callPackage ../development/libraries/haskell/path-pieces/0.1.0.nix {};
|
||||
pathPieces = self.pathPieces_0_1_0;
|
||||
|
||||
pandoc = callPackage ../development/libraries/haskell/pandoc/default.nix {};
|
||||
pandoc = callPackage ../development/libraries/haskell/pandoc {};
|
||||
|
||||
pandocTypes = callPackage ../development/libraries/haskell/pandoc-types {};
|
||||
|
||||
|
|
@ -1080,6 +1078,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
|
|||
pathPieces = self.pathPieces_0_0_0;
|
||||
};
|
||||
|
||||
persistentSqlite = callPackage ../development/libraries/haskell/persistent-sqlite {};
|
||||
|
||||
persistentTemplate = callPackage ../development/libraries/haskell/persistent-template {};
|
||||
|
||||
polyparse = callPackage ../development/libraries/haskell/polyparse/default.nix {};
|
||||
|
|
@ -1210,6 +1210,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
|
|||
|
||||
snapServer = callPackage ../development/libraries/haskell/snap/server.nix {};
|
||||
|
||||
socks = callPackage ../development/libraries/haskell/socks {};
|
||||
|
||||
stateref = callPackage ../development/libraries/haskell/stateref {};
|
||||
|
||||
StateVar = callPackage ../development/libraries/haskell/StateVar {};
|
||||
|
|
@ -1467,6 +1469,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
|
|||
pathPieces = self.pathPieces_0_0_0;
|
||||
};
|
||||
|
||||
yesodDefault = callPackage ../development/libraries/haskell/yesod-default {};
|
||||
|
||||
yesodForm = callPackage ../development/libraries/haskell/yesod-form {};
|
||||
|
||||
yesodJson = callPackage ../development/libraries/haskell/yesod-json {};
|
||||
|
|
@ -1492,10 +1496,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
|
|||
zlib_0_5_3_1 = callPackage ../development/libraries/haskell/zlib/0.5.3.1.nix {
|
||||
inherit (pkgs) zlib;
|
||||
};
|
||||
zlib_0_5_3_2 = callPackage ../development/libraries/haskell/zlib/0.5.3.2.nix {
|
||||
inherit (pkgs) zlib;
|
||||
};
|
||||
zlib = self.zlib_0_5_3_2;
|
||||
zlib = self.zlib_0_5_3_1;
|
||||
|
||||
zlibBindings = callPackage ../development/libraries/haskell/zlib-bindings {};
|
||||
|
||||
|
|
|
|||
|
|
@ -15,7 +15,6 @@ with (import ./release-lib.nix);
|
|||
|
||||
} // (mapTestOn ((packagesWithMetaPlatform pkgs) // rec {
|
||||
|
||||
MPlayer = linux;
|
||||
abcde = linux;
|
||||
alsaUtils = linux;
|
||||
apacheHttpd = linux;
|
||||
|
|
@ -52,12 +51,10 @@ with (import ./release-lib.nix);
|
|||
chatzilla = linux;
|
||||
cksfv = all;
|
||||
classpath = linux;
|
||||
cmake = all;
|
||||
consolekit = linux;
|
||||
coreutils = all;
|
||||
cpio = all;
|
||||
cron = linux;
|
||||
cups = linux;
|
||||
cvs = linux;
|
||||
db4 = all;
|
||||
ddrescue = linux;
|
||||
|
|
@ -237,7 +234,6 @@ with (import ./release-lib.nix);
|
|||
php = linux;
|
||||
pidgin = linux;
|
||||
pinentry = linux;
|
||||
pkgconfig = all;
|
||||
pltScheme = linux;
|
||||
pmccabe = linux;
|
||||
portmap = linux;
|
||||
|
|
@ -333,7 +329,6 @@ with (import ./release-lib.nix);
|
|||
wine = ["i686-linux"];
|
||||
wireshark = linux;
|
||||
wirelesstools = linux;
|
||||
wpa_supplicant = linux;
|
||||
wxGTK = linux;
|
||||
x11_ssh_askpass = linux;
|
||||
xchm = linux;
|
||||
|
|
@ -354,20 +349,6 @@ with (import ./release-lib.nix);
|
|||
zsh = linux;
|
||||
zsnes = ["i686-linux"];
|
||||
|
||||
aspellDicts = {
|
||||
de = all;
|
||||
en = all;
|
||||
es = all;
|
||||
fr = all;
|
||||
nl = all;
|
||||
ru = all;
|
||||
};
|
||||
|
||||
dbus_all = {
|
||||
libs = linux;
|
||||
tools = linux;
|
||||
};
|
||||
|
||||
emacs22Packages = {
|
||||
bbdb = linux;
|
||||
cedet = linux;
|
||||
|
|
@ -382,8 +363,8 @@ with (import ./release-lib.nix);
|
|||
};
|
||||
|
||||
firefox36Pkgs.firefox = linux;
|
||||
firefox80Pkgs.firefox = linux;
|
||||
firefox90Pkgs.firefox = linux;
|
||||
firefox100Pkgs.firefox = linux;
|
||||
|
||||
gnome = {
|
||||
gnome_panel = linux;
|
||||
|
|
@ -391,10 +372,6 @@ with (import ./release-lib.nix);
|
|||
gnome_vfs = linux;
|
||||
};
|
||||
|
||||
gtkLibs = {
|
||||
gtk = linux;
|
||||
};
|
||||
|
||||
/*
|
||||
haskellPackages_ghc6104 = {
|
||||
ghc = ghcSupported;
|
||||
|
|
|
|||
Loading…
Reference in New Issue