Commit Graph

180 Commits

Author SHA1 Message Date
Peter Simons
32757ef184 hackage-packages.nix: update to bfbb2bc96c with hackage2nix revision d0ef14cd08973bdb61a29700ef07b1149c86b7a3 2015-06-02 10:32:27 +02:00
Peter Simons
1cc014fdae hackage-packages.nix: update to a0ad41c6f5 with hackage2nix revision 4d6361f0199d51068066c62bb0ca5c18530161f4 2015-05-30 19:55:32 +02:00
Peter Simons
35b2be0d24 hackage-packages.nix: update to 19c8675e5d with hackage2nix revision 66f6b1336269ffa8e106822407e09e3dbadffcd1 2015-05-30 19:54:42 +02:00
William A. Kennington III
b07929b0a3 Use libpulseaudio instead of pulseaudio 2015-05-29 14:32:56 -07: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
Peter Simons
1b66d9318b hackage-packages.nix: update to 67bad0d79a with hackage2nix revision fb67f15c8cb79342f5719342c1b1b42e134bcce4 2015-05-25 20:43:39 +02:00
Peter Simons
3fa1b2183a hackage-packages.nix: update to 8ed599c155 with hackage2nix revision 61d7380337df7e1b568c1b30f4d97e5c2df42b66 2015-05-25 00:19:14 +02:00
Peter Simons
3440c4c8e4 hackage-packages.nix: update to a4032345e0 with hackage2nix revision ca778c8501c0d2e3c44fa9016b1f79cdf6f3dcc2 2015-05-24 05:19:27 +02:00
Peter Simons
0a329f4512 hackage-packages.nix: update to 381af77b54 with hackage2nix revision ca778c8501c0d2e3c44fa9016b1f79cdf6f3dcc2 2015-05-23 15:09:25 +02:00
Peter Simons
da6567785b hackage-packages.nix: update to 134ac5a06c with hackage2nix revision a31a6f02a9c437a93e5f13394aa2268f476433aa 2015-05-22 16:35:52 +02:00
Peter Simons
06d002acb5 hackage-packages.nix: update to 25810f6054 with hackage2nix revision a70a5194597133ba31b950c826ef09206249cca9 2015-05-21 14:57:12 +02:00
Peter Simons
8e48f09284 hackage-packages.nix: update to 6ccfe7a320 with hackage2nix revision d339b0fe58a504a61db589362b73992a5912304e 2015-05-18 20:43:50 +02:00
Peter Simons
a14966e827 hackage-packages.nix: update to eb2884c12c with hackage2nix revision bf850da9044b16efb9ef06a05c645fa981513444 2015-05-18 18:04:31 +02:00
Peter Simons
f9f55b4147 hackage-packages.nix: update to 21baf54727 with hackage2nix revision b0eec6a5853fb52a28ae3ded058c3f7d0c510e2a 2015-05-17 13:46:23 +02:00
Peter Simons
4e2e36f388 hackage-packages.nix: update to 31bc649141 with hackage2nix revision 8e3ad6c8af82151574e87c1e9c9ec6cbb5841b3d 2015-05-16 21:59:36 +02:00
Peter Simons
4ead7bc0b7 hackage-packages.nix: update to 65d3f6a305 with hackage2nix revision 4c63d4ad559c7c9569df1ea07557f92a1cfb5a3e 2015-05-11 17:01:56 +02:00
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
Peter Simons
7b49289c74 hackage-packages.nix: update to 4f492cbdcc with hackage2nix revision 4c63d4ad559c7c9569df1ea07557f92a1cfb5a3e 2015-05-10 22:14:42 +02:00
codyopel
c250cf6f53 libsodium: refactor & remove duplicate 2015-05-10 13:46:29 +02:00
Peter Simons
d484328619 hackage-packages.nix: update to 7424fa13db with hackage2nix revision 5e6df99a29c3e80bb071af288038312b19baf022 2015-05-10 13:46:01 +02:00
Peter Simons
132e0fed79 hackage-packages.nix: update to 533fd30acc with hackage2nix revision f8474108eabeb513175d845709f749070ffdd8ba 2015-05-10 13:46:00 +02:00
codyopel
7a794e1797 libsodium: refactor & remove duplicate 2015-05-09 18:20:06 -04:00
Peter Simons
31b330828c hackage-packages.nix: update to 7424fa13db with hackage2nix revision 5e6df99a29c3e80bb071af288038312b19baf022 2015-05-09 14:16:43 +02:00
Peter Simons
d9411d53e9 hackage-packages.nix: update to 533fd30acc with hackage2nix revision f8474108eabeb513175d845709f749070ffdd8ba 2015-05-09 11:26:09 +02:00
Peter Simons
e930cf057e hackage-packages.nix: update to d338756e7c with hackage2nix revision f8474108eabeb513175d845709f749070ffdd8ba 2015-05-08 14:10:15 +02:00
Peter Simons
06255562b6 hackage-packages.nix: update to a194932779 with hackage2nix revision db53ac3a644eebda581c9f036ccd55a19ff3c629 2015-05-05 21:44:48 +02:00
Peter Simons
01ba9d0dec hackage-packages.nix: update to 69ffcf7c20 with hackage2nix revision 936f7d1dd81cf86df3d79e4e38d17dc68e2a561e 2015-05-05 21:44:47 +02:00
Peter Simons
1650292b65 hackage-packages.nix: update to 9c68a9d77e with hackage2nix revision a92f66b20fe51e401d0d4d945beeae82093f8d43 2015-05-05 21:44:47 +02:00
Peter Simons
53598090ea hackage-packages.nix: update to 461332b5dd with hackage2nix revision a92f66b20fe51e401d0d4d945beeae82093f8d43 2015-05-05 19:18:19 +02:00
Peter Simons
34c533009d hackage-packages.nix: update to 377c4aff87 with hackage2nix revision e4785fc969ad3ea9d2fdda94a86d0fff9c56721c 2015-05-05 12:54:48 +02:00
Peter Simons
cf230ccc82 hackage-packages.nix: update to 7291c193bd with hackage2nix revision 1e8c48d7b3a9b73489d686ee1ae44f4198130294 2015-05-04 15:49:46 +02:00
Peter Simons
9b27a88b66 hackage-packages.nix: update to 5f6d964cba with hackage2nix revision 913111f692c1890208c98f0fd73dbe1b711c789b 2015-04-29 12:22:20 +02:00
Peter Simons
f426922f4a hackage-packages.nix: update to 44775051f9 with hackage2nix revision 913111f692c1890208c98f0fd73dbe1b711c789b 2015-04-28 17:57:04 +02:00
Peter Simons
2028ece4a8 hackage-packages.nix: update to 0342de381c with hackage2nix revision 0d45926218066869f16d55d970cac0d6b50d9ebd 2015-04-27 17:24:10 +02:00
Peter Simons
0241c1f25c hackage-packages.nix: update to 30bfb9f702 with hackage2nix revision 0d45926218066869f16d55d970cac0d6b50d9ebd 2015-04-27 13:09:40 +02:00
Peter Simons
08f0e0208a hackage-packages.nix: update to bf1b180f9d with hackage2nix revision c84f676708fec9d3a848f466468db04c7e641069 2015-04-26 16:53:47 +02:00
Peter Simons
effd525c55 hackage-packages.nix: update to ea1e77a413 with hackage2nix revision c84f676708fec9d3a848f466468db04c7e641069 2015-04-26 13:06:35 +02:00
Peter Simons
c59420a856 hackage-packages.nix: update to abae36d131 with hackage2nix revision c84f676708fec9d3a848f466468db04c7e641069 2015-04-26 11:47:44 +02:00
Peter Simons
24f50d3e22 hackage-packages.nix: update to cc08310397 with hackage2nix revision c84f676708fec9d3a848f466468db04c7e641069 2015-04-25 17:57:32 +02:00
Peter Simons
2ca6148bc7 hackage-packages.nix: re-generate from Hackage state 5af579af59 2015-04-25 17:09:04 +02:00
Peter Simons
5fade2b6aa hackage-packages.nix: re-generate from Hackage state f3fe5bb92d 2015-04-24 11:22:47 +02:00
Peter Simons
4e679f0ca3 hackage-packages.nix: re-generate from Hackage state fdf6d76660 2015-04-23 19:55:55 +02:00
Peter Simons
8a9de1effd hackage-packages.nix: re-generate from Hackage state 318f4faa8b 2015-04-23 11:34:05 +02:00
Peter Simons
32c0d3bd4f hackage-packages.nix: re-generate from Hackage state 12d6257d3e 2015-04-21 14:16:20 +02:00
Peter Simons
26941230b5 hackage-packages.nix: re-generate from Hackage state e1a69962dc 2015-04-20 22:05:33 +02:00
Peter Simons
82f22dd5a1 hackage-packages.nix: disable approx. 1,000 Hydra build that are known to fail with GHC 7.10.1 2015-04-20 17:40:16 +02:00
Peter Simons
2799cf5e1b hackage-packages.nix: re-generate from Hackage state ea1b618ac7 2015-04-20 17:40:14 +02:00
Peter Simons
b6944026c6 haskell-hruby: add missing system dependency and disable broken test suite
Work around https://github.com/bartavelle/hruby/issues/10 and
https://github.com/bartavelle/hruby/issues/9 as suggested in
https://github.com/NixOS/nixpkgs/pull/7442.
2015-04-20 00:06:52 +02:00
Peter Simons
bfe4b07321 hackage-packages.nix: re-generate from Hackage state be5b264dd1 2015-04-20 00:06:52 +02:00
Peter Simons
09fe56f2e5 haskell-ng: switch default configuration to mtl 2.2.x 2015-04-18 20:43:23 +02:00