cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2
60985 commits 1 branch 0 tags 3.7 GiB
Commit graph

1519 commits

Author SHA1 Message Date
desiderius
37a90efc45 python-packages: update cov-core-1.7 to 1.15.0 2015-02-26 17:05:53 +01:00
Tobias Geerinckx-Rice
e071b6d71b python-packages: pygments 2.0.1 -> 2.0.2 2015-02-26 16:13:40 +01:00
desiderius
486ee6e252 python-packages: update coverage-3.6 to 3.7 2015-02-26 16:08:21 +01:00
desiderius
94024b4c7d python-packages: add elasticsearch-1.4.0 2015-02-26 14:58:09 +01:00
desiderius
d480e06262 python-packages: add pyaml-15.02.1 2015-02-26 14:33:50 +01:00
desiderius
4607e0711c python-packages: add nosexcover-1.0.10 2015-02-26 14:04:33 +01:00
desiderius
1fe1f73089 python-packages: add falcon-0.2 2015-02-26 13:41:43 +01:00
desiderius
56a8ab137c python-packages: add ddt-1.0.0 2015-02-26 13:39:42 +01:00
desiderius
3970bfdd29 python-packages: add python3-pika-0.9.14 2015-02-26 11:54:35 +01:00
lethalman
222725d062 Merge pull request #6495 from psibi/python-wtf-patch 
new package: wtforms
 2015-02-26 09:46:39 +01:00
vbgl
8db9bd23fa Merge pull request #6423 from DamienCassou/update-requests2 
requests2 2.4.3 -> 2.5.1
 2015-02-25 14:59:47 +01:00
Domen Kožar
6919be40bd Merge pull request #6549 from desiderius/python-sphinx-contrib 
python-packages: update sphinxcontrib
 2015-02-25 09:29:15 +01:00
Domen Kožar
9214859fd2 Revert "Mark many packages (mostly python) broken because of broken dependencies." 
This reverts commit bf86758a42.

See 71a9aa10ca25f5659a657d8910e11f36c3439a36
 2015-02-25 09:23:31 +01:00
Domen Kožar
67f9edc98e Revert "python-packages.nix: updated 'disabled' attributes to reduce the number of evaluation errors in http://hydra.nixos.org/jobset/nixpkgs/trunk#tabs-errors" 
This reverts commit a250e9b908.

See 71a9aa10ca25f5659a657d8910e11f36c3439a36
 2015-02-25 09:23:31 +01:00
Rok Garbas
d378324166 pythonPackages.py3status: new package, status bar for i3 window manager 2015-02-24 22:05:05 +01:00
desiderius
e32643d7cb python-packages: add sphinxcontrib-plantuml-0.5 
- Tested with Python 2.6, 2.7, 3.3 and 3.4.
- Fails with pypy due to issue #6548.
 2015-02-24 16:33:14 +01:00
Peter Simons
a250e9b908 python-packages.nix: updated 'disabled' attributes to reduce the number of evaluation errors in http://hydra.nixos.org/jobset/nixpkgs/trunk#tabs-errors 2015-02-24 15:23:45 +01:00
desiderius
22f365d654 python-packages: update sphinxcontrib-httpdomain-1.1.9 to 1.3.0 
- Tested with Python 2.6, 2.7, 3.3 and 3.4.
- Fails with pypy due to issue #6548.
 2015-02-24 15:18:10 +01:00
Lluís Batlle i Rossell
dfe8d7ecd8 Adding ddar, unix de-duplicating archiver. 
(cherry picked from commit d93c6ffa10d778782ec774b51e5814917e600a5e)
 2015-02-24 12:54:21 +01:00
Nathaniel Baxter
aa91480f45 pythonPackages.libvirt: fix python executable path 2015-02-23 20:09:54 +01:00
Nathaniel Baxter
0be8418275 libvirt: update from 1.2.9 to 1.2.12 
libvirt-glib: update from 0.1.9 to 0.2.0
pythonPackages.libvirt: update from 1.2.9 to 1.2.12

Potentially fixes CVE-2014-7823 CVE-2015-0236
 2015-02-23 20:09:54 +01:00
Domen Kožar
8e4a8494be Merge pull request #6494 from psibi/new-python-sibi-patch 
new package: passlib
 2015-02-23 15:56:43 +00:00
