Commit Graph

1929 Commits

Author SHA1 Message Date
Shea Levy
139f8949e6 Merge branch 'merge-kernel-builds' into upstream-master
This is a second attempt at unifying the generic and manual-config
kernel builds (see #412 for the last time).

The set of working kernel packages is a superset of those that work on
master, and as the only objection last time was the size of the $dev
closure and now both $out and $dev combined are 20M smaller than $out on
master (see message for ac2035287f), this
should be unobjectionable.

Signed-off-by: Shea Levy <shea@shealevy.com>
2014-01-05 07:13:19 -05:00
Vladimír Čunát
9443129b08 Merge master into stdenv-updates
Conflicts:
	pkgs/development/libraries/glibc/2.18/common.nix (take stdenv-updates)
	pkgs/misc/emulators/zsnes/default.nix (more complex, build tested)
	pkgs/top-level/all-packages.nix (auto-solved)
2014-01-04 18:34:53 +01:00
Eelco Dolstra
54d1721414 ant: Update to 1.9.3
Also, Ant no longer has a build-time dependency on a particular JDK.
It finds the JDK via $JAVA_HOME or $PATH (by looking up javac).  This
way, we don't need to have separate packages like apacheAntOpenJDK and
apacheAntOracleJDK.  It also seems reasonable: after all, installing
GNU Make doesn't give you a C compiler either.  It does mean that
instead of

  buildInputs = [ ant ];

you now need to write something like

  buildInputs = [ ant jdk ];
2014-01-03 13:29:06 +01:00
Eelco Dolstra
b13b146150 jikespg: Cleanup 2014-01-03 11:56:41 +01:00
Bjørn Forsman
4d6605e882 Whitespace fixes in package expressions I maintain 2014-01-02 17:58:08 +01:00
Shea Levy
6b7ede300f systemtap: Remove from linuxPackagesFor
It doesn't seem to depend on the kernel in any way.

Signed-off-by: Shea Levy <shea@shealevy.com>
2014-01-02 00:03:49 -05:00
Michael Raskin
a3843455c5 Re-add HTTP/HTTPS support back to Subversion by adding serf. Tested. 2013-12-30 23:33:22 +04:00
Michael Raskin
64361fd269 Update SlimerJS to 0.9.0 release 2013-12-30 23:33:22 +04:00
Peter Simons
ac692ddb50 haskell-cabal2nix: update to version 1.57 2013-12-29 12:26:07 +01:00
Peter Simons
a5d046d007 cabal2nix: the test suite compiles only on GHC 7.6.x or later
See <https://github.com/sol/doctest-haskell/issues/69> for further details.
2013-12-29 12:26:07 +01:00
Vladimír Čunát
e740b565cf Merge master into stdenv-updates
Conflicts (easy):
	pkgs/development/compilers/llvm/default.nix
	pkgs/development/compilers/openjdk/default.nix
	pkgs/development/libraries/icu/default.nix
	pkgs/development/libraries/libssh/default.nix
	pkgs/development/libraries/libxslt/default.nix
	pkgs/development/tools/parsing/bison/3.x.nix
2013-12-29 10:01:22 +01:00
Moritz Ulrich
e87515e519 Opam 1.1: Constrain supported ocaml versions.
Signed-off-by: Moritz Ulrich <moritz@tarn-vedra.de>
2013-12-25 14:43:23 +01:00
Malcolm Matalka
545216ee02 Opam: Update to 1.1.0
Also keeps 1.0 for backwards compatibility.

Signed-off-by: Moritz Ulrich <moritz@tarn-vedra.de>
2013-12-25 14:18:28 +01:00
Peter Simons
47816b4bd4 haskell-uuagc: update to version 0.9.50.2 2013-12-23 22:30:43 +01:00
Peter Simons
44a9fc6fcb haskell-timeplot: update to version 1.0.23 2013-12-23 22:30:43 +01:00
Mathijs Kwik
cf9cc60a8d bison: use gz tarball, early stdenv does not have xz 2013-12-23 10:25:17 +01:00
Peter Simons
cd73e1cefa haskell-uuagc: update to version 0.9.50.1 2013-12-20 10:45:56 +01:00
Peter Simons
95d31aa306 haskell-HaRe: update to version 0.7.0.9 2013-12-19 11:35:26 +01:00
Nixpkgs Monitor
05288d3ad5 findbugs: update from 1.3.2 to 2.0.3 2013-12-18 18:18:27 +02:00
Nixpkgs Monitor
8d2d9f6d21 docutils: update from 0.10 to 0.11 2013-12-18 18:18:25 +02:00
Nixpkgs Monitor
32b2973807 ccache: update from 3.1.7 to 3.1.9 2013-12-18 18:18:21 +02:00
Nixpkgs Monitor
fe6522309e bison3: update from 3.0 to 3.0.2 2013-12-18 18:18:19 +02:00
Nixpkgs Monitor
37d39237ab avrdude: update from 5.11 to 6.0.1 2013-12-18 18:18:18 +02:00
Nixpkgs Monitor
8970fb09ab autogen: update from 5.17 to 5.18 2013-12-18 18:18:17 +02:00
Peter Simons
45e8de9a7d Merge branch 'origin/master' into stdenv-updates.
Conflicts:
	pkgs/tools/misc/less/default.nix
2013-12-16 21:13:24 +01:00
Jason "Don" O'Conal
2b65900e75 vagrant: update to 1.4.0 2013-12-16 04:50:22 +00:00
Nixpkgs Monitor
53754a0397 help2man: update from 1.40.8 to 1.43.3 2013-12-15 13:03:15 +02:00
Nixpkgs Monitor
38803914d6 doxygen: update from 1.8.3.1 to 1.8.5 2013-12-15 12:32:24 +02:00
Nixpkgs Monitor
680a6380c8 cppcheck: update from 1.53 to 1.62 2013-12-15 12:26:24 +02:00
Nixpkgs Monitor
202ea363c4 astyle: update from 2.02.1 to 2.04 2013-12-15 11:25:54 +02:00
Nixpkgs Monitor
672999a3d4 oprofile: update from 0.9.8 to 0.9.9 2013-12-14 17:59:57 +02:00
Vladimír Čunát
0fe37b7519 Merge #1269: add vagrant 2013-12-14 11:03:21 +01:00
Nixpkgs Monitor
537a5d4b70 gdb: update from 7.6.1 to 7.6.2 2013-12-14 04:36:56 +02:00
Nixpkgs Monitor
904ee6d5d2 re2c: update from 0.13.5 to 0.13.6 2013-12-14 00:41:47 +02:00
Petr Rockai
f9d66c239e lcov: Update to 1.10 as 1.9 fails with gcc 4.7 .gcno files. 2013-12-13 20:56:36 +02:00
Nixpkgs Monitor
e0ae2b01e6 gnome.gnome_doc_utils: update from 0.20.7 to 0.20.10 2013-12-12 03:11:35 +02:00
Nixpkgs Monitor
8cfaf0697c global: update from 6.2.2 to 6.2.9 2013-12-12 03:11:34 +02:00
Nixpkgs Monitor
57826becea gengetopt: update from 2.22.5 to 2.22.6 2013-12-12 03:11:34 +02:00
Peter Simons
2bc29e4e6d Merge branch 'master' into stdenv-updates. 2013-12-10 22:29:20 +01:00
Peter Simons
a47b25da5b haskell-keter: update to version 1.1.0.1 2013-12-10 20:41:39 +01:00
Peter Simons
486e7736df Merge remote-tracking branch 'origin/master' into stdenv-updates.
Conflicts:
	pkgs/tools/networking/p2p/amule/default.nix
2013-12-10 00:25:54 +01:00
Peter Simons
6dfc18dc00 gnumake: add version 4.0 2013-12-09 16:14:41 +01:00
Peter Simons
aa58b5f571 gnumake: clean up directory structure; no functional change 2013-12-09 16:09:33 +01:00
Pascal Wittmann
799062bcb6 Fixed sbt options 2013-12-08 20:03:17 +01:00
Jason "Don" O'Conal
1d7108d5f5 drush: add expression 2013-12-05 04:38:35 +00:00
Peter Simons
c32bf83301 Merge remote-tracking branch 'origin/master' into stdenv-updates.
Conflicts:
	pkgs/development/interpreters/perl/5.16/default.nix
	pkgs/tools/networking/curl/default.nix
	pkgs/top-level/all-packages.nix
	pkgs/top-level/release-python.nix
	pkgs/top-level/release-small.nix
	pkgs/top-level/release.nix
2013-12-04 18:33:52 +01:00
Peter Simons
fd5f6e81f6 haskell-cabal2nix: update to version 1.56 2013-12-03 22:23:22 +01:00
Peter Simons
64feb74f44 happy: update to version 1.19.2 2013-12-03 22:23:19 +01:00
Peter Simons
07ce265406 alex: update to version 3.1.3 2013-12-03 22:23:19 +01:00
Eelco Dolstra
bc3c49ce9b valgrind: Update to 3.9.0 2013-12-03 09:17:49 -05:00
Peter Simons
066c03f5a1 haskell-hlint: update to version 1.8.55 2013-12-02 16:26:24 +01:00
Jason "Don" O'Conal
b3504c7bf5 complexity: fix build 2013-11-28 23:52:49 +00:00
Jason "Don" O'Conal
c5bc23a259 vagrant: add expression 2013-11-27 23:05:14 +00:00
Peter Simons
99a4fcfc1b haskell-hdevtools: re-generate expression with cabal2nix 2013-11-26 21:09:24 +01:00
Peter Simons
b20b8b9844 happy: update to version 1.19.1 2013-11-26 21:09:18 +01:00
Peter Simons
09c50d6f9c alex: update to version 3.1.2 2013-11-26 21:09:17 +01:00
Peter Simons
8aa2de3e1d Merge pull request #1256 from tomberek/add_hdevtools
Add hdevtools
2013-11-26 00:48:21 -08:00
Michael Raskin
5c90e785b2 Updating LuaRocks to 2.1.1 2013-11-25 10:59:38 +04:00
Michael Raskin
940c52f4c3 Update SlimerJS - there is still no fresh release for xulrunner 25 2013-11-25 10:59:37 +04:00
Shea Levy
7ab7be0cc3 Add automake 1.14
Signed-off-by: Shea Levy <shea@shealevy.com>
2013-11-23 21:18:37 -05:00
Thomas Bereknyei
53f05a812f Add hdevtools
4 spaces per indent
2013-11-23 16:12:21 -05:00
Song Wenwu
61b8ebc77f swig: bump 2.0.4 -> 2.0.11 2013-11-22 09:41:17 +08:00
Bjørn Forsman
04ce6241ac lttv: update 1.5-beta1 -> 1.5
This makes lttv build again with the new GTK+ version that was recently
updated in nixpkgs.
2013-11-15 00:19:15 +01:00
Bjørn Forsman
fbfa569efd stlink: fix chroot build
Add sha256 attribute to fetchgit to make it a fixed-output derivation
(needed for chroot builds).
2013-11-13 23:30:47 +01:00
Bjørn Forsman
a8d63681db stlink: fix package name
To stop nixpkgs-lint from saying "stlink: package has no version".
2013-11-13 23:25:48 +01:00
Peter Simons
20b512de7c haskell-keter: update to version 1.0.1.2 2013-11-11 14:39:58 +01:00
Bjørn Forsman
f4f18c11b6 uhd: bump 3.5.2 -> 3.5.4
It seems upstream changed the hash of the 3.5.2 archive so it doesn't
build anymore. Bump it instead of just updating the hash.
2013-11-10 16:22:38 +01:00
Bjørn Forsman
e0b7eeb0ad uhd: new package
UHD is USRP Hardware Driver (for Software Defined Radio).
2013-11-09 22:15:52 +01:00
Moritz Ulrich
698065715a Leiningen: Update to 2.3.3
Signed-off-by: Moritz Ulrich <moritz@tarn-vedra.de>
2013-11-08 21:30:34 +01:00
Lluís Batlle i Rossell
3e8e635be7 Updating gdb to 7.6.1 2013-11-08 17:27:57 +01:00
Eelco Dolstra
58af4fb11e Update some more platforms 2013-11-06 10:58:20 +01:00
Rickard Nilsson
2d44f3e8af sbt: Update to 0.13.0
Also remove all old sbt versions, and rename package to
sbt instead of simple-build-tool. sbt seems to be
the correct name for this package.
2013-11-05 14:51:14 +01:00
Eelco Dolstra
a0e21fd1ca Mark more packages as broken 2013-11-04 21:11:00 +01:00
Mathijs Kwik
609f8dc04b Merge branch 'master' into stdenv-updates
Conflicts:
	pkgs/top-level/all-packages.nix
2013-11-01 08:31:54 +01:00
Peter Simons
86443f4efd haskell-cabal2nix: update to version 1.55 2013-10-31 09:02:25 +01:00
Michael Raskin
92e3206c2a Updating SlimerJS to Git version for compatibility with fresh xulrunner 2013-10-31 02:59:45 +04:00
Domen Kožar
09fa7304ae ninka: update to 1.1 and refactor 2013-10-30 11:47:12 +01:00
Michael Raskin
52d5290118 Update SlimerJS 2013-10-30 13:03:47 +04:00
Peter Simons
d64917ad17 Back-port Haskell-related improvements from stdenv-updates.
* There now is full support for building Haskell packages as shared libraries
   for GHC versions 7.4.2 or later. The Cabal builder recognizes the following
   attributes:

    - enableSharedLibraries configures Cabal to build of shared libraries in
      addition to static ones. This option requires that all dependencies of
      the package have been compiled for use in shared libraries, too.

    - enableSharedExecutables configures Cabal to prefer shared libraries when
      linking executables.

   The default values for these attributes are arguments to the haskellPackages
   expression.

 * Haskell builds now run in a LANG="en_US.UTF-8" environment to avoid plenty
   of build and test suite errors. Without this setting, GHC seems unable to
   deal with the UTF-8 character encoding that's generally considered standard
   in the Haskell world.

 * The Cabal builder supports a new attribute 'testTarget' to specify the exact
   set of tests to be run during the check phase.

 * The ghc-wrapper attribute ghcVersion has been removed. Instead, we use the
   ghc.version attribute, which exists in unwrapped GHC derivations, too.
2013-10-27 10:09:36 +01:00
Peter Simons
91f2c362de Merge remote-tracking branch 'origin/master' into stdenv-updates.
Conflicts:
	pkgs/top-level/all-packages.nix
2013-10-26 18:28:05 +02:00
Bjørn Forsman
a13ed71b43 xc3sprog: new package
xc3sprog is command-line tools for programming FPGAs, microcontrollers
and PROMs via JTAG.

Homepage: http://xc3sprog.sourceforge.net/

I'm using the latest from subversion as xc3sprog doesn't seem to make
proper releases. There are only a few seemingly random snapshots at
sourceforge. And these snapshots are built binary packages, not source
archives.

NOTE: I haven't tested this on any hardware yet.
2013-10-26 12:43:12 +02:00
Peter Simons
1b86a6d399 haskell-HaRe: update to version 0.7.0.7 2013-10-24 23:29:55 +02:00
Michael Raskin
5bbb1f77b2 Adding SlimerJS — script-driven Gecko browser 2013-10-21 00:30:39 +04:00
Michael Raskin
20e8f46022 Updating luarocks to 2.1.0 2013-10-20 21:08:09 +04:00
Michael Raskin
96585205d7 Updating CL-Launch to 3.22.1 2013-10-20 21:07:48 +04:00
Michael Raskin
be5b32e798 Apparently fix texinfo5 with fresh TeXLive 2013-10-20 19:15:11 +04:00
Peter Simons
fae8fd8ef1 ghc-wrapper: rename 'ghcVersion' attribute to 'version' for consistency 2013-10-20 15:40:36 +02:00
Peter Simons
6be8ad3392 Merge branch 'origin/master' into stdenv-updates.
There was a minor conflict in 'stumpwm'. The package needs texinfo
version 4.x. At least is used to, I'm not sure whether it still does.
2013-10-18 18:57:24 +02:00
Peter Simons
4dee7de246 haskell-packunused: update to version 0.1.0.1 2013-10-14 08:46:31 +02:00
Eelco Dolstra
df0d362f31 Fix some more Hydra evaluation errors 2013-10-08 11:07:14 +02:00
Bjørn Forsman
083d0890f5 More description fixes
* Remove package name
* Start with upper case letter
* Remove trailing period

Also reword some descriptions and move some long descriptions to
longDescription.

I'm not touching generated packages.
2013-10-06 12:01:38 +02:00
Bjørn Forsman
28ac782583 Some description fixes
There are many more packages to fix, this is just a start.

Rules:
 * Don't repeat the package name (not always that easy...)
 * Start with capital letter
 * Don't end with full stop
 * Don't start with "The ..." or "A ..."

I've also added descriptions to some packages and rewritten others.
2013-10-05 19:36:23 +02:00
Peter Simons
ac5d5297dd Merge remote-tracking branch 'origin/master' into stdenv-updates. 2013-10-02 22:44:12 +02:00
Peter Simons
3a8c00c00d haskell-HaRe: update to version 0.7.0.6 2013-10-02 22:33:42 +02:00
Jason "Don" O'Conal
d4ba98abc9 phantomjs: add openssl to rpath 2013-10-02 05:17:32 +00:00
Moritz Ulrich
f09dca7d60
Leiningen: Update to 2.3.2 (& add GnuPG to closure) 2013-09-30 19:11:19 +00:00
Song Wenwu
d4c222dd34 gradle: update to 1.8 2013-09-29 21:40:17 +02:00
Peter Simons
b15c3e49e5 texinfo: remove obsolete version 4.9 2013-09-28 10:37:05 +02:00
Peter Simons
8ff3855204 texinfo: update to version 5.2 2013-09-28 10:36:34 +02:00
aszlig
9170351e69
ninja: Update to new upstream version 1.4.0.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2013-09-27 15:23:30 +02:00
Moritz Ulrich
36fca94805
Fix some issues in my packages reported by nixpkgs-lint.
Signed-off-by: Moritz Ulrich <moritz@tarn-vedra.de>
2013-09-26 20:03:57 +00:00
Peter Simons
01c91a7fa1 haskell-hlint: update to version 1.8.53 2013-09-25 18:25:00 +02:00
Peter Simons
9407832de4 Merge remote-tracking branch 'origin/master' into stdenv-updates.
Conflicts:
	pkgs/development/libraries/gettext/default.nix
2013-09-23 10:59:44 +02:00
Peter Simons
e4f6e4b15d gnum4: drop obsolete patches 2013-09-22 16:35:54 +02:00
Peter Simons
ee3dc2d0c9 gnum4: fix download URL 2013-09-22 16:32:26 +02:00
Peter Simons
8d6b23a60a gnum4: update to version 1.4.17 2013-09-22 16:27:44 +02:00
Rok Garbas
7350100fa2 phantomjs: upgrade to 1.9.2 2013-09-19 01:57:58 +02:00
Peter Simons
651b94fd32 haskell-keter: update to version 1.0.1.1 2013-09-18 17:17:32 +02:00
Peter Simons
54124516de haskell-happy: add version 1.19.0 2013-09-18 17:17:31 +02:00
Peter Simons
5bc2f6ce02 haskell-alex: add version 3.1.0 2013-09-18 17:17:31 +02:00
Peter Simons
07ec0d7cef haskell-HaRe: update to version 0.7.0.5 2013-09-18 17:17:31 +02:00
Vladimír Čunát
2c7c65595d Revert "binutils: minor update 2.23.1 -> .2"
This reverts commit 15f96c840f.
See #909.

Conflicts (trivial, auto-resolved):
	pkgs/development/tools/misc/binutils/default.nix
2013-09-16 15:53:40 +02:00
Peter Simons
b962caede7 bison-3.x: fix build for good this time
- Bison 3.x no longer compiles without Perl.

 - Don't try to run the test suite unless flex is available.
2013-09-15 22:05:16 +02:00
Peter Simons
24366adf19 Merge remote-tracking branch 'origin/master' into stdenv-updates. 2013-09-14 15:28:40 +02:00
Krofek
51f63b1d03 Merge branch 'master' of https://github.com/Krofek/nixpkgs 2013-09-14 00:28:27 +02:00
Krofek
da21a852c3 gtkdialog: update to 0.8.3 2013-09-14 00:10:17 +02:00
Rickard Nilsson
45b8a1b1ff avrdude: Update to version 5.11 2013-09-13 00:28:02 +02:00
Peter Simons
6fff4c01e8 haskell-HaRe: update to version 0.7.0.4 2013-09-12 19:27:25 +02:00
Peter Simons
edfefa6167 gnulib: update to version 0.0-8015-gf0aab22 2013-09-12 12:22:17 +02:00
Peter Simons
a1cca8226a happy: add version 1.18.11 2013-09-11 19:58:34 +02:00
Mathijs Kwik
2f428bbb46 Merge remote-tracking branch 'official/master' into stdenv-updates 2013-09-11 10:56:47 +02:00
Peter Simons
445aa49c71 bison: prefer the tar.gz variant of the sources
Apparently, the bootstrapping stdenv cannot unpack xz-compressed tarfiles.
2013-09-11 10:55:23 +02:00
Vladimír Čunát
aa8e8303e1 Merge branch 'x-updates' into master 2013-09-11 08:37:03 +02:00
Peter Simons
09477f6002 haskell-HaRe: update to version 0.7.0.2 2013-09-09 15:07:36 +02:00
Peter Simons
6451264e63 Drop obsolete versions of flex: we only used the latest one, 2.5.35. 2013-09-09 10:39:56 +02:00
Peter Simons
701937b085 binutils: remove unused flex2535, bc, and dejagnu arguments 2013-09-09 10:34:37 +02:00
Peter Simons
a4531a5dd5 Merge remote-tracking branch 'origin/master' into stdenv-updates. 2013-09-09 09:51:12 +02:00
Peter Simons
c8c7a8dc42 haskell-keter: update to version 1.0.1 2013-09-08 22:56:29 +02:00
Peter Simons
b68dfd49c7 haskell-splot: re-generate expression with cabal2nix 2013-09-08 22:56:25 +02:00
Peter Simons
3d2caf1180 Merge remote-tracking branch 'origin/master' into stdenv-updates. 2013-09-08 22:54:35 +02:00
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
Vladimír Čunát
c074433fc6 binutils: add support for x86_64 in i686 builds (close #857)
Also some style refactoring around repeating "stdenv.lib.optional*".
The author of the idea is @errge.
2013-09-02 22:03:43 +02:00
Vladimír Čunát
74488e2b58 Merge branch 'x-updates' into stdenv-updates
Conflicts (simple):
	pkgs/development/libraries/glib/default.nix
	pkgs/development/libraries/mesa/default.nix
2013-09-02 15:44:57 +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
Peter Simons
98fcc2f746 Merge remote-tracking branch 'origin/master' into stdenv-updates. 2013-08-30 10:45:11 +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
9ac8ea937c Merge branch 'origin/master' into stdenv-updates. 2013-08-26 12:21:23 +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
bbenoist
e13720c3c4 cmake: Fix CTest custom commands
This commit is related to:
 - https://github.com/NixOS/nixpkgs/issues/762
 - http://public.kitware.com/Bug/view.php?id=13887
And fixes a bug present in recent CMake versions.

The fix should be integrated in the next CMake release.
2013-08-21 10:24:53 +02:00
bbenoist
bef090400e cmake: Update to 2.8.11.2 2013-08-21 10:24:53 +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
Peter Simons
0d7118814b Merge branch 'origin/master' into stdenv. 2013-08-17 10:00:16 +02:00
Ludovic Courtès
2e937c437a unmaintain several packages 2013-08-16 23:45:01 +02:00
Peter Simons
76244ac2e2 Merge branch 'master' into stdenv-updates
Conflicts:
	pkgs/development/compilers/ghc/with-packages.nix
2013-08-16 22:51:13 +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
522acfd2f4 Merge remote-tracking branch 'master' into stdenv-updates.
Conflicts:
	pkgs/applications/version-management/git-and-tools/git/default.nix
	pkgs/top-level/all-packages.nix
2013-07-30 11:29:30 +02: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
Vladimír Čunát
8ba92b8895 Merge master into stdenv-updates
Conflicts (simple):
	pkgs/development/tools/misc/binutils/default.nix
	pkgs/tools/package-management/disnix/default.nix
	pkgs/top-level/all-packages.nix
2013-07-08 10:48:05 +02: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
Vladimír Čunát
c1ef3d2854 texinfo5: add missing xz, use version 5.* by default 2013-06-30 09:00:11 +02:00
Vladimír Čunát
15f96c840f binutils: minor update 2.23.1 -> .2 2013-06-30 09:00:11 +02:00
Vladimír Čunát
3314be6b73 cmake: consistent names, to satisfy comments on #567 2013-06-27 16:33:24 +02:00
Vladimír Čunát
4251b70c7e Merge master into stdenv-updates (contains new X stuff) 2013-06-27 16:24:57 +02:00
Vladimír Čunát
7f1e09c35d Re-Revert "Merge pull request #567 from MarcWeber/submit/cmake-improvement"
This reverts commit b08e12b37a.
2013-06-27 15:14:32 +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
Vladimír Čunát
842420c3e1 Merge branch 'master' into stdenv-updates
Conflicts (relatively simple):
	pkgs/development/interpreters/python/2.7/default.nix
	pkgs/development/libraries/dbus/default.nix
	pkgs/development/libraries/glib/default.nix
	pkgs/development/libraries/glibc/2.17/common.nix
2013-06-20 19:21:25 +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
Peter Simons
b08e12b37a Revert "Merge pull request #567 from MarcWeber/submit/cmake-improvement"
This reverts commit abc7591aaf, reversing changes
made to 6b1ebeccf2, because they broke half the
packages in stdenv-updates: http://hydra.nixos.org/eval/927013 has further
details.
2013-06-17 10:19:15 +02:00
Peter Simons
12b29fadcb Merge remote-tracking branch 'origin/master' into stdenv-updates. 2013-06-17 10:14:45 +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
abc7591aaf Merge pull request #567 from MarcWeber/submit/cmake-improvement
experimental/cmake-improvement
2013-06-13 05:47:20 -07: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
Peter Simons
6b1ebeccf2 Merge branch 'master' into stdenv-updates.
There were conflicts in pkgs/development/interpreters/ruby/ruby-19.nix,
which I resolved to the best of my knowledge. I'd appreciate if some of
the ruby gurus could have a look at the outcome of my merge, though.
2013-06-11 12:11:25 +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
5718931dd3 Merge remote-tracking branch 'origin/master' into stdenv-updates. 2013-06-01 11:48:21 +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
Marc Weber
f7ef08e5cd experimental/cmake-improvement
set CMAKE_LIBRARY_PATH, CMAKE_INCLUDE_PATH based on NIX_CFLAGS_COMPILE and
NIX_LDFLAGS so that cmake's find_library like functions find all the libraries
gcc knows about thanks to the gcc wrapper

This is particular useful with myEnvFun which then also sets those CMAKE_* env
variables.`

Because setup.sh has to change this causes many rebuilds - thus it should be
included in a stdenv-update like branch

Also cmake builds in parallel perfectly fine

update cmake to latest minor number, I didn't change the patches,
just reapplied them manually recordin a new patch
2013-05-28 16:22:45 +02:00
Peter Simons
2bd7aa7a65 haskell-timeplot: update to version 1.0.20 2013-05-25 11:31:00 +02:00
Peter Simons
728e305205 Merge remote-tracking branch 'origin/master' into stdenv-updates. 2013-05-22 12:30:02 +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
6b78544add binutils: enable gold by default
This doesn't change the default but makes gold available to packages
that might want to use it.

Required switching to the gzipped tarball for bison, as xz isn't
available in the early bootstrap.

Signed-off-by: Shea Levy <shea@shealevy.com>
2013-05-04 19:38:46 -04:00
Shea Levy
fde3526e7d Merge branch 'master' into stdenv-updates
Conflict in kerberos, which was updated both in master and in
stdenv-updates. Kept the stdenv-updates version, except pulled in the
enableParallelBuilding change from master.

Signed-off-by: Shea Levy <shea@shealevy.com>

Conflicts:
	pkgs/development/libraries/kerberos/krb5.nix
2013-05-04 18:28:48 -04: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
Peter Simons
2ffd0b6dac Merge changes from branch 'origin/master' into stdenv-updates. 2013-04-20 22:19:39 +02:00
Peter Simons
2b56b020c7 alex, happy: fix build for gcc 4.8.0
Alex and happy use CPP to generate some internal template files, but the code
is unprepared for the output from CPP 4.8.0, which generates LINE pragmas that
contain more information than they thought it would.
2013-04-20 18:15:57 +02:00
Vladimír Čunát
1b349b06d8 itstool: update 2013-04-20 10:25:24 +02:00
Peter Simons
4914e63a89 Merge changes from branch 'master' into stdenv-updates.
Conflicts:
	pkgs/development/libraries/icu/default.nix
	pkgs/tools/misc/coreutils/default.nix
2013-04-19 11:48:11 +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
022f120a2c Merge branch 'master' into stdenv-updates. 2013-04-07 23:37:12 +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
Peter Simons
9f4d510b6b Merge branch 'master' into stdenv-updates. 2013-04-05 11:23:38 +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
Peter Simons
64f600a010 Merge remote-tracking branch 'origin/master' into stdenv-updates. 2013-04-01 13:39:57 +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
fdbe2878f0 Merge remote-tracking branch 'origin/master' into stdenv-updates. 2013-03-28 14:02:56 +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
0823aea0a6 Merge branch 'master' into stdenv-updates.
Conflicts:
	pkgs/development/libraries/libxslt/default.nix

Commit 1764ea2b0a introduced changes to libxslt
in an awkward way to avoid re-builds on Linux. This patch has been simplified
during this merge.
2013-03-25 13:43:45 +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
22fb1ad99e Merge remote-tracking branch 'origin/master' into stdenv-updates. 2013-03-21 09:23:54 +01:00
Peter Simons
8e9ff8e1ab cppi: update to version 1.18 2013-03-18 11:37:46 +01:00
Danny Wilson
d007a78ccb Merge remote-tracking branch 'origin/stdenv-updates' into illumos
Conflicts:
	pkgs/development/libraries/gmp/5.1.1.nix
	pkgs/development/libraries/mpc/default.nix
	pkgs/development/libraries/mpfr/default.nix
	pkgs/development/libraries/ppl/default.nix
	pkgs/tools/misc/coreutils/default.nix
2013-03-17 13:22:24 +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
Vladimír Čunát
99da34c204 elfutils: fix build via update 2013-03-17 10:26:44 +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
Danny Wilson
5dcc019dc0 Update bison to 2.7 2013-02-28 20:04:05 +01:00
Peter Simons
97c3f61e08 haskell-jailbreak-cabal: update to version 1.1 2013-02-28 11:31:50 +01:00