Commit graph

14859 commits

Author SHA1 Message Date
Shea Levy
645d54c35d Merge branch 'itk-shared' of git://github.com/jacobhinkle/nixpkgs
Added sharedLibs option to ITK
2014-03-14 20:11:33 -04:00
Shea Levy
f2930e661a Merge branch 'haskell-scrypt' of git://github.com/hrdinka/nixpkgs
haskell-scrypt: add version 0.5.0
2014-03-14 20:10:25 -04:00
Shea Levy
e742265234 Merge branch 'haskell-snowball' of git://github.com/hrdinka/nixpkgs
haskell-snowball: add version 1.0.0.1
2014-03-14 20:08:58 -04:00
Shea Levy
ad3d9755a9 Merge branch 'master' of git://github.com/hrdinka/nixpkgs
haskell-wai-websockets: add version 2.1.0

and

haskell-leveldb-haskell: add version 0.3.0
2014-03-14 20:05:46 -04:00
Shea Levy
7939ca1e99 Merge branch 'update-java7' of git://github.com/bennofs/nixpkgs
oraclejdk7: add missing dependencies
2014-03-14 20:04:22 -04:00
Christoph Hrdinka
b89bfdf2c2 haskell-scrypt: add version 0.5.0 2014-03-15 00:10:06 +01:00
Christoph Hrdinka
eeecf8f6ca haskell-snowball: add version 1.0.0.1 2014-03-15 00:07:18 +01:00
Christoph Hrdinka
fa9335e441 haskell-leveldb-haskell: add version 0.3.0 2014-03-14 23:59:58 +01:00
Christoph Hrdinka
65bb4ce47b haskell-wai-websockets: add version 2.1.0 2014-03-14 23:56:42 +01:00
Jacob Hinkle
f5edf3244f Added sharedLibs option to ITK 2014-03-14 16:29:24 -06:00
Domen Kozar
a48658c3c6 keybinder: remove redundant arg 2014-03-14 13:28:41 +01:00
Domen Kozar
c0c835dcce keybinder: add gtk3 support 2014-03-14 12:09:19 +00:00
Peter Simons
f43a9e9d5d Merge pull request #1940 from jacobhinkle/master
haskellPackages: Add AES and pbkdf haskell packages
2014-03-14 11:45:17 +01:00
Peter Simons
cc97f4e1da Merge pull request #1831 from coreyoconnor/jenkins
Add jenkins continuous integration server and user.
2014-03-14 11:20:50 +01:00
Nixpkgs Monitor
6a2aede374 SDL_ttf: update from 2.0.9 to 2.0.11 2014-03-14 11:16:56 +01:00
Nixpkgs Monitor
ceb1f815b4 SDL2: update from 2.0.1 to 2.0.2 2014-03-14 11:16:56 +01:00
Nixpkgs Monitor
74488f2ade clisp_2_44_1: update from 2.44.1 to 2.49 2014-03-14 11:16:56 +01:00
Nixpkgs Monitor
6a09ce8c01 check: update from 0.9.11 to 0.9.12 2014-03-14 11:16:56 +01:00
Jacob Hinkle
e46f9075d6 Merge remote-tracking branch 'upstream/master' 2014-03-13 22:12:55 -06:00
Vladimír Čunát
ef32fbe6a4 libpng12, libpng15: minor updates of legacy versions 2014-03-13 22:32:17 +01:00
Vladimír Čunát
f5464c2982 libpng: update 1.6.9 -> .10 to fix CVE-2014-0333 2014-03-13 22:00:41 +01:00
Vladimír Čunát
d6349df0dd put systemd unit dirs on the right place
Also see #1936.
2014-03-13 21:44:51 +01:00
Jacob Hinkle
766f053cc3 Added Haskell AES package 2014-03-13 14:23:34 -06:00
Corey O'Connor
4b6e67f6c4 add platform and license to package metadata. 2014-03-13 13:01:49 -07:00
Corey O'Connor
9b79d5b298 Add jenkins continuous integration server and user.
By default the jenkins server is executed under the user "jenkins". Which can be configured using
users.jenkins.* options. If a different user is requested by changing services.jenkins.user then
none of the users.jenkins options apply.