Sibi
fcc379070f new package: wtforms 2015-02-23 19:02:44 +05:30
Peter Simons
bf86758a42 Mark many packages (mostly python) broken because of broken dependencies. 2015-02-23 14:06:24 +01:00
Shaun Bruce
c2c561ad4d Added pymongo-2.8 python package 2015-02-22 08:03:45 -07:00
Sibi
c8ae0b77f3 new package: passlib 2015-02-21 15:09:21 +05:30
Domen Kožar
d67ba6c5ab Merge pull request #6431 from psibi/new-python-sibi-patch 
new package: pybcrypt
 2015-02-20 12:49:13 -08:00
William A. Kennington III
29fc0daa27 protobuf: Mark as disabled on py3k and fix python executable references 2015-02-20 11:17:08 -08:00
William A. Kennington III
a959cc91cf google_apputils: Keep disabled on py3k 2015-02-20 11:16:44 -08:00
William A. Kennington III
c21991d478 google_apputils: Update to 0.4.1 2015-02-20 11:14:41 -08:00
William A. Kennington III
f58c96149d protobuf: Fix python build 2015-02-20 10:36:16 -08:00
Luca Bruno
cc837a974b sqlalchemy9: disable for pypy 2015-02-20 14:15:35 +01:00
Luca Bruno
7620fdb3ac sympy: disable for pypy 2015-02-20 14:11:25 +01:00
Luca Bruno
3225bf25b9 more-itertools: disable for py3k 2015-02-20 14:10:54 +01:00
Luca Bruno
1d09c1fd34 audiotools: disable for py3k 2015-02-20 14:10:49 +01:00
Domen Kožar
a76b53b06b Merge pull request #6339 from psibi/pythonmagick-fix 
Integrate mailchimp.
 2015-02-20 07:22:15 +01:00
Sibi
af7c1baf95 new package: Mailchimp python module 2015-02-20 04:31:25 +05:30
Marcell Vazquez-Chanlatte
7e4e671c54 Add uncertainties python package 2015-02-18 11:29:40 -06:00
Sibi
efbd73dc4c new package: pybcrypt 2015-02-18 18:08:13 +05:30
Damien Cassou
3ae27db166 requests2 2.4.3 -> 2.5.1 2015-02-18 08:51:41 +01:00
Damien Cassou
ae0263f960 Merge pull request #6420 from DamienCassou/deactivate-simpleparse-on-python3 
Disable simpleparse on python3 and pypy
 2015-02-18 07:38:03 +01:00
Damien Cassou
6938b79de8 Disable simpleparse on python3 and pypy 2015-02-18 07:35:54 +01:00
Damien Cassou
453c26abe7 Merge pull request #6397 from DamienCassou/simpleparse 
Add the simpleparse python package
 2015-02-17 13:43:38 +01:00
Damien Cassou
a45acf1b29 Add the simpleparse python package 2015-02-17 13:42:31 +01:00
Domen Kožar
3dbde25855 Merge pull request #6381 from olavks/numpyfix 
Numpy: remove slow building and little used math library for more commonly used openblas
 2015-02-17 11:13:58 +01:00
Damien Cassou
8be35e6efe Merge pull request #6391 from DamienCassou/update-pylint-astroid 
update pylint, astroid, six, and logilab-common
 2015-02-17 11:08:37 +01:00
Damien Cassou
c9b4cb56ae update pylint, astroid, six, and logilab-common 
pylint 1.4.0 -> 1.4.1
astroid 1.3.2 -> 1.3.4
six 1.8.0 -> 1.9.0
logilab-common 0.61.0 -> 0.63.2
 2015-02-17 11:02:31 +01:00
Marcell Vazquez-Chanlatte
7ad16801b0 moreItertools package had typo 2015-02-16 23:41:22 -06:00
Olav
380bd3f48a Numpy: Replace ATLAS and liblapack with openblas (that has blas and lapack). 
Was previously with ATLAS [Automatically Tuned Linear Algebra Software].
This takes ages and has little to no performance benefit over openblas+lapack.
And if you need this performance, you should really built it against your own hardware.
 2015-02-17 03:59:27 +00:00
