public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into staging

Browse Source 
Conflicts (simple):
	pkgs/development/lisp-modules/clwrapper/setup-hook.sh
This commit is contained in:
Vladimír Čunát
2014-11-14 14:28:23 +01:00
parent 5ad9db0473 961ed7c8b4
commit b4af993c3f
151 changed files with 6654 additions and 1254 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/development/libraries/clearsilver/default.nix
View File

@@ -1,11 +1,11 @@
{ stdenv, fetchurl, python }:
stdenv.mkDerivation {
name = "clearsilver-0.10.3";
stdenv.mkDerivation rec {
name = "clearsilver-0.10.5";
src = fetchurl {
url = http://www.clearsilver.net/downloads/clearsilver-0.10.3.tar.gz;
sha256 = "1lhbbf5rrqxb44y5clga7iifcfrh8sfjwpj4phnr3qabk92wdn3i";
url = "http://www.clearsilver.net/downloads/${name}.tar.gz";
sha256 = "1046m1dpq3nkgxbis2dr2x7hynmy51n64465q78d7pdgvqwa178y";
};
builder = ./builder.sh;

10
pkgs/development/libraries/cminpack/default.nix
View File

@@ -1,11 +1,11 @@
{stdenv, fetchurl}:
stdenv.mkDerivation {
name = "cminpack-1.3.2";
stdenv.mkDerivation rec {
name = "cminpack-1.3.4";
src = fetchurl {
url = http://devernay.free.fr/hacks/cminpack/cminpack-1.3.2.tar.gz;
sha256 = "09bqr44wqancbdsc39lvhdz7rci3hknmlrrrzv46skvwx6rgk9x0";
url = "http://devernay.free.fr/hacks/cminpack/${name}.tar.gz";
sha256 = "1jh3ymxfcy3ykh6gnvds5bbkf38aminvjgc8halck356vkvpnl9v";
};
patchPhase = ''
@@ -18,7 +18,7 @@ stdenv.mkDerivation {
meta = {
homepage = http://devernay.free.fr/hacks/cminpack/cminpack.html;
license = "BSD";
license = stdenv.lib.licenses.bsd3;
description = "Software for solving nonlinear equations and nonlinear least squares problems";
};

4
pkgs/development/libraries/haskell/HDBC/HDBC-odbc.nix
View File

@@ -4,8 +4,8 @@
cabal.mkDerivation (self: {
pname = "HDBC-odbc";
version = "2.3.1.1";
sha256 = "0zypgwy8yxzp69c2775gkzi8591b0l3wncn7vmq11l16ign95fc7";
version = "2.4.0.0";
sha256 = "0zjq5j095jyh0axmgnr59fwhh1nhipj6flz77z46kygagygrg2qz";
isLibrary = true;
isExecutable = true;
buildDepends = [ HDBC mtl time utf8String ];

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

@@ -4,8 +4,8 @@
cabal.mkDerivation (self: {
pname = "HFuse";
version = "0.2.4.3";
sha256 = "1daka673mx0gsnsa04pxani7n4wp93hflzxs3imzy4sgb30p7l01";
version = "0.2.4.4";
sha256 = "1wsrf9y90dk27da9pm9m11hnrxwrqwvq6c9799b91a91mc2lxslc";
isLibrary = true;
isExecutable = true;
extraLibraries = [ fuse ];
@@ -17,6 +17,6 @@ cabal.mkDerivation (self: {
description = "HFuse is a binding for the Linux FUSE library";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.stdenv.lib.platforms.linux;
maintainers = [ self.stdenv.lib.maintainers.andres ];
maintainers = with self.stdenv.lib.maintainers; [ andres ];
};
})

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

@@ -6,8 +6,8 @@
cabal.mkDerivation (self: {
pname = "HandsomeSoup";
version = "0.3.4";
sha256 = "0xpimys8pb0kzqnfxxf04dbxfmcrry5pzgmagyydcrmafacg0vjb";
version = "0.3.5";
sha256 = "1d1zanlr1mdxjc69xvbxg5kn5bc08gd960j6lb1x3grhcgmj9krm";
isLibrary = true;
isExecutable = true;
buildDepends = [
@@ -15,7 +15,6 @@ cabal.mkDerivation (self: {
];
testDepends = [ hspec hxt ];
jailbreak = true;
doCheck = false;
meta = {
homepage = "https://github.com/egonSchiele/HandsomeSoup";
description = "Work with HTML more easily in HXT";

1
pkgs/development/libraries/haskell/ReadArgs/default.nix
View File

@@ -10,6 +10,7 @@ cabal.mkDerivation (self: {
isExecutable = true;
buildDepends = [ systemFilepath text ];
testDepends = [ hspec systemFilepath text ];
jailbreak = true;
meta = {
homepage = "http://github.com/rampion/ReadArgs";
description = "Simple command line argument parsing";

2
pkgs/development/libraries/haskell/Unixutils/default.nix
View File

@@ -8,7 +8,7 @@ cabal.mkDerivation (self: {
sha256 = "1gp04mc6irycwazykl9kpyhkkryn3hbnpn08ih6cjbsm3p8yi8b4";
buildDepends = [ filepath pureMD5 regexTdfa zlib ];
meta = {
homepage = "http://src.seereason.com/haskell-unixutils";
homepage = "https://github.com/seereason/haskell-unixutils";
description = "A crude interface between Haskell and Unix-like operating systems";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;

4
pkgs/development/libraries/haskell/cabal-cargs/default.nix
View File

@@ -7,8 +7,8 @@
cabal.mkDerivation (self: {
pname = "cabal-cargs";
version = "0.7.3";
sha256 = "10707nja5j9hbx5yj7pq8s9zgfx21n36r4xhs71g70g6hwpciqjb";
version = "0.7.4";
sha256 = "0dar64xk3bcccyaz2b9v1qc8y63vrm60vb54k8c4n1j6cqzcdp8h";
isLibrary = true;
isExecutable = true;
buildDepends = [

4
pkgs/development/libraries/haskell/cabal-lenses/default.nix
View File

@@ -4,8 +4,8 @@
cabal.mkDerivation (self: {
pname = "cabal-lenses";
version = "0.4";
sha256 = "19ryd1qvsc301kdpk0zvw89aqhvk26ccbrgddm9j5m31mn62jl2d";
version = "0.4.1";
sha256 = "0gkd82g6q8ahrrfmnjzr4r9n5cgdmhpxkqvnsy50k043v0faa0cx";
buildDepends = [ Cabal lens unorderedContainers ];
jailbreak = true;
meta = {

22
pkgs/development/libraries/haskell/cairo/0.12.5.3.nix
View File

@@ -1,22 +0,0 @@
# This file was auto-generated by cabal2nix. Please do NOT edit manually!
{ cabal, cairo, gtk2hsBuildtools, libc, mtl, pkgconfig, utf8String
, zlib
}:
cabal.mkDerivation (self: {
pname = "cairo";
version = "0.12.5.3";
sha256 = "1g5wn7dzz8cc7my09igr284j96d795jlnmy1q2hhlvssfhwbbvg7";
buildDepends = [ mtl utf8String ];
buildTools = [ gtk2hsBuildtools ];
extraLibraries = [ cairo libc pkgconfig zlib ];
pkgconfigDepends = [ cairo ];
meta = {
homepage = "http://projects.haskell.org/gtk2hs/";
description = "Binding to the Cairo library";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
hydraPlatforms = self.stdenv.lib.platforms.none;
};
})

0
pkgs/development/libraries/haskell/cairo/0.13.0.4.nix → pkgs/development/libraries/haskell/cairo/default.nix
View File

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

@@ -6,8 +6,8 @@
cabal.mkDerivation (self: {
pname = "cgrep";
version = "6.4.6";
sha256 = "13plsh6411k273qllpkcrkakwxcdmw0p6arj0j3gdqa7bbxii99s";
version = "6.4.7";
sha256 = "1937dvd69igx41sp1ljpghwqz0ki436pv0xmwz6bq1vny0axwmp7";
isLibrary = false;
isExecutable = true;
buildDepends = [

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

@@ -4,13 +4,14 @@
cabal.mkDerivation (self: {
pname = "colors";
version = "0.1.1";
sha256 = "1i1n05prbp0l3xgx0w2lxzc5r81pcmbzclsamdr7fmjvhvh8blqm";
version = "0.2";
sha256 = "009qkab6m1gnvxc23ayhv5h2v9mpiji5hasiym7a8nm69p8678xa";
buildDepends = [ profunctors ];
meta = {
homepage = "https://github.com/fumieval/colors";
description = "A type for colors";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
maintainers = with self.stdenv.lib.maintainers; [ fuuzetsu ];
};
})

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

@@ -9,8 +9,8 @@
cabal.mkDerivation (self: {
pname = "conduit-combinators";
version = "0.3.0";
sha256 = "1ggdzll71a05743x3a8y1n43ais85simlqsng9da2z3qa42a9dz9";
version = "0.3.0.4";
sha256 = "1aphk79r3ibpb9gykdnz55isp7kf48jhz4h4vgplb0ndbmz8f8zm";
buildDepends = [
base16Bytestring base64Bytestring chunkedData conduit conduitExtra
monadControl monoTraversable mwcRandom primitive resourcet

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

@@ -7,8 +7,8 @@
cabal.mkDerivation (self: {
pname = "conduit-extra";
version = "1.1.4.1";
sha256 = "18q2d9ga49gldw4i8a5vnncsr712b21ik0160gdw3czqilvf8nbr";
version = "1.1.4.2";
sha256 = "0s2ggca6g2104dylbrkn090xwsfrp0946bhwf7fgpfpg9gi1sz1g";
buildDepends = [
attoparsec blazeBuilder conduit filepath monadControl network
primitive resourcet stm streamingCommons text transformers

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

@@ -6,8 +6,8 @@
cabal.mkDerivation (self: {
pname = "conduit";
version = "1.2.2";
sha256 = "04wx9c7lybqmrvhw8h6zb9vp5qyqfs9p7a9a2m2yicf1p3p0q4n8";
version = "1.2.2.2";
sha256 = "0jabdv91zc64bwk709hkpjd7n4gy2cmsv2dhr5ydv35whmkhyry2";
buildDepends = [
exceptions liftedBase mmorph monadControl mtl resourcet
transformers transformersBase void

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

@@ -6,8 +6,8 @@
cabal.mkDerivation (self: {
pname = "crypto-conduit";
version = "0.5.4";
sha256 = "1z628gj4sf50s7pd6p41c670rz98f8b6p3n2dvl93haczcg53l1n";
version = "0.5.5";
sha256 = "0zd4smj3rk2x1msl8z8f5y01x4b87rhgm45g26g6c3dsdasn1lyf";
buildDepends = [
cereal conduit conduitExtra cryptoApi resourcet transformers
];

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

@@ -4,8 +4,8 @@
cabal.mkDerivation (self: {
pname = "cufft";
version = "0.1.0.3";
sha256 = "1jj1ixacmhwjcb2syv4fglawpya5vmdhdk2xqrw4wwfxw4wc9ypi";
version = "0.1.1.0";
sha256 = "0d13nf61698gzh0hcycx1z9bm2xpikkg27bjymsjhfwimvqn7z8h";
buildDepends = [ cuda ];
buildTools = [ c2hs ];
meta = {

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

@@ -1,16 +1,17 @@
# This file was auto-generated by cabal2nix. Please do NOT edit manually!
{ cabal, exceptions, free, monadControl, MonadRandom, mtl
, semigroupoids, semigroups, transformers, transformersBase
{ cabal, bifunctors, exceptions, free, monadControl, MonadRandom
, mtl, profunctors, semigroupoids, semigroups, transformers
, transformersBase
}:
cabal.mkDerivation (self: {
pname = "either";
version = "4.3.1";
sha256 = "1k7aqy3k0ivpbqhym79q49dx41gnrkn1nw2inkm6gv8dy7bj9h6x";
version = "4.3.2";
sha256 = "0bmw4qc263fs5ivf94qfzrq26v8kflb13gims7c474d4jhg8g0w1";
buildDepends = [
exceptions free monadControl MonadRandom mtl semigroupoids
semigroups transformers transformersBase
bifunctors exceptions free monadControl MonadRandom mtl profunctors
semigroupoids semigroups transformers transformersBase
];
noHaddock = self.stdenv.lib.versionOlder self.ghc.version "7.6";
meta = {

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

@@ -4,8 +4,8 @@
cabal.mkDerivation (self: {
pname = "entropy";
version = "0.3.4";
sha256 = "1khfvrk49zf0rd90d34983048mxy093ci2qk8866qq0hwi53b0q0";
version = "0.3.4.1";
sha256 = "10myxs2a7838sywnlfggpsd7lmvzphl10zdh1vbbi18n3x79gyk0";
meta = {
homepage = "https://github.com/TomMD/entropy";
description = "A platform independent entropy source";

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

@@ -4,8 +4,8 @@
cabal.mkDerivation (self: {
pname = "extra";
version = "0.7";
sha256 = "11839h4915xjgmz8av60pn8qaw3b0ckbpw4l9nq5a77qb9rgpbfs";
version = "0.8";
sha256 = "06ydgniar294i9xzviz7qmr3xpnlkpvyvgigwxqfz50kv77w8ijw";
buildDepends = [ filepath time ];
testDepends = [ filepath QuickCheck time ];
meta = {

17
pkgs/development/libraries/haskell/github/default.nix
View File

@@ -1,18 +1,19 @@
# This file was auto-generated by cabal2nix. Please do NOT edit manually!
{ cabal, aeson, attoparsec, caseInsensitive, conduit, cryptohash
, dataDefault, failure, hashable, HTTP, httpConduit, httpTypes
, network, text, time, unorderedContainers, vector
{ cabal, aeson, attoparsec, base16Bytestring, byteable
, caseInsensitive, conduit, cryptohash, dataDefault, failure
, hashable, HTTP, httpConduit, httpTypes, network, text, time
, unorderedContainers, vector
}:
cabal.mkDerivation (self: {
pname = "github";
version = "0.11.1";
sha256 = "0s94ivp3c40zhwwfxa6nzzgwh2frfih8as81i0kidx4ca35wf92k";
version = "0.13";
sha256 = "1vvfrlz6p43mrzskvhp9skh6xbgd5pqcn06wvxw31plpamf5pmzn";
buildDepends = [
aeson attoparsec caseInsensitive conduit cryptohash dataDefault
failure hashable HTTP httpConduit httpTypes network text time
unorderedContainers vector
aeson attoparsec base16Bytestring byteable caseInsensitive conduit
cryptohash dataDefault failure hashable HTTP httpConduit httpTypes
network text time unorderedContainers vector
];
meta = {
homepage = "https://github.com/fpco/github";

1
pkgs/development/libraries/haskell/gitlib-libgit2/default.nix
View File

@@ -26,6 +26,7 @@ cabal.mkDerivation (self: {
description = "Libgit2 backend for gitlib";
license = self.stdenv.lib.licenses.mit;
platforms = self.ghc.meta.platforms;
hydraPlatforms = self.stdenv.lib.platforms.none;
maintainers = with self.stdenv.lib.maintainers; [ ianwookim ];
};
})

1
pkgs/development/libraries/haskell/gitlib-test/default.nix
View File

@@ -18,5 +18,6 @@ cabal.mkDerivation (self: {
license = self.stdenv.lib.licenses.mit;
platforms = self.ghc.meta.platforms;
maintainers = with self.stdenv.lib.maintainers; [ ianwookim ];
broken = true;
};
})

21
pkgs/development/libraries/haskell/glib/0.12.5.4.nix
View File

@@ -1,21 +0,0 @@
# This file was auto-generated by cabal2nix. Please do NOT edit manually!
{ cabal, glib, gtk2hsBuildtools, libc, pkgconfig, utf8String
}:
cabal.mkDerivation (self: {
pname = "glib";
version = "0.12.5.4";
sha256 = "1jbqfcsmsghq67lwnk6yifs34lxvh6xfbzxzfryalifb4zglccz6";
buildDepends = [ utf8String ];
buildTools = [ gtk2hsBuildtools ];
extraLibraries = [ libc pkgconfig ];
pkgconfigDepends = [ glib ];
patches = self.stdenv.lib.optionals self.stdenv.isDarwin [ ./gtk2hs.patch ];
meta = {
homepage = "http://projects.haskell.org/gtk2hs/";
description = "Binding to the GLIB library for Gtk2Hs";
license = self.stdenv.lib.licenses.lgpl21;
platforms = self.ghc.meta.platforms;
};
})

0
pkgs/development/libraries/haskell/glib/0.13.0.5.nix → pkgs/development/libraries/haskell/glib/default.nix
View File

15
pkgs/development/libraries/haskell/glib/gtk2hs.patch
View File

@@ -1,15 +0,0 @@
Author: Hamish Mackenzie <Hamish.K.Mackenzie@googlemail.com>
Date: Mon Jul 7 21:28:50 2014 +1200
Fixes #1
--- a/glib.cabal.orig 2014-11-03 14:52:40.000000000 -0600
+++ b/glib.cabal 2014-11-03 14:52:51.000000000 -0600
@@ -36,6 +36,7 @@
utf8-string >= 0.2 && < 0.4,
containers
build-tools: gtk2hsC2hs >= 0.13.8
+ cpp-options: -U__BLOCKS__ -D__attribute__(A)=
if flag(closure_signals)
cpp-options: -DUSE_GCLOSURE_SIGNALS_IMPL
c-sources: System/Glib/hsgclosure.ccommit aa22754e04616c354557fc350f96a8f7f331e984

22
pkgs/development/libraries/haskell/gtk/0.12.5.7.nix
View File

@@ -1,22 +0,0 @@
# This file was auto-generated by cabal2nix. Please do NOT edit manually!
{ cabal, cairo, gio, glib, gtk, gtk2hsBuildtools, libc, mtl, pango
, pkgconfig, text
}:
cabal.mkDerivation (self: {
pname = "gtk";
version = "0.12.5.7";
sha256 = "0hax4ixdz523753rc774c8g76bjlj56lsabyl5nwkpnppffpa73w";
buildDepends = [ cairo gio glib mtl pango text ];
buildTools = [ gtk2hsBuildtools ];
extraLibraries = [ libc pkgconfig ];
pkgconfigDepends = [ glib gtk ];
patches = self.stdenv.lib.optionals self.stdenv.isDarwin [ ./gtk.patch ];
meta = {
homepage = "http://projects.haskell.org/gtk2hs/";
description = "Binding to the Gtk+ graphical user interface library";
license = self.stdenv.lib.licenses.lgpl21;
platforms = self.ghc.meta.platforms;
};
})

0
pkgs/development/libraries/haskell/gtk/0.13.0.3.nix → pkgs/development/libraries/haskell/gtk/default.nix
View File

10
pkgs/development/libraries/haskell/gtk/gtk.patch
View File

@@ -1,10 +0,0 @@
--- a/gtk.cabal.orig 2014-11-03 15:13:42.000000000 -0600
+++ b/gtk.cabal 2014-11-03 15:14:05.000000000 -0600
@@ -148,6 +148,7 @@
build-tools: gtk2hsC2hs >= 0.13.8,
gtk2hsHookGenerator, gtk2hsTypeGen
+ cpp-options: -U__BLOCKS__ -D__attribute__(A)=
exposed-modules:
Graphics.UI.Gtk

4
pkgs/development/libraries/haskell/highlighting-kate/default.nix
View File

@@ -6,8 +6,8 @@
cabal.mkDerivation (self: {
pname = "highlighting-kate";
version = "0.5.9";
sha256 = "025j6d97nwjhhyhdz7bsfhzgpb1ld28va4r8yv7zfh1dvczs6lkr";
version = "0.5.11";
sha256 = "0jfgz4cyn6fylfrsk1yi0fykir8mhxdniq80h7hy5i2xv7qwf5vw";
isLibrary = true;
isExecutable = true;
buildDepends = [

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

@@ -6,8 +6,8 @@
cabal.mkDerivation (self: {
pname = "hoauth2";
version = "0.4.2";
sha256 = "08vdrgzn1j02gn2j5apjhnv2lgp7i8xhvibqjcjf4l80spmja2h0";
version = "0.4.3";
sha256 = "1qmhk9h3rwp29dsjqbgsma4zgzdd6cw1jcryzd17rk32biiiylvg";
isLibrary = true;
isExecutable = true;
buildDepends = [

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

@@ -6,8 +6,8 @@
cabal.mkDerivation (self: {
pname = "hsimport";
version = "0.6.2";
sha256 = "02v32gh5has3y8qk55cpdr0336n2hi33d5aw0ifpg84p89k8kr33";
version = "0.6.3";
sha256 = "0pmlspz09qj8zb1qpv6dxd25l69hh2ccsyvc37914dis74g9rw03";
isLibrary = true;
isExecutable = true;
buildDepends = [

27
pkgs/development/libraries/haskell/hspec-core/default.nix Normal file
View File

@@ -0,0 +1,27 @@
# This file was auto-generated by cabal2nix. Please do NOT edit manually!
{ cabal, ansiTerminal, async, deepseq, ghcPaths, hspecExpectations
, hspecMeta, HUnit, QuickCheck, quickcheckIo, random, setenv
, silently, tfRandom, time, transformers
}:
cabal.mkDerivation (self: {
pname = "hspec-core";
version = "2.0.1";
sha256 = "1yr2hkr1p95bpj5n6hqw20g8imqal6pva4nrvy0hmxdg53jyxcf7";
buildDepends = [
ansiTerminal async deepseq hspecExpectations HUnit QuickCheck
quickcheckIo random setenv tfRandom time transformers
];
testDepends = [
ansiTerminal async deepseq ghcPaths hspecExpectations hspecMeta
HUnit QuickCheck quickcheckIo random setenv silently tfRandom time
transformers
];
meta = {
homepage = "http://hspec.github.io/";
description = "A Testing Framework for Haskell";
license = self.stdenv.lib.licenses.mit;
platforms = self.ghc.meta.platforms;
};
})

20
pkgs/development/libraries/haskell/hspec-discover/default.nix Normal file
View File

@@ -0,0 +1,20 @@
# This file was auto-generated by cabal2nix. Please do NOT edit manually!
{ cabal, filepath, hspecMeta }:
cabal.mkDerivation (self: {
pname = "hspec-discover";
version = "2.0.1";
sha256 = "0k54j1id5yj60kjxs16w4hr52wanc55l131arypcjgf9w4yx3x3w";
isLibrary = true;
isExecutable = true;
buildDepends = [ filepath ];
testDepends = [ filepath hspecMeta ];
noHaddock = true;
meta = {
homepage = "http://hspec.github.io/";
description = "Automatically discover and run Hspec tests";
license = self.stdenv.lib.licenses.mit;
platforms = self.ghc.meta.platforms;
};
})

8
pkgs/development/libraries/haskell/hspec-meta/default.nix
View File

@@ -1,19 +1,19 @@
# This file was auto-generated by cabal2nix. Please do NOT edit manually!
{ cabal, ansiTerminal, async, deepseq, filepath, hspecExpectations
, HUnit, QuickCheck, quickcheckIo, random, setenv, tfRandom, time
, HUnit, QuickCheck, quickcheckIo, random, setenv, time
, transformers
}:
cabal.mkDerivation (self: {
pname = "hspec-meta";
version = "1.12.3";
sha256 = "106wzvramjw18a2wvmfik3z47zshq7yalgax389gx340g3wnrfp7";
version = "2.0.0";
sha256 = "0x1k2d4nycglzn9l4i32xrampr9fgzjpp4j1jyy7pj89cfl8jc8f";
isLibrary = true;
isExecutable = true;
buildDepends = [
ansiTerminal async deepseq filepath hspecExpectations HUnit
QuickCheck quickcheckIo random setenv tfRandom time transformers
QuickCheck quickcheckIo random setenv time transformers
];
doCheck = false;
meta = {

21
pkgs/development/libraries/haskell/hspec/default.nix
View File

@@ -1,26 +1,17 @@
# This file was auto-generated by cabal2nix. Please do NOT edit manually!
{ cabal, ansiTerminal, async, deepseq, filepath, ghcPaths
, hspecExpectations, hspecMeta, HUnit, QuickCheck, quickcheckIo
, random, setenv, silently, stringbuilder, tfRandom, time
, transformers
{ cabal, hspecCore, hspecDiscover, hspecExpectations, hspecMeta
, QuickCheck, stringbuilder, transformers
}:
cabal.mkDerivation (self: {
pname = "hspec";
version = "1.12.3";
sha256 = "0lqihgsk46lwm4k2nc81pbi1gdfk7qnmjli90bvf4pbbhg5igjkn";
isLibrary = true;
isExecutable = true;
version = "2.0.1";
sha256 = "05kwxn5sws8gc1v8im2pyirrj5bzc6lnj22q2klgj4mg3apjd0jb";
buildDepends = [
ansiTerminal async deepseq filepath hspecExpectations HUnit
QuickCheck quickcheckIo random setenv tfRandom time transformers
];
testDepends = [
ansiTerminal async deepseq filepath ghcPaths hspecExpectations
hspecMeta HUnit QuickCheck quickcheckIo random setenv silently
stringbuilder tfRandom time transformers
hspecCore hspecDiscover hspecExpectations QuickCheck transformers
];
testDepends = [ hspecCore hspecMeta QuickCheck stringbuilder ];
doCheck = false;
meta = {
homepage = "http://hspec.github.io/";

23
pkgs/development/libraries/haskell/hspec2/default.nix
View File

@@ -1,31 +1,16 @@
# This file was auto-generated by cabal2nix. Please do NOT edit manually!
{ cabal, ansiTerminal, async, deepseq, filepath, ghcPaths
, hspecExpectations, hspecMeta, HUnit, QuickCheck, quickcheckIo
, random, setenv, silently, stringbuilder, tfRandom, time
, transformers
}:
{ cabal, hspec, hspecDiscover }:
cabal.mkDerivation (self: {
pname = "hspec2";
version = "0.5.1";
sha256 = "1ax507vb0zm5jalp6pvlk1fjfil766pf7w61d1igpxr0s00lnvlq";
isLibrary = true;
isExecutable = true;
buildDepends = [
ansiTerminal async deepseq filepath hspecExpectations HUnit
QuickCheck quickcheckIo random setenv tfRandom time transformers
];
testDepends = [
ansiTerminal async deepseq filepath ghcPaths hspecExpectations
hspecMeta HUnit QuickCheck quickcheckIo random setenv silently
stringbuilder tfRandom time transformers
];
version = "0.6.1";
sha256 = "0zlvm7r46q8yhgx2kx9mfrf6x2f5amdbi3a59fh69dsqs4lbgmf4";
buildDepends = [ hspec hspecDiscover ];
meta = {
homepage = "http://hspec.github.io/";
description = "Alpha version of Hspec 2.0";
license = self.stdenv.lib.licenses.mit;
platforms = self.ghc.meta.platforms;
broken = true;
};
})

14
pkgs/development/libraries/haskell/labeled-tree/default.nix Normal file
View File

@@ -0,0 +1,14 @@
# This file was auto-generated by cabal2nix. Please do NOT edit manually!
{ cabal }:
cabal.mkDerivation (self: {
pname = "labeled-tree";
version = "1.0.0.0";
sha256 = "1cnnyic5z5y21hpxpmx66ph34mjyysckgiasmzg7yx202y2ih7s7";
meta = {
description = "Labeled tree structure";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
};
})

24
pkgs/development/libraries/haskell/libjenkins/default.nix
View File

@@ -1,24 +1,24 @@
# This file was auto-generated by cabal2nix. Please do NOT edit manually!
{ cabal, async, conduit, doctest, exceptions, filepath, free, hspec
, hspecExpectationsLens, httpClient, httpConduit, httpTypes, lens
, monadControl, network, networkUri, resourcet, text, transformers
, xmlConduit
{ cabal, async, attoparsec, doctest, filepath, free, hspec
, hspecExpectationsLens, httpClient, httpClientTls, httpTypes, lens
, liftedAsync, liftedBase, monadControl, mtl, network, networkUri
, profunctors, text, transformers, xmlConduit
}:
cabal.mkDerivation (self: {
pname = "libjenkins";
version = "0.5.0";
sha256 = "010gid9r3kcajijg7x56c77l93vlbh7fy7akjrg7b73i4zy6jnl7";
version = "0.6.0";
sha256 = "0rcqmj5myi2wy2acd59gqdfwiiapw1zwzm71bjqb1y66z0rnrkx4";
buildDepends = [
async conduit exceptions free httpClient httpConduit httpTypes lens
monadControl network networkUri resourcet text transformers
xmlConduit
attoparsec free httpClient httpClientTls httpTypes liftedAsync
liftedBase monadControl mtl network networkUri profunctors text
transformers
];
testDepends = [
async conduit doctest exceptions filepath free hspec
hspecExpectationsLens httpClient httpConduit httpTypes lens
monadControl network networkUri resourcet text transformers
async attoparsec doctest filepath free hspec hspecExpectationsLens
httpClient httpClientTls httpTypes lens liftedAsync liftedBase
monadControl mtl network networkUri profunctors text transformers
xmlConduit
];
jailbreak = true;

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

@@ -8,8 +8,8 @@
cabal.mkDerivation (self: {
pname = "linear";
version = "1.11.3";
sha256 = "12a3qfkyb4h14630k312gpb5j7dxr38bqk5y2lnnafka8hcc6w5n";
version = "1.13";
sha256 = "1gad6dvri7a21v8zx6m2m3ghcvb4zfrra3c4ghrc7ywccxvzmxpc";
buildDepends = [
adjunctions binary distributive hashable lens reflection
semigroupoids semigroups tagged transformers unorderedContainers

22
pkgs/development/libraries/haskell/pango/0.12.5.3.nix
View File

@@ -1,22 +0,0 @@
# This file was auto-generated by cabal2nix. Please do NOT edit manually!
{ cabal, cairo, glib, gtk2hsBuildtools, libc, mtl, pango, pkgconfig
, text
}:
cabal.mkDerivation (self: {
pname = "pango";
version = "0.12.5.3";
sha256 = "1n64ppz0jqrbzvimbz4avwnx3z0n5z2gbmbmca0hw9wqf9j6y79a";
buildDepends = [ cairo glib mtl text ];
buildTools = [ gtk2hsBuildtools ];
extraLibraries = [ libc pkgconfig ];
pkgconfigDepends = [ cairo pango ];
patches = self.stdenv.lib.optionals self.stdenv.isDarwin [ ./pango.patch ];
meta = {
homepage = "http://projects.haskell.org/gtk2hs/";
description = "Binding to the Pango text rendering engine";
license = self.stdenv.lib.licenses.lgpl21;
platforms = self.ghc.meta.platforms;
};
})

0
pkgs/development/libraries/haskell/pango/0.13.0.3.nix → pkgs/development/libraries/haskell/pango/default.nix
View File

10
pkgs/development/libraries/haskell/pango/pango.patch
View File

@@ -1,10 +0,0 @@
--- a/pango.cabal.orig 2014-11-03 15:11:35.000000000 -0600
+++ b/pango.cabal 2014-11-03 15:11:57.000000000 -0600
@@ -52,6 +52,7 @@
build-depends: base < 4
build-tools: gtk2hsC2hs >= 0.13.8, gtk2hsTypeGen
+ cpp-options: -U__BLOCKS__ -D__attribute__(A)=
exposed-modules: Graphics.Rendering.Pango
Graphics.Rendering.Pango.Font

4
pkgs/development/libraries/haskell/pipes-text/default.nix
View File

@@ -6,8 +6,8 @@
cabal.mkDerivation (self: {
pname = "pipes-text";
version = "0.0.0.13";
sha256 = "1sqwrs5y9s16zikwb5w21fvrqf06ld0915kc065ikdcrd6z4sk43";
version = "0.0.0.15";
sha256 = "10906gdb9gjhxxmxvmib6kw7py6fl2r4df5bryqvbjvr1afcc3x9";
buildDepends = [
pipes pipesBytestring pipesGroup pipesParse pipesSafe
streamingCommons text transformers

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

@@ -7,8 +7,8 @@
cabal.mkDerivation (self: {
pname = "rethinkdb";
version = "1.15.2.0";
sha256 = "1cca6nrdaia5dgq2ah6sfr9qy01iasilw7zdw6k8vp5907alsh0f";
version = "1.15.2.1";
sha256 = "017fq9mhqdw78hrnjm9n0nipi182361bxh1qzjpb8djc8azx49b5";
buildDepends = [
aeson base64Bytestring binary dataDefault mtl network scientific
text time unorderedContainers utf8String vector

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

@@ -1,13 +1,15 @@
# This file was auto-generated by cabal2nix. Please do NOT edit manually!
{ cabal, SDL2 }:
{ cabal, SDL2, transformers }:
cabal.mkDerivation (self: {
pname = "sdl2";
version = "1.2.0";
sha256 = "19q7x74b9ismxmlsblqvfy4w91bspl9n1fjccz8w1qylyilr6ca2";
version = "1.3.0";
sha256 = "0fi9kjf12qlp64r2pxwc1k9241s23j6xm0dmwdsc18y8f6acvqxa";
buildDepends = [ transformers ];
extraLibraries = [ SDL2 ];
pkgconfigDepends = [ SDL2 ];
noHaddock = true;
meta = {
description = "Low-level bindings to SDL2";
license = self.stdenv.lib.licenses.bsd3;

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

@@ -6,8 +6,8 @@
cabal.mkDerivation (self: {
pname = "shakespeare";
version = "2.0.1.1";
sha256 = "0xddm8xby19323d9bcd196b1ninlvfkv5b93w1da23m7w0hy509p";
version = "2.0.2";
sha256 = "18yzihkjxgchb4358pbm45xk9zcmpgbp3rr27mx08nj5n0mdkwyy";
buildDepends = [
aeson blazeHtml blazeMarkup exceptions parsec systemFileio
systemFilepath text time transformers

10
pkgs/development/libraries/haskell/snaplet-postgresql-simple/default.nix
View File

@@ -1,6 +1,6 @@
# This file was auto-generated by cabal2nix. Please do NOT edit manually!
{ cabal, clientsession, configurator, errors
{ cabal, clientsession, configurator, errors, lens
, MonadCatchIOTransformers, mtl, postgresqlSimple
, resourcePoolCatchio, snap, text, transformers
, unorderedContainers
@@ -8,10 +8,10 @@
cabal.mkDerivation (self: {
pname = "snaplet-postgresql-simple";
version = "0.5";
sha256 = "0pzn0lg1slrllrrx1n9s1kp1pmq2ahrkjypcwnnld8zxzvz4g5jm";
version = "0.6";
sha256 = "042mpyj84d089pr2qjix9fvzfj4ir74kjkdx3jg84jwn602lhzi6";
buildDepends = [
clientsession configurator errors MonadCatchIOTransformers mtl
clientsession configurator errors lens MonadCatchIOTransformers mtl
postgresqlSimple resourcePoolCatchio snap text transformers
unorderedContainers
];
@@ -20,7 +20,5 @@ cabal.mkDerivation (self: {
description = "postgresql-simple snaplet for the Snap Framework";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
hydraPlatforms = self.stdenv.lib.platforms.none;
broken = true;
};
})

4
pkgs/development/libraries/haskell/system-fileio/default.nix
View File

@@ -5,8 +5,8 @@
cabal.mkDerivation (self: {
pname = "system-fileio";
version = "0.3.14";
sha256 = "1x5cricx2n1wwvdad4i3q8s3gb28a129v3kkj9rn9803xh43zh29";
version = "0.3.15";
sha256 = "06cnr3hzw8xd75529nfqajgb5xy5i4ddqybgjw1v1nwpq04mhihi";
buildDepends = [ systemFilepath text time ];
testDepends = [
chell systemFilepath temporary text time transformers

4
pkgs/development/libraries/haskell/terminal-size/default.nix
View File

@@ -4,8 +4,8 @@
cabal.mkDerivation (self: {
pname = "terminal-size";
version = "0.2.1.0";
sha256 = "0d41af1is3vdb1kgd8dk82fags86bgs67vkbzpdhjdwa3aimsxgn";
version = "0.3.0";
sha256 = "0g8v08d20hlfsah9dlgv2v2pzj0m4dva0zp6zi4jrkxjhg6vi7bw";
meta = {
description = "Get terminal window height and width";
license = self.stdenv.lib.licenses.bsd3;

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

@@ -9,8 +9,8 @@
cabal.mkDerivation (self: {
pname = "twitter-conduit";
version = "0.0.7";
sha256 = "1xwfyhjkbdl19b7cpw12lgnjzqhpiqvfhag2l8zhks21yv0l3kg0";
version = "0.0.8";
sha256 = "16yxf9qdy1x2w4l4ix1kp1a9vcgmd1cvkqffkj52rzckcjpyd6fs";
isLibrary = true;
isExecutable = true;
buildDepends = [

13
pkgs/development/libraries/haskell/yesod-bin/default.nix
View File

@@ -5,14 +5,14 @@
, ghcPaths, httpConduit, httpReverseProxy, httpTypes, liftedBase
, network, optparseApplicative, parsec, projectTemplate, resourcet
, shakespeare, split, streamingCommons, systemFileio
, systemFilepath, tar, text, time, transformers, unixCompat
, unorderedContainers, wai, waiExtra, warp, yaml, zlib
, systemFilepath, tar, text, time, transformers, transformersCompat
, unixCompat, unorderedContainers, wai, waiExtra, warp, yaml, zlib
}:
cabal.mkDerivation (self: {
pname = "yesod-bin";
version = "1.4.0.5";
sha256 = "06rwmcag0vlj8q647mwimk5fsjfmrxc6d1yg95b7a2g48rh1m25x";
version = "1.4.0.6";
sha256 = "1sx8fwi191zzq4p4lmmvk430dgf0zkik01ckxnkswvazmbjlm5vj";
isLibrary = false;
isExecutable = true;
buildDepends = [
@@ -20,8 +20,9 @@ cabal.mkDerivation (self: {
dataDefaultClass fileEmbed filepath fsnotify ghcPaths httpConduit
httpReverseProxy httpTypes liftedBase network optparseApplicative
parsec projectTemplate resourcet shakespeare split streamingCommons
systemFileio systemFilepath tar text time transformers unixCompat
unorderedContainers wai waiExtra warp yaml zlib
systemFileio systemFilepath tar text time transformers
transformersCompat unixCompat unorderedContainers wai waiExtra warp
yaml zlib
];
meta = {
homepage = "http://www.yesodweb.com/";

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

@@ -13,8 +13,8 @@
cabal.mkDerivation (self: {
pname = "yesod-core";
version = "1.4.3";
sha256 = "1mglavffzvav4dzwqq70agz5rd4bdb66p40qa445fq1dxwbwcq6i";
version = "1.4.3.1";
sha256 = "11zds9zh6vpc83vv8aizd8vm5ajlnqdha5l0rz35n75c21iygg3w";
buildDepends = [
aeson blazeBuilder blazeHtml blazeMarkup caseInsensitive cereal
clientsession conduit conduitExtra cookie dataDefault deepseq

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

@@ -8,8 +8,8 @@
cabal.mkDerivation (self: {
pname = "yesod-test";
version = "1.4.0.3";
sha256 = "00rg8q5qwyp7aa409d8ir09vgbvwa9qxkgcjpwqa4lp3ncbpiw9j";
version = "1.4.1";
sha256 = "10z88ki694z0kzbg84gaj10h8s9hrj5ghgbxq4y486nvmp4px8f1";
buildDepends = [
attoparsec blazeBuilder blazeHtml blazeMarkup caseInsensitive
cookie hspec htmlConduit httpTypes HUnit monadControl network

22
pkgs/development/libraries/java/commons/bsf/default.nix Normal file
View File

@@ -0,0 +1,22 @@
{stdenv, fetchurl}:
stdenv.mkDerivation {
name = "commons-bsf-1.2";
src = fetchurl {
url = mirror://apache/commons/bsf/binaries/bsf-bin-2.4.0.tar.gz;
sha256 = "1my3hv4y8cvrd1kr315wvbjqsamzlzswnbqcmsa2m4hqcafddfr8";
};
installPhase = ''
mkdir -p $out/share/java
cp lib/bsf.jar $out/share/java/
'';
meta = {
description = "Interface to scripting languages, including JSR-223";
homepage = http://commons.apache.org/proper/commons-bsf/;
license = stdenv.lib.licenses.asl20;
};
}

22
pkgs/development/libraries/java/commons/logging/default.nix Normal file
View File

@@ -0,0 +1,22 @@
{stdenv, fetchurl}:
stdenv.mkDerivation {
name = "commons-logging-1.2";
src = fetchurl {
url = mirror://apache/commons/logging/binaries/commons-logging-1.2-bin.tar.gz;
sha256 = "1gc70pmcv0x6ibl89jglmr22f8zpr63iaifi49nrq399qw2qhx9z";
};
installPhase = ''
mkdir -p $out/share/java
cp commons-logging-*.jar $out/share/java/
'';
meta = {
description = "Wrapper around a variety of logging API implementations";
homepage = http://commons.apache.org/proper/commons-logging;
license = stdenv.lib.licenses.asl20;
};
}

13
pkgs/development/libraries/libgphoto2/default.nix
View File

@@ -1,4 +1,4 @@
{stdenv, fetchurl, pkgconfig, libusb, libtool, libexif, libjpeg, gettext}:
{ stdenv, fetchurl, pkgconfig, libusb1, libtool, libexif, libjpeg, gettext }:
stdenv.mkDerivation rec {
name = "libgphoto2-${meta.version}";
@@ -7,12 +7,12 @@ stdenv.mkDerivation rec {
url = "mirror://sourceforge/gphoto/${name}.tar.bz2";
sha256 = "0ij80nixichihv3iic7cgdq3irssk8waz1c25m6yypjl4kg6n3k0";
};
nativeBuildInputs = [ pkgconfig gettext ];
buildInputs = [ libtool libjpeg ];
buildInputs = [ libtool libjpeg libusb1 ];
# These are mentioned in the Requires line of libgphoto's pkg-config file.
propagatedBuildInputs = [ libusb libexif ];
propagatedBuildInputs = [ libexif ];
meta = {
homepage = http://www.gphoto.org/proj/libgphoto2/;
@@ -20,12 +20,13 @@ stdenv.mkDerivation rec {
longDescription = ''
This is the library backend for gphoto2. It contains the code for PTP,
MTP, and other vendor specific protocols for controlling and transferring data
from digital cameras.
from digital cameras.
'';
version = "2.5.5.1";
# XXX: the homepage claims LGPL, but several src files are lgpl21Plus
license = stdenv.lib.licenses.lgpl21Plus;
license = stdenv.lib.licenses.lgpl21Plus;
platforms = with stdenv.lib.platforms; unix;
maintainers = with stdenv.lib.maintainers; [ jcumming ];
};
}

14
pkgs/development/libraries/libusb/default.nix
View File

@@ -1,16 +1,12 @@
{stdenv, fetchurl}:
{stdenv, fetchurl, pkgconfig, libusb1}:
stdenv.mkDerivation {
name = "libusb-0.1.12";
name = "libusb-compat-0.1.5";
# On non-linux, we get warnings compiling, and we don't want the
# build to break.
patchPhase = ''
sed -i s/-Werror// Makefile.in
'';
buildInputs = [ pkgconfig libusb1 ];
src = fetchurl {
url = mirror://sourceforge/libusb/libusb-0.1.12.tar.gz;
sha256 = "0i4bacxkyr7xyqxbmb00ypkrv4swkgm0mghbzjsnw6blvvczgxip";
url = mirror://sourceforge/libusb/libusb-compat-0.1.5.tar.bz2;
sha256 = "0nn5icrfm9lkhzw1xjvaks9bq3w6mjg86ggv3fn7kgi4nfvg8kj0";
};
}

25
pkgs/development/libraries/science/math/ipopt/default.nix Normal file
View File

@@ -0,0 +1,25 @@
{ stdenv, fetchurl, unzip, blas, liblapack, gfortran }:
stdenv.mkDerivation rec {
version = "3.11.9";
name = "ipopt-${version}";
src = fetchurl {
url = "http://www.coin-or.org/download/source/Ipopt/Ipopt-${version}.zip";
sha256 = "0sji4spl5dhw1s3f9y0ym09gi7d1c8wldn6wbiap4q8dq7cvklq5";
};
nativeBuildInputs = [ unzip ];
buildInputs = [ gfortran blas liblapack ];
enableParallelBuilding = true;
meta = with stdenv.lib; {
description = "A software package for large-scale nonlinear optimization";
homepage = https://projects.coin-or.org/Ipopt;
license = licenses.epl10;
platforms = platforms.unix;
maintainers = with maintainers; [ abbradar ];
};
}