Commit Graph

101773 Commits

Author SHA1 Message Date
Michael Weiss
1a9467edd5 fuse3: 3.1.1 -> 3.2.0 2017-09-23 21:31:15 +02:00
Daiderd Jordan
18ee806811 Merge pull request #29690 from therealpxc/varnish
varnish: enable Darwin build
2017-09-23 21:21:45 +02:00
Daiderd Jordan
db2538fb0c
qt5-qtbase: fix darwin build
Fixes #27474
2017-09-23 21:06:09 +02:00
Peter Jones
f1355079b9
playbar2: init at 2.5 2017-09-23 11:40:24 -07:00
Michael Raskin
8d001911db asymptote: do not install sty-files, let texlive care of it
TeXLive version is effectively identical anyway, and it caused an
unneccessary file name collision.

Fixes: #29671
2017-09-23 19:28:09 +02:00
John Ericson
8326c42dc2 Merge pull request #29708 from obsidiansystems/ghc-prebuilt-indent
ghc prebuilt: Normalize style without changing hashes
2017-09-23 13:04:00 -04:00
Pascal Wittmann
ad8958a747 Merge pull request #29678 from mimadrid/update/axel-2.14.1
axel: 2.13.1 -> 2.14.1
2017-09-23 19:03:31 +02:00
Pascal Wittmann
359b3b9c4c Merge pull request #29677 from mimadrid/update/entr-3.8
entr: 3.7 -> 3.8
2017-09-23 19:03:16 +02:00
Pascal Wittmann
acefacb9ef Merge pull request #29681 from mimadrid/update/filezilla-3.27.1
filezilla: 3.27.0.1 -> 3.27.1
2017-09-23 19:03:00 +02:00
Pascal Wittmann
53aa329054 Merge pull request #29680 from mimadrid/update/gsource-0.47
gsource: 0.44 -> 0.47
2017-09-23 19:02:45 +02:00
Robert Scott
9ca4f39b97 python.pkgs.python-gnupg: disable failing test test_search_keys
reading the code, it's hard to see how this test was *ever* supposed to
pass. interestingly, peeking across the fence, guix have disabled this test
too for the same reason.

note that tests don't actually run *at all* on py27 but that's a problem
for another day
2017-09-23 19:01:41 +02:00
John Ericson
2d52156793 ghc prebuilt: Fix indentation
Doing this separately so the other commits are more readable
2017-09-23 12:58:07 -04:00
John Ericson
a8ef3f6742 ghc prebuilt: Clean up syntax, without changes hashes
If I'm going to make a bunch more of these, I think it's a good idea to
make them more uniform first.
2017-09-23 12:58:07 -04:00
Robin Gloster
08b09fdc5c
fanctl, fan module: remove
This has been broken nearly all the time due to the patches needed to
iproute2 not being compatible with the newer versions we have been
shipping. As long as Ubuntu does not manage to upstream these changes
so they are maintained with iproute2 and we don't have a maintainer
updating these patches to new iproute2 versions it is not feasible to
have this available.
2017-09-23 17:55:33 +02:00
Samuel Leathers
694e7e08d6 kodi: 17.3 -> 17.4 2017-09-23 16:59:45 +02:00
Robert Scott
a358c43975 python.pkgs.pyscss: 1.3.4 -> 1.3.5
this also:
 - enables tests (properly)
 - fixes build on python 3.6
2017-09-23 15:15:48 +01:00
Peter Simons
fc2c994991 Merge pull request #29586 from cocreature/ghcjs-shims
ghcjsHEAD: bump ghcjs shims
2017-09-23 16:15:20 +02:00
Dmitry Kalinkin
de1480e079
pythonPackages.simanneal: init at 0.4.1 2017-09-23 09:58:21 -04:00
Robin Gloster
d6879f930a
radsecproxy: fix license 2017-09-23 15:37:28 +02:00
Vladimír Čunát
7c7f8c9c1d
knot-*: simplify lmdb dependency
Partly thanks to lmdb.pc, partly thanks to 84bd2f4
(hopefully; untested on Darwin).
2017-09-23 14:15:56 +02:00
Francois-Rene Rideau
fc82bad4a9 gerbil: 0.12-DEV -> 0.12-DEV-777-gd855915 2017-09-23 08:10:53 -04:00
Joachim F
dbf4d4ebb5 Merge pull request #29658 from teto/ctags
universal-ctags: generate manpage
2017-09-23 12:04:06 +00:00
Joachim F
6cd2ebc1d1 Merge pull request #29674 from dapphub/solc-0-4-17
solc: v0.4.16 -> v0.4.17
2017-09-23 12:01:01 +00:00
Joachim F
2756fac2ae Merge pull request #29667 from sargon/radsecproxy
radsecproxy: init at 1.6.9
2017-09-23 11:58:06 +00:00
Antoine Eiche
35f205a4b6 dockerTools.buildImage: Switch to the format image generated by Skopeo
We were using 'Combined Image JSON + Filesystem Changeset Format' [1] to
unpack and pack image and this patch switches to the format used by the registry.

We used the 'repository' file which is not generated by Skopeo when it
pulls an image. Moreover, all information of this file are also in the
manifest.json file.
We then use the manifest.json file instead of 'repository' file. Note
also the manifest.json file is required to push an image with Skopeo.

Fix #29636

[1] 749d90e10f/image/spec/v1.1.md (combined-image-json--filesystem-changeset-format)
2017-09-23 13:17:07 +02:00
taku0
692fcd9f53 oraclejdk: add version 9
Oracle JDK 9 does not seems to contain jre directory, so oraclejre9
package now uses a dedicated archive file.