Marcell Vazquez-Chanlatte
5e328ef690 fix indentation 2015-02-16 21:30:21 -06:00
Marcell Vazquez-Chanlatte
3c06b41c26 Added more-itertools-2.2 python package 2015-02-16 13:57:44 -06:00
Marcell Vazquez-Chanlatte
5c62f143c1 Added python package funcy-1.4 2015-02-16 00:50:50 -06:00
Marcell Vazquez-Chanlatte
dbcbe712dd Add python package parsimonoius 0.6.0 2015-02-16 00:41:30 -06:00
Nathaniel Baxter
b3a866fd24 pythonPackages.flexget: update to 1.2.278 2015-02-15 21:51:34 +11:00
Domen Kožar
d67a792a83 taskw: 0.8.6 -> 1.0.2 2015-02-13 14:33:11 +01:00
Domen Kožar
c6252250d8 Merge pull request #6329 from DamienCassou/vobject-not-compatible-with-pypy 
Make sure vobject is not built by pypy
 2015-02-13 14:21:39 +01:00
Damien Cassou
1dfab1cd9b Make sure vobject is not built by pypy 
http://hydra.nixos.org/build/19521419
 2015-02-13 12:51:08 +01:00
Domen Kožar
fa51c9bfc1 browserid: disable tests 2015-02-11 10:22:21 +01:00
Domen Kožar
a586293706 sympy: 0.7.4 -> 0.7.6 2015-02-11 10:22:11 +01:00
Domen Kožar
2024e08564 partially fix pythonPackages.protobuf 2015-02-11 10:21:51 +01:00
Domen Kožar
4869902a70 sqlalchemy9: 0.9.4 -> 0.9.8 2015-02-11 09:34:25 +01:00
Domen Kožar
5da0d18a0a boto: 2.34.0 -> 2.36.0 2015-02-11 09:21:04 +01:00
Tobias Geerinckx-Rice
a1d1151792 pgcli: update 0.14.0 -> 0.15.4 2015-02-10 15:27:36 +01:00
aszlig
e05bade342
Merge pull request #6076 (vdirsyncer). 
Adds vdirsyncer and dependencies (request_toolbelt and atomicwrites).

It's to synchronize calendars and addressbooks between two storages (for
example between CalDAV/CardDAV and a local folders/files).
 2015-02-07 17:10:30 +01:00
Matthias Beyer
2797883e27 Add pythonPackage: atomicwrites 2015-02-07 15:34:20 +01:00
Matthias Beyer
bc444ffd32 Add requests_toolbelt python library, required for vdirsyncer 2015-02-07 15:34:19 +01:00
Tobias Geerinckx-Rice
bf748c97e1 Update pgcli 0.13.0 -> 0.14.0 2015-02-02 02:00:19 +01:00
Peter Simons
7ccd363015 Merge pull request #6059 from joelmo/python-graph-tool 
add graph-tool
 2015-01-30 13:33:49 +01:00
Joel Moberg
7b33a74235 Add graph-tool 2015-01-30 13:13:02 +01:00
Rok Garbas
7f27a9a7e8 pythonPackages.alot: update to 0.3.6 2015-01-29 19:48:05 +01:00
Damien Cassou
4e7bb192a7 Merge pull request #6026 from DamienCassou/vobject-not-for-python3 
Fix pythonPackages.vobject not building in Python3
 2015-01-28 13:05:13 +01:00
Damien Cassou
cda6c039d3 Fix pythonPackages.vobject not building in Python3 2015-01-28 10:48:28 +01:00
Domen Kožar
98f650a477 Merge pull request #5943 from offlinehacker/pkgs/pythonPackages/polylint 
pythonPackages: add polylint, polymer linting tool
 2015-01-27 10:48:54 +01:00
Domen Kožar
1a466f463d Merge pull request #5826 from tinkerthaler/master 
Add PyChart 1.39 as pychart in the Python packages
 2015-01-27 10:35:50 +01:00
Domen Kožar
dad8b95ea5 Merge pull request #5946 from richardlarocque/loxodo2 
Add Loxodo to python-packages.nix
 2015-01-27 10:32:02 +01:00
