Commit Graph

2725 Commits

Author SHA1 Message Date
Eelco Dolstra
e7f1038798 Fix typo in last merge 2015-06-01 20:09:31 +02:00
Eelco Dolstra
553abf71ba Merge remote-tracking branch 'origin/staging' into gcc-4.9
Conflicts:
	pkgs/build-support/cc-wrapper/default.nix
	pkgs/development/libraries/wayland/default.nix
	pkgs/development/tools/build-managers/cmake/default.nix
	pkgs/top-level/all-packages.nix
2015-06-01 20:08:43 +02:00
Pascal Wittmann
ed9455838c checkstyle: update from 6.6 to 6.7 2015-05-31 20:25:33 +02:00
Peter Simons
c55ca3fd0b cabal2nix: update to version 20150531
This update adds support for bash completion.
2015-05-31 18:31:26 +02:00
Tobias Geerinckx-Rice
21015ea82f Add bin_replace_string: edit precompiled binaries 2015-05-30 21:09:26 +02:00
Pascal Wittmann
1d30557516 Fixed meta.license: s/licence/license 2015-05-30 15:19:05 +02:00
Pascal Wittmann
24d2849dba gtk-doc: update from 1.23 to 1.24 2015-05-30 13:48:53 +02:00
Peter Simons
99273a6716 Merge pull request #8047 from nckx/master
Don't use "with licenses;" for single licences
2015-05-28 22:14:53 +02:00
Tobias Geerinckx-Rice
158e1cfdd0 Don't use "with licenses;" for single licences
And don't use square brackets on such lines.
2015-05-28 19:20:29 +02:00
Pascal Wittmann
7822640a18 yodl: update from 3.05.00 to 3.05.01 2015-05-28 19:10:52 +02:00
Pascal Wittmann
f675c4d90d icmake: update from 7.22.00 to 7.22.01 2015-05-28 18:57:32 +02:00
Pascal Wittmann
38bc63c605 help2man: update from 1.46.5 to 1.46.6 2015-05-28 18:56:12 +02:00
Pascal Wittmann
b57097b2fe fswatch: update from 1.4.6 to 1.4.7 2015-05-28 18:54:35 +02:00
Pascal Wittmann
1a3860e95a checkstyle: update from 6.5 to 6.6 2015-05-28 18:49:06 +02:00
Sander van der Burg
3fa15c820f doclifter: add new package 2015-05-28 16:13:47 +00:00
Rok Garbas
ea3748d519 cygwin: help2man patch for cygwin 2015-05-28 14:15:47 +02:00
Florian Friesdorf
90a97d32df cygwin cmake 2015-05-28 10:53:36 +02:00
Florian Friesdorf
f33f2a7e82 cygwin: disable gnumake check because of hanging test 2015-05-28 10:53:35 +02:00
Marko Durkovic
c4efe32d4d cygwin: pkgconfig 2015-05-28 10:53:35 +02:00
Austin Seipp
4793f2c7d3 nixpkgs: arcanist 20150412 -> 20150525
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2015-05-27 16:36:26 -05:00
Tobias Geerinckx-Rice
b2d7f4b1ba Use common licence attributes from lib/licenses.nix
Many (less easily automatically converted) old-style strings
remain.

Where there was any possible ambiguity about the exact version or
variant intended, nothing was changed. IANAL, nor a search robot.

