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

5065 commits

Author SHA1 Message Date
(cdep)illabout
f0c3c54712 Create wrapper package for fcitx with plugins. 
This creates a wrapper package for fcitx so that plugins can be enabled
by the user.  This is based on the wrapper package for
pidgin-with-plugins.

By using this wrapper instead of the fcitx package itself, it will be
possible for the user to enable/disable plugins.
 2014-11-05 10:37:10 +09:00
William A. Kennington III
cbc05e77eb bareos: Add derivation 2014-11-04 11:11:14 -08:00
Jaka Hudoklin
f253186e96 Add flannel, etcd backed network fabric for containers 2014-11-04 19:32:30 +01:00
Vladimir Kirillov
049a991bc1 awscli -> 1.5.5, botocore -> 0.69.0 2014-11-04 19:44:13 +02:00
Eelco Dolstra
7495c61d49 Merge remote-tracking branch 'origin/darwin-clang-stdenv' into staging 
Conflicts:
	pkgs/applications/editors/vim/macvim.nix
 2014-11-04 14:30:43 +01:00
Rob Vermaas
c9d40dc6f8 oathToolkit: update from 2.0.2 to 2.4.1, potentially fixes CVE-2013-4204, CVE-2013-6280, CVE-2013-7322 2014-11-04 10:22:46 +01:00
Michael Raskin
5854eb09eb Update NILFS2 utils 2014-11-04 12:04:42 +03:00
John Wiegley
80b0f385f0 emacs24Packages.auctex: 11.87 -> 11.88 2014-11-03 17:30:49 -06:00
William A. Kennington III
7c605db462 tinc_pre: Update to f57d53c 2014-11-03 14:21:30 -08:00
Peter Simons
b5fed52c43 Merge pull request #4238 from wkennington/master.boost 
Make boost 156 the default
 2014-11-03 23:03:01 +01:00
Michael Raskin
4fd8e1eac0 Update ioping 2014-11-04 00:37:42 +03:00
Michael Raskin
04635a87eb Update monit 2014-11-03 16:54:38 +03:00
Michael Raskin
1042d595c4 Update TeX-disser thesis template for Russian styles 2014-11-03 16:54:38 +03:00
Jaka Hudoklin
c2d4fd7360 Merge pull request #4762 from ambrop72/badvpn-debug 
badvpn: Add debug flag to enable assertions.
 2014-11-03 14:07:28 +01:00
Vladimír Čunát
ed867a50eb iconv: remove usage on Linux in several packages 
This fixes builds after #4419. Thanks to @vbgl for the original commit;
I changed that as I'm not sure whether passing null values to buildInputs is clean.

CC maintainers: @coroa, @peti, @phreedom, @robberer, @jcumming.
 2014-11-03 12:58:54 +01:00
Evgeny Egorochkin
3a03bf5700 youtube-dl: update from 2014.10.30 to 2014.11.02.1 2014-11-03 13:18:20 +02:00
William A. Kennington III
79cc2754ca syslog-ng-incubator: Refactor 2014-11-02 17:22:28 -08:00
William A. Kennington III
8e1072fd60 Revert "syslog-ng: Update from 3.5.6 to 3.6.1" 
This reverts commit e2ada42623.
 2014-11-02 17:22:28 -08:00
William A. Kennington III
a9c472d16e boost: Fix incompatible applications 2014-11-02 17:22:28 -08:00
William A. Kennington III
b94f27b846 ceph: 0.86 -> 0.87 2014-11-02 17:22:27 -08:00
William A. Kennington III
5ae216558f jfsrec: Remove derivation 2014-11-02 17:22:27 -08:00
William A. Kennington III
94f80e66d3 boost: Remove legacy users 2014-11-02 17:22:27 -08:00
William A. Kennington III
aa3e800be7 boost: Remove boost.lib 2014-11-02 17:22:27 -08:00
William A. Kennington III
7b06577d4b iperf3: 3.0.8 -> 3.0.9 2014-11-02 17:22:01 -08:00
William A. Kennington III
674a588b0a btrfs-progs: 3.16.2 -> 3.17 2014-11-02 17:18:50 -08:00
Michael Raskin
4ef5bd9918 Update Pipelight: both Wine version and Pipelight distribution 2014-11-02 23:51:58 +03:00
Michael Raskin
815bbfb852 Update GlusterFS 2014-11-02 23:51:58 +03:00
Michael Raskin
b6c0e1825b Update FreeIPMI 2014-11-02 23:51:58 +03:00
Arseniy Seroka
2b61f0b204 Merge pull request #4772 from abbradar/lbzip2 
lbzip2: add package
 2014-11-02 22:38:39 +03:00
