1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-12-01 01:51:24 +00:00
Commit graph

1110 commits

Author SHA1 Message Date
Domen Kožar bb4d658f64 Merge branch 'master' into staging
Conflicts:
	nixos/doc/manual/release-notes/rl-unstable.xml
	nixos/modules/services/printing/cupsd.nix
	pkgs/applications/misc/calibre/default.nix
	pkgs/development/haskell-modules/hackage-packages.nix
	pkgs/development/libraries/libsodium/default.nix
	pkgs/misc/emulators/wine/unstable.nix
	pkgs/top-level/all-packages.nix
2015-05-11 10:05:23 +02:00
codyopel 4b07d16827 intltool: refactor 2015-05-11 03:11:30 -04:00
Michael Raskin 84ffa4d489 Update CL-Launch 2015-05-10 13:46:31 +02:00
Michael Raskin 53f8245494 Update luarocks 2015-05-10 13:46:31 +02:00
Michael Raskin fdd0a1f7f8 Update CL-Launch 2015-05-10 13:36:46 +03:00
Michael Raskin d1d2a9856c Update luarocks 2015-05-10 13:36:45 +03:00
William A. Kennington III 074c4a7f78 Merge remote-tracking branch 'upstream/master' into staging 2015-05-07 01:44:49 -07:00
Peter Simons 324719a5a6 Drop obsolete pre-NG Haskell builds. 2015-05-05 21:44:47 +02:00
Tobias Geerinckx-Rice 288291e132 yodl: fix paths. Now it actually works. 2015-05-05 19:44:45 +02:00
William A. Kennington III 00df204c82 Merge remote-tracking branch 'upstream/master' into staging 2015-05-01 15:57:09 -07:00
William A. Kennington III f48fe899c3 Simplify some builds with curses compatability 2015-04-30 18:49:28 -07:00
William A. Kennington III f537943f27 dejagnu: Add metadata 2015-04-30 18:49:27 -07:00
Joachim Fasting bf7ad2d84f meta.description fixups
Mostly scripted substitutions with a couple of subjective enhancements.
2015-04-30 18:17:42 +02:00
Thomas Tuegel 1fe28a1132 Merge remote-tracking branch 'upstream/master' into staging 2015-04-29 11:33:28 -05:00
William A. Kennington III c6bee4b4bb sysbench: Update to 2015-04-22 2015-04-28 18:27:39 -07:00
Pascal Wittmann f99d5cf2fc Fixed some descriptions 2015-04-28 10:55:20 +02:00
Vladimír Čunát 30f31c9afc Merge 'master' into staging
(relatively simple conflicts)
2015-04-26 22:52:08 +02:00
Ambroz Bizjak 05a44cd06e stlink: Update to version 1.1.0. 2015-04-24 00:08:12 +02:00
Georges Dubus 7372c5434f nixbang: upgrade to 0.1.2 2015-04-22 10:00:26 +02:00
Tobias Geerinckx-Rice 74d66a3df1 dejagnu 1.5.1 -> 1.5.3 2015-04-19 02:13:30 +02:00
Luca Bruno 384abb5e29 Add automake 1.15 2015-04-17 17:18:10 +02:00
Lluís Batlle i Rossell 745b1ce04a Updating gdb to 7.9.
I can remove the patch of edit-signals. It seems to work without it.

I tested the change over release-14.12.
2015-04-14 17:26:13 +02:00
Austin Seipp a4e63baf35 nixpkgs: arcanist 20150318 -> 20150412
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2015-04-12 12:16:30 -05:00
Thomas Tuegel 88918e10e9 Merge branch 'master' into staging 2015-04-10 07:45:38 -05:00
William A. Kennington III 91221f5941 Revert "binutils: 2.23.1 -> 2.25"
This reverts commit 4adae43646.

This breaks the building of samba and likely other binaries as some
libraries are never linked.
2015-04-08 12:14:08 -07:00
Pascal Wittmann 2887162c7a intel-gpu-tools: update from 1.9 to 1.10 2015-04-08 16:06:58 +02:00
Pascal Wittmann 2958fedc2d global: update from 6.3.4 to 6.4 2015-04-08 16:04:56 +02:00
William A. Kennington III 5872185250 automake: Bump to 1.15 2015-04-07 13:32:35 -07:00
Eric Seidel c94b24fa4a fix fallout from merge of master 2015-04-06 19:48:44 -07:00
Eric Seidel 6ec373d776 Merge branch master into staging 2015-04-06 18:58:08 -07:00
Michael Raskin 67e055501f Update intltool 2015-04-05 20:27:25 +03:00
Michael Raskin 25317cf30c Update cl-launch 2015-04-05 20:27:25 +03:00
Ryan Mulligan 93f1029b0f Get rid of fetchurlGnome
closes #1707
2015-04-04 22:22:12 -07:00
Spencer Whitt 171225ab1c uncrustify: build on Darwin 2015-04-04 02:07:55 -04:00
Spencer Whitt 162f870e6f astyle: fix on Darwin 2015-04-04 02:07:55 -04:00
William A. Kennington III a604b42480 mysql: Use libs in place of the binary mysql 2015-04-01 16:46:53 -07:00
John Wiegley 80c6c5e9ec global: wrap "global" in the same fashion 2015-03-31 20:56:05 -05:00
John Wiegley c7ce8c7768 global: make pygments visible to "gtags" binary 2015-03-31 20:53:22 -05:00
John Wiegley b29fc6bfaf global: add missing spaces to configureFlags 2015-03-31 16:09:40 -05:00
John Wiegley 227ebdc7cb Remove unnecessary entries in propagatedBuildInputs 2015-03-31 10:34:22 -05:00
John Wiegley 65b4013194 Add propagatedBuildInputs 2015-03-31 10:31:58 -05:00
John Wiegley b6932f56f8 Enable two modern features of GNU global 2015-03-31 10:30:19 -05:00
William A. Kennington III fa2e5b25ba Merge branch 'master' into staging 2015-03-29 14:25:48 -07:00
Henry Till 7d52faac72 texi2html: change platforms to unix
Tested on Darwin
2015-03-28 17:11:14 -04:00
William A. Kennington III a0aec63eb8 dejagnu: 1.5.1 -> 1.5.2 2015-03-26 16:11:57 -07:00
William A. Kennington III 767c179a94 Merge branch 'master' into staging 2015-03-26 14:44:05 -07:00
William A. Kennington III 5c3cdaf351 libtool: 2.4.5 -> 2.4.6 2015-03-26 00:59:08 -07:00
William A. Kennington III 4adae43646 binutils: 2.23.1 -> 2.25 2015-03-26 00:24:17 -07:00
Shea Levy 6e3c9d5ce4 Fix fallout of recent cc-wrapper changes
Fixes tarball except for 56e21d05e8
2015-03-24 22:13:43 -04:00
Shea Levy f80e342e83 ccache-links is wrapped, so it needs a gcc attribute 2015-03-24 08:59:34 -04:00