Patrick Mahoney
a6f35b3e60
connect 1.104
...
Upstream moved to https://bitbucket.org/gotoh/connect
2014-12-23 09:07:39 -06:00
Peter Simons
4bb1e611a2
Merge pull request #5440 from ip1981/strongswan
...
Patches to Strongswan
2014-12-23 13:02:08 +01:00
Domen Kožar
d2e6891be9
trash-cli: assert we're on linux
2014-12-23 11:30:56 +01:00
Domen Kožar
168f541724
Merge pull request #5442 from rycee/package/trash-cli
...
Add package 'trash-cli'.
2014-12-23 11:17:41 +01:00
Robert Helgesson
b017231a21
Add package 'trash-cli'.
2014-12-23 10:22:37 +01:00
Igor Pashev
17d8029150
Strongswan: preserve PATH
2014-12-22 20:20:58 +00:00
Igor Pashev
9bbe674927
Strongswan: use full path to ipsec
...
This fixes issue:
... charon[6135]: 11[CHD] updown: /bin/sh: ipsec: command not found
2014-12-22 20:20:15 +00:00
Pascal Wittmann
389f745efb
Merge pull request #5429 from joachifm/fix-attic-checksum
...
attic: fix sha256
2014-12-22 19:03:24 +01:00
Joachim Fasting
bee4a4e5dc
attic: fix sha256
2014-12-22 05:11:58 +01:00
Michael Raskin
77436079e9
Pipelight: 0.2.7.3 → 0.2.8, also update Wine
2014-12-21 20:19:33 +03:00
Michael Raskin
ed19e6755f
ZPAQ: 655 → 660
2014-12-21 11:14:26 +03:00
Michael Raskin
641307f553
Drop wrong default.upstream
2014-12-21 11:14:25 +03:00
Michael Raskin
13fbe8150a
GlusterFS; 3.6.0 → 3.6.1
2014-12-21 11:14:25 +03:00
Michael Raskin
32160007ff
FreeIPMI: 1.4.6 → 1.4.7
2014-12-21 11:14:25 +03:00
Pascal Wittmann
f94580da69
Fix license attribute of many bsd-like licensed packages
2014-12-21 00:00:35 +01:00
Pascal Wittmann
f55545c0c9
fix maintainer information
...
s/maintainer/maintainers
2014-12-20 21:54:22 +01:00
Arseniy Seroka
c08149c6a4
Merge pull request #5384 from ts468/glusterfs
...
FIX: Change local state dir
2014-12-20 02:09:08 +03:00
Pascal Wittmann
bc19ef9efe
bfr: update source url, fix build and adopt it
2014-12-19 23:17:07 +01:00
Pascal Wittmann
197ea06a73
axel: add meta-information
2014-12-19 22:57:38 +01:00
Kovacsics Robert (rmk35)
caa521c8d2
Updated remind package name (otherwise unchanged).
...
Also added myself to the maintainers list.
2014-12-19 16:44:00 +00:00
Vincent Laporte
5191d694c2
timidity: update from 2.13.0 to 2.14.0
2014-12-19 11:29:54 +01:00
lethalman
6c5f112bd5
Merge pull request #5377 from wjlroe/logstash-forwarder-20141216-update
...
Bump logstash-forwarder git version and GoLang to latest
2014-12-19 10:24:57 +01:00
lethalman
70bede51a2
Merge pull request #5370 from KoviRobi/master
...
Added package 'fatsort'.
2014-12-19 10:23:13 +01:00
Bjørn Forsman
4b65f53652
gdmap: set meta attributes (license, platforms, maintainers)
2014-12-19 08:01:08 +01:00
Peter Simons
c9a2bbdf65
cabal-install-1.20.0.4: patch the build manually instead of relying on jailbreak
...
jailbreak-cabal has trouble with that cabal file when built with older versions
of the Cabal library.
2014-12-19 07:45:11 +01:00
Evgeny Egorochkin
26fc2c4988
youtube-dl: update from 2014.12.16 to 2014.12.17.2
2014-12-19 08:35:01 +02:00
Evgeny Egorochkin
4bf9039abf
privoxy: update from 3.0.21 to 3.0.22
2014-12-19 08:34:32 +02:00
William A. Kennington III
86971fd33b
gnupg: Fix src hash
2014-12-18 11:37:58 -08:00
Peter Simons
fa165e137d
cabal-install: update to version 1.20.0.4
...
The test suite had to be disabled because of https://github.com/haskell/cabal/issues/2285 .
2014-12-18 18:36:49 +01:00
Eelco Dolstra
011e581a4e
dhcpcd: Update to 6.6.6
2014-12-18 14:11:10 +01:00
Eelco Dolstra
5274749b7b
less: Update to 471
2014-12-18 14:11:10 +01:00
Vladimír Čunát
ec5e916f6f
attic: add maintainer and platforms
...
CC #5374 .
2014-12-18 13:36:35 +01:00
Eelco Dolstra
6866712a39
sudo: Update to 1.8.11p2
2014-12-18 12:31:56 +01:00
Thomas Strobel
d07154b3bc
FIX: Change local state dir, which must be writable, from "/nix/store/...glusterfs..." to "/var"
2014-12-18 11:20:03 +01:00
vbgl
78ae54bf49
Merge pull request #5375 from ftrvxmtrx/master
...
plan9port: fix destination path in sources; add myself as a maintainer
2014-12-18 09:52:59 +01:00
Bjørn Forsman
1fde0738ca
attic: fix missing modules at runtime
...
Switch buildInputs to propagatedBuildInputs. Without this attic won't
run at all.
2014-12-18 08:40:20 +01:00
Wayne Scott
4a0aff5f3b
attic: upgrade to 0.14
2014-12-18 08:21:36 +01:00
Bjørn Forsman
a8af7f16ce
attic: expression cleanup
...
Clean up some whitespace errors and add namePrefix = "" to make package
name like attribute name (no pythonX.Y- prefix).
2014-12-18 08:14:52 +01:00
Wayne Scott
110333abd3
attic: fix path to OPENSSL headers.
2014-12-18 08:12:12 +01:00
Siarhei Zirukin
2c8ff5fdb7
plan9port: fix destination path in sources; add myself as a maintainer
2014-12-17 23:37:18 +01:00
William Roe
fe4da34ffd
Bump logstash-forwarder git version and go to latest
2014-12-17 20:50:23 +00:00
Kovacsics Robert (rmk35)
6f608967f4
Added package 'fatsort'.
...
Fatsort sorts partition table on FAT12/16/32 partitions for devices that
don't sort the files for themselves (e.g. some media players).
2014-12-17 13:54:13 +00:00
wmertens
2fb69f5277
Merge pull request #5196 from madjar/cloud-init
...
cloud-init: add expression and service
2014-12-17 06:58:54 +01:00
Domen Kožar
9de5eb6ade
remove btrfsProgs-3_16, not needed anymore
2014-12-17 01:20:05 +01:00
William A. Kennington III
973f4bedbf
bareos: 14.2.1 -> 14.2.2
2014-12-16 15:53:12 -08:00
William A. Kennington III
56908ab49f
pinentry: 0.8.4 -> 0.9.0
2014-12-16 15:30:16 -08:00
William A. Kennington III
b671a46f92
gnupg: 2.1.0 -> 2.1.1
2014-12-16 15:24:28 -08:00
William A. Kennington III
02f75f91f1
xfsprogs: 3.2.1 -> 3.2.2
2014-12-16 15:22:53 -08:00
William A. Kennington III
0cfd61bdea
btrfs-progs: 3.17.2 -> 3.17.3
2014-12-16 14:25:27 -08:00
William A. Kennington III
1368e94ae2
tinc: Update pre 1.1
2014-12-16 13:54:44 -08:00
William A. Kennington III
cbe467ef99
ceph: 0.89 -> 0.90-pre
2014-12-16 11:44:08 -08:00
Mateusz Kowalczyk
51ca7fdf0b
youtube-dl: update to 2014.12.16
2014-12-16 07:01:49 +00:00
Wayne Scott
6dc9ea2a2c
Package attic-backup.org
2014-12-15 17:00:10 -05:00
Eelco Dolstra
997531d172
Document screen incompatibility
2014-12-15 19:55:37 +01:00
lethalman
8ad61fcb10
Merge pull request #5327 from k0ral/moreutils
...
New package: moreutils-0.54
2014-12-14 13:33:11 +01:00
koral
421b3ebe25
New package: moreutils-0.54
2014-12-14 12:49:07 +01:00
Arseniy Seroka
60d3660f71
Merge pull request #5324 from prikhi/add-wyrd
...
Add the Wyrd Front-End for Remind
2014-12-14 13:31:46 +03:00
Eelco Dolstra
bd0d1e836c
nix-repl: Update
2014-12-14 05:29:32 +01:00
Eelco Dolstra
e115bdecd8
nix: Update to 1.8
2014-12-14 05:29:24 +01:00
Pavan Rikhi
62b98c458d
Add the Wyrd Front-End for Remind
2014-12-13 20:23:09 -05:00
Eelco Dolstra
188c038897
Add nix-serve
2014-12-14 02:19:54 +01:00
Pascal Wittmann
1f0fdd7c28
added tmsu, a tool for tagging your files
2014-12-13 23:50:49 +01:00
Pavan Rikhi
0df1c05f71
Add the Profile Sync Daemon Package & NixOS Module
2014-12-13 09:24:12 -05:00
tv
86055e2f00
nixopsUnstable: Initial version 1.3pre1362_2a616f8
2014-12-12 16:30:54 +01:00
Oliver Charles
40bbc1806a
opentsdb: Use the release tarball
...
Now that https://github.com/OpenTSDB/opentsdb/issues/420 is resolved
we can use the official release tarball. This includes all third
party JARs, which vastly simplifies the build expression.
2014-12-12 12:43:15 +00:00
Mateusz Kowalczyk
4fcb615498
youtube-dl: update to 2014.12.12.1
2014-12-12 03:09:02 +00:00
Jaka Hudoklin
1465d9321d
thc-hydra: include postgresql brute-force support
2014-12-11 23:25:26 +01:00
Jaka Hudoklin
3ceb789c36
john: use systemd wide config, and not from store
2014-12-11 23:25:26 +01:00
Domen Kožar
3dc551fcc3
opentsdb: patch shebangs in correct directory
...
(cherry picked from commit 105b77f36f1810287b0f32036ae5303dae8c5a66)
Signed-off-by: Domen Kožar <domen@dev.si>
2014-12-11 09:17:45 +01:00
Mateusz Kowalczyk
3d713ff1d6
youtube-dl: update from 2014.12.06.1 to 2014.12.10.3
2014-12-10 23:22:24 +00:00
Vladimír Čunát
225ddcda9a
cpio: fix CVE-2014-9112 by Fedora patch
2014-12-10 19:20:28 +01:00
Austin Seipp
5c52382448
tor-arm: kill tabs
...
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2014-12-10 04:21:14 -06:00
Austin Seipp
7a51e5f416
nixpkgs: fix tor-arm dependencies
...
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2014-12-10 04:14:11 -06:00
Austin Seipp
0d63eae992
tor-arm: Fix python path
...
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2014-12-10 04:06:02 -06:00
Austin Seipp
b31283dd8b
nixpkgs: add tor-arm 1.4.5.0
...
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2014-12-10 03:59:59 -06:00
Domen Kožar
0ec12d53e6
tcpcrypt: 2011.07.22 -> 0.3rc1, fix nixos service
2014-12-10 10:23:46 +01:00
Mateusz Kowalczyk
ddcb9db54f
youtube-dl: update to 2014.12.06.1
...
Also add self to maintainers considering I bump it pretty often already.
2014-12-10 09:15:59 +00:00
Austin Seipp
323113ef6d
nixpkgs: afl 0.85b -> 0.89b
...
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2014-12-09 21:59:28 -06:00
wmertens
24924e4fdf
Merge pull request #5125 from nckx/eid-mw
...
Add eid-mw: authenticate & sign with Belgian eID identity cards
2014-12-08 16:40:54 +01:00
Domen Kožar
de99c9c955
Merge branch 'staging'
2014-12-08 16:28:45 +01:00
Jaka Hudoklin
51fe9d17a8
Merge pull request #5261 from matejc/connman126
...
connman: update to 1.26
2014-12-08 13:01:12 +01:00
Jaka Hudoklin
d4cb3056ec
Merge pull request #5262 from matejc/cmst20141205
...
cmst: update to 2014.12.05
2014-12-08 13:01:02 +01:00
Matej Cotman
4b74502a35
cmst: update to 2014.12.05
2014-12-08 12:49:28 +01:00
Matej Cotman
94f8f28433
connman: update to 1.26
2014-12-08 12:47:00 +01:00
Edward Tjörnhammar
3ce89ba002
srm: added package
2014-12-08 11:51:39 +01:00
Domen Kožar
4aa3eec330
Merge branch 'master' into staging
...
Conflicts:
pkgs/development/libraries/fontconfig/default.nix
2014-12-07 14:02:48 +01:00
Richard Wallace
b00f6cde88
wrap pasystray to provide XDG_DATA_DIRS so tray icon displays correctly
2014-12-06 15:50:26 -07:00
cillianderoiste
4687494b7c
Merge pull request #5245 from ftrvxmtrx/plan9port
...
plan9port: make it actually work
2014-12-06 15:46:59 +00:00
Siarhei Zirukin
60f2081019
plan9port: make it actually work
...
* Add "which" dependency, otherwise it builds with lots of
"command not found" errors.
* -lgcc_s, otherwise many commands basically fail without pthread_cancel.
* Fix X11 dependencies, otherwise it would be plan9port with none of UI
programs working.
2014-12-06 16:18:30 +01:00
Bjørn Forsman
32da2ba923
plantuml: update from 7991 to 8012
2014-12-06 16:13:15 +01:00
Austin Seipp
c3bdbd3b52
nixpkgs: tor-browser 4.0.1 -> 4.0.2
...
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2014-12-06 05:01:28 -06:00
Austin Seipp
92eb86e110
nixpkgs: add myself as a 'tor' maintainer
...
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2014-12-06 05:01:27 -06:00
Austin Seipp
c206c728a8
nixpkgs: tor depends on torsocks
...
This may seem strange, but tor distributes its 'torify' wrapper which in
turn attempts to use torsocks to bridge a connection, meaning 'tor'
users out the box may want it to work.
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2014-12-06 05:00:27 -06:00
Austin Seipp
d92d0eca92
nixpkgs: torsocks 1.3 -> 2.0.0
...
Additionally, this fixes 'torsocks' using the 'which' executable as a
dependency.
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2014-12-06 05:00:26 -06:00
Pascal Wittmann
47eabfabe2
Merge pull request #5239 from robberer/pkgs/mrtg
...
mrtg: add 2.17.4
2014-12-06 10:58:53 +01:00
Longrin Wischnewski
cf4318ad4e
mrtg: add 2.17.4
...
- The Multi Router Traffic Grapher
- You have a router, you want to know what it does all day long?
- Then MRTG is for you. It will monitor SNMP network devices and draw
- pretty pictures showing how much traffic has passed through each interface.
2014-12-06 09:05:29 +01:00
Tobias Geerinckx-Rice
51ccf09ba2
Add duff: find duplicate files from the command line
2014-12-06 00:10:08 +01:00
Tobias Geerinckx-Rice
b7425f8fef
Add eid-mw: authenticate & sign with Belgian eID identity cards
2014-12-05 23:15:44 +01:00
Rok Garbas
24848992bc
goaccess: update to 0.8.5
2014-12-05 11:30:25 +01:00
Charles Strahan
aadb556e29
lastpass-cli: new package
...
This adds the official lastpass CLI, a utility for manipulating lastpass logins.
2014-12-04 18:23:25 -05:00
William A. Kennington III
d2a2c77643
ceph: 0.88 -> 0.89
2014-12-04 15:17:58 -08:00
Pascal Wittmann
00444ab724
logstalgia: fix build with new glm version
2014-12-04 14:31:28 +01:00
Luca Bruno
51992d82a1
Merge "Ipxe" PR #5208
...
Fixed some indentation issues
2014-12-04 12:04:08 +01:00
Emery Hemingway
3faacca044
nixpkgs: iPXE initial package
2014-12-04 11:03:56 +01:00
Shea Levy
fcaf268d54
nixUnstable: bump
2014-12-03 22:22:18 -05:00
Austin Seipp
25d883a46d
nixpkgs: afl 0.79b -> 0.85b
...
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2014-12-03 18:53:20 -06:00
Rob Vermaas
6ae8983a5e
Update dd-agent to 4.4.0
2014-12-03 16:08:39 +01:00
Peter Simons
79486d44c0
tree: don't rely on $CC being set in the stdenv build environment
...
Fixes https://github.com/NixOS/nixpkgs/issues/5214 .
2014-12-03 16:00:41 +01:00
Bjørn Forsman
3ba01941ce
duply: update 1.7.3 -> 1.9.1
2014-12-02 22:56:44 +01:00
Bjørn Forsman
998e6153be
duplicity: update 0.6.24 -> 0.6.25 (latest stable)
2014-12-02 22:56:44 +01:00
Thomas Tuegel
02157ab123
libcurl: honor $SSL_CERT_FILE (fixed)
...
The previous attempt to patch libcurl used
getenv("CURL_CA_BUNDLE") || getenv("SSL_CERT_FILE")
to get the second environment variable if the first is unset.
Unfortunately, this broke libcurl because the (||) operator is C returns
only 0 or 1, so it is inappropriate for pointer comparisons! Now we use
getenv("CURL_CA_BUNDLE") ? getenv("CURL_CA_BUNDLE") : getenv("SSL_CERT_FILE")
instead. This has one downside: it always calls getenv twice! But,
that's a small price to pay for actually being correct.
2014-12-02 10:41:24 -06:00
Domen Kožar
f57d22fd05
openvpn: fix build
2014-12-02 15:30:25 +01:00
Domen Kožar
cc0d52846e
openvpn: 2.3.4 -> 2.3.6 (CVE-2014-8104)
2014-12-02 13:11:37 +01:00
lethalman
9bce8d2ef2
Merge pull request #5190 from deepfire/debootstrap-version-fix
...
debootstrap | 404-fix: -> 1.0.64, since 1.0.63 disappeared from archive
2014-12-02 10:59:14 +01:00
Domen Kožar
a2acbc230a
Merge pull request #5191 from AndersonTorres/megatools
...
Megatools: update to 1.9.93
2014-12-01 22:03:34 +01:00
Moritz Ulrich
77049af46f
pngcheck: New package.
2014-12-01 17:05:20 +01:00
Georges Dubus
1c3a9336ed
Packaged cloud-init and its dependencies
2014-12-01 10:55:45 +01:00
Austin Seipp
8f6279be5c
afl: 0.68b -> 0.79b
...
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2014-11-30 13:19:26 -06:00
AndersonTorres
3af34aa2b1
Megatools: update to 1.9.93
2014-11-30 12:07:44 -02:00
Kosyrev Serge
ae72e5ba8f
debootstrap | 404-fix: -> 1.0.64, since 1.0.63 disappeared from archive
2014-11-30 16:51:42 +03:00
Arseniy Seroka
5b8fb2239c
Merge pull request #5188 from DamienCassou/umlet
...
New package for Umlet 13.1
2014-11-30 15:30:03 +03:00
Damien Cassou
dcc2f1ac38
New package for Umlet 13.1
2014-11-30 12:56:08 +01:00
Corey O'Connor
b2f3e10a35
Add primus and extend bumblebee to support 32bit/64bit multilib architectures.
...
Using primusrun will work as expected in a multilib environment. Even if the initial program
executes a antoehr program of the another architecture. Assuming the program does not modify
LD_LIBRARY_PATH inappropriately.
This does not update virtualgl for seemless multilib. I was unable to get a mixed 64/32 bit
environment to work with VirtualGL. The mechanism VirtualGL uses to inject the fake GL library would
fail if both 32bit and 64 bit libraries were in the environment. Instead the bumblebee package
creates a optirun32 executable that can be used to run a 32bit executable with optimus on a 64 bit
host. This is not created if the host is 32bit.
For my usage, gaming under wine, the primusrun executable works as expected regardless of
32bit/64bit.
2014-11-29 16:42:00 -08:00
Jaka Hudoklin
31ebe4d89d
Merge pull request #5181 from grwlf/plowshare
...
plowshare: version bump
2014-11-29 21:57:05 +01:00
Sergey Mironov
2e95f697fb
plowshare: version bump
...
fixes games/adom downloader
2014-11-29 23:39:33 +03:00
Jaka Hudoklin
88d4ae98ae
Merge pull request #5168 from pmahoney/skarnet-refactor
...
Skarnet refactor
2014-11-29 02:48:06 +01:00
Ricardo M. Correia
d4b4bae307
Update my maintainership
2014-11-29 02:15:39 +01:00
Patrick Mahoney
cf5f282940
Consolidate conf-compile steps for skarnet.org pkgs.
2014-11-28 13:10:37 -06:00
Vladimír Čunát
cbd2305d4d
Merge branch 'master' into staging
2014-11-28 18:59:07 +01:00
Vladimír Čunát
06c6d4696d
*: fix builds by disregarding warning from new glibc
...
Also, in case of collectd, the -lgcc_s shouldn't be needed anymore,
as the library is in ${glibc}/lib/ now, which is practically always on RPATH.
In case of seyren it was some stdenv change uncovering the mistake of
putting src into buildInputs.
2014-11-28 18:42:03 +01:00
Pascal Wittmann
4261ab39a8
nzbget: update from 14.0 to 14.1
2014-11-28 11:08:12 +01:00
cillianderoiste
d2a1867a20
Merge pull request #5157 from magnetophon/sselp
...
sselp prints X selection to standard out
2014-11-28 09:33:44 +00:00
Mateusz Kowalczyk
456312a5fc
youtube-dl: update to 2014.11.27
2014-11-28 02:31:01 +00:00
Michael Raskin
0fc32b90d8
Add qrcode minimalistic QR-code decode/encode tool (for pure codes only)
2014-11-28 00:12:26 +03:00
Michael Raskin
9ef9544189
Adding quirc QR code decoder
2014-11-28 00:12:26 +03:00
Bart Brouns
647617885d
added platforms and maintainers
2014-11-27 21:30:36 +01:00
Bart Brouns
b7f51920ee
sselp prints X selection to standard out
2014-11-27 21:06:24 +01:00
Wout Mertens
cacf3f6c1e
Merge branch 'curl-ssl-cert-file' of https://github.com/the-kenny/nixpkgs into staging
...
Standardize NixOS on using only SSL_CERT_FILE for the trusted SSL certificate store.
2014-11-27 13:29:50 +01:00
Oliver Charles
1132484200
opentsdb: Use fetchurl to fetch all dependencies
2014-11-27 12:06:01 +00:00
Domen Kožar
34ca304f58
network-manager: 0.9.8.8 -> 0.9.8.10
2014-11-27 12:10:20 +01:00
Domen Kožar
91bdca38a0
NetworkManager.service -> network-manager.service
2014-11-27 12:10:20 +01:00
Vladimír Čunát
abcb355453
restund, openssh_hpn: mark as broken
2014-11-27 01:19:24 +01:00
William A. Kennington III
021efdf021
yubico-piv-tool: 0.1.0 -> 0.1.2
2014-11-26 15:50:15 -08:00
William A. Kennington III
e1988740a5
yubikey-personalization: 1.16.0 -> 1.16.1
2014-11-26 15:47:43 -08:00
William A. Kennington III
17a1b67cb6
btrfsprogs: 3.17.1 -> 3.17.2
2014-11-26 15:47:43 -08:00
Vladimír Čunát
bdc323c540
opentsdb: mark as broken
...
It tries to download things and fails. CC @ocharles.
2014-11-27 00:45:47 +01:00
Vladimír Čunát
a68c1adc35
*: fix builds by disregarding warning from new glibc
...
Says: #warning "_BSD_SOURCE and _SVID_SOURCE are deprecated, use _DEFAULT_SOURCE"
CC: #4803 . There will likely appear more of these errors on Hydra in time.
2014-11-26 23:40:03 +01:00
muflax
dc9f084278
parcellite: 1.1.7 -> 1.1.9
2014-11-26 21:23:17 +00:00
Vladimír Čunát
b5ff06eda4
Merge branch 'master' into staging
2014-11-26 21:48:26 +01:00
Domen Kožar
f45b6fb078
fix tarball job
2014-11-26 21:04:59 +01:00