chn/nixpkgs
1
0
Fork 0
mirror of https://github.com/CHN-beta/nixpkgs.git synced 2026-01-12 02:40:31 +08:00
Code Issues Packages Projects Releases Wiki Activity

svn merge ^/nixpkgs/trunk

Browse Source 
A trivial conflict in all-packages.nix

svn path=/nixpkgs/branches/glib-2.30/; revision=32041
This commit is contained in:
Yury G. Kudryashov
2012-02-05 18:39:09 +00:00
parent f9c27946c2 c81e27f1f7
commit c0f7e03b67
152 changed files with 1550 additions and 494 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
pkgs/applications/audio/spotify/default.nix
View File

@@ -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.";

1
pkgs/applications/graphics/graphicsmagick/1.3.7.nix
View File

@@ -27,5 +27,6 @@ stdenv.mkDerivation {
homepage = http://www.graphicsmagick.org;
description = "Swiss army knife of image processing";
license = stdenv.lib.licenses.mit;
platforms = stdenv.lib.platforms.all;
};
}

1
pkgs/applications/graphics/graphicsmagick/default.nix
View File

@@ -27,5 +27,6 @@ stdenv.mkDerivation {
homepage = http://www.graphicsmagick.org;
description = "Swiss army knife of image processing";
license = stdenv.lib.licenses.mit;
platforms = stdenv.lib.platforms.all;
};
}

6
pkgs/applications/misc/adobe-reader/default.nix
View File

@@ -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.

4
pkgs/applications/misc/ikiwiki/default.nix
View File

@@ -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

10
pkgs/applications/misc/truecrypt/default.nix
View File

@@ -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 = {

8
pkgs/applications/networking/browsers/firefox/8.0.nix → pkgs/applications/networking/browsers/firefox/10.0.nix
View File

@@ -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";

65
pkgs/applications/networking/browsers/links2/default.nix
View File

@@ -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;
};
}

9
pkgs/applications/networking/browsers/links2/src-for-default.nix
View File

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

4
pkgs/applications/networking/browsers/links2/src-info-for-default.nix
View File

@@ -1,4 +0,0 @@
{
downloadPage = "http://links.twibright.com/download.php";
baseName = "links2";
}

41
pkgs/applications/networking/browsers/links2/stdenv.nix
View File

@@ -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
];
};
}

4
pkgs/applications/networking/remote/rdesktop/default.nix
View File

@@ -2,12 +2,12 @@
stdenv.mkDerivation (rec {
pname = "rdesktop";
version = "1.7.0";
version = "1.7.1";
name = "${pname}-${version}";
src = fetchurl {
url = "mirror://sourceforge/${pname}/${name}.tar.gz";
sha256 = "0x2hnzvm0smnanin28n4mvzx9chpj2qnjfrxy307x21mgw6l5q1v";
sha256 = "0yc4xz95w40m8ailpjgqp9h7bkc758vp0dlq4nj1pvr3xfnl7sni";
};
buildInputs = [openssl libX11];

6
pkgs/applications/networking/skype/default.nix
View File

@@ -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

4
pkgs/applications/office/hledger-interest/default.nix
View File

@@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "hledger-interest";
version = "1.3";
sha256 = "1sgnl3vv38cmgxv3xag3c78j1955xxwdmr5xr3f8rc78np6d0wnz";
version = "1.4";
sha256 = "0lm4jcxcig3yxzhbnka1q54fvshn5b9d91a5a2mbmkzbwhzjj0lg";
isLibrary = false;
isExecutable = true;
buildDepends = [ hledgerLib mtl time ];

6
pkgs/applications/science/logic/hol_light/default.nix
View File

@@ -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 ];

14
pkgs/applications/video/dvswitch/default.nix
View File

@@ -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 ];

2
pkgs/applications/window-managers/icewm/default.nix
View File

@@ -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

34
pkgs/build-support/make-startupitem/default.nix Normal file
View File

@@ -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 ];
}

5
pkgs/build-support/vm/rpm/rpm-closure.pl
View File

@@ -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;
}

44
pkgs/development/compilers/ghc/7.4.1.nix Normal file
View File

