1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-12-25 03:17:13 +00:00
Commit graph

994 commits

Author SHA1 Message Date
Vladimír Čunát 1e389c976c merge 'staging' into modular-stdenv
In 2c62a36b77 the messages in pkgs/stdenv/generic/default.nix
were not merged correctly.

Conflicts:
	pkgs/stdenv/generic/default.nix
2014-09-08 18:16:54 +02:00
Eelco Dolstra 585983bc95 Merge remote-tracking branch 'origin/staging'
Conflicts:
	pkgs/applications/version-management/subversion/default.nix
2014-09-08 11:42:09 +02:00
Vladimír Čunát 06fea81c6e Merge recent master into staging
Hydra: ?compare=1150594
2014-09-06 16:52:45 +02:00
Pascal Wittmann f99ad6fe94 help2man: update from 1.46.1 to 1.46.2 2014-09-06 16:23:15 +02:00
Rüdiger Sonderfeld 46266cc216 gdb: Update to 7.8 and include Guile support.
GDB 7.8 adds Guile scripting support.  This is now enabled by default as
well.  Checking for guile also adds a pkg-config dependency.

It seems Python is explicitly excluded from cross building.  I'm not
sure if Guile should also be excluded.
2014-09-06 13:31:56 +02:00
Michael Raskin d81303813a Merge pull request #3465 from joelteon/picky-binutils
Stop binutils from trying to build on Darwin
2014-09-03 19:57:09 +04:00
Eelco Dolstra 9d64b445b6 swig: Disable ccache stuff
http://hydra.nixos.org/build/13936297
2014-09-02 13:07:49 +02:00
Peter Simons 1c0d15b90e Merge branch 'origin/master' into staging.
Conflicts:
	pkgs/development/libraries/ffmpeg/2.x.nix
	pkgs/development/libraries/serf/default.nix
2014-09-02 12:31:03 +02:00
Ricardo M. Correia f9e63ca20d inotify-tools: Fix hash
The hash wasn't updated when the version was bumped.
2014-09-01 15:07:54 +02:00
Michael Raskin fe549d89be Update CL-Launch 2014-08-31 18:20:06 +04:00
Pascal Wittmann 408832ac67 help2man: update from 1.44.1 to 1.46.1 and add myself as a maintainer 2014-08-30 23:59:35 +02:00
Vladimír Čunát e51f73652d Merge recent master into staging
Hydra: ?compare=1149952

Conflicts:
	nixos/doc/manual/configuration.xml (changed split file)
	nixos/modules/config/users-groups.nix (choosing filterNull instead of inline definition)
	pkgs/development/libraries/readline/readline6.3.nix (auto-solved)
2014-08-30 10:04:02 +02:00
ambrop7@gmail.com 21090fa778 Add BOSSA.
BOSSA is a flash programming utility for Atmel's SAM family of flash-based ARM microcontrollers. The motivation behind
BOSSA is to create a simple, easy-to-use, open source utility to replace Atmel's SAM-BA software. BOSSA is an acronym
for Basic Open Source SAM-BA Application to reflect that goal.
2014-08-27 13:07:43 +02:00
Bjørn Forsman c9baba9212 Fix many package descriptions
(My OCD kicked in today...)

Remove repeated package names, capitalize first word, remove trailing
periods and move overlong descriptions to longDescription.

I also simplified some descriptions as well, when they were particularly
long or technical, often based on Arch Linux' package descriptions.

I've tried to stay away from generated expressions (and I think I
succeeded).

Some specifics worth mentioning:
 * cron, has "Vixie Cron" in its description. The "Vixie" part is not
   mentioned anywhere else. I kept it in a parenthesis at the end of the
   description.

 * ctags description started with "Exuberant Ctags ...", and the
   "exuberant" part is not mentioned elsewhere. Kept it in a parenthesis
   at the end of description.

 * nix has the description "The Nix Deployment System". Since that
   doesn't really say much what it is/does (especially after removing
   the package name!), I changed that to "Powerful package manager that
   makes package management reliable and reproducible" (borrowed from
   nixos.org).

 * Tons of "GNU Foo, Foo is a [the important bits]" descriptions
   is changed to just [the important bits]. If the package name doesn't
   contain GNU I don't think it's needed to say it in the description
   either.