Use `with stdenv.lib` wherever it makes sense.
2015-05-27 22:00:06 +02:00
Arseniy Seroka
6c9ac3f967 Merge pull request #8024 from ragnard/update-boot-version
boot: Update version from 2.0.0-rc14 to 2.0.0.
2015-05-27 22:43:15 +03:00
Ragnar Dahlén
9cb63367dc boot: Update version from 2.0.0-rc14 to 2.0.0. 2015-05-27 20:39:17 +01:00
lethalman
257c05fa82 Merge pull request #7622 from jzellner/master
add goimports package
2015-05-27 10:57:23 +02:00
vbgl
2857d5d7a8 Merge pull request #7823 from ericbmerritt/ocaml-enhancements
Ocaml enhancements
2015-05-26 23:52:32 +02:00
Edward Tjörnhammar
f02284a361 activator: add version 1.3.2 2015-05-26 20:56:43 +02:00
Antoine R. Dumont
a12dd8f6a1 Upgrade to latest stable
Upgraded the dependency to oracle's jdk8.
2015-05-26 19:30:19 +02:00
Alexander Flatter
7d9724057c Update heroku toolbelt to 3.32.0 2015-05-26 13:06:34 +02:00
Alexander Flatter
be71c0871c Add meta information to heroku toolbelt 2015-05-26 13:06:34 +02:00
Alexander Flatter
d2b906c771 Add heroku-client 2015-05-26 13:05:53 +02:00
Peter Simons
d808f5b3e6 cabal2nix: update to version 20150525 2015-05-25 15:00:07 +02:00
Eric Merritt
8751d1ea1a rename ocaml_typeconv to type_conv
The actual name of the package is type_conv
(https://github.com/janestreet/type_conv). Having it named
ocaml_typeconv adds a verbosity that isn't required and actually makes
the package harder to find.
2015-05-24 12:32:45 -07:00
Eric Merritt
56627d5444 ocaml-opam: the sha hash of 1.2.2 changed
This is a bit scary. The sha of 1.2.2 changed, causing a crash on
download of the url. This updates to the current sha. Opam maintainer
why, oh why, do you change a released version without a version bump??
2015-05-24 12:31:44 -07:00
Boris Sukholitko
1da49e714d Upgrade to selenium 2.45
Without the upgrade, firefox driver is unusable, due to:

https://code.google.com/p/selenium/issues/detail?id=8399
2015-05-22 17:40:18 +03:00
Sander van der Burg
e612ea59c0 rman: add expression 2015-05-22 10:04:44 +00:00
Tobias Geerinckx-Rice
5d5044b2ec Use mirror:// URIs for ftp.debian.org
Provide a more robust experience for users with horrible network
hardware (me).
2015-05-22 10:39:27 +02:00
Pascal Wittmann
71aaebc954 thrust: fix build 2015-05-21 15:24:59 +02:00
jz
f2cc21a8b4 Merge branch 'master' of github.com:NixOS/nixpkgs 2015-05-20 15:18:26 -06:00
Ozan Sener
97160a8644 Add Thrust 0.7.6 2015-05-20 20:58:03 +02:00
Ossi Herrala
d2f21ab3fc cfr: Update to version 0_101 and remove platform restrictions
cfr is written in Java, so it should work in every platform supported
by jre. This fix makes cfr usable in Darwin.
2015-05-20 09:02:13 +03:00
Pascal Wittmann
2c8872f191 gtk-doc: update from 1.21 to 1.23 2015-05-19 20:08:15 +02:00
Ricardo M. Correia
2817e74d37 cargo: Add myself to maintainers 2015-05-19 19:02:38 +02:00
Ricardo M. Correia
9b752fd0e1 buildRustPackage: Don't hardcode registry index hash
Instead, discover it automatically when building the package.

This makes `buildRustPackage` more future-proof with respect to changes
in how `cargo` generates the hash.

Also, it fixes broken builds in i686 because apparently, cargo generates
a different registry index hash in this architecture (compared to
x86-64).
2015-05-19 19:02:38 +02:00
Ricardo M. Correia
de322b48b7 cargo: Fix src hash
It seems that when you pass `leaveDotGit = true` to `fetchgit`, sometimes
the output can still change (i.e. it's not completely deterministic).

This could be due to changes in the upstream git repository...
2015-05-19 19:02:38 +02:00
Luca Bruno
9adde87fea More usage of gnome3.defaultIconTheme 2015-05-19 14:44:27 +02:00
Ricardo M. Correia
85c48934bc racerRust: 2015-05-04 -> 2015-05-18
Fixes build failure with rustc 1.0.0.
2015-05-19 03:08:34 +02:00
Peter Simons
61224338ff cabal2nix: update to version 20150518 2015-05-18 18:04:37 +02:00
Joel Taylor
78ef78719f Merge branch 'master' of https://github.com/NixOS/nixpkgs 2015-05-15 14:33:21 -07:00
Joel Taylor
1aef9fc4af cmake: disable building with ncurses if building without ncurses 2015-05-15 14:31:40 -07:00
Vladimír Čunát
b7fe141f6b Revert "remove cmake-2.8"
Some packages fail with the only cmake version we've left.
This reverts commit 67199bda4e.
2015-05-15 23:02:41 +02:00