lethalman
560fd3a5b7 Merge pull request #4742 from abbradar/bcache-stage1 
Support bcache volumes in initrd
 2014-11-02 17:29:38 +01:00
Nikolay Amiantov
92f94e901a bcache-tools: don't use probe-bcache and bcache-register 
This allows us not to include any additional binaries for bcache
support in initrd; just an udev rule.
 2014-11-02 19:03:41 +03:00
Peter Simons
a9c53037fa Merge remote-tracking branch 'origin/master' into staging. 2014-11-02 16:15:53 +01:00
lethalman
a63cf7a1fa Merge pull request #4771 from abbradar/pbzip2-update 
pbzip2: update package
 2014-11-02 00:52:28 +01:00
Nikolay Amiantov
b6529ce1f6 lbzip2: add package 2014-11-02 02:05:54 +03:00
Nikolay Amiantov
f2a27d8d81 pbzip2: update package 2014-11-02 02:04:36 +03:00
Igor Pashev
ce5cc9d803 Added pxz 2014-11-01 18:59:20 +01:00
ambrop7@gmail.com
4664321cd3 badvpn: Add debug flag to enable assertions. 2014-11-01 15:16:28 +01:00
Evgeny Egorochkin
eb8f380f4e pwgen: update from 2.06 to 2.07 2014-11-01 14:52:11 +02:00
Evgeny Egorochkin
767814e585 youtube-dl: update from 2014.10.25 to 2014.10.30 2014-11-01 14:52:11 +02:00
Emery Hemingway
6b7eda4ddc mbox does not support i686 2014-10-31 11:48:55 -04:00
Georges Dubus
d8f5d246e6 nox: use pypi for distribution 2014-10-31 14:19:33 +01:00
Peter Simons
b11060d8db Merge remote-tracking branch 'origin/master' into staging. 2014-10-31 11:14:24 +01:00
Pascal Wittmann
a156a6b2a7 opkg: update from 0.2.2 to 0.2.3 2014-10-30 19:02:42 +01:00
cillianderoiste
4b78eff026 Merge pull request #4729 from deepfire/ifuse 
ifuse:  new expression
 2014-10-30 14:08:31 +01:00
Georges Dubus
925684e83d Updated nox 2014-10-30 14:01:32 +01:00
Franz Pletz
e630ee2fdd wget: Update to 1.16 (fix CVE-2014-4877) 
This patch updates wget to the current version, 1.16. This release fixes a
remotely exploitable security issue: CVE-2014-4877.

A dependency on libidn was added and the testsuite now depends on
python3. A patch that disables a test was removed because it is not needed
anymore.

As I intend to take care of wget in the future, I added myself to the
maintainers.
 2014-10-30 10:30:08 +01:00
Kosyrev Serge
b3ebe093b0 ifuse: new expression 2014-10-30 12:11:24 +03:00
William A. Kennington III
578d77ae0e jfsrec: Undelete and fix evaluation 2014-10-29 09:23:08 -07:00
William A. Kennington III
06f8885609 libusb: 1.0.18 -> 1.0.19 2014-10-29 02:05:17 -07:00
William A. Kennington III
fa6275857e yubico-piv-tool: Add derivation 2014-10-29 02:05:17 -07:00
William A. Kennington III
4e8d55c59f pinentry: 0.8.3 -> 0.8.4 2014-10-29 02:05:17 -07:00
Domen Kožar
419f15b060 Remove http_proxy/ftp_proxy overrides used in setup hooks. 
Partially reverts eaa4db148d. Used
together with nix-shell it results into unresolvable domains. For
example: `nix-shell -p libxml2` spawns a shell with non-working DNS.