2014-08-24 22:31:37 +02:00
Georges Dubus 6418007dab nixbang: add expession 2014-08-24 16:07:23 +02:00
Vladimír Čunát d4e9fd2a90 Merge recent master into staging
Hydra: ?compare=1148749

Conflicts (easy):
	nixos/modules/virtualisation/containers.nix
2014-08-21 15:09:31 +02:00
Eelco Dolstra 5c53f22492 Revert "binutils: Enable sysroot support"
This reverts commit 773595540b. It
breaks stuff and we don't need it anymore.

http://hydra.nixos.org/build/13517591
2014-08-20 11:13:46 +02:00
Pascal Wittmann f06419e1a8 inotify-tools: update from 3.13 to 3.14 and add myself to maintainers
note: project has moved to github on 23 November 2009
2014-08-17 23:13:12 +02:00
Eelco Dolstra 773595540b binutils: Enable sysroot support 2014-08-17 17:25:12 +02:00
Luca Bruno 36bef2b267 gobject-introspection: refer to shlibs with absolute paths in typelibs
After this, LD_LIBRARY_PATH should not be required anymore.
The patch has been applied only for .la files, so there may
be some other cases missing.
2014-08-14 23:16:51 +02:00
Michael Raskin 8da8c805bb Update luarocks 2014-08-14 10:14:21 +04:00
Austin Seipp 6bd1b35509 arcanist: 20140717 -> 20140812
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2014-08-12 21:52:35 -05:00
Moritz Ulrich 1f221a72de dfu-programmer: Bump to 0.7. 2014-08-12 13:42:10 +02:00
Peter Simons 18250b97ae Remove 'andres' from the meta.maintainer section of all Haskell package where I
had added him earlier.
2014-08-09 13:49:24 +02:00
Eelco Dolstra e3f7dbbac8 Cleanup: Use += to append to envHooks 2014-08-09 12:47:05 +02:00
Eelco Dolstra 2def8e7499 Remove addHook
Just use bash arrays directly. I.e.

  addHook preConfigure myPreConfigure

is now

  preConfigureHooks+=(myPreConfigure)
2014-08-09 12:45:53 +02:00
Eelco Dolstra d7a4fa26b0 Fix dontPatchELF being set after the setup script has been sourced 2014-08-09 12:44:49 +02:00
Eelco Dolstra 83a41771ab Move RPATH shrinking from stdenv to a setup hook provided by patchelf 2014-08-09 12:44:49 +02:00
Vladimír Čunát 52d9c93abe Merge 'staging' into master 2014-08-08 20:13:23 +02:00
Eelco Dolstra 8a7f3c3618 Mark a bunch of packages as broken or not supported on Darwin 2014-08-08 17:59:02 +02:00
Peter Simons 9226fbf56a Merge remote-tracking branch 'origin/master' into staging. 2014-08-08 09:51:01 +02:00
William A. Kennington III 0450b0ad0a intel-gpu-tools: Add derivation 2014-08-07 01:32:43 +02:00
Joel Taylor a232a2d2c5 prevent usage of binutils on darwin 2014-08-04 13:30:05 -07:00
Peter Simons 2d326e5032 Merge remote-tracking branch 'origin/master' into staging.
Conflicts:
	pkgs/desktops/e18/enlightenment.nix
2014-08-04 16:51:47 +02:00
Bjørn Forsman 410f2a9dab lttng: align attribute name with package name
lttngModules => lttng-modules
lttngTools => lttng-tools
lttngUst => lttng-ust

But keep the old attributes around for backward compatibility.
2014-07-31 16:00:04 +02:00
Eelco Dolstra 8a10d8bbc3 autoconf: Disable tests
These take waaaay too long.
2014-07-29 17:03:48 +02:00
Mateusz Kowalczyk 7a45996233 Turn some license strings into lib.licenses values 2014-07-28 11:31:14 +02:00
Eelco Dolstra 7f410ef923 Merge remote-tracking branch 'origin/master' into staging
Conflicts:
	pkgs/misc/vim-plugins/default.nix
