Shea Levy
5f0f47994a
Merge branch 'pyserial' of git://github.com/ambrop72/nixpkgs
...
Update pyserial to 2.7
2014-03-14 20:20:07 -04:00
Shea Levy
d1e88c4625
Unconditionally compile itk with shared libs
2014-03-14 20:18:17 -04:00
ambrop7@gmail.com
0f7efa31d5
Update pyserial to 2.7.
2014-03-15 01:14:43 +01:00
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
Shea Levy
04fe6405e4
Merge branch 'ocaml-updates' of git://github.com/maggesi/nixpkgs
...
Make OCaml 4.01.0 the default version of OCaml
2014-03-14 19:58:02 -04:00
Shea Levy
6da2d89016
Merge branch 'postgresql93-ossp-uuid-clean' of git://github.com/basvandijk/nixpkgs
...
Configure postgresql-9.3 with support for the ossp-uuid module
Conflicts:
pkgs/servers/sql/postgresql/9.3.x.nix
2014-03-14 19:52:43 -04:00
Shea Levy
5a38bfdb9c
Merge branch 'darcsum' of git://github.com/falsifian/nixpkgs
...
Added darcsum, "a pcl-cvs like interface for managing darcs patches".
2014-03-14 19:42:27 -04:00
Shea Levy
602cf8d78c
Merge branch 'u/zfs-import' of git://github.com/wizeman/nixpkgs
...
zfs: Misc fixes
2014-03-14 19:40:34 -04:00
Shea Levy
0c12dd3ded
Merge branch 'pkgs/systemd/journald_http_gateway' of git://github.com/offlinehacker/nixpkgs
...
systemd: python support & journal http gateway
Conflicts:
nixos/modules/misc/ids.nix
2014-03-14 19:16:59 -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
Shea Levy
3cc2b243c7
Merge branch 'nix-run' of git://github.com/rickynils/nixpkgs
...
Add nix-run and myEnvRun
2014-03-14 18:52:50 -04:00
Shea Levy
4d5d6aed29
Merge branch 'vimPlugins.YouCompleteMe/update' of git://github.com/offlinehacker/nixpkgs
...
vimPlugins.YouCompleteMe: update to ee12530df0
Conflicts:
pkgs/misc/vim-plugins/default.nix
2014-03-14 18:50:21 -04:00
Shea Levy
da17e151d8
Merge branch 'pkgs/openvpn/openvpn_learnaddress' of git://github.com/offlinehacker/nixpkgs
...
add openvpn_learnaddress script
2014-03-14 18:39:28 -04:00
Jacob Hinkle
f5edf3244f
Added sharedLibs option to ITK
2014-03-14 16:29:24 -06:00
Bjørn Forsman
562f937d21
openscad: bump 2013.06 -> 2014.03
...
openscad now depends on glib, and it needs pkgconfig to find glib.
2014-03-14 22:21:15 +01:00
Ricardo M. Correia
17b473449b
Add myself as maintainer of pkgs I wish to keep up-to-date
2014-03-14 21:22:09 +01:00
Shea Levy
3f6603a80e
Fix alsa-utils
2014-03-14 09:08:04 -04:00
Eelco Dolstra
2156be8449
Don't enable Flash by default in the Firefox wrapper
2014-03-14 13:37:50 +01:00
Domen Kozar
a48658c3c6
keybinder: remove redundant arg
2014-03-14 13:28:41 +01:00
Eelco Dolstra
5a807eaedb
flashplayer: Add license field
2014-03-14 13:24:23 +01:00
Domen Kozar
c0c835dcce
keybinder: add gtk3 support
2014-03-14 12:09:19 +00:00
Peter Simons
e443c6d3fa
Merge pull request #1938 from pSub/logcheck-update
...
Update logcheck from 1.3.15 to 1.3.16
2014-03-14 11:46:06 +01: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
69fff447aa
alsaUtils: update from 1.0.27 to 1.0.27.2
2014-03-14 11:16:56 +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
b86692e00d
mpg123: update from 1.18.1 to 1.19.0
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
Rickard Nilsson
191bd1c26a
dovecot22: Update from 2.2.6 to 2.2.12
2014-03-14 10:34:21 +01:00
Jacob Hinkle
e46f9075d6
Merge remote-tracking branch 'upstream/master'
2014-03-13 22:12:55 -06:00
Bjørn Forsman
147e6ed4c9
pcsclite: update download url
...
The current one doesn't work.
2014-03-13 23:40:20 +01:00
Vladimír Čunát
db9599c4a0
gnumeric: minor update 1.12.9 -> .12
2014-03-13 22:55:52 +01:00
Vladimír Čunát
dc3f762019
goffice: minor update, dep cleanup
...
Also enable parallel building.
2014-03-13 22:54:58 +01:00
Vladimír Čunát
ef32fbe6a4
libpng12, libpng15: minor updates of legacy versions
2014-03-13 22:32:17 +01:00
Pascal Wittmann
9ae063df13
Update logcheck from 1.3.15 to 1.3.16
2014-03-13 22:11:33 +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
Vladimír Čunát
344f2e6518
udisks1: bump to fix CVE-2014-0004
...
Also systemd unit is now installed.
Thanks to nixpkgs monitor again, as for all my CVE commits.
2014-03-13 21:16:50 +01: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