There is no 32-bit version nor arm version (yet). If Oracle releases
them, I will update the package.
2017-09-23 17:47:12 +09:00
Michael Raskin
f7d7c7bedf singular: use gcc5
Progress on: #28643
Fixes: #29682
2017-09-23 10:16:47 +02:00
Vladimír Čunát
73282c8cc2
Merge branch 'master' into staging
Thousands of rebuilds from master :-/
2017-09-23 09:57:23 +02:00
Matthieu Coudron
5c4ddc30d3 universal-ctags: 2017-01-08 -> 2017-09-22 2017-09-23 16:53:20 +09:00
Frederik Rietdijk
18ebc8dba9 Merge pull request #29676 from mimadrid/update/calc-2.12.6.3
calc: 2.12.6.1 -> 2.12.6.3
2017-09-23 08:39:02 +02:00
Frederik Rietdijk
805fa2e667 python.pkgs.botocore: fix dependencies 2017-09-23 08:23:43 +02:00
Frederik Rietdijk
5e916914ef python.pkgs: alias dateutil to python-dateutil 2017-09-23 08:23:43 +02:00
Ruben Maher
b1c4498b41 awsebcli: init at 3.10.5 2017-09-23 08:23:43 +02:00
Ruben Maher
65aba6ed17 pythonPackages.semantic-version: use fetchPypi
In order to make it nicer to override when a specific version is required for
Python derivations.
2017-09-23 08:23:43 +02:00
Ruben Maher
4101582270 pythonPackages.tabulate: use fetchPypi
In order to make it nicer to override when a specific version is required for
Python derivations.
2017-09-23 08:23:43 +02:00
Ruben Maher
742de0bf24 pythonPackages.cement: init at 2.8.2
This is a dependency of awsebcli.
2017-09-23 08:23:43 +02:00
Ruben Maher
9a0155a241 pythonPackages.blessed: init at 1.14.2
This is a dependency of awsebcli.
2017-09-23 08:23:43 +02:00
Michael Weiss
5f0a7cded7 nox: Add a temporary patch for the "wip" command
See #29684.
2017-09-23 04:25:11 +02:00
Patrick Callahan
f4f90a7354 nodePackages.typings: init at 2.1.1 2017-09-22 19:10:08 -07:00
Matt McHenry
aedfc0d8d3 minecraft-server: 1.12 -> 1.12.2 2017-09-22 21:42:38 -04:00
Patrick Callahan
8be447b522 varnish: enable Darwin build 2017-09-22 17:45:10 -07:00
Ruben Maher
a557d3a848 networkmanager_openvpn: 1.2.8 -> 1.8.0 2017-09-23 09:50:23 +09:30
John Ericson
17de435533 ghc prebuilt: Don't hardcode the version in a few more places
This removes noise in the diff, making creating new versions easier. No
hashes should be changed.
2017-09-22 19:53:29 -04:00
John Ericson
d72647bc05 ghc-6.10.2-binary: Remove dead Darwin code
This looks like a WIP attempt from 2008
2017-09-22 19:53:28 -04:00
mimadrid
ece5c1482b
filezilla: 3.27.0.1 -> 3.27.1 2017-09-23 00:43:07 +02:00
mimadrid
00bdbcd99e
libfilezilla: 0.10.0 -> 0.10.1 2017-09-23 00:42:29 +02:00
Jörg Thalheim
21cadbb8f4 Merge pull request #29672 from andir/upstream-ferm
ferm: 2.3.1 -> 2.4.1
2017-09-22 23:38:15 +01:00
mimadrid
80a14bf5fb
gsource: 0.44 -> 0.47 2017-09-23 00:38:03 +02:00
mimadrid
9c46ef3d9a
axel: 2.13.1 -> 2.14.1 2017-09-23 00:32:04 +02:00
mimadrid
47974b2670
entr: 3.7 -> 3.8 2017-09-23 00:28:02 +02:00
Joachim Fasting
69e3817eb6
tor-browser-bundle-bin: optionally disable multiprocess support
Multiprocess tabs always crash, as first reported by the issue mentioned
below.  It is now consistently reproducible both on NixOS and non-NixOS
for me, so I've decided to add a toggle to conveniently disable
multiprocess support as a work-around.

Closes https://github.com/NixOS/nixpkgs/issues/27759 but does
not really fix the underlying problem ...
2017-09-23 00:17:42 +02:00
mimadrid
676db57c37
calc: 2.12.6.1 -> 2.12.6.3 2017-09-23 00:13:42 +02:00
Daiderd Jordan
84bd2f4ab0
lmdb: fix library id on darwin 2017-09-22 23:33:29 +02:00
Joachim F
456e96fbbf Merge pull request #29620 from joachifm/pkg/snapper-0_5_0
snapper: 0.3.3 -> 0.5.0
2017-09-22 20:49:19 +00:00
Joachim Fasting
fd3a9e6468
tor: enable parallel building 2017-09-22 22:37:15 +02:00
Mikael Brockman
2c5ab79d2d
solc: v0.4.16 -> v0.4.17 2017-09-22 23:18:21 +03:00
Joachim F
22d9935a01 Merge pull request #29663 from womfoo/bump-fix/trackballs-1.2.3
trackballs: 1.1.4 (broken) -> 1.2.3
2017-09-22 20:04:46 +00:00
Joachim F
8ab9502868 Merge pull request #29664 from womfoo/bump-fix/giv-0.9.26
giv: 20150811-git (broken) -> 0.9.26
2017-09-22 20:04:31 +00:00
gnidorah
42dcf914d1 termite: fix fonts in wayland 2017-09-22 22:55:44 +03:00
Michael Weiss
5257232ac7 gns3: "Improve" the packaging
This is "a bit" hacky tho...
The improvement is that it now covers the stable as well as the preview
releases and doesn't require Python 3.4 anymore.
2017-09-22 21:30:38 +02:00
Daiderd Jordan
1acf6716aa
textql: fix darwin build 2017-09-22 21:25:34 +02:00
Tuomas Tynkkynen
4acb425c39 darwin: Disable yet another bunch of packages never having built successfully
cjdns: https://hydra.nixos.org/build/61134279
jonprl: https://hydra.nixos.org/build/61123711
mate.libmatemixer: https://hydra.nixos.org/build/61126968
dirac: https://hydra.nixos.org/build/61132432
idnkit: https://hydra.nixos.org/build/61123544
trousers: https://hydra.nixos.org/build/61109766
packetdrill: https://hydra.nixos.org/build/61116190
osm2pgsql: https://hydra.nixos.org/build/61118017
nawk: https://hydra.nixos.org/build/61139000
2017-09-22 21:16:39 +03:00
Daiderd Jordan
8a0d857aa9
tw-rs: fix darwin build 2017-09-22 19:45:33 +02:00
Tuomas Tynkkynen
a7440aa7c6 hdf5: Re-enable on darwin
Oops, ab71280823 intended to only disable hdf5-fortran but also
disabled the others that are fine.
2017-09-22 19:56:49 +03:00
Tuomas Tynkkynen
4b4bfbf3e5 darwin: Disable another bunch of packages never having built successfully
tecoc: https://hydra.nixos.org/build/61141995
shallot: https://hydra.nixos.org/build/61145497
plink-ng: https://hydra.nixos.org/build/61130149
tshark: https://hydra.nixos.org/build/61479600
2017-09-22 19:49:57 +03:00
Andreas Rammhold
e9a56e798a
ferm: 2.3.1 -> 2.4.1 2017-09-22 18:42:38 +02:00
Francois-Rene Rideau
34739b3cc6 gambit: 4.8.8-f3ffeb6 -> 4.8.8-300db59 2017-09-22 11:30:07 -04:00
Tim Steinbach
24bed29809
openjdk: Fix build 2017-09-22 11:16:14 -04:00
Michael Weiss
6f02c3bf77 sshfs-fuse: Fix the build on i686-linux
The last upgrade (137142a72c) broke the
build on i686. Thanks @globin for noticing this.
2017-09-22 17:13:24 +02:00
Tuomas Tynkkynen
ab71280823 darwin: Disable some packages that have never built successfully
mate.mate-desktop: https://hydra.nixos.org/build/61110037
gdmap: https://hydra.nixos.org/build/61144743
redsocks: https://hydra.nixos.org/build/61123106
resolv_wrapper: https://hydra.nixos.org/build/61121132
ogmtools: https://hydra.nixos.org/build/61108726
mp3info: https://hydra.nixos.org/build/61139015
lxappearance-gtk3: https://hydra.nixos.org/build/61126327
hdf5-fortran: https://hydra.nixos.org/build/61146631
pqiv: https://hydra.nixos.org/build/61124724
2017-09-22 17:25:38 +03:00
Daniel Ehlers
8bb57bce2a radsecproxy: init at 1.6.9 2017-09-22 15:08:19 +02:00
Thomas Tuegel
6237ece367 Merge pull request #29665 from vyp/issue/29589
qt-5/qtbase-setup-hook.sh: attempt to make directories only if needed
2017-09-22 07:51:05 -05:00
Michael Weiss
8758a4dde2 pythonPackages.raven: 6.1.0 -> 6.2.0 2017-09-22 14:47:37 +02:00
Joerg Thalheim
e4a859a95d
jetbrains.datagrip: 2017.1.5 -> 2017.2.2 2017-09-22 13:43:35 +01:00
Thomas Tuegel
a2b852caa0
hplip: change maintainers
Remove nckx and add ttuegel
2017-09-22 07:41:18 -05:00
Thomas Tuegel
ec62d5462d
hplip: 3.16.11 -> 3.17.9
hplip-3.16.11 is retained as `hplip_3_16_11`.
2017-09-22 07:41:17 -05:00
Matt McHenry
02fe1207ab openjdk9: init at 9.0.0+180
* openjdk 8: code cleanup