2014-07-22 11:00:00 +02:00
Mathnerd314 dd325fa30c Add prelink package 2014-07-19 02:16:41 +02:00
Alexander Tsamutali cc4c108965 usb-modeswitch: Update to 2.2.0. 2014-07-18 20:11:16 +04:00
Austin Seipp d5326a4af0 arcanist: 20140627 -> 20140717
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2014-07-17 01:26:44 -05:00
Eelco Dolstra b9d19af3e6 Merge remote-tracking branch 'origin/master' into staging 2014-07-15 12:14:35 +02:00
Peter Simons 78c7ea2c8f haskell-ShellCheck: update to version 0.3.4 2014-07-14 17:33:50 +02:00
Eelco Dolstra ff97b7dbe6 Merge remote-tracking branch 'origin/master' into staging 2014-07-14 17:04:55 +02:00
Peter Simons d2e731e111 Add "please don't edit" comment at the top of every auto-generated Haskell file. 2014-07-14 13:21:41 +02:00
Eelco Dolstra 973c9abdbe Fix info command
The "info" command has been broken on NixOS since
457fdb3842 (proving that nobody uses
info).
2014-07-08 15:19:08 +02:00
Eelco Dolstra 95b828de42 Merge remote-tracking branch 'origin/master' into staging 2014-07-07 13:16:26 +02:00
Bjørn Forsman 3950f2582d openocd: fix symlink to udev rules file
I made an error last time I touched this line. Fix it (.udev => .rules).
2014-07-05 14:56:10 +02:00
Luca Bruno ac711a705e dfeet: fix icons 2014-07-05 12:18:17 +02:00
Peter Simons d9d6af1bda haskell-cpphs: update to version 1.18.5 2014-07-04 11:45:42 +02:00
Eelco Dolstra 06fc1ec34d Merge remote-tracking branch 'origin/master' into staging
Conflicts:
	pkgs/servers/serfdom/default.nix
