Archive/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-10-23 12:00:35 -04:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity
36919 commits 224 branches 122 tags 7.6 GiB
Commit graph

1552 commits

Author SHA1 Message Date
Peter Simons 057ec53542 haskell-haskdogs: update to version 0.3.2 2013-05-13 13:43:44 +02:00
Mathijs Kwik 81022e4b0a neoload: upgrade to 4.1.2 2013-05-12 22:46:41 +02:00
Bjørn Forsman df09b7fb5f tcptrack: new package 
tcptrack is a small libpcap based program (with ncurses UI) for live TCP
connection monitoring.

It seems upstream homepage is down, so download the source code from a
fedora server instead.
 2013-05-12 14:03:24 +02:00
Bjørn Forsman 7f1509aba6 ninja: use version attribute 
...to avoid the risk of downloading a different version than the package
name suggests (i.e. on the next version bump).
 2013-05-11 12:01:33 +02:00
Bjørn Forsman beb2a7a579 ninja: add description and license 2013-05-11 12:01:31 +02:00
Bjørn Forsman 5ab346a327 ninja: move out of pythonPackages 
ninja is a build system written in C++ that just happens to use python
to build/install *itself*. It is not a "python package".

After this commit, ninja will be at pkgs.ninja instead of
pkgs.pythonPackages.ninja.
 2013-05-11 12:01:00 +02:00
Peter Simons 3b2254a3af Remove myself from the meta.maintainer field of most Haskell packages. 
There is no point in receiving hundreds of e-mails; I cannot read them anyway.
 2013-05-11 00:36:59 +02:00
Peter Simons 60195e10ba haskell-haskdogs: update to version 0.3.1 2013-05-10 21:55:38 +02:00
Evgeny Egorochkin 9a2685af9b Merge pull request #515 from bjornfor/openocd 
OpenOCD: bump from 0.6.1 to 0.7.0
 2013-05-10 08:18:52 -07:00
Bjørn Forsman 263b411639 openocd: update homepage 
The old one still works, but it redirects to the new one:
http://openocd.sourceforge.net/
 2013-05-10 15:30:25 +02:00
Bjørn Forsman 6ad413668e openocd: bump to version 0.7.0 
OpenOCD 0.7.0 has grown a dependency on libusb1.
 2013-05-10 15:30:25 +02:00
Vladimír Čunát ec3965d8d0 Revert Merge x-updates into master due to mesa bloat 
See #490 discussion.

This reverts commit 1278859d31, reversing
changes made to 0c020c98f9.

Conflicts:
	pkgs/desktops/xfce/core/xfce4-session.nix (take master)
	pkgs/lib/misc.nix (auto)
 2013-05-09 14:03:35 +02:00
Phreedom 7a4b06e0e8 Merge pull request #511 from bjornfor/buildbot 
Buildbot version bump and add buildbot-slave
 2013-05-08 15:45:20 -07:00
Bjørn Forsman 9fa9afe71e buildbot-slave: new package 
Tested with buildbot (master).
 2013-05-08 22:26:43 +02:00
Bjørn Forsman a36577367e buildbot: bump to version 0.8.7p1 (latest stable) 
* 0.8.7p1 doesn't contain *.info documentation; use manpage
  instead
* Update meta.description to not contain the package name (redundant)
* 0.8.7p1 only builds with python dateutil==1.5, so that has to be added
  as well

Runtime tested with the buildbot slave that is added in the next commit.
 2013-05-08 22:09:05 +02:00
Vladimír Čunát 1278859d31 Merge branch 'master' into x-updates 
Conflicts (just splitting version from name):
	pkgs/os-specific/linux/systemd/default.nix
 2013-05-08 13:46:46 +02:00
Shea Levy f8f9f3b1cc binutils_gold: Don't require unneded dependencies. 
Based on my scan of the logs they weren't even used when enabled

Signed-off-by: Shea Levy <shea@shealevy.com>
 2013-05-04 18:05:45 -04:00
Peter Simons 0b946a6374 haddock: update to version 2.13.2 2013-05-03 11:38:57 +02:00
Peter Simons 318b7e2eeb Merge pull request #495 from bjornfor/stlink 
stlink: new package
 2013-05-02 06:21:37 -07:00
Bjørn Forsman 8df1afa9c9 stlink: new package 
stlink is an in-circuit debugging and programming tool for ST-Link v1
and v2 devices. It is similar to OpenOCD but just for ST-Link devices.

  https://github.com/texane/stlink

IMPORTANT: You need permissions to access the stlink usb devices. Here
are example udev rules for stlink v1 and v2 so you don't need to have
root permissions (copied from <stlink>/49-stlink*.rules):

  SUBSYSTEMS=="usb", ATTRS{idVendor}=="0483", ATTRS{idProduct}=="3744", MODE:="0666", SYMLINK+="stlinkv1_%n"
  SUBSYSTEMS=="usb", ATTRS{idVendor}=="0483", ATTRS{idProduct}=="3748", MODE:="0666", SYMLINK+="stlinkv2_%n"
 2013-05-01 23:29:59 +02:00
Vladimír Čunát 8fc5fb6ecc Merge branch 'master' into x-updates 2013-05-01 08:14:15 +02:00
Lluís Batlle i Rossell b4fd5fdd83 gdb: update to 7.6 2013-04-29 13:44:23 +04:00
Vladimír Čunát bde20f3e88 Merge branch 'master' into x-updates 
Conflicts (just taken x-updates):
	pkgs/servers/x11/xorg/overrides.nix
 2013-04-24 06:29:09 +00:00