as recommended by 0xABAB in #27194

* openjdk 9: init at ea build 176

this starts with copy of 8.nix and just updates hashes and replaces 8
with 9.  it also tweaks the version handling because we aren't dealing
with an update version yet.

* openjdk 9: adapt patches from openjdk 8

fix-java-home: surrounding code changed slightly

swing-use-gtk-jdk9: location of the file being patched changed due to
modularization

read-truststore-from-env: the code that handles the trustStore was
refactored out into a helper class in upstream commit
http://hg.openjdk.java.net/jdk9/jdk9/jdk/rev/904861872c0e

adlc_updater: this isn't present anymore

* openjdk 9: make two more warnings-as-errors non-fatal

this requires that we switch to configureFlagsArray to deal with
whitespace

the errors being suppressed are show below:

* For target support_native_java.desktop_libawt_xawt_awt_Robot.o:
/tmp/nix-build-openjdk-9ea-b176.drv-0/jdk9-jdk-9+176/jdk/src/java.desktop/unix/native/libawt_xawt/awt/awt_Robot.c: In function 'isXCompositeDisplay':
/tmp/nix-build-openjdk-9ea-b176.drv-0/jdk9-jdk-9+176/jdk/src/java.desktop/unix/native/libawt_xawt/awt/awt_Robot.c:152:50: error: embedded '\0' in format
[-Werror=format-contains-nul]
     snprintf(NET_WM_CM_Sn, sizeof(NET_WM_CM_Sn), "_NET_WM_CM_S%d\0", screenNumber);
                                                  ^
/tmp/nix-build-openjdk-9ea-b176.drv-0/jdk9-jdk-9+176/jdk/src/java.desktop/unix/native/libawt_xawt/awt/awt_Robot.c:152:50: error: embedded '\0' in format
[-Werror=format-contains-nul]
cc1: all warnings being treated as errors
* For target support_native_jdk.hotspot.agent_libsa_ps_core.o:
/tmp/nix-build-openjdk-9ea-b176.drv-0/jdk9-jdk-9+176/hotspot/src/jdk.hotspot.agent/linux/native/libsaproc/ps_core.c: In function 'read_exec_segments':
/tmp/nix-build-openjdk-9ea-b176.drv-0/jdk9-jdk-9+176/hotspot/src/jdk.hotspot.agent/linux/native/libsaproc/ps_core.c:834:7: error: ignoring return value of 'pread', declared
with attribute warn_unused_result [-Werror=unused-result]
       pread(ph->core->exec_fd, interp_name, exec_php->p_filesz, exec_php->p_offset);
       ^
cc1: all warnings being treated as errors

* openjdk 9: ea+176 -> ea+180

* openjdk 9: TODO disable infinality patches, at least to start

the code being patched here seems to have changed substantially or
perhaps even disappeared altogether.  need to investigate whether
these patches are still relevant.

* openjdk 9: update installPhase for modularization