@@ -0,0 +1,44 @@
{stdenv, fetchurl, ghc, perl, gmp, ncurses, darwinInstallNameToolUtility}:
stdenv.mkDerivation rec {
version = "7.4.1";
name = "ghc-${version}";
src = fetchurl {
url = "http://haskell.org/ghc/dist/${version}/${name}-src.tar.bz2";
sha256 = "0ycscsagyy9n796a59q6761s6ar50d8inibvnrcp96siksj0j73j";
};
buildInputs = [ghc perl gmp ncurses] ++
(if stdenv.isDarwin then [darwinInstallNameToolUtility] else []);
buildMK = ''
libraries/integer-gmp_CONFIGURE_OPTS += --configure-option=--with-gmp-libraries="${gmp}/lib"
libraries/integer-gmp_CONFIGURE_OPTS += --configure-option=--with-gmp-includes="${gmp}/include"
'';
preConfigure = ''
echo "${buildMK}" > mk/build.mk
sed -i -e 's|-isysroot /Developer/SDKs/MacOSX10.5.sdk||' configure
'';
configureFlags=[
"--with-gcc=${stdenv.gcc}/bin/gcc"
];
# required, because otherwise all symbols from HSffi.o are stripped, and
# that in turn causes GHCi to abort
stripDebugFlags=["-S" "--keep-file-symbols"];
meta = {
homepage = "http://haskell.org/ghc";
description = "The Glasgow Haskell Compiler";
maintainers = [
stdenv.lib.maintainers.marcweber
stdenv.lib.maintainers.andres
stdenv.lib.maintainers.simons
];
platforms = ghc.meta.platforms;
};
}

6
pkgs/development/compilers/idris/default.nix
View File

