3
0
Fork 0
forked from mirrors/nixpkgs
Commit graph

11194 commits

Author SHA1 Message Date
Christoph Hrdinka 26d5d506c9 conky: add config options 2014-03-16 12:30:15 +01:00
Cillian de Róiste 1661501465 ardour: make ardour3 the default and remove ardour 2, it doesn't build 2014-03-16 11:32:56 +01:00
Shea Levy 3c8f5c2471 Merge branch 'fasd' of https://github.com/ellis/nixpkgs
Create package for 'fasd'
2014-03-15 15:52:41 -04:00
Ellis Whitehead 44b6766f5d Create package for 'fasd' 2014-03-15 20:33:10 +01:00
Shea Levy dddb4f45e9 Merge branch 'pr-wqy' of git://github.com/PkmX/nixpkgs
Bump wqy-zenhei font to the latest version and add wqy-microhei
2014-03-15 13:22:31 -04:00
Shea Levy 80ed0ff85f Merge branch 'ocaml-oasis' of git://github.com/maggesi/nixpkgs
Ocaml oasis
2014-03-15 13:14:14 -04:00
Shea Levy da184a455f Merge branch 'vmpk' of git://github.com/iyzsong/nixpkgs
add vmpk 0.5.1, a virtual midi piano keyboard
2014-03-15 12:22:18 -04:00
Anders Claesson 2985f31b1c Add haskell library terminal-size. 2014-03-15 16:05:02 +00:00
Shea Levy a330e244ad Revert "Merge branch 'nix-run' of git://github.com/rickynils/nixpkgs"
nix-run's functionality is subsumed by nix-shell -p.

This reverts commit 3cc2b243c7, reversing
changes made to 4d5d6aed29.
2014-03-15 08:15:22 -04:00
Thomas Bereknyei 9dd6e2adef happstack-fastcgi: add version 0.1.5 2014-03-15 09:13:15 +01:00
宋文武 9ce62a1ae6 add vmpk 0.5.1, a virtual midi piano keyboard 2014-03-15 13:13:25 +08:00
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 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 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
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 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
Eelco Dolstra 2156be8449 Don't enable Flash by default in the Firefox wrapper 2014-03-14 13:37:50 +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
Jacob Hinkle 766f053cc3 Added Haskell AES package 2014-03-13 14:23:34 -06: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
Peter Simons 6754d75188 haskell-defaults.nix: update reference to cabal-install 1.18.0.2 2014-03-13 11:45:05 +01:00
Cillian de Róiste fcfbe753e7 Add synfig: A 2D animation program 2014-03-13 01:14:05 +01:00
Domen Kozar 576eaa16b8 pythonPackages.gevent-socketio: add 2014-03-12 23:48:43 +01:00
Rickard Nilsson 040df9c41a New package: solr 4.7.0, a Java search platform 2014-03-12 23:14:09 +01:00
Rickard Nilsson ec3dbdf93d New package: winstone 0.9.10, a Java Servlet container 2014-03-12 23:14:09 +01:00
Peter Simons 23807bbe97 Merge pull request #1925 from wkennington/master.notbit
notbit: Add Package
2014-03-12 19:00:31 +01:00
Domen Kozar 03c6c1608b add pythonPackages.dropbox 2014-03-12 17:48:09 +01:00
William A. Kennington III 635cb24bb1 notbit: Add Package 2014-03-12 11:28:16 -05:00
Bjørn Forsman 844d246d2d Unbreak channel (fix license attribute in python-packages.nix) 2014-03-12 13:37:09 +01:00
Peter Simons b75a5e6f84 Merge pull request #1922 from jagajaga/haskell_pkgs_add
hoauth2 and bytestring-show add pkgs
2014-03-12 11:49:08 +01:00
Peter Simons c4784335d0 Merge pull request #1921 from kosmikus/ghc-7.8.1
Add GHC-7.8.1-rc2.
2014-03-12 11:33:01 +01:00
Rickard Nilsson a3bf4df6e4 libvirt-python: Update from 1.2.0 to 1.2.2 2014-03-12 08:33:43 +01:00
Vladimír Čunát ef825eaca7 libproxy: attempt to fix build on Darwin
It seems it won't compile with too old compilers.
2014-03-12 07:11:15 +01:00
Arseniy Seroka cf931434de hoauth2 and bytestring-show add pkgs 2014-03-12 00:20:27 +04:00
Andres Loeh b2b4e46198 Add GHC-7.8.1-rc2. 2014-03-11 20:14:24 +01:00
Peter Simons d35e61913b haskell-ghcjs-codemirror: add version 0.0.0.1 2014-03-11 13:50:51 +01:00
Peter Simons 27247b0325 haskell-ghcjs-dom: add version 0.0.4 2014-03-11 13:50:51 +01:00