mirrors/nixpkgs
1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-28 00:22:13 +00:00
Code Issues Wiki Activity
37537 commits 241 branches 124 tags 7.5 GiB
Commit graph

1562 commits

Author SHA1 Message Date
Peter Simons aa0df547a8 bison-3.x: fix test suite by adding flex as a build input 2013-09-08 21:12:34 +02:00
Vladimír Čunát c1ed13dad0 Merge branch 'master' into x-updates 2013-09-08 12:04:20 +02:00
Gergely Risko 38d54cfc21 Update splot to 0.3.11, so it compiles again 2013-09-07 20:55:42 +02:00
Vladimír Čunát 9766dbb1df dejagnu: minor update 2013-09-07 16:20:39 +02:00
Vladimír Čunát b1be46e932 Merge branch 'master' into x-updates 2013-09-07 16:19:46 +02:00
Peter Simons 222cf9a8fc haskell-HaRe: jailbreak to support recent versions of Diff and hspec 2013-09-06 23:35:12 +02:00
Peter Simons b94cf8c733 haskell-HaRe: update to version 0.7.0.1 2013-09-06 23:35:11 +02:00
Peter Simons 908e0cc23d haskell-uuagc-cabal: update to version 1.0.5.0 2013-09-06 23:35:10 +02:00
Bjørn Forsman 86c7583ab4 lttng: 2.2.x -> 2.3.0 2013-09-05 22:46:07 +02:00
Peter Simons 3031968b0c haskell-timeplot: re-generate with cabal2nix 2013-09-02 14:05:25 +02:00
Gergely Risko 05fd8db379 Update timeplot to 1.0.22 to fix building with Chart-1.0 2013-09-02 11:36:54 +02:00
Bjørn Forsman 36564b72fe uncrustify: new package 
Uncrustify is a source code beautifier for C, C++, C#, ObjectiveC, D,
Java, Pawn and VALA.

Homepage: http://uncrustify.sourceforge.net/
 2013-08-31 09:42:20 +02:00
Peter Simons 4cb183dd88 haskell-uuagc: update to version 0.9.50 2013-08-30 10:53:03 +02:00
Peter Simons 85a6660d08 haskell-hslogger: update to version 1.2.3 2013-08-30 10:53:03 +02:00
Vladimír Čunát 2fda1165da Merge branch 'master' into x-updates 2013-08-28 10:37:41 +02:00
aszlig 35229f0cf4
boomerang: Refactor and fix build. 
Thanks to @phreedom for reporting the broken URL used fetchgit, which
was because I deleted my fork repository. Fortunately, in the meantime
other forks got to a more "working" state and being more actively
maintained than my fork. So that's why I switched using @nemerle's fork
now, as it is the the most usable one out there, at least in our case.

One stupid thing I've done in the first place was to use "1.0pre" as the
version and the fork uses "alpha 0.3.2", so it essentially is some kind
of a "downgrade" if you just look at the version.

Fortunately, peer-unreviewed research based on guesswork has shown that
I'm the only one using Boomerang on NixOS, so this shouldn't have a big
impact on the other non-existent users.

Also, this drops dependencies on boehmgc and cppunit, because building
with either one or both will fail at the moment.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
 2013-08-27 04:39:33 +02:00
Peter Simons 5ba7c2a24f haskell-cabal2nix: update to version 1.54 2013-08-24 13:00:43 +02:00
Peter Simons db9383d93b haskell-hslogger: update to version 1.2.2 2013-08-24 13:00:43 +02:00
Peter Simons eb703936d0 haskell-cabal2ghci: update to version 0.0.1.1 2013-08-24 13:00:43 +02:00
Peter Simons fe2acafee7 haskell-hlint: update to version 1.8.51 2013-08-24 13:00:42 +02:00
Peter Simons b92c0c2896 haskell-SourceGraph: delete obsolete package 
This library hasn't compiled in ages.
 2013-08-24 13:00:41 +02:00
Vladimír Čunát c1e62e7e91 Merge branch 'master' into x-updates 2013-08-22 19:29:09 +02:00
Shea Levy 9c9b7a427b Update phantomjs 
Signed-off-by: Shea Levy <shea@shealevy.com>
 2013-08-20 18:56:20 -04:00
