diff options
Diffstat (limited to 'pkgs/development')
54 files changed, 197 insertions, 270 deletions
diff --git a/pkgs/development/compilers/idris/default.nix b/pkgs/development/compilers/idris/default.nix index 15b4aa009864..babaa2e24821 100644 --- a/pkgs/development/compilers/idris/default.nix +++ b/pkgs/development/compilers/idris/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "idris"; - version = "0.9.6"; - sha256 = "1yml1k4bis210hgi898hgs4wj5p34ainlj7vwy5lh7bjkvrksgq1"; + version = "0.9.6.1"; + sha256 = "1wy79rrm5pvg77i9nvwkcg6swsdbmg2izch48n4lj4idj0ga5g62"; isLibrary = false; isExecutable = true; buildDepends = [ diff --git a/pkgs/development/interpreters/love/default.nix b/pkgs/development/interpreters/love/default.nix index ee68f85725ab..318a336faa66 100644 --- a/pkgs/development/interpreters/love/default.nix +++ b/pkgs/development/interpreters/love/default.nix @@ -1,58 +1,32 @@ -x@{builderDefsPackage - , lua5, mpg123, physfs, freetype, libdevil, openal, SDL, libvorbis - , libogg, flac, mesa, libtiff, libpng, libjpeg, libmodplug - , ...}: -builderDefsPackage -(a : -let - helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ - []; +{ stdenv, fetchurl, pkgconfig +, SDL, mesa, openal, lua5 +, libdevil, freetype, physfs +, libmodplug, mpg123, libvorbis, libogg +}: - buildInputs = map (n: builtins.getAttr n x) - (builtins.attrNames (builtins.removeAttrs x helperArgNames)); - sourceInfo = rec { - baseName="love"; - version="0.7.2"; - name="${baseName}-${version}"; - url="https://bitbucket.org/rude/love/downloads/${name}-linux-src.tar.gz"; - hash="0s7jywkvydlshlgy11ilzngrnybmq5xlgzp2v2dhlffwrfqdqym5"; +stdenv.mkDerivation rec { + name = "love-0.8.0"; + src = fetchurl { + url = "https://bitbucket.org/rude/love/downloads/${name}-linux-src.tar.gz"; + sha256 = "1k4fcsa8zzi04ja179bmj24hvqcbm3icfvrvrzyz2gw9qwfclrwi"; }; -in -rec { - src = a.fetchurl { - url = sourceInfo.url; - sha256 = sourceInfo.hash; - }; - - inherit (sourceInfo) name version; - inherit buildInputs; - /* doConfigure should be removed if not needed */ - phaseNames = ["setVars" "fixSrc" "doConfigure" "doMakeInstall"]; - - fixSrc =a.fullDepEntry '' - sed -e '/typedef void (\*__GLXextFuncPtr)/d' -i src/modules/graphics/opengl/GLee.h - '' ["minInit" "doUnpack"]; + buildInputs = [ + pkgconfig SDL mesa openal lua5 + libdevil freetype physfs libmodplug mpg123 libvorbis libogg + ]; - setVars = a.noDepEntry '' - export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${SDL}/include/SDL" - export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${freetype}/include/freetype2" + NIX_CFLAGS_COMPILE = '' + -I${SDL}/include/SDL + -I${freetype}include/freetype2 ''; meta = { + homepage = "http://love2d.org"; description = "A Lua-based 2D game engine/scripting language"; - maintainers = with a.lib.maintainers; - [ - raskin - ]; - platforms = with a.lib.platforms; - linux; - license = a.lib.licenses.zlib; - }; - passthru = { - updateInfo = { - downloadPage = "http://love2d.org/"; - }; - }; -}) x + license = "zlib"; + platforms = stdenv.lib.platforms.linux; + maintainers = [ stdenv.lib.maintainers.raskin ]; + }; +} diff --git a/pkgs/development/libraries/haskell/DAV/default.nix b/pkgs/development/libraries/haskell/DAV/default.nix index c10e56d11460..b19329666756 100644 --- a/pkgs/development/libraries/haskell/DAV/default.nix +++ b/pkgs/development/libraries/haskell/DAV/default.nix @@ -13,6 +13,7 @@ cabal.mkDerivation (self: { caseInsensitive cmdargs httpConduit httpTypes lens liftedBase mtl network resourcet transformers xmlConduit xmlHamlet ]; + jailbreak = true; meta = { homepage = "http://floss.scru.org/hDAV"; description = "RFC 4918 WebDAV support"; diff --git a/pkgs/development/libraries/haskell/attoparsec-conduit/default.nix b/pkgs/development/libraries/haskell/attoparsec-conduit/default.nix index 9c969ed858fd..916f38f66c57 100644 --- a/pkgs/development/libraries/haskell/attoparsec-conduit/default.nix +++ b/pkgs/development/libraries/haskell/attoparsec-conduit/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "attoparsec-conduit"; - version = "0.5.0.3"; - sha256 = "1n35v7mq93marx6ayja7zfk2hib4whspvysf0a7hjikylp4lfydw"; + version = "1.0.0"; + sha256 = "1aw071qcwhxwpd6azhgaiia97rhj50rms4pysbc19iihmdih3ib8"; buildDepends = [ attoparsec conduit text transformers ]; meta = { homepage = "http://github.com/snoyberg/conduit"; diff --git a/pkgs/development/libraries/haskell/authenticate/default.nix b/pkgs/development/libraries/haskell/authenticate/default.nix index c6624208048a..f0a1969ffbab 100644 --- a/pkgs/development/libraries/haskell/authenticate/default.nix +++ b/pkgs/development/libraries/haskell/authenticate/default.nix @@ -1,17 +1,16 @@ -{ cabal, aeson, attoparsec, blazeBuilder, blazeBuilderConduit -, caseInsensitive, conduit, httpConduit, httpTypes, monadControl -, network, resourcet, tagsoup, text, transformers +{ cabal, aeson, attoparsec, blazeBuilder, caseInsensitive, conduit +, httpConduit, httpTypes, network, tagsoup, text, transformers , unorderedContainers, xmlConduit }: cabal.mkDerivation (self: { pname = "authenticate"; - version = "1.3.2.4"; - sha256 = "1xakp54g5dyppzpm1q3bbx6g4pvs7p2903pyq6bya1n82zsk7yg7"; + version = "1.3.2.6"; + sha256 = "12sgi6q6kajjhh8mns9nklxj0kwn32xs5kzi7wmw50shx0smnjrz"; buildDepends = [ - aeson attoparsec blazeBuilder blazeBuilderConduit caseInsensitive - conduit httpConduit httpTypes monadControl network resourcet - tagsoup text transformers unorderedContainers xmlConduit + aeson attoparsec blazeBuilder caseInsensitive conduit httpConduit + httpTypes network tagsoup text transformers unorderedContainers + xmlConduit ]; meta = { homepage = "http://github.com/yesodweb/authenticate"; diff --git a/pkgs/development/libraries/haskell/base64-conduit/default.nix b/pkgs/development/libraries/haskell/base64-conduit/default.nix index 851dda488dcd..c6d25384be22 100644 --- a/pkgs/development/libraries/haskell/base64-conduit/default.nix +++ b/pkgs/development/libraries/haskell/base64-conduit/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "base64-conduit"; - version = "0.5.1"; - sha256 = "1zmp6iv55rac7x7w59az7zaarq79fr7zvgg2wcb5b627axlw909l"; + version = "1.0.0"; + sha256 = "10wjgdixk5da48jpm2i91vy3ckdqpbpgba6hzn7ak6d3qac22m9q"; buildDepends = [ base64Bytestring conduit ]; meta = { homepage = "http://github.com/snoyberg/conduit"; diff --git a/pkgs/development/libraries/haskell/blaze-builder-conduit/default.nix b/pkgs/development/libraries/haskell/blaze-builder-conduit/default.nix index a9568dde4963..89ff67fac37c 100644 --- a/pkgs/development/libraries/haskell/blaze-builder-conduit/default.nix +++ b/pkgs/development/libraries/haskell/blaze-builder-conduit/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "blaze-builder-conduit"; - version = "0.5.0.3"; - sha256 = "0dbymh29zg0bvhlmai5s6qiqypx46hmlg375jpcq1597vzaanwnw"; + version = "1.0.0"; + sha256 = "15q0b0k5dxrp9cw2b4qf9mmjwz1mmxrn3890df5rc9z6yajajrc6"; buildDepends = [ blazeBuilder conduit text transformers ]; meta = { homepage = "http://github.com/snoyberg/conduit"; diff --git a/pkgs/development/libraries/haskell/classy-prelude-conduit/default.nix b/pkgs/development/libraries/haskell/classy-prelude-conduit/default.nix index 0b4ae85c73a1..85a1fb7bdef5 100644 --- a/pkgs/development/libraries/haskell/classy-prelude-conduit/default.nix +++ b/pkgs/development/libraries/haskell/classy-prelude-conduit/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "classy-prelude-conduit"; - version = "0.5.0"; - sha256 = "1c1j9cxj08nz1pkrdxhphk6zyn1dxf3wbl8phcrzi8qk6q1vi0bi"; + version = "0.5.1"; + sha256 = "1vwcxwrbnczchq2b773kjjr3ysc47widak8qj0kwi26nf3jics4k"; buildDepends = [ classyPrelude conduit monadControl resourcet transformers void xmlConduit diff --git a/pkgs/development/libraries/haskell/conduit/default.nix b/pkgs/development/libraries/haskell/conduit/default.nix index 74827d407b74..3ea60db5fb56 100644 --- a/pkgs/development/libraries/haskell/conduit/default.nix +++ b/pkgs/development/libraries/haskell/conduit/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "conduit"; - version = "0.5.6"; - sha256 = "1a5apcds3jjksz7hzw4ag725796axqk9nm5fhn5i4l82zphq2cxs"; + version = "1.0.0"; + sha256 = "1sx7s3awzb7y51prmmvrx9gxhd5068rbzwl719lfx3r50k94r00d"; buildDepends = [ liftedBase monadControl resourcet text transformers transformersBase void diff --git a/pkgs/development/libraries/haskell/crypto-api/default.nix b/pkgs/development/libraries/haskell/crypto-api/default.nix index 5f71e6222508..dbfc60c189c7 100644 --- a/pkgs/development/libraries/haskell/crypto-api/default.nix +++ b/pkgs/development/libraries/haskell/crypto-api/default.nix @@ -1,10 +1,10 @@ -{ cabal, cereal, entropy, largeword, tagged }: +{ cabal, cereal, entropy, tagged, transformers }: cabal.mkDerivation (self: { pname = "crypto-api"; - version = "0.10.2"; - sha256 = "06dbvdwyw2hf5cafpjfhasgyzzbigvvg74c47lafvqvgxvn9v4ms"; - buildDepends = [ cereal entropy largeword tagged ]; + version = "0.11"; + sha256 = "1v42dmm4cx8brb5mpz34wa20c3s27r0v7qiqlb54svzsl0jkfmiy"; + buildDepends = [ cereal entropy tagged transformers ]; meta = { homepage = "http://trac.haskell.org/crypto-api/wiki"; description = "A generic interface for cryptographic operations"; diff --git a/pkgs/development/libraries/haskell/crypto-conduit/default.nix b/pkgs/development/libraries/haskell/crypto-conduit/default.nix index d22bfa840e78..29163f897370 100644 --- a/pkgs/development/libraries/haskell/crypto-conduit/default.nix +++ b/pkgs/development/libraries/haskell/crypto-conduit/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "crypto-conduit"; - version = "0.4.3"; - sha256 = "0h9dmr88hqmz2876mlnzz8s5kmi368zs9pljvvmb9vn7m44gpyrk"; + version = "0.5.0"; + sha256 = "0mlf2l784w0wyfjqsxzfdwmn1wb0z1s6mb8kdhw8x1z4a8gy9a92"; buildDepends = [ cereal conduit cryptoApi transformers ]; meta = { homepage = "https://github.com/meteficha/crypto-conduit"; diff --git a/pkgs/development/libraries/haskell/filesystem-conduit/default.nix b/pkgs/development/libraries/haskell/filesystem-conduit/default.nix index fd20b7c7547d..681ee6820739 100644 --- a/pkgs/development/libraries/haskell/filesystem-conduit/default.nix +++ b/pkgs/development/libraries/haskell/filesystem-conduit/default.nix @@ -3,8 +3,8 @@ cabal.mkDerivation (self: { pname = "filesystem-conduit"; - version = "0.5.0.2"; - sha256 = "0vpxl32k6734vli8nky9cwyabw9alvpjm0g5q822yj9rk2439yfq"; + version = "1.0.0"; + sha256 = "1fz3iihcqpg6m3svjqdg8lvkpza955qn8cbs9b3w333vxkglhi6v"; buildDepends = [ conduit systemFileio systemFilepath text transformers ]; diff --git a/pkgs/development/libraries/haskell/hamlet/default.nix b/pkgs/development/libraries/haskell/hamlet/default.nix index 39df11063ada..28881da84c38 100644 --- a/pkgs/development/libraries/haskell/hamlet/default.nix +++ b/pkgs/development/libraries/haskell/hamlet/default.nix @@ -4,12 +4,11 @@ cabal.mkDerivation (self: { pname = "hamlet"; - version = "1.1.6.2"; - sha256 = "00asrmyb4k9xpsbwwafm3rj1lisssrc3hj3dsr827w9x86xxargy"; + version = "1.1.6.3"; + sha256 = "1kpj8j47licmdf364n0fn5908hsl6ib1wkiqhcx3m0nimb7pjnss"; buildDepends = [ blazeBuilder blazeHtml blazeMarkup failure parsec shakespeare text ]; - jailbreak = true; meta = { homepage = "http://www.yesodweb.com/book/shakespearean-templates"; description = "Haml-like template files that are compile-time checked"; diff --git a/pkgs/development/libraries/haskell/highlighting-kate/default.nix b/pkgs/development/libraries/haskell/highlighting-kate/default.nix index ef46b12747b1..805519d3d30c 100644 --- a/pkgs/development/libraries/haskell/highlighting-kate/default.nix +++ b/pkgs/development/libraries/haskell/highlighting-kate/default.nix @@ -2,13 +2,12 @@ cabal.mkDerivation (self: { pname = "highlighting-kate"; - version = "0.5.3.6"; - sha256 = "0ypgw56gaa2hvh05ks079lfcaaynki3da471g39f23m3scgkawlr"; + version = "0.5.3.7"; + sha256 = "04wa1al83v5ak6gvrwqy2b63mda0qfi2ircxfs9ddk1gkdscrlrl"; isLibrary = true; isExecutable = true; buildDepends = [ blazeHtml filepath mtl parsec regexPcre ]; prePatch = "sed -i -e 's|regex-pcre-builtin|regex-pcre|' highlighting-kate.cabal"; - jailbreak = true; meta = { homepage = "http://github.com/jgm/highlighting-kate"; description = "Syntax highlighting"; diff --git a/pkgs/development/libraries/haskell/hjsmin/default.nix b/pkgs/development/libraries/haskell/hjsmin/default.nix index 58720e33f7b9..6538e17c41ab 100644 --- a/pkgs/development/libraries/haskell/hjsmin/default.nix +++ b/pkgs/development/libraries/haskell/hjsmin/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "hjsmin"; - version = "0.1.4"; - sha256 = "1w4w560p7xy3lci36xy01dpwl0hhf9iv8gy4ldqvh33931pkxhxn"; + version = "0.1.4.1"; + sha256 = "0r73hd6kn37mdbm2i3g6v3qqm696kyflqs6ajq68qr5sr62sjb1a"; buildDepends = [ blazeBuilder languageJavascript text ]; meta = { homepage = "http://github.com/alanz/hjsmin"; diff --git a/pkgs/development/libraries/haskell/hoogle/default.nix b/pkgs/development/libraries/haskell/hoogle/default.nix index 153cee7db75a..a54802ef9b00 100644 --- a/pkgs/development/libraries/haskell/hoogle/default.nix +++ b/pkgs/development/libraries/haskell/hoogle/default.nix @@ -14,6 +14,7 @@ cabal.mkDerivation (self: { haskellSrcExts httpTypes parsec random safe tagsoup time transformers uniplate wai warp ]; + jailbreak = true; meta = { homepage = "http://www.haskell.org/hoogle/"; description = "Haskell API Search"; diff --git a/pkgs/development/libraries/haskell/html-conduit/default.nix b/pkgs/development/libraries/haskell/html-conduit/default.nix index 28216a54815c..ff4b03c1e6ab 100644 --- a/pkgs/development/libraries/haskell/html-conduit/default.nix +++ b/pkgs/development/libraries/haskell/html-conduit/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "html-conduit"; - version = "0.1.0.4"; - sha256 = "1g217856dz1ad545slk020n5w0la4yyd5ygva2gg2g0999padi78"; + version = "1.1.0"; + sha256 = "11mkr7plhbn8kyki0h362habzhsnlb7yrg4ypy48d0l3i7p7vm53"; buildDepends = [ conduit filesystemConduit resourcet systemFilepath tagstreamConduit text transformers xmlConduit xmlTypes diff --git a/pkgs/development/libraries/haskell/http-conduit/default.nix b/pkgs/development/libraries/haskell/http-conduit/default.nix index 544f6c0d6747..ebb44f1512b3 100644 --- a/pkgs/development/libraries/haskell/http-conduit/default.nix +++ b/pkgs/development/libraries/haskell/http-conduit/default.nix @@ -9,8 +9,8 @@ cabal.mkDerivation (self: { pname = "http-conduit"; - version = "1.8.7.1"; - sha256 = "1m0f9snc2zxj8hvxw3ngw0h78ckvdlxxfjvrryk93blfwbamssi5"; + version = "1.8.9"; + sha256 = "0v99nc29h4qm1dbs7bwk4nwhxwk22vzl4ghrq9r3vishi6gwr7hb"; buildDepends = [ asn1Data attoparsec attoparsecConduit base64Bytestring blazeBuilder blazeBuilderConduit caseInsensitive certificate conduit cookie diff --git a/pkgs/development/libraries/haskell/http-reverse-proxy/default.nix b/pkgs/development/libraries/haskell/http-reverse-proxy/default.nix index 05e97291f378..618438e927f6 100644 --- a/pkgs/development/libraries/haskell/http-reverse-proxy/default.nix +++ b/pkgs/development/libraries/haskell/http-reverse-proxy/default.nix @@ -5,8 +5,8 @@ cabal.mkDerivation (self: { pname = "http-reverse-proxy"; - version = "0.1.1.2"; - sha256 = "179j6zfmx3g6gc7mzhzhl7ymxkijg9vahjvwjwm0wm15vna52iqa"; + version = "0.1.1.3"; + sha256 = "0z2h2xbvg034snfh3hzc0v2zp5j57lcak2h4vz10lwaqr3jxqnpn"; buildDepends = [ blazeBuilder caseInsensitive classyPrelude conduit dataDefault httpConduit httpTypes liftedBase monadControl network diff --git a/pkgs/development/libraries/haskell/monad-logger/default.nix b/pkgs/development/libraries/haskell/monad-logger/default.nix index 97078f2fb84f..173529b443d4 100644 --- a/pkgs/development/libraries/haskell/monad-logger/default.nix +++ b/pkgs/development/libraries/haskell/monad-logger/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "monad-logger"; - version = "0.2.3.2"; - sha256 = "0b5jfmzmsb7pdawcm5i74sy934q2d78pjs39invas502kx5bxzk5"; + version = "0.3.0.1"; + sha256 = "05pwccs2f5qn22cwvzaiw6bflyxl3avrl89y737rjcsw6755r5sr"; buildDepends = [ conduit fastLogger monadControl mtl resourcet text transformers transformersBase diff --git a/pkgs/development/libraries/haskell/network-conduit/default.nix b/pkgs/development/libraries/haskell/network-conduit/default.nix index a56c35a214ba..67d44bd1ebb5 100644 --- a/pkgs/development/libraries/haskell/network-conduit/default.nix +++ b/pkgs/development/libraries/haskell/network-conduit/default.nix @@ -3,8 +3,8 @@ cabal.mkDerivation (self: { pname = "network-conduit"; - version = "0.6.2.2"; - sha256 = "1v8abhw977hr78hkshrbxy04abbbhafvvnhr4xxgqc0phwch02mc"; + version = "1.0.0"; + sha256 = "16kgg6wkpl10kcwfijm9iqi7r5gababaymxyhmjab6axfzknppk3"; buildDepends = [ conduit liftedBase monadControl network transformers ]; diff --git a/pkgs/development/libraries/haskell/persistent-postgresql/default.nix b/pkgs/development/libraries/haskell/persistent-postgresql/default.nix index 638f2e2c3bfc..52c74af4d4d9 100644 --- a/pkgs/development/libraries/haskell/persistent-postgresql/default.nix +++ b/pkgs/development/libraries/haskell/persistent-postgresql/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "persistent-postgresql"; - version = "1.1.3"; - sha256 = "0dxazkdck2l5wxiyd7lcgd4xj95c7ql067s5hi3w1k89jf1wcx12"; + version = "1.1.3.1"; + sha256 = "1lbr4x45hzk73439x6is9zw6y3mqy1ivmblncvg70kzw0kmjhpnk"; buildDepends = [ aeson conduit monadControl persistent postgresqlLibpq postgresqlSimple text time transformers diff --git a/pkgs/development/libraries/haskell/persistent-sqlite/default.nix b/pkgs/development/libraries/haskell/persistent-sqlite/default.nix index 17b9a6664364..418c8c4ca741 100644 --- a/pkgs/development/libraries/haskell/persistent-sqlite/default.nix +++ b/pkgs/development/libraries/haskell/persistent-sqlite/default.nix @@ -1,13 +1,13 @@ -{ cabal, aeson, conduit, monadControl, persistent, text -, transformers +{ cabal, aeson, conduit, monadControl, monadLogger, persistent +, text, transformers }: cabal.mkDerivation (self: { pname = "persistent-sqlite"; - version = "1.1.3"; - sha256 = "0rhwq9s6w48y867dmy5c0kvgrh9ixy3sqwq1i2zfacak82r6kki1"; + version = "1.1.4"; + sha256 = "1xllj5bq7rw9v32ddm515705nviarw0hp4yxj0z8jf5q5jdz2vz0"; buildDepends = [ - aeson conduit monadControl persistent text transformers + aeson conduit monadControl monadLogger persistent text transformers ]; meta = { homepage = "http://www.yesodweb.com/book/persistent"; diff --git a/pkgs/development/libraries/haskell/persistent-template/default.nix b/pkgs/development/libraries/haskell/persistent-template/default.nix index 284c7116ce6c..2816a38c4130 100644 --- a/pkgs/development/libraries/haskell/persistent-template/default.nix +++ b/pkgs/development/libraries/haskell/persistent-template/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "persistent-template"; - version = "1.1.2.2"; - sha256 = "168cxlnpcgkm7m7kzl3zlcvpgdl9wz7vx3anw8z8pc50qjns8dy0"; + version = "1.1.2.4"; + sha256 = "0fsqyv5r6h356shmah6bs75fzds0fsmyizbnvj5ywzhc003jv5h9"; buildDepends = [ aeson monadControl persistent text transformers ]; meta = { homepage = "http://www.yesodweb.com/book/persistent"; diff --git a/pkgs/development/libraries/haskell/persistent/default.nix b/pkgs/development/libraries/haskell/persistent/default.nix index 3babf8727354..f7812a2692da 100644 --- a/pkgs/development/libraries/haskell/persistent/default.nix +++ b/pkgs/development/libraries/haskell/persistent/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "persistent"; - version = "1.1.5"; - sha256 = "0jk4vkisc4as6xi0glc0sdldqf4xdj3s5xvv2vwzgjliyalggxga"; + version = "1.1.5.1"; + sha256 = "1ds0q3mzgg60makx7impyxsvpzd3issa89igcy176yb54ypjwfnz"; buildDepends = [ aeson attoparsec base64Bytestring blazeHtml blazeMarkup conduit liftedBase monadControl monadLogger pathPieces poolConduit diff --git a/pkgs/development/libraries/haskell/publicsuffixlist/default.nix b/pkgs/development/libraries/haskell/publicsuffixlist/default.nix new file mode 100644 index 000000000000..53b7062cd0d8 --- /dev/null +++ b/pkgs/development/libraries/haskell/publicsuffixlist/default.nix @@ -0,0 +1,14 @@ +{ cabal, cereal, dataDefault, text, utf8String }: + +cabal.mkDerivation (self: { + pname = "publicsuffixlist"; + version = "0.0.3"; + sha256 = "1drsm1zp30629rzy0693ggzcx46b7ydzzafmf07mjanmn1kyyqci"; + buildDepends = [ cereal dataDefault text utf8String ]; + meta = { + homepage = "https://github.com/litherum/publicsuffixlist"; + description = "Is a given string a domain suffix?"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/show/default.nix b/pkgs/development/libraries/haskell/show/default.nix index 7fe0013d0d29..411684e4953c 100644 --- a/pkgs/development/libraries/haskell/show/default.nix +++ b/pkgs/development/libraries/haskell/show/default.nix @@ -1,10 +1,10 @@ -{ cabal, QuickCheck, random, smallcheck, syb }: +{ cabal, QuickCheck, random, simpleReflect, smallcheck, syb }: cabal.mkDerivation (self: { pname = "show"; - version = "0.4.1.2"; - sha256 = "1qaphxjaxng7d0kcn3vvxbvqljzzs1hvmsrdsm3pbi19qlsavd5w"; - buildDepends = [ QuickCheck random smallcheck syb ]; + version = "0.5"; + sha256 = "1s9nwhbc1935359r76glirg858c1sg8nfvv0bzzrncrgf0gxcl4f"; + buildDepends = [ QuickCheck random simpleReflect smallcheck syb ]; meta = { description = "'Show' instances for Lambdabot"; license = "GPL"; diff --git a/pkgs/development/libraries/haskell/simple-reflect/default.nix b/pkgs/development/libraries/haskell/simple-reflect/default.nix new file mode 100644 index 000000000000..7a7f40c6d833 --- /dev/null +++ b/pkgs/development/libraries/haskell/simple-reflect/default.nix @@ -0,0 +1,13 @@ +{ cabal }: + +cabal.mkDerivation (self: { + pname = "simple-reflect"; + version = "0.3.1"; + sha256 = "189pc7fk28bwl0mq6hw502kc048n203rb4vpf2wva490r36xiw6s"; + meta = { + homepage = "http://twan.home.fmf.nl/blog/haskell/simple-reflection-of-expressions.details"; + description = "Simple reflection of expressions containing variables"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/simple-sendfile/default.nix b/pkgs/development/libraries/haskell/simple-sendfile/default.nix index 6f858398bc9a..7ecd70f25f7f 100644 --- a/pkgs/development/libraries/haskell/simple-sendfile/default.nix +++ b/pkgs/development/libraries/haskell/simple-sendfile/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "simple-sendfile"; - version = "0.2.10"; - sha256 = "07js189yyya2vs3wsc49b7c2zbh63f48kywmz88g7s394bp3n9am"; + version = "0.2.11"; + sha256 = "1q9m9lxv9jfkn6a1lf07jcl4li3n5996df1qrfkfjq2n0bvn4qfj"; buildDepends = [ network ]; meta = { description = "Cross platform library for the sendfile system call"; diff --git a/pkgs/development/libraries/haskell/skein/default.nix b/pkgs/development/libraries/haskell/skein/default.nix index 1ccedad6d114..cc910711768b 100644 --- a/pkgs/development/libraries/haskell/skein/default.nix +++ b/pkgs/development/libraries/haskell/skein/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "skein"; - version = "0.1.0.11"; - sha256 = "16iy3frzxzkiybl5cglvnmvxzziwr8361s00m7130dh82r3vc21q"; + version = "0.1.0.12"; + sha256 = "1nx0ad0y7zmljc7phwin2aph6frs70hvz3di8q52kzpi5m1h3g3a"; buildDepends = [ cereal cryptoApi tagged ]; meta = { homepage = "https://github.com/meteficha/skein"; diff --git a/pkgs/development/libraries/haskell/smallcheck/default.nix b/pkgs/development/libraries/haskell/smallcheck/default.nix index a11eb501a861..b7b0dc8e974d 100644 --- a/pkgs/development/libraries/haskell/smallcheck/default.nix +++ b/pkgs/development/libraries/haskell/smallcheck/default.nix @@ -1,10 +1,10 @@ -{ cabal, dlist }: +{ cabal, logict, mtl }: cabal.mkDerivation (self: { pname = "smallcheck"; - version = "0.6.2"; - sha256 = "0yz7an3k71ia7sgs8xpkh37xz9ipsnbf13680185cij8llq8zbyr"; - buildDepends = [ dlist ]; + version = "1.0.1"; + sha256 = "1b8g7vgvwyz2smx16gbn73k749mazj2zmr2hjhqj4rk0433i6lpk"; + buildDepends = [ logict mtl ]; meta = { homepage = "https://github.com/feuerbach/smallcheck"; description = "A property-based testing library"; diff --git a/pkgs/development/libraries/haskell/snap/snap.nix b/pkgs/development/libraries/haskell/snap/snap.nix index 7316e519d65e..b87cde894472 100644 --- a/pkgs/development/libraries/haskell/snap/snap.nix +++ b/pkgs/development/libraries/haskell/snap/snap.nix @@ -8,8 +8,8 @@ cabal.mkDerivation (self: { pname = "snap"; - version = "0.11.1"; - sha256 = "0dd66496fjfp80i6whl356sqk7n03rx4ycsah7x11fc9rvplmr3q"; + version = "0.11.2"; + sha256 = "1z9n15dhbxg0j17c1ik0vhdhxy2mz70915xd4jffg9jrdvlky51a"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -19,6 +19,7 @@ cabal.mkDerivation (self: { snapCore snapServer stm syb text time transformers unorderedContainers vector vectorAlgorithms xmlhtml ]; + jailbreak = true; meta = { homepage = "http://snapframework.com/"; description = "Top-level package for the Snap Web Framework"; diff --git a/pkgs/development/libraries/haskell/socks/default.nix b/pkgs/development/libraries/haskell/socks/default.nix index d1b4494090cb..34e4bf978a4f 100644 --- a/pkgs/development/libraries/haskell/socks/default.nix +++ b/pkgs/development/libraries/haskell/socks/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "socks"; - version = "0.4.2"; - sha256 = "1nbhx2jjij5kjqa0l68s401ach4yziq6w8mvcv589fcscw212w8r"; + version = "0.5.0"; + sha256 = "1lk6yvx5a65nz7z89i0sgqzcqw2v6j645nq15kgbpxhcinfdvqs7"; buildDepends = [ cereal network ]; meta = { homepage = "http://github.com/vincenthz/hs-socks"; diff --git a/pkgs/development/libraries/haskell/tagstream-conduit/default.nix b/pkgs/development/libraries/haskell/tagstream-conduit/default.nix index 84187bb4c1f4..38f4375becdf 100644 --- a/pkgs/development/libraries/haskell/tagstream-conduit/default.nix +++ b/pkgs/development/libraries/haskell/tagstream-conduit/default.nix @@ -1,13 +1,14 @@ -{ cabal, attoparsec, blazeBuilder, blazeBuilderConduit, conduit -, text +{ cabal, attoparsec, attoparsecConduit, blazeBuilder +, blazeBuilderConduit, caseInsensitive, conduit, text, transformers }: cabal.mkDerivation (self: { pname = "tagstream-conduit"; - version = "0.5.3"; - sha256 = "08g34dbb59mrpj0lym5a0zlygvj7in57nkhbk84kxvggrhl0jndl"; + version = "0.5.4"; + sha256 = "1djf66kn3m4sdwmis82f9w2nkmjyrq12zda7ic9pcsvra579868i"; buildDepends = [ - attoparsec blazeBuilder blazeBuilderConduit conduit text + attoparsec attoparsecConduit blazeBuilder blazeBuilderConduit + caseInsensitive conduit text transformers ]; meta = { homepage = "http://github.com/yihuang/tagstream-conduit"; diff --git a/pkgs/development/libraries/haskell/wai-app-static/default.nix b/pkgs/development/libraries/haskell/wai-app-static/default.nix index 8970c1d1042f..36ec82d88c39 100644 --- a/pkgs/development/libraries/haskell/wai-app-static/default.nix +++ b/pkgs/development/libraries/haskell/wai-app-static/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "wai-app-static"; - version = "1.3.1.1"; - sha256 = "0zbkjh2l9qjm4s9z7cm327kdrf58rhasn764pv347ll2n7gphgqq"; + version = "1.3.1.2"; + sha256 = "1i0j3n0cp1zq43g06nb3cxajd4k9isg4chdwzzlyimm078a9w54x"; buildDepends = [ base64Bytestring blazeBuilder blazeHtml blazeMarkup cereal cryptoConduit cryptohash fileEmbed httpDate httpTypes mimeTypes diff --git a/pkgs/development/libraries/haskell/wai-extra/default.nix b/pkgs/development/libraries/haskell/wai-extra/default.nix index 3ba52da0050a..7a4e18b32956 100644 --- a/pkgs/development/libraries/haskell/wai-extra/default.nix +++ b/pkgs/development/libraries/haskell/wai-extra/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "wai-extra"; - version = "1.3.2.3"; - sha256 = "1xqx00s1y87ji8n092f0rq150b3ahl1p4xwas5cl01ayp106ywzs"; + version = "1.3.2.4"; + sha256 = "12hdg5h4bk04nhcmjm5mc62dng9np0dlik4b1w1syd2lxqv6pdb9"; buildDepends = [ ansiTerminal blazeBuilder blazeBuilderConduit caseInsensitive conduit dataDefault dateCache fastLogger httpTypes network diff --git a/pkgs/development/libraries/haskell/wai-test/default.nix b/pkgs/development/libraries/haskell/wai-test/default.nix index d0dc0a5b571a..9995cd6b9770 100644 --- a/pkgs/development/libraries/haskell/wai-test/default.nix +++ b/pkgs/development/libraries/haskell/wai-test/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "wai-test"; - version = "1.3.0.2"; - sha256 = "0awr1wwhky0mbllfdan42shfckmnnf66dji5zx7rhwjdfqvbbhzn"; + version = "1.3.0.4"; + sha256 = "1si54frsn8s8r0ykqc9h571rqbapf82jcvbz8bd49bbylv4j6yy0"; buildDepends = [ blazeBuilder blazeBuilderConduit caseInsensitive conduit cookie httpTypes HUnit text transformers wai diff --git a/pkgs/development/libraries/haskell/wai/default.nix b/pkgs/development/libraries/haskell/wai/default.nix index f1922a95b7e3..deb1090dd4ab 100644 --- a/pkgs/development/libraries/haskell/wai/default.nix +++ b/pkgs/development/libraries/haskell/wai/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "wai"; - version = "1.3.0.3"; - sha256 = "091qykycxfh9f1jysdjxkw4msdgxp796as3yzv9sgqsxvz58rv1n"; + version = "1.4.0"; + sha256 = "1213sib2qp1xafrrnmkxabgkba0g00awy6dx9jnlfkj5r6m32wdq"; buildDepends = [ blazeBuilder conduit httpTypes network text transformers vault ]; diff --git a/pkgs/development/libraries/haskell/warp/default.nix b/pkgs/development/libraries/haskell/warp/default.nix index 135d57f0024c..290e60ff3b71 100644 --- a/pkgs/development/libraries/haskell/warp/default.nix +++ b/pkgs/development/libraries/haskell/warp/default.nix @@ -5,8 +5,8 @@ cabal.mkDerivation (self: { pname = "warp"; - version = "1.3.7.3"; - sha256 = "0k68dqnz0j9x5698sr2yqcxh1bd3ppv2qh2dn4919lrlpzn3xd93"; + version = "1.3.7.4"; + sha256 = "0z043v1fjblbvkn44hzp7j8iawqzbwf67qxq7gsv7jfq1q58xbrx"; buildDepends = [ blazeBuilder blazeBuilderConduit caseInsensitive conduit hashable httpTypes liftedBase network networkConduit simpleSendfile diff --git a/pkgs/development/libraries/haskell/xml-conduit/default.nix b/pkgs/development/libraries/haskell/xml-conduit/default.nix index 452c75e28659..39bcc63248e5 100644 --- a/pkgs/development/libraries/haskell/xml-conduit/default.nix +++ b/pkgs/development/libraries/haskell/xml-conduit/default.nix @@ -6,14 +6,13 @@ cabal.mkDerivation (self: { pname = "xml-conduit"; - version = "1.0.3.3"; - sha256 = "0jw1r4vmcbxj8kgkdj4pgibihcdmbdj15g06i9p8mdklmmd7gqnz"; + version = "1.1.0.2"; + sha256 = "17wv4rngmn8jvg6c3ia48w5q9s9dww9aisrmans9llqs7ks3ndqc"; buildDepends = [ attoparsec attoparsecConduit blazeBuilder blazeBuilderConduit blazeHtml blazeMarkup conduit dataDefault failure monadControl resourcet systemFilepath text transformers xmlTypes ]; - jailbreak = true; meta = { homepage = "http://github.com/snoyberg/xml"; description = "Pure-Haskell utilities for dealing with XML with the conduit package"; diff --git a/pkgs/development/libraries/haskell/xmlhtml/default.nix b/pkgs/development/libraries/haskell/xmlhtml/default.nix index fc6c189db8eb..aff309b184f0 100644 --- a/pkgs/development/libraries/haskell/xmlhtml/default.nix +++ b/pkgs/development/libraries/haskell/xmlhtml/default.nix @@ -4,12 +4,11 @@ cabal.mkDerivation (self: { pname = "xmlhtml"; - version = "0.2.0.3"; - sha256 = "03bwsm3dazc01cwndlm92nr35a4fllsxx17rp72d2vnf1571a1vb"; + version = "0.2.0.4"; + sha256 = "1z40hkq9l6nw3hcnz6d1x0han7ynjkvbvjy8bl5mq7zmhk1xhmr6"; buildDepends = [ blazeBuilder blazeHtml blazeMarkup parsec text unorderedContainers ]; - jailbreak = true; meta = { description = "XML parser and renderer with HTML 5 quirks mode"; license = self.stdenv.lib.licenses.bsd3; diff --git a/pkgs/development/libraries/haskell/yesod-auth/default.nix b/pkgs/development/libraries/haskell/yesod-auth/default.nix index 59eca41fff35..8456aa39a8eb 100644 --- a/pkgs/development/libraries/haskell/yesod-auth/default.nix +++ b/pkgs/development/libraries/haskell/yesod-auth/default.nix @@ -1,6 +1,6 @@ -{ cabal, aeson, authenticate, blazeHtml, blazeMarkup, hamlet -, httpConduit, httpTypes, liftedBase, mimeMail, network, persistent -, persistentTemplate, pureMD5, pwstoreFast, random, SHA +{ cabal, aeson, authenticate, blazeHtml, blazeMarkup, fileEmbed +, hamlet, httpConduit, httpTypes, liftedBase, mimeMail, network +, persistent, persistentTemplate, pureMD5, pwstoreFast, random, SHA , shakespeareCss, shakespeareJs, text, transformers , unorderedContainers, wai, yesodCore, yesodForm, yesodJson , yesodPersistent @@ -8,16 +8,15 @@ cabal.mkDerivation (self: { pname = "yesod-auth"; - version = "1.1.4.1"; - sha256 = "18x2m1clk3nqaap51c6ayxbh5q6v0i4srcphgyf26lrxq514pvad"; + version = "1.1.5.3"; + sha256 = "07srz4zpkn8w382xwi8ri6mh9kgplf0m51819zw1hympphmd9z82"; buildDepends = [ - aeson authenticate blazeHtml blazeMarkup hamlet httpConduit - httpTypes liftedBase mimeMail network persistent persistentTemplate - pureMD5 pwstoreFast random SHA shakespeareCss shakespeareJs text - transformers unorderedContainers wai yesodCore yesodForm yesodJson - yesodPersistent + aeson authenticate blazeHtml blazeMarkup fileEmbed hamlet + httpConduit httpTypes liftedBase mimeMail network persistent + persistentTemplate pureMD5 pwstoreFast random SHA shakespeareCss + shakespeareJs text transformers unorderedContainers wai yesodCore + yesodForm yesodJson yesodPersistent ]; - jailbreak = true; meta = { homepage = "http://www.yesodweb.com/"; description = "Authentication for Yesod"; diff --git a/pkgs/development/libraries/haskell/yesod-core/default.nix b/pkgs/development/libraries/haskell/yesod-core/default.nix index 6ddbaa13eff4..e2a36c2f1843 100644 --- a/pkgs/development/libraries/haskell/yesod-core/default.nix +++ b/pkgs/development/libraries/haskell/yesod-core/default.nix @@ -9,8 +9,8 @@ cabal.mkDerivation (self: { pname = "yesod-core"; - version = "1.1.8.1"; - sha256 = "1bkqh8k7wwyj5s8pyxmlc1lrz47rz1mj49mqmpbislkjk0p6hbks"; + version = "1.1.8.2"; + sha256 = "0brrvij1vldb5zr3vnynikaf1x479qrgf7k3162nhrmwl57lm9sz"; buildDepends = [ aeson blazeBuilder blazeHtml blazeMarkup caseInsensitive cereal clientsession conduit cookie failure fastLogger hamlet httpTypes @@ -19,7 +19,6 @@ cabal.mkDerivation (self: { text time transformers transformersBase vector wai waiExtra yesodRoutes ]; - jailbreak = true; meta = { homepage = "http://www.yesodweb.com/"; description = "Creation of type-safe, RESTful web applications"; diff --git a/pkgs/development/libraries/haskell/yesod-default/default.nix b/pkgs/development/libraries/haskell/yesod-default/default.nix index 65a86b46cca3..b0e720ff4879 100644 --- a/pkgs/development/libraries/haskell/yesod-default/default.nix +++ b/pkgs/development/libraries/haskell/yesod-default/default.nix @@ -5,8 +5,8 @@ cabal.mkDerivation (self: { pname = "yesod-default"; - version = "1.1.3.1"; - sha256 = "16kxq93q5q6bz47s1rfgswrygyp1g090b8r11n56r8mnr24ix0mi"; + version = "1.1.3.2"; + sha256 = "07gm9sj4c231wdmfmb7df1s8wvqa6fw7nhcq554h16h2ibv5pcqg"; buildDepends = [ dataDefault hamlet networkConduit safe shakespeareCss shakespeareJs text transformers unorderedContainers wai waiExtra warp yaml diff --git a/pkgs/development/libraries/haskell/yesod-form/default.nix b/pkgs/development/libraries/haskell/yesod-form/default.nix index 0e9999532a0c..d853e217a7f8 100644 --- a/pkgs/development/libraries/haskell/yesod-form/default.nix +++ b/pkgs/development/libraries/haskell/yesod-form/default.nix @@ -6,15 +6,14 @@ cabal.mkDerivation (self: { pname = "yesod-form"; - version = "1.2.1.2"; - sha256 = "121c6ln8y6l2f9n6pjs2nrghz7w94pb34vp12cj8fabc71vk029j"; + version = "1.2.1.3"; + sha256 = "1mrqr6pfrhkk0vv9lhd4wxiic8d1hsraiqmjcqsfbpdyrc6fqypq"; buildDepends = [ aeson attoparsec blazeBuilder blazeHtml blazeMarkup cryptoApi dataDefault emailValidate hamlet network persistent shakespeareCss shakespeareJs text time transformers wai xssSanitize yesodCore yesodPersistent ]; - jailbreak = true; meta = { homepage = "http://www.yesodweb.com/"; description = "Form handling support for Yesod Web Framework"; diff --git a/pkgs/development/libraries/haskell/yesod-static/default.nix b/pkgs/development/libraries/haskell/yesod-static/default.nix index 5af1efc31f25..a661a83c7318 100644 --- a/pkgs/development/libraries/haskell/yesod-static/default.nix +++ b/pkgs/development/libraries/haskell/yesod-static/default.nix @@ -5,8 +5,8 @@ cabal.mkDerivation (self: { pname = "yesod-static"; - version = "1.1.2.1"; - sha256 = "0hpab9sgm6pa0lw2nl1p6l4gl3ciscsc21q0d2cp3aa75gavyrjz"; + version = "1.1.2.2"; + sha256 = "1z1afpr9xbclpwswlbys7f7w8761vvr06hxhqhnqfzf4ky8g3671"; buildDepends = [ base64Bytestring cereal conduit cryptoConduit cryptohash fileEmbed httpTypes systemFilepath text transformers unixCompat wai diff --git a/pkgs/development/libraries/haskell/yesod/default.nix b/pkgs/development/libraries/haskell/yesod/default.nix index dc412ca9a9ee..ebb46f68bc82 100644 --- a/pkgs/development/libraries/haskell/yesod/default.nix +++ b/pkgs/development/libraries/haskell/yesod/default.nix @@ -12,8 +12,8 @@ cabal.mkDerivation (self: { pname = "yesod"; - version = "1.1.8.1"; - sha256 = "01s9b0pqqj7q760vm62ni95k5fqwccw8l6531kqav2vnfvi08ric"; + version = "1.1.9"; + sha256 = "0fcvf0bg7dsrka639q20dncinqq0fdv21zyvwpx63qfcmilhmjlm"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -27,7 +27,6 @@ cabal.mkDerivation (self: { yesodAuth yesodCore yesodDefault yesodForm yesodJson yesodPersistent zlib ]; - jailbreak = true; meta = { homepage = "http://www.yesodweb.com/"; description = "Creation of type-safe, RESTful web applications"; diff --git a/pkgs/development/libraries/haskell/zlib-conduit/default.nix b/pkgs/development/libraries/haskell/zlib-conduit/default.nix index e902cce44e5f..cf62afc6c013 100644 --- a/pkgs/development/libraries/haskell/zlib-conduit/default.nix +++ b/pkgs/development/libraries/haskell/zlib-conduit/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "zlib-conduit"; - version = "0.5.0.3"; - sha256 = "05rlbyxcwq952psbfp94irmygabqxyf1kkm80pwdanlaaky03nsb"; + version = "1.0.0"; + sha256 = "0q0l4qw1f2cwjj71n4i082ba47x1xba695q8xk0ky2vw5s8cg0bv"; buildDepends = [ conduit transformers void zlibBindings ]; meta = { homepage = "http://github.com/snoyberg/conduit"; diff --git a/pkgs/development/libraries/neon/0.26.nix b/pkgs/development/libraries/neon/0.26.nix deleted file mode 100644 index 6b06e54e73d6..000000000000 --- a/pkgs/development/libraries/neon/0.26.nix +++ /dev/null @@ -1,33 +0,0 @@ -{ stdenv, fetchurl, libxml2, pkgconfig -, compressionSupport ? true, zlib ? null -, sslSupport ? true, openssl ? null -}: - -assert compressionSupport -> zlib != null; -assert sslSupport -> openssl != null; - -stdenv.mkDerivation { - name = "neon-0.26.4"; - - src = fetchurl { - url = http://www.webdav.org/neon/neon-0.26.4.tar.gz; - sha256 = "1pjrn5wb18gy419293hmwd02blmh36aaxsrgajm9nkkkjzqakncj"; - }; - - buildInputs = [libxml2] - ++ stdenv.lib.optional compressionSupport zlib - ++ (if sslSupport then [ openssl pkgconfig ] else []); - - configureFlags = '' - ${if compressionSupport then "--with-zlib" else "--without-zlib"} - ${if sslSupport then "--with-ssl" else "--without-ssl"} - --enable-shared - ''; - - passthru = {inherit compressionSupport sslSupport;}; - - meta = { - description = "An HTTP and WebDAV client library"; - homepage = http://www.webdav.org/neon/; - }; -} diff --git a/pkgs/development/libraries/neon/0.28.nix b/pkgs/development/libraries/neon/0.28.nix deleted file mode 100644 index 8e717ff52d82..000000000000 --- a/pkgs/development/libraries/neon/0.28.nix +++ /dev/null @@ -1,37 +0,0 @@ -{ stdenv, fetchurl, libxml2, pkgconfig -, compressionSupport ? true, zlib ? null -, sslSupport ? true, openssl ? null -, static ? false -, shared ? true -}: - -assert compressionSupport -> zlib != null; -assert sslSupport -> openssl != null; -assert static || shared; - -stdenv.mkDerivation rec { - name = "neon-0.28.6"; - - src = fetchurl { - url = "http://www.webdav.org/neon/${name}.tar.gz"; - sha256 = "03ncisn1iziz79vw678wsrv8jf63m2szd2qml5baj53slcd8pvh6"; - }; - - buildInputs = [libxml2 pkgconfig openssl] - ++ stdenv.lib.optional compressionSupport zlib; - - configureFlags = '' - ${if shared then "--enable-shared" else "--disable-shared"} - ${if static then "--enable-static" else "--disable-static"} - ${if compressionSupport then "--with-zlib" else "--without-zlib"} - ${if sslSupport then "--with-ssl" else "--without-ssl"} - --enable-shared - ''; - - passthru = {inherit compressionSupport sslSupport;}; - - meta = { - description = "An HTTP and WebDAV client library"; - homepage = http://www.webdav.org/neon/; - }; -} diff --git a/pkgs/development/libraries/neon/0.29.nix b/pkgs/development/libraries/neon/default.nix index ffc409d271e0..ffc409d271e0 100644 --- a/pkgs/development/libraries/neon/0.29.nix +++ b/pkgs/development/libraries/neon/default.nix diff --git a/pkgs/development/libraries/physfs/default.nix b/pkgs/development/libraries/physfs/default.nix index 501516e8a5b5..16fb46d1698a 100644 --- a/pkgs/development/libraries/physfs/default.nix +++ b/pkgs/development/libraries/physfs/default.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl, cmake}: stdenv.mkDerivation rec { - name = "physfs-2.0.2"; + name = "physfs-2.0.3"; src = fetchurl { - url = "${meta.homepage}/downloads/${name}.tar.gz"; - sha256 = "02dwy0vsn2dp31f15vxd3yxxr1rgy25ab7ncavyh73i290qnsadf"; + url = "${meta.homepage}/downloads/${name}.tar.bz2"; + sha256 = "0sbbyqzqhyf0g68fcvvv20n3928j0x6ik1njmhn1yigvq2bj11na"; }; nativeBuildInputs = [ cmake ]; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = http://icculus.org/physfs/; + homepage = "http://icculus.org/physfs/"; description = "Library to provide abstract access to various archives"; license = "free"; }; diff --git a/pkgs/development/tools/misc/openocd/default.nix b/pkgs/development/tools/misc/openocd/default.nix index 4b01c9d33e8e..5c0b1a3b101e 100644 --- a/pkgs/development/tools/misc/openocd/default.nix +++ b/pkgs/development/tools/misc/openocd/default.nix @@ -1,39 +1,22 @@ {stdenv, fetchurl, libftdi}: -let - # The "GuruPlug installer" from Marvell. See - # <http://www.plugcomputer.org/index.php/us/resources/downloads?func=select&id=16>, - # linked from <http://www.globalscaletechnologies.com/t-downloads.aspx>. - guruplug_installer = fetchurl { - url = "http://www.plugcomputer.org/index.php/us/resources/downloads?func=download&id=65&chk=d6878f4bf86070f7b4f7bc93317fcb0f&no_html=1"; - sha256 = "1nps9li9k1kxb31f9x6d114hh0a3bx886abvgh8vg004ni996hlv"; - name = "guruplug-installer.tar.gz"; - }; -in -stdenv.mkDerivation { - name = "openocd-0.4.0"; +stdenv.mkDerivation rec { + name = "openocd-${version}"; + version = "0.6.1"; src = fetchurl { - url = "http://download.berlios.de/openocd/openocd-0.4.0.tar.bz2"; - sha256 = "1c9j8s3mqgw5spv6nd4lqfkd1l9jmjipi0ya054vnjfsy2617kzv"; + url = "http://downloads.sourceforge.net/project/openocd/openocd/${version}/openocd-${version}.tar.bz2"; + sha256 = "0argjhff9x4ilgycics61kfgkvb6kkkhhhmj3fxcyydd8mscri7l"; }; - configureFlags = [ "--enable-ft2232_libftdi" "--disable-werror" ]; + configureFlags = [ "--enable-ft2232_libftdi" + "--enable-jlink" + "--enable-rlink" + "--enable-ulink" + "--enable-stlink" ]; buildInputs = [ libftdi ]; - # Copy the GuruPlug stuff. - # XXX: Unfortunately, these files were written for OpenOCD 0.2.0 and don't - # work with 0.4.0. - # postInstall = - # '' tar xf "${guruplug_installer}" - # for dir in interface target board - # do - # cp -v "guruplug-installer/openocd/$dir/"* \ - # "$out/share/openocd/scripts/$dir/" - # done - # ''; - meta = { homepage = http://openocd.berlios.de; description = "OpenOCD, an on-chip debugger"; diff --git a/pkgs/development/tools/parsing/alex/3.0.4.nix b/pkgs/development/tools/parsing/alex/3.0.4.nix new file mode 100644 index 000000000000..bc82079aa791 --- /dev/null +++ b/pkgs/development/tools/parsing/alex/3.0.4.nix @@ -0,0 +1,18 @@ +{ cabal, perl, QuickCheck }: + +cabal.mkDerivation (self: { + pname = "alex"; + version = "3.0.4"; + sha256 = "0fgh7ziwxyb140wghh7dpndh41sixcssnba0q942cvkg77m6ah6d"; + isLibrary = false; + isExecutable = true; + buildDepends = [ QuickCheck ]; + buildTools = [ perl ]; + meta = { + homepage = "http://www.haskell.org/alex/"; + description = "Alex is a tool for generating lexical analysers in Haskell"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + maintainers = [ self.stdenv.lib.maintainers.andres ]; + }; +}) |