jolheiser/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
93,713 Commits 266 Branches 122 Tags 5.3 GiB
6351c4d24b
Commit Graph

666 Commits

Author SHA1 Message Date
Franz Pletz
aff1f4ab94 Use general hardening flag toggle lists 
The following parameters are now available:

  * hardeningDisable
    To disable specific hardening flags
  * hardeningEnable
    To enable specific hardening flags

Only the cc-wrapper supports this right now, but these may be reused by
other wrappers, builders or setup hooks.

cc-wrapper supports the following flags:

  * fortify
  * stackprotector
  * pie (disabled by default)
  * pic
  * strictoverflow
  * format
  * relro
  * bindnow
 2016-03-05 18:55:26 +01:00
Valérian Galliat
269d0864b5 nix-prefetch-scripts: explicitly depend on Nix 
Otherwise, a call to, for example, nix-prefetch-git, in a nix-shell --pure or
nix-build phase would result in an error such as:

    Switched to a new branch 'fetchgit'
    removing `.git'...
    /nix/store/7qvjji7kbd033nsyxlpiiiam61a44yz9-nix-prefetch-git/bin/.nix-prefetch-git-wrapped: line 374: nix-hash: command not found
 2016-02-29 18:38:59 -05:00
Robin Gloster
3477e662e6 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-02-27 00:08:08 +00:00
Robin Gloster
ea84b3a915 clib: turn off fortify hardening 2016-02-19 21:15:59 +00:00
Frederik Rietdijk
4d06bf70f4 buildPythonApplication: use new function for Python applications 2016-02-19 13:16:41 +01:00
Franz Pletz
41698c9efa Merge branch 'master' into hardened-stdenv 2016-02-15 20:05:29 +01:00
Vladimír Čunát
d039c87984 Merge branch 'master' into closure-size 2016-02-14 08:33:51 +01:00
Eelco Dolstra
e674356c46 nix: Fix indentation 2016-02-12 16:10:59 +01:00
Eelco Dolstra
aa31d99d29 nix: 1.11.1 -> 1.11.2 2016-02-12 15:20:27 +01:00
Robin Gloster
6be9164b97 checkinstall: turn off fortify 2016-02-09 01:03:24 +00:00
Vladimír Čunát
ae74c356d9 Merge recent 'staging' into closure-size 
Let's get rid of those merge conflicts.
 2016-02-03 16:57:19 +01:00
Sander van der Burg
a6bda1a62a disnix: bump to version 0.5 2016-01-27 22:32:34 +00:00
Eelco Dolstra
42e53ba62c nix: 1.10 -> 1.11.1 2016-01-26 17:00:15 +01:00
Tobias Geerinckx-Rice
9fb8020e4e Add version attribute where maintainers |= nckx 
This will probably be mandatory soon, and is a step in the right
direction. Removes the deprecated meta.version, and move some meta
sections to the end of the file where I should have put them in
the first place.
 2016-01-25 17:35:21 +01:00
Rob Vermaas
ce2756f701 Fix nixops URL 2016-01-19 10:00:32 +00:00
Vladimír Čunát
716aac2519 Merge branch 'staging' into closure-size 2016-01-19 09:55:31 +01:00
Tobias Geerinckx-Rice
33e2c9c29a dpkg: 1.18.2 -> 1.18.4 2016-01-19 02:04:18 +01:00
Eelco Dolstra
320f1b4e3c nix: 1.11pre4345_b8258a4 -> 1.11pre4379_786046c 2016-01-14 13:20:49 +01:00
Vladimír Čunát
f9f6f41bff Merge branch 'master' into closure-size 
TODO: there was more significant refactoring of qtbase and plasma 5.5
on master, and I'm deferring pointing to correct outputs to later.
 2015-12-31 09:53:02 +01:00
Eelco Dolstra
63bf2a551e nixUnstable: 1.11pre4334_7431932 -> 1.11pre4345_b8258a4 2015-12-29 17:54:58 +01:00
Domen Kožar
688ff0c0dc Merge pull request #11992 from dezgeg/pr-update-diffoscope 
diffoscope: 29 -> 44
 2015-12-28 07:46:12 +01:00
Tuomas Tynkkynen
c0aada1e1f rpm: Hack fix finding libpython when compiling for Python 3 
Currently, building RPM with `python = python3` causes this:

checking for a Python interpreter with version >= 2.6... python3
checking for python3... /nix/store/dykqxnrwiz9drlcv2wy8lpvl3xvklx0g-python3-3.4.3/bin/python3
checking for python3 version... 3.4
checking for Python.h... yes
checking for library containing Py_Main... no
configure: error: missing python library

That comes from this snippet in configure.ac:
    AC_SEARCH_LIBS([Py_Main],[python${PYTHON_VERSION} python],[
      WITH_PYTHON_LIB="$ac_res"
    ],[AC_MSG_ERROR([missing python library])
    ])

So it's looking for (e.g) `libpython3.4.so` wheras we have `libpython3.4m.so`.
Patching the configure script to match seems to make that work (although
I don't really understand what the heck is this 'm' business about).
 2015-12-28 02:16:23 +02:00
Domen Kožar
0e4e01c7a6 add back nixopsUnstable 2015-12-18 18:51:12 +01:00
Luca Bruno
5b0352a6a4 Merge branch 'master' into closure-size 2015-12-11 18:31:00 +01:00
Eelco Dolstra
2de76b2753 nixUnstable: 1.11pre4273_71039be -> 1.11pre4334_7431932 2015-12-10 15:25:48 +01:00
Pascal Wittmann
fbcf7fcd33 opkg: 0.3.0 -> 0.3.1 2015-12-08 22:54:03 +01:00
Tuomas Tynkkynen
c47910ae4e nix-prefetch-scripts: Split into multiple derivations 
This makes it possible to e.g. only install nix-prefetch-git and not the
others.

Closes #7399.
 2015-12-04 14:38:41 +02:00
Luca Bruno
920b1d3591 Merge branch 'master' into closure-size 2015-11-29 16:50:26 +01:00
Tobias Geerinckx-Rice
2798b02ad0 Convert some *Flags from strings to lists 2015-11-26 23:45:31 +01:00
Luca Bruno
a412927924 Merge remote-tracking branch 'origin/master' into closure-size 2015-11-25 21:37:30 +01:00
Tobias Geerinckx-Rice
5e63a0b51a packagekit: fix typo urmpi -> urpmi 2015-11-24 01:40:41 +01:00
Tobias Geerinckx-Rice
8a222f6844 packagekit: convert configureFlags string -> list 2015-11-24 01:40:41 +01:00
Vladimír Čunát
333d69a5f0 Merge staging into closure-size 
The most complex problems were from dealing with switches reverted in
the meantime (gcc5, gmp6, ncurses6).
It's likely that darwin is (still) broken nontrivially.
 2015-11-20 14:32:58 +01:00
Matej Cotman
5f5fd03a71 nixui: upgrade to 0.2.1 2015-11-17 12:28:22 +01:00
zimbatm
76bf9c54ea nix-prefetch-git: add missing coreutils dependency 
At runtime, `readlink` is a dependency
 2015-11-16 11:54:43 +01:00
Eelco Dolstra
58f9896a43 nixUnstable: Update to 1.11pre4273_71039be 2015-10-31 00:22:32 +01:00
Eelco Dolstra
d9d5c98c56 Add option environment.enableDebugInfo 
This makes the debug outputs of packages that have them available to
programs like gdb.
 2015-10-30 15:21:16 +01:00
Tuomas Tynkkynen
c471cb866f subversion: Split into multiple outputs 2015-10-28 10:22:59 +01:00
Tuomas Tynkkynen
bff9b546e4 nix-prefetch-scripts: Reference correct output of curl 2015-10-28 10:17:12 +01:00
Sander van der Burg
644dd145c9 dysnomia: bump to version 0.4.1 2015-10-24 18:23:47 +00:00
Vladimír Čunát
ba9b80c7e0 nspr,nss: split into multiple outputs 
Hopefully most references are OK.
 2015-10-13 20:18:44 +02:00
Eelco Dolstra
1286435499 nixUnstable: Update to 1.11pre4244_133a421 2015-10-09 14:44:27 +02:00
Eelco Dolstra
24483ebe47 nixUnstable: Update to 1.11pre4243_2075ec8 2015-10-08 15:57:29 +02:00
Vladimír Čunát
5227fb1dd5 Merge commit staging+systemd into closure-size 
Many non-conflict problems weren't (fully) resolved in this commit yet.
 2015-10-03 13:33:37 +02:00
Arseniy Seroka
f34aedfbd7 Merge pull request #10161 from dezgeg/pr-update-rpm 
rpm: 4.11.2 -> 4.12.0
 2015-10-01 14:20:43 +03:00
Tuomas Tynkkynen
aa6076f9f5 rpm: 4.11.2 -> 4.12.0 2015-10-01 00:42:36 +03:00
Rob Vermaas
df9fc0f8e0 Remove nixops unstable expression, until we reintroduce it again. Currently it is not referenced, as nixopsUnstable = nixops. 2015-09-30 12:49:11 +00:00
Rob Vermaas
92e98c2b03 nixops: 1.2 -> 1.3 
(cherry picked from commit a91d4f8a243933181c119ceff434e59eae09be10)
 2015-09-29 19:53:47 +00:00
Rob Vermaas
ad4f110b73 Revert "nixops: 1.2 -> 1.3." 
This reverts commit 43dee76b4b3fea9fee4d304daf57abc3b6c7aa85.
 2015-09-28 11:41:10 +00:00
Rob Vermaas
43dee76b4b nixops: 1.2 -> 1.3. 
(cherry picked from commit fcaf96b8d40e0c9559523674da03ab47edcfc8fb)
 2015-09-28 11:33:58 +00:00
Eelco Dolstra
2a28bc6691 separateDebugInfo: Assert Linux 
Also remove some unintended setting of separateDebugInfo.
 2015-09-22 20:21:10 +02:00
Domen Kožar
6b7c2a47c2 nixopsUnstable: bump 
(cherry picked from commit 9a401ca40430028310b4bcfa18f5c5b268b54014)
Signed-off-by: Domen Kožar <domen@dev.si>
 2015-09-19 16:37:33 +02:00
Eelco Dolstra
ec5b66eb4a Enable separate debug info 
You can now pass

  separateDebugInfo = true;

to mkDerivation. This causes debug info to be separated from ELF
binaries and stored in the "debug" output. The advantage is that it
enables installing lean binaries, while still having the ability to
make sense of core dumps, etc.
 2015-09-17 15:56:33 +02:00
Eric Seidel
1d5a96c3c6 Merge pull request #9309 from acowley/nix-darwin 
nix: use libsodium on darwin
 2015-09-14 15:12:33 -07:00
Eelco Dolstra
a5ea7ddb08 nix-repl: Update 
Fixes #9710.
 2015-09-08 10:41:13 +02:00
Eelco Dolstra
86eaeb4c0a Nix: Update to 1.10 2015-09-04 10:40:08 +02:00
Frederik Rietdijk
3e0fab3864 nox: use propagatedBuildInputs instead of pythonPath, fixes #9633 
This way, when accessing Nox via Python, the dependencies will be
available.
 2015-09-03 12:51:47 +02:00
Tobias Geerinckx-Rice
6a02e7201c packagekit: 1.0.7 -> 1.0.8 2015-08-31 17:17:33 +02:00
Tobias Geerinckx-Rice
80a882e6cc dpkg: 1.18.1 -> 1.18.2 2015-08-31 17:17:33 +02:00
Eelco Dolstra
fa67a2d301 nixUnstable: Update 2015-08-24 18:58:45 +02:00
Tobias Geerinckx-Rice
69114f74aa packagekit: use http:// instead of https:// 
Proxy weirdness?
 2015-08-23 00:02:29 +02:00
Tobias Geerinckx-Rice
4ec87513b6 packagekit: python3 attr. -> unversioned python 2015-08-20 18:26:15 +02:00
Tobias Geerinckx-Rice
46df28d371 packagekit: init at 1.0.7 
Don't worry, this does absolutely nothing on Nix and only serves to
satisfy simple-scan's zany new dep.
 2015-08-20 04:41:11 +02:00
Anthony Cowley
7dbea7aa78 Nix darwin use libsodium 2015-08-17 18:09:19 -04:00
Peter Simons
7053602206 nixops: update unstable version to latest git HEAD 2015-08-05 14:37:46 +02:00
Eelco Dolstra
b3d8d750de Remove /etc/nixos/nixpkgs from $NIX_PATH 
NixOS hasn't used /etc/nixos/nixpkgs for a long time, so it's time to
get rid of it.
 2015-08-05 14:34:33 +02:00
Sander van der Burg
0310b48494 Add mongodb-tools package as dependency to make snapshots and restores work 2015-07-31 16:19:56 +00:00
Eelco Dolstra
61a858783c nix-repl: Bump 2015-07-30 12:08:20 +02:00
Eelco Dolstra
8a5000cc78 nixUnstable: Update to 1.10pre4200_76cc8e9 
Also unify the nixStable and nixUnstable expressions.
 2015-07-30 12:08:20 +02:00
Eelco Dolstra
f98c7f2976 More docs in separate outputs 2015-07-26 22:46:45 +02:00
Peter Simons
dc5084b4d1 nixops: fix Emacs syntax highlighting 2015-07-23 19:47:43 +02:00
Peter Simons
5fcdd7c0dc nixopsUnstable: disable broken documentation build 2015-07-23 19:47:16 +02:00
Georges Dubus
eb9475d110 nox: updated to 0.0.2 2015-07-20 17:09:33 +02:00
Sander van der Burg
e54d0371b9 disnix: bump to version 0.4 2015-07-08 12:03:56 +00:00
Tobias Geerinckx-Rice
8e16c57424 nox: show trace for evaluation errors 
Backports upstream commit 8900531.
 2015-07-03 04:52:06 +02:00
William Casarin
634d9eb4c1 clib: a micro-package manager for C 2015-06-23 00:35:03 -07:00
William A. Kennington III
3a60e40d9b nix-serve: Update 2015-06-18 19:29:39 -07:00
Tobias Geerinckx-Rice
4e5e44140b dpkg, x2goclient: fix evaluation 
Bed time.
 2015-06-17 23:25:09 +02:00
Tobias Geerinckx-Rice
98b2d7b727 Separate nativeBuildInputs where maintainers |= nckx 2015-06-17 22:21:32 +02:00
Peter Simons
fcd7b6829b nix-repl: bump version to add support for current versions of Nix 2015-06-17 11:11:25 +02:00
Sander van der Burg
093b2de396 dysnomia: fix compatibility with mariadb derivation 2015-06-12 16:19:26 +00:00
Eelco Dolstra
192d20e820 nix: Update to 1.9 2015-06-12 13:19:48 +02:00
Pascal Wittmann
794feb7879 opkg: update from 0.2.4 to 3.0.0 2015-06-08 16:19:42 +02:00
Eelco Dolstra
a70d0275e2 nixUnstable: Bump 
This should fix the NixOS installer tests.
 2015-06-05 13:53:49 +02:00
Shea Levy
33a1b14b06 nixopsUnstable: Bring in quick fix 2015-06-02 16:23:46 -04:00
Shea Levy
99bf7f5698 nixopsUnstable: Bump 2015-06-02 15:50:44 -04:00
Tobias Geerinckx-Rice
cf8ea81fe4 dpkg 1.18.0 -> 1.18.1 2015-06-01 04:04:33 +02:00
Tobias Geerinckx-Rice
3c6d34a5d9 dpkg 1.17.25 -> 1.18.0 2015-05-30 21:09:25 +02:00
William A. Kennington III
f51d38214d nixUnstable: Bump 2015-05-29 11:48:58 -07:00
Shea Levy
0ad7204c3d nixopsUnstable: bump 2015-05-29 13:05:48 -04:00
Tobias Geerinckx-Rice
158e1cfdd0 Don't use "with licenses;" for single licences 
And don't use square brackets on such lines.
 2015-05-28 19:20:29 +02:00
Peter Simons
324719a5a6 Drop obsolete pre-NG Haskell builds. 2015-05-05 21:44:47 +02:00
Vladimír Čunát
3b9ef2c71b fix "libc}/lib" and similar references 
Done mostly without any verification.
I didn't bother with libc}/include, as the path is still correct.
 2015-05-05 11:52:08 +02:00
Vladimír Čunát
375bc8def7 Merge staging into closure-size 2015-05-05 11:49:03 +02:00
Edward Tjörnhammar
87b0558101 nixUnstable: Update to 1.9pre4100_4bbcfaf 2015-04-23 13:52:44 +02:00
Tobias Geerinckx-Rice
55edae18f0 dpkg 1.16.9 -> 1.17.25 2015-04-20 04:09:50 +02:00
Vladimír Čunát
e36dd5acf8 nix: fix paths to bzip outputs 2015-04-18 21:37:00 +02:00
William A. Kennington III
493f526eef nixUnstable: Bump 2015-04-07 14:00:26 -07:00
Eelco Dolstra
f713e7033e nixUnstable: Update to 1.9pre4087 2015-04-03 11:40:12 +02:00
William A. Kennington III
a604b42480 mysql: Use libs in place of the binary mysql 2015-04-01 16:46:53 -07:00
Eelco Dolstra
5cc05f6cf2 nixUnstable: Update to 1.9pre4083_5114a07 2015-03-24 14:42:37 +01:00
Eelco Dolstra
2ed5c2bd6b Set some meta.platforms 
Also fix meta.platform -> meta.platforms in a few places.
 2015-03-20 20:04:42 +01:00
Sander van der Burg
9be119bb0e disnix: bump to version 0.3 2015-03-13 21:07:46 +00:00
Sander van der Burg
0bc51eacd9 dysnomia: bump development version 2015-03-12 16:40:34 +00:00
Sander van der Burg
e61c7ad901 Bump development versions of Disnix 2015-03-09 23:29:40 +01:00
Eelco Dolstra
e02d926ca9 nixUnstable: Update to 1.9pre4074_e659978 2015-03-09 11:27:22 +01:00
Sander van der Burg
de8e1bcb03 DisnixWebService: bump to latest development version 2015-03-06 09:41:31 +00:00
Eric Seidel
b6a3fd396e dysnomia: fix syntax error 2015-03-05 13:00:50 -08:00
Sander van der Burg
bb3cf3b461 Bump development versions of disnix packages 2015-03-05 20:22:42 +00:00
Sander van der Burg
b0dc17a5ed Bump development versions of Disnix 2015-03-02 09:37:10 +00:00
Sander van der Burg
8b1110f89a Bump development versions of several Disnix tools 2015-02-20 20:20:43 +00:00
Eelco Dolstra
d6c88eaeb8 Apply upstream fix for Nix on XFS 
Fixes #6424.
 2015-02-18 10:41:39 +01:00
Eelco Dolstra
cbab474cea nixUnstable: Update 2015-02-18 10:39:47 +01:00
Eric Seidel
e08b9ab8d3 kill libiconvOr* 
Conflicts:
	pkgs/applications/networking/mailreaders/sup/default.nix
	pkgs/development/compilers/ghc/7.8.3-binary.nix
	pkgs/development/interpreters/php/5.3.nix
	pkgs/development/interpreters/ruby/patches.nix
	pkgs/development/libraries/cairo/default.nix
	pkgs/development/libraries/poppler/default.nix
	pkgs/top-level/all-packages.nix
 2015-02-07 20:29:28 -08:00
Eelco Dolstra
038a837f02 nixUnstable: Update to 1.9pre4028_0d1dafa 2015-02-04 14:22:34 +01:00
Matej Cotman
7e1e553cb8 nixui: update to 0.1.2 (close #6005) 2015-01-27 18:19:39 +01:00
Matej Cotman
f550c76d0e nixui: update to 0.1.1 2015-01-26 10:21:24 +01:00
Matej Cotman
4212dcabd9 nixui: do not use pkgs.path 2015-01-23 17:28:04 +01:00
Wout Mertens
70ac34b8c0 nixui: include build files 2015-01-23 15:59:10 +01:00
Wout Mertens
4c2554ebf4 Remove nixui to fix travis failures 2015-01-23 15:49:57 +01:00
Wout Mertens
71e107acac Set nixui to broken 
See 264ed82eda (commitcomment-9416066)
 2015-01-23 15:37:54 +01:00
wmertens
c5692758b5 Merge pull request #5896 from matejc/nixui 
Add NixUI package
 2015-01-22 13:23:36 +01:00
Charles Strahan
8d49e87dec Merge pull request #4677 from cstrahan/pleasant-ruby 
Pleasant ruby
 2015-01-21 23:27:38 -05:00
Matej Cotman
264ed82eda nixui: add new package 2015-01-22 05:27:31 +01:00
Daniel Peebles
ea5594679c Bump nixUnstable build 2015-01-21 22:13:51 -05: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
Domen Kožar
afe7612e89 Merge pull request #5779 from cstrahan/prefetch-scripts-home 
prefetch-scripts: improve purity
 2015-01-17 15:18:52 +01:00
Daniel Peebles
65522d05d4 Turn nixUnstable back on 2015-01-15 22:47:47 -05:00
Charles Strahan
54f3b50131 prefetch-scripts: improve purity 
Set HOME to /homeless-shelter to prevent things like git hooks from
running

Closes #5777
 2015-01-14 21:28:14 -05:00
Ludovic Courtès
41b53577a8 unmaintain a bunch of packages 2015-01-13 22:33:49 +01:00
Kirill Elagin
67d0e60f6c nox: Do not wrap 
Fixes madjar/nox#17.
 2015-01-09 21:34:48 +03:00
Peter Simons
dc70244447 Update HEAD versions of Cabal and cabal-install version to 1.22.0.0. 2015-01-05 18:39:19 +01:00
Peter Simons
9b8ff2f5f2 Update Cabal to version 1.20.0.3 and cabal-install to version 1.20.0.6. 2015-01-01 23:07:41 +01:00
Charles Strahan
df55381b65 ghcjs: restructure 2014-12-31 00:03:43 -05:00
Charles Strahan
94dd4b9721 ruby: WIP 2014-12-30 21:05:00 -05: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
Charles Strahan
347a9674c1 ghcjs: cleanup 2014-12-27 18:48:12 -05:00
John Wiegley
28b6fb61e6 Change occurrences of gcc to the more general cc 
This is done for the sake of Yosemite, which does not have gcc, and yet
this change is also compatible with Linux.
 2014-12-26 11:06:21 -06: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
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
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
Eelco Dolstra
188c038897 Add nix-serve 2014-12-14 02:19:54 +01:00
tv
86055e2f00 nixopsUnstable: Initial version 1.3pre1362_2a616f8 2014-12-12 16:30:54 +01:00
Shea Levy
fcaf268d54 nixUnstable: bump 2014-12-03 22:22:18 -05:00
Shea Levy
97f35cf29a nixUnstable: bump 
Bug fixed in b0c5c2a was giving me segfaults...
 2014-11-21 08:36:02 -05:00
Eelco Dolstra
8be7b23cb3 nixUnstable: Update to 1.8pre3899_8299aaf 2014-11-19 18:26:07 +01:00
Shea Levy
8b9b0d95a0 nixUnstable: bump 2014-11-17 00:59:31 -05:00
Pascal Wittmann
2c19d082fb opkg: update from 0.2.3 to 0.2.4 2014-11-15 12:19:54 +01:00
Eelco Dolstra
ca441636f1 Merge branch 'staging' 2014-11-14 16:00:23 +01:00