* separate jdk and jre images are now present under build/*/images

* samples have been removed (JEP 298)
  -- TODO that JEP says demos will be gone too, but it seems some are still present?

* bina directory is no longer present

* openjdk 9: TODO handle *.pf files or purge this code completely

* openjdk 9: update minimal jre components

in particular, the name of the config option for headless has changed,
per https://bugs.openjdk.java.net/browse/JDK-8163102

* TODO about echo -n vs printWords, #27427
2017-09-22 08:27:34 -04:00
xd1le
99eabd6c06 qt-5/qtbase-setup-hook.sh: attempt to make directories only if needed
Resolves #29589.
2017-09-22 22:26:02 +10:00
Tim Steinbach
8227568a76 Merge pull request #29077 from lsix/update_qtcreator
qtcreator: 4.3.1 -> 4.4.0
2017-09-22 08:20:46 -04:00
Tim Steinbach
38f65be5c3 Merge pull request #28561 from nlewo/dockerTools-load-nix-db
dockerTools: populate the nix database of the container nix store
2017-09-22 08:17:51 -04:00
Joerg Thalheim
a2444a2831
neomutt: fix missing libidn 2017-09-22 13:04:28 +01:00
Kranium Gikos Mendoza
5da75526f7 giv: 20150811-git (broken) -> 0.9.26 2017-09-22 21:55:14 +10:00
Thomas Tuegel
4c09acad5c
hplip: remove 3.15.9
hplip-3.15.9 has not been buildable in some time due to changes in CUPS.
2017-09-22 06:50:54 -05:00
Brandon Barker
14f2e0cd36
jetbrains: update.pl fixes
* indentation, retab
  * url handling for alternative version names
  * handling for alt. download url format
  * made unknown channel error non-fatal
2017-09-22 13:49:49 +02:00
Kranium Gikos Mendoza
92ec5cddbc trackballs: 1.1.4 (broken) -> 1.2.3 2017-09-22 21:37:26 +10:00
Jaka Hudoklin
e17e22d455 Merge pull request #29529 from holidaycheck/nodejs-8.5.0
libuv: 1.14.1 and nodejs 8.5.0
2017-09-22 13:21:50 +02:00
John M. Harris, Jr
b2924389ac pim-data-exporter: init at 17.08.1
* Add pim-data-exporter

* pim-data-exporter: fix indentation
2017-09-22 11:20:49 +01:00
Jörg Thalheim
83f0659365 Merge pull request #29643 from dotlambda/ttwatch
ttwatch: init at 2017-04-20
2017-09-22 11:03:58 +01:00
Joerg Thalheim
f2aecac5c7 topydo: use throw instead of trace to not break evaluation 2017-09-22 10:55:04 +01:00
Jörg Thalheim
11e1e826bf Merge pull request #29649 from disassembler/topydo
topydo: 0.9 -> 0.13
2017-09-22 10:50:42 +01:00
Joerg Thalheim
446f9c96f5 topydo: really move out of python-packages 2017-09-22 10:48:21 +01:00
Vladimír Čunát
fd56648a04
knot-resolver: 1.3.3 -> 1.4.0
Also drop rarely used dependencies, by default,
and utilize root server addresses from nixpkgs.
2017-09-22 11:27:59 +02:00
Edward Tjörnhammar
4e12dbb092
jetbrains.clion: set CL_JDK 2017-09-22 11:13:48 +02:00
Robert Schütz
723042efa9 ttwatch: init at 2017-04-20 2017-09-22 10:45:31 +02:00
Russell O'Connor
6075d4ad07 bitcoin: 0.15.0 -> 0.15.0.1 2017-09-22 09:43:38 +02:00
Peter Hoeg
bcd82d6b62 Merge pull request #29603 from peterhoeg/f/erlang
erlang: introduce "no X" variation
2017-09-22 15:39:32 +08:00
Jörg Thalheim
5b29e35c8c Merge pull request #29214 from timor/paraview-5.4.0
ParaView: 4.0.1 -> 5.4.0
2017-09-22 08:31:11 +01:00
Matthieu Coudron
c2f928d44e universal-ctags: generate manpage 2017-09-22 15:56:02 +09:00
Cray Elliott
5522cd5cb1 wineUnstable: 2.16 -> 2.17
per usual, staging has been updated as well!
2017-09-21 22:57:27 -07:00
Vincent Laporte
3b7c68615e abella: fix build with OCaml ≥ 4.03 2017-09-22 03:32:06 +00:00
Peter Hoeg
51aa419354 erlang: introduce "no X" variation 2017-09-22 09:54:45 +08:00
Neil Mayhew
9d01b511b5 spideroak: 6.0.1 -> 6.1.9 2017-09-21 19:27:45 -06:00
Jörg Thalheim
743848bb46 Merge pull request #29581 from eqyiel/fix-rpc-gssd
nixos/nfs: allow setting the path to krb5.keytab
2017-09-22 01:41:10 +01:00
John Ericson
1dd63de9a0 Merge some Master PRs into staging
No native hashes should be changed
2017-09-21 20:11:59 -04:00
Samuel Leathers
be530263bc topydo: 0.9 -> 0.13 2017-09-21 18:59:56 -04:00
John Ericson
56574e6087 Merge pull request #29610 from obsidiansystems/no-gccCrossStageFinal
top-level: No `gccCrossStageFinal` needed anymore
2017-09-21 18:57:16 -04:00
Jörg Thalheim
677371c531 Merge pull request #29630 from florianjacob/piwik-3.1.1
piwik: 3.1.0 -> 3.1.1
2017-09-21 23:52:35 +01:00
Daiderd Jordan
570c0b3a72
transfig: cleanup and fix darwin clang 2017-09-22 00:25:22 +02:00
Joachim F
ae4f2fbb41 Merge pull request #29469 from ThomasMader/fix-dmd
dmd & ldc: Fix bootstrap dmd to build with sandboxing of nixUnstable and fix dmd to build on Darwin; Disable check phases of dmd and ldc because of sandboxing problem
2017-09-21 22:19:30 +00:00
Joachim F
44d2eaab80 Merge pull request #29538 from bcdarwin/update-and-fix-ANTS
ants: bump version and fix sandboxed build
2017-09-21 22:08:40 +00:00
Jörg Thalheim
7833062986 Merge pull request #29648 from zzamboni/assh-2.6.0
assh: init at 2.6.0
2017-09-21 23:05:22 +01:00
Jörg Thalheim
81569ecd72 assh: add openssh to PATH 2017-09-21 23:03:55 +01:00
Michael Weiss
137142a72c sshfs-fuse: 2.10 -> 3.2.0 2017-09-21 23:59:46 +02:00
Michael Weiss
351f5fc585 fuse3: init at 3.1.1
This includes fuse-common (fusePackages.fuse_3.common) as recommended by
upstream. But while fuse(2) and fuse3 would normally depend on
fuse-common we can't do that in nixpkgs while fuse-common is just
another output from the fuse3 multiple-output derivation (i.e. this
would result in a circular dependency). To avoid building fuse3 twice I
decided it would be best to copy the shared files (i.e. the ones
provided by fuse(2) and fuse3) from fuse-common to fuse (version 2) and
avoid collision warnings by defining priorities. Now it should be
possible to install an arbitrary combination of "fuse", "fuse3", and
"fuse-common" without getting any collision warnings. The end result
should be the same and all changes should be backwards compatible
(assuming that mount.fuse from fuse3 is backwards compatible as stated
by upstream [0] - if not this might break some /etc/fstab definitions
but that should be very unlikely).

My tests with sshfs (version 2 and 3) didn't show any problems.

See #28409 for some additional information.

[0]: https://github.com/libfuse/libfuse/releases/tag/fuse-3.0.0
2017-09-21 23:59:46 +02:00
Daiderd Jordan
62f8e255a4
vapoursynth: fix darwin build 2017-09-21 22:30:56 +02:00
Joachim F
82a4b755b1 Merge pull request #29621 from joachifm/pkg/hydra-git
hydra: 2017-07-27 -> 2017-09-14
2017-09-21 20:28:40 +00:00
Diego Zamboni
334dfc3086 assh: init at 2.6.0
Powerful wrapper around ssh.
2017-09-21 22:23:16 +02:00
Jörg Thalheim
0d391a8e5a Merge pull request #29647 from bachp/riot-web-0.12.5
riot-web: 0.12.3 -> 0.12.5
2017-09-21 21:14:14 +01:00
Jörg Thalheim
4d225b3d40 nodePackages.pulp: init at 12.0.1
fixes #29374
2017-09-21 20:58:43 +01:00
Daiderd Jordan
7c30c83b7b
vmmlib: fix darwin frameworks 2017-09-21 21:52:10 +02:00
John Ericson
b9bf90ca6c all-packages: Remove gccCrossStageFinal; any gcc will not work 2017-09-21 15:49:18 -04:00
John Ericson
88a0e55ce0 wrapCC: Alias now does the right thing for cross
Unfortunately this makes previously-barely-working overrides have
infinite recursion, so I had to reinstantiate gcc for gccCrossStageFinal
instead.
2017-09-21 15:49:18 -04:00
John Ericson
54282b9610 gcc: Change default of crossStageStatic param to false
This gets us one step closer to removing `gccCrossStageFinal`.

Care is taken to avoid a mass rebuild; will clean up with one later.
2017-09-21 15:49:18 -04:00
John Ericson
fe2e7def53 Merge pull request #29646 from obsidiansystems/stdenv-cross-adapter
stdenv cross adapter: Misc changes
2017-09-21 15:46:59 -04:00
José Romildo Malaquias
2bbef7658a google-drive-ocamlfuse: 0.6.17 -> 0.6.21 2017-09-21 21:43:35 +02:00
Jörg Thalheim
a0017e2904 Merge pull request #29252 from dywedir/tokei
tokei: 6.0.1 -> 6.1.2
2017-09-21 20:42:57 +01:00
Pascal Bach
50f12373af riot-web: 0.12.3 -> 0.12.5 2017-09-21 21:36:08 +02:00
Daiderd Jordan
ef4c15e54d
erlang: add R17-R20 back to all-packages 2017-09-21 21:32:03 +02:00
Daiderd Jordan
ab390ab050
erlang: remove erlangR16 and all versioned variants from all-packages
(re-applies commit 0fafa0d7d7)
2017-09-21 21:28:20 +02:00
Peter Simons
a68eea3cb0 Merge pull request #29089 from LnL7/vaultenv-0.5.0
vaultenv: init at 0.5.0
2017-09-21 21:13:53 +02:00
Vladimír Čunát
e15123092c
Merge #29612: unbound: 1.6.5 -> 1.6.6 2017-09-21 21:10:06 +02:00
Daiderd Jordan
bafb9c4d50
vsqlite: fix darwin build 2017-09-21 21:10:03 +02:00
Vladimír Čunát
4683c374fa
Merge branch 'master' into staging
A couple thousand rebuilds again.
2017-09-21 21:09:32 +02:00
John Ericson
3af3d6efc2 stdenv cross adapater: Remove old extraBuildInputs
They, unlike their native counterparts, run on the wrong platform and
are therefore invalid.
2017-09-21 14:52:42 -04:00
John Ericson
05ef1034c7 stdenv cross adaptor: Add optional overrides parameter
By default, all previous overrides are discarded as before, as they
would only apply to the old host platform. But sometimes it is useful to
add some new ones, and this optional parameter allows that.
2017-09-21 14:52:07 -04:00
Daiderd Jordan
1ae204d2fa
zroc-ice: cleanup and fix darwin build 2017-09-21 20:48:56 +02:00
John Ericson
738bb4777c stdenv: Update autotools scripts on all Aarch64, not just Linux
This is needed when cross-compiling for iOS (Aarch64 + Darwin). I also
changed the syntax of the Linux stdenv for visual consistency, though
that has no effect on semantics as the os is already guaranteed to be
Linux.
2017-09-21 14:40:40 -04:00
Jake Waksbaum
a3ba600366 ocamlPackages.merlin: 2.5.4 -> 3.0.2 (#29337) 2017-09-21 19:39:36 +01:00
Tim Steinbach
7d3d276a16
linux-copperhead: 4.13.2.a -> 4.13.3.a 2017-09-21 14:37:44 -04:00
Jörg Thalheim
217add9043 Merge pull request #29451 from jerith666/client-ip-echo-1709
client-ip-echo: init at 0.1.0.1
2017-09-21 19:33:22 +01:00
Robin Gloster
e2822f6384
gitlab: 9.5.2 -> 9.5.5 2017-09-21 20:26:12 +02:00
Jörg Thalheim
e5b97e36c5 Merge pull request #29642 from Zimmi48/update-compcert
Update CompCert
2017-09-21 18:30:39 +01:00
Thomas Tuegel
5f328b33ab Merge pull request #29616 from ttuegel/hplip
HPLIP: Fix PostScript printers, installed utilities
2017-09-21 11:19:27 -05:00
Michael Weiss
a127f91f28 fim: Add X11 support and "USE flags" 2017-09-21 18:00:48 +02:00
Jörg Thalheim
31b7bc4c1e Merge pull request #29243 from hamhut1066/master
traefik: init at 1.3.8
2017-09-21 17:00:37 +01:00
Shea Levy
c3b41a77e6 openldap: Use a global localstatedir 2017-09-21 08:18:45 -06:00
Michael Weiss
e0ef28c12d fim: init at 0.5rc3 2017-09-21 16:08:32 +02:00
Robert Helgesson
41cca299ef
perl-Scope-Upper: 0.24 -> 0.29 2017-09-21 15:40:51 +02:00
Robert Helgesson
2dae9980cc
perl-File-Slurper: 0.009 -> 0.010 2017-09-21 15:40:51 +02:00
Robert Helgesson
25a2b4b3ec
svtplay-dl: 1.9.4 -> 1.9.6 2017-09-21 15:40:51 +02:00
Théo Zimmermann
8fde5790b4 compcert: fix license
The license of CompCert is not a generic "INRIA" license. It is "INRIA Non-Commercial
Agreement for the CompCert verified compiler". As unfortunate as it may seem, this
is a non-free license (clearly mentioned as such in its preamble). See also #20256.
2017-09-21 15:24:17 +02:00
Théo Zimmermann
3370615a7f compcert: 3.0.1 -> 3.1
Note that the fix of the VERSION file can likely be removed at the next update.
2017-09-21 15:06:51 +02:00
Tim Steinbach
182dd6a9d6 Merge pull request #29634 from edwtjo/jbjdk
jetbrains-jdk
2017-09-21 08:42:01 -04:00
Tim Steinbach
5facacad01 Merge pull request #29591 from andir/update-jetbrains
Update jetbrains packages
2017-09-21 08:01:45 -04:00
Tim Steinbach
a80067636e Merge pull request #29481 from neilmayhew/fix/spideroak
spideroak: fix crash due to zlib version mismatch
2017-09-21 07:59:32 -04:00
Jörg Thalheim
521a801863 Merge pull request #29590 from matthiasbeyer/update-khal
khal: 0.9.5 -> 0.9.7
2017-09-21 12:51:14 +01:00
Jörg Thalheim
d5b46fdd80 khal: use fetchPypi 2017-09-21 12:50:32 +01:00
Théophane Hufschmitt
e76c2c1496 pythonPackages.pafy: 0.5.2 -> 0.5.3.1 (#29588)
* pythonPackages.pafy: 0.5.2 -> 0.5.3.1

* pythonPackages.pafy: move to its own file

* pythonPackages.pafy: fetchurl -> fetchPypi
2017-09-21 12:45:33 +01:00
Diego Zamboni
8b8a2fd542 elvish: 0.9 -> 0.10; fix darwin build (#29587)
* First attempt at making elvish compile on darwin

* Fixed cyclic dependency on darwin

This fixes the "cycle detected in the references of" error when building
on darwin. The fix is based on the solution in issue #18131.

* Use version 0.10 and not 0.10.1, which is not officially released yet
2017-09-21 12:20:37 +01:00
José Romildo Malaquias
595d92eb7a ocamlfuse: 2.7-3 -> 2.7.1_cvs5 (#29606) 2017-09-21 12:14:22 +01:00
Jörg Thalheim
6bdabc7752 Merge pull request #29632 from lheckemann/oil-update
oil: 0.0.0 -> 0.1.0
2017-09-21 12:13:41 +01:00
Thomas Tuegel
b0deb1ed48
dropbox: 34.4.22 -> 35.4.20 2017-09-21 06:11:15 -05:00
Jörg Thalheim
a3ed686110 Merge pull request #29545 from dotlambda/texworks
texworks: init at 0.6.2
2017-09-21 12:07:00 +01:00
Jörg Thalheim
49d18cd42b Merge pull request #29633 from vaibhavsagar/update-nginx-echo-module
nginxModules.echo: v0.57 -> v0.61
2017-09-21 12:02:35 +01:00
Vaibhav Sagar
dea2affe6c nginxModules.echo: 0.57 -> 0.61
This fixes #29555.
2017-09-21 11:01:35 +00:00
Jörg Thalheim
8da89ab658 Merge pull request #29635 from andir/update-afew-to-1.2.0
afew: git-2017-02-8 -> 1.2.0
2017-09-21 11:56:16 +01:00
Andreas Rammhold
559d8d4c3a
afew: git-2017-02-8 -> 1.2.0 2017-09-21 10:52:52 +02:00
Edward Tjörnhammar
85cd648778 jetbrains.jdk: style fixes, platform restriction 2017-09-21 10:48:02 +02:00
Aleksey Kladov
53337c0fc8 jetbrains.jdk: init at 152b970.2 2017-09-21 10:48:02 +02:00
Linus Heckemann
6988537835 oil: 0.0.0 -> 0.1.0 2017-09-21 09:24:22 +01:00
Jörg Thalheim
116c34a748 Merge pull request #29613 from bcdarwin/nifti
nifticlib: init at 2.0.0
2017-09-21 09:11:39 +01:00
Jörg Thalheim
aab8f8df4b nifticlib: use mirror for sourceforge 2017-09-21 09:10:12 +01:00
Jörg Thalheim
eaac347982 Merge pull request #29609 from lheckemann/impressive-fixes
impressive: fixes and improvements
2017-09-21 08:53:09 +01:00
Florian Jacob
6aea372e28 piwik: 3.1.0 -> 3.1.1 2017-09-21 08:58:02 +02:00
Nick Novitski
5ddfcc774c gemconfig: add curb 2017-09-20 23:53:25 -07:00
John Ericson
df0c265ee1 Merge pull request #29625 from obsidiansystems/linuxHeadersCross
glibc: Grab the right linux headers when build != host
2017-09-20 21:13:54 -04:00
John Ericson
8bfb247224 glibc: Grab the right linux headers when build != host
In #28519 / 791ce593ce I made linux
headers be intended to be used from the stage stage, as it would be if
it were a library containing headers and code. I forgot to update glibc,
however, so it was incorrectly using headers for the build platform, not
host platform.

This fixes that, basically reverting a small portion of changes I made a
few months ago in 25edc476fd and its
parent.

No native hashes are changed.
2017-09-20 20:57:41 -04:00
Robert Schütz
d58a88277d pythonPackages.py3status: add file as a dependency 2017-09-21 01:23:32 +02:00
Ben Darwin
0d981c5761 nifticlib: init at 2.0.0 2017-09-20 19:04:22 -04:00
Joachim Fasting
3e96cee147
hydra: 2017-07-27 -> 2017-09-14
Builds against recent nixUnstable
2017-09-21 01:02:02 +02:00
Robert Schütz
50d52ac8a8 texworks: init at 0.6.2 2017-09-21 00:58:49 +02:00
Joachim Fasting
6bf56656f0
snapper: 0.3.3 -> 0.5.0 2017-09-21 00:56:24 +02:00
Ben Darwin
c7bbe471b0 ants: bump version and fix sandboxed build 2017-09-20 18:42:34 -04:00
Thomas Tuegel
1e2ebee42a
hplip: fix Python wrappers
We cannot rely on wrapPythonPrograms to wrap the installed executables because
they are symlinks (which it ignores). Instead, we have to emulate it to make
the wrappers ourselves.
2017-09-20 17:03:12 -05:00
Joachim F
29c1888a57 Merge pull request #29560 from LumiGuide/elk-5.6.1
elk: 5.5.2 -> 5.6.1
2017-09-20 21:56:26 +00:00
Franz Pletz
94a5de61af
unifi: 5.5.20 -> 5.6.16 2017-09-20 23:51:48 +02:00
Simon Lackerbauer
27ed570445
atlassian-jira: 7.4.1 -> 7.5.0 2017-09-20 23:51:42 +02:00
Simon Lackerbauer
c95e158143
atlassian-confluence: 6.3.1 -> 6.4.0 2017-09-20 23:51:27 +02:00
Joachim F
408734441b Merge pull request #29593 from romildo/upd.tint2
tint2: 0.14.6 -> 15.1
2017-09-20 20:28:07 +00:00
Joachim F
ac7ab7ccbe Merge pull request #29596 from romildo/numix-icon-theme
numix-icon-theme: 2017-01-25 -> 2017-09-17
2017-09-20 20:27:46 +00:00
Joachim F
5e212b6eaf Merge pull request #29597 from romildo/upd.numix-icon-theme-circle
numix-icon-theme-circle: 2016-11-10 -> 17-09-13
2017-09-20 20:27:32 +00:00
Joachim F
cd72ad944d Merge pull request #29598 from romildo/upd.numix-icon-theme-square
numix-icon-theme-square: 2016-11-23 -> 17-09-13
2017-09-20 20:27:13 +00:00
Joachim F
cf60de70c0 Merge pull request #29600 from romildo/upd.flat-plat
flat-plat: 20170605 -> 20170917
2017-09-20 20:26:57 +00:00
Jörg Thalheim
71551ff0de Merge pull request #29607 from disassembler/mqtt-bench
mqtt-bench: init at 0.3.0
2017-09-20 21:23:39 +01:00
Joachim Fasting
c41af35c04
unbound: 1.6.5 -> 1.6.6 2017-09-20 22:23:05 +02:00
Joachim Fasting
7a1f5bad0c
ocamlPackages.csv: fix meta eval
fetchurl does not expose a meta.homepage attr
2017-09-20 22:15:26 +02:00
Thomas Tuegel
5ab37fb913
hplip: install PPDs where CUPS will find them 2017-09-20 14:04:55 -05:00
Linus Heckemann
05101d32c0 impressive: fixes and improvements
- Fix finding SDL (would previously fail unless gcc was in environment)
- Use ghostscript rather than xpdf for rendering as it has a slightly
  smaller closure
- Fix broken link for reasoning behind name change
- Add self to maintainers
- Add reference to DejaVu fonts so it can always find the OSD fonts
- Install manpage into correct location
2017-09-20 19:41:42 +01:00
Antoine Eiche
cb6fc52f99 dockerTools.buildImageWithNixDb: Make output paths valid and add gcroots
The database dump doesn't contain sha and size. This leads to invalid
path in the container. We have to fix the database by using
nix-store.
Note a better way to do this is available in Nix 1.12 (since the
database dump contains all required information).

We also add content output paths in the gcroots since they ca be used
by the container.
2017-09-20 20:14:29 +02:00
Antoine Eiche
df589a438e dockerTools.buildImageWithNixDb: populate the Nix Db of the image Nix store
Currently, the contents closure is copied to the layer but there is no
nix database initialization. If pkgs.nix is added in the contents,
nix-store doesn't work because there is no nix database.

From the contents of the layer, this commit generates and loads the
database in the nix store of the container. This only works if there
is no parent layer that already have a nix store (to support several
nix layers, we would have to merge nix databases of parent layers).

We also add an example to play with the nix store inside the
container. Note it seems `more` is a missing dependency of the nix
package!
2017-09-20 20:14:24 +02:00
Michael Weiss
9182927998 gengetopt: Fix the build
Thanks @orivej for providing this fix.

Fix #28255 (the build was broken since
2bc7b4e134).
2017-09-20 19:32:06 +02:00
Samuel Leathers
f8ad84ad23 mqtt-bench: init at 0.3.0 2017-09-20 12:37:19 -04:00
Tuomas Tynkkynen
2c2cd34b54 esptool: Fix tests in sandbox
It actually requires flake8-future-import but manages to download it
from the Internet when run outside the sandbox.
2017-09-20 17:55:31 +03:00
Tuomas Tynkkynen
ecebb6090a pythonPackages.flake8-future-import: Init at 0.4.3 2017-09-20 17:55:31 +03:00
Peter Simons
56207cdbd1 rtorrent: update to current git HEAD to avoid build errors with recent cppunit
Fixes https://github.com/NixOS/nixpkgs/issues/29601.
2017-09-20 16:53:03 +02:00
Peter Simons
6b0e6e2e97 libtorrent: update to current git HEAD to avoid build errors with recent cppunit 2017-09-20 16:53:03 +02:00
Daniel Peebles
f0982ba4be Merge pull request #29594 from NeQuissimus/minikube_0_22_2
minikube: 0.22.1 -> 0.22.2
2017-09-20 10:51:57 -04:00
Ruben Maher
98a2316166 nfs-utils: set /etc/krb5.keytab as default path for rpc-gssd
Currently the `rpc-gssd.service` has a `ConditionPathExists` clause that can
never be met, because it's looking for stateful data inside `/nix/store`.

`auth-rpcgss-module.service` also only starts if this file exists.

Fixes NixOS/nixpkgs#29509.
2017-09-20 15:36:26 +01:00
Peter Hoeg
55c58c0826 calibre: 3.5.0 -> 3.7.0 2017-09-20 22:24:29 +08:00
Peter Simons
0dddef468d hackage-packages.nix: automatic Haskell package set update
This update was generated by hackage2nix v2.5-9-g8a6ffec-dirty from Hackage revision
9e7aa353cc.
2017-09-20 16:18:36 +02:00
Tim Steinbach
e200cfbae1
sbt: 1.0.1 -> 1.0.2 2017-09-20 09:42:03 -04:00
Tim Steinbach
6941fe36f3 Merge pull request #29495 from NeQuissimus/vscode_1_16_1
vscode: 1.16.0 -> 1.16.1
2017-09-20 08:40:20 -04:00
Tim Steinbach
eab480ac3d
linux: 4.13.2 -> 4.13.3 2017-09-20 08:36:27 -04:00
Tim Steinbach
726765404b
linux: 4.12.13 -> 4.12.14 2017-09-20 08:36:13 -04:00
Tim Steinbach
7cfa6895e8
linux: 4.9.50 -> 4.9.51 2017-09-20 08:35:44 -04:00
Tim Steinbach
890386090a
minikube: 0.22.1 -> 0.22.2 2017-09-20 08:34:22 -04:00
Jörg Thalheim
e3141bc1b1 valauncher: 1.2 -> 1.3.1 2017-09-20 13:23:56 +01:00
Andreas Rammhold
ac9353b815 jetbrains.webstorm: 2017.2.2 -> 2017.2.4 2017-09-20 14:05:49 +02:00
Andreas Rammhold
4948b09524 jetbrains.rider: 171.4456.1432 -> 2017.1.1 2017-09-20 14:05:42 +02:00
José Romildo Malaquias
f89ba64f00 flat-plat: 20170605 -> 20170917 2017-09-20 08:26:02 -03:00
Matthias Beyer
d697403303 khal: 0.9.5 -> 0.9.7 2017-09-20 13:03:19 +02:00
Andreas Rammhold
eb363ff3dc
jetbrains.pycharm-professional: 2017.2.2 -> 2017.2.3 2017-09-20 12:46:46 +02:00
Andreas Rammhold
0d6b50f2eb
jetbrains.pycharm-community: 2017.2.2 -> 2017.2.3 2017-09-20 12:46:27 +02:00
Andreas Rammhold
5f9a4cb163
jetbrains.phpstorm: 2017.2.1 -> 2017.2.2 2017-09-20 12:46:07 +02:00
Andreas Rammhold
74d7542892
jetbrains.idea-ultimate: 2017.2.2 -> 2017.2.4 2017-09-20 12:45:40 +02:00
Andreas Rammhold
d6663a559c
jetbrains.idea-community: 2017.2.2 -> 2017.2.4 2017-09-20 12:45:18 +02:00
Andreas Rammhold
5b3dad3b1c
jetbrains.gogland: 172.3757.46 -> 172.3968.45 2017-09-20 12:44:32 +02:00
Andreas Rammhold
42e13a85ed
jetbrains.clion: 2017.2.1 -> 2017.2.2 2017-09-20 12:44:02 +02:00
José Romildo Malaquias
79941a3bf4 numix-icon-theme-square: 2016-11-23 -> 17-09-13 2017-09-20 07:10:44 -03:00
Jörg Thalheim
2ebfdf972f nvim-cm-racer: init at 2017-07-27 2017-09-20 11:10:16 +01:00
Jörg Thalheim
276d234659 vimPlugins.LanguageClient-neovim: init at 2017-09-05 2017-09-20 11:10:09 +01:00
José Romildo Malaquias
c40b6862f2 numix-icon-theme-circle: 2016-11-10 -> 17-09-13 2017-09-20 07:04:21 -03:00
José Romildo Malaquias
b9907fc6fe numix-icon-theme: 2017-01-25 -> 2017-09-17 2017-09-20 06:47:53 -03:00
José Romildo Malaquias
ee88bd3424 tint2: 0.14.6 -> 15.1 2017-09-20 06:35:19 -03:00
Moritz Kiefer
d5a33e8f38 ghcjsHEAD: bump ghcjs shims 2017-09-20 10:59:22 +02:00
Gauthier POGAM--LE MONTAGNER
e1cab6b4c5
jetbrains.phpstorm10: remove 2017-09-20 10:46:18 +02:00
Gauthier POGAM--LE MONTAGNER
88de0e44f6
jetbrains.idea{14,15}-{community,ultimate}: remove 2017-09-20 10:46:18 +02:00
Gauthier POGAM--LE MONTAGNER
352855e778
jetbrains.webstorm{10,11}: remove 2017-09-20 10:46:17 +02:00
Gauthier POGAM--LE MONTAGNER
5a6939fefb
jetbrains.ruby-mine{7,8}: remove 2017-09-20 10:46:17 +02:00
Jörg Thalheim
daf833316a Merge pull request #29578 from jfroche/upgrade-openfortivpn
openfortivpn: 1.2.0 -> 1.5.0
2017-09-20 09:35:59 +01:00
Jean-Francois Roche
0b39118494 openfortivpn: 1.2.0 -> 1.5.0
fixes #29578
2017-09-20 09:21:42 +01:00
Lancelot SIX
4935d5f376 gnupg: 2.2.0 -> 2.2.1
See http://lists.gnu.org/archive/html/info-gnu/2017-09/msg00010.html
for release information
2017-09-20 10:01:28 +02:00
John Ericson
e9c1f64048 Merge branch 'master' into staging 2017-09-20 01:39:59 -04:00
Vincent Laporte
1e9deaad66 ocamlPackages.csv: 1.7 -> 2.0 2017-09-20 05:39:12 +00:00
John Ericson
19e3c580ad Merge pull request #29584 from obsidiansystems/no-wrapCCCross
top-level: Remove useless abstractions
2017-09-20 01:25:02 -04:00
John Ericson
1fc12241ed all-packages: get rid of wrapCCCross
It's unneeded
2017-09-20 00:59:19 -04:00
John Ericson
e19bb868dc all-packages: Remove forcedNativePackages; we no longer need it
Its kept around in the Hurd package set, but all that code is
presumably broken.
2017-09-20 00:59:19 -04:00
John Ericson
100db4fa3b vim: Properly categorize pkgconfig dependency 2017-09-20 00:58:55 -04:00
Jörg Thalheim
c1de354a3d libwebsockets: revert making libuv a propagated build input
it is possible to use libwebsockets without libuv

cc @volth
2017-09-20 02:49:31 +01:00
Jörg Thalheim
87435a95f8 Merge pull request #29562 from LumiGuide/journalbeat-5.6.0
journalbeat: 5.5.0 -> 5.6.0
2017-09-20 02:44:40 +01:00