diff options
author | Rickard Nilsson <rickynils@gmail.com> | 2013-01-20 16:53:21 +0100 |
---|---|---|
committer | Rickard Nilsson <rickynils@gmail.com> | 2013-01-20 16:53:21 +0100 |
commit | 1886d1db6a962578bd802e820a1279b4aed3333a (patch) | |
tree | 4b938608821b25f0b972c80a837b8f8f35becc1f /pkgs/development | |
parent | d1c548cdd728961350f6ee4a65d597df3b1ebe61 (diff) | |
parent | e185691ced86fc517a2daea762d7d11e525c6ae8 (diff) | |
download | nixlib-1886d1db6a962578bd802e820a1279b4aed3333a.tar nixlib-1886d1db6a962578bd802e820a1279b4aed3333a.tar.gz nixlib-1886d1db6a962578bd802e820a1279b4aed3333a.tar.bz2 nixlib-1886d1db6a962578bd802e820a1279b4aed3333a.tar.lz nixlib-1886d1db6a962578bd802e820a1279b4aed3333a.tar.xz nixlib-1886d1db6a962578bd802e820a1279b4aed3333a.tar.zst nixlib-1886d1db6a962578bd802e820a1279b4aed3333a.zip |
Merge remote-tracking branch 'upstream/master' into stdenv-updates
Diffstat (limited to 'pkgs/development')
17 files changed, 64 insertions, 50 deletions
diff --git a/pkgs/development/compilers/fpc/lazarus.nix b/pkgs/development/compilers/fpc/lazarus.nix index e2a9fd128e98..a2863663bea9 100644 --- a/pkgs/development/compilers/fpc/lazarus.nix +++ b/pkgs/development/compilers/fpc/lazarus.nix @@ -38,8 +38,8 @@ rec { name = "lazarus-${version}"; meta = { description = "Lazarus graphical IDE for FreePascal language"; - homepage = http://www.lazarus.freepascal.org ; + homepage = http://www.lazarus.freepascal.org; maintainers = [args.lib.maintainers.raskin]; - platforms = args.lib.platforms.linux; + #platforms = args.lib.platforms.linux; }; } diff --git a/pkgs/development/compilers/opa/default.nix b/pkgs/development/compilers/opa/default.nix index 2a54b90dda98..68413e3e25d1 100644 --- a/pkgs/development/compilers/opa/default.nix +++ b/pkgs/development/compilers/opa/default.nix @@ -48,13 +48,12 @@ stdenv.mkDerivation rec { ''; meta = { - description = "Opa is a concise and elegant language for writing distributed web applications. Both client and server sides."; + description = "A concise and elegant language for writing distributed web applications"; longDescription = '' - Opa is a new generation of web development platform that lets you write distributed - web applications using a single technology. Among the the many features of Opa are these: - Opa is concise, simple, concurrent, dynamically distributed, and secure. + Opa is a new generation of web development platform that lets you write distributed + web applications using a single technology. Among the the many features of Opa are these: + Opa is concise, simple, concurrent, dynamically distributed, and secure. ''; - homepage = http://opalang.org/; license = stdenv.lib.licenses.gpl3; maintainers = [ stdenv.lib.maintainers.kkallio ]; diff --git a/pkgs/development/libraries/haskell/certificate/default.nix b/pkgs/development/libraries/haskell/certificate/default.nix index eb40a4744f9c..036e7ddc124c 100644 --- a/pkgs/development/libraries/haskell/certificate/default.nix +++ b/pkgs/development/libraries/haskell/certificate/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "certificate"; - version = "1.3.3"; - sha256 = "043xj3xd6cfnbg9hw2f8agckww3fasvraa72jw84zqc7l2gq0rq2"; + version = "1.3.5"; + sha256 = "17g2alyib89y2k8jjg4b6jskz0ndpr92yi8hzra7vw7ygfi5mi4j"; isLibrary = true; isExecutable = true; buildDepends = [ diff --git a/pkgs/development/libraries/haskell/hakyll/default.nix b/pkgs/development/libraries/haskell/hakyll/default.nix index 9b708eff0203..2824234ede3c 100644 --- a/pkgs/development/libraries/haskell/hakyll/default.nix +++ b/pkgs/development/libraries/haskell/hakyll/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "hakyll"; - version = "4.0.0.0"; - sha256 = "165r9x158nnnwzd1cxymskkxvfhxsnpam8bi3gjy8bql8arsibzr"; + version = "4.1.1.0"; + sha256 = "0v0c2hbwnd56q3vwrf9515v85yn2k850z9jd8y8kj2i79wh7l3dz"; isLibrary = true; isExecutable = true; buildDepends = [ diff --git a/pkgs/development/libraries/haskell/highlighting-kate/default.nix b/pkgs/development/libraries/haskell/highlighting-kate/default.nix index cc591acf2022..afb6a4be662a 100644 --- a/pkgs/development/libraries/haskell/highlighting-kate/default.nix +++ b/pkgs/development/libraries/haskell/highlighting-kate/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "highlighting-kate"; - version = "0.5.3.4"; - sha256 = "1xm9dr71qna1w65vzaf63hbchpvshfjvvs5038sy04x2ddwdix77"; + version = "0.5.3.5"; + sha256 = "0m76h33igw77ndllgzkqgmygi7krc5vfjvizidsgris0zd1g2yv3"; isLibrary = true; isExecutable = true; buildDepends = [ blazeHtml filepath mtl parsec regexPcre ]; diff --git a/pkgs/development/libraries/haskell/hs-bibutils/default.nix b/pkgs/development/libraries/haskell/hs-bibutils/default.nix index 8acb621fe3f0..b9f3eb3cb8e5 100644 --- a/pkgs/development/libraries/haskell/hs-bibutils/default.nix +++ b/pkgs/development/libraries/haskell/hs-bibutils/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "hs-bibutils"; - version = "4.15"; - sha256 = "1h2vqi6ymhx9wpfv5qzvq4fhc4iand93shsncp8nszk64acmz9z9"; + version = "4.16"; + sha256 = "0501fqv0xlwdmpg65s3rr0fns6gqq15x2zq2a8915n3dvipfkixb"; buildDepends = [ syb ]; meta = { homepage = "http://gorgias.mine.nu/repos/hs-bibutils/"; diff --git a/pkgs/development/libraries/haskell/http-conduit/default.nix b/pkgs/development/libraries/haskell/http-conduit/default.nix index 5009d4132de9..b9f47b440068 100644 --- a/pkgs/development/libraries/haskell/http-conduit/default.nix +++ b/pkgs/development/libraries/haskell/http-conduit/default.nix @@ -1,21 +1,23 @@ { cabal, asn1Data, attoparsec, attoparsecConduit, base64Bytestring , blazeBuilder, blazeBuilderConduit, caseInsensitive, certificate , conduit, cookie, cprngAes, dataDefault, deepseq, failure -, httpTypes, liftedBase, monadControl, mtl, network, regexCompat -, resourcet, socks, text, time, tls, tlsExtra, transformers -, transformersBase, utf8String, void, zlibConduit +, filepath, httpTypes, liftedBase, mimeTypes, monadControl, mtl +, network, random, regexCompat, resourcet, socks, text, time, tls +, tlsExtra, transformers, transformersBase, utf8String, void +, zlibConduit }: cabal.mkDerivation (self: { pname = "http-conduit"; - version = "1.8.6.3"; - sha256 = "0ykwfii3qcj77ai0jafgbf5017mckz51gmbk3m8kwm1z6dalb27r"; + version = "1.8.7"; + sha256 = "12v5rxp4dx6glyijygpp7r7b5b6mscclgfp2cbii78m3hgld097i"; buildDepends = [ asn1Data attoparsec attoparsecConduit base64Bytestring blazeBuilder blazeBuilderConduit caseInsensitive certificate conduit cookie - cprngAes dataDefault deepseq failure httpTypes liftedBase - monadControl mtl network regexCompat resourcet socks text time tls - tlsExtra transformers transformersBase utf8String void zlibConduit + cprngAes dataDefault deepseq failure filepath httpTypes liftedBase + mimeTypes monadControl mtl network random regexCompat resourcet + socks text time tls tlsExtra transformers transformersBase + utf8String void zlibConduit ]; meta = { homepage = "http://www.yesodweb.com/book/http-conduit"; diff --git a/pkgs/development/libraries/haskell/pandoc-types/default.nix b/pkgs/development/libraries/haskell/pandoc-types/default.nix index 6dfbc1fc15ff..d4f49791d306 100644 --- a/pkgs/development/libraries/haskell/pandoc-types/default.nix +++ b/pkgs/development/libraries/haskell/pandoc-types/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "pandoc-types"; - version = "1.9.1"; - sha256 = "1174nkaig0g71n3kqrhgqn7xmr9rni3l3dh1xpypc0ksjm0ym21i"; + version = "1.10"; + sha256 = "1xbqvgb95h0jhqx2y0jzds3xvycx5gwi3xn6agdmfkg7xhx9hnz6"; buildDepends = [ syb ]; meta = { homepage = "http://johnmacfarlane.net/pandoc"; diff --git a/pkgs/development/libraries/haskell/pandoc/default.nix b/pkgs/development/libraries/haskell/pandoc/default.nix index b3bfbc50b5f4..98f4dfb05016 100644 --- a/pkgs/development/libraries/haskell/pandoc/default.nix +++ b/pkgs/development/libraries/haskell/pandoc/default.nix @@ -1,20 +1,20 @@ { cabal, base64Bytestring, blazeHtml, blazeMarkup, citeprocHs -, extensibleExceptions, filepath, highlightingKate, HTTP, json, mtl -, network, pandocTypes, parsec, random, syb, tagsoup, temporary -, texmath, time, utf8String, xml, zipArchive, zlib +, dataDefault, extensibleExceptions, filepath, highlightingKate +, HTTP, json, mtl, network, pandocTypes, parsec, random, syb +, tagsoup, temporary, texmath, text, time, xml, zipArchive, zlib }: cabal.mkDerivation (self: { pname = "pandoc"; - version = "1.9.4.5"; - sha256 = "05k8i537756m07xlb6kgshpfxa4sp2jxidb1c8m72ilpai13r6fb"; + version = "1.10"; + sha256 = "11zvyzn16zckgs1zzhl415y14nziw16zhgghg31a459d1ww7c3dg"; isLibrary = true; isExecutable = true; buildDepends = [ - base64Bytestring blazeHtml blazeMarkup citeprocHs + base64Bytestring blazeHtml blazeMarkup citeprocHs dataDefault extensibleExceptions filepath highlightingKate HTTP json mtl network pandocTypes parsec random syb tagsoup temporary texmath - time utf8String xml zipArchive zlib + text time xml zipArchive zlib ]; configureFlags = "-fblaze_html_0_5"; meta = { diff --git a/pkgs/development/libraries/haskell/smallcheck/default.nix b/pkgs/development/libraries/haskell/smallcheck/default.nix index 1086a1929a80..a11eb501a861 100644 --- a/pkgs/development/libraries/haskell/smallcheck/default.nix +++ b/pkgs/development/libraries/haskell/smallcheck/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "smallcheck"; - version = "0.6.1"; - sha256 = "1p2bsc08lcyzmqdjc5qsr60dr03kvc8xw7kk4lbi9cnn9s9w90vb"; + version = "0.6.2"; + sha256 = "0yz7an3k71ia7sgs8xpkh37xz9ipsnbf13680185cij8llq8zbyr"; buildDepends = [ dlist ]; meta = { homepage = "https://github.com/feuerbach/smallcheck"; diff --git a/pkgs/development/libraries/haskell/tls-extra/default.nix b/pkgs/development/libraries/haskell/tls-extra/default.nix index 5bcce9df16b7..c9ab989ed76d 100644 --- a/pkgs/development/libraries/haskell/tls-extra/default.nix +++ b/pkgs/development/libraries/haskell/tls-extra/default.nix @@ -5,8 +5,8 @@ cabal.mkDerivation (self: { pname = "tls-extra"; - version = "0.6.0"; - sha256 = "11cf91cgbyp4xzbr3n9h20rvbb6756r9dk74r5w158f3xmlgk5nx"; + version = "0.6.1"; + sha256 = "0gc3dz3s188jk6q2lai56y4ckxh62s9gm04d7jznr6jzpx2i4fan"; isLibrary = true; isExecutable = true; buildDepends = [ diff --git a/pkgs/development/libraries/haskell/yst/default.nix b/pkgs/development/libraries/haskell/yst/default.nix index 5cb5fb6a2099..5087bfce12cf 100644 --- a/pkgs/development/libraries/haskell/yst/default.nix +++ b/pkgs/development/libraries/haskell/yst/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "yst"; - version = "0.3.0.1"; - sha256 = "17jp9vdbpp82wzsj8rhp5nh6fbmgm2xrclfnb7jl4gjwls7xggrv"; + version = "0.3.1"; + sha256 = "1ax3j21b4ac9x4vvvfgnhz0sczd7l7ia6mcxnqhbc3166sn91vig"; isLibrary = false; isExecutable = true; buildDepends = [ diff --git a/pkgs/development/libraries/libnatspec/default.nix b/pkgs/development/libraries/libnatspec/default.nix index fbab569e38cc..985745c38986 100644 --- a/pkgs/development/libraries/libnatspec/default.nix +++ b/pkgs/development/libraries/libnatspec/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchurl, popt }: +{ stdenv, fetchurl, popt, libiconv }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (rec { name = "libnatspec-0.2.6"; src = fetchurl { @@ -16,4 +16,8 @@ stdenv.mkDerivation rec { platforms = stdenv.lib.platforms.unix; maintainers = [ stdenv.lib.maintainers.urkud ]; }; -} +} // stdenv.lib.optionalAttrs (!stdenv.isLinux) { + NIX_CFLAGS_COMPILE = "-I${libiconv}/include"; + + NIX_CFLAGS_LINK = "-L${libiconv}/lib -liconv"; +}) diff --git a/pkgs/development/libraries/ncbi/default.nix b/pkgs/development/libraries/ncbi/default.nix index 0b795e78ad50..a74cd81854e1 100644 --- a/pkgs/development/libraries/ncbi/default.nix +++ b/pkgs/development/libraries/ncbi/default.nix @@ -49,6 +49,6 @@ rec { maintainers = [ a.lib.maintainers.raskin ]; - platforms = a.lib.platforms.linux ; + #platforms = a.lib.platforms.linux ; }; } diff --git a/pkgs/development/mobile/titaniumenv/build-app.nix b/pkgs/development/mobile/titaniumenv/build-app.nix index 5a06e809c3d3..c675116f88aa 100644 --- a/pkgs/development/mobile/titaniumenv/build-app.nix +++ b/pkgs/development/mobile/titaniumenv/build-app.nix @@ -16,7 +16,8 @@ let deleteKeychain = "security delete-keychain $keychainName"; in stdenv.mkDerivation { - inherit name src; + name = stdenv.lib.replaceChars [" "] [""] name; + inherit src; buildInputs = [] ++ stdenv.lib.optional (stdenv.system == "x86_64-darwin") xcodewrapper; @@ -27,9 +28,9 @@ stdenv.mkDerivation { ${if target == "android" then if release then - "${titaniumsdk}/mobilesdk/*/*/android/builder.py distribute ${name} ${androidsdkComposition}/libexec/android-sdk-* $(pwd) ${appId} ${androidKeyStore} ${androidKeyStorePassword} ${androidKeyAlias} $out" + ''${titaniumsdk}/mobilesdk/*/*/android/builder.py distribute "${name}" ${androidsdkComposition}/libexec/android-sdk-* $(pwd) ${appId} ${androidKeyStore} ${androidKeyStorePassword} ${androidKeyAlias} $out'' else - "${titaniumsdk}/mobilesdk/*/*/android/builder.py build ${name} ${androidsdkComposition}/libexec/android-sdk-* $(pwd) ${appId}" + ''${titaniumsdk}/mobilesdk/*/*/android/builder.py build "${name}" ${androidsdkComposition}/libexec/android-sdk-* $(pwd) ${appId}'' else if target == "iphone" then if iosDistribute then '' @@ -52,7 +53,7 @@ stdenv.mkDerivation { cp ${iosKeyFile} "$HOME/Library/MobileDevice/Provisioning Profiles/$provisioningId.mobileprovision" fi - ${titaniumsdk}/mobilesdk/*/*/iphone/builder.py distribute 6.0 $(pwd) ${appId} ${name} "$provisioningId" "${iosCertificateName}" $out universal "$HOME/Library/Keychains/$keychainName" + ${titaniumsdk}/mobilesdk/*/*/iphone/builder.py distribute 6.0 $(pwd) ${appId} "${name}" "$provisioningId" "${iosCertificateName}" $out universal "$HOME/Library/Keychains/$keychainName" # Remove our generated keychain @@ -80,7 +81,7 @@ stdenv.mkDerivation { cp ${iosKeyFile} "$HOME/Library/MobileDevice/Provisioning Profiles/$provisioningId.mobileprovision" fi - ${titaniumsdk}/mobilesdk/*/*/iphone/builder.py adhoc 6.0 $(pwd) ${appId} ${name} "$provisioningId" "${iosCertificateName}" universal "$HOME/Library/Keychains/$keychainName" + ${titaniumsdk}/mobilesdk/*/*/iphone/builder.py adhoc 6.0 $(pwd) ${appId} "${name}" "$provisioningId" "${iosCertificateName}" universal "$HOME/Library/Keychains/$keychainName" # Remove our generated keychain @@ -95,7 +96,7 @@ stdenv.mkDerivation { cp -av * $out cd $out - ${titaniumsdk}/mobilesdk/*/*/iphone/builder.py build 6.0 $(pwd) ${appId} ${name} + ${titaniumsdk}/mobilesdk/*/*/iphone/builder.py build 6.0 $(pwd) ${appId} "${name}" '' else throw "Target: ${target} is not supported!"} diff --git a/pkgs/development/python-modules/generic/default.nix b/pkgs/development/python-modules/generic/default.nix index bc5086519d7a..adba30372861 100644 --- a/pkgs/development/python-modules/generic/default.nix +++ b/pkgs/development/python-modules/generic/default.nix @@ -40,6 +40,8 @@ , preInstall ? "" , postInstall ? "" +, meta ? {} + , ... } @ attrs: # Keep extra attributes from ATTR, e.g., `patchPhase', etc. @@ -48,6 +50,12 @@ python.stdenv.mkDerivation (attrs // { name = namePrefix + name; + # default values for maintainers and platforms + meta = { + maintainers = python.meta.maintainers; + platforms = python.meta.platforms; + } // meta; + # checkPhase after installPhase to run tests on installed packages phases = "unpackPhase patchPhase configurePhase buildPhase installPhase checkPhase fixupPhase distPhase"; diff --git a/pkgs/development/tools/haskell/hlint/default.nix b/pkgs/development/tools/haskell/hlint/default.nix index 4cbd57a8c5f9..5b7a925e20b2 100644 --- a/pkgs/development/tools/haskell/hlint/default.nix +++ b/pkgs/development/tools/haskell/hlint/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "hlint"; - version = "1.8.40"; - sha256 = "18w4dhxv7c1y4x1agdjq99ss5i77jnm8p9vg3jp9gvhk2arhcl0x"; + version = "1.8.41"; + sha256 = "0b585i5v81jh1j2r70x74ykabc5hcd5sbww4kspl3s5i3jwkp16q"; isLibrary = true; isExecutable = true; buildDepends = [ |