Commit Graph

4382 Commits

Author SHA1 Message Date
DarkOnion0
1e31734c9e drawio: 16.4.0 -> 16.5.1 2022-01-28 20:54:35 +01:00
06kellyjac
e98d8f7207 feh: correct license 2022-01-28 14:23:25 +00:00
Jan Tojnar
2da5ce4ab3 Merge branch 'staging-next' into staging
; Conflicts:
;	pkgs/development/python-modules/fakeredis/default.nix
2022-01-28 14:05:11 +01:00
Mica Semrick
36bea6f5f8 darktable: set lua version in all-packages.nix 2022-01-28 11:53:56 +01:00
Jan Tojnar
8152911f61
Merge pull request #149570 from r-ryantm/auto-update/poppler-glib
poppler: 21.06.1 -> 22.01.0
2022-01-28 11:42:30 +01:00
Bobby Rong
58f285c4f4
Merge pull request #156913 from dali99/update_hydrus2
hydrus: 470b -> 471
2022-01-28 17:16:45 +08:00
Jan Tojnar
c4b9851332 inkscape: fix build with Poppler 21.11.0 2022-01-27 17:49:12 +01:00
R. RyanTM
899778e8cf
tev: 1.19 -> 1.22
* tev: 1.19 -> 1.22 (#156914)

* tev: don't build on aarch64-linux

Co-authored-by: Renaud <c0bw3b@users.noreply.github.com>
2022-01-27 17:06:22 +01:00
Sandro
27cccd4e49
Merge pull request #151363 from Stunkymonkey/doc-updateWalker 2022-01-27 14:06:36 +01:00
Markus S. Wamser
3624f96c70 imagemagick: apply upstream patch to fix perlPackages.ImageMagick 2022-01-27 13:37:01 +01:00
Jan Solanti
4591082c61 renderdoc: 1.17 -> 1.18 2022-01-27 01:38:14 +02:00
Daniel Olsen
e5dfca887c hydrus: 470b -> 471 2022-01-26 23:11:45 +01:00
Felix Buehler
ed7bf9452c treewide: remove *.upstream files from updateWalker 2022-01-26 21:46:07 +01:00
Jonathan Ringer
e379e3d4bb
Merge remote-tracking branch 'origin/staging-next' into staging
Conflicts:
	pkgs/development/python-modules/googleapis-common-protos/default.nix
2022-01-24 23:49:19 -08:00
github-actions[bot]
bbbd0a92af
Merge master into staging-next 2022-01-25 00:02:13 +00:00
R. Ryantm
8fbbb41354 menyoki: 1.5.5 -> 1.5.6 2022-01-24 18:59:42 +00:00
Alyssa Ross
1a60dd2adc
Merge remote-tracking branch 'nixpkgs/staging-next' into staging
Conflicts:
	pkgs/development/python-modules/cupy/default.nix
	pkgs/development/python-modules/staticjinja/default.nix
2022-01-24 15:39:34 +00:00
Patrick Hilhorst
4ed7bed68d
Merge branch 'master' into nixos-tests-missing 2022-01-24 12:05:30 +01:00
Sandro
bdcfc06ae2
Merge pull request #156187 from c0bw3b/pkg/imlib2 2022-01-23 22:17:06 +01:00
Fabian Möller
4329d79dba
nixos/tests: link tests to their packages 2022-01-23 21:08:10 +01:00
c0bw3b
ff517c4db7 imlibsetroot: adapt to Imlib2 v1.7.5
imlib2-config is gone

imlibsetroot.c license header is actually MIT-advertising
2022-01-23 18:14:54 +01:00
github-actions[bot]
8d5200b415
Merge master into staging-next 2022-01-23 12:02:06 +00:00
Alvar Penning
0439a474bf imagemagick: 7.1.0-19 -> 7.1.0-20
https://github.com/ImageMagick/ImageMagick/releases/tag/7.1.0-20
2022-01-23 13:01:33 +01:00
github-actions[bot]
591c66a4e3
Merge master into staging-next 2022-01-23 06:00:56 +00:00
DarkOnion0
b67aa192ba drawio: add a check phase 2022-01-22 17:58:41 +01:00
DarkOnion0
23507a5d7c drawio: 16.1.2 -> 16.4.0 2022-01-22 17:40:08 +01:00
github-actions[bot]
1ca0ba653f
Merge master into staging-next 2022-01-22 00:01:46 +00:00
R. RyanTM
e01fa67cdd
drawing: 0.8.3 -> 0.8.5
(#156017)
2022-01-21 19:30:50 +01:00
github-actions[bot]
e156d59d2b
Merge master into staging-next 2022-01-21 12:01:24 +00:00
Bobby Rong
ea1f1453ac
Merge pull request #155198 from trofi/fix-inkscape-for-gcc-12
inkscape: fix build against upcoming gcc-12
2022-01-21 17:23:50 +08:00
Renaud
f6722c80d4
Merge pull request #155429 from herrwiese/master
geeqie: 1.6 -> 1.7.1
2022-01-21 10:11:27 +01:00
Andreas Wiese
64eac0ea11 geeqie: 1.6 -> 1.7.1
This especially fixes

  $ geeqie

  (geeqie:1879548): Gdk-ERROR **: 00:08:00.631: The program 'geeqie'
  received an X Window System error.
  This probably reflects a bug in the program.
  The error was 'BadValue (integer parameter out of range for operation)'.
    (Details: serial 209 error_code 2 request_code 152 (GLX) minor_code
  24)
    (Note to programmers: normally, X errors are reported asynchronously;
     that is, you will receive the error a while after causing it.
     To debug your program, run it with the GDK_SYNCHRONIZE environment
     variable to change this behavior. You can then get a meaningful
     backtrace from your debugger if you break on the gdk_x_error()
  function.)
  zsh: trace trap (core dumped)  geeqie
  $

which stems from some issue with clutter-gtk.
2022-01-21 00:17:55 +01:00
github-actions[bot]
360ff20100
Merge master into staging-next 2022-01-20 06:01:09 +00:00
Daniel Olsen
c7193ca132 hydrus: 469 -> 470b 2022-01-19 23:02:14 +01:00
Sergei Trofimovich
5f12173f81 inkscape: fix build against upcoming gcc-12
Without the change build fails as:

    src/io/file.h:29:63: error: use of deleted function
      'std::__cxx11::basic_string<...>::basic_string(std::nullptr_t) [...]'
       29 | SPDocument* ink_file_new(const std::string &Template = nullptr);
          |                                                               ^
2022-01-19 08:19:24 +00:00
github-actions[bot]
1b54e5bb50
Merge master into staging-next 2022-01-19 06:01:24 +00:00
Bobby Rong
32e4b9949d
Merge pull request #155241 from jansol/renderdoc
renderdoc: 1.16 -> 1.17
2022-01-19 11:52:52 +08:00
github-actions[bot]
c795e7ba4f
Merge master into staging-next 2022-01-17 18:01:06 +00:00
Jan Tojnar
6e046a4e71
Merge pull request #155364 from wentasah/inkscape-fix-line-spacing
inkscape: fix line spacing problem
2022-01-17 18:21:02 +01:00
github-actions[bot]
0eee7ee8c8
Merge master into staging-next 2022-01-17 12:01:25 +00:00
Michal Sojka
a6f6108149 inkscape: fix line spacing problem
Inkscape does not work well with with Pango 1.49+ (nixpkgs has Pango
1.50.0). An upstream commit with the fix will be a part of upcomming
1.1.2 release due in a month. Until than, let's apply the fix in
nixpkgs.
2022-01-17 12:33:57 +01:00
Frederik Rietdijk
afef6d0e81
Merge pull request #154687 from dotlambda/python-alias
python,pythonPackages: make aliases
2022-01-17 09:37:49 +01:00
github-actions[bot]
f0a71fe6f3
Merge master into staging-next 2022-01-17 06:01:22 +00:00
Thiago Kenji Okada
78abd4df66 pinta: add translations, use msbuild to install files 2022-01-16 19:34:39 -03:00
Robert Schütz
d5cceedbd1 python,pythonPackages: make aliases
Since aliases are disallowed in nixpkgs, this makes usage of Python 2
which is EOL more explicit.
2022-01-16 18:39:59 +00:00
github-actions[bot]
d1d6f982a8
Merge master into staging-next 2022-01-16 18:00:59 +00:00
Jan Solanti
1f42b69c67 renderdoc: 1.16 -> 1.17
Also set up updateScript since there haven't been any particularly
dramatic changes requiring modifications to the expression in a while.
2022-01-16 19:10:47 +02:00
Thiago Kenji Okada
1ed395aaaf pinta: 2.0.1 -> 2.0.2 2022-01-16 11:36:01 -03:00
Pavol Rusnak
5c32667d6e
Merge pull request #154677 from IvarWithoutBones/dotnetModule-installphase
buildDotnetModule: wrap executables in preFixup
2022-01-16 15:22:54 +01:00
github-actions[bot]
0173b359a6
Merge master into staging-next 2022-01-16 12:01:11 +00:00
wackbyte
bbf10ee6a8 krita: 5.0.0 -> 5.0.2 2022-01-16 09:56:26 +01:00
github-actions[bot]
122cae786e
Merge master into staging-next 2022-01-16 06:01:16 +00:00
Martin Weinelt
3c0752dbe0
displaycal: drop
Last release from 2019, hasn't migrated to python3.

```
Traceback (most recent call last):
  File "/build/DisplayCAL-3.8.9.3/nix_run_setup", line 8, in <module>
    exec(compile(getattr(tokenize, 'open', open)(__file__).read().replace('\\r\\n', '\\n'), __file__, 'exec'))
  File "setup.py", line 258
    print "Bumping version number %s ->" % \
          ^
SyntaxError: Missing parentheses in call to 'print'. Did you mean print("Bumping version number %s ->" % \)?
```
2022-01-16 02:36:25 +01:00
github-actions[bot]
a6928c74cc
Merge master into staging-next 2022-01-13 12:01:29 +00:00
Bobby Rong
0ac4b516c0
Merge pull request #153688 from brandonweeks/electron
blockbench-electron: 3.7.5 -> 4.1.1
2022-01-13 18:30:00 +08:00
Bobby Rong
31fe3448c4
Merge pull request #154669 from evanjs/imgbrd-grabber/7.7.1
imgbrd-grabber: 7.7.0 -> 7.7.1
2022-01-13 18:01:56 +08:00
Daniel Olsen
7738de9075 hydrus: 468 -> 469 2022-01-13 00:36:12 +01:00
Daniel Olsen
0e5389c1f8 hydrus: 467 -> 468 2022-01-13 00:36:11 +01:00
github-actions[bot]
9b5359861c
Merge master into staging-next 2022-01-12 12:01:06 +00:00
Bobby Rong
6b65ba196c
Merge pull request #154631 from figsoda/update-image-roll
image-roll: 1.4.0 -> 1.4.1
2022-01-12 16:45:54 +08:00
github-actions[bot]
e81177a147
Merge staging-next into staging 2022-01-12 00:02:57 +00:00
IvarWithoutBones
88064e44a6 pinta: dont manually set gappsWrapperArgs
As of aa36cb9d1ec58764af9a5df6674a19c4170d8e9d, this is not required anymore.
2022-01-12 00:23:53 +01:00
Evan Stoll
e5c57c36bf imgbrd-grabber: 7.7.0 -> 7.7.1 2022-01-11 17:35:58 -05:00
Lassulus
1b29f6fdb8
Merge pull request #152738 from r-ryantm/auto-update/imgbrd-grabber
imgbrd-grabber: 7.5.1 -> 7.7.0
2022-01-11 23:10:11 +01:00
figsoda
cd96c5afdd image-roll: 1.4.0 -> 1.4.1 2022-01-11 13:41:34 -05:00
Jörg Thalheim
d49c972804
Merge pull request #153448 from Mic92/k3d
k3d: remove
2022-01-11 18:24:00 +00:00
Alyssa Ross
d77022e114
Merge remote-tracking branch 'nixpkgs/staging-next' into staging
Conflicts:
	nixos/doc/manual/from_md/release-notes/rl-2205.section.xml
	nixos/doc/manual/release-notes/rl-2205.section.md
2022-01-11 16:35:43 +00:00
Max Hausch
a3d54a465d
inkscape: Remove networkmanager as an inkscape dependency 2022-01-10 15:07:21 +01:00
Jan Tojnar
f7aa55946b Merge branch 'staging-next' into staging
; Conflicts:
;	nixos/doc/manual/from_md/release-notes/rl-2205.section.xml
;	nixos/doc/manual/release-notes/rl-2205.section.md
;	pkgs/build-support/libredirect/default.nix
2022-01-10 01:26:05 +01:00
Jan Tojnar
e2441863d4 gnome-photos: remove adwaita-icon-theme dependency
Adding an icon theme as dependency will not do anything
other than contaminating XDG_DATA_DIRS by its build time value
(through hicolor-icon-theme+wrapGAppsHook setup hooks).
2022-01-09 02:04:37 +01:00
github-actions[bot]
cf7efe1192
Merge staging-next into staging 2022-01-08 12:01:36 +00:00
Maximilian Bosch
4979df6ca1
Merge pull request #153911 from jyooru/update/feh
feh: 3.7.2 -> 3.8
2022-01-07 23:50:23 +01:00
Joel
c94d5d98f7
feh: 3.7.2 -> 3.8 2022-01-08 08:29:03 +10:00
Jonathan Ringer
172bcecd6b
Merge remote-tracking branch 'origin/staging-next' into staging 2022-01-07 10:32:13 -08:00
Thiago Kenji Okada
949155cbec pinta: 2.0 -> 2.0.1 2022-01-07 10:48:51 -03:00
github-actions[bot]
aed0ee64b8
Merge staging-next into staging 2022-01-07 06:02:04 +00:00
Ben Siraphob
3cc74356f4
Merge pull request #153746 from siraben/https-urls
treewide: replace some URLs with https variants + fix homepage redirects
2022-01-07 09:59:16 +07:00
Ben Siraphob
e9e90a941b
treewide: replace http://web.archive.org with https://web.archive.org 2022-01-07 09:58:36 +07:00
github-actions[bot]
1342506d40
Merge staging-next into staging 2022-01-07 00:04:19 +00:00
Pavol Rusnak
0b5c462b4e
ovito: 3.4.0 -> 3.6.0 2022-01-06 20:40:39 +01:00
Robert Scott
fbf0ca0d13
Merge pull request #152874 from r-ryantm/auto-update/graphicsmagick
graphicsmagick: 1.3.36 -> 1.3.37
2022-01-06 18:23:05 +00:00
Will Cohen
93c3b17f75 ovito: mark as broken on darwin 2022-01-06 13:09:12 -05:00
Brandon Weeks
f8a84952e0 blockbench-electron: 3.7.5 -> 4.1.1 2022-01-05 23:20:26 -08:00
github-actions[bot]
ad23b42739
Merge staging-next into staging 2022-01-06 00:02:40 +00:00
Vladimír Čunát
2f8299f321
Merge #151500: opentoonz: 1.4.0 -> 1.5.0 2022-01-05 19:37:36 +01:00
github-actions[bot]
a738715d80
Merge staging-next into staging 2022-01-05 00:02:28 +00:00
Thiago Kenji Okada
13c35a4f5f pinta: add meta.mainProgram 2022-01-04 15:18:56 -03:00
github-actions[bot]
285dff553d
Merge staging-next into staging 2022-01-04 18:01:46 +00:00
Thiago Kenji Okada
f3369c6977 pinta: 1.7.1 -> 2.0
Pinta now uses dotnet 6.0 + GTK3 instead of old mono + gtk-sharp (GTK2)
library. So build it with the new buildDotnetModule introduced sometime ago.

This does causes some small issues. For example, there is no translations
since this is build using autoreconf + intltool + pkg-config. There is no
way to build just translations using this build system AFAIK. Shouldn't be
too much of an issue considering that we also didn't had translations
before (or it was incomplete).
2022-01-04 09:50:32 -03:00
Jörg Thalheim
c8a29fc999 k3d: remove 2022-01-04 08:49:29 +01:00
github-actions[bot]
25662d01ae
Merge staging-next into staging 2022-01-04 00:02:40 +00:00
Jan Tojnar
009de75a84
Merge pull request #153225 from NixOS/libportal
Fix builds broken by libportal update
2022-01-03 00:46:23 +01:00
Scott Worley
920c5cd2b4 opentoonz-libtiff: Note knownVulnerabilities 2022-01-02 15:31:55 -08:00
Scott Worley
a20e31bf09 opentoonz: 1.4.0 -> 1.5.0
(The qtbase diamond-dependency problem was resolved in 4bac8a7a00)
2022-01-02 15:31:55 -08:00
Jan Tojnar
50dd556b4f gcolor3: fix build 2022-01-02 17:01:47 +01:00
Patrick Hilhorst
51b29225e9
Merge pull request #153105 from paperdigits/darktable-38 2022-01-02 13:07:53 +01:00
Mica Semrick
a97f7f700e darktable: run nixpkgs-fmt 2022-01-01 13:32:28 -08:00
Mica Semrick
a3786f99a2 darktable: 3.6.1 -> 3.8.0 2022-01-01 13:31:44 -08:00
Bobby Rong
031376dbb9
Merge pull request #148857 from vs49688/meshlab
meshlab: 2020.12 -> 2021.10
2022-01-01 19:56:33 +08:00
zowoq
36b5fc4b36 buildGoModule packages: remove unnecessary runVend 2022-01-01 15:55:33 +10:00
Ben Siraphob
7eca037d30 pbrt: fix meta.homepage 2021-12-31 11:17:07 -08:00
Bobby Rong
0d1c42d7b2
Merge pull request #152782 from r-ryantm/auto-update/lightburn
lightburn: 1.0.04 -> 1.0.06
2021-12-31 21:04:40 +08:00
DarkOnion0
278cee9de2 drawio: 16.0.2 -> 16.1.2 2021-12-31 10:45:13 +01:00
R. Ryantm
8a8572a7c4 graphicsmagick: 1.3.36 -> 1.3.37 2021-12-31 05:07:59 +00:00
R. Ryantm
561614728a lightburn: 1.0.04 -> 1.0.06 2021-12-30 19:35:05 +00:00
R. Ryantm
d4c3973092 imgbrd-grabber: 7.5.1 -> 7.7.0 2021-12-30 16:19:51 +00:00
legendofmiracles
73f18ebfff
Merge pull request #145051 from noneucat/fix/weylus-pipewire 2021-12-27 07:47:17 -06:00
Jan Tojnar
998234e12e
Merge pull request #152245 from jtojnar/gimp
gimp: 2.10.28 → 2.10.30
2021-12-27 12:33:02 +01:00
Robert Schütz
2c526159cf imagemagick: 7.1.0-17 -> 7.1.0-19 2021-12-27 01:53:34 +01:00
Jan Tojnar
e6c3e3d394 gimp: 2.10.28 → 2.10.30
https://www.gimp.org/news/2021/12/21/gimp-2-10-30-released/
2021-12-26 15:21:20 +01:00
DarkOnion0
57c19a77d4 drawio: 16.0.0 -> 16.0.2 2021-12-24 14:06:46 +01:00
figsoda
268fd4723d image-roll: 1.3.1 -> 1.4.0 2021-12-23 22:23:29 -05:00
Felix Bühler
e0f8595b15
Merge pull request #145090 from Stunkymonkey/buildDotnetPackage-pname
buildDotnetPackage/fetchNuGet: use `pname` instead of `name` and `baseName`
2021-12-24 00:55:24 +01:00
Felix Bühler
85b6f5299c
Merge pull request #150542 from Stunkymonkey/treewide-github-1
treewide: switch to fetchFromGitHub part 1
2021-12-24 00:24:37 +01:00
Felix Buehler
1d047ac77e geeqie: switch to fetchFromGitHub 2021-12-24 00:04:12 +01:00
Felix Buehler
989e950f48 buildDotnetPackage: rename baseName to pname 2021-12-23 22:46:35 +01:00
Felix Buehler
cd897b859b scantailor: switch to fetchFromGitHub 2021-12-23 19:11:17 +01:00
Ilan Joselevich
2f2dc9dd62 krita-beta: alias to krita 2021-12-23 19:43:37 +02:00
Ilan Joselevich
c3b03050eb krita: 4.4.8 -> 5.0.0 2021-12-23 17:10:49 +02:00
Daniel Olsen
d41201d708 hydrus: 466 -> 467 2021-12-23 00:50:41 +01:00
Bobby Rong
7827393729
Merge pull request #151388 from austinbutler/digikam-740
digikam: 7.3.0 -> 7.4.0
2021-12-22 18:19:43 +08:00
Ben Darwin
f527818ea6 f3d: 1.2.0 -> 1.2.1 2021-12-22 02:28:42 -05:00
Austin Butler
10ce0204ac digikam: 7.3.0 -> 7.4.0 2021-12-21 15:33:48 -08:00
Emery Hemingway
8c509d504d imv: 4.3.0 -> 4.3.1
Package update, split outputs, sources moved to SourceHut.
2021-12-20 14:57:33 +01:00
DarkOnion0
09b8e7c89b drawio: 15.8.7 -> 16.0.0 2021-12-18 20:38:32 +01:00
Bobby Rong
aaea8029e4
Merge pull request #149841 from dali99/update_hydrus2
hydrus: 464 -> 466
2021-12-18 20:06:50 +08:00
Bobby Rong
040d6eb51a
Merge pull request #150147 from smancill/bump-hdr-plus
hdr-plus: unstable-2020-10-29 -> unstable-2021-12-10
2021-12-17 16:34:06 +08:00
Bobby Rong
7b720837e7
Merge pull request #150332 from r-ryantm/auto-update/avocode
avocode: 4.15.1 -> 4.15.5
2021-12-17 11:35:20 +08:00
Andy Chun @noneucat
45db1b5f38 weylus: add meta.platforms 2021-12-16 12:44:53 -08:00
Andy Chun @noneucat
d727551423 weylus: add pipewire gst plugins to GST_PLUGIN_PATH
Weylus was not picking up the PipeWire GStreamer plugins required for
PipeWire functionality. This commit adds the appropriate path to
GST_PLUGIN_PATH for the binary.
2021-12-16 12:43:31 -08:00
Robert Schütz
715ebb50a6 megapixels: 1.4.2 -> 1.4.3
https://gitlab.com/postmarketOS/megapixels/-/tags/1.4.3
2021-12-16 08:31:00 -08:00
Alyssa Ross
82f2c5e3a1 symbolic-preview: init at 0.0.2 2021-12-16 16:09:26 +00:00
Alyssa Ross
8d63b3ddb3 icon-library: init at 0.0.8 2021-12-16 16:09:16 +00:00
Daniel Olsen
95db526b4d hydrus: 464 -> 466 2021-12-15 23:29:41 +01:00
snkgak
fce2dca966
brscan5: 1.2.6-0 -> 1.2.7-0 2021-12-14 23:04:37 +08:00
R. Ryantm
8ddda2b444 avocode: 4.15.1 -> 4.15.5 2021-12-11 23:23:51 +00:00
Sebastián Mancilla
27b8a8df3e hdr-plus: unstable-2020-10-29 -> unstable-2021-12-10 2021-12-10 19:27:27 -03:00
Doron Behar
6494a49b1a pdfcpu: Add an installCheck 2021-12-08 07:04:56 +02:00
R. Ryantm
3ffb1e60e5 pdfcpu: 0.3.12 -> 0.3.13 2021-12-08 00:05:59 +00:00
R. Ryantm
e97eeacafc f3d: 1.1.1 -> 1.2.0 2021-12-06 19:16:18 +00:00
Zane van Iperen
7c0942ba57
meshlab: 2020.12 -> 2021.10
* De-vendors boost and xercesc
* Enables CGAL
2021-12-06 14:35:38 +10:00
Kerstin Humm
7617df63c2
imagemagick: 7.1.0-16 -> 7.1.0-17 2021-12-06 00:29:25 +01:00
ckie
31e19b9546
xrgears: unstable-2020-04-15 -> unstable-2021-06-19 2021-12-05 21:59:04 +02:00
ckie
f4a5fd4682
xrgears: add LD_LIBRARY_PATH wrapper to unbreak 2021-12-05 21:58:25 +02:00
R. Ryantm
43ca0f5e74 viewnior: 1.7 -> 1.8 2021-12-05 17:37:09 +00:00
Sandro
48e11eb977
Merge pull request #148430 from jtojnar/gimp-texturize 2021-12-05 02:01:51 +01:00
Sandro
955bc9b5c2
Merge pull request #142643 from danth/ascii-image-converter 2021-12-05 00:58:22 +01:00
Daniel Thwaites
97fe3d9aa3
ascii-image-converter: init at 1.11.0 2021-12-04 23:31:26 +00:00
Michael Weiss
16e55eac06
tev: remove myself as maintainer
I'm not using it anymore.
2021-12-04 15:09:04 +01:00
Michael Weiss
3b3494eca2
tev: 1.17 -> 1.19 2021-12-04 15:08:36 +01:00