Domen Kožar
e387389d9f pync: not broken anymore 2015-01-27 10:23:24 +01:00
Thomas Strobel
f0228c6eb2 Add: nix-template-rpm: Script to generate templates of nix expressions from RPM .spec files 2015-01-27 01:18:52 -08:00
Charles Strahan
5a73cda9b5 terminal-notifier: add package 2015-01-26 17:06:20 -05:00
Domen Kožar
7c0dbdb3b2 fix eval 2015-01-26 12:11:39 +01:00
Domen Kožar
2c35ed3929 remove duplicated pythonPackages.beautifulsoup 2015-01-26 12:02:19 +01:00
Sander van der Burg
c3a1231f52 python-beautifulsoup3: new package 2015-01-26 10:36:30 +00:00
Sander van der Burg
86f635aad8 python-html2text: add package 2015-01-26 10:36:30 +00:00
Domen Kožar
42bd43fbc4 pync: mark as broken 2015-01-26 11:02:10 +01:00
Richard Larocque
007676fd00 Add Loxodo to python-packages.nix 
Loxodo is a Password Safe v3 compatible password vault.
 2015-01-24 18:06:50 -08:00
Jaka Hudoklin
c0adb0040b pythonPackages: add polylint, polymer linting tool 2015-01-24 23:23:29 +01:00
Edward Tjörnhammar
631096c611 Merge pull request #5932 from k0ral/pyqtgraph 
pyqtgraph: 0.9.8 -> 0.9.10
 2015-01-24 20:36:09 +01:00
Edward Tjörnhammar
4ccc188261 Merge pull request #5933 from k0ral/restview 
restview: 2.1.1 -> 2.2.1
 2015-01-24 20:34:54 +01:00
Domen Kožar
8270a5f0eb Merge pull request #5876 from berdario/pew 
Update pew to 0.1.14
 2015-01-24 20:02:20 +01:00
Jascha Geerds
3b7d32f014 Merge pull request #5931 from k0ral/bottle 
bottle: 0.12.7 -> 0.12.8
 2015-01-24 17:11:58 +01:00
Jascha Geerds
2445f13a94 Merge pull request #5930 from k0ral/batinfo 
batinfo: 0.1.9 -> 0.2
 2015-01-24 17:09:55 +01:00
Jascha Geerds
185a72b58a Merge pull request #5929 from k0ral/percol 
percol: 0.0.7 -> 0.0.8
 2015-01-24 17:07:24 +01:00
Jascha Geerds
708803324e Merge pull request #5927 from k0ral/dulwich 
dulwich: 0.9.7 -> 0.9.8
 2015-01-24 17:03:20 +01:00
koral
51119a6b8d restview: 2.1.1 -> 2.2.1 2015-01-24 17:02:17 +01:00
koral
a4cbb472ba pyqtgraph: 0.9.8 -> 0.9.10 2015-01-24 16:58:18 +01:00
Jascha Geerds
8b79a73905 Merge pull request #5928 from k0ral/hg-git 
hg-git: 0.6.1 -> 0.7.0
 2015-01-24 16:57:38 +01:00
koral
cefd38080e bottle: 0.12.7 -> 0.12.8 2015-01-24 16:41:09 +01:00
koral
a158cffac3 batinfo: 0.1.9 -> 0.2 2015-01-24 16:38:51 +01:00
koral
cff83eb6f4 percol: 0.0.7 -> 0.0.8 2015-01-24 16:36:32 +01:00
koral
484d347173 hg-git: 0.6.1 -> 0.7.0 2015-01-24 16:33:06 +01:00
koral
35d609a638 dulwich: 0.9.7 -> 0.9.8 2015-01-24 16:29:18 +01:00
Dario Bertini
57577f2019
Explicitly specify the pythonVersion and use that together with versionOlder/versionAtLeast to specify bounds 2015-01-24 10:38:54 +00:00
Peter Simons
65d1c7f1a1 python-vobject: fix reference to "apache" license 2015-01-22 12:01:30 +01:00
Edward Tjörnhammar
b834778c6e Merge pull request #5889 from DamienCassou/pycarddav 
pycarddav + vobject
 2015-01-22 10:52:05 +01:00
Damien Cassou
a8458cb091 pycarddav + vobject 2015-01-22 10:12:17 +01:00
Damien Cassou
71ecac3372 Add Subdownloader 2015-01-22 10:06:30 +01:00
Charles Strahan
8d49e87dec Merge pull request #4677 from cstrahan/pleasant-ruby 
Pleasant ruby
 2015-01-21 23:27:38 -05:00
Domen Kožar
f94600e57b Merge pull request #5806 from nckx/pgcli 
Python: add pgcli + update/add various libraries
 2015-01-21 11:14:25 +01:00
lethalman
7cad64a13d Merge pull request #5856 from rycee/update/pyacoustid 
Fix build of 'pyacoustid' under Python 3.
 2015-01-21 10:54:27 +01:00
