Frederik Rietdijk
3c5a6eb313
cython: 0.20.1 -> 0.22.1
2015-07-12 13:37:43 +00:00
Frederik Rietdijk
3a3062192c
terminado: init at 0.5
...
A dependency for IPython 3.2 Notebook
2015-07-12 11:37:26 +00:00
Frederik Rietdijk
c211a8aa59
ptyprocess: init at 0.5
2015-07-12 11:32:05 +00:00
Frederik Rietdijk
df8d620bf3
odo: init at 0.3.3
2015-07-12 09:24:42 +00:00
Frederik Rietdijk
88c7e86706
datashape: init at 0.4.6
2015-07-12 09:00:13 +00:00
James Cook
452745d5ab
cudatoolkit65, cudatoolkit7: use python-2.7
...
@vcunat confirms they still build
2015-07-12 10:12:33 +02:00
James Cook
d384914a35
Merge pull request #8744 from FRidh/decorator
...
decorator: 3.4.0 -> 3.4.2
2015-07-12 00:07:55 -07:00
James Cook
a16f77744a
Merge pull request #8748 from devhell/rainbowstream-update
...
rainbowstream: 1.2.5 -> 1.2.7
2015-07-12 00:06:41 -07:00
James Cook
b4e1254080
Merge pull request #8724 from oconnorr/master
...
cassandra-driver: fix package attribute name
2015-07-12 00:04:02 -07:00
Franz Pletz
a21ead3d62
jool: init at 3.3.2
...
Jool is a SIIT and a NAT64 implementation for Linux.
2015-07-12 07:25:44 +02:00
Jude Taylor
2767e93843
darwin purity: go-1.4
2015-07-11 16:05:04 -07:00
John Chee
f420f927f6
pythonPackages.gmpy2: init at 2.0.6
2015-07-11 15:06:23 -07:00
John Chee
21743decf3
pythonPackages.gmpy: init at 1.17
2015-07-11 15:05:32 -07:00
devhell
b650fe3000
rainbowstream: 1.2.5 -> 1.2.7
...
Unfortunately I was unable to locate a changelog. This was built and run
locally to ensure the update works.
2015-07-11 17:08:42 +01:00
Frederik Rietdijk
c88ec978db
decorator: 3.4.0 -> 3.4.2
2015-07-11 14:11:24 +02:00
Frederik Rietdijk
2103633037
colorama: 0.2.5 -> 0.3.3
2015-07-11 10:22:22 +00:00
Frederik Rietdijk
cb6edaca03
pystache: init at 0.5.4
2015-07-11 10:20:28 +00:00
Pascal Wittmann
071304f26d
ruby_2_2_0: pass libobjc and libunwind
2015-07-11 11:51:48 +02:00
Frederik Rietdijk
329c2b2e8b
multipledispatch: init at 0.4.8
2015-07-11 11:15:59 +02:00
Jude Taylor
05a4733558
Merge pull request #8453 from pikajude/darwin-security-tool
...
Build Darwin's security-tool
2015-07-10 19:01:48 -07:00
Jude Taylor
d29eb63542
node v0.10 doesn't work either. update libuv on darwin only
2015-07-10 18:48:14 -07:00
Lancelot SIX
e1f2930213
poezio: init at 0.8.1
2015-07-10 22:40:49 +02:00
Jude Taylor
43c72cb6af
add security-tool
2015-07-10 10:41:07 -07:00
Jude Taylor
7393c6c69d
modernize rubies
2015-07-10 10:28:27 -07:00
Jude Taylor
f72beea75e
darwin purity: nodejs-0.10
2015-07-10 10:28:27 -07:00
Pascal Wittmann
4977855101
pythonPackages.sipsimple: update from 2.4.0 to 2.5.0
2015-07-10 18:53:27 +02:00
Pascal Wittmann
8280f5a602
blink: use gnutls33, fixes #8234
2015-07-10 18:53:26 +02:00
William A. Kennington III
097ffe89cd
gcc48: Pin to the latest supported version of isl
2015-07-10 02:21:21 -07:00
Lancelot SIX
976e34cd6c
python3Packages.sleekxmpp: init at 1.2.5
2015-07-10 08:04:06 +00:00
Lancelot SIX
2caa3b7d50
python3Packages.dnspython3: init at 1.12.0
2015-07-10 08:03:57 +00:00
Lancelot SIX
20f47e3abd
pythonPackages.pytestpep257: init at 0.0.1
2015-07-10 07:53:24 +00:00
Lancelot SIX
d9a4fc2df9
pythonPackages.pep257: init at 0.3.2
...
pep257 is a static analysis tool for checking compliance with Python PEP 257.
I stay with pep257-0.3.2 because newer versions does nos satisfy requirements
for pytest-pep257.
2015-07-10 07:47:15 +00:00
Michel Kuhlmann
e30c99d40a
gdal: adding version 1.11.2 for merkaartor and openscenegraph
2015-07-10 09:33:08 +02:00
Robert Irelan
322edf09e0
rustRegistry: 2015-06-12-020d1f3 -> 2015-07-07-fd9e3e4
2015-07-09 21:14:55 -07:00
Robert Irelan
e6ee86b941
cargoSnapshot: 2015-04-02 -> 2015-06-17, hide from nix-env
...
Update snapshot to avoid rust-lang/cargo#976 , which otherwise breaks the
build.
Also move the `cargoSnapshot` derivation inside a set in
pkgs/top-level/all-packages.nix in order to hide the `cargo-snapshot`
packages from `nix-env -qa`, since it's only used to build the `cargo`
package.
2015-07-09 21:14:55 -07:00
Robert Irelan
cf2f3f60ca
rustCargoPlatform: run on stable Rust
...
Use stable Rust now that Cargo builds on stable Rust.
2015-07-09 21:14:55 -07:00
Robert Irelan
bf492548a2
rustc: 1.0.0 -> 1.1.0
2015-07-09 21:14:55 -07:00
John Chee
fb371c0642
fzf: init at 0.9.13
...
patch by @magnetophon
2015-07-09 18:05:14 -07:00
John Chee
2d006f090e
go-shellwords: init at 35d512af75e283aae4ca1fc3d44b159ed66189a4
...
patch by @magnetophon
2015-07-09 18:05:12 -07:00
John Chee
092e6e23b3
junegunn.go-runewidth: init at travisish
...
patch by @magnetophon
2015-07-09 18:05:05 -07:00
Russell O'Connor
e4b583a5d0
cassandra-driver: fix package attribute name
...
Use a hyphen instead of camelCase.
2015-07-09 14:43:59 +00:00
Pascal Wittmann
1e3a12bf22
snake4: init at 1.0.14
2015-07-09 15:24:00 +02:00
Pascal Wittmann
d1c2fd81f6
shhopt: init at 1.1.7
2015-07-09 15:23:25 +02:00
Pascal Wittmann
7ec18455b2
shhmsg: init at 1.4.2
2015-07-09 15:21:43 +02:00
Edward Tjörnhammar
0109c5a6fb
pythonPackages.infoqscraper: init at 0.1.0
2015-07-09 13:07:32 +02:00
aszlig
9b8f66180f
python-hetzner: Update to bugfix version 0.7.3.
...
Fixes creating of admin accounts, which is used by NixOps to deploy new
servers. Props to @rbvermaa for reporting the issue and testing it with
NixOps.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2015-07-09 12:44:28 +02:00
ts468
7c339ff10e
Merge pull request #8718 from ts468/upstream.qboot
...
qboot: init at pre-release
2015-07-09 11:23:25 +02:00
Thomas Strobel
8f2f1dbb76
qboot: init at pre-release
2015-07-09 11:11:18 +02:00
Luca Bruno
5c57369fc4
cloog: fix build by using isl_0_14 (ZHF)
2015-07-09 10:38:22 +02:00
Andrew Kelley
1fdd432ffa
ffmpeg: 2.6.3 -> 2.7.1
2015-07-08 17:03:49 -07:00
William A. Kennington III
906be98e0d
isl: Add 0.15.0
...
And remove the defunct and unused default.nix
2015-07-08 16:22:11 -07:00
William A. Kennington III
5ce2cf8a0f
v8_3_16_14: Must be build with gcc <= 4.8
2015-07-08 16:18:08 -07:00
Arseniy Seroka
ee5bea4f81
Merge pull request #8707 from rycee/package/fira-code
...
fira-code: init at 0.5
2015-07-09 00:53:21 +03:00
William A. Kennington III
af22ac6f34
ruby: Fix 1.9.3 for libobjc
2015-07-08 14:15:35 -07:00
Jude Taylor
976d80eb57
map apple sdk frameworks CF to darwin.CF to avoid confusion
2015-07-08 14:15:04 -07:00
William A. Kennington III
7cda24c01e
Merge branch 'master.upstream' into staging.upstream
2015-07-08 14:11:16 -07:00
William Casarin
8ead9cf0c5
caffe: init at rev 77d66dfc
...
Initial version of the Caffe deep learning framework from Berkeley
2015-07-08 10:07:10 -07:00
Robert Helgesson
92c5355690
fira-code: init at 0.5
2015-07-08 17:39:49 +02:00
Tobias Geerinckx-Rice
0b6e9f38ca
python-packages: pgcli 0.17.0 -> 0.18.0
...
Changes: https://raw.githubusercontent.com/dbcli/pgcli/master/changelog.rst
2015-07-08 17:13:04 +02:00
Jaka Hudoklin
957390ecba
Merge pull request #8682 from offlinehacker/pkgs/openshift/add
...
Add openshift
2015-07-08 12:20:01 +02:00
Jaka Hudoklin
4e33dd4e99
openshift: init at 1.0.1
2015-07-08 12:18:06 +02:00
Jaka Hudoklin
4b1cfd17a8
Merge pull request #8680 from offlinehacker/pkgs/compass/add
...
Add compass, stylesheet authoring environment
2015-07-08 12:17:19 +02:00
Arseniy Seroka
54821893d6
Merge pull request #8692 from ts468/upstream.diffpdf
...
diffpdf: init at 2.1.3
2015-07-08 02:33:46 +03:00
Arseniy Seroka
1e631b51e0
Merge pull request #8693 from ts468/upstream.pdfdiff
...
pdfdiff: init at 0.92
2015-07-08 02:10:43 +03:00
Charles Strahan
75f53bc615
ruby: set the default to 2.2.2
2015-07-07 18:41:03 -04:00
Thomas Strobel
88d5f2c0a5
pdfdiff: init at 0.92
2015-07-08 00:22:57 +02:00
Arseniy Seroka
f579662864
Merge pull request #8565 from oconnorr/master
...
cassandra-driver-2.6.0c2: new python package
2015-07-08 01:12:12 +03:00
Charles Strahan
357324df26
ruby: add 2.2.2, bump patch levels
...
* Adds Ruby 2.2.2
* 1.9.3-p547 -> 1.9.3-p551
* 2.0.0-p481 -> 2.0.0-p645
2015-07-07 17:45:33 -04:00
Thomas Strobel
528fae6dd3
diffpdf: init at 2.1.3
2015-07-07 23:32:54 +02:00
Robert Helgesson
ac91ab371a
perl-BoostGeometryUtils: fix OOM in tests
...
The included patch from Debian resolves an out-of-memory error occurring
when running the test suite.
2015-07-07 22:33:45 +02:00
aszlig
b028c14256
python-wrapper: Fix variable name for sed expr.
...
Regression introduced by 5f55788531
.
The commit not only changes documentation, but also changed a few
variable names. One of them is $i which now is $f and it contains the
name of the file to wrap.
This was accidentally found by @Profpatsch (thanks!) who found himself
getting the basename of the last patch file to end up in sys.argv[0].
The reason for this is that $i is used in the for loop of the generic
patchPhase and thus is reused later when the Python file is to be
wrapped.
I have also added a small comment noting about this, to be sure that
this won't accidentally occur the next time someone changes variable
names.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2015-07-07 18:25:10 +02:00
Eelco Dolstra
b7ffacffef
Revert "perl: Make 5.22 the default"
...
This reverts commit 7f547126d8
. We're a
bit too close to release to make such fundamental changes.
2015-07-07 15:13:31 +02:00
Jaka Hudoklin
acc995cf41
Add compass, stylesheet authoring environment
2015-07-07 12:11:58 +02:00
Simon Vandel Sillesen
e85dac137e
sundtek init at 30-06-2015
2015-07-07 10:58:58 +02:00
William A. Kennington III
731b4a4371
perlPackages: Updates
2015-07-06 19:21:21 -07:00
William A. Kennington III
7f547126d8
perl: Make 5.22 the default
2015-07-06 18:34:11 -07:00
William A. Kennington III
ae28ff8b91
Merge branch 'master.upstream' into staging.upstream
2015-07-06 17:15:11 -07:00
William A. Kennington III
7fa3e5f8d9
ruby: Make 2.1.x the default
2015-07-06 16:42:16 -07:00
William A. Kennington III
d5cd6eebcd
ruby: Add 2.1.6
2015-07-06 16:42:16 -07:00
Arseniy Seroka
4f2b22aff0
Merge pull request #8629 from telotortium/subsonic
...
subsonic: init at 5.2.1
2015-07-07 01:09:19 +03:00
Peter Simons
ca6ba3496c
Merge pull request #8662 from deepfire/ghc-nokinds
...
ghc: add haskell.compiler.ghcNokinds, for Richard Eisenberg's `nokinds` branch
2015-07-06 21:51:01 +02:00
Arseniy Seroka
2714fe1cf0
Merge pull request #8620 from aycanirican/emacsPackagesNg-multiple-cursors
...
Introduce emacsPackagesNg.multiple-cursors
2015-07-06 22:48:24 +03:00
Robert Helgesson
3b5c1621ec
perl-Crypt-OpenSSL-AES: init at 0.02
2015-07-06 18:08:26 +02:00
Arseniy Seroka
6bb0436bb3
Merge pull request #8418 from kirelagin/dmenu-xft-by-default
...
dmenu: build with Xft
2015-07-06 14:48:07 +03:00
Arseniy Seroka
83083da5b1
Merge pull request #8651 from ts468/upstream.sbsigntool
...
sbsigntool: init at 0.5
2015-07-06 14:26:39 +03:00
Pascal Wittmann
505f624e01
newtonwars: init at 2015060
2015-07-06 11:37:06 +02:00
lethalman
8212ec8d55
Merge pull request #8659 from robbinch/pkg-gitfs
...
gitfs: init at 0.2.5.
2015-07-06 11:24:49 +02:00
Robbin C
945ac597b9
gitfs: init at 0.2.5
...
This adds gitfs, a FUSE filesystem that fully integrates with git.
2015-07-06 17:10:17 +08:00
Kosyrev Serge
5fee7af3ba
ghc: add haskell.compiler.ghcNokinds, for Richard Eisenberg's 'nokinds' branch
2015-07-06 11:09:28 +03:00
Leroy Hopson
040c399beb
vultr: init at 0.1.2
2015-07-06 15:18:58 +12:00
William A. Kennington III
fbfdc139d6
Merge branch 'master.upstream' into staging.upstream
2015-07-05 18:36:16 -07:00
Robert Irelan
3e61595a3e
subsonic: init at 5.2.1
...
Add package for the Subsonic personal media streamer server
(<http://subsonic.org >).
2015-07-05 17:10:26 -07:00
William A. Kennington III
799c46e6e7
libvirt: 1.2.12 -> 1.2.17
2015-07-05 16:50:50 -07:00
William A. Kennington III
d605663ae2
Merge branch 'master.upstream' into staging.upstream
2015-07-05 13:06:02 -07:00
Eelco Dolstra
d14b4741da
Merge pull request #8657 from jb55/fix-double-apply-patch
...
Fix some double applications of callPackage
2015-07-05 21:23:41 +02:00
Pascal Wittmann
beffeedccf
radicale: update from 0.9 to 0.10
...
add myself to maintainers
2015-07-05 21:12:50 +02:00
William Casarin
a87c9af080
fix some double applications of callPackage
2015-07-05 12:01:22 -07:00
Peter Simons
df4fb819be
ghc: add release candidate 2 for compiler version 7.10.2
2015-07-05 20:56:29 +02:00
William A. Kennington III
282e7e6c84
Merge pull request #8647 from ts468/upstream.trusted_grub
...
trustedGRUB: GRUB 1 based -> GRUB 2 based
2015-07-05 11:52:13 -07:00
Daiderd Jordan
d366f5db9a
xhyve: init at version 0.1.0
...
Lightweight Virtualization on OS X Based on bhyve.
2015-07-05 18:54:55 +02:00
Thomas Strobel
c9e5218b33
sbsigntool: init at 0.5
2015-07-05 14:59:01 +02:00
Thomas Strobel
2285ad1bfa
trustedGRUB: GRUB 1 based -> GRUB 2 based
2015-07-05 11:48:36 +02:00
Michael Raskin
af3d395cfe
sgtpuzzles: update to revision 10286; rewrite completely to avoid reliance on builderDefs features
2015-07-05 11:57:49 +03:00
Charles Strahan
e199d9e844
urxvt-perl: init at 2015-01-16
...
Includes two extensions for `urxvt`:
* fullscreen: Toggle fullscreen for terminal
* newterm: Open a new terminal in your current working directory
2015-07-05 00:12:50 -04:00
William Casarin
d1590482cf
cudatoolkit: generalize derivations, add cuda7
...
There is not much different between the cudatoolkit
expressions:
pkgs/development/compilers/cudatoolkit/5.5.nix
pkgs/development/compilers/cudatoolkit/6.0.nix
pkgs/development/compilers/cudatoolkit/6.5.nix
This commit removes those and replaces them with
pkgs/development/compilers/cudatoolkit/generic.nix
and adds cudatoolkit version 7
2015-07-04 17:05:50 -07:00
Thomas Strobel
36f2ec82cc
tmp-luks: init at 0.9pre
2015-07-04 23:57:59 +02:00
Aycan iRiCAN
afacbf7123
multiple-cursors: init at 20150627
2015-07-05 00:13:57 +03:00
Bjørn Forsman
7f6667f979
python-namebench: bump 1.0.5 -> 1.3.1
2015-07-04 20:17:24 +02:00
Bjørn Forsman
a7b6e152bb
python-namebench: enable GUI support
...
tkinter apparently doesn't exist for pypy, hence it is disabled for that
interpreter.
2015-07-04 20:17:01 +02:00
Bjørn Forsman
8e4edf52dc
python-namebench: fix error preventing it from starting
...
namebench expects to be run from its own source tree (it uses relative
paths to various resources), make it work.
The current version fails like this:
$ ./result/bin/namebench.py
Traceback (most recent call last):
File "/nix/store/04d29llycr5xcxplfv4gn556nzm1mrl7-python2.7-namebench-1.0.5/bin/.namebench.py-wrapped", line 46, in <module>
(options, supplied_ns, global_ns, regional_ns) = config.GetConfiguration()
File "/nix/store/04d29llycr5xcxplfv4gn556nzm1mrl7-python2.7-namebench-1.0.5/lib/python2.7/site-packages/libnamebench/config.py", line 27, in GetConfiguration
(configured_options, global_ns, regional_ns) = ProcessConfigurationFile(options)
File "/nix/store/04d29llycr5xcxplfv4gn556nzm1mrl7-python2.7-namebench-1.0.5/lib/python2.7/site-packages/libnamebench/config.py", line 100, in ProcessConfigurationFile
general = dict(config.items('general'))
File "/nix/store/z6vp5aix4ks1zdjdry7v7dahg8dd02sy-python-2.7.10/lib/python2.7/ConfigParser.py", line 642, in items
raise NoSectionError(section)
ConfigParser.NoSectionError: No section: 'general'
2015-07-04 20:12:16 +02:00
vbgl
3d70bd2763
Merge pull request #8635 from FRidh/patsy
...
patsy: init at 0.3.0
2015-07-04 17:37:37 +02:00
Mateusz Kowalczyk
2bd811155e
Merge pull request #8603 from ts468/upstream.xen
...
Xen related stuff
2015-07-04 16:13:33 +01:00
Frederik Rietdijk
be7dce488a
patsy: init at 0.3.0
2015-07-04 15:22:56 +02:00
William Casarin
9d85874aeb
lmdb: lightning memory-mapped database
2015-07-04 05:06:29 -07:00
Frederik Rietdijk
e0d32691a5
pytz: 2013.9 -> 2015.4
2015-07-04 13:55:03 +02:00
lethalman
8722e5453e
Merge pull request #8584 from robbinch/pkg-python-atomiclong
...
python-packages: Add atomiclong.
2015-07-04 13:22:27 +02:00
lethalman
2d49c104a3
Merge pull request #8623 from FRidh/cytoolz
...
cytoolz: init at 0.7.3
2015-07-04 13:08:15 +02:00
lethalman
39722b552e
Merge pull request #8622 from FRidh/toolz
...
toolz: init at 0.7.2
2015-07-04 13:07:16 +02:00
Arseniy Seroka
093a8994f9
Merge pull request #8624 from ambrop72/minidlna-update
...
minidlna 1.1.4
2015-07-04 13:59:32 +03:00
Arseniy Seroka
36a7b25282
Merge pull request #8608 from datakurre/datakurre-master-dot2tex
...
dot2tex: init at 2.9.0
2015-07-04 13:58:29 +03:00
Arseniy Seroka
a9a2868095
Merge pull request #8626 from ts468/upstream.chaps
...
New: chaps: PKCS #11 implementation with TPM backend
2015-07-04 13:58:06 +03:00
Thomas Strobel
b73e917237
chaps: init at version 0.42-6812
...
Chaps is a PKCS #11 implementation with TPM backend.
2015-07-04 12:53:09 +02:00
Asko Soukka
198ea49d8a
dot2tex: init at 2.9.0
2015-07-04 12:56:30 +03:00
Frederik Rietdijk
0a3e430e85
toolz: init at 0.7.2
2015-07-04 09:57:31 +02:00
Frederik Rietdijk
7aacf74cc7
cytoolz: init at 0.7.3
2015-07-04 09:56:36 +02:00
Charles Strahan
737de61912
urxvt-font-size: init
2015-07-04 03:17:52 -04:00
Ambroz Bizjak
42a5ad5c5e
minidlna: 1.0.25 -> 1.1.4
...
Changes:
- gettext is needed to build
- Switched to using non-legacy ffmpeg.
- Removed ffmpeg stuff from include path since it causes build errors related to
a time.h header.
- Removed unneeded patch.
- Adjusted NixOS service due to the binary being renamed.
2015-07-04 09:16:28 +02:00
Charles Strahan
44594e851c
xsensors: init at 0.70
2015-07-03 22:55:10 -04:00
Thomas Strobel
91b85236d0
Virtualization: add XEN/KVM related drivers for Windows
2015-07-04 00:14:05 +02:00
lethalman
5a2d1fedbc
Merge pull request #8615 from kamilchm/albatross
...
New GTK theme - Albatross from Shimmer Project
2015-07-03 09:57:16 +02:00
Kamil Chmielewski
6db7437a64
New GTK theme - Albatross from Shimmer Project
...
http://shimmerproject.org/our-projects/albatross/
2015-07-03 08:40:40 +02:00
Tobias Geerinckx-Rice
dfdcbb3640
python-packages: prompt_toolkit 0.41 -> 0.42
2015-07-03 04:13:02 +02:00
Tobias Geerinckx-Rice
209837a59a
redshift: 1.9.1 -> 1.10
...
Notes:
- The current linking to geoclue2 looks nice but doesn't actually do
anything. Only clients whitelisted by the geoclue package are
allowed. Use static locations for now, like the NixOS service does.
- redshift-gtk still needs some work (icon?). It at least runs now,
but can't control non-user instances like the NixOS service uses.
This isn't a bug, but will confuse people.
- Add myself as a maintainer.
2015-07-03 03:19:09 +02:00
Thomas Strobel
649697ddcf
Xen: add XEN 4.5.1
2015-07-02 16:37:03 +02:00
Arseniy Seroka
afa1f5ba22
Merge pull request #8586 from vbgl/ocaml-updates
...
Ocaml package updates
2015-07-02 12:06:29 +03:00
Arseniy Seroka
bc9079dc53
Merge pull request #8589 from matthiasbeyer/update-klaus
...
klaus: 0.4.9 -> 0.4.10
2015-07-02 03:16:32 +03:00
William A. Kennington III
7eae48871f
Merge branch 'master.upstream' into staging.upstream
2015-07-01 13:38:17 -07:00
Matthias Beyer
279057da8d
klaus: 0.4.9 -> 0.4.10
2015-07-01 20:47:04 +02:00
Vincent Laporte
dab57252b1
ocaml-qcheck: init at 0.4.0.1
2015-07-01 20:23:19 +02:00
Matthias Beyer
95578b07f7
khard: init at 0.4.0
2015-07-01 20:06:06 +02:00
Pascal Wittmann
0cc53d0711
phpPackages.memcached: update from 2.1.0. to 2.2.0
2015-07-01 18:29:31 +02:00
Pascal Wittmann
f41564389b
phpPackages.xcache: update from 3.1.0 to 3.2.0 and enable tests
2015-07-01 18:29:31 +02:00
Pascal Wittmann
db5d03c4f1
phpPackages.xdebug: update from 2.2.5 to 2.3.1 and enable tests
2015-07-01 18:29:31 +02:00
Robbin C
1969397ead
atomiclong: init at 0.1.1.
2015-07-01 22:31:34 +08:00
Arseniy Seroka
9661e477bc
Merge pull request #8563 from akaWolf/master
...
Updated qtox to the last version
2015-07-01 17:16:16 +03:00
Shea Levy
dd9530c819
Merge remote-tracking branch 'projectorhq/riemann-tools'
...
Add riemann-tools package and service
2015-07-01 08:45:33 -04:00
Shea Levy
145768bf9b
Unmaintain a bunch of packages
2015-07-01 08:11:05 -04:00
Artjom Vejsel
68f4a0f0ea
libtoxcore: added new-api version
2015-07-01 14:38:56 +03:00
Artjom Vejsel
6a6ecde159
filter-audio library: init at 20150624
2015-07-01 14:37:59 +03:00
William A. Kennington III
612f0bdd67
Merge branch 'master.upstream' into staging.upstream
2015-06-30 23:58:07 -07:00
Robert Pitts and Trenton Strong
bbb36ea039
Add riemann-tools to nixpkgs
...
Adds package via bundlerEnv and service for Riemann health.
2015-06-30 17:16:51 -04:00
Russell O'Connor
90b4054aa0
cassandra-driver: init at 2.6.0c2
2015-06-30 17:47:04 +00:00
Charles Strahan
433a13d12a
taffybar: init with-packages wrapper
...
This provides a wrapper around taffybar, in a fashion similar to how
package xmonad.
2015-06-30 11:11:43 -04:00
Carles Pagès
3dd09ed069
Merge pull request #8524 from cpages/master
...
abcde: update to 2.7 and fix mp3 tagging
2015-06-30 15:04:47 +02:00
Tuomas Tynkkynen
d013de6d32
U-Boot: Update to 2015.04 and major refactor
...
Instead of selecting the defconfig based on stdenv.platform.uboot,
provide different ubootFoo packages. Otherwise we couldn't easily build
U-Boots for different platforms than what we are currently running on.
All users of the ubootChooser function appear to be using only CLI tools
like mkimage, whose behaviour is not affected by the defconfig (their
build outputs are bitwise-identical). So add a separate package for the
CLI tools.
Of the removed patches, some version of sheevaplug-sdio.patch has
apparently been applied upstream (with at least mv_sdio.c renamed to
mvebu_mmc.c). sheevaplug-config.patch needs rebasing & re-testing on
real hardware.
Tested boards and input/output methods that upstream supports:
- Raspberry Pi:
- HDMI works, USB keyboard not yet supported
- Serial via the 26-pin connector (3.3V)
- pcDuino3 Nano:
- HDMI + USB keyboard (only if attached to a hub)
- Serial via the 3-pin connector (3.3V)
- Jetson TK1: RS-232 serial port only
- Versatile Express CA9 (for QEMU only): Serial via '-serial stdio'
2015-06-30 10:49:56 +03:00
Tuomas Tynkkynen
1793fdbfb1
platforms.nix: Remove IntegratorCP and Versatile
...
These ARM boards are very old and quite likely used only for booting in
QEMU emulation. I'll focus on making the multiplatform image easy to
boot in QEMU instead.
2015-06-30 10:33:25 +03:00
Jude Taylor
b62baacbc1
Revert "Fix libcxxStdenv on Linux"
...
This reverts commit 172ed10426
.
2015-06-29 13:55:12 -07:00
Arseniy Seroka
3862fd57fe
Merge pull request #8526 from matthiasbeyer/add-klaus
...
Package: klaus + dependencies
2015-06-29 19:08:38 +03:00
Matthias Beyer
5344e4db4d
klaus: init at 0.4.9
2015-06-29 17:55:33 +02:00
Matthias Beyer
ce10f31e0e
httpauth: init at 0.2
2015-06-29 17:55:32 +02:00
Matthias Beyer
886a872853
humanize: init at 0.5.1
2015-06-29 17:55:32 +02:00
Pascal Wittmann
851ef7e2de
Merge pull request #8548 from dezgeg/pr-dtc
...
dtc: init at 1.4.1
2015-06-29 16:37:45 +02:00
Pascal Wittmann
512225ef81
Fixed some descriptions
2015-06-29 16:20:58 +02:00
Tobias Geerinckx-Rice
d94285788f
python-packages: repocheck 2015-05-04 -> 2015-06-27
2015-06-29 01:21:17 +02:00
Shea Levy
291d203f80
Merge branch 'clang-stdenv' of https://github.com/Ralith/nixpkgs into staging
2015-06-28 15:54:06 -04:00
Tuomas Tynkkynen
b0ad2da4ed
dtc: init at 1.4.1
...
Compiling U-Boot for the Jetson TK1 board requires this.
2015-06-28 22:40:35 +03:00
Benjamin Saunders
172ed10426
Fix libcxxStdenv on Linux
...
This corrects linkage failures arising from missing -lc++abi and
resolves "unused argument" warnings arising due to -stdlib=libc++
serving no purpose when search paths are being supplied explicitly.
2015-06-28 21:33:12 +02:00
Domen Kožar
3ff2dfb7fa
Merge pull request #8423 from bobvanderlinden/popcorntime-bin
...
added popcorntime package
2015-06-28 10:01:45 +02:00
Kirill Elagin
6209961810
pyqt5: make it actually 5.4.2
2015-06-28 02:18:58 +03:00
William A. Kennington III
511fc648b5
keepalived: Add derivation
2015-06-27 14:33:29 -07:00
William A. Kennington III
f93d565c28
Merge branch 'master.upstream' into staging.upstream
2015-06-27 10:44:00 -07:00
William A. Kennington III
e080827fdb
Fix heimdal reference
2015-06-27 10:43:45 -07:00
William A. Kennington III
8b844dce2d
ffado -> ffadoFull
2015-06-27 10:42:13 -07:00
Nicolas Dudebout
430c8520b2
One more change for jack2 to libjack2
...
7297255019
did break things and this change seems to fix them.
2015-06-27 13:20:56 -04:00
vbgl
742824bd78
Merge pull request #8291 from maurer/misc-ocaml
...
Add miscellaneous OCaml Packages
2015-06-27 18:52:03 +02:00
Matthew Maurer
9c0f1eefc6
piqi-ocaml: init at 0.7.4
2015-06-27 16:54:20 +00:00
Matthew Maurer
8c875e76f0
uuidm: init at 0.9.5
2015-06-27 16:54:20 +00:00
Matthew Maurer
289e2a10db
ocaml-faillib: init at 111.17.00
2015-06-27 16:54:20 +00:00
Matthew Maurer
1d79d840b1
piqi: init at 0.6.12
2015-06-27 16:54:20 +00:00
Matthew Maurer
90a4de0f1b
ocaml-bitstring: init at 2.0.4 and f1673f8
2015-06-27 16:54:10 +00:00
Carles Pagès
8658ab9675
abcde: update to 2.7 and fix mp3 tagging
...
It now depends on eyeD3 (python), but that's an upstream decision.
2015-06-27 14:19:22 +02:00
Carles Pagès
658c8c5e38
eyeD3: fix and update to 0.7.8
2015-06-27 14:18:31 +02:00
William A. Kennington III
12102562f7
Merge branch 'master.upstream' into staging.upstream
2015-06-27 00:18:18 -07:00
William A. Kennington III
7297255019
Convert all jack references to libjack2
2015-06-27 00:17:52 -07:00
William A. Kennington III
559cbdaab7
heimdal: Rename to heimdalFull
2015-06-26 23:07:10 -07:00
William A. Kennington III
769ea09360
heimdal: Use the git version and breakout into a library
2015-06-26 22:41:25 -07:00
William A. Kennington III
ccc47a6a42
kerberos: Use mit by default as it is has more upstream support / bugfixes
2015-06-26 22:06:16 -07:00
William A. Kennington III
b6322e1215
krb5: Break out into a lib and not lib version
2015-06-26 22:05:47 -07:00
William A. Kennington III
ef253212f4
Merge branch 'master.upstream' into staging.upstream
2015-06-26 17:25:49 -07:00
William A. Kennington III
8ce4cb4de8
Also fix the default reference for kerberos
2015-06-26 17:24:11 -07:00
William A. Kennington III
adeab5e815
Migrate all heimdal -> libheimdal
...
Also disable heimdal references in samba as it uses internal api
features not guaranteed to be stable
2015-06-26 17:23:00 -07:00
William A. Kennington III
fa1bdb8cbd
Migrate all krb5 -> libkrb5
2015-06-26 17:21:49 -07:00
William A. Kennington III
eb8a411a18
Add kerberos library references for later use
2015-06-26 17:16:27 -07:00
Arseniy Seroka
43636bc83c
Merge pull request #8506 from hrdinka/add/qtpass
...
qtpass: init at 0.8.4
2015-06-26 20:19:06 +03:00
Jude Taylor
363d1bf07a
darwin purity: vim
2015-06-26 09:54:44 -07:00
Jude Taylor
616ed6ee15
darwin purity: libev
2015-06-26 09:53:10 -07:00
lethalman
5754fd9e02
Merge pull request #8490 from lethalman/overridepkgs
...
Add pkgs.overridePackages
2015-06-26 17:14:22 +02:00
Pascal Wittmann
dd73d2af87
Merge pull request #8505 from joachifm/delete-codeville
...
codeville: delete expression
2015-06-26 17:09:42 +02:00
Andrey Pavlov
5506632473
erlang: add Erlang R18, closes #8515
2015-06-26 16:15:14 +02:00
Luca Bruno
7f5f9072ad
all-packages.nix: Add pkgs.overridePackages
2015-06-26 15:08:11 +02:00
Christoph Hrdinka
bc975c36d1
qtpass: init at 0.8.4
2015-06-26 09:44:02 +02:00
Charles Strahan
d51a81690c
libtsm: fix building with clang for darwin
2015-06-25 21:06:55 -05:00
Jude Taylor
80c62d1325
darwin purity: ruby-1.9.3
2015-06-25 16:36:04 -07:00
Jude Taylor
a8c98bc013
darwin purity: mercurial
2015-06-25 16:36:04 -07:00
Jude Taylor
c0e1f2e34f
darwin purity: weechat
2015-06-25 16:35:18 -07:00
Arseniy Seroka
61fdf5b758
Merge pull request #8511 from avnik/add-vault
...
New package: vault
2015-06-26 01:35:44 +03:00
Alexander V. Nikolaev
41bbb904eb
vault: init at v0.1.2
2015-06-26 01:34:32 +03:00
Arseniy Seroka
55d7d52d13
Merge pull request #8496 from jb55/obs-studio-audio
...
obs-studio: add audio support
2015-06-26 00:59:05 +03:00
vbgl
5c537f3bdd
Merge pull request #8296 from vbgl/ocamlp4
...
OCaml-4.02: fix ocamlbuild rules for camlp4
2015-06-25 23:54:13 +02:00
Vincent Laporte
715f78be7e
E prover: do not build the manual
2015-06-25 23:21:25 +02:00
Joachim Fasting
78d4f1dec6
codeville: delete expression
...
Codeville is abandonware. The homepage returns 404, and the last release
is 8 years old ...
2015-06-25 22:34:29 +02:00
Eelco Dolstra
7f54f99656
Don't build texLive in Hydra
...
It's way too big (texlive-core-2014 alone is > 1.5 GB).
2015-06-25 17:34:08 +02:00
Rushmore Mushambi
ddade52f0e
Merge pull request #8501 from rushmorem/package-j2cli
...
Add j2cli package, a shell script templating helper
2015-06-25 16:36:52 +02:00
Thomas Tuegel
a8c52d0958
Merge branch 'master' into staging
2015-06-25 09:15:05 -05:00
Thomas Tuegel
8862d8d9c9
autonix: JSON manifest format
2015-06-25 09:03:40 -05:00
Thomas Tuegel
0aa8e64967
kde5: JSON manifest format
2015-06-25 09:03:40 -05:00
Lluís Batlle i Rossell
662a94312d
Fix python-json-pointer meta.
...
(cherry picked from commit f1f5441b50
)
2015-06-25 15:44:04 +02:00
rushmorem
fad9d34452
Add j2cli package, a shell script templating helper
2015-06-25 15:30:27 +02:00
Peter Simons
160e342dbd
python-args: drop bogus reference to "stdenv.lib.licenses.bsd"
2015-06-25 12:19:58 +02:00
Lluís Batlle i Rossell
66bd251a7c
Adding internetarchive 0.8.3.
2015-06-25 12:06:12 +02:00
William Casarin
1281f51b69
obs-studio: audio support
2015-06-25 00:32:16 -07:00
Vincent Laporte
1d72ce49cf
coq-8.3: fix (needs make 3)
2015-06-25 08:55:31 +02:00
Vincent Laporte
af3f91085a
mldonkey: move package out of ocamlPackages
...
as it does not provides any library but only an executable program
2015-06-25 08:55:27 +02:00
lethalman
5988dda30f
Merge pull request #8485 from obadz/coreclr
...
dotnet: package coreclr (from git)
2015-06-24 16:59:27 +02:00
obadz
30bd03a3e2
dotnet: package coreclr (from git)
2015-06-24 15:06:14 +01:00
Simon Vandel Sillesen
9dab1a840c
tvheadend: init at 4.0.4
2015-06-24 13:22:09 +00:00
lethalman
5ee8b66a68
Merge pull request #8474 from obadz/moar-dotnet
...
Some dotnet upgrades + a few new packages
2015-06-24 14:32:56 +02:00
Sou Bunnbu
c7c8f4a780
Merge pull request #8481 from iyzsong/master
...
tiled: update to 0.12.3 and build with qt5
2015-06-24 19:16:22 +08:00
Rok Garbas
2c944fd4dd
pythonPackages.jenkins-job-builder: init at 1.2.0
2015-06-24 12:37:11 +02:00
Peter Simons
4ad434e521
python-dulwich: update to version 0.10.1a
2015-06-24 11:37:30 +02:00
Peter Simons
922c555015
mercurial: add hg-git support
...
Enable this feature by putting these lines into your ~/.hgrc file:
[extensions]
hgext.bookmarks =
hggit =
2015-06-24 11:33:17 +02:00
Peter Simons
c112c3f51f
hg-git: update to version 0.8.1
2015-06-24 11:33:17 +02:00
宋文武
7c0c2dc15b
tiled: update to 0.12.3 and build with qt5
2015-06-24 17:14:12 +08:00
Michael Phillips
e17494956b
powerline: 2.1 -> 2.1.4, closes #8466
...
Makes powerline work again with tmux 2.0
2015-06-24 10:17:30 +02:00
obadz
33e0dbbc4b
dotnet: package Projekt
2015-06-23 23:12:29 +01:00
obadz
e45788993b
dotnet: FSharp.Compiler.Service 0.0.89 -> 0.0.90
2015-06-23 23:12:29 +01:00
obadz
0092d04d25
dotnet: package Deedle 1.2.0
2015-06-23 23:12:29 +01:00
obadz
3e6d95fc2a
dotnet: FSharp.Data 2.2.2 -> 2.2.3
2015-06-23 23:11:50 +01:00
obadz
9c205124e4
dotnet: package ExcelDna 0.32.0 + ExcelDna.Registration
2015-06-23 23:11:50 +01:00
obadz
14dcf50cb1
dotnet: package MathNet.Numerics 3.7.0
2015-06-23 23:11:08 +01:00
obadz
58418eaa67
dotnet: FSharp.AutoComplete 0.16.0 -> 0.18.2
2015-06-23 23:11:08 +01:00
obadz
24bb5d1a94
dotnet: Paket 1.6.2 -> 1.18.2
2015-06-23 23:11:08 +01:00
Arseniy Seroka
22b89f2fcd
Merge pull request #8463 from mbbx6spp/jruby-1_7_20_1
...
jruby: 1.7.12 -> 1.7.20.1 (update package for CVE patch)
2015-06-23 20:04:31 +03:00
Susan Potter
2968707101
jruby: 1.7.12 -> 1.7.20.1
...
Security release which only updates Rubygems to version 2.4.8. Rubygems 2.4.8
addresses CVE-2015-1855 to resolve some problems with wildcard matching of
hostnames.
See following entry for more information:
http://jruby.org/2015/06/10/jruby-1-7-20-1.html
2015-06-23 11:58:29 -05:00
Arseniy Seroka
266531b5b0
Merge pull request #8422 from travisbhartwell/update/atom-shell-to-electron
...
atom-shell: renamed to electron and updated 0.19.1 -> 0.28.2
2015-06-23 18:54:22 +03:00
Arseniy Seroka
2aac4c301c
Merge pull request #8469 from ehahn/qutebrowser
...
add packages: qutebrowser + dependency pypeg2
2015-06-23 17:22:26 +03:00
Tom Hunger
04f6a1c665
pandas: Update to 0.16.1, closes #8288
...
Note that I could remove the line-switching hack because
the problem has been fixed upstream:
https://github.com/fvia/pandas/commit/09a7a69e116
2015-06-23 13:54:19 +02:00
Erik Hahn
006e7ae04e
qutebrowser: init at 0.2.1
2015-06-23 13:39:33 +02:00
Erik Hahn
d9085b845e
pypeg2: init at 2.15.1
2015-06-23 13:39:23 +02:00
lethalman
0f1abcc78d
Merge pull request #8395 from mbakke/ipcalcs
...
add ipcalc and sipcalc
2015-06-23 13:33:25 +02:00
William Casarin
634d9eb4c1
clib: a micro-package manager for C
2015-06-23 00:35:03 -07:00
William A. Kennington III
c6e512b80c
Merge branch 'master.upstream' into staging.upstream
2015-06-22 12:43:12 -07:00
William A. Kennington III
bd9433c90d
kernel: Add version 4.1 latest
2015-06-22 12:41:23 -07:00
William A. Kennington III
094bf83b26
Fix the usage of cross packages during nix-env listings
2015-06-22 12:25:53 -07:00
William A. Kennington III
282d03befa
Merge branch 'master.upstream' into staging.upstream
2015-06-22 10:57:36 -07:00
laMudri
22172b8e43
ibus-table-others: init at 1.3.7, closes #8460
2015-06-22 18:25:45 +02:00
laMudri
f0b4065392
ibus-table: init at 1.9.6
2015-06-22 18:25:45 +02:00
lassulus
2204206a47
asciinema: init at 1.1.1, closes #8459
2015-06-22 18:16:52 +02:00
Michael Raitza
7907a8bcba
dialog: init at 1.2-20150225, closes #8457
...
Generate ncurses dialogs from shell scripts.
2015-06-22 18:11:05 +02:00
Arseniy Seroka
6881cd2c3a
Merge pull request #8435 from flosse/k9copy
...
k9copy: init at 3.0.3
2015-06-22 18:45:52 +03:00
Arseniy Seroka
1c444984bc
Merge pull request #8448 from dezgeg/pr-ckbcomp
...
ckbcomp: New package at version 1.129
2015-06-22 18:45:24 +03:00
Oliver Charles
fd6600c809
bluejeans: New Mozilla plugin
2015-06-22 14:04:40 +01:00
Tuomas Tynkkynen
4ac3bc3330
ckbcomp: init at 1.129
2015-06-22 15:32:42 +03:00
Dario Bertini
1e40c2347a
Fix conflict, Merge branch 'master' of github.com:NixOS/nixpkgs into redis-3.0.2
2015-06-22 12:20:02 +01:00
Markus Kohlhase
f50b2e5892
k9copy: init at 3.0.3
2015-06-22 12:34:00 +02:00
Eelco Dolstra
47868d85b2
Merge pull request #8452 from rycee/update/perl-DateTime
...
Update core Perl DateTime packages
2015-06-22 12:03:43 +02:00
Shea Levy
f63e764bb6
Add buildMaven
2015-06-21 22:24:03 -04:00
Robert Helgesson
17402efed0
Update core Perl DateTime packages.
...
This change includes the following updates:
- DateTime 1.08 → 1.19,
- DateTimeFormatStrptime 1.54 → 1.56,
- DateTimeLocale 0.45 → 0.46, and
- DateTimeTimeZone 1.63 → 1.91.
2015-06-22 00:39:57 +02:00
Robert Helgesson
46b47fa2b7
Update perl-List-AllUtils to 0.09.
2015-06-22 00:39:57 +02:00
Tobias Geerinckx-Rice
30bda340f5
python-packages: prompt_toolkit -> 0.41
...
Fixes:
- Emacs Control-T key binding.
- Color fix for Windows consoles.
New features:
- Allow both booleans and Filters in many places.
- `password` can be a Filter now.
2015-06-21 22:37:18 +02:00
Joachim Schiele
9980367639
ipfs: added to go-packages
2015-06-21 22:06:58 +02:00
Arseniy Seroka
311d55315d
Merge pull request #8432 from andrewrk/rucksack
...
rucksack: init at 3.1.0
2015-06-21 20:12:26 +03:00
Matthias Beyer
563167bbe7
tasknc: init at 0.8
2015-06-21 14:22:10 +02:00
Jude Taylor
26da697f73
darwin purity: libuv, again
2015-06-21 00:56:48 -07:00
Jude Taylor
6f3729e3b3
darwin purity: nodejs
2015-06-21 00:56:26 -07:00
Travis B. Hartwell
f4d876f73c
i3-py: init at 0.6.4
...
Extract i3-py from i3minator so it can be installed on its own.
2015-06-20 23:31:38 -06:00
Jude Taylor
72737118fd
darwin purity: libuv
2015-06-20 15:29:55 -07:00
Jude Taylor
a4fbe26ec8
darwin purity: haskell-hfsevents
2015-06-20 15:29:55 -07:00
William A. Kennington III
d4f176f70d
Fix libiconv handling when using a crossSystem
2015-06-20 13:31:39 -07:00
William A. Kennington III
105feaa9f4
Cleanup some top-level cross compiling toolchain things
...
Also, switch the cross gcc to use the default gcc.
2015-06-20 12:59:32 -07:00
Marius Bakke
aef2a813a8
add ipcalc
2015-06-20 10:24:19 +01:00
Marius Bakke
c0d4cdce07
add sipcalc
2015-06-20 10:24:19 +01:00
Andrew Kelley
55262f98b6
rucksack: init at 3.1.0
2015-06-20 02:06:20 -07:00
Arseniy Seroka
0fea053461
Merge pull request #8425 from lihop/add/openpyxl
...
openpyxl: init at 2.2.4
2015-06-20 10:50:31 +02:00
Andrew Kelley
42f88b5ba7
liblaxjson: init at 1.0.5
2015-06-19 23:35:04 -07:00
Leroy Hopson
108dbfba9a
openpyxl: init at 2.2.4
2015-06-20 12:53:04 +12:00
Leroy Hopson
9b623def11
jdcal: init at 1.0
...
a dependency of openpyxl
2015-06-20 12:53:04 +12:00
Arseniy Seroka
a00d5998da
Merge pull request #8417 from kirelagin/update-tabbed
...
tabbed: update and add xft patch
2015-06-20 00:33:29 +02:00
Arseniy Seroka
8043c4834b
Merge pull request #8400 from andrewrk/wolfebin
...
wolfebin: init at 5.4
2015-06-20 00:31:37 +02:00
Travis B. Hartwell
caa216b640
atom-shell: renamed to electron and updated 0.19.1 -> 0.28.2
...
Added systemd to buildEnv path because of new libudev dependency.
2015-06-19 15:32:12 -06:00
Bob van der Linden
236f8c720d
added popcorntime package
2015-06-19 23:22:18 +02:00
Jude Taylor
d3ef216c54
darwin purity: libusb1
2015-06-19 12:56:39 -07:00
Jude Taylor
f048ff3969
darwin purity: python-2.7
2015-06-19 12:56:39 -07:00
Andrew Kelley
3d7125d1a7
wolfebin: init at 5.4
2015-06-19 12:26:00 -07:00
Kirill Elagin
a35263d75e
dmenu: build with Xft
...
It doesn’t make any sense to build dmenu without Xft. Really.
Extra bonus: getting rid of deprecated config.
2015-06-19 21:44:34 +03:00
Kirill Elagin
1bb72a8198
tabbed: update and add xft patch
2015-06-19 21:28:52 +03:00
lethalman
f914a39d57
Merge pull request #8151 from globin/lxc-python-wrapping
...
Wrap the python scripts in lxc
2015-06-19 18:51:52 +02:00
Vincent Laporte
01571ab2d7
coq-mathcomp: refactor
2015-06-19 18:11:33 +02:00
Vincent Laporte
524b7fe178
coq-ssreflect: refactor
2015-06-19 18:11:33 +02:00
Mateusz Kowalczyk
fc26e89159
Merge pull request #8394 from mbakke/maim
...
Add maim and slop
2015-06-19 15:22:20 +01:00