chroot should remove such unpurities.
 2014-10-28 23:20:59 +01:00
Emery Hemingway
358acd7d52 mbox: initial package 
http://pdos.csail.mit.edu/mbox
 2014-10-28 12:43:51 -04:00
Pascal Wittmann
e7bfcdac05 parallel: update from 20140922 to 20141022 2014-10-28 15:51:47 +01:00
Nikolay Amiantov
1f101efa88 update-resolv-conf: add package 2014-10-28 03:04:14 -07:00
Aristid Breitkreuz
b6314fdad6 rsnapshot: add (commented) code for an idea that did not work out yet 2014-10-27 21:02:04 +01:00
Aristid Breitkreuz
93f2c180d0 rsnapshot: add git version & make it configurable in the nixos module 2014-10-27 20:38:39 +01:00
Bjørn Forsman
d12da7007c fping: set meta.platforms 2014-10-27 18:20:46 +01:00
Rickard Nilsson
e2ada42623 syslog-ng: Update from 3.5.6 to 3.6.1 
Also update the NixOS module, syslog-ng now automatically listens to
the systemd journal, so we don't have to set up syslog.socket.
 2014-10-27 12:22:22 +01:00
Rob Vermaas
8b47b67329 Update to latest awscli 2014-10-27 12:00:07 +01:00
Evgeny Egorochkin
7eb9b172bb youtube-dl: update from 2014.10.13 to 2014.10.25 2014-10-27 07:35:13 +02:00
Alastair Pharo
47dc7990ec enca: update from 1.15 to 1.16 2014-10-27 07:28:23 +02:00
Evgeny Egorochkin
7a01610988 logcheck: update from 1.3.16 to 1.3.17 2014-10-27 07:16:33 +02:00
Mateusz Kowalczyk
881a645c38 gifsicle: update from 1.84 to 1.86 2014-10-27 00:53:19 +00:00
Anders Papitto
0d11520727 add rcm, Management Suite for Dotfiles 2014-10-26 00:17:26 +02:00
Evgeny Egorochkin
a6dc9ce957 tor: update from 0.2.4.23 to 0.2.4.24 2014-10-25 20:31:54 +03:00
Evgeny Egorochkin
8977addc3a youtubeDL: update from 2014.09.19 to 2014.10.13 2014-10-25 20:31:54 +03:00
Lluís Batlle i Rossell
f3d978be65 cjdns: installing contrib scripts 
I made the nodejs and python scripts have the proper shebang. A lot more
of them could be updated to reference store paths (calls to "python",
etc.)

(cherry picked from commit 2fb382afb6319065f20af22d86774df190beb0d5)
 2014-10-25 15:52:54 +02:00
William A. Kennington III
ce590c3fc7 yubikey-personalization-gui: Add derivation 2014-10-24 16:37:37 -07:00
William A. Kennington III
2910183d5e yubikey-personalization: Add derivation 2014-10-24 16:37:37 -07:00
viric
f75e5330f3 Merge pull request #4658 from ehmry/cjdns 
cjdns: update 20140928 to 20141023
 2014-10-24 23:20:52 +02:00
Emery Hemingway
957602c40c cjdns: update 20140928 to 20141023 2014-10-24 17:15:13 -04:00
Lluís Batlle i Rossell
7da0fecf32 Adding an extra url for nc6. The previous was failing. 2014-10-24 23:14:35 +02:00
Eelco Dolstra
f4be4f5e54 Merge remote-tracking branch 'origin/master' into staging 2014-10-24 12:24:13 +02:00
Edward Tjörnhammar
a5af1c228e Adding fetchurl mirrors for roy marples projects(dhcpcd, openresolv) 2014-10-23 19:45:33 +02:00
cillianderoiste
fd7c18e5cb Merge pull request #4539 from cdepillabout/fctix-configtool 
Added package for fcitx-configtool.
 2014-10-23 19:44:02 +02:00
cillianderoiste
5c6ae9c6d3 Merge pull request #4623 from abbradar/rng-tools 
rng-tools: update package
 2014-10-23 19:35:08 +02:00
Vladimír Čunát
2cf17b0802 Merge recent master into staging 
Hydra nixpkgs: ?compare=1156478
 2014-10-23 17:40:41 +02:00