This patch does not include jenkins slave configuration. Some config options will probably change
when this is implemented.

Aspects like the user and environment are typically identical between slave and master. The service
configs are different. The design is for users.jenkins to cover the shared aspects while
services.jenkins and services.jenkins-slave cover the master and slave specific aspects,
respectively.

Another option would be to place everything under services.jenkins and have a config that selects
master vs slave.
2014-03-13 13:01:49 -07:00
Jacob Hinkle
eed8f2d91e Added Haskell package pbkdf 2014-03-13 10:49:45 -06:00
Domen Kožar
afc1f7ca15 Merge pull request #1935 from offlinehacker/pkgs/pythonPackages/distutils-cfg/override_config
pythonPackages: distutils-cfg, allow to override config
2014-03-13 14:03:32 +01:00
Peter Simons
7bb1de4a2f haskell-thyme: update to version 0.3.1.1 2014-03-13 11:45:05 +01:00
Peter Simons
d1a77ca66c haskell-smtp-mail: update to version 0.1.4.5 2014-03-13 11:45:05 +01:00
Peter Simons
8a9a4e3f14 haskell-linear: update to version 1.9.0.1 2014-03-13 11:45:05 +01:00
Peter Simons
fe7f0a1198 haskell-bson: update to version 0.2.4 2014-03-13 11:45:05 +01:00
Peter Simons
18a4fa7594 haskell-adjunctions: update to version 4.0.2 2014-03-13 11:45:05 +01:00
Peter Simons
89ac0bdaf2 haskell-yesod-form: update to version 1.3.7 2014-03-13 11:45:05 +01:00
Peter Simons
7f42327a64 haskell-yesod-bin: update to version 1.2.7.1 2014-03-13 11:45:05 +01:00
Peter Simons
2fb6b4b547 haskell-warp: update to version 2.1.1 2014-03-13 11:45:05 +01:00
Peter Simons
5acd15da48 haskell-tasty-rerun: update to version 1.1.2 2014-03-13 11:45:05 +01:00
Peter Simons
2d4b15028b haskell-sqlite-simple: update to version 0.4.5.2 2014-03-13 11:45:05 +01:00
Peter Simons
1e99af6888 haskell-shelly: update to version 1.5.0.1 2014-03-13 11:45:05 +01:00
Peter Simons
b38f435e0e haskell-pool-conduit: update to version 0.1.2.1 2014-03-13 11:45:04 +01:00
Peter Simons
2180e76c47 haskell-persistent: update to version 1.3.0.3 2014-03-13 11:45:04 +01:00
Peter Simons
b077659834 haskell-persistent-template: update to version 1.3.1.2 2014-03-13 11:45:04 +01:00
Peter Simons
79cf91b1e5 haskell-persistent-sqlite: update to version 1.3.0.3 2014-03-13 11:45:04 +01:00
Peter Simons
6a55221179 haskell-persistent-postgresql: update to version 1.3.0.3 2014-03-13 11:45:04 +01:00
Peter Simons
080408ea8a haskell-network-conduit: update to version 1.0.4 2014-03-13 11:45:04 +01:00
Peter Simons
07cc34bc12 haskell-hsini: update to version 0.3.1 2014-03-13 11:45:04 +01:00
Shea Levy
c81c344d67 wai-middleware-static: Jailbreak for the latest wai 2014-03-13 06:43:54 -04:00
Jaka Hudoklin
f7cdd1611b pythonPackages: distutils-cfg, allow to override config 2014-03-13 11:33:11 +01:00
Evgeny Egorochkin
3ac4078d9e telepathy_farstream: update from 0.6.0 to 0.6.1 2014-03-13 09:14:05 +02:00
Domen Kozar
059e8e179b set all licenses to be attributes (and wait for Nix 1.7) 2014-03-12 21:20:43 +01:00
Peter Simons
238a98fcbe Merge pull request #1927 from iyzsong/noweb
noweb: some fixes
2014-03-12 19:01:48 +01:00