Charles Strahan
dfc225d143 Merge branch 'master' of github.com:nixos/nixpkgs into pleasant-ruby 
Conflicts:
	pkgs/applications/version-management/git-and-tools/default.nix
	pkgs/applications/version-management/git-and-tools/hub/default.nix
	pkgs/tools/audio/mpdcron/default.nix
 2015-01-20 20:21:03 -05:00
William A. Kennington III
ba67ad3c88 python-ldap: 2.4.15 -> 2.4.19 2015-01-20 14:50:39 -08:00
Dario Bertini
5ca3648137
Update pew to 0.1.14 2015-01-20 14:45:42 +00:00
Domen Kožar
61d5c2c0af eventlet: disable tests, too much of a burden 
(cherry picked from commit 676e8d7aa4b689df622bf4dd58b9a828ed0f5d09)
Signed-off-by: Domen Kožar <domen@dev.si>
 2015-01-20 13:48:06 +01:00
Tobias Geerinckx-Rice
4a3c873e17 Python: add pgcli 0.13.0: command line interface for Postgres 2015-01-20 06:22:27 +01:00
Tobias Geerinckx-Rice
6a2175e4f2 Python: psycopg2 2.5.3 -> 2.5.4 2015-01-20 06:22:27 +01:00
Tobias Geerinckx-Rice
75573d02f2 Python: add sqlparse 0.1.14: SQL parser 2015-01-20 06:22:26 +01:00
Tobias Geerinckx-Rice
6b74454634 Python: add wcwidth 0.1.4: measure wide-character columns 2015-01-20 06:22:26 +01:00
Tobias Geerinckx-Rice
b3747c9180 Python: add prompt_toolkit 0.26: powerful command lines 2015-01-20 06:22:25 +01:00
Robert Helgesson
f4bcecbda4 Fix build of 'pyacoustid' under Python 3. 2015-01-19 18:42:23 +01:00
lethalman
ec7c028e14 Merge pull request #5563 from nckx/gdrivefs 
Add gdrivefs (Python Google Drive FUSE client) and dependencies
 2015-01-19 14:52:47 +01:00
Wout Mertens
7c3fa29e30 Fix LOCALE_ARCHIVE handling 2015-01-19 14:50:52 +01:00
Michael Raskin
c163baca3b Clean up glibcLocales environment handling -- manual merge of patch by wmertens (except Haskell part) 2015-01-19 11:06:11 +03:00
tinkerthaler
7d8ebab819 Add PyChart 1.39 as pychart in the Python packages 2015-01-18 22:13:00 +01:00
Domen Kožar
f98a2558ec eventlet: increase TEST_TIMEOUT 
(cherry picked from commit 1c489ee2a8f0a5c3e4d4ab7181e5efe3a83dc87d)
Signed-off-by: Domen Kožar <domen@dev.si>
 2015-01-18 19:20:11 +01:00
Domen Kožar
3b174a4024 Merge pull request #5301 from nbp/syncserver 
Add Firefox Sync service
 2015-01-18 17:47:51 +01:00
Robert Helgesson
c8d0d91db1 Add optional backends to matplotlib. 2015-01-17 14:24:49 +01:00
Domen Kožar
c611f5837c fix gevent/eventlet on python 2.7.9, fixes #5782 2015-01-17 14:15:18 +01:00
Vincent Laporte
ef92f1094a Python27.zope_testrunner: disable test 
Tests fails due to `python-subunit` not found
 2015-01-16 14:25:17 +01:00
Tobias Geerinckx-Rice
0f15ee1a45 Python: pygments: update 1.6 -> 2.0.1; add licence; maintain 2015-01-15 17:33:46 +01:00
cillianderoiste
63f48b2528 Merge pull request #5758 from nckx/click 
Python: click: upgrade 2.1 -> 3.3
 2015-01-15 14:14:46 +01:00
Pascal Wittmann
375ba22185 Merge pull request #5678 from muflax/awscli 
awscli: bump version and fix missing runtime dependency
 2015-01-15 14:00:24 +01:00