2014-07-01 11:25:41 +02:00
Eelco Dolstra 40f7b0f9df Another attempt to eradicate ensureDir
See c556a6ea46.
2014-06-30 14:56:10 +02:00
Austin Seipp 48f2ca07f4 arcanist: 20140617 -> 20140627
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2014-06-27 01:12:49 -05:00
Bjørn Forsman 32bca3976f openocd: update meta attributes
* Don't repeat package name in description
* Fix longDescription indent
* Use licenses.gpl2Plus instead of string literal "GPLv2+"
2014-06-25 20:39:10 +02:00
Bjørn Forsman 1149154e0e openocd: update 0.7.0 -> 0.8.0
* Remove unneeded --enable-<JLINK_BASED_DEBUGGER> configure flags.
  configure auto selects support for them now (and they're all enabled).

* Not everything is auto-detected; I asked on the openocd mailing list
  and they suggested a set of ./configure flags for a "distro build"
  (add them).

* Remove --enable-ft2232_libftdi because configure says that it's
  deprecated and we should use libftdi (which we are using when *not*
  passing --enable-ft2232_libftdi (or --enable-legacy-ft2232_libftdi as
  the option is now known as)).

* Add needed pkgconfig build input.

* Udev rules file has been renamed in source archive: openocd.rules =>
  99-openocd.rules.
2014-06-25 20:18:53 +02:00
Bjørn Forsman f2909d0763 dejagnu: fix description (don't repeat package name) 2014-06-23 16:16:18 +02:00
Bjørn Forsman 9883b5806a chrpath: new package
chrpath is a command line tool to adjust the RPATH or RUNPATH of ELF
binaries.

(Yes, it is similar to our patchelf tool.)

gpsd and Yocto/OpenEmbedded depend on chrpath (although we have
currently patched that dependency out of gpsd).
2014-06-22 14:21:55 +02:00
John Wiegley 812bba77f1 swig: ccache tests broken on Darwin with Gcc 4.8.3 2014-06-21 23:53:49 -07:00
Peter Simons 72dae9f3e0 ShellCheck: re-generate with cabal2nix 2014-06-20 14:56:33 +02:00
Austin Seipp 5cf3fb7cb6 arcanist: 20140606 -> 20140617
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2014-06-17 15:48:51 -05:00
Vladimír Čunát 9757785295 Merge recent master 2014-06-15 17:55:35 +02:00
Michael Raskin ed20f939f5 Update CL-Launch 2014-06-14 00:23:11 +04:00
Ricky Elrod 4a2dd52b54 add ShellCheck
Signed-off-by: Ricky Elrod <ricky@elrod.me>
2014-06-12 21:27:32 -04:00
Vladimír Čunát f2352f7ecf Merge recent master 2014-06-10 20:14:08 +02:00
Vladimír Čunát 5a98b9f514 Merge recent master into p/stdenv
Merged just before the pypi update, as it seems to cause problems on Hydra.
2014-06-09 19:07:31 +02:00
Austin Seipp 678def6d30 Fix again, thx to @CodeBlock
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2014-06-09 01:29:53 -05:00
Austin Seipp 3f6197cafe arcanist: Fix this because how did it work
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2014-06-09 01:25:27 -05:00
Austin Seipp 4dd5496bd4 arcanist: build xhpast for 'arc liberate'
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2014-06-07 07:12:02 -05:00
Austin Seipp 17368bdf8e arcanist: update
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2014-06-06 23:01:13 -05:00
Luca Bruno bc53b9ec4c opengrok: new package
Source code search and cross reference engine

http://opengrok.github.io/OpenGrok/
2014-06-04 14:29:54 +02:00
Bjørn Forsman 3b3d1d075c avrdude: update 6.0.1 -> 6.1 2014-05-31 14:20:15 +02:00
Bjørn Forsman c7c32e1d09 avrdude: add extra dependencies: libelf, libftdi1, readline
They are strictly speaking optional, but they provide useful features...
2014-05-31 14:20:04 +02:00
Bjørn Forsman be524e925b avrdude: rewrite expression
* Use stdenv.mkDerivation instead of composableDerivation.
  stdenv.mkDerivation is the current coding standard and is easier to
  read (IMHO).

* Remove the 'parportSupport' flag because it doesn't do anything.
  (Parallel port support is still enabled.)

* Remove unneeded --disable-dependency-tracking flag to ./configure; our
  default builder does that already.

* Fix documentation build. But it is still disabled (by default),
  because texLive is such a big dependency. There is always the man
  page.

* Update 'meta' attributes
2014-05-31 14:11:59 +02:00
Austin Seipp 7b0736b7c0 arcanist: Fix php exec (needed for arc diff)
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2014-05-30 15:19:18 -05:00
Austin Seipp 90f01d6a68 arcanist: 20140521 -> 20140530
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2014-05-30 04:38:36 -05:00
Vladimír Čunát 872860e6de Merge #1187 into p/stdenv
Tested building firefox, kdelibs, evince on x86_64-linux.
2014-05-29 22:16:07 +02:00
Rob Vermaas fdc78ad9e0 Merge pull request #2760 from offlinehacker/pkgs/grafana/add
Add grafana, A Graphite & InfluxDB Dashboard and Graph Editor
2014-05-28 08:33:43 +02:00
Michael Raskin 97c61e9a44 Updating LuaRocks 2014-05-28 01:33:28 +04:00
Michael Raskin 700d332e7d Updating CL-Launch 2014-05-28 01:33:28 +04:00
Jaka Hudoklin a8a9c78af8 Add grafana, A Graphite & InfluxDB Dashboard and Graph Editor 2014-05-27 21:02:55 +02:00
Luca Bruno db3b440150 pkg-config: update to 0.28 (close #2769) 2014-05-27 11:48:08 +02:00
wmertens 8ad1a0ceaf swig: enable on Darwin (close #2326)
Verified on OS X 10.9.2 to build and check, dependents build fine too.

@vcunat enabled doCheck as it works for him on x86_64-linux;
also did style nitpick modification, and changed platforms to .all
according to the homepage http://www.swig.org/compat.html
2014-05-26 21:50:27 +02:00
Bjørn Forsman e1d2e0d380 srecord: update 1.62 -> 1.63 2014-05-25 13:44:31 +02:00
Austin Seipp 7685754f0f arcanist: Fix license
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2014-05-21 15:21:50 -05:00
Austin Seipp 79a0ae902f arcanist: version 20140521
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2014-05-21 15:17:52 -05:00
Ricardo M. Correia 2902c8f628 binutils: Add PaX patch 2014-05-15 13:25:49 +02:00
Eelco Dolstra 46b77d3bb4 fetchurl_gnome -> fetchurlGnome 2014-05-08 15:30:17 +02:00
John Wiegley 66f0275b41 Disable Texinfo tests on Darwin 2014-05-05 01:03:51 -05:00
Austin Seipp f21d619558 nixpkgs: move frama-c to a more appropriate directory
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2014-05-01 19:14:08 -05:00
Austin Seipp 628e914f2b frama-c: overhaul, upgrade to 20140301-Neon
This massively upgrades the frama-c package to be far more useful,
including support for a lot more plugins, including Jessie.

Jessie unfortunately requires that its plugin is installed alongside
frama-c, so we install why2 (where it lives) along with frama-c now.
This increases the size, but makes it much more useful.

In the future, it may be possible to split out the build such that why2
is a separate expression and frama-c only installs the plugin, rather
than all of why2. However, right now this is fine.

Furthermore, why3 is now a dependency - the Jessie plugin can use
either, and defaults to Why3 now. Per the design, Frama-C can also go
from Why2->Why3 as well.

We also make Coq and Alt-Ergo dependencies, so that out-of-the-box users
get at least one SMT solver and a prover for support.

Signed-off-by: Austin Seipp <aseipp@pobox.com>
2014-05-01 02:42:34 -05:00
Austin Seipp 5f702d52f4 ocamlgraph: upgrade to 1.8.5
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2014-05-01 02:30:39 -05:00
aszlig 625d7b9043
Merge pull request #1928 from 'cross-win-osx'.
This includes a lot of fixes for cross-building to Windows and Mac OS X
and could possibly fix things even for non-cross-builds, like for
example OpenSSL on Windows.

The main reason for merging this in 14.04 already is that we already
have runInWindowsVM in master and it doesn't work until we actually
cross-build Cygwin's setup binary as the upstream version is a fast
moving target which gets _overwritten_ on every new release.

Conflicts:
	pkgs/top-level/all-packages.nix
2014-04-21 10:00:35 +02:00
Vladimír Čunát cb83796abb elfutils: update 0.155 -> 0.158 2014-04-20 18:24:11 +02:00
Vladimír Čunát b4df087f14 elfutils: fix CVE-2014-0172
Patch taken from upstream mailing-list.
2014-04-20 18:24:11 +02:00
Matt Whiteley 552d66cd9e Add swig-3.x 2014-04-20 11:30:31 +01:00
Bjørn Forsman 5c2d17780d uhd: update 3.5.4 -> 3.7.0
Build tested (with gnuradio).
2014-04-15 07:11:41 +02:00
Bjørn Forsman 6989b9a3f9 babeltrace: update from 1.1.1 to 1.2.1 2014-04-13 10:47:17 +02:00
Bjørn Forsman d1f875c6af lttng project: update from 2.3.0 to 2.4.1
(And update liburcu to 0.8.4 according to release notes for lttng 2.4.x.)

In addition to new features and bug fixes, version 2.4.x is needed to build
against Linux 3.12 (our new stable kernel).
2014-04-13 10:47:16 +02:00
John Wiegley 010132e302 Change several package constraints from linux to unix
They all build on Darwin.
2014-04-12 16:01:16 -05:00
John Wiegley b296895abe Allow lsof to build on darwin (fixes #2219)
Closes #2219, closes #2223

Signed-off-by: Austin Seipp <aseipp@pobox.com>
2014-04-12 11:14:18 -05:00