Shea Levy
2ac3c2e462 nixUnstable: Bump 2014-10-23 09:21:12 -04:00
Mateusz Kowalczyk
342e7748e2 Merge pull request #4624 from abbradar/wipe 
wipe: add package
 2014-10-23 11:50:12 +01:00
Mateusz Kowalczyk
f5c9daf99e Merge pull request #4530 from ts468/simple-tpm 
Add package: simple-tpm-pk11
 2014-10-23 11:47:44 +01:00
Mateusz Kowalczyk
0e840902ff Merge pull request #4629 from ts468/aide 
New package: AIDE, version 0.16a2
 2014-10-23 11:47:22 +01:00
Mateusz Kowalczyk
adb034f299 Merge pull request #4522 from ts468/trustedGrub 
Add package: trustedGrub
 2014-10-23 11:47:05 +01:00
Mateusz Kowalczyk
d5385034be Merge pull request #4508 from ts468/opencryptoki 
Add package: opencryptoki
 2014-10-23 11:46:33 +01:00
Michael Raskin
3bd29ef68f Add dmtx-utils after update broke dmtx command-line use 2014-10-23 08:55:44 +04:00
Thomas Strobel
c89c3649d2 New package: AIDE, version 0.16a2 
Advanced Intrusion Detection Environment (AIDE) is a file and directory integrity checker
 2014-10-23 01:29:14 +02:00
Domen Kožar
efea92de19 fixes #1933 2014-10-23 00:14:09 +02:00
Nikolay Amiantov
0f2af778b7 wipe: add package 2014-10-23 02:08:37 +04:00
Nikolay Amiantov
9fa041e3e6 rng-tools: update package 2014-10-23 02:07:46 +04:00
Aristid Breitkreuz
608aeede89 Merge pull request #4597 from ehmry/cjdns 
Cjdns
 2014-10-22 20:49:20 +02:00
Aristid Breitkreuz
69989eea1b Merge pull request #4615 from abbradar/rpmextract 
rpmextract: accept multiple input files
 2014-10-22 20:48:14 +02:00
Valérian Galliat
1f4456fb5a Add youtube-dl license 2014-10-22 20:35:42 +02:00
aszlig
eea4fce4a5
btrfsprogs: Revert update to version 3.17. 
This reverts commit 249e417677.

Breaks snapper:

http://hydra.nixos.org/build/16420291

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
 2014-10-22 18:12:12 +02:00
Domen Kožar
c01af09401 squashfs: -lgcc_s 2014-10-22 15:06:05 +02:00
Nikolay Amiantov
b580be236c rpmextract: accept multiple input files 2014-10-22 16:53:32 +04:00
Domen Kožar
b3a4c3c2d0 squashfs: 4.3 -> 4.4, hopefully fixes http://hydra.nixos.org/build/16422733 2014-10-22 14:36:56 +02:00
aszlig
57aaf3d36e
Merge branch 'nixpart-1.0-preparations'. 
Partially and temporarily addresses NixOS/nixops#228.

We now have an up-to-date version of Blivet and a bunch of its dependen-
cies as well as the old nixpart 0.4 with all its old and crappy
dependencies, which should fix _simple_ partitioning layouts for NixOps.

Also, nixpart 1.0 is now marked as broken, because it is not yet
released and this branch is more of a preparation and "damage control"
in case I shouldn't manage to finish nixpart + nixos-assimilate in time
for the next NixOS release.
 2014-10-22 08:23:31 +02:00
aszlig
78ef5f9c14
nixpart: Move all 0.4 dependencies into one dir. 
Once nixpart 1.0 is released we then only need to delete one single
directory rather than searching for needles in a haystack, that is, all
of <nixpkgs>. Also, it keeps my sanity at an almost healthy level.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
 2014-10-22 08:22:59 +02:00