Peter Simons 2badada2be haskell-cpphs: update to version 1.17.1 2013-08-19 20:54:51 +02:00
Peter Simons 5adcbf299f haskell-hlint: update to version 1.8.50 2013-08-19 20:54:51 +02:00
Petr Rockai 374a27fe8e binutils: Also enable plugins when building with gold. 2013-08-18 21:14:16 +02:00
Peter Simons 0cb9924e7f hlint: jailbreak to support latest version of cpphs 2013-08-18 18:49:12 +02:00
Peter Simons e6e33e3d08 haskell-cpphs: update to version 1.17 2013-08-18 18:49:12 +02:00
Ludovic Courtès 2e937c437a unmaintain several packages 2013-08-16 23:45:01 +02:00
Peter Simons e2baa14add xxdiff: update to version 4.0 2013-08-15 12:25:07 +02:00
Evgeny Egorochkin 2d056f9307 Merge pull request #811 from the-kenny/erlang-elixir 
Update erlang to R16B1, add elixir and rebar
 2013-08-13 21:56:04 -07:00
Moritz Ulrich c5d81ea3b5 Update leiningen to 2.3.1. 2013-08-13 21:48:26 +00:00
Peter Simons 92a9b2ab83 haskell-cabal2nix: update to version 1.53 2013-08-11 23:50:04 +02:00
Peter Simons 173d4aac67 haskell-cabal-ghci: update to version 0.3 2013-08-11 23:50:04 +02:00
Evgeny Egorochkin d068505b2f leiningen: fix hash 2013-08-11 07:59:30 +03:00
Evgeny Egorochkin 8b02246373 Merge pull request #812 from the-kenny/leiningen-2.3.0 
Update leiningen to 2.3.0.
 2013-08-10 21:46:41 -07:00
Bjørn Forsman 5a3a82d81c lttv: new package 
Linux Trace Toolkit Viewer is a GUI program to visualize LTTng trace
files. (An alternative to this program is the LTTng plugin for the
Eclipse IDE.)
 2013-08-10 14:32:57 +02:00
Bjørn Forsman 1eb38f2ccb babeltrace: new package 
Babeltrace is a command-line tool and library to read and convert LTTng
tracefiles. Give it a (binary) trace file/dir path and it will print a
human readable event log to standard out.
 2013-08-10 14:32:57 +02:00
Bjørn Forsman 6a4f068b9e lttng-tools: new package 
This is the Linux Trace Toolkit. Included in this package:

Command-line client:
  lttng
Tracing daemons:
  lttng-sessiond (automatically started by lttng)
  lttng-relayd   (remote trace collection daemon)

Userspace tracing can be done by using liblttng-ust. To do kernel
tracing we also need the LTTng kernel modules.

I've added a patch that changes "/sbin/modprobe" to just "modprobe".
 2013-08-10 14:32:57 +02:00
Bjørn Forsman 33d78777a3 lttng-ust: new package 
This is the user space library for LTTng. It is needed to do user space
tracing, as opposed to kernel space tracing.
 2013-08-10 14:32:56 +02:00