@@ -3,8 +3,8 @@
cabal.mkDerivation (self: {
pname = "idris";
version = "0.9.0";
sha256 = "03zbdcl3v90zv0ibzq9fa8z2qrrdsilh5m509mczwrcmlzbzsmrl";
version = "0.9.1";
sha256 = "1yvw15750mqrvq1kd7bsk3ldq3s0z947c4f93pv7008gq5im4cvr";
isLibrary = false;
isExecutable = true;
buildDepends = [ binary epic haskeline mtl parsec transformers ];
@@ -12,7 +12,7 @@ cabal.mkDerivation (self: {
noHaddock = true;
meta = {
homepage = "http://www.idris-lang.org/";
description = "Dependently Typed Functional Programming Language";
description = "Functional Programming Language with Dependent Types";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
maintainers = [

4
pkgs/development/interpreters/guile/default.nix
View File

@@ -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 ];

4
pkgs/development/interpreters/racket/default.nix
View File

@@ -4,12 +4,12 @@
stdenv.mkDerivation rec {
pname = "racket";
version = "5.2";
version = "5.2.1";
name = "${pname}-${version}";
src = fetchurl {
url = "http://download.racket-lang.org/installers/${version}/${pname}/${name}-src-unix.tgz";
sha256 = "1viz2hq1q1wyw9jmnssg5sbgglh05fwqkhyhfbak9lb6nfbhlg5w";
sha256 = "1v5kvp7vfi4a4bn08jlaga441amlfxpjw9dm6vc1fazwzd72m539";
};
# Various racket executables do run-time searches for these.

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

@@ -3,24 +3,28 @@
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;
ZenTest = g.ZenTest_4_5_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;
autotest_rails = g.autotest_rails_4_1_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 +39,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;
sass = g.sass_3_1_12;
rubyzip = g.rubyzip_0_9_5;
sass = g.sass_3_1_13;
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 +60,101 @@ 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 = [ ''autotest-rails'' ''buildr'' ''nix'' ''rails'' ''rake'' ''rb-fsevent'' ''sass'' ''selenium-webdriver'' ];
gems = {
actionmailer_3_2_0 = {
ZenTest_4_5_0 = {
basename = ''ZenTest'';
meta = {
description = ''ZenTest provides 4 different tools: zentest, unit_diff, autotest, and multiruby'';
homepage = ''http://www.zenspider.com/ZSS/Products/ZenTest/'';
longDescription = ''ZenTest provides 4 different tools: zentest, unit_diff, autotest, and
multiruby.
ZenTest scans your target and unit-test code and writes your missing
code based on simple naming rules, enabling XP at a much quicker
pace. ZenTest only works with Ruby and Test::Unit. Nobody uses this
tool anymore but it is the package namesake, so it stays.
unit_diff is a command-line filter to diff expected results from
actual results and allow you to quickly see exactly what is wrong.
autotest is a continous testing facility meant to be used during
development. As soon as you save a file, autotest will run the
corresponding dependent tests.
multiruby runs anything you want on multiple versions of ruby. Great
for compatibility checking! Use multiruby_setup to manage your
installed versions.'';
};
name = ''ZenTest-4.5.0'';
requiredGems = [ ];
sha256 = ''05iam95wqafz4c890b17w7ahp9i4jbz4hsw6304p9zbsaq7d7h1h'';
};
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,9 +193,21 @@ 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'';
};
autotest_rails_4_1_1 = {
basename = ''autotest_rails'';
meta = {
description = ''This is an autotest plugin to provide rails support'';
homepage = ''https://github.com/seattlerb/autotest-rails'';
longDescription = ''This is an autotest plugin to provide rails support. It provides basic
rails support and extra plugins for migrations and fixtures.'';
};
name = ''autotest-rails-4.1.1'';
requiredGems = [ g.ZenTest_4_5_0 ];
sha256 = ''09i6mpxibs8yfdcr53nazlxq94yswahz9gdjqdz9srfshcccqbal'';
};
builder_2_1_2 = {
basename = ''builder'';
meta = {
@@ -217,6 +262,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 +332,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 +410,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 +625,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 +669,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 &amp; 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 +707,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 +715,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,7 +809,17 @@ See RDoc for a description of RDoc's markup and basic use.'';
requiredGems = [ ];
sha256 = ''1lc67ssqyz49rm1jms5sdvy6x41h070razxlmvj4j5q6w3qixx41'';
};
sass_3_1_12 = {
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_13 = {
basename = ''sass'';
meta = {
description = ''A powerful but elegant CSS compiler that makes CSS fun again.'';
@@ -749,9 +830,20 @@ See RDoc for a description of RDoc's markup and basic use.'';
command line tool or a web-framework plugin.
'';
};
name = ''sass-3.1.12'';
name = ''sass-3.1.13'';
requiredGems = [ ];
sha256 = ''10n2aic53290xsa3y3d63523s8xc78w5q5gqpns6cbljkdwb0ndy'';
sha256 = ''0x07yckw9c4d59713midk2n85d3h88fcp147p8nai88gbvrm8b63'';
};
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'';

4
pkgs/development/interpreters/ruby/ruby-18.nix
View File

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

4
pkgs/development/libraries/ffmpeg/default.nix
View File

@@ -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

10
pkgs/development/libraries/haskell/Chart/default.nix
View File

@@ -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";

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

@@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "binary";
version = "0.5.0.2";
sha256 = "02qkybh11psmggkqcs7f8kh4izfj44gq1wk23xhv3jbxc7gdxhp0";
version = "0.5.1.0";
sha256 = "18si0f021447b1kqshar224zyh02gc65z7v82waxcn4igss7gm1a";
meta = {
homepage = "http://code.haskell.org/binary/";
description = "Binary serialisation for Haskell values using lazy ByteStrings";

12
pkgs/development/libraries/haskell/zlib/0.5.3.2.nix → pkgs/development/libraries/haskell/bitarray/default.nix
View File

@@ -1,12 +1,12 @@
{ cabal, zlib }:
{ cabal }:
cabal.mkDerivation (self: {
pname = "zlib";
version = "0.5.3.2";
sha256 = "1a5xr59bw7hpgd7fwkpgkrpib7i46dsip7285pccvi2934k0628q";
extraLibraries = [ zlib ];
pname = "bitarray";
version = "0.0.1";
sha256 = "01ijysisw70zaw70hx851axw48agfamdqj21rzzhdqd2ww6bwchb";
meta = {
description = "Compression and decompression in the gzip and zlib formats";
homepage = "http://code.haskell.org/~bkomuves/";
description = "Mutable and immutable bit arrays";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
maintainers = [

4
pkgs/development/libraries/haskell/blaze-builder/default.nix
View File

@@ -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";

8
pkgs/development/libraries/haskell/bytestring-lexing/default.nix
View File

@@ -2,12 +2,12 @@
cabal.mkDerivation (self: {
pname = "bytestring-lexing";
version = "0.2.1";
sha256 = "0pibn4phfp346i6i8zwic5zlbq9lqa6ifyx6bdl3p5c8jy3v23r9";
version = "0.4.0";
sha256 = "1lww38rab9k8drndqkg306kiq6663i89sq6l1bvjv6cs13acc8wr";
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 and produce literals efficiently from strict or lazy bytestrings";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
maintainers = [

1
pkgs/development/libraries/haskell/cabal-file-th/default.nix
View File

@@ -4,6 +4,7 @@ cabal.mkDerivation (self: {
pname = "cabal-file-th";
version = "0.2.1";
sha256 = "0nczwicgf6kx3lk5m7wqf1wj6ghn8jfx112dzh7jh4f4xs66nsd1";
patchPhase = "sed -i cabal-file-th.cabal -e 's|Cabal >= 1.10 && < 1.13|Cabal|'";
meta = {
homepage = "http://github.com/nkpart/cabal-file-th";
description = "Template Haskell expressions for reading fields from a project's cabal file";

4
pkgs/development/libraries/haskell/citeproc-hs/default.nix
View File

@@ -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

6
pkgs/development/libraries/haskell/clientsession/default.nix
View File

@@ -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;

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

@@ -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
pkgs/development/libraries/haskell/conduit/default.nix
View File

@@ -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
];

17
pkgs/development/libraries/haskell/containers-deepseq/default.nix Normal file
View File

@@ -0,0 +1,17 @@
{ cabal, deepseq }:
cabal.mkDerivation (self: {
pname = "containers-deepseq";
version = "0.1.0.1";
sha256 = "0l9d7hj66fygpsbjw6wy4l11c9cw739lvkrypapwihav7jzva541";
buildDepends = [ deepseq ];
meta = {
description = "Provide orphan NFData instances for containers as needed. (deprecated)";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
maintainers = [
self.stdenv.lib.maintainers.andres
self.stdenv.lib.maintainers.simons
];
};
})

4
pkgs/development/libraries/haskell/crypto-api/default.nix
View File

@@ -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
pkgs/development/libraries/haskell/data-object-yaml/default.nix
View File

@@ -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 = [

16
pkgs/development/libraries/haskell/deepseq/1.3.0.0.nix Normal file
View File

@@ -0,0 +1,16 @@
{ cabal }:
cabal.mkDerivation (self: {
pname = "deepseq";
version = "1.3.0.0";
sha256 = "0z2k1rda67nmhv62irjfd642iarj1i9m55l6p47j4cysrszhvqgy";
meta = {
description = "Deep evaluation of data structures";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
maintainers = [
self.stdenv.lib.maintainers.andres
self.stdenv.lib.maintainers.simons
];
};
})

4
pkgs/development/libraries/haskell/email-validate/default.nix
View File

@@ -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";

20
pkgs/development/libraries/haskell/explicit-exception/default.nix Normal file
View File

@@ -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
];
};
})

16
pkgs/development/libraries/haskell/extensible-exceptions/0.1.1.4.nix Normal file
View File

@@ -0,0 +1,16 @@
{ cabal }:
cabal.mkDerivation (self: {
pname = "extensible-exceptions";
version = "0.1.1.4";
sha256 = "1273nqws9ij1rp1bsq5jc7k2jxpqa0svawdbim05lf302y0firbc";
meta = {
description = "Extensible exceptions";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
maintainers = [
self.stdenv.lib.maintainers.andres
self.stdenv.lib.maintainers.simons
];
};
})

4
pkgs/development/libraries/haskell/fast-logger/default.nix
View File

@@ -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
pkgs/development/libraries/haskell/filepath/default.nix
View File

@@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "filepath";
version = "1.2.0.1";
sha256 = "1fq62kxf68y2952qhipllz049cq52yc3wm4i31v2lg5hdcwbw152";
version = "1.3.0.0";
sha256 = "1v5affq82b4fypm49d5sradcx4ymgmkac563vfx483pmyl73i5jl";
meta = {
homepage = "http://www-users.cs.york.ac.uk/~ndm/filepath/";
description = "Library for manipulating FilePaths in a cross platform way";

19
pkgs/development/libraries/haskell/gd/default.nix Normal file
View File

@@ -0,0 +1,19 @@
{ cabal, expat, fontconfig, freetype, gd, libjpeg, libpng, zlib }:
cabal.mkDerivation (self: {
pname = "gd";
version = "3000.7.1";
sha256 = "07rb02jfmz6bw853b6snw1inby9qgaygdmlsid35snc2xn2ylb50";
extraLibraries = [
expat fontconfig freetype gd libjpeg libpng zlib
];
meta = {
description = "A Haskell binding to a subset of the GD graphics library";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
maintainers = [
self.stdenv.lib.maintainers.andres
self.stdenv.lib.maintainers.simons
];
};
})

4
pkgs/development/libraries/haskell/hackage-db/default.nix
View File

@@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "hackage-db";
version = "1.0";
sha256 = "0y769ssr9jlyzcdr0l8wh5s3ivc3zbp9mf7xy7vnq6mr9hjh7lcw";
version = "1.2";
sha256 = "1dsm8mp8f6z7jqqgx39xfvl5kql6bbwxk25k435rsb685q9hzpxq";
buildDepends = [ tar ];
meta = {
homepage = "http://github.com/peti/hackage-db";

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

@@ -5,8 +5,8 @@
cabal.mkDerivation (self: {
pname = "hakyll";
version = "3.2.5.0";
sha256 = "1y1dqfbas7ym1jghq3i7zhqcny01paqfrszj0aakg6ys2jjx0m29";
version = "3.2.5.1";
sha256 = "1vb3jqasf6j10fk8afwrbd85dc4k9dx6zls5c6wn0wnh87r5987x";
buildDepends = [
binary blazeHtml citeprocHs cryptohash hamlet mtl pandoc parsec
regexBase regexPcre snapCore snapServer tagsoup time

4
pkgs/development/libraries/haskell/happstack/happstack-util.nix
View File

@@ -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 = [

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

@@ -1,10 +1,10 @@
{ cabal, blazeBuilder, mtl, syb, text, utf8String }:
{ cabal, blazeBuilder, ieee754, mtl, syb, text, utf8String }:
cabal.mkDerivation (self: {
pname = "hastache";
version = "0.2.4";
sha256 = "0881sh3vp5v8kk3rnz9dg2bnis6qy4gx5sr0sqj6xl162sbhf3yv";
buildDepends = [ blazeBuilder mtl syb text utf8String ];
version = "0.3.3";
sha256 = "18ayrfwi3jn3q650m5dm9wx9c7djwc2miz3mxlscd9gzlnrfi772";
buildDepends = [ blazeBuilder ieee754 mtl syb text utf8String ];
meta = {
homepage = "http://github.com/lymar/hastache";
description = "Haskell implementation of Mustache templates";

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

@@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "hjsmin";
version = "0.0.14";
sha256 = "16053hnxnr9vsqvasbibjwjdg0jpsl5fwzgy54ac1xkh4rhp3a5i";
version = "0.0.15";
sha256 = "1bik3bvaz4zjhyx8nyghhs61l14zm71hndfhj4k0xvkw3h6hlj9k";
isLibrary = true;
isExecutable = true;
buildDepends = [ blazeBuilder languageJavascript text ];

3
pkgs/development/libraries/haskell/hledger-chart/default.nix
View File

@@ -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
pkgs/development/libraries/haskell/hledger-lib/default.nix
View File

@@ -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
];

12
pkgs/development/libraries/haskell/hledger-web/default.nix
View File

@@ -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

12
pkgs/development/libraries/haskell/hledger/default.nix
View File

@@ -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";

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

@@ -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";

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

@@ -1,19 +1,19 @@
{ cabal, asn1Data, attoparsec, attoparsecConduit, base64Bytestring
, blazeBuilder, blazeBuilderConduit, caseInsensitive, certificate
, conduit, cprngAes, dataDefault, failure, httpTypes, liftedBase
, monadControl, network, text, time, tls, tlsExtra, transformers
, transformersBase, utf8String, zlibConduit
, monadControl, network, socks, text, time, tls, tlsExtra
, transformers, transformersBase, utf8String, zlibConduit
}:
cabal.mkDerivation (self: {
pname = "http-conduit";
version = "1.1.2.2";
sha256 = "049gidxmrw4zri2zkibl2298glhapzzh1kg001dn563594bbiccz";
version = "1.2.3";
sha256 = "0kygmbcvv0j020ml9jgmg3yzda3k066s2h8g3c135cmad6jc8hnd";
buildDepends = [
asn1Data attoparsec attoparsecConduit base64Bytestring blazeBuilder
blazeBuilderConduit caseInsensitive certificate conduit cprngAes
dataDefault failure httpTypes liftedBase monadControl network text
time tls tlsExtra transformers transformersBase utf8String
dataDefault failure httpTypes liftedBase monadControl network socks
text time tls tlsExtra transformers transformersBase utf8String
zlibConduit
];
meta = {

17
pkgs/development/libraries/haskell/ieee754/default.nix Normal file
View File

@@ -0,0 +1,17 @@
{ cabal }:
cabal.mkDerivation (self: {
pname = "ieee754";
version = "0.7.3";
sha256 = "0gq747h15inxbxbgmzmchb9a8p57rhv3bmj69idx5arh0d3whgv0";
meta = {
homepage = "http://github.com/patperry/hs-ieee754";
description = "Utilities for dealing with IEEE floating point numbers";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
maintainers = [
self.stdenv.lib.maintainers.andres
self.stdenv.lib.maintainers.simons
];
};
})

4
pkgs/development/libraries/haskell/language-javascript/default.nix
View File

@@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "language-javascript";
version = "0.4.6";
sha256 = "1rqbb44cyvj6iyipi4bzrdd59lk9q1vxh0zvilvc54kqg97y07v6";
version = "0.4.7";
sha256 = "029ncc7hdw3pi9fbnxd0knz7wy3jpj5wcfqsxzyk5dkwji6d95x1";
isLibrary = true;
isExecutable = true;
buildDepends = [ mtl utf8Light ];

4
pkgs/development/libraries/haskell/mime-mail/default.nix
View File

@@ -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";

22
pkgs/development/libraries/haskell/multiarg/default.nix Normal file
View File

@@ -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
];
};
})

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

@@ -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";

18
pkgs/development/libraries/haskell/network/2.3.0.10.nix Normal file
View File

@@ -0,0 +1,18 @@
{ cabal, parsec }:
cabal.mkDerivation (self: {
pname = "network";
version = "2.3.0.10";
sha256 = "1f1z7wggxl2rzix1r4bhvcdl0fmx2mzkn70iy3w5yl54vmym21bm";
buildDepends = [ parsec ];
meta = {
homepage = "http://github.com/haskell/network";
description = "Low-level networking interface";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
maintainers = [
self.stdenv.lib.maintainers.andres
self.stdenv.lib.maintainers.simons
];
};
})

4
pkgs/development/libraries/haskell/nixos-types/default.nix
View File

@@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "nixos-types";
version = "1.2";
sha256 = "140qk6wqq87qfk471cnhrg135fnqv0vfmfxh8kj14ar2kxvzrr8w";
version = "1.3";
sha256 = "0kdi3q316c9irrzwl1vx764f958i5d61v2vc03356sfyy13d19sk";
buildDepends = [ regexPosix ];
meta = {
homepage = "http://github.com/haskell4nix/nixos-types";

22
pkgs/development/libraries/haskell/persistent-sqlite/default.nix Normal file
View File

@@ -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
];
};
})

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

@@ -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";

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

@@ -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.";

18
pkgs/development/libraries/haskell/socks/default.nix Normal file
View File

@@ -0,0 +1,18 @@
{ cabal, cereal, network }:
cabal.mkDerivation (self: {
pname = "socks";
version = "0.4.1";
sha256 = "0kapic4rf1cwbqy5f229b69kr1mg9blpr5p5jna8sx5ds2b8jdjn";
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
];
};
})

4
pkgs/development/libraries/haskell/string-combinators/default.nix
View File

@@ -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
pkgs/development/libraries/haskell/test-framework/default.nix
View File

@@ -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
pkgs/development/libraries/haskell/vty/default.nix
View File

@@ -4,8 +4,8 @@
cabal.mkDerivation (self: {
pname = "vty";
version = "4.7.0.8";
sha256 = "1wh94m2i0ivdkf8hhl9qrsfs7z3mk0xrzgwdfgqw7lhq321i2bnm";
version = "4.7.0.10";
sha256 = "03cvr4z0fvxfyrikgf89777cp1xqhy22yj83p0dysp0i5ds6cd9v";
buildDepends = [
deepseq mtl parallel parsec terminfo utf8String vector
];

4
pkgs/development/libraries/haskell/web-routes/default.nix
View File

@@ -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
];

17
pkgs/development/libraries/haskell/xhtml/3000.2.0.5.nix Normal file
View File

@@ -0,0 +1,17 @@
{ cabal }:
cabal.mkDerivation (self: {
pname = "xhtml";
version = "3000.2.0.5";
sha256 = "1gqq910pncqppb2dscxnfxvm1ly4qpb5mwmady2i4irar3gngh9v";
meta = {
homepage = "https://github.com/haskell/xhtml";
description = "An XHTML combinator library";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
maintainers = [
self.stdenv.lib.maintainers.andres
self.stdenv.lib.maintainers.simons
];
};
})

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

@@ -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

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

@@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "yap";
version = "0.1";
sha256 = "14x1z5pmb499qq5sy0iksxv0mli8556s1jh9jm7rdg671h1cy1hl";
version = "0.2";
sha256 = "14lq549jhgnf51pgy1jv31ik8qx71yl7d53w8dpq1f9mlsn1g16i";
meta = {
description = "yet another prelude - a simplistic refactoring with algebraic classes";
license = self.stdenv.lib.licenses.bsd3;

23
pkgs/development/libraries/haskell/yesod-default/default.nix Normal file
View File

@@ -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
];
};
})

4
pkgs/development/libraries/haskell/zlib-bindings/default.nix
View File

@@ -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";

24
pkgs/development/libraries/libbsd/default.nix Normal file
View File

@@ -0,0 +1,24 @@
{ stdenv, fetchurl }:
let name = "libbsd-0.3.0";
in stdenv.mkDerivation {
inherit name;
src = fetchurl {
url = "http://libbsd.freedesktop.org/releases/${name}.tar.gz";
sha256 = "fbf36ed40443e1d0d795adbae8d461952509e610c3ccf0866ae160b723f7fe38";
};
patchPhase = ''
substituteInPlace Makefile \
--replace "/usr" "$out" \
--replace "{exec_prefix}" "{prefix}"
'';
meta = {
description = "Common functions found on BSD systems";
homepage = http://libbsd.freedesktop.org/;
license = "BSD3";
};
}

25
pkgs/development/libraries/libdevil/default.nix
View File

@@ -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 ];
};
}
}

31
pkgs/development/libraries/libdevil/ftbfs-libpng15.patch Normal file
View File

@@ -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

6
pkgs/development/libraries/libjpeg-turbo/default.nix
View File

@@ -1,11 +1,11 @@
{ stdenv, fetchurl, nasm }:
stdenv.mkDerivation {
name = "libjpeg-turbo-1.0.1";
name = "libjpeg-turbo-1.1.1";
src = fetchurl {
url = mirror://sourceforge/libjpeg-turbo/libjpeg-turbo-1.0.1.tar.gz;
sha256 = "094jvqzibqbzmhh7mz3xi76lzlilxzb4j1x8rpdcdkzyig9dizqf";
url = mirror://sourceforge/libjpeg-turbo/libjpeg-turbo-1.1.1.tar.gz;
sha256 = "553b1f5a968fb9efc089623ed99be2aa6bc21586be92eb04848489c91a63f1e2";
};
buildInputs = [ nasm ];

19
pkgs/development/libraries/libnatspec/default.nix Normal file
View File

@@ -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 ];
};
}

12
pkgs/development/libraries/libvpx/default.nix
View File

@@ -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";

22
pkgs/development/libraries/lzo/default.nix
View File

@@ -1,18 +1,32 @@
{stdenv, fetchurl}:
stdenv.mkDerivation rec {
name = "lzo-2.03";
name = "lzo-2.06";
src = fetchurl {
url = "${meta.homepage}/download/${name}.tar.gz";
sha256 = "8b1b0da8f757b9ac318e1c15a0eac8bdb56ca902a2dd25beda06c0f265f22591";
sha256 = "0wryshs446s7cclrbjykyj766znhcpnr7s3cxy33ybfn6vwfcygz";
};
configureFlags = "--enable-shared";
configureFlags = [ "--enable-shared" ];
doCheck = true;
meta = {
description = "A data compresion library suitable for real-time data de-/compression";
longDescription =
'' LZO is a data compression library which is suitable for data
de-/compression in real-time. This means it favours speed over
compression ratio.
LZO is written in ANSI C. Both the source code and the compressed
data format are designed to be portable across platforms.
'';
homepage = http://www.oberhumer.com/opensource/lzo;
license = "GPLv2+";
platforms = stdenv.lib.platforms.all;
maintainers = [ stdenv.lib.maintainers.ludo ];
};
}

4
pkgs/development/libraries/qhull/default.nix
View File

@@ -1,11 +1,11 @@
{stdenv, fetchurl, cmake}:
stdenv.mkDerivation rec {
name = "qhull-2011.1";
name = "qhull-2012.1";
src = fetchurl {
url = "${meta.homepage}/download/${name}-src.tgz";
sha256 = "1i2lqw0552mvbcc1q7l4b31fpzf2l2qcabc23r4sybhwyljl9bmd";
sha256 = "19hb10vs7ww45ifn7mpvxykn470gd1g568d84mlld6v4pnz7gamv";
};
buildNativeInputs = [ cmake ];

4
pkgs/development/libraries/x264/default.nix
View File

@@ -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 = ''

4
pkgs/development/tools/haskell/cabal-ghci/default.nix
View File

@@ -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 = {

4
pkgs/development/tools/haskell/cabal2nix/default.nix
View File

@@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "cabal2nix";
version = "1.23";
sha256 = "1rnvnzwb4n89hq4wpyq1h6x773r7y23clqj5slsfnas7j3alzz8c";
version = "1.25";
sha256 = "12csiw7j51vlf8l0prhjj06l7sqii12qy5ryl5n8vrgp8vch2kvl";
isLibrary = false;
isExecutable = true;
buildDepends = [ hackageDb HTTP mtl nixosTypes regexPosix ];

40
pkgs/development/tools/misc/help2man/default.nix
View File

@@ -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 ];
};
}

0
pkgs/tools/pydb/default.nix → pkgs/development/tools/pydb/default.nix
View File

74
pkgs/games/oilrush/default.nix Normal file
View File

@@ -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;
};
}

14
pkgs/os-specific/linux/broadcom-sta/default.nix
View File

@@ -1,6 +1,6 @@
{ stdenv, fetchurl, kernel }:
let version = "5_100_82_38";
let version = "5_100_82_112";
bits = if stdenv.system == "i686-linux" then "32" else
assert stdenv.system == "x86_64-linux"; "64";
in
@@ -10,15 +10,15 @@ stdenv.mkDerivation {
src = fetchurl {
url = "http://www.broadcom.com/docs/linux_sta/hybrid-portsrc_x86_${bits}-v${version}.tar.gz";
sha256 = if bits == "32"
then "0dzvnk0vmi5dlbsi9k2agvs5xsqn07mv66g9v1jzn1gsl8fsydpp"
else "19rm9m949yqahgii7wr14lj451sd84s72mqj15yd0dnpm4k5n5hw";
then "1rvhw9ngw0djxyyjx5m01c0js89zs3xiwmra03al6f9q7cbf7d45"
else "1qsarnry10f5m8a73wbr9cg2ifs00sqg6x0ay59l72vl9hb2zlww";
};
buildInputs = [ kernel ];
patches = [ ./makefile.patch ]
++ stdenv.lib.optional
(! builtins.lessThan (builtins.compareVersions kernel.version "2.6.37") 0)
[ ./mutex-sema.patch ];
patches = [ ./makefile.patch ];
#++ stdenv.lib.optional
#(! builtins.lessThan (builtins.compareVersions kernel.version "2.6.37") 0)
#[ ./mutex-sema.patch ];
makeFlags = "KDIR=${kernel}/lib/modules/${kernel.modDirVersion}/build";

28
pkgs/os-specific/linux/microcode/intel.nix Normal file
View File

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

6
pkgs/os-specific/windows/mingwrt/default.nix
View File

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

53
pkgs/os-specific/windows/pthread-w32/default.nix Normal file
View File

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

13
pkgs/os-specific/windows/w32api/default.nix
View File

@@ -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";

22
pkgs/servers/nosql/redis/default.nix Normal file
View File

@@ -0,0 +1,22 @@
{ stdenv, fetchurl }:
stdenv.mkDerivation rec {
pname = "redis";
version = "2.4.7";
name = "${pname}-${version}";
src = fetchurl {
url = "http://redis.googlecode.com/files/redis-2.4.7.tar.gz";
sha256 = "f91956377b7ff23cc23e0c8758e0b873032f36545c61d88436ebb741bf4dd5e1";
};
makeFlags = "PREFIX=$(out)";
meta = {
homepage = http://redis.io;
description = "An open source, advanced key-value store";
license = "BSD";
platforms = stdenv.lib.platforms.unix;
};
}

2
pkgs/servers/sql/mysql55/default.nix
View File

@@ -12,7 +12,7 @@ stdenv.mkDerivation {
buildInputs = [ cmake bison ncurses openssl readline zlib ] ++ stdenv.lib.optionals stdenv.isDarwin [ darwinInstallNameToolUtility perl ];
cmakeFlags = "-DWITH_SSL=yes -DWITH_READLINE=yes -DWITH_EMBEDDED_SERVER=yes -DWITH_ZLIB=yes -DINSTALL_SCRIPTDIR=bin";
cmakeFlags = "-DWITH_SSL=yes -DWITH_READLINE=yes -DWITH_EMBEDDED_SERVER=yes -DWITH_ZLIB=yes -DINSTALL_SCRIPTDIR=bin -DHAVE_IPV6=yes";
NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isLinux "-lgcc_s";

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

@@ -1398,11 +1398,11 @@ let
})) // {inherit inputproto xorgserver xproto ;};
xf86inputsynaptics = (stdenv.mkDerivation ((if overrides ? xf86inputsynaptics then overrides.xf86inputsynaptics else x: x) {
name = "xf86-input-synaptics-1.3.0";
name = "xf86-input-synaptics-1.5.0";
builder = ./builder.sh;
src = fetchurl {
url = mirror://xorg/X11R7.6/src/everything/xf86-input-synaptics-1.3.0.tar.bz2;
sha256 = "1mwgb85qjyzx2yfi7jhgvd435zdyqxyq9aqwlsldmlpkqi8358rh";
url = mirror://xorg/individual/driver/xf86-input-synaptics-1.5.0.tar.bz2;
sha256 = "0khwda8lrrvrdb37i4i1kdhg8f44kgcjq9y209ds7ja9zjcm7k4m";
};
buildInputs = [pkgconfig inputproto randrproto recordproto libX11 libXi xorgserver xproto libXtst ];
})) // {inherit inputproto randrproto recordproto libX11 libXi xorgserver xproto libXtst ;};

2
pkgs/servers/x11/xorg/tarballs-7.6.list
View File

@@ -121,7 +121,7 @@ mirror://xorg/individual/driver/xf86-input-evdev-2.6.0.tar.bz2
mirror://xorg/X11R7.6/src/everything/xf86-input-joystick-1.5.0.tar.bz2
mirror://xorg/X11R7.6/src/everything/xf86-input-keyboard-1.5.0.tar.bz2
mirror://xorg/X11R7.6/src/everything/xf86-input-mouse-1.6.0.tar.bz2
mirror://xorg/X11R7.6/src/everything/xf86-input-synaptics-1.3.0.tar.bz2
mirror://xorg/individual/driver/xf86-input-synaptics-1.5.0.tar.bz2
mirror://xorg/X11R7.6/src/everything/xf86-input-vmmouse-12.6.10.tar.bz2
mirror://xorg/X11R7.6/src/everything/xf86-input-void-1.3.1.tar.bz2
mirror://xorg/X11R7.6/src/everything/xf86-video-apm-1.2.3.tar.bz2

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