mirrors/nixpkgs
1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-21 21:21:06 +00:00
Code Issues Wiki Activity
29582 commits 313 branches 124 tags 6.6 GiB
Commit graph

1484 commits

Author SHA1 Message Date
Vladimír Čunát 6bcf790d05 Merge branch 'master' into x-updates 2013-06-17 22:08:16 +02:00
Gergely Risko 7a602e5f86 Hackage: upgrade Chart to 0.17, timeplot to 1.0.21 and add Chart-gtk 2013-06-17 09:53:28 +02:00
Michael Raskin 81b7f5fe63 Merge remote-tracking branch 'upstream/master' into x-updates 2013-06-15 17:15:32 +04:00
Peter Simons 43822c1a36 haskell-cabal2nix: update to version 1.52 2013-06-15 13:40:59 +02:00
Michael Raskin 19530856ed Merge remote-tracking branch 'upstream/master' into x-updates 
Conflicts:
	pkgs/development/libraries/cairo/default.nix
	pkgs/development/libraries/gdk-pixbuf/default.nix
	pkgs/development/libraries/gtk+/2.x.nix
	pkgs/misc/ghostscript/default.nix
	pkgs/top-level/all-packages.nix
 2013-06-13 17:12:43 +04:00
Michael Raskin 27bbff463f Merge pull request #601 from craff/ocaml/upgrade_and_new 
Ocaml/upgrade and new
 2013-06-13 05:41:59 -07:00
Peter Simons 7b3ebfe8c5 haskell-haddock: add version 2.13.2.1 2013-06-13 10:43:35 +02:00
Michael Raskin 8271de6727 Merge remote-tracking branch 'upstream/master' into x-updates 
Conflicts:
	pkgs/misc/emulators/wine/default.nix
 2013-06-10 10:04:46 +04:00
Peter Simons 504ae3f3a8 haskell-hlint: update to version 1.8.46 2013-06-09 10:47:15 +02:00
Vladimír Čunát 7db886fdb9 Merge remote-tracking branch 'hydra/master' into x-updates 
Conflicts (taken from @7c6f434c):
	pkgs/development/libraries/libgphoto2/default.nix
 2013-06-08 15:41:39 +00:00
Christophe Raffalli 356983074e Forgotten to add wanr.patch for omake. 2013-06-07 21:58:19 +02:00
Christophe Raffalli 87e1089498 Upgraded omake to 0.9.8.6_rc1. kept the previous version as default because this is a rc1. 
This is necessary to compile the latest camlimages
 2013-06-07 21:40:37 +02:00
Michael Raskin eb946b4795 Luarocks: new package 2013-06-07 14:05:13 +04:00
Michael Raskin 2baaaebf57 Luarocks: new package 2013-06-07 14:04:15 +04:00
Evgeny Egorochkin 9c6f7cc9c1 Add package versions to some of the packages or fix existing ones to conform to nixpkgs conventions. 2013-06-07 03:15:45 +03:00
Evgeny Egorochkin bc409a6e00 Merge pull request #593 from bjornfor/saleae-logic 
saleae-logic: new package
 2013-06-06 04:44:44 -07:00
Peter Simons f37e7a92cf gnulib: update to version v0.0-7952-g439b0e9 2013-06-05 22:16:24 +02:00
Bjørn Forsman f425048875 saleae-logic: new package 
Add Saleae Logic - analyzer software for Saleae logic analyzators.

Also, add a small LD_PRELOAD library that is needed to make it work from
a read-only installation directory.
 2013-06-05 21:56:50 +02:00
Vladimír Čunát 7af694700c Merge branch 'master' into x-updates 
Silently merged badly the firefox 20/21 things. I got that, hopefully
there aren't more (my nixos-rebuild dry-run finds no more errors).
 2013-06-05 12:59:47 +02:00
Peter Simons 97935a981e haskell-cabal2nix: update to version 1.51 2013-06-05 12:17:36 +02:00
Peter Simons f165b58b7b cabal2nix: add myself as a maintainer 2013-06-05 12:17:35 +02:00
Mathijs Kwik 079ea60624 neoload: upgrade to 4.1.3 2013-06-04 07:50:59 +02:00
Peter Simons e8b8efa471 haskell-cabal2nix: update to version 1.50 2013-06-01 14:53:44 +02:00
Peter Simons 36aaa263d3 cabal2ghci: jailbreak to fix build with Haskell Platform 2013.2.0.0 2013-05-30 12:33:44 +02:00
Rickard Nilsson a7dbbd2e25 New package: sbt 0.12.3, a Scala build tool 2013-05-30 12:12:19 +02:00
Vladimír Čunát b770365574 ReRevert Merge x-updates into master 
This reverts commit ec3965d8d0.

Conflicts (taken x-updates):
	pkgs/development/libraries/libgcrypt/default.nix
	pkgs/development/libraries/libgpg-error/default.nix
	pkgs/development/libraries/poppler/default.nix
 2013-05-29 23:25:02 +02:00
Peter Simons 2bd7aa7a65 haskell-timeplot: update to version 1.0.20 2013-05-25 11:31:00 +02:00
Rob Vermaas d5f7976aef Fix maintainers attribute 2013-05-21 09:20:00 +02:00
Bjørn Forsman 05bb66ce20 Add myself as maintainer for several packages 
And set missing meta.platforms for the packages I've added earlier.
 2013-05-20 20:28:15 +02:00
Michael Raskin f75d60fd90 Adding jq JSON processor 2013-05-20 11:17:20 +04:00
Bjørn Forsman 40d35e4bd5 ninja: include package name in source archive path 
So that the nix store path becomes this:

  /nix/store/HASH-ninja-1.2.0.zip.drv

instead of this anonymous path:

  /nix/store/HASH-v1.2.0.zip.drv
 2013-05-19 14:39:48 +02:00
Peter Simons 25b7c65b34 haskell-hlint: update to version 1.8.45 2013-05-13 13:43:44 +02:00
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