diff options
Diffstat (limited to 'pkgs/development')
41 files changed, 352 insertions, 168 deletions
diff --git a/pkgs/development/compilers/gcc-4.5/default.nix b/pkgs/development/compilers/gcc-4.5/default.nix index 0948e94702e2..5dddef522fbd 100644 --- a/pkgs/development/compilers/gcc-4.5/default.nix +++ b/pkgs/development/compilers/gcc-4.5/default.nix @@ -260,8 +260,8 @@ stdenv.mkDerivation ({ ) ) } - ${ # Trick that should be taken out once we have a mips64-linux not loongson2f - if cross == null && stdenv.system == "mips64-linux" then "--with-arch=loongson2f" else ""} + ${ # Trick that should be taken out once we have a mips64el-linux not loongson2f + if cross == null && stdenv.system == "mips64el-linux" then "--with-arch=loongson2f" else ""} ${if langAda then " --enable-libada" else ""} ${if (cross == null && stdenv.isi686) then "--with-arch=i686" else ""} ${if cross != null then crossConfigureFlags else ""} diff --git a/pkgs/development/compilers/gcc-4.6/default.nix b/pkgs/development/compilers/gcc-4.6/default.nix index 5fdb61576faa..4a3689776330 100644 --- a/pkgs/development/compilers/gcc-4.6/default.nix +++ b/pkgs/development/compilers/gcc-4.6/default.nix @@ -270,8 +270,8 @@ stdenv.mkDerivation ({ ) ) } - ${ # Trick that should be taken out once we have a mips64-linux not loongson2f - if cross == null && stdenv.system == "mips64-linux" then "--with-arch=loongson2f" else ""} + ${ # Trick that should be taken out once we have a mips64el-linux not loongson2f + if cross == null && stdenv.system == "mips64el-linux" then "--with-arch=loongson2f" else ""} ${if langAda then " --enable-libada" else ""} ${if (cross == null && stdenv.isi686) then "--with-arch=i686" else ""} ${if cross != null then crossConfigureFlags else ""} diff --git a/pkgs/development/interpreters/ruby/generated.nix b/pkgs/development/interpreters/ruby/generated.nix index e46de5d231dc..1fea718aeb53 100644 --- a/pkgs/development/interpreters/ruby/generated.nix +++ b/pkgs/development/interpreters/ruby/generated.nix @@ -3,13 +3,13 @@ g: # Get dependencies from patched gems { aliases = { - actionmailer = g.actionmailer_3_1_3; - actionpack = g.actionpack_3_1_3; - activemodel = g.activemodel_3_1_3; - activerecord = g.activerecord_3_1_3; - activeresource = g.activeresource_3_1_3; - activesupport = g.activesupport_3_1_3; - arel = g.arel_2_2_1; + actionmailer = g.actionmailer_3_2_0; + actionpack = g.actionpack_3_2_0; + activemodel = g.activemodel_3_2_0; + activerecord = g.activerecord_3_2_0; + activeresource = g.activeresource_3_2_0; + activesupport = g.activesupport_3_2_0; + arel = g.arel_3_0_0; atoulme_Antwrap = g.atoulme_Antwrap_0_7_1; builder = g.builder_3_0_0; buildr = g.buildr_1_4_6; @@ -20,9 +20,10 @@ g: # Get dependencies from patched gems hike = g.hike_1_2_1; hoe = g.hoe_2_3_3; i18n = g.i18n_0_6_0; + journey = g.journey_1_0_0; json = g.json_1_6_5; json_pure = g.json_pure_1_6_5; - mail = g.mail_2_3_0; + mail = g.mail_2_4_1; mime_types = g.mime_types_1_17_2; minitar = g.minitar_0_5_3; multi_json = g.multi_json_1_0_4; @@ -30,13 +31,12 @@ g: # Get dependencies from patched gems net_ssh = g.net_ssh_2_3_0; nix = g.nix_0_1_1; polyglot = g.polyglot_0_3_3; - rack = g.rack_1_4_0; + rack = g.rack_1_4_1; rack_cache = g.rack_cache_1_1; - rack_mount = g.rack_mount_0_8_3; rack_ssl = g.rack_ssl_1_3_2; rack_test = g.rack_test_0_6_1; - rails = g.rails_3_1_3; - railties = g.railties_3_1_3; + rails = g.rails_3_2_0; + railties = g.railties_3_2_0; rake = g.rake_0_9_2_2; rb_fsevent = g.rb_fsevent_0_4_3_1; rdoc = g.rdoc_3_12; @@ -48,7 +48,7 @@ g: # Get dependencies from patched gems rubyforge = g.rubyforge_2_0_4; rubyzip = g.rubyzip_0_9_4; sass = g.sass_3_1_12; - sprockets = g.sprockets_2_0_3; + sprockets = g.sprockets_2_1_2; thor = g.thor_0_14_6; tilt = g.tilt_1_3_3; treetop = g.treetop_1_4_10; @@ -57,89 +57,89 @@ g: # Get dependencies from patched gems }; gem_nix_args = [ ''buildr'' ''nix'' ''rails'' ''rake'' ''rb-fsevent'' ''sass'' ]; gems = { - actionmailer_3_1_3 = { + actionmailer_3_2_0 = { basename = ''actionmailer''; meta = { description = ''Email composition, delivery, and receiving framework (part of Rails).''; homepage = ''http://www.rubyonrails.org''; longDescription = ''Email on Rails. Compose, deliver, receive, and test emails using the familiar controller/view pattern. First-class support for multipart email and attachments.''; }; - name = ''actionmailer-3.1.3''; - requiredGems = [ g.mail_2_3_0 ]; - sha256 = ''04qjgf8irg2srqa9j0ahxpydx42h9dymiabfiyzwy0h3wayg2qyj''; + name = ''actionmailer-3.2.0''; + requiredGems = [ g.mail_2_4_1 ]; + sha256 = ''0fhvdbxw93y00awz4xfkyzn78zfca210zwqx7xvaizipaq5rs8d6''; }; - actionpack_3_1_3 = { + actionpack_3_2_0 = { basename = ''actionpack''; meta = { description = ''Web-flow and rendering framework putting the VC in MVC (part of Rails).''; homepage = ''http://www.rubyonrails.org''; longDescription = ''Web apps on Rails. Simple, battle-tested conventions for building and testing MVC web applications. Works with any Rack-compatible server.''; }; - name = ''actionpack-3.1.3''; - requiredGems = [ g.activemodel_3_1_3 g.rack_cache_1_1 g.rack_1_3_6 g.rack_test_0_6_1 g.rack_mount_0_8_3 g.sprockets_2_0_3 g.erubis_2_7_0 ]; - sha256 = ''1awhqxdfg2zcb0b34jwq3sm2favay94n4glqywqzrn85wkf47a2q''; + name = ''actionpack-3.2.0''; + requiredGems = [ g.activemodel_3_2_0 g.rack_cache_1_1 g.rack_test_0_6_1 g.journey_1_0_0 g.sprockets_2_1_2 g.erubis_2_7_0 ]; + sha256 = ''08fghqa01x6bkcnyik36jaxdd6jp05sh1mnxgqaw4snjwrl5b4ki''; }; - activemodel_3_1_3 = { + activemodel_3_2_0 = { basename = ''activemodel''; meta = { description = ''A toolkit for building modeling frameworks (part of Rails).''; homepage = ''http://www.rubyonrails.org''; longDescription = ''A toolkit for building modeling frameworks like Active Record and Active Resource. Rich support for attributes, callbacks, validations, observers, serialization, internationalization, and testing.''; }; - name = ''activemodel-3.1.3''; - requiredGems = [ g.builder_3_0_0 g.i18n_0_6_0 ]; - sha256 = ''1kpkr1gwvjbxc8q3n1ps1j8zf7m1258swb9n5zm5igr6j0d803a3''; + name = ''activemodel-3.2.0''; + requiredGems = [ g.builder_3_0_0 ]; + sha256 = ''1785g6b1daqncgsyc1kjwhxypx6xk9m3pw5vhipfv2bvygan3y9z''; }; - activerecord_3_1_3 = { + activerecord_3_2_0 = { basename = ''activerecord''; meta = { description = ''Object-relational mapper framework (part of Rails).''; homepage = ''http://www.rubyonrails.org''; longDescription = ''Databases on Rails. Build a persistent domain model by mapping database tables to Ruby classes. Strong conventions for associations, validations, aggregations, migrations, and testing come baked-in.''; }; - name = ''activerecord-3.1.3''; - requiredGems = [ g.arel_2_2_1 g.tzinfo_0_3_31 ]; - sha256 = ''0z2p51hm12alg6axih2mhxjsj8vmnvdqp3wwzcg9bbkp3fc368w0''; + name = ''activerecord-3.2.0''; + requiredGems = [ g.arel_3_0_0 g.tzinfo_0_3_31 ]; + sha256 = ''065yyv3y1wkzm3ykdxd43hmz3q4gadc9qb3psjydqalgii0dr1ww''; }; - activeresource_3_1_3 = { + activeresource_3_2_0 = { basename = ''activeresource''; meta = { description = ''REST modeling framework (part of Rails).''; homepage = ''http://www.rubyonrails.org''; longDescription = ''REST on Rails. Wrap your RESTful web app with Ruby classes and work with them like Active Record models.''; }; - name = ''activeresource-3.1.3''; + name = ''activeresource-3.2.0''; requiredGems = [ ]; - sha256 = ''0hf3fi6zwk9zqzgk4rr95ax9mfzfkzpq28qw7fm2av6841wl54fg''; + sha256 = ''0lklbgmf1in8cm3w1xl9nxc5yjr9a884fjslyjca42kc7j90mbr7''; }; - activesupport_3_1_3 = { + activesupport_3_2_0 = { basename = ''activesupport''; meta = { description = ''A toolkit of support libraries and Ruby core extensions extracted from the Rails framework.''; homepage = ''http://www.rubyonrails.org''; longDescription = ''A toolkit of support libraries and Ruby core extensions extracted from the Rails framework. Rich support for multibyte strings, internationalization, time zones, and testing.''; }; - name = ''activesupport-3.1.3''; - requiredGems = [ g.multi_json_1_0_4 ]; - sha256 = ''19na7857adshdsswsgygky30r985ng100z3n78scd65481zcgb9z''; + name = ''activesupport-3.2.0''; + requiredGems = [ g.i18n_0_6_0 g.multi_json_1_0_4 ]; + sha256 = ''07x0jl4fnjgiblffbwmjnqzly765l55y9zmyad8divcaa1qjqwmb''; }; - arel_2_2_1 = { + arel_3_0_0 = { basename = ''arel''; meta = { description = ''Arel is a SQL AST manager for Ruby''; homepage = ''http://github.com/rails/arel''; longDescription = ''Arel is a SQL AST manager for Ruby. It -1. Simplifies the generation complex of SQL queries +1. Simplifies the generation of complex SQL queries 2. Adapts to various RDBMS systems It is intended to be a framework framework; that is, you can build your own ORM with it, focusing on innovative object and collection modeling as opposed to database compatibility and query generation.''; }; - name = ''arel-2.2.1''; + name = ''arel-3.0.0''; requiredGems = [ ]; - sha256 = ''19pz68pr9l8h2j2v3vqzhjvs94s0hwqwpb6m9sd6ncj18gaci8jy''; + sha256 = ''0ci86z4h8bw2rzx9wf1kdkyz19cdrawmkvjfavdm06bpjrhrpykl''; }; atoulme_Antwrap_0_7_1 = { basename = ''atoulme_Antwrap''; @@ -339,6 +339,17 @@ See class rdoc for help. Hint: ri Hoe''; requiredGems = [ ]; sha256 = ''1pgmfhmh2wv409g7kla30mkp8jpslvp25vcmmim1figl87wpn3j0''; }; + journey_1_0_0 = { + basename = ''journey''; + meta = { + description = ''Journey is a router''; + homepage = ''http://github.com/tenderlove/journey''; + longDescription = ''Journey is a router. It routes requests.''; + }; + name = ''journey-1.0.0''; + requiredGems = [ ]; + sha256 = ''0xphcsxksy0m78j1mphzp0lyj7bgrabdnlgs18lrkwivs0gryhdd''; + }; json_1_6_5 = { basename = ''json''; meta = { @@ -372,16 +383,16 @@ See class rdoc for help. Hint: ri Hoe''; requiredGems = [ ]; sha256 = ''09s5qymc4y9q0376zjiwf5bjm69fcivr75ar8ji0kmhjkk2rwc55''; }; - mail_2_3_0 = { + mail_2_4_1 = { basename = ''mail''; meta = { description = ''Mail provides a nice Ruby DSL for making, sending and reading emails.''; homepage = ''http://github.com/mikel/mail''; longDescription = ''A really Ruby Mail handler.''; }; - name = ''mail-2.3.0''; + name = ''mail-2.4.1''; requiredGems = [ g.mime_types_1_17_2 g.treetop_1_4_10 ]; - sha256 = ''1cnid9wn5wy0d2shx4ykvgd5jrvgq55yal8i51b47d4037n1yr53''; + sha256 = ''03h5bj9cws7my0igrqxwyjg9p1p8i0gwvwhma3rff09wz7k45mw0''; }; mime_types_1_17_2 = { basename = ''mime_types''; @@ -488,25 +499,7 @@ augments 'require' to find and load matching files.''; requiredGems = [ ]; sha256 = ''082zmail2h3cxd9z1wnibhk6aj4sb1f3zzwra6kg9bp51kx2c00v''; }; - rack_1_3_6 = { - basename = ''rack''; - meta = { - description = ''a modular Ruby webserver interface''; - homepage = ''http://rack.rubyforge.org''; - longDescription = ''Rack provides minimal, modular and adaptable interface for developing -web applications in Ruby. By wrapping HTTP requests and responses in -the simplest way possible, it unifies and distills the API for web -servers, web frameworks, and software in between (the so-called -middleware) into a single method call. - -Also see http://rack.rubyforge.org. -''; - }; - name = ''rack-1.3.6''; - requiredGems = [ ]; - sha256 = ''1qkhwsr1gz4k5rlf9d6ga4cwkw4lbxpcywxy0bkg92js413hy2fl''; - }; - rack_1_4_0 = { + rack_1_4_1 = { basename = ''rack''; meta = { description = ''a modular Ruby webserver interface''; @@ -520,9 +513,9 @@ middleware) into a single method call. Also see http://rack.rubyforge.org. ''; }; - name = ''rack-1.4.0''; + name = ''rack-1.4.1''; requiredGems = [ ]; - sha256 = ''15mqryky86fhx0h3kiab5x1lamq62hq6kc3knl6v10p1az4zpcq9''; + sha256 = ''1cx3wzg48pn4sbb6a0iq726fjh3q7y77fly81mfnprrnwp7d0190''; }; rack_cache_1_1 = { basename = ''rack_cache''; @@ -532,21 +525,9 @@ Also see http://rack.rubyforge.org. longDescription = ''HTTP Caching for Rack''; }; name = ''rack-cache-1.1''; - requiredGems = [ g.rack_1_4_0 ]; + requiredGems = [ g.rack_1_4_1 ]; sha256 = ''08jlym48qwfj7wddv0vpjj3vlc03q8wvbya24zbrjj8grgfgrvrl''; }; - rack_mount_0_8_3 = { - basename = ''rack_mount''; - meta = { - description = ''Stackable dynamic tree based Rack router''; - homepage = ''https://github.com/josh/rack-mount''; - longDescription = '' A stackable dynamic tree based Rack router. -''; - }; - name = ''rack-mount-0.8.3''; - requiredGems = [ ]; - sha256 = ''09a1qfaxxsll1kbgz7z0q0nr48sfmfm7akzaviis5bjpa5r00ld2''; - }; rack_ssl_1_3_2 = { basename = ''rack_ssl''; meta = { @@ -573,27 +554,27 @@ request helpers feature.''; requiredGems = [ ]; sha256 = ''0hq5q8fjhbb7szzrj7k0l21z025c4qsxqzd5qmgivikhymw10ws0''; }; - rails_3_1_3 = { + rails_3_2_0 = { basename = ''rails''; meta = { description = ''Full-stack web application framework.''; homepage = ''http://www.rubyonrails.org''; longDescription = ''Ruby on Rails is a full-stack web framework optimized for programmer happiness and sustainable productivity. It encourages beautiful code by favoring convention over configuration.''; }; - name = ''rails-3.1.3''; - requiredGems = [ g.activesupport_3_1_3 g.actionpack_3_1_3 g.activerecord_3_1_3 g.activeresource_3_1_3 g.actionmailer_3_1_3 g.railties_3_1_3 g.bundler_1_0_21 ]; - sha256 = ''07p8agfarj5nz8v1nlg1rfqy1cnqxhpakxhadfhk4sqrzlp2a5z8''; + name = ''rails-3.2.0''; + requiredGems = [ g.activesupport_3_2_0 g.actionpack_3_2_0 g.activerecord_3_2_0 g.activeresource_3_2_0 g.actionmailer_3_2_0 g.railties_3_2_0 g.bundler_1_0_21 ]; + sha256 = ''10jc4ri60ivd5z54k0i4l1pdqbmswwhh05ydca7axpd9d1ss1jzh''; }; - railties_3_1_3 = { + railties_3_2_0 = { basename = ''railties''; meta = { description = ''Tools for creating, working with, and running Rails applications.''; homepage = ''http://www.rubyonrails.org''; longDescription = ''Rails internals: application bootup, plugins, generators, and rake tasks.''; }; - name = ''railties-3.1.3''; + name = ''railties-3.2.0''; requiredGems = [ g.thor_0_14_6 g.rack_ssl_1_3_2 g.rdoc_3_12 ]; - sha256 = ''07kgr9nzvgwpjqwssiknlqds1a9mj74g1hqpwsj6720x4pk9r13h''; + sha256 = ''0zwdjj6kfgpslqywyhc171pfp9zc26hs4z0fx0hysyvvc961qhb3''; }; rake_0_8_7 = { basename = ''rake''; @@ -772,16 +753,16 @@ See RDoc for a description of RDoc's markup and basic use.''; requiredGems = [ ]; sha256 = ''10n2aic53290xsa3y3d63523s8xc78w5q5gqpns6cbljkdwb0ndy''; }; - sprockets_2_0_3 = { + sprockets_2_1_2 = { basename = ''sprockets''; meta = { description = ''Rack-based asset packaging system''; homepage = ''http://getsprockets.org/''; longDescription = ''Sprockets is a Rack-based asset packaging system that concatenates and serves JavaScript, CoffeeScript, CSS, LESS, Sass, and SCSS.''; }; - name = ''sprockets-2.0.3''; + name = ''sprockets-2.1.2''; requiredGems = [ g.hike_1_2_1 g.tilt_1_3_3 ]; - sha256 = ''1az22a7vjfhfglbn02np8lci6ww1lzgzs0i9qlfwx87ybp2227bi''; + sha256 = ''1zjxxvp8lz7hgf7mf1cc0gfca93iqx55nr1864rpwybivkay7s2r''; }; thor_0_14_6 = { basename = ''thor''; diff --git a/pkgs/development/libraries/boehm-gc/default.nix b/pkgs/development/libraries/boehm-gc/default.nix index a5ecc12a8b11..0ad643d9ac41 100644 --- a/pkgs/development/libraries/boehm-gc/default.nix +++ b/pkgs/development/libraries/boehm-gc/default.nix @@ -1,17 +1,15 @@ { stdenv, fetchurl }: stdenv.mkDerivation (rec { - name = "boehm-gc-7.2pre20110122"; + name = "boehm-gc-7.2alpha6"; src = fetchurl { - url = "http://nixos.org/tarballs/${name}.tar.bz2"; - sha256 = "06nf60flq6344pgic3bz83jh6pvj4k42apm3x4xwxc4d2is457ly"; + url = "http://www.hpl.hp.com/personal/Hans_Boehm/gc/gc_source/gc-7.2alpha6.tar.gz"; + sha256 = "05jwadjbrv8pr7z9cb4miskicxqpxm0pca4h2rg5cgbpajr2bx7b"; }; doCheck = true; - configureFlags = stdenv.lib.optionalString (stdenv.system == "x86_64-darwin") "CPPFLAGS=-D_XOPEN_SOURCE"; - meta = { description = "The Boehm-Demers-Weiser conservative garbage collector for C and C++"; diff --git a/pkgs/development/libraries/haskell/DSH/default.nix b/pkgs/development/libraries/haskell/DSH/default.nix new file mode 100644 index 000000000000..0ccc9d810dfd --- /dev/null +++ b/pkgs/development/libraries/haskell/DSH/default.nix @@ -0,0 +1,22 @@ +{ cabal, convertible, csv, FerryCore, HaXml, HDBC, json, mtl +, Pathfinder, syb, text, xhtml +}: + +cabal.mkDerivation (self: { + pname = "DSH"; + version = "0.7.8"; + sha256 = "1mlym2hs7sr78lih8c0yi5y5h14vxy3zpl3gfnidh9wiw5cai9lg"; + buildDepends = [ + convertible csv FerryCore HaXml HDBC json mtl Pathfinder syb text + xhtml + ]; + meta = { + description = "Database Supported Haskell"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + maintainers = [ + self.stdenv.lib.maintainers.andres + self.stdenv.lib.maintainers.simons + ]; + }; +}) diff --git a/pkgs/development/libraries/haskell/FerryCore/default.nix b/pkgs/development/libraries/haskell/FerryCore/default.nix new file mode 100644 index 000000000000..e7167baab7d7 --- /dev/null +++ b/pkgs/development/libraries/haskell/FerryCore/default.nix @@ -0,0 +1,17 @@ +{ cabal, HaXml, mtl, parsec, TableAlgebra }: + +cabal.mkDerivation (self: { + pname = "FerryCore"; + version = "0.4.6.4"; + sha256 = "1dxhbrmcl36dg14lyihpy8fd8sdsmawh70fykllcjk3fh7a11wgp"; + buildDepends = [ HaXml mtl parsec TableAlgebra ]; + meta = { + description = "Ferry Core Components"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + maintainers = [ + self.stdenv.lib.maintainers.andres + self.stdenv.lib.maintainers.simons + ]; + }; +}) diff --git a/pkgs/development/libraries/haskell/HStringTemplate/default.nix b/pkgs/development/libraries/haskell/HStringTemplate/default.nix index 55d2914d5bc9..31aef957a4f9 100644 --- a/pkgs/development/libraries/haskell/HStringTemplate/default.nix +++ b/pkgs/development/libraries/haskell/HStringTemplate/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "HStringTemplate"; - version = "0.6.6"; - sha256 = "1ian79az5q6m08pwb5fks52ffs4h2mq02kkcwmr6jb7i0ha2k2si"; + version = "0.6.8"; + sha256 = "1fybvb3v2b786n1hfzcvyanj3yfm5j8z4fm48vaskcggawh6rlkr"; buildDepends = [ deepseq mtl parsec syb sybWithClass text time utf8String ]; diff --git a/pkgs/development/libraries/haskell/HsOpenSSL/default.nix b/pkgs/development/libraries/haskell/HsOpenSSL/default.nix new file mode 100644 index 000000000000..1ab60436f68a --- /dev/null +++ b/pkgs/development/libraries/haskell/HsOpenSSL/default.nix @@ -0,0 +1,19 @@ +{ cabal, network, openssl, time }: + +cabal.mkDerivation (self: { + pname = "HsOpenSSL"; + version = "0.10.1.2"; + sha256 = "0najn3749s6jxqavpxw7q58jzsvli06sxjgkvs3lidasv6jhwmxh"; + buildDepends = [ network time ]; + extraLibraries = [ openssl ]; + meta = { + homepage = "https://github.com/phonohawk/HsOpenSSL"; + description = "(Incomplete) OpenSSL binding for Haskell"; + license = self.stdenv.lib.licenses.publicDomain; + platforms = self.ghc.meta.platforms; + maintainers = [ + self.stdenv.lib.maintainers.andres + self.stdenv.lib.maintainers.simons + ]; + }; +}) diff --git a/pkgs/development/libraries/haskell/Pathfinder/default.nix b/pkgs/development/libraries/haskell/Pathfinder/default.nix new file mode 100644 index 000000000000..90df60cc8e6e --- /dev/null +++ b/pkgs/development/libraries/haskell/Pathfinder/default.nix @@ -0,0 +1,18 @@ +{ cabal, libxml2, text }: + +cabal.mkDerivation (self: { + pname = "Pathfinder"; + version = "0.5.10"; + sha256 = "1k38p73jnkfcmmz94iqpzg2g6apsxflidvy8p9lwqyzfmg70brqf"; + buildDepends = [ text ]; + extraLibraries = [ libxml2 ]; + meta = { + description = "Relational optimiser and code generator"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + maintainers = [ + self.stdenv.lib.maintainers.andres + self.stdenv.lib.maintainers.simons + ]; + }; +}) diff --git a/pkgs/development/libraries/haskell/TableAlgebra/default.nix b/pkgs/development/libraries/haskell/TableAlgebra/default.nix new file mode 100644 index 000000000000..f1c212d7a491 --- /dev/null +++ b/pkgs/development/libraries/haskell/TableAlgebra/default.nix @@ -0,0 +1,17 @@ +{ cabal, HaXml, mtl }: + +cabal.mkDerivation (self: { + pname = "TableAlgebra"; + version = "0.7.1"; + sha256 = "1jqkjnyznklyiy2shm4c9gix267war1hmsjncdmailhca41fs4bz"; + buildDepends = [ HaXml mtl ]; + meta = { + description = "Ferry Table Algebra"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + maintainers = [ + self.stdenv.lib.maintainers.andres + self.stdenv.lib.maintainers.simons + ]; + }; +}) diff --git a/pkgs/development/libraries/haskell/aeson/default.nix b/pkgs/development/libraries/haskell/aeson/default.nix index b8ead39671e6..2c55bdfc3575 100644 --- a/pkgs/development/libraries/haskell/aeson/default.nix +++ b/pkgs/development/libraries/haskell/aeson/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "aeson"; - version = "0.5.0.0"; - sha256 = "1n7c0kf6rdf5p76mjcxlqrzhnfz4b1zkkbxk9w94hibb0s4kwxv6"; + version = "0.6.0.0"; + sha256 = "1j8g1q7xr1pgyfyrkbh2zz7fhqshj0q5qg7fczrnsbbzf5k459zw"; buildDepends = [ attoparsec blazeBuilder deepseq dlist hashable mtl syb text time unorderedContainers vector diff --git a/pkgs/development/libraries/haskell/bson/default.nix b/pkgs/development/libraries/haskell/bson/default.nix index d14b0c990c85..53a8ee3ba469 100644 --- a/pkgs/development/libraries/haskell/bson/default.nix +++ b/pkgs/development/libraries/haskell/bson/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "bson"; - version = "0.1.6"; - sha256 = "0w9dab8x6b3dwk2afy0gnmrvcvx2dshwhjvlr2k69nchid4wh823"; + version = "0.1.7"; + sha256 = "1dmndq0rx22h9kxv31rxwqhwkgsvqg9qy4l0xmvpcvvl101zj4jx"; buildDepends = [ binary compactStringFix cryptohash dataBinaryIeee754 mtl network time diff --git a/pkgs/development/libraries/haskell/criterion/default.nix b/pkgs/development/libraries/haskell/criterion/default.nix index e8d1c4f901b7..e99f4b7df537 100644 --- a/pkgs/development/libraries/haskell/criterion/default.nix +++ b/pkgs/development/libraries/haskell/criterion/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "criterion"; - version = "0.6.0.0"; - sha256 = "0yi6gx9zrmljhhdfqpaylri8x71q2yzyhwwn1c377xngrskpydr9"; + version = "0.6.0.1"; + sha256 = "0k6ip41w5h1z8gl67a8vsb6c3md5nc4yh1vd6dysp9fqgn0vky0a"; buildDepends = [ aeson deepseq hastache mtl mwcRandom parsec statistics time transformers vector vectorAlgorithms diff --git a/pkgs/development/libraries/haskell/data-object-yaml/default.nix b/pkgs/development/libraries/haskell/data-object-yaml/default.nix index 1669f4be73ee..ec24fc554dff 100644 --- a/pkgs/development/libraries/haskell/data-object-yaml/default.nix +++ b/pkgs/development/libraries/haskell/data-object-yaml/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "data-object-yaml"; - version = "0.3.4"; - sha256 = "1wx6m7mjmdks8ym6dh117bhkdks4d1jlfchqif0svcwg04qnfczd"; + version = "0.3.4.1"; + sha256 = "04mpa59gyfkqi5s94ps3qhphw4csiasb3lj6kf6rhhmd5yx52dnp"; isLibrary = true; isExecutable = true; buildDepends = [ diff --git a/pkgs/development/libraries/haskell/generic-deriving/default.nix b/pkgs/development/libraries/haskell/generic-deriving/default.nix index b6f79ed16c22..b34c394cac72 100644 --- a/pkgs/development/libraries/haskell/generic-deriving/default.nix +++ b/pkgs/development/libraries/haskell/generic-deriving/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "generic-deriving"; - version = "1.0.2"; - sha256 = "0qj4ql44f87rgg5l512mh863c1zjfklw1w5k8x4nyw37s7qx9hvq"; + version = "1.0.3"; + sha256 = "0g5sw4m9qdr1l47zq15l6jk9ksz1nazssdxz7lrdqx6ib3xbrz6y"; meta = { description = "Generic programming library for generalized deriving"; license = self.stdenv.lib.licenses.bsd3; diff --git a/pkgs/development/libraries/haskell/happstack/happstack-hamlet.nix b/pkgs/development/libraries/haskell/happstack/happstack-hamlet.nix index 2826d84fa90b..a0ec12802a09 100644 --- a/pkgs/development/libraries/haskell/happstack/happstack-hamlet.nix +++ b/pkgs/development/libraries/haskell/happstack/happstack-hamlet.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "happstack-hamlet"; - version = "6.2.2"; - sha256 = "02kpfv7axrmgzyyqsfkdixcm7badh0sgy7am2kryvyb49zzk1vjr"; + version = "6.2.3"; + sha256 = "0k8g0rx9ikfklsrry2hxmm4hxwn31ra004qllpn6aldg6dr2w5n1"; buildDepends = [ hamlet happstackServer text ]; meta = { homepage = "http://www.happstack.com/"; diff --git a/pkgs/development/libraries/haskell/hxt/default.nix b/pkgs/development/libraries/haskell/hxt/default.nix index c8871f423c00..7a3a5fdcb945 100644 --- a/pkgs/development/libraries/haskell/hxt/default.nix +++ b/pkgs/development/libraries/haskell/hxt/default.nix @@ -1,14 +1,14 @@ { cabal, binary, deepseq, HUnit, hxtCharproperties -, hxtRegexXmlschema, hxtUnicode, network, parsec +, hxtRegexXmlschema, hxtUnicode, mtl, network, parsec }: cabal.mkDerivation (self: { pname = "hxt"; - version = "9.1.6"; - sha256 = "1ir1az8zpi9adkwpm3m4gjrwrn9cbmwd1dbqz4lrwi82i54c9bpb"; + version = "9.2.0"; + sha256 = "182yl4ksh4hg332b0lnk4s9cfqxsnnan7p5vqas5lbxvibmg68zc"; buildDepends = [ binary deepseq HUnit hxtCharproperties hxtRegexXmlschema hxtUnicode - network parsec + mtl network parsec ]; meta = { homepage = "http://www.fh-wedel.de/~si/HXmlToolbox/index.html"; diff --git a/pkgs/development/libraries/haskell/instant-generics/default.nix b/pkgs/development/libraries/haskell/instant-generics/default.nix index ca02a9bc8c75..2a51e8d344bf 100644 --- a/pkgs/development/libraries/haskell/instant-generics/default.nix +++ b/pkgs/development/libraries/haskell/instant-generics/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "instant-generics"; - version = "0.3.3"; - sha256 = "125ninsm1k9hixlwqdn7b842fpqxz4zih4rh8fn7r7djmv1zpq9q"; + version = "0.3.4"; + sha256 = "0j3sfbw3j0izwmhvwcl8nxxvlrpfla5rngxx2yvl6w5i87wyhswi"; buildDepends = [ syb ]; noHaddock = true; meta = { diff --git a/pkgs/development/libraries/haskell/language-javascript/default.nix b/pkgs/development/libraries/haskell/language-javascript/default.nix index 68f8006d2a97..17f57fbe5467 100644 --- a/pkgs/development/libraries/haskell/language-javascript/default.nix +++ b/pkgs/development/libraries/haskell/language-javascript/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "language-javascript"; - version = "0.4.5"; - sha256 = "0rsggjpxsvaipkibhl90qcj2w2i16g53srbb54v0hajx2msmi0ci"; + version = "0.4.6"; + sha256 = "1rqbb44cyvj6iyipi4bzrdd59lk9q1vxh0zvilvc54kqg97y07v6"; isLibrary = true; isExecutable = true; buildDepends = [ mtl utf8Light ]; diff --git a/pkgs/development/libraries/haskell/lifted-base/default.nix b/pkgs/development/libraries/haskell/lifted-base/default.nix index 48822d777bcb..255570f6c6e8 100644 --- a/pkgs/development/libraries/haskell/lifted-base/default.nix +++ b/pkgs/development/libraries/haskell/lifted-base/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "lifted-base"; - version = "0.1.0.2"; - sha256 = "1j810pdkhl6kpc368081ar1k9342k3bl4cmx294zdyd0j00n23zx"; + version = "0.1.0.3"; + sha256 = "1fk2jv8xwjb4xmzcx7h74nh14i3wf5mpifiki9rvq4hnrb7gdx36"; buildDepends = [ baseUnicodeSymbols monadControl transformersBase ]; diff --git a/pkgs/development/libraries/haskell/mongoDB/default.nix b/pkgs/development/libraries/haskell/mongoDB/default.nix index 0b59808a53a9..374521d36c57 100644 --- a/pkgs/development/libraries/haskell/mongoDB/default.nix +++ b/pkgs/development/libraries/haskell/mongoDB/default.nix @@ -1,14 +1,14 @@ -{ cabal, binary, bson, cryptohash, monadControl, mtl, network -, parsec, random, randomShuffle +{ cabal, binary, bson, cryptohash, liftedBase, monadControl, mtl +, network, parsec, random, randomShuffle, transformersBase }: cabal.mkDerivation (self: { pname = "mongoDB"; - version = "1.1.1"; - sha256 = "0hy47kvswm4g85c3lb75fvdrcnrcbmjrhk15r1jjriwzqicgiimz"; + version = "1.2.0"; + sha256 = "0rffa13p889mxbbkj2bmqy3yada3mrhngvp8pp7qvrll1acm7s13"; buildDepends = [ - binary bson cryptohash monadControl mtl network parsec random - randomShuffle + binary bson cryptohash liftedBase monadControl mtl network parsec + random randomShuffle transformersBase ]; meta = { homepage = "http://github.com/TonyGen/mongoDB-haskell"; diff --git a/pkgs/development/libraries/haskell/mwc-random/default.nix b/pkgs/development/libraries/haskell/mwc-random/0.10.0.1.nix index ab762c2db63b..ab762c2db63b 100644 --- a/pkgs/development/libraries/haskell/mwc-random/default.nix +++ b/pkgs/development/libraries/haskell/mwc-random/0.10.0.1.nix diff --git a/pkgs/development/libraries/haskell/mwc-random/0.11.0.0.nix b/pkgs/development/libraries/haskell/mwc-random/0.11.0.0.nix new file mode 100644 index 000000000000..5cf459fb0a92 --- /dev/null +++ b/pkgs/development/libraries/haskell/mwc-random/0.11.0.0.nix @@ -0,0 +1,18 @@ +{ cabal, primitive, time, vector }: + +cabal.mkDerivation (self: { + pname = "mwc-random"; + version = "0.11.0.0"; + sha256 = "1yqi472m3snx71fvd4mig6my74rkpf3sbsdcmx2y2l00cyk79ghh"; + buildDepends = [ primitive time vector ]; + meta = { + homepage = "https://github.com/bos/mwc-random"; + description = "Fast, high quality pseudo random number generation"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + maintainers = [ + self.stdenv.lib.maintainers.andres + self.stdenv.lib.maintainers.simons + ]; + }; +}) diff --git a/pkgs/development/libraries/haskell/pretty-show/default.nix b/pkgs/development/libraries/haskell/pretty-show/default.nix index deb9e731ebda..19398be7ac7d 100644 --- a/pkgs/development/libraries/haskell/pretty-show/default.nix +++ b/pkgs/development/libraries/haskell/pretty-show/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "pretty-show"; - version = "1.1.1"; - sha256 = "0w6r68l1452vh9aqnlh4066y62h8ylh45gbsl5l558wjgchlna5k"; + version = "1.2"; + sha256 = "0lbalmyrqisgd2spbvzifsy25lr6cl9sgz78hav8q8r406k7nf2l"; isLibrary = true; isExecutable = true; buildDepends = [ haskellLexer ]; diff --git a/pkgs/development/libraries/haskell/statistics/default.nix b/pkgs/development/libraries/haskell/statistics/default.nix index ad18f9cbd981..97202c4ec602 100644 --- a/pkgs/development/libraries/haskell/statistics/default.nix +++ b/pkgs/development/libraries/haskell/statistics/default.nix @@ -1,13 +1,14 @@ -{ cabal, deepseq, erf, monadPar, mwcRandom, primitive, vector -, vectorAlgorithms +{ cabal, deepseq, erf, mathFunctions, monadPar, mwcRandom +, primitive, vector, vectorAlgorithms }: cabal.mkDerivation (self: { pname = "statistics"; - version = "0.10.0.1"; - sha256 = "0bn131yzq3qk4dpr78i3ndsxyn7hars9jw9krfsxmin9pqr114sw"; + version = "0.10.1.0"; + sha256 = "0fnpwnhcwxjcm81b9daqdy07cw5qgqa7m2bj6fxxwicpvawcyabc"; buildDepends = [ - deepseq erf monadPar mwcRandom primitive vector vectorAlgorithms + deepseq erf mathFunctions monadPar mwcRandom primitive vector + vectorAlgorithms ]; meta = { homepage = "https://github.com/bos/statistics"; diff --git a/pkgs/development/libraries/haskell/text/0.11.1.13.nix b/pkgs/development/libraries/haskell/text/0.11.1.13.nix new file mode 100644 index 000000000000..9576e1806e1a --- /dev/null +++ b/pkgs/development/libraries/haskell/text/0.11.1.13.nix @@ -0,0 +1,18 @@ +{ cabal, deepseq }: + +cabal.mkDerivation (self: { + pname = "text"; + version = "0.11.1.13"; + sha256 = "0lbc4yfqpydps0rd1qjymnnhp87sl9w7n1f5vd5lsixby93zjv2f"; + buildDepends = [ deepseq ]; + meta = { + homepage = "https://github.com/bos/text"; + description = "An efficient packed Unicode text type"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + maintainers = [ + self.stdenv.lib.maintainers.andres + self.stdenv.lib.maintainers.simons + ]; + }; +}) diff --git a/pkgs/development/libraries/haskell/tls-extra/default.nix b/pkgs/development/libraries/haskell/tls-extra/default.nix index d9d5c8c11d68..6ea11c7d6ad6 100644 --- a/pkgs/development/libraries/haskell/tls-extra/default.nix +++ b/pkgs/development/libraries/haskell/tls-extra/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "tls-extra"; - version = "0.4.2"; - sha256 = "14zi5xzdyzdzw9qv6775li635x8i9rkp2z655ygzcwz5v3spjz9z"; + version = "0.4.2.1"; + sha256 = "0gddss5pnvrkjgjlvyl92rb78i4q8x9m6r8z01ba1snqjgldmj56"; isLibrary = true; isExecutable = true; buildDepends = [ diff --git a/pkgs/development/libraries/haskell/zeromq-haskell/default.nix b/pkgs/development/libraries/haskell/zeromq-haskell/default.nix index f7c6a81d1886..ef2eb97063aa 100644 --- a/pkgs/development/libraries/haskell/zeromq-haskell/default.nix +++ b/pkgs/development/libraries/haskell/zeromq-haskell/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "zeromq-haskell"; - version = "0.8.2"; - sha256 = "0wi3s3ygxd15jbj5bpq6xvrsjsm94hhj6na8r45j241j0cgr322x"; + version = "0.8.3"; + sha256 = "1gp85fbgylsqkxacgdxv4ifvgvwca03gy88raphqhrnk59bmjgzd"; extraLibraries = [ zeromq ]; meta = { homepage = "http://github.com/twittner/zeromq-haskell/"; diff --git a/pkgs/development/libraries/libmsn/default.nix b/pkgs/development/libraries/libmsn/default.nix index 3d7f20291b9a..4ec5e62ea04d 100644 --- a/pkgs/development/libraries/libmsn/default.nix +++ b/pkgs/development/libraries/libmsn/default.nix @@ -1,12 +1,10 @@ {stdenv, fetchurl, cmake, openssl}: stdenv.mkDerivation rec { - name = "libmsn-4.1"; + name = "libmsn-4.2.1"; src = fetchurl { url = "mirror://sourceforge/libmsn/${name}.tar.bz2"; - sha256 = "0p3c3gidnq4ai697dgg930hm7aap4176sbq7w7nn0mxg4rg5gwfx"; + sha256 = "338369c7455b123e84b9a7a858ac0ed2b1dc32e6529f460fdc01d28869a20fde"; }; - patches = [ ./libmsn-4.1-openssl-1.patch ]; - patchFlags = "-p0"; buildInputs = [ cmake openssl ]; } diff --git a/pkgs/development/libraries/libxcrypt/default.nix b/pkgs/development/libraries/libxcrypt/default.nix index aea9e53eef6e..1f45207382ee 100644 --- a/pkgs/development/libraries/libxcrypt/default.nix +++ b/pkgs/development/libraries/libxcrypt/default.nix @@ -2,7 +2,7 @@ # I could not build it in armv5tel-linux or the fuloon2f assert stdenv.system != "armv5tel-linux"; -assert stdenv.system != "mips64-linux"; +assert stdenv.system != "mips64el-linux"; stdenv.mkDerivation { name = "libxcrypt-3.0.2"; diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix index edbde5a9b494..55701cf18c96 100644 --- a/pkgs/development/libraries/mesa/default.nix +++ b/pkgs/development/libraries/mesa/default.nix @@ -17,14 +17,15 @@ stdenv.mkDerivation { sha256 = "0msk1fh4yw4yi7z37v75vhpa23z49lkwgin6drczbihbqsl6lx2p"; }; - patches = [ ./swrast-settexbuffer.patch ]; + patches = [ ./swrast-settexbuffer.patch ] ++ stdenv.lib.optional + (stdenv.system == "mips64el-linux") ./mips_wmb.patch; prePatch = "patchShebangs ."; # r300 configureFlags = " --with-driver=dri --enable-gl-osmesa --enable-gles1" - + " --with-gallium-drivers=i915,i965,nouveau,r600,svga,swrast" + + " --with-gallium-drivers=i915,nouveau,r600,svga,swrast" + " --enable-gles2 --enable-gallium-egl --disable-glx-tls" + " --enable-xcb --enable-egl --disable-glut" # Texture floats are patented, see docs/patents.txt diff --git a/pkgs/development/libraries/mesa/mips_wmb.patch b/pkgs/development/libraries/mesa/mips_wmb.patch new file mode 100644 index 000000000000..1ffa1bdd8df4 --- /dev/null +++ b/pkgs/development/libraries/mesa/mips_wmb.patch @@ -0,0 +1,16 @@ +rixed told me (viric) it's the patch to apply for mesa. +I adapted his patch for mesa 7.5 to this 7.10 + +diff --git a/src/mesa/drivers/dri/sis/sis_context.h b/src/mesa/drivers/dri/sis/sis_context.h +index a82a659..d8d8d9a 100644 +--- a/src/mesa/drivers/dri/sis/sis_context.h ++++ b/src/mesa/drivers/dri/sis/sis_context.h +@@ -404,6 +404,8 @@ struct sis_context + #define MMIO_WMB() __asm __volatile("" : : : "memory") + #elif defined(__ia64__) + #define MMIO_WMB() __asm __volatile("mf" : : : "memory") ++#elif defined(__mips__) ++#define MMIO_WMB() __asm __volatile("" : : : "memory") + #else + #error platform needs WMB + #endif diff --git a/pkgs/development/libraries/mlt/default.nix b/pkgs/development/libraries/mlt/default.nix index 384c31a7cd44..50100e3f1f38 100644 --- a/pkgs/development/libraries/mlt/default.nix +++ b/pkgs/development/libraries/mlt/default.nix @@ -2,11 +2,11 @@ libvorbis, sox}: stdenv.mkDerivation { - name = "mlt-0.7.4"; + name = "mlt-0.7.6"; src = fetchurl { - url = mirror://sourceforge/mlt/mlt-0.7.4.tar.gz; - sha256 = "1xcrrd3xbz9hmahgl7xf610cm97chwpxwgcajkd10mpcxbqs08i0"; + url = mirror://sourceforge/mlt/mlt-0.7.6.tar.gz; + sha256 = "f8ea8590417ea2b5543a495f2edc30636d3931932deee7a4e0d8516e9c2b58ae"; }; buildInputs = [ qt4 SDL ffmpeg libdv libxml2 libsamplerate libvorbis sox ]; diff --git a/pkgs/development/libraries/xapian/bindings/default.nix b/pkgs/development/libraries/xapian/bindings/default.nix index bb7643330a08..fc46088833b9 100644 --- a/pkgs/development/libraries/xapian/bindings/default.nix +++ b/pkgs/development/libraries/xapian/bindings/default.nix @@ -5,11 +5,11 @@ let inherit (composableDerivation) wwf; in composableDerivation.composableDerivation {} rec { - name = "xapian-bindings-1.2.7"; + name = "xapian-bindings-1.2.8"; src = fetchurl { - url = "http://oligarchy.co.uk/xapian/1.2.7/${name}.tar.gz"; - sha256 = "c9f63ad7a032c260f0617e029327d7b05dd986d91af401032268a9f7b2eabde8"; + url = "http://oligarchy.co.uk/xapian/1.2.8/${name}.tar.gz"; + sha256 = "eb740c619c75d288e65a1c2f86faecdca53d44d3f9896bcc080085839887b124"; }; buildInputs = [ xapian pkgconfig zlib ]; diff --git a/pkgs/development/libraries/xapian/default.nix b/pkgs/development/libraries/xapian/default.nix index ac27962b8c59..99837974b1d9 100644 --- a/pkgs/development/libraries/xapian/default.nix +++ b/pkgs/development/libraries/xapian/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, libuuid, zlib }: stdenv.mkDerivation { - name = "xapian-1.2.7"; + name = "xapian-1.2.8"; src = fetchurl { - url = http://oligarchy.co.uk/xapian/1.2.7/xapian-core-1.2.7.tar.gz; - sha256 = "6ce8cb3502f35245ec0cb0dcf579ce4f65c015a2f2e8d1b4c388c95f58278c89"; + url = http://oligarchy.co.uk/xapian/1.2.8/xapian-core-1.2.8.tar.gz; + sha256 = "00411ebac66a5592b87fc57ccfeb234c84b929ed23c185befb5df9929df3d4f9"; }; buildInputs = [ libuuid zlib ]; diff --git a/pkgs/development/tools/haskell/tar/default.nix b/pkgs/development/tools/haskell/tar/default.nix index ef03d80f5e95..8bffe95fe890 100644 --- a/pkgs/development/tools/haskell/tar/default.nix +++ b/pkgs/development/tools/haskell/tar/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "tar"; - version = "0.3.1.0"; - sha256 = "1n16sq5y7x30r1k7ydxmncn9x2nx3diildzyfxjy2b8drxp4jr03"; + version = "0.3.2.0"; + sha256 = "0yplrfai8bwihyn18whi0jiz1qzll9hgbc37xcy2jkr28480jba9"; meta = { description = "Reading, writing and manipulating \".tar\" archive files."; license = self.stdenv.lib.licenses.bsd3; diff --git a/pkgs/development/tools/misc/astyle/default.nix b/pkgs/development/tools/misc/astyle/default.nix new file mode 100644 index 000000000000..9b1e99557324 --- /dev/null +++ b/pkgs/development/tools/misc/astyle/default.nix @@ -0,0 +1,27 @@ +{ stdenv, fetchurl }: + +let + name = "astyle"; + version = "2.02.1"; +in +stdenv.mkDerivation { + name = "${name}-${version}"; + + src = fetchurl { + url = "mirror://sourceforge/${name}/${name}_${version}_linux.tar.gz"; + sha256 = "0bece9a32887e51f42c57617cf7c4f9b63d0a386749fe3a094f5525b639ef953"; + }; + + sourceRoot = "astyle/build/gcc"; + + installFlags = "INSTALL=install prefix=$$out"; + + meta = { + homepage = "http://astyle.sourceforge.net/"; + description = "source code reformatter"; + license = "LGPL"; + + platforms = stdenv.lib.platforms.linux; + maintainers = [ stdenv.lib.maintainers.simons ]; + }; +} diff --git a/pkgs/development/tools/misc/binutils/default.nix b/pkgs/development/tools/misc/binutils/default.nix index 4ccaa550313b..b4238a99ab5c 100644 --- a/pkgs/development/tools/misc/binutils/default.nix +++ b/pkgs/development/tools/misc/binutils/default.nix @@ -54,7 +54,7 @@ stdenv.mkDerivation rec { ''; configureFlags = "--disable-werror" # needed for dietlibc build - + stdenv.lib.optionalString (stdenv.system == "mips64-linux") + + stdenv.lib.optionalString (stdenv.system == "mips64el-linux") " --enable-fix-loongson2f-nop" + stdenv.lib.optionalString (cross != null) " --target=${cross.config}" + stdenv.lib.optionalString gold " --enable-gold"; diff --git a/pkgs/development/tools/misc/ccache/default.nix b/pkgs/development/tools/misc/ccache/default.nix index dc1238cc47ed..2cd00f51d9d4 100644 --- a/pkgs/development/tools/misc/ccache/default.nix +++ b/pkgs/development/tools/misc/ccache/default.nix @@ -1,10 +1,40 @@ -{stdenv, fetchurl}: +{stdenv, fetchurl, runCommand, gcc, zlib}: +let + ccache = stdenv.mkDerivation { - name = "ccache-3.0"; + name = "ccache-3.1.7"; src = fetchurl { - url = http://samba.org/ftp/ccache/ccache-3.0.tar.gz; - sha256 = "0mi8sfnlcp2pmp7nzb7894rv85v13zxrj0v3qgnwhny3gx2p5pgk"; + url = http://samba.org/ftp/ccache/ccache-3.1.7.tar.gz; + sha256 = "04ax6ks49b6rn57hx4v9wbvmsfmw6ipn0wyfqwhh4lzw70flv3r7"; + }; + + buildInputs = [ zlib ]; + + passthru = { + # A derivation that provides gcc and g++ commands, but that + # will end up calling ccache for the given cacheDir + links = extraConfig : (runCommand "ccache-links" + { inherit (gcc) langC langCC; } + '' + mkdir -p $out/bin + if [ $langC -eq 1 ]; then + cat > $out/bin/gcc << EOF + #!/bin/sh + ${extraConfig} + exec ${ccache}/bin/ccache ${gcc.gcc}/bin/gcc "\$@" + EOF + chmod +x $out/bin/gcc + fi + if [ $langCC -eq 1 ]; then + cat > $out/bin/g++ << EOF + #!/bin/sh + ${extraConfig} + exec ${ccache}/bin/ccache ${gcc.gcc}/bin/g++ "\$@" + EOF + chmod +x $out/bin/g++ + fi + ''); }; meta = { @@ -12,4 +42,6 @@ stdenv.mkDerivation { homepage = http://ccache.samba.org/; license = "GPL"; }; -} +}; +in +ccache diff --git a/pkgs/development/tools/misc/coccinelle/default.nix b/pkgs/development/tools/misc/coccinelle/default.nix index 7a247b0b2e34..276c3bd1ed0a 100644 --- a/pkgs/development/tools/misc/coccinelle/default.nix +++ b/pkgs/development/tools/misc/coccinelle/default.nix @@ -27,9 +27,6 @@ stdenv.mkDerivation rec { # Note: The tests want $out/share/coccinelle/standard.h so they must be run # after "make install". - # (I'm not sure if this is still needed.) - # Note: The check phase is now disabled completely, because the expected - # testing score is not always updated. doCheck = false; postInstall = diff --git a/pkgs/development/tools/misc/pkgconfig/default.nix b/pkgs/development/tools/misc/pkgconfig/default.nix index 22035f6fee7c..ae5048f6306a 100644 --- a/pkgs/development/tools/misc/pkgconfig/default.nix +++ b/pkgs/development/tools/misc/pkgconfig/default.nix @@ -1,6 +1,6 @@ -{stdenv, fetchurl}: +{stdenv, fetchurl, automake}: -stdenv.mkDerivation rec { +stdenv.mkDerivation (rec { name = "pkg-config-0.23"; setupHook = ./setup-hook.sh; @@ -21,5 +21,9 @@ stdenv.mkDerivation rec { homepage = http://pkg-config.freedesktop.org/wiki/; }; -} - +} // (if stdenv.system == "mips64el-linux" then + { + preConfigure = '' + cp -v ${automake}/share/automake*/config.{sub,guess} . + ''; + } else {})) |