Peter Simons acd879f36f xxdiff: update to current HEAD of the source repository 2013-04-23 12:11:58 +02:00
Peter Simons afd37640e7 haskell-hlint: update to version 1.8.44 2013-04-22 14:14:39 +02:00
Vladimír Čunát 1b349b06d8 itstool: update 2013-04-20 10:25:24 +02:00
Vladimír Čunát ec736312d4 Merge branch 'master' into x-updates 
Conflicts:
	pkgs/development/compilers/vala/default.nix (it's different version)
	pkgs/development/libraries/cairo/default.nix (trivial)
 2013-04-17 18:26:28 +02:00
viric d2d69902e8 Merge pull request #456 from bjornfor/premake 
premake: bump to version 4.3
 2013-04-15 14:35:46 -07:00
Michael Raskin 0d9d2a65ba Adding libffi to autogen dependencies to fix the build 2013-04-15 09:46:42 +04:00
Vladimír Čunát 17ae1617dc Merge branch 'master' into x-updates 
Conflicts (systemd version is split on x-updates):
	pkgs/os-specific/linux/systemd/default.nix
 2013-04-13 12:21:31 +02:00
Peter Simons 1bec0e5a34 haskell-cabal-dev: update to version 0.9.2 2013-04-13 00:13:22 +02:00
Eelco Dolstra 4adad458e7 Remove the "proprietary" license 
We already had "unfree".
 2013-04-12 14:37:50 +02:00
Vladimír Čunát 8249695b61 Merge branch 'master' into x-updates 
Needed that to fix the tarball.
 2013-04-11 23:31:33 +02:00
Bjørn Forsman 38c7d196ac premake: bump to version 4.3 
aacskeys depends on premake3, so keep that version around.
 2013-04-08 21:06:54 +02:00
Peter Simons c976480a01 elfutils: disable -Werror to fix the build 
nm.c: In function 'show_symbols_sysv':
  nm.c:773:27: error: argument to 'sizeof' in 'snprintf' call is the same expression as the destination; did you mean to provide an explicit length? [-Werror=sizeof-pointer-memaccess]
      snprintf (name, sizeof name, "[invalid sh_name %#" PRIx32 "]",
                             ^
  cc1: all warnings being treated as errors
 2013-04-07 23:33:20 +02:00
Peter Simons 1ebb925939 haskell-cabal2nix: update to version 1.49 2013-04-06 15:56:27 +02:00
Peter Simons d81e8a9cc3 gnulib: update to version 0.0-7901-g076ac82 2013-04-06 15:09:25 +02:00
Vladimír Čunát eb2e46aab2 Merge branch 'master' into x-updates 
Conflicts:
	pkgs/applications/graphics/rawtherapee/default.nix
	pkgs/applications/misc/blender/default.nix
	pkgs/applications/networking/browsers/chromium/sources.nix
	pkgs/os-specific/linux/kernel/linux-3.9.nix
	pkgs/top-level/all-packages.nix
 2013-04-04 21:43:40 +02:00
Peter Simons e1b932689f haskell-cabal2nix: update to version 1.48 2013-04-04 16:27:57 +02:00
Peter Simons e71abf64c8 haskell-keter: update to version 0.3.6.1 2013-04-04 16:22:47 +02:00
Peter Simons 3c66736304 haskell-uuagc: update to version 0.9.42.3 2013-04-04 16:18:08 +02:00
Pascal Wittmann 310b1221e1 New: keter, Yesod deployment manager. 
Including the dependencies: unix-process-conduit and networkConduitTls.
 2013-04-03 23:50:40 +02:00
Moritz Ulrich 05f2ea2d12 Add myself (the-kenny) to the maintainer list. 
Signed-off-by: Moritz Ulrich <moritz@tarn-vedra.de>
 2013-03-30 21:05:15 +01:00
Moritz Ulrich d2cb352ad9 leiningen: Update to 2.1.2 
Signed-off-by: Moritz Ulrich <moritz@tarn-vedra.de>
 2013-03-30 20:09:39 +01:00
Peter Simons 600d023c33 texinfo-5.1: install tex-related files like 'texinfo.tex' 2013-03-26 01:16:15 +01:00
Peter Simons 96dbbc7e21 gnulib: update to version 0.0-7899-g34f8464 and provide a proper meta section 2013-03-26 01:16:15 +01:00
Peter Simons ac86eed59c gnumake: disable test suite on FreeBSD 
One test fails, unfortunately, but I'm not sure what to do about it.
 2013-03-25 12:44:23 +01:00
Peter Simons d2fff5ed22 gnulib: add version 0.0-7898-gdb9cad7 2013-03-24 23:32:14 +01:00
Peter Simons 6fc2cccfe6 Add myself as a maintainer to all Haskell packages (re-)generated by hackage4nix. 2013-03-23 15:58:14 +01:00
Carles Pagès 381660cf31 doxygen: update to 1.8.3.1 
There are many bugfixes and some new features over 1.8.1.
 2013-03-22 15:44:27 +01:00
Peter Simons 8e9ff8e1ab cppi: update to version 1.18 2013-03-18 11:37:46 +01:00
Vladimír Čunát b1eeae8cac Merge branch 'master' into x-updates 
Conflicts (easy):
	pkgs/desktops/xfce/core/xfdesktop.nix
	pkgs/development/libraries/cairo/default.nix
	pkgs/development/libraries/pango/default.nix
 2013-03-17 11:28:28 +01:00
Malcolm Matalka 27e2fb6895 Upgrade to 1.0.0 2013-03-15 12:41:01 +01:00
Peter Simons a8a6fd4063 texinfo: update to version 5.1 2013-03-13 15:13:40 +01:00
Lluís Batlle i Rossell 183b37645b cmake setup-hook: fixing cmakeFlagsArray 
The array wasn'te expanded properly, the spaces weren't preserved.
 2013-03-12 11:31:58 +01:00
Peter Simons f21539578e haskell-alex: update to version 3.0.5 2013-03-11 11:26:15 +01:00
Peter Simons e45d55964b alex: update to version 3.0.5 2013-03-11 11:26:14 +01:00
Vladimír Čunát 86639d9bb9 Merge branch 'master' into x-updates 
Conflicts (taken master versions):
	pkgs/desktops/xfce-4.8/core/libxfcegui4.nix
	pkgs/desktops/xfce/applications/gigolo.nix
	pkgs/desktops/xfce/applications/mousepad.nix
	pkgs/desktops/xfce/applications/ristretto.nix
	pkgs/desktops/xfce/applications/terminal.nix
	pkgs/desktops/xfce/applications/xfce4-mixer.nix
	pkgs/desktops/xfce/applications/xfce4-notifyd.nix
	pkgs/desktops/xfce/applications/xfce4-taskmanager.nix
	pkgs/desktops/xfce/art/xfce4-icon-theme.nix
	pkgs/desktops/xfce/core/exo.nix
	pkgs/desktops/xfce/core/garcon.nix
	pkgs/desktops/xfce/core/gtk-xfce-engine.nix
	pkgs/desktops/xfce/core/libxfce4ui.nix
	pkgs/desktops/xfce/core/libxfce4util.nix
	pkgs/desktops/xfce/core/libxfcegui4.nix
	pkgs/desktops/xfce/core/thunar-volman.nix
	pkgs/desktops/xfce/core/thunar.nix
	pkgs/desktops/xfce/core/tumbler.nix
	pkgs/desktops/xfce/core/xfce4-appfinder.nix
	pkgs/desktops/xfce/core/xfce4-panel.nix
	pkgs/desktops/xfce/core/xfce4-power-manager.nix
	pkgs/desktops/xfce/core/xfce4-session.nix
	pkgs/desktops/xfce/core/xfce4-settings.nix
	pkgs/desktops/xfce/core/xfconf.nix
	pkgs/desktops/xfce/core/xfdesktop.nix
	pkgs/desktops/xfce/core/xfwm4.nix
	pkgs/desktops/xfce/panel-plugins/xfce4-cpufreq-plugin.nix
	pkgs/development/libraries/webkit/default.nix
	pkgs/top-level/all-packages.nix
 2013-03-09 17:55:37 +01:00
Shea Levy b634efe63c ocamlPackages.opam: Fix indentation 
Signed-off-by: Shea Levy <shea@shealevy.com>
 2013-03-08 17:12:56 -05:00
Shea Levy 66ad165829 Merge branch 'add-opam-0.9.5' of git://github.com/orbitz/nixpkgs 
This adds the opam ocaml package, and also adds orbitz as a maintainer.
I've tested that it builds, nothing more.

Signed-off-by: Shea Levy <shea@shealevy.com>
 2013-03-08 17:10:54 -05:00
orbitz 55be059467 Add myself to maintainers, remove 0.9.4, set maintainer for this packge to me 2013-03-08 22:59:54 +01:00
orbitz 98a6759bc7 Delete 0.9.4 2013-03-08 22:48:58 +01:00
orbitz fd48192018 Add opam 0.9.5 2013-03-08 22:42:22 +01:00
Peter Simons 1f38a4ca66 haskell-cabal2nix: update to version 1.47 2013-03-08 13:44:59 +01:00
orbitz 6da29419e4 Add opam 0.9.4 2013-03-08 11:56:50 +01:00
Eelco Dolstra 234c6b74c6 Merge remote-tracking branch 'origin/stdenv-updates' 2013-03-07 23:09:05 +01:00
Eelco Dolstra 674c51af3c Merge remote-tracking branch 'origin/master' into stdenv-updates 2013-03-07 19:33:52 +01:00
Jack Cummings 96f662f746 lsof-4.87 2013-03-07 10:23:43 -08:00
Peter Simons 1fdd780e2c ctags: update to SVN revision 804 2013-03-06 12:38:49 +01:00
Peter Simons 70836d5e64 haskell-cabal2nix: update to version 1.45 2013-03-06 11:06:01 +01:00
Rickard Nilsson 14ceed2ddb gob2: Use fetchurl_gnome. Previous URL disappeared. 2013-03-03 20:52:31 +01:00
Vladimír Čunát 26af997d41 Merge branch 'master' into stdenv-updates 
Conflicts (simple):
	pkgs/applications/networking/browsers/chromium/default.nix
	pkgs/development/libraries/libsoup/default.nix
	pkgs/os-specific/linux/kernel/manual-config.nix
	pkgs/os-specific/linux/qemu-kvm/default.nix
 2013-03-02 10:41:53 +01:00
Peter Simons 97c3f61e08 haskell-jailbreak-cabal: update to version 1.1 2013-02-28 11:31:50 +01:00
Vladimír Čunát 9bc36c9729 gnumake381: fix the patching because of gnumake 2013-02-27 15:26:56 +01:00
Vladimír Čunát d3821edb9e gnumake: patch the patches so it looks nice 2013-02-27 15:26:56 +01:00
Vladimír Čunát 8ad7893bfc make: PATCHES from gentoo 
also needed for updated firebird to build
 2013-02-27 15:26:55 +01:00
Peter Simons 55b67195d4 haskell-packunused: add version 0.1.0.0 2013-02-27 12:00:52 +01:00
Cillian de Róiste d2b6645e82 Add chromedriver: a server for running Selenium tests in Chrome 2013-02-26 00:41:10 +01:00
Peter Simons e16c5eab9f haskell-jailbreak-cabal: update to version 1.1 2013-02-25 01:44:09 +01:00
Peter Simons 04b2efff19 Merge branch 'master' into stdenv-updates. 2013-02-25 01:26:26 +01:00
Peter Simons e993649477 haskell-cabal2nix: update to version 1.44 2013-02-25 01:13:44 +01:00
Peter Simons a540dd5650 alex: disable 'doCheck' to avoid compilation errors 
The test-suite stanza is incomplete.
 2013-02-25 00:32:42 +01:00
Peter Simons 1fac9c5a41 haddock: disable 'doCheck' to avoid compilation errors 
The test-suite stanza is incomplete.
 2013-02-25 00:32:42 +01:00
Peter Simons a30df95691 Re-generate all Haskell packages with the latest version of cabal2nix. 
This change brings support for building and running the regressions test suites.
 2013-02-25 00:32:40 +01:00
Peter Simons 024f036ecd alex: disable 'doCheck' to avoid compilation errors 
The test-suite stanza is incomplete.
 2013-02-24 22:22:02 +01:00
Peter Simons 6d212a9129 haddock: disable 'doCheck' to avoid compilation errors 
The test-suite stanza is incomplete.
 2013-02-24 22:21:54 +01:00
Peter Simons 7165babaf1 Re-generate all Haskell packages with the latest version of cabal2nix. 
This change brings support for building and running the regressions test suites.
 2013-02-24 22:09:07 +01:00
Peter Simons 5f32207dfc Merge remote-tracking branch 'origin/master' into stdenv-updates. 2013-02-24 19:27:08 +01:00
Peter Simons 9fc277e0b6 haskell-cabal2ghci: add version 0.0.1.0 2013-02-24 11:00:52 +01:00
Peter Simons d4b8008a44 haskell-tar: dropped obsolete version 0.3.2.0 2013-02-24 10:44:17 +01:00
Peter Simons c2fc8c6da3 cabal-dev: update to Git version to fix build with ghc 7.6.2 2013-02-24 10:42:30 +01:00
Vladimír Čunát 25d00bf765 oprofile: fix via minor update 2013-02-23 23:49:48 +01:00
Vladimír Čunát e6e3035dbf autogen: minor update and fix by disabling tests 
/dev/tty is missing
 2013-02-23 14:44:38 +01:00
Shea Levy acd4299e75 Merge branch 'master' into stdenv-updates 
Conflicts:
	pkgs/applications/networking/browsers/chromium/default.nix
	pkgs/top-level/all-packages.nix

Merge conflicts seemed trivial, but a look from viric and aszlig would be nice.
 2013-02-21 11:13:30 -05:00
Peter Simons 6d560fb081 Merge pull request #308 from bjornfor/master 
openocd: bump from 0.4.0 to 0.6.1
 2013-02-21 05:42:56 -08:00
Vladimír Čunát 0d72174dbd Merge branch stdenv-updates into x-updates 
x-updates is supposed to merge after stdenv-updates, so let's test it

Conflicts:
	pkgs/development/libraries/gtk+/2.x.nix (both updated, taking newer)
	pkgs/development/libraries/mesa/default.nix (taking nativeBuildInputs)
 2013-02-21 12:43:00 +01:00
Peter Simons 773c5a04e4 haskell-alex: update to version 3.0.4 2013-02-20 11:35:36 +01:00
Shea Levy aacca1902c Merge branch 'upstream-master' into stdenv-updates 2013-02-19 10:09:39 -05:00
Peter Simons 7dfd7a93d4 haskell-BNFC: fix broken version number in executable 2013-02-19 13:26:01 +01:00
Peter Simons dfebdde16f texinfo: added version 5.0 2013-02-19 12:53:44 +01:00
Lluís Batlle i Rossell bcbf9472ea Merge remote-tracking branch 'central/master' into x-updates 2013-02-18 13:49:11 +01:00
Peter Simons 9e68734d61 Merge remote-tracking branch 'origin/master' into stdenv-updates. 2013-02-18 11:54:56 +01:00
Peter Simons b91414b12e haskell-SourceGraph: update to version 0.7.0.5 2013-02-18 11:11:17 +01:00
Bjørn Forsman ff47b7b6ec openocd: bump from 0.4.0 to 0.6.1 
Also:
 * Remove commented out "GuruPlug installer" stuff that hasn't worked
   since openocd 0.2.0 (according to the comments).
 * Build with support for the following JTAG hardware:
   - Segger J-Link
   - Raisonance RLink
   - Keil ULINK
   - STMicroelectronics ST-Link
 2013-02-16 18:01:02 +01:00
Eelco Dolstra 2aa6f262cb Merge remote-tracking branch 'origin/master' into stdenv-updates 2013-02-15 13:36:34 +01:00
Vladimír Čunát f536aa7e7a Merge pull request #293 from vcunat/vlada/intltool 
unify intltool
 2013-02-14 12:29:29 -08:00
Shea Levy 45f6008817 cmake setup hook: If configurePhase is set, don't override it 2013-02-07 14:03:23 -05:00
Shea Levy b3ec511a1a sysbench: Fix URL 2013-02-06 15:38:44 -05:00
Aristid Breitkreuz d6f5d3c9a8 pydb: mirror://sourceforge.net/ is no longer valid 2013-02-05 20:35:39 +01:00
Vladimír Čunát efd432e862 intltool: add propagated gettext 2013-01-31 17:41:07 +01:00
Vladimír Čunát 38ee738b8a unify intltool 
IMHO:
	- It's no longer GNOME package.
	- It seems best for everyone to use the newest version.
 2013-01-31 16:43:52 +01:00
Lluís Batlle i Rossell 36f6f003fe docutils: updating to 0.10 
mplayer2 required "rst2man.py", not available in 0.5.
 2013-01-31 00:23:55 +01:00
Peter Simons e816889ccc haskell-hlint: update to version 1.8.43 2013-01-30 11:29:59 +01:00
Eelco Dolstra 5cad2c497d valgrind: Support Glibc 2.17 
http://hydra.nixos.org/build/3894741
 2013-01-28 17:19:03 +01:00
Eelco Dolstra d8f37cdf9a gdb: Update to 7.5.1 2013-01-28 15:47:22 +01:00
Shea Levy 6ce14a6729 leiningen: Update to 2.0.0. 
Patch thanks to Patrick Lee.
 2013-01-27 20:38:32 -05:00
Lluís Batlle i Rossell 3b26ba7019 Merge remote-tracking branch 'central/master' into stdenv-updates 
Conflicts:
	pkgs/os-specific/linux/alsa-utils/default.nix
 2013-01-27 11:32:12 +01:00
Peter Simons 3395d065ee haskell-cpphs: update to version 1.16 2013-01-25 14:52:04 +01:00
Peter Simons 8db11ef402 haskell-hlint: update to version 1.8.42 2013-01-25 14:52:04 +01:00
Peter Simons 7aa6680ecb haskell-cabal2nix: update to version 1.43 2013-01-25 14:52:04 +01:00
Peter Simons ce2423a6e7 haskell-BNFC: update to version 2.6.0.3 2013-01-25 14:52:04 +01:00
Rickard Nilsson 1886d1db6a Merge remote-tracking branch 'upstream/master' into stdenv-updates 2013-01-20 16:53:21 +01:00
Peter Simons f8447dc1e0 haskell-hlint: update to version 1.8.41 2013-01-20 16:42:50 +01:00
Mathijs Kwik 0890c45498 buildNativeInputs -> nativeBuildInputs 2013-01-13 11:33:45 +01:00
Peter Simons b33ad366a1 Merge branch 'master' into stdenv-updates. 2013-01-11 15:46:10 +01:00
Peter Simons a547de1ecb haskell-hlint: update to version 1.8.40 2013-01-07 12:18:36 +01:00
Peter Simons 9e9cd7b529 Merge branch 'master' into stdenv-updates. 2013-01-04 21:00:53 +01:00
Peter Simons fdf4dddac1 automake: add version 1.13.1 2013-01-04 20:51:45 +01:00
Peter Simons 21dcee77c0 haskell-splot: update to version 0.3.8 2013-01-04 19:24:18 +01:00
Peter Simons e1a9fb4f98 haskell-SourceGraph: update to version 0.7.0.4 2013-01-04 19:24:17 +01:00
Lluís Batlle i Rossell b58780c43d Merge remote-tracking branch 'eelco/master' into stdenv-updates 
Conflicts:
	pkgs/development/compilers/gcc/4.7/default.nix

Trivial solution.
 2012-12-28 23:28:16 +01:00
Eelco Dolstra 84779a6f7d Remove unnecessary parentheses around if conditions 
Pet peeve...
 2012-12-28 19:54:15 +01:00
Eelco Dolstra ab3eeabfed Rename buildNativeInputs -> nativeBuildInputs 
Likewise for propagatedBuildNativeInputs, etc.  "buildNativeInputs"
sounds like an imperative rather than a noun phrase.
 2012-12-28 19:20:09 +01:00
Eelco Dolstra 5be0a9acd7 Rename hostDrv -> crossDrv, buildDrv -> nativeDrv 
This is for consistency with terminology in stdenv (and the terms
"hostDrv" and "buildDrv" are not very intuitive, even if they're
consistent with GNU terminology).
 2012-12-28 19:08:19 +01:00
Arseniy Alekseyev d1e70f9b84 Updated sysprof from 1.0.12 to 1.2.0. 
Updated the sysprof package. I've removed 1.0.12 because itwas failing to build.
It also allowed to simplify the expression because 1.2.0 no longer
includes a kernel module.
 2012-12-27 01:02:06 +00:00
Lluís Batlle i Rossell 499e686ca5 distcc: Fixing indentation 
Noticed by niksnut.
 2012-12-26 23:32:23 +01:00
Lluís Batlle i Rossell 67c73aafe8 Fixing distccMasquerade to have gas too 2012-12-26 21:54:09 +00:00
Lluís Batlle i Rossell d779fc2da9 distccMasquerade: some fixes 2012-12-26 21:54:07 +00:00
Lluís Batlle i Rossell ea5f15813c distcc: Adding a derivation that prepares a masquerade for distccd 2012-12-26 21:54:06 +00:00
Lluís Batlle i Rossell 3e57886620 Adding wrappers for distcc, similar to those of ccache. 2012-12-26 21:53:57 +00:00
Peter Simons b0e92ac388 haskell-timeplot: update to version 1.0.19 2012-12-25 11:35:04 +01:00
Peter Simons 5827744a0e haskell-splot: update to version 0.3.7 2012-12-25 11:35:04 +01:00
Lluís Batlle i Rossell d476a7eac0 distcc: making it build 2012-12-22 17:13:47 +01:00
Lluís Batlle i Rossell d9f4b0a2e4 binutils: update to 2.23.1, and addition of patch for DT_NEEDED 2012-12-20 23:05:27 +01:00
Mathijs Kwik 4d57a834f9 phantomjs: it seems upx packing is only used on x86_64 2012-12-14 00:27:43 +01:00
Mathijs Kwik fbee57defb new package: casperjs 2012-12-13 17:51:03 +01:00
Mathijs Kwik 2cdc567ff5 new package: phantomjs 2012-12-13 17:51:03 +01:00
Eelco Dolstra f364619e22 Merge remote-tracking branch 'origin/master' into stdenv-updates 2012-12-12 17:01:20 +01:00
Peter Simons f9ad750bdc haskell-uuagc: update to version 0.9.42.2 2012-12-08 11:35:18 +01:00
Peter Simons f38f3e19f6 haskell-uuagc-cabal: update to version 1.0.4.0 2012-12-08 11:35:18 +01:00
Peter Simons 45ffccf33a haskell-hlint: update to version 1.8.39 2012-12-08 11:35:18 +01:00
Michael Raskin d3e5b8feee Fix dummy pseudo-updates being found for some packages 2012-12-08 13:05:43 +04:00
Eelco Dolstra 5e256ccc88 Merge remote-tracking branch 'origin/master' into stdenv-updates 2012-12-04 17:12:35 +01:00
Mathijs Kwik 2b4fba3d03 neoload: upgrade to 4.1.1 2012-12-04 12:02:36 +01:00
Peter Simons 158388b521 haskell-cpphs: update to version 1.15 2012-12-03 16:12:12 +01:00
Peter Simons b690d7a20b haskell-hlint: update to version 1.8.37 2012-12-03 16:12:12 +01:00
Rob Vermaas faaa1581e2 Added re2c 0.13.5 2012-12-02 00:25:01 +01:00
Eelco Dolstra 72684fb42f Remove support for the obsolete powerpc-darwin and i686-darwin platforms 2012-11-29 14:10:49 +01:00
Eelco Dolstra 5553546c21 Remove a bunch of unreferenced files 
Plus a small number of obsolete packages (like old versions of qemu).
 2012-11-29 13:43:37 +01:00
Mathijs Kwik 288d98afd9 neoload: upgrade to 4.1.0 2012-11-27 02:14:06 +01:00
Florian Friesdorf fc57b8940b intltool: fix license attribute name 2012-11-26 16:11:32 +01:00
Michael Raskin 7333c01dba Update Compiz 2012-11-25 23:58:04 +04:00
Lluís Batlle i Rossell 2880190491 valgrind: updating to bugfix release 3.8.1 2012-11-23 15:04:51 +01:00
Michael Raskin 1c32897905 Merge pull request #187 from orbitz/ocaml-findlib-add-topfind 
Ocaml findlib add topfind
 2012-11-21 21:34:09 -08:00
Peter Simons f67d5a9a39 Merge branch 'master' into stdenv-updates. 
Conflicts have been resolved in:

        pkgs/tools/misc/file/default.nix
        pkgs/top-level/all-packages.nix
        pkgs/top-level/python-packages.nix
 2012-11-21 16:20:36 +01:00
Mathijs Kwik b155a188e3 neoload: link used jre to a location which is hard-coded into some binaries 2012-11-21 09:49:35 +01:00
Peter Simons 306cb4d9b5 haskell-cabal2nix: update to version 1.42 2012-11-20 14:42:19 +01:00
Peter Simons 84591241db haskell-hlint: update to version 1.8.35 2012-11-20 14:02:04 +01:00
Peter Simons f1733b361f haskell-cabal2nix: update to version 1.41 2012-11-20 14:02:04 +01:00
Mathijs Kwik 3ab0cd1d41 neoload: fix evaluation of tarball job 2012-11-18 18:35:01 +01:00
Mathijs Kwik 125953f1bc add package: neoload-4.0.4 2012-11-18 15:33:52 +01:00
Malcolm Matalka 5ff6be9224 Support installing findlib 2012-11-16 11:43:43 +01:00
Malcolm Matalka 6299baeb88 Support installing topfind now 2012-11-16 11:43:32 +01:00
Peter Simons 3fafdb362b bison: update to version 2.6.5 
This update fixes the grub-2.0 warning issue that was worked around in commit
4f5e655b36. Consequently, that patch is no longer
needed.
 2012-11-09 18:00:49 +01:00
Peter Simons 6896a895c3 haskell-hlint: update to version 1.8.34 2012-11-08 14:57:37 +01:00
Peter Simons 0ae5d8fd05 haskell: drop noHaddock from some packages which build fine in their respective latest version 2012-11-06 13:38:34 +01:00
Peter Simons 5ce4e11e40 haskell-uuagc: update to version 0.9.42.1 2012-11-05 16:25:29 +01:00
Peter Simons 3385f76ae1 haskell-uuagc-cabal: update to version 1.0.3.0 2012-11-05 16:25:29 +01:00
Peter Simons 4fa4749b4f haskell-threadscope: update to version 0.2.2 2012-11-05 16:25:29 +01:00
Peter Simons 42c1c63919 haskell-splot: update to version 0.3.6 2012-11-05 16:25:28 +01:00
Peter Simons e2e1526884 haskell-timeplot: update to version 1.0.18 2012-11-01 10:09:26 +01:00
Peter Simons 2531a08ef9 haskell-splot: update to version 0.3.5 2012-11-01 10:09:26 +01:00
Peter Simons 78a308f6f5 haskell-BNFC-meta: update to version 0.4.0.1 2012-11-01 10:09:26 +01:00
Cyril Roelandt 4b3d29003e smatch: add dependency on Perl 
Signed-off-by: Cyril Roelandt <tipecaml@gmail.com>
Signed-off-by: Ludovic Courtès <ludo@gnu.org>
 2012-10-30 17:15:26 +01:00
Ludovic Courtès d1202f702b smatch: install files in the right place 2012-10-30 15:07:35 +01:00
Andres Loeh 4c5b56d212 Add cabal-dev. 2012-10-30 09:03:53 +01:00
Rob Vermaas d72ee9c961 Added sysbench 0.4.12 2012-10-26 14:45:16 +02:00
Peter Simons 7ffcf39ad6 haskell-timeplot: update to version 1.0.14 2012-10-26 11:04:36 +02:00
Rickard Nilsson 9c0459972f Revert "gnum4: Disable tests for ARM." 
This reverts commit b63305721d.

gnum4 builds fine on Sheevaplug for me now. I consider my previous
failure a glitch, since I'm not sure how my stdenv looked at that
time. Sorry for the noise.
 2012-10-25 10:03:53 +02:00
Peter Simons f54cc84aec haskell-hlint: update to version 1.8.33 2012-10-24 18:06:11 +02:00
Peter Simons 2e2a17a92a bison: drop obsolete version 1.875 2012-10-23 18:46:09 +02:00
Peter Simons b3aafc8494 bison-2.6: update to version 2.6.4 2012-10-23 18:36:26 +02:00
Peter Simons 40c142201d haskell-hlint: update to version 1.8.32 2012-10-23 18:29:59 +02:00
Eelco Dolstra 6c75d07e65 automake: Update to 1.12.4 
Also disable tests, they're really way too slow.

http://hydra.nixos.org/build/3082076
 2012-10-16 14:09:57 -04:00
Peter Simons a13346961f haskell-cabal2nix: update to version 1.40 2012-10-15 20:23:43 +02:00
Peter Simons b1701fc609 haskell-alex-meta: update to version 0.3.0.5 2012-10-15 11:52:34 +02:00
Peter Simons cbc3cb7bd8 haskell-BNFC-meta: update to version 0.4 2012-10-15 11:52:34 +02:00
Peter Simons e32db14a59 haskell-haddock: add version 2.13.1 2012-10-15 11:52:01 +02:00
Marco Maggesi 2221bf0593 Update camlp5 to 6.06. 2012-10-09 14:03:12 -04:00
Peter Simons e6f26c5142 haskell-happy-meta: update to version 0.2.0.5 2012-10-08 11:25:28 +02:00
Peter Simons fc470f1d5a haskell-alex-meta: update to version 0.3.0.4 2012-10-08 11:25:27 +02:00
Peter Simons 8029d18f7a haskell-BNFC-meta: update to version 0.3.0.5 2012-10-08 11:25:27 +02:00
Peter Simons 0a9568df7b haskell-tar: update to version 0.4.0.1 2012-10-08 10:47:32 +02:00
Shea Levy 29fd8d4eaa cmake: Bump 2012-10-08 03:12:42 -04:00
Cyril Roelandt 172abb4b26 Add a "smatch" package. 
Signed-off-by: Cyril Roelandt <tipecaml@gmail.com>
Signed-off-by: Ludovic Courtès <ludo@gnu.org>
 2012-10-05 10:41:44 +02:00
Rickard Nilsson b63305721d gnum4: Disable tests for ARM. 
I can't get the `diversions' to pass on SheevaPlug. It builds fine otherwise.
 2012-10-02 08:49:33 +02:00
Peter Simons 878595c2a0 haskell-hslogger: update to version 1.2.1 2012-09-24 12:08:34 +02:00
Peter Simons df80a705af haskell-happy: add version 1.18.10 2012-09-24 12:08:29 +02:00
Eelco Dolstra fcc18aad0a Fix some packages that referred to gets() 
Glibc no longer defines gets() if _GNU_SOURCE is defined.
 2012-09-18 14:05:23 -04:00
Eelco Dolstra 0b900d21f4 Remove unused files 2012-09-18 11:09:18 -04:00
Peter Simons 2460be6f63 haskell-splot: add version 0.3.4 2012-09-18 11:58:12 +02:00
Peter Simons 3865d54f0f haskell-timeplot: add version 1.0.11 2012-09-18 11:58:12 +02:00
Arie Middelkoop 44dec2d5dd fixes the build of coccinelle. 2012-09-12 12:08:21 +02:00
Peter Simons 7596ce3dbb Remove myself as maintainer of these packages. 2012-09-11 18:22:31 +02:00
Arie Middelkoop 504e2ad128 updates coccinelle to 1.0-rc15 2012-09-11 15:02:37 +02:00
Peter Simons 18e9e6832b haddock: add version 2.11.0 and 2.12.0 2012-09-10 14:18:40 +02:00
Peter Simons 2ccd0238cb haskell-jailbreak-cabal: add version 1.0 2012-09-10 12:28:25 +02:00
Peter Simons 11111c7d01 haskell-cabal2nix: update to version 1.39 2012-09-10 12:28:25 +02:00
Lluís Batlle i Rossell 6cdb98a140 valgrind: update to 3.8.0 2012-09-04 15:50:47 +02:00
Peter Simons 702854cb5d haskell-Ebnf2ps: update to version 1.0.11 2012-08-31 09:10:18 +02:00
Peter Simons 410ba4ee20 haskell-SourceGraph: update to version 0.7.0.3 2012-08-30 13:02:00 +02:00
Shea Levy a94e8d2756 Add npm2nix as a nodePackage 2012-08-26 16:02:04 -04:00
Rob Vermaas 64a57c8f16 Merge branch 'master' of github.com:NixOS/nixpkgs 2012-08-23 11:22:53 +02:00
Rob Vermaas 7b5d312720 Add pstack, a wrapper script for gdb. Used to be part of gdb. 2012-08-23 11:22:06 +02:00
Lluís Batlle i Rossell 518c90d361 cscope: update to 15.8a 2012-08-23 10:15:27 +02:00
Eelco Dolstra d7fc07705a Add latest patchelf prerelease 2012-08-21 15:57:41 -04:00
Eelco Dolstra dc2f0f6474 gdb: Update to 7.5 2012-08-21 14:27:00 -04:00
Peter Simons 7f8246c76e haskell-hlint: update to version 1.8.31 2012-08-20 10:34:56 +02:00
Peter Simons c0dafdf8d5 Merge pull request #94 from aszlig/boomerang 
boomerang: New package from the fork.
 2012-08-16 06:50:55 -07:00
Shea Levy 10aa2bd5c3 Update autobuild URL 
Only tested building autobuild.src, succeeds now, failed before.

Fixes #99.
 2012-08-15 05:58:25 -04:00
Rob Vermaas 61817876fc Revert "automake: Disabling tests on mips." Causes infinite recursion on all other platforms. 
This reverts commit eadcd7dab6.
 2012-08-15 10:13:02 +02:00
Lluís Batlle i Rossell eadcd7dab6 automake: Disabling tests on mips. 
There is a test that fails on mips, and that breaks the nix build.
The text does not exist anymore in automake upstream git, so the next
version may not need this mips-specific disabling.
 2012-08-15 09:56:13 +02:00
Eelco Dolstra 6020d52cbe strace: Update to 4.7 2012-08-10 18:54:10 -04:00
aszlig d10772ec8a boomerang: Fix prefix in dlopen(). 
We already have the correct library dir in our search path, so we don't need to
prepend lib/ again.
 2012-08-10 15:02:19 +02:00
aszlig a6e266306f boomerang: Fix endless loop in createDirectory(). 
Fix is on GitHub, so changing the git URL to point to the commit ID of my fix.
 2012-08-10 14:59:05 +02:00
aszlig 77b1a7ff42 boomerang: New package from the fork. 
This adds the boomerang decompiler, which has been forked on github because of
some years of inactivity.
 2012-08-09 19:05:16 +02:00
Peter Simons 705fbf2e8c bison: update to version 2.6.2 2012-08-04 13:00:44 +02:00
Arie Middelkoop 5bc99bc883 Adds Ocaml 4.00.0 (first attempt) 
Bumps Findlib to 1.3.3 (required for ocaml 4.00)
 2012-07-31 14:09:27 +02:00
Arie Middelkoop 2df1d646c8 frama-c: add version 20111001 2012-07-31 14:08:52 +02:00
Arie Middelkoop 7d70836580 ocamlgraph: update to 1.8.2 
Also added the dependency on lablgtk, so that it builds the 'dgraph' module,
which is needed for packaging frama-c. This dependency can be made optional.
 2012-07-31 14:08:48 +02:00
Shea Levy b0552eb9ca Add npm2nix 2012-07-25 18:11:57 -04:00
Peter Simons 72e07c2940 bison: add version 2.6 2012-07-22 18:54:50 +02:00
Peter Simons 03d98589e2 haskell-cabal2nix: update to version 1.38 2012-07-19 12:18:40 +02:00
Peter Simons be22305ace haskell-BNFC: update to version 2.4.2.1 2012-07-17 22:50:29 +02:00
Peter Simons abad8b8873 haskell-hslogger: update to version 1.2.0 2012-07-16 11:21:30 +02:00
Peter Simons ed7a149f7d haskell-cpphs: update to version 1.14 2012-07-14 11:14:40 +02:00
Peter Simons f2d77b76d7 haskell-hlint: update to version 1.8.30 2012-07-14 11:14:40 +02:00
Peter Simons 719852784a automake-1.11.x: create symlinks for un-versioned directory names 
The latest Automake version installs the 'aclocal' and 'automake' directories
with a '-1.11' version suffix. Our setup hook is not prepared to handle that,
so we add those symlinks as a quick fix. A better solution would be to extend
the setup hook for Automake to recognize those kind of version suffixes.
 2012-07-10 22:26:27 +02:00
Peter Simons 5c6185d925 automake-1.12.x.nix: disable 't/aclocal7.sh' regression test to avoid failures on Hydra 
The test succeeds on my machine, but not when built on Hydra. It would
be great if some Automake guru could examine what exactly is going on.
 2012-07-10 17:38:43 +02:00
Peter Simons bb6c1e9878 automake-1.12.x: update to version 1.12.2 2012-07-10 16:15:30 +02:00