Moritz Ulrich 02707296e8 Update leiningen to 2.3.0. 
Unfortunately, leiningen will now pull in some dependencies via maven (via http) on `lein version' so the test at the end of builder.sh failed. This is okay because leiningen is used only as a interactive tool and no other package in Nixpkgs depends on it.

Signed-off-by: Moritz Ulrich <moritz@tarn-vedra.de>
 2013-08-09 17:30:10 +02:00
Moritz Ulrich 31083cd226 Add myself as a maintainer to erlang R16B1 and elixir. 
Signed-off-by: Moritz Ulrich <moritz@tarn-vedra.de>
 2013-08-09 16:33:51 +02:00
Moritz Ulrich dbfcdc9066 Add meta for elixir & rebar. 
Signed-off-by: Moritz Ulrich <moritz@tarn-vedra.de>
 2013-08-09 16:29:01 +02:00
Moritz Ulrich ceb96b7312 Package elixir and rebar. 
Signed-off-by: Moritz Ulrich <moritz@tarn-vedra.de>
 2013-08-09 16:29:01 +02:00
Bjørn Forsman 61a1867c5d strace: 4.7 -> 4.8 
Also, update meta.license and add meta.platforms.
 2013-08-06 23:43:51 +02:00
Bjørn Forsman d0748afc5e splint: improve meta attributes 
- don't repeat package name in description
- prefer licenses.gpl2Plus over free form "GPLv2+" license name
- add platform attribute so that splint will be available in the channel
 2013-08-06 21:20:47 +02:00
Peter Simons 41126666a6 bison: add version 3.0 2013-08-03 10:39:07 +02:00
Vladimír Čunát 661a1a68a6 automake113x: minor update to .4 
I can't make glib build without it.
 2013-08-03 09:39:31 +02:00
Michael Raskin bfbbb12e35 Adding CL-Launch. CL-Launch is a wrapper for unified launching of various Lisp implementations 2013-08-02 09:39:20 +04:00
Peter Simons 37e428f229 haskell-splot: update to version 0.3.9 2013-07-26 19:40:47 +02:00
Rob Vermaas d568ff324a Add meta attribute to colormake. 2013-07-25 11:38:13 +02:00
Rob Vermaas 9afc8bb1e0 Add colormake 2013-07-25 11:36:07 +02:00
Peter Simons 6c63a85786 haskell-hlint: update to version 1.8.49 2013-07-23 15:58:44 +02:00
Bjørn Forsman 67ce7f863a srecord: new package 
The SRecord package is a collection of powerful tools for manipulating
EPROM load files.

http://srecord.sourceforge.net/
 2013-07-19 00:29:50 +02:00
Moritz Ulrich 30f54585d5 Add stm32flash, flash program for stm32 bootloader. 
Signed-off-by: Moritz Ulrich <moritz@tarn-vedra.de>
 2013-07-18 01:50:41 +02:00
Peter Simons 09583c0f4e haskell-hlint: update to version 1.8.48 2013-07-17 13:06:47 +02:00
Bjørn Forsman 2c702a1d81 avarice: set meta.platforms (make hydra build it) 2013-07-16 19:40:45 +02:00
Sergey Mironov 62bbba8173 AVaRICE: translates between GDB's remote debug protocol and the AVR JTAG ICE protocol 2013-07-16 14:19:32 +04:00
Evgeny Egorochkin da4be371e9 make package use mirror:// for gnu, savannah and gnome repositories where possible 2013-07-14 05:23:06 +03:00
Evgeny Egorochkin b084b29d26 Even more mirror:// fixes 2013-07-14 04:17:07 +03:00
Evgeny Egorochkin 8a2da95255 luarocks: fix version to match tarball 2013-07-14 02:08:49 +03:00
Jason "Don" O'Conal 525a6856f2 otool and setfile: cleanup 2013-07-07 18:58:29 +10:00
Jason "Don" O'Conal 2a21046f24 otool & setFile: only allow on darwin 2013-07-04 19:01:47 +10:00
Jason "Don" O'Conal c2901da1b8 setFile: add expression 2013-07-04 08:50:37 +10:00
Jason "Don" O'Conal 216d47be0c gobject-introspection: fix build on darwin 
* add otool expression (add otool to build inputs)
* add libintlOrEmpty to build inputs
 2013-07-03 22:03:48 +10:00
Peter Simons df12e039e3 haskell-keter: update to version 0.4.0 2013-07-01 12:11:05 +02:00
Peter Simons 6b58b32ad8 haskell-hlint: update to version 1.8.47 2013-07-01 12:11:05 +02:00
Moritz Ulrich 978fa98933 avrdude: Add libusb to enable USB support 2013-06-25 22:19:31 +02:00
Eelco Dolstra acba9240cd nixos.org/tarballs -> tarballs.nixos.org 
It's currently the same machine, but tarballs.nixos.org should become
an S3/CloudFront site eventually.
 2013-06-25 14:12:16 +02:00
Rickard Nilsson 0dbb2fdcfe sbt: Remove duplicate package 2013-06-25 12:32:28 +02:00
Rickard Nilsson 8496b31e34 sbt: Use recommended java options 2013-06-25 12:31:44 +02:00
Evgeny Egorochkin 0889bbe88f Patch binutils to produce more deterministic output 2013-06-25 11:15:45 +03:00
Bjørn Forsman 860161dcb7 remake: bump from version 3.81+dbg-0.2 to 3.82+dbg-0.6 
This version needs readline. And the license is GPLv3. Also, add
meta.platforms and meta.maintainers attributes.
 2013-06-22 21:09:43 +02:00
aszlig 1709571b3f
ninja: Update to v1.3.4 and drop unzip dependency. 
Version 1.2.0 is way too old in order to build the latest chromium (29) version,
so let's get it up to date (especially because no other package is referencing
ninja, so it should be non-critical).

The dependency on unzip is not needed here, because GitHub also provides
archives in tar.gz format.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
 2013-06-21 12:17:55 +02:00
Shea Levy 97b95d60d8 Chromedriver: update to 2.0 
Signed-off-by: Shea Levy <shea@shealevy.com>
 2013-06-20 09:21:25 -04:00
Evgeny Egorochkin f5f76e6446 ocamlPackages.deriving: fix version 2013-06-19 03:20:00 +03:00
Marc Weber d25d1e4d24 ocaml adding deriving 2013-06-19 03:07:27 +03:00
Marc Weber ccb2e9a832 Adding multiple versions of sbt. Probably you want to use the latest(default). 2013-06-19 02:45:40 +03:00
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