Tobias Geerinckx-Rice
3aaec79aed Python: click: upgrade 2.1 -> 3.3 (!) 2015-01-15 05:34:56 +01:00
Tobias Geerinckx-Rice
dda7ea5dd8 Python: jedi: update 0.8.0-final0 -> 0.8.1 2015-01-15 05:34:30 +01:00
muflax
79e901e3e1 botocore: update to 0.81.0 2015-01-14 16:17:49 +00:00
Tobias Geerinckx-Rice
5d36b300bd Add gdrivefs (Google Drive FUSE client) & dependecies 2015-01-12 19:22:24 +01:00
Charles Strahan
96fd899fea capnproto: update to 0.5.0 2015-01-12 03:24:52 -05:00
Mateusz Kowalczyk
ebf4d5c62b livestreamer: update to 1.11.1 2015-01-05 21:11:04 +00:00
Rob Vermaas
20c4d9cade Add pythonPackages.ntplib, needed for dd-agent update. 
(cherry picked from commit 3e73b5888ef9e230e95ad978f8c36c8cdc0fc675)
 2015-01-05 13:15:19 +01:00
William A. Kennington III
cde8e6086f subunit: Update to 1.0.0 and build other bindings 2015-01-02 17:22:37 -08:00
William A. Kennington III
312f812c40 testscenarios: Add derivation 2015-01-02 17:22:36 -08:00
Bjørn Forsman
b8e860682b python-llfuse: new package 
Python bindings for the low-level FUSE API. (Needed by attic, the backup
program.)
 2015-01-02 15:17:42 +01:00
Georges Dubus
6dc7771cdc Merge pull request #5341 from prikhi/add-mezzanine 
Add Mezzanine, a Django CMS
 2015-01-01 22:30:10 +01:00
aszlig
880c985f27
Merge branch 'better-beets'. 
Makes beets actually usable (and configurable) on Nix(OS), if you want
to use more plugins rather than just plain lookup of tracks based on
(fuzzy) string matching.

This also changes the derivation name from "python2.7-beets" to just
"beets".

* Commit summary:
  beets: Check dependencies on activated plugins.
  beets: Check plugin definitions against package.
  beets: Use audiotools backend for replaygain.
  beets: Allow to configure plugin dependencies.
  beets: Switch to using fetchFromGitHub.
  python: Add new package audiotools.
  python: Add new package discogs_client.
  python: Add pyacoustid and dependencies.
  python/mutagen: Update to upstream version 1.27.
  mp3gain: Fix output path bin directory.
  beets: Add myself to maintainers.
  beets: Update to new upstream version 1.3.9.
  beets: Move into its own package directory.
 2014-12-30 23:21:57 +01:00
aszlig
eecd932493
python: Add new package audiotools. 
This is needed for the replaygain plugin in beets.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
 2014-12-30 22:36:09 +01:00
aszlig
a1acc35177
python: Add new package discogs_client. 
Needed in order to fetch Discogs album information in beets.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
 2014-12-30 22:34:48 +01:00
aszlig
07c9efaf22
python: Add pyacoustid and dependencies. 
We're going to need this for fingerprinting support in beets.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
 2014-12-30 22:33:55 +01:00
aszlig
5278695304
python/mutagen: Update to upstream version 1.27. 
Also now comes with a few more build dependencies in order to run tests,
which for this version now succeed.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
 2014-12-30 22:31:16 +01:00
Tobias Geerinckx-Rice
c64257b8e5 Fix user-facing typos (mainly in descriptions) 2014-12-30 03:31:03 +01:00
aszlig
d6874d6063
beets: Move into its own package directory. 
The primary use of beets is not as a Python library and users usually
would expect to install it into the env using "nix-env -i beets" rather
than "nix-env -i pythonX.Y-beets".

Having beets in its own package directory also allows for better
customization, where we're going to implement attributes that can be
used to turn on/off various features and plugins.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
 2014-12-30 03:23:37 +01:00
Charles Strahan
145733c479 Merge branch 'master' of github.com:nixos/nixpkgs into pleasant-ruby 
Conflicts:
	pkgs/applications/version-management/redmine/default.nix
	pkgs/development/interpreters/ruby/gem.nix
	pkgs/development/interpreters/ruby/generated.nix
	pkgs/development/interpreters/ruby/patches.nix
	pkgs/development/tools/vagrant/default.nix
	pkgs/servers/consul/default.nix
 2014-12-28 14:29:52 -05:00
vbgl
baeb69626e Merge pull request #5482 from DamienCassou/mutag-0.0.2 
Update pythonPackages.mutag
 2014-12-27 19:24:41 +01:00