aszlig
7676ff5973
nixpart: Bring back requirements for version 0.4. 
Quite a mess but at least the mdraid tests succeed now. However, the
lvm2 tests are still failing, so we need to bring back a few more old
crap :-(

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
 2014-10-22 08:22:58 +02:00
aszlig
16371fce91
nixpart: Bump version to 1.0.0 and mark as broken. 
We don't want Hydra to even try and build this, because we're going to
fill in the right sha256 as soon as the the new nixpart version is
released.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
 2014-10-22 08:22:57 +02:00
aszlig
cb2c34f1bb
blivet: Update to new upstream version 0.67. 
Put a copy of old version 0.17 expression into 0.17.nix and update the
pointers from nixpart0 accordingly.

This also means, that plain nixpart is now way more broken than
nixpart0 (we might want to temporarily fix 0.4 anyway).

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
 2014-10-22 08:22:57 +02:00
aszlig
7deadbb55f
nixpart: Copy package expression to 0.4.nix. 
Update the nixpart0 pointer to point to this version, because we're
going to update blivet as well and NixOps still points to nixpart0.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
 2014-10-22 01:54:48 +02:00
aszlig
34ae3b7f77
parted: Update to new upstream version 3.2. 
In order to properly run tests, we need to fix the unicode tests and
after some search, I have found that Ludo (who is also the <nixpkgs>
maintainer of parted) already reported this upstream and also provided a
solution:

http://lists.gnu.org/archive/html/bug-parted/2014-08/msg00003.html

I'm updating parted to 3.2, because the latest blivet implementation
relies on it for device geometry calculations.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
 2014-10-22 01:54:47 +02:00
koral
03ec2d9477 New package: safe-rm-0.11 2014-10-21 20:19:57 +02:00
Emery Hemingway
70e0577886 update cjdns from 20140922 to 20140928 2014-10-21 13:08:54 -04:00
aszlig
249e417677
btrfsprogs: Update to new upstream version 3.17. 
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
 2014-10-21 18:29:55 +02:00
Michael Raskin
6b727e8d68 Merge pull request #4596 from abbradar/rpmextract 
Add "rpmextract" script and use it
 2014-10-20 22:00:59 +04:00
Eelco Dolstra
d316346d42 Merge pull request #4588 from edwtjo/dhcpcd-update 
dhcpcd: 6.4.7 -> 6.5.1
 2014-10-20 10:52:17 +02:00
(cdep)illabout
35375d0917 Added package for fcitx-configtool. 
This allows fctix to be configured through a GUI.
 2014-10-20 11:35:47 +09:00
Nikolay Amiantov
307af9148b use rpmextract in some packages 2014-10-20 03:16:59 +04:00
Nikolay Amiantov
4dba792a59 rpmextract: add package 2014-10-20 03:16:24 +04:00
Edward Tjörnhammar
3b08861278 dhcpcd: 6.4.7 -> 6.5.1 2014-10-19 08:22:17 +02:00
Michael Raskin
a32e534262 SSL support for cadaver DAV client 2014-10-18 21:47:49 +04:00
Benno Fünfstück
35e4adf64c update gvolicon 2014-10-18 19:18:43 +02:00
Michael Raskin
a95a5ef29f Fix override for patched Wine in pipelight 2014-10-18 19:52:59 +04:00
koral
43292d1ebf Removed useless terminfo wrapping. 
Users should manually set the TERMINFO environment variable.
 2014-10-18 16:04:34 +02:00
Vladimír Čunát
b5ea865f35 texLive-linkdir: work around a failure 
It often failed since 3c6efec2c0, i.e. #4453.
Now it should "work" the same as before.

CC @7c6f434c, maybe?
 2014-10-18 13:52:37 +02:00
Shea Levy
eff15260d4 nixUnstable: bump 
Some memory and speed improvements
 2014-10-17 21:56:13 -04:00
William A. Kennington III
061cbc40f6 radvd: 2.7 -> 2.8 2014-10-17 16:56:35 -07:00
Michael Raskin
6909944827 Remove failing steps from pipelight build 2014-10-18 00:14:51 +04:00
Michael Raskin
eee6f5a004 Adding Pipelight via patch from Sven Keidel and some cleanup 2014-10-18 00:14:51 +04:00
aszlig
08d2f3340d
xdotool: Update to upstream version 2.20110530.1. 
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
 2014-10-17 09:14:34 +02:00
Eelco Dolstra
09dc132e04 Merge remote-tracking branch 'origin/master' into staging 
Conflicts:
	pkgs/development/libraries/poppler/default.nix
 2014-10-16 15:16:50 +02:00
Domen Kožar
d704fb3b36 fix mpdcron 2014-10-16 11:03:10 +02:00
Pascal Wittmann
1eea99016e logstalgia: update from 1.0.5 to 1.0.6 2014-10-16 09:06:20 +02:00
Rickard Nilsson
6960149b03 New package: runit 2.1.2 2014-10-15 13:08:22 +02:00
Thomas Strobel
49fd0c32ff Add package: simple-tpm-pk11 
Simple PKCS11 provider for TPM chips
 2014-10-15 01:14:34 +02:00
Peter Simons
06445b309e cabal-install: jailbreak version 1.16.0.2 to build with random 1.x 2014-10-14 17:39:35 +02:00
Peter Simons
e53b2ba9b2 cabal-install: jailbreak version 1.18.0.3 to accept random 1.x 2014-10-14 17:39:33 +02:00
Peter Simons
919da91d13 cabal-install: jailbreak version 1.20.0.3 to fix build with latest version of 'random' and override 'network' to the old 2.5 version 2014-10-14 17:39:31 +02:00
Thomas Strobel
596c9f54dc Add trustedGrub package. 2014-10-14 16:02:48 +02:00
Shea Levy
b5fe0d32b6 Merge branch 'strongswan-charon-cmd' of github.com:ftrvxmtrx/nixpkgs 
strongswan: enable charon-cmd
 2014-10-14 09:54:28 -04:00
Jascha Geerds
e6ec404b0b Update plasma-nm 2014-10-14 13:17:55 +02:00
Pascal Wittmann
249f9eee56 Merge pull request #4510 from ts468/trousers 
Update: trousers 0.3.11 -> 0.3.13
 2014-10-14 12:44:11 +02:00
Siarhei Zirukin
8799219f1e strongswan: enable charon-cmd 2014-10-14 10:02:02 +02:00
Thomas Strobel
d206122ade Add package: opencryptoki 
Make tpm-tools depend on opencryptoki as well.
 2014-10-14 09:03:50 +02:00
Thomas Strobel
0dd66a50de Update: trousers 0.3.11 -> 0.3.13 2014-10-14 09:00:31 +02:00
John Wiegley
436cdb7e87 texlive: add jwiegley as a maintainer 2014-10-13 17:59:05 -05:00
John Wiegley
6dfb01d6e0 Merge pull request #4507 from geerds/texlive 
texlive: Update to latest release 2014.20140927
 2014-10-13 17:58:01 -05:00
Mateusz Kowalczyk
b9c2fe5fd8 Merge pull request #4400 from matejc/seeksservice 
seeks: update and write nixos module
 2014-10-13 21:37:11 +01:00
Jascha Geerds
22c9903e0e texlive: Updated to latest release 2014.20140927 2014-10-13 21:21:23 +02:00
Michael Raskin
53a5b67d5e Adding mailsend tool 2014-10-13 18:18:34 +04:00
Peter Simons
fb30eb932b thc-hydra: fix download url 2014-10-13 15:58:27 +02:00
Matej Cotman
76a7b0ba68 seeks: upgrade and add optional seeks_confDir 2014-10-13 13:10:49 +02:00
Jaka Hudoklin
dd0758ab6b Merge pull request #4392 from cstrahan/logstash 
logstash service improvements
 2014-10-12 23:02:52 +02:00
Peter Simons
1658c545d4 Merge pull request #4502 from grwlf/screen-256color 
screen: enable 256 colors
 2014-10-12 21:45:58 +02:00
Sergey Mironov
efcb363ea9 screen: enable 256 colors 2014-10-12 20:47:47 +04:00
Peter Simons
525a850511 thc-hydra: don't call this package "hydra"; that name is taken in NixOS 2014-10-12 17:34:49 +02:00
Longrin Wischnewski
6e7de2155b change md5sum to sha256sum for a few packages 2014-10-12 16:13:21 +02:00
Mateusz Kowalczyk
b0258a5d17 Merge pull request #4462 from VShell/discount 
discount: new package
 2014-10-12 12:37:50 +01:00