Commit Graph

2926 Commits

Author SHA1 Message Date
sternenseemann
7f31ab271c Merge remote-tracking branch 'origin/master' into haskell-updates 2021-06-06 12:44:46 +02:00
github-actions[bot]
47de0ebf63
Merge master into staging-next 2021-06-06 06:23:08 +00:00
Sable Seyler
59a07bc60f
terra: add seylerius as a maintainer 2021-06-05 19:06:46 -07:00
Nicolás Kennedy
19f80f0d32
veikk-linux-driver-gui: init at 2.0
Add configuration utility to configure VEIKK brand digitizers
2021-06-05 17:16:38 -07:00
github-actions[bot]
d9d6f71e43
Merge master into staging-next 2021-06-05 18:30:28 +00:00
Sandro
32e38027aa
Merge pull request #125747 from ratsclub/master 2021-06-05 18:30:56 +02:00
Sandro
db0abdd87e
Merge pull request #118921 from necessarily-equal/unvanquished 2021-06-05 17:20:56 +02:00
sternenseemann
1e7351550c maintainers/…/regenerate-hackage-packages.sh: overrideable hackage2nix
Allow setting the HACKAGE2NIX environment variable to change the
hackage2nix the script uses to an absolute path to a local build. Useful
to test local changes in a realistic environment.
2021-06-05 17:03:08 +02:00
Sandro
1918720d0f
Merge pull request #124234 from rkitover/aucc-init 2021-06-05 16:57:36 +02:00
Victor Freire
841ae9708e maintainers: add ratsclub 2021-06-05 01:21:10 -03:00
github-actions[bot]
ad63c3d31f
Merge master into staging-next 2021-06-04 19:40:59 +00:00
Antoine Fontaine
758c87007c unvanquished: init at 0.52.0 2021-06-04 17:48:46 +02:00
Roosemberth Palacios
699f8a215c
maintainers: update roosemberth's mail and add gpg key (#125667)
The previous email account no longer exists.

Signed-off-by: Roosembert Palacios <roosemberth@posteo.ch>
2021-06-04 16:58:37 +02:00
github-actions[bot]
065a1dcee6
Merge master into staging-next 2021-06-04 13:00:24 +00:00
Sandro
950b4ddfdf
Merge pull request #125188 from musfay/qdl 2021-06-04 11:17:06 +02:00
Sandro
6cafa9f06a
Merge pull request #124360 from frogamic/124352-quintom-cursor-theme 2021-06-04 11:15:23 +02:00
github-actions[bot]
a9f286f5cf
Merge master into staging-next 2021-06-03 19:52:02 +00:00
Sandro
66d245a51c
Merge pull request #124880 from nkpvk/natural-docs 2021-06-03 17:59:06 +02:00
Sandro
8894fc5d49
Merge pull request #124579 from IreneKnapp/oneko 2021-06-03 17:28:34 +02:00
github-actions[bot]
a12e0d5bff
Merge master into staging-next 2021-06-03 12:49:11 +00:00
Fabian Affolter
cf9ba37d43
Merge pull request #125210 from 0xbe7a/master
pferd: init at 3.0.1
2021-06-03 12:50:46 +02:00
Niko Pavlinek
4b0c3de58c maintainers: nipav -> nkpvk 2021-06-02 21:06:30 +02:00
github-actions[bot]
9e56e764cd
Merge master into staging-next 2021-06-02 13:08:13 +00:00
Sandro
a9c61f2c67
Merge pull request #119057 from erdnaxe/obs-websocket 2021-06-02 10:15:24 +02:00
github-actions[bot]
42b70ad7f1
Merge master into staging-next 2021-06-01 20:30:45 +00:00
Mustafa Çalışkan
bb25328562
maintainers: add musfay 2021-06-01 17:17:47 +03:00
Sandro
bec25aa852
Merge pull request #124955 from tfc/ustreamer 2021-06-01 15:16:50 +02:00
be7a
326eb72c9d
maintainers: Add Bela Stoyan 2021-06-01 13:11:59 +02:00
Rafael Kitover
180d6d4de5
maintainers: add rkitover
Signed-off-by: Rafael Kitover <rkitover@gmail.com>
2021-06-01 02:50:29 +00:00
github-actions[bot]
7f14676873
Merge master into staging-next 2021-05-31 19:44:13 +00:00
Maciej Krüger
ef555f6a0b
Merge pull request #123426 from mattchrist/brscan5 2021-05-31 17:52:16 +02:00
Irene Knapp
b4778d1cac
maintainers: add irenes 2021-05-31 08:01:21 -07:00
github-actions[bot]
5bf27cf89e
Merge master into staging-next 2021-05-31 12:54:42 +00:00
Dominic Shelton
b54a842529 maintainers: add frogamic 2021-05-31 21:43:52 +10:00
Sandro
522a2a222f
Merge pull request #122566 from hoppla20/add-yaru-remix-theme 2021-05-31 12:36:14 +02:00
Jacek Galowicz
d80b17d530 maintainers: init tfc 2021-05-31 11:36:19 +02:00
github-actions[bot]
8df965d4eb
Merge master into staging-next 2021-05-31 07:23:33 +00:00
Kenny Ballou
879e6926ce maintainers: add kennyballou
Signed-off-by: Kenny Ballou <kb@devnulllabs.io>
2021-05-31 12:19:41 +08:00
github-actions[bot]
2867d5301f
Merge master into staging-next 2021-05-30 19:15:10 +00:00
Luke Granger-Brown
1e10a150da
Merge pull request #124872 from devins2518/bunnyfetch
bunnyfetch: init at unstable-2021-05-24
2021-05-30 20:05:14 +01:00
github-actions[bot]
c33da551bf
Merge master into staging-next 2021-05-30 07:13:26 +00:00
Rafael Varago
ff58fe96fd maintainers: add rvarago 2021-05-29 19:42:39 +02:00
Devin Singh
d5a1bb6ade maintainers: add devins2518 2021-05-29 08:36:15 -05:00
github-actions[bot]
4cfefea5b2
Merge master into staging-next 2021-05-29 01:43:58 +00:00
Sandro
8283538f0f
Merge pull request #124426 from nichtsfrei/master 2021-05-29 02:31:33 +02:00
Sandro
3b87c94c61
Merge pull request #122958 from olebedev/add-bkyml-python-package 2021-05-29 02:23:53 +02:00
github-actions[bot]
796b7fd644
Merge master into staging-next 2021-05-28 19:09:12 +00:00
Mark Vainomaa
f830b000fc maintainers: add mikroskeem 2021-05-28 11:22:14 -07:00
Joakim Holm
e23a9584fc maintainers: add jo1gi 2021-05-27 09:50:22 +02:00
github-actions[bot]
f385b431a7
Merge master into staging-next 2021-05-27 06:45:59 +00:00
Sandro
11e59a08dd
Merge pull request #124280 from Mdsp9070/gnome-extensions-gTile 2021-05-27 05:37:09 +02:00
Sandro
43f633241a
Merge pull request #124447 from bolasblack/feat/fn-cli 2021-05-27 05:32:42 +02:00
Philipp Eder
a1ddc21608 maintainers: add nichtsfrei 2021-05-27 05:25:03 +02:00
github-actions[bot]
ffa8e995ba
Merge master into staging-next 2021-05-27 01:17:56 +00:00
Ronuk Raval
3869caac0f maintainers: add rraval 2021-05-26 17:55:17 -04:00
Vincent Cui
76b39037c9 maintainers: add hoppla20 2021-05-26 10:45:47 +02:00
c4605
b86e59d6d6 maintainers: add c4605 2021-05-26 10:33:21 +08:00
github-actions[bot]
a673990e6c
Merge master into staging-next 2021-05-25 18:43:22 +00:00
Phillip Seeber
44595a679b maintainer-list: add sheepforce (me) 2021-05-25 14:00:20 +02:00
github-actions[bot]
0615bb674f
Merge master into staging-next 2021-05-25 00:59:01 +00:00
Sandro
f2f00af5b8
Merge pull request #122020 from L3afMe/master 2021-05-25 02:29:17 +02:00
github-actions[bot]
141439f6f1
Merge master into staging-next 2021-05-24 18:41:50 +00:00
Matheus de Souza Pessanha
54fd011d65
maintainers: add mdsp's GPG keys 2021-05-24 14:43:51 -03:00
Sandro
8ab3f6e967
Merge pull request #122477 from ProofOfKeags/pkg/faraday 2021-05-24 19:38:03 +02:00
Keagan McClelland
94fc5998a0 maintainers: add ProofOfKeags 2021-05-24 10:11:52 -06:00
Patrick Hilhorst
841cee208f
maintainers/teams: add ericson2314 to gcc 2021-05-24 15:01:07 +02:00
Patrick Hilhorst
4b1fa9e847
maintainers/teams: fix typo in gcc
Co-authored-by: Henri Menke <henri@henrimenke.de>
2021-05-24 15:01:07 +02:00
Patrick Hilhorst
f2e5fa469c
maintainers/teams: add vcunat to gcc 2021-05-24 15:01:06 +02:00
Patrick Hilhorst
d9b59212d5
maintainers/teams: add gcc 2021-05-24 15:01:05 +02:00
github-actions[bot]
a8835232ec
Merge master into staging-next 2021-05-24 01:00:29 +00:00
Luke Granger-Brown
9deeafd24d
Merge pull request #123150 from stelcodes/master
zprint: init at 1.1.2
2021-05-24 01:44:10 +01:00
Stel Abrego
2d98c76a38 maintainers: add stelcodes 2021-05-23 19:17:33 -04:00
github-actions[bot]
2aa5735c09
Merge master into staging-next 2021-05-23 18:33:25 +00:00
Sandro
77efb5b850
Merge pull request #121471 from Kho-Dialga/master 2021-05-23 18:51:13 +02:00
Sandro
70c5544861
Merge pull request #122157 from onixie/master 2021-05-23 17:10:28 +02:00
Luke Granger-Brown
f020253837
Merge pull request #123413 from gfrascadorio/master
retry: init at v1.04
2021-05-23 14:59:33 +01:00
Jonathan Ringer
b9b9cdb87c
Merge remote-tracking branch 'origin/staging' into staging-next 2021-05-22 19:23:14 -07:00
Kira Bruneau
cd4780fab4
maintainers: rename metadark -> kira-bruneau (#124035) 2021-05-22 16:47:40 +02:00
Sandro
f1452b8978
Merge pull request #123829 from LogicalOverflow/master 2021-05-22 14:36:01 +02:00
Andrew Brooks
1f74a70740 maintainers: add agbrooks 2021-05-21 15:18:12 -05:00
Robert Schütz
68f959ddef
Merge pull request #121825 from dotlambda/drf-jwt-init
pythonPackages.drf-jwt: init at 1.19.0
2021-05-21 20:33:40 +02:00
Matt Christ
a9b7300f6f brscan5: init at 1.2.6-0 2021-05-21 12:59:30 -05:00
Malte Voos
c6715f2fb8 maintainers: add malvo 2021-05-20 14:18:03 -07:00
Martin Weinelt
dfe77a81af
Merge pull request #123180 from zeri42/zod-version-bump 2021-05-20 22:19:11 +02:00
Leon Vack
6afabc7d4e maintainers: add lgcl 2021-05-20 21:46:46 +02:00
Jan Tojnar
3b0cf29640
Merge pull request #122642 from fitzgibbon/dev/init-gnome-inform7
gnome-inform7: init at unstable-2021-04-06
2021-05-20 18:33:04 +02:00
Zach
40da7cda40 mix2nix: init at 0.1.2 2021-05-20 14:14:35 +09:00
gfrascadorio
30d19f22e2 maintainers: add gfrascadorio
Added new entry to maintainers
Fixed new retry package to cite new maintainer
2021-05-19 15:20:47 -06:00
Louis Bettens
bdad351842 maintainers: add chia team 2021-05-19 14:10:03 -07:00
Yc.Shen
cdeaa30ae1 maintainers: add onixie 2021-05-19 22:25:22 +09:00
Dennis Gosnell
b76684aff7
Merge pull request #122719 from NixOS/haskell-updates
haskell: update package set
2021-05-19 10:52:35 +09:00
zeri42
2a7c5c78b7 maintainers: add zeri 2021-05-18 23:30:57 +02:00
Kho-Dialga
f626605073 maintainers: add kho-dialga 2021-05-18 09:13:40 -06:00
Sandro
e34309b62a
Merge pull request #121497 from Hyzual/add-goss 2021-05-18 03:17:32 +02:00
Sandro
af2a7fef84
Merge pull request #122820 from NULLx76/unpackerr-init
unpackerr: init at 0.9.4
2021-05-18 03:15:57 +02:00
olebedev
aa80302844
maintainers: add olebedev 2021-05-18 10:06:53 +10:00
Sandro
811b50437a
Merge pull request #122830 from lromor/openslide 2021-05-17 19:29:09 +02:00
David
f2dd3eac0e rebar3-nix: init at 0.1.0 2021-05-17 16:08:07 +09:00
Gabriel Gonzalez
4f48006a0c
hackage2nix: Add Gabriel439 as maintainer 2021-05-17 12:09:12 +09:00
Sandro
700942d2a5
Merge pull request #121119 from SuperSandro2000/remove-gnidorah
treewide: remove gnidorah
2021-05-17 02:42:24 +02:00
Sandro
72df572fa3
Merge pull request #122819 from primeos/maintainers-remove-pesterhazy
maintainers: remove pesterhazy
2021-05-17 02:22:35 +02:00
Martin Weinelt
7bd65d54f7 treewide: remove nand0p as maintainer
While looking at the sphinx package I noticed it was heavily
undermaintained, which is when we noticed nand0p has been inactive for
roughly 18 months. It is therefore prudent to assume they will not be
maintaining their packages, modules and tests.

- Their last contribution to nixpkgs was in 2019/12
- On 2021/05/08 I wrote them an email to the address listed in the
  maintainer-list, which they didn't reply to.
2021-05-17 01:50:49 +02:00
Matthieu Coudron
0a9e9c0965 pkgs/misc/vim-plugins/update.py: add logging
there was a 404 error, having basic logging makes it easier to troubleshoot
2021-05-17 00:40:25 +02:00
Robert Hensing
338baef861
Merge pull request #122458 from serokell/team-serokell
maintainers: add serokell team, move various packages to it
2021-05-16 22:37:50 +02:00
sternenseemann
9e5896496c Merge remote-tracking branch 'origin/master' into haskell-updates 2021-05-16 21:39:44 +02:00
github-actions[bot]
8c6d819143
Merge master into staging-next 2021-05-16 18:32:41 +00:00
Malte Brandy
cb6ec35052
maintainers/scripts/haskell/hydra-report.hs: Remove trailing dots
Some job names actually are not followed by a platform name and therefor don‘t have a dot after the name.
2021-05-16 20:20:57 +02:00
Bran
bc9098d60d
river: remove branwright1 as maintainer (#123266) 2021-05-16 14:15:44 -04:00
midchildan
2b7ed5deef
trafficserver: remove joaquinito2051 as maintainer
This reverts commit da69e884b8.
2021-05-17 00:42:57 +09:00
(cdep)illabout
f75fe9394f
Merge remote-tracking branch 'origin/master' into haskell-updates 2021-05-16 16:56:34 +09:00
(cdep)illabout
4ac4ced470
hydra-report.hs: Change Maintainers back to being Maybe Text 2021-05-16 10:43:39 +09:00
Leonardo Romor
de19ea1c4d
maintainers: add lromor 2021-05-15 13:04:35 +02:00
(cdep)illabout
39d04243e2
hydra-report.hs: small formatting changes 2021-05-15 15:53:19 +09:00
github-actions[bot]
39e3f7c2cc
Merge master into staging-next 2021-05-13 18:32:50 +00:00
Jonas Chevalier
c6b62f2381
mkShell: introduce packages argument (#122180)
The distinction between the inputs doesn't really make sense in the
mkShell context.  Technically speaking, we should be using the
nativeBuildInputs most of the time.

So in order to make this function more beginner-friendly, add "packages"
as an attribute, that maps to nativeBuildInputs.

This commit also updates all the uses in nixpkgs.
2021-05-13 19:17:29 +02:00
Victor Roest
ed482358c9
maintainers: add nullx76 2021-05-13 11:25:39 +00:00
Michael Weiss
b364139f2b
maintainers: remove pesterhazy
Their last commit was caf43ad5af from 2015.
Thank you for your contributions.
2021-05-13 13:00:47 +02:00
github-actions[bot]
a8e5ac148b
Merge master into staging-next 2021-05-13 00:56:26 +00:00
Sandro
c92942e00d
Merge pull request #121766 from bmwalters/minipro 2021-05-12 23:23:08 +02:00
github-actions[bot]
f214722172
Merge master into staging-next 2021-05-12 18:32:26 +00:00
Sandro
f8a1317749
Merge pull request #121524 from Mdsp9070/earthly 2021-05-12 18:49:20 +02:00
Niall FitzGibbon
78cce96c8d maintainers: add fitzgibbon 2021-05-12 16:33:22 +01:00
Robert Schütz
2aa6bce7d9 maintainers: remove ivegotasthma
He disappeared from GitHub and doesn't reply to emails.
2021-05-12 13:31:03 +02:00
github-actions[bot]
5a513ae14b
Merge master into staging-next 2021-05-12 00:50:10 +00:00
Bradley Walters
e5d8c19f70
maintainers: add bmwalters 2021-05-11 17:22:52 -06:00
Matheus de Souza Pessanha
ee6e39fdb8 maintainers: add mdsp
removed non alphabetically sorted mdsp maintainer

remove trailing whitespace in pkgs/top-level/all-packages.nix:2377

Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
2021-05-11 19:34:51 -03:00
maralorn
00794f2270
Merge pull request #122510 from NixOS/haskell-updates 2021-05-12 00:01:25 +02:00
github-actions[bot]
37c26a396b
Merge master into staging-next 2021-05-11 18:28:07 +00:00
Sandro
b1eb90c00f
Merge pull request #122454 from nixbitcoin/XD 2021-05-11 17:31:33 +02:00
Malte Brandy
49a014f3e9
maintainers/scripts/haskell/hydra-report.hs: Support HydraFailure statuscode 2021-05-11 16:04:22 +02:00
nixbitcoin
542e957965
maintainers: add nixbitcoin 2021-05-11 11:21:19 +00:00
github-actions[bot]
49b8e6f7d4
Merge master into staging-next 2021-05-11 00:48:15 +00:00
maralorn
881d2af5ee
Merge pull request #122286 from NixOS/haskell-updates 2021-05-11 02:31:06 +02:00
Sandro
124eb1c9d2
Merge pull request #122169 from onsails/atuin 2021-05-11 01:20:39 +02:00
Malte Brandy
9a51c0704f
maintainers/scripts/haskell: Sort transitive broken case insensitive 2021-05-10 22:36:44 +02:00
Malte Brandy
dd8a25528a
maintainers/scripts/haskell: Add mark-broken.sh 2021-05-10 22:36:44 +02:00
Malte Brandy
1da75e70f8
maintainers/scripts/haskell/hydra-report.hs: Add links to job and set names 2021-05-10 22:36:43 +02:00
maralorn
086180140d
maintainers/scripts/haskell/hydra-report.hs: Fix typo
Co-authored-by: Dennis Gosnell <cdep.illabout@gmail.com>
2021-05-10 22:36:43 +02:00
Malte Brandy
10d2ea64cd
maintainers/scripts/haskell/hydra-report.hs: Deal with more buildstatus codes 2021-05-10 22:36:43 +02:00
(cdep)illabout
461c374bda
maintainers/scripts/haskell/hydra-report.hs: change Build.buildstatus to Maybe Int
The buildstatus may be `null` from Hydra if the Build hasn't finished
running yet.
2021-05-10 22:36:43 +02:00
Malte Brandy
df0572cf3a
maintainers/scripts/haskell/hydra-report.hs: Enable warnings and small refactoring 2021-05-10 22:36:43 +02:00
(cdep)illabout
277bb664de
maintainers/scripts/haskell/hydra-report.hs: Use only 2 queries to get report 2021-05-10 22:36:43 +02:00
Malte Brandy
912c7bd20d
maintainers/scripts/haskell/hydra-report.hs: init 2021-05-10 22:36:42 +02:00
Christian Höppner
648eada1c3
Update maintainers/team-list.nix
Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
2021-05-10 20:28:31 +01:00
Matheus de Souza Pessanha
a669f2a0e4 earthly: init at 0.5.11
Update pkgs/top-level/all-packages.nix; Added earthly

Do check tests

created personal handle in maintainers/maintainer-list.nix

preppended "debugger" and "shellrepeater" binaries with earthly-* to avoid collisions

fixed earthly package maintainer name
2021-05-10 13:01:27 -03:00
github-actions[bot]
1e3d91bd19
Merge master into staging-next 2021-05-10 00:48:32 +00:00
Alex Eyre
ab22d96d1d maintainers: add alex-eyre 2021-05-09 11:41:30 -07:00
Alex Eyre
51ade7bf46 maintainers: add noreferences 2021-05-09 11:41:30 -07:00
Vladimír Čunát
5663b2b2d3
Merge branch 'master' into staging-next
(a trivial conflict in transmission)
2021-05-09 09:31:55 +02:00
Malte Brandy
e60afba5d1
Merge branch 'master' into haskell-updates 2021-05-09 02:18:56 +02:00
Malte Brandy
66de11da71
maintainers/scripts/haskell/regenerate-hackage-packages.sh: Small improvents and encoding workaround 2021-05-09 01:01:33 +02:00
Maximilian Bosch
c98bdda0ae
Merge pull request #122060 from Ma27/hydra-maintainer-fix
maintainers/check-hydra-by-maintainer: use `pkgs.hydra-check` from package set itself
2021-05-08 23:23:54 +02:00
github-actions[bot]
6d46d8a9b9
Merge master into staging-next 2021-05-08 18:22:46 +00:00
Robert Schütz
876e7e2883 maintainers/build: enable cross builds 2021-05-08 10:19:20 -07:00
Martin Weinelt
9651084620 Merge remote-tracking branch 'origin/master' into staging-next 2021-05-08 14:43:43 +02:00
sternenseemann
e37a0ebc85 Merge remote-tracking branch 'origin/master' into haskell-updates 2021-05-08 14:04:31 +02:00
Yorick van Pelt
87f11f84b2
maintainers: add serokell team, move various packages to it 2021-05-08 12:11:48 +02:00
Andrey Kuznetsov
4d55543634
maintainers: add onsails 2021-05-08 09:31:49 +00:00
Vladimír Čunát
080cd658ca
Merge #121780: treewide meta.maintainers tweaks 2021-05-08 10:47:08 +02:00
Jan Tojnar
468cb5980b gnome: rename from gnome3
Since GNOME version is now 40, it no longer makes sense to use the old attribute name.
2021-05-08 09:47:42 +02:00
github-actions[bot]
b4416b52c5
Merge master into staging-next 2021-05-08 00:46:50 +00:00
Malte Brandy
cfdeaa13f2
maintainers/scripts/haskell/update-stackage.sh: Fix wrong variable 2021-05-07 23:58:18 +02:00
Malte Brandy
7f236bd4b2
hackage2nix: Split configuration, auto disable hydra builds
We split configuration-hackage2nix.yaml into multiple files.  We bump
cabal2nix-unstable to get support for multiple config files in
hackage2nix.

* The file main.yaml is only supposed to be edited by humans.
* The file stackage.yaml is only supposed to be updated by the
  update-stackage.sh
* The file broken.yaml can be edited by humans, but probably future
  helpers will want to insert broken packages into this file based on
  hydra reports.
* The file transitive-broken.yaml is newly introduced to be generated
  by regenerate-transitive-broken-packages.sh

regenerate-transitive-broken-packages.sh makes a nix query (in
transitive-broken-packages.nix) which evaluates all haskellPackages
once with and once without "allowBroken" this way it get's a list of
packages which are broken by some transitive dependency, but does not
disable packages which have eval errors not caused by a broken package.
2021-05-07 21:58:08 +02:00
Maximilian Bosch
acb7b55d92
maintainers/check-hydra-by-maintainer: use pkgs.hydra-check from package set itself 2021-05-07 19:32:10 +02:00
Vladimír Čunát
9f054b5e1a
treewide: remove worldofpeace from meta.maintainers
(It was requested by them.)
I left one case due to fetching from their personal repo:
pkgs/desktops/pantheon/desktop/extra-elementary-contracts/default.nix
2021-05-07 15:36:40 +02:00
Malte Brandy
2a11f1f5cc
Merge branch 'master' into haskell-updates 2021-05-07 15:03:54 +02:00
github-actions[bot]
12193913a1
Merge staging-next into staging 2021-05-07 12:23:21 +00:00
L3af
f8108be127 maintainers: add l3eaf 2021-05-07 11:35:28 +00:00
Jan Tojnar
416cd66e29
maintainers/scripts/update.nix: Ensure the worktree is clean
When an update script fails, it might still modify the source tree.
These changes would then be committed in the next update attempt.
Let’s make sure the worktree is clean before updating to avoid that.
2021-05-05 22:42:30 +02:00
Jan Tojnar
d51a631a46
maintainers/scripts/update.nix: Add support for filtering pkgs by predicate
Arbitrary predicate is useful for updating decentralised package sets like GNOME.
2021-05-05 22:20:20 +02:00
Malte Brandy
f37d5402bc
maintainers/scripts/haskell: Improve commit messages 2021-05-04 14:29:45 +02:00
sternenseemann
794bc5e9ed haskellPackages.cabal2nix-unstable: rename from cabal2nix-latest 2021-05-04 13:38:46 +02:00
sternenseemann
e30cf42f0c haskellPackages.cabal2nix-latest: use unstable-YYYY-MM-DD format
This is the preferred format for things fetched from git or similar that
are not proper releases: https://nixos.org/manual/nixpkgs/stable/#sec-package-naming

Also we should think about making name and attribute name more
consistent: cabal2nix-latest -> cabal2nix-unstable
2021-05-04 13:38:46 +02:00
Malte Brandy
81b5682da3
Merge branch 'master' into haskell-updates 2021-05-04 00:25:54 +02:00
Malte Brandy
4dbda0125a
maintainers/scripts/haskell: Add --do-commit option 2021-05-03 22:58:51 +02:00
github-actions[bot]
5e177b16b1
Merge staging-next into staging 2021-05-03 18:25:49 +00:00
Silvan Mosberger
0111666954
Merge pull request #109561 from mjlbach/init_matrix_dendrite
matrix-dendrite: init at 0.3.11
2021-05-03 20:16:27 +02:00
github-actions[bot]
a4c3a2d732
Merge staging-next into staging 2021-05-03 12:26:48 +00:00
Luke Granger-Brown
97d8c5c9de
Merge pull request #120721 from diogox/master
frugal: init at 3.14.2
2021-05-03 10:49:43 +01:00
sternenseemann
387387aa20 lib/maintainers: add haskell team 2021-05-03 11:36:18 +02:00
Luke Granger-Brown
d922cad4d6
Merge pull request #119172 from midchildan/package/trafficserver
nixos/trafficserver: init
2021-05-03 09:48:07 +01:00
github-actions[bot]
0e4580d4d0
Merge staging-next into staging 2021-05-02 18:24:58 +00:00
Hyzual
c36517d632 maintainers: add Joris Masson 2021-05-02 19:53:03 +02:00
Dan Eads
33682a80a1 maintainers: add daneads 2021-05-02 09:15:45 -04:00
github-actions[bot]
a7e07bddd5
Merge staging-next into staging 2021-05-02 12:24:53 +00:00
Vojtěch Káně
9a943b4b42
maintainers: add vojta001 2021-05-02 08:01:44 -04:00
hyperfekt
f3f84855e8
maintainers/scripts/haskell/regenerate-hackage-packages.sh: init
Introduces a script that can be used to update the Nix expressions for

the Haskell package set. In service of that, also

- introduces cabal2nix-latest, which pins the hackage2nix version used

- changes all-cabal-hashes to use fetchFromGitHub

- adds update-hackage.sh & update-cabal2nix-latest.sh & update-stackage.sh maintainer scripts
2021-05-01 21:55:18 +02:00
github-actions[bot]
49721bed32
Merge staging-next into staging 2021-05-01 18:26:21 +00:00
Sandro
4b2c9640e7
Merge pull request #120613 from erikbackman/master 2021-05-01 18:42:40 +02:00
Jan Tojnar
1733bade1a
Merge pull request #121226 from zhaofengli/librem-take2
phosh: init at 0.10.2
2021-05-01 18:41:50 +02:00
Sandro
e9547b6a31
Merge pull request #120733 from evalexpr/add-zsh-z 2021-05-01 17:33:07 +02:00
Michael Lingelbach
f03f26bf8f maintainers: add mjlbach to the matrix team 2021-04-30 12:04:58 -07:00
github-actions[bot]
20ebbe6b59
Merge staging-next into staging 2021-04-30 18:26:34 +00:00
Diogo Xavier
b876437295 maintainers: add diogox 2021-04-30 14:53:31 +01:00
Sandro
9a80c030b6
Merge pull request #120754 from netcrns/netcrns/movine 2021-04-30 15:01:44 +02:00
Sandro
09fb96f975
Merge pull request #120763 from vale981/master 2021-04-30 15:00:55 +02:00
Jordi Masip
ea6882edda maintainers: add masipcat 2021-04-30 02:08:14 +00:00
Sandro Jäckel
ae02415ee8
treewide: remove gnidorah
due to github account removal/deletion and not other mean of contact.
2021-04-30 01:48:19 +02:00
Jan Tojnar
76c3a6aafd
Merge branch 'staging-next' into staging 2021-04-29 02:35:54 +02:00
V
dba77f4fd0 maintainers: add V 2021-04-28 20:53:57 +02:00
erikbackman
8298d66e42 (maintainer-list): add myself 2021-04-27 19:05:57 +02:00
Jonathan Wilkins
d490493d00
maintainers: add Jonathan Wilkins 2021-04-27 14:53:22 +01:00
github-actions[bot]
c01456266d
Merge staging-next into staging 2021-04-27 12:07:01 +00:00
netcrns
b235179807 maintainers: add netcrns 2021-04-27 13:43:38 +02:00
Valentin Boettcher
f99ab79b94
maintainers: add Valentin Boettcher 2021-04-27 11:44:03 +02:00
Pavol Rusnak
eb4a0b56a3
maintainers/teams: remove prusnak from jitsi team 2021-04-27 09:03:20 +02:00
github-actions[bot]
f0290a5d27
Merge staging-next into staging 2021-04-26 18:14:28 +00:00
Robert Schütz
53d547ce19
Merge pull request #120619 from amanjeev/semiphemeral-python-package
semiphemeral: init at 0.6
2021-04-26 17:29:47 +02:00
midchildan
da69e884b8
maintainers: add joaquinito2051
From #114116

Co-authored-by: heroku-miraheze <61781343+heroku-miraheze@users.noreply.github.com>
2021-04-27 00:02:19 +09:00
github-actions[bot]
8634c6f7d1
Merge staging-next into staging 2021-04-26 00:17:03 +00:00
therealansh
2164917479 maintiners: add therealansh 2021-04-26 09:01:17 +09:00
Amanjeev Sethi
bf4c2036af
maintainers: add Amanjeev Sethi 2021-04-25 15:49:26 -04:00
github-actions[bot]
9a945aac72
Merge staging-next into staging 2021-04-25 18:14:18 +00:00
Luke Granger-Brown
ed83f6455c
Merge pull request #119443 from ambroisie/add-podgrab
Add podgrab package and module
2021-04-25 14:12:40 +01:00
rsynnest
098977ab6a maintainers: add rsynnest 2021-04-24 18:42:41 -07:00
schnusch
f96a6606d6 remote-touchpad: init at 1.0.1 2021-04-24 18:18:10 +02:00
Michael Raskin
d04f1c4314
Merge pull request #101071 from ju1m/apparmor
apparmor: try again to fix and improve
2021-04-24 11:24:26 +00:00
Sandro
de959006f5
Merge pull request #119081 from Stekke/infnoise 2021-04-24 07:42:06 +02:00
Sandro
496d33dc17
Merge pull request #116747 from jakubgs/gomobile-20200622 2021-04-24 07:14:28 +02:00
Sandro
01ad91b02c
Merge pull request #120173 from nbren12/gcsfs 2021-04-24 03:53:34 +02:00
Kerstin Humm
a8ed2152a1
maintainers: change first name and mail of erictapen
It's time to make it official :)
2021-04-24 01:22:51 +02:00
Valentin Lorentz
9bb6bf650e maintainers: add progval 2021-04-23 10:19:37 +00:00
Noah D. Brenowitz
ae4c837636 maintainers: add nbren12 2021-04-22 23:14:14 -07:00
Julien Moutinho
05d334cfe2 Revert "Revert "apparmor: fix and improve the service""
This reverts commit 420f89ceb2.
2021-04-23 07:17:55 +02:00
Michael Weiss
3e01d42024
maintainers: remove tavyc
Their last commit was dcc84d8 from 2017.
Thank you for your contributions.
2021-04-22 11:34:25 +02:00
Jakub Sokołowski
c7bfba04ee
maintainers: Add jakubgs
Signed-off-by: Jakub Sokołowski <jakub@status.im>
2021-04-22 09:51:44 +02:00
Sandro
d235056d6d
Merge pull request #119976 from sayanarijit/add/xplr 2021-04-22 04:08:21 +02:00
Sandro
227fecc2e7
Merge pull request #119280 from malob/add-fish-plugin 2021-04-22 03:34:51 +02:00
Matthieu Coudron
3eb8f4d15c
update.py: allow to disable autocommit (#119182) 2021-04-22 03:21:36 +02:00
Sandro
6a2783899a
Merge pull request #120012 from vs49688/orcli 2021-04-21 06:04:33 +02:00
Sandro
b88948d879
Merge pull request #118364 from jappeace/upgrade-ydotools-2 2021-04-21 05:13:47 +02:00
Zane van Iperen
e322cff6ac
maintainers: add zane 2021-04-21 11:39:40 +10:00
Sandro
8cb93e8921
Merge pull request #119970 from akshgpt7/add-jql 2021-04-21 03:17:05 +02:00
Sandro
8c4eadf7b5
Merge pull request #119018 from dasisdormax/add-astc-encoder 2021-04-20 23:18:02 +02:00
Aksh Gupta
9c560ca9c0 maintainers: add akshgpt7 2021-04-21 02:05:10 +05:30
Arijit Basu
583c3e49ec
maintainers: add suryasr007 2021-04-21 01:58:04 +05:30
Arijit Basu
3076c747e3
maintainers: add sayanarijit 2021-04-21 01:57:07 +05:30
Graham Christensen
777286310b teams: add cole-h to the determinatesystems team 2021-04-19 18:03:11 -04:00
Graham Christensen
705227c558 teams: init determinatesystems 2021-04-19 18:03:08 -04:00
Sandro
6734491095
Merge pull request #110900 from obfusk/add-jiten 2021-04-19 20:41:42 +02:00
Sandro
5c69c99434
Merge pull request #119836 from sophrosyne97/master 2021-04-19 19:21:01 +02:00
sophrosyne97
a6fb208ef0 maintainers: add sophrosyne 2021-04-19 10:10:03 -04:00
Bruno Bigras
d0a243c4ba luaPackages.lua-resty-openidc: 1.7.2-1 -> 1.7.4-1 2021-04-18 17:21:13 +02:00
Robert Helgesson
831e64bad4
Drop maintainership for some packages 2021-04-18 09:00:18 +02:00
Felix C. Stegerman
e69f9dbd63
maintainers: add obfusk 2021-04-17 12:46:34 +02:00
legendofmiracles
0c86640c68
maintainers: add legendofmiracles 2021-04-17 08:51:05 +02:00
Sandro
392d72c74d
Merge pull request #119394 from hzeller/init-timg 2021-04-15 18:20:41 +02:00
Sandro
609765dd85
Merge pull request #119095 from friedelino/upd-googlearth 2021-04-14 21:17:11 +02:00
Sandro
24dc4599cb
Merge pull request #119387 from branwright1/river 2021-04-14 19:23:18 +02:00
Sandro
6cdc8bcc0f
Merge pull request #114507 from dschrempf/vimiv-qt 2021-04-14 19:15:14 +02:00
Henner Zeller
02085112e1 maintainers: add hzeller
Signed-off-by: Henner Zeller <h.zeller@acm.org>
2021-04-14 10:14:03 -07:00
Bruno BELANYI
e64b418e3e maintainers: add ambroisie 2021-04-14 17:03:24 +00:00
Sandro
5280218da0
Merge pull request #118685 from petrosagg/add-materialize 2021-04-14 18:34:28 +02:00
branwright1
3943b3ddf2 maintainers: add branwright1
river: init at unstable 2021-04-08

river: init at unstable 2021-04-08

river: init at unstable 2021-04-08

river: init at unstable 2021-04-08

river: init at unstable 2021-04-08

river: init at unstable 2021-04-08

river: init at unstable 2021-04-08
2021-04-14 14:51:09 +01:00
Lars Rasmusson
79d6e2a2b7 maintainers: add larsr 2021-04-14 13:45:56 +02:00
Petros Angelatos
b30ee6df17 maintainers: add petrosagg
Signed-off-by: Petros Angelatos <petrosagg@gmail.com>
2021-04-14 10:49:14 +02:00
Dominik Schrempf
e9b96bfaca
maintainers: add dschrempf
alphabetical maintainer list
2021-04-14 08:12:03 +02:00
Maximilian Wende
6426d1e6c0
maintainers: add dasisdormax 2021-04-14 07:55:10 +02:00
Sandro
1562f6ae8e
Merge pull request #119281 from enderger/lbry-init 2021-04-14 01:12:12 +02:00
Frido Friedemann
2107c96b44 maintainers: add friedelino 2021-04-13 19:28:17 +02:00
Sandro
15c6e7170a
Merge pull request #102060 from addict3d/add-python-diagrams-from-github 2021-04-13 13:56:54 +02:00
Hutzdog
be8129be33 maintainers: add enderger 2021-04-12 19:08:11 -07:00
Malo Bourgon
3b026ab7e2 maintainers: add malo 2021-04-12 18:56:34 -07:00
Sandro
8fdeb355c6
Merge pull request #118405 from jwygoda/doitintl-bigquery-datasource 2021-04-12 20:11:42 +02:00
Sandro
ab1a223747
Merge pull request #112322 from mohe2015/module/declarative-step-ca 2021-04-12 17:35:54 +02:00
Sandro
39c17f77a5
Merge pull request #110398 from wirew0rm/pkg/scenebuilder 2021-04-12 17:33:32 +02:00
Sandro
512e44abb1
Merge pull request #101852 from takagiy/init-wmderland 2021-04-12 16:44:46 +02:00
Dmitry Kalinkin
61886ca7b2
Merge pull request #118660 from xworld21/mftrace
mftrace: init at 1.2.20
2021-04-11 23:28:45 -04:00
Sandro
f1ee4471b5
Merge pull request #115270 from gspia/kitsas 2021-04-12 03:59:11 +02:00
Sandro
36d6015eed
Merge pull request #116576 from wunderbrick/juniper 2021-04-12 02:26:00 +02:00
Sandro
186151f303
Merge pull request #118769 from p-h/add-foxitreader 2021-04-12 01:44:25 +02:00
Sandro
0e95d213c8
Merge pull request #118461 from aaschmid/rmlint.darwin.support 2021-04-12 00:56:29 +02:00
wunderbrick
32d7db5e70 maintainers: add wunderbrick 2021-04-11 14:51:35 -04:00
Vincenzo Mantova
d9e725e717 maintainers: add xworld21 2021-04-11 15:15:58 +01:00
Hubert Jasudowicz
83838f7233 maintainers: add chivay 2021-04-11 00:16:41 +02:00
Stijn DW
10353970bb maintainers: update github name, email 2021-04-10 22:40:57 +02:00
Alexandre Iooss
7eedec57e8
maintainers: add erdnaxe 2021-04-10 18:46:13 +02:00
mohe2015
a3141361cb maintainers: add mohe2015 2021-04-09 14:57:43 +02:00
Anderson Torres
a60f46b491
Merge pull request #118857 from plabadens/free42-3.0.2
free42: 3.0.1 -> 3.0.2
2021-04-08 23:23:54 -03:00
Sandro
6fc2b7ecc2
Merge pull request #116570 from dnr/gphotos-sync 2021-04-09 02:55:52 +02:00
Pierre Labadens
f55d365058
maintainers: add plabadens 2021-04-09 00:09:55 +02:00
Sandro
26f16c1cef
Merge pull request #91318 from stephank/pkg-doh-proxy-rust 2021-04-08 22:32:12 +02:00
Riey
21ef17ec44
maintainers: add riey 2021-04-08 18:32:12 +09:00
Philippe Hürlimann
c131e6286a maintainers: add p-h 2021-04-08 01:23:19 +02:00
Stéphan Kochen
720f19156e maintainers: add stephank 2021-04-07 14:23:55 +02:00
Martin Weinelt
0e31f09774
maintainers/team: add home-assistant team 2021-04-07 02:33:23 +02:00
Sandro
2fb8be188f
Merge pull request #117377 from SEbbaDK/i3wsr 2021-04-06 12:03:26 +02:00
Sandro
6f45d62f2b
Merge pull request #107190 from applePrincess/add-zsteg 2021-04-06 10:19:40 +02:00
Sandro
be0b9616ca
Merge pull request #116671 from electrified/sjasmplus-1.18.2 2021-04-06 01:07:42 +02:00
Gregory Schwartz
9bf867612d
meme-suite: init at 5.1.1 (#118603)
Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
2021-04-05 22:43:27 +02:00
Jarosław Wygoda
9fc2371ddf maintainers: add jwygoda 2021-04-05 16:31:42 +00:00
SEbbaDK
2b8b6344b2 maintainers: add sebbadk 2021-04-05 18:10:50 +02:00
gspia
ca743d55d5 maintainers: add {gspia} 2021-04-05 09:04:50 +03:00
Sandro
7aae486f43
Merge pull request #117545 from bootstrap-prime/master 2021-04-05 06:25:08 +02:00
Sandro
354703e66f
Merge pull request #116067 from djwf/add-empty 2021-04-05 05:22:01 +02:00
David J. Weller-Fahy
5156911479 maintainers: add djwf 2021-04-04 22:25:55 -04:00
Raimon Grau
e9e02171f7 maintainers: add kidd 2021-04-04 21:40:31 +01:00
Andreas Schmid
7462194620 maintainers: add aaschmid 2021-04-04 20:51:49 +02:00
Jappie Klooster
6401be45a9
maintainers: add jappie 2021-04-03 10:10:05 -04:00
Sandro
ee8c25055b
Merge pull request #117737 from babbaj/master 2021-04-03 02:28:44 +02:00
Sandro
0b971c20f0
Merge pull request #116983 from totoroot/update/qownnotes-21.3.2 2021-04-02 20:34:15 +02:00
Babbaj
181ade78c2
maintainers: add babbaj 2021-04-02 13:31:21 -04:00
Sandro
383c8f9090
Merge pull request #118286 from xdHampus/quich 2021-04-02 19:13:11 +02:00
Sandro
bc0144e5c9
Merge pull request #111346 from beardhatcode/bump/matrix-appservice-slack 2021-04-02 17:53:04 +02:00
Sandro
5a41d751ae
Merge pull request #104919 from gravndal/git-annex-remote-googledrive 2021-04-02 17:28:35 +02:00
xdHampus
b6630e76a5 maintainers: add xdhampus 2021-04-01 23:29:52 +00:00
Sandro
682e8ac409
Merge pull request #99663 from sumnerevans/sublime-music-metadata 2021-04-01 18:59:40 +02:00
Sandro
607ac87945
Merge pull request #117511 from karthikiyengar/submit/unipicker 2021-04-01 13:42:41 +02:00
Sandro
ca6a01c9a1
Merge pull request #117946 from andreisergiu98/ombi-init 2021-04-01 12:01:10 +02:00
Andrei Pampu
cfd56a4c04
maintainers: add woky 2021-04-01 10:34:29 +03:00
Gaute Ravndal
89aa5c2fb5 maintainers: add gravndal 2021-04-01 03:17:09 +02:00
Martin Weinelt
b2ebc881cf
Merge pull request #113988 from piegamesde/matrix-appservice-irc 2021-04-01 01:39:24 +02:00
Martin Weinelt
27065924cb
Revert "gnome3: Package all the Gnome extensions" 2021-04-01 01:37:54 +02:00
Martin Weinelt
f76486302f
Merge pull request #108414 from piegamesde/gnome-extensions 2021-04-01 01:37:45 +02:00
piegames
635854bbbb maintainers: add piegames 2021-04-01 01:16:22 +02:00
Wael Nasreddine
ce865faa4b
Merge pull request #118113 from DiegoLelis/kuttl-v0.9.0
kuttl: init at version 0.9.0
2021-03-31 13:40:33 -07:00
diegolelis
aa9ebb14d4 maintainers: add diegolelis 2021-03-31 13:20:44 -07:00
Robert Schütz
4e5687f0e5
Merge pull request #117870 from Mephistophiles/i3wm/packages
i3wm.i3-auto-layout: init at 0.2.0
2021-03-31 15:36:23 +02:00
Maxim Zhukov
4188cd1a0e
maintainers: add mephistophiles (myself) 2021-03-31 15:34:06 +03:00
Matthias Thym
5aa1b1bac3 maintainers: add totoroot 2021-03-31 09:43:16 +02:00
Paul Hendry
df285339a3 maintainers: pshendry -> polendri 2021-03-29 16:51:18 +08:00
Doron Behar
bf2a8f6364
Merge pull request #117908 from wandersoncferreira/whatsapp-for-linux
whatsapp-for-linux: init-at 1.1.5
2021-03-29 08:05:34 +00:00
Wanderson Ferreira
2f9d5ad739
maintainers: add bartuka 2021-03-28 19:20:37 -03:00
Russell Sim
ffe0408224 maintainers: add russell 2021-03-27 21:11:33 +01:00
bootstrap-prime
19839492cc maintainers: add bootstrap-prime 2021-03-27 11:21:30 -04:00
Sandro
61d017abdf
Merge pull request #116485 from Flakebi/kakoune 2021-03-27 02:40:12 +01:00
Sandro
b37b2f38fe
Merge pull request #115159 from xfnw/master 2021-03-27 01:34:41 +01:00
xfnw
a82ecfbde2 maintainers: add xfnw 2021-03-26 17:00:33 -04:00
Sandro
a019a90a33
Merge pull request #115806 from rowanG077/master 2021-03-26 19:26:24 +01:00
Sandro
019908e371
Merge pull request #115885 from MatthewCroughan/fioctl 2021-03-26 00:14:23 +01:00
Ethan Edwards
3205e23fe0 maintainers: fix ethancedwards8 email 2021-03-25 22:02:30 +01:00
Karthik Iyengar
c17c39cc61 maintainers: add kiyengar 2021-03-25 17:17:43 +01:00
rowanG077
52f33101dc maintainers: add rowanG077 2021-03-25 16:11:43 +01:00
Kostas Karachalios
44dde3daa9 maintainers: add vrinek 2021-03-25 08:19:25 +01:00
Flakebi
04184cd64f
scripts.pluginupdate: write final newline
json.dump does not write any newline, so the final newline in the file
is missing.
2021-03-22 22:56:47 +01:00
Robbert Gurdeep Singh
045e01aae6 maintainers: add beardhatcode
Signed-off-by: Robbert Gurdeep Singh <git@beardhatcode.be>
2021-03-22 10:05:51 +01:00
Lein Matsumaru
50ab490bdb maintainers: add applePrincess 2021-03-22 06:40:46 +00:00
Aaron Andersen
74ade33ccc
Merge pull request #116806 from aanderse/kodi-team
maintainers/teams: add kodi team
2021-03-21 21:39:49 -04:00
Sumner Evans
62f2452237
maintainers: add sumnerevans 2021-03-21 19:22:49 -06:00
Maxine Aubrey
4660c8c153
maintainers: add maxeaubrey to the gnome team 2021-03-21 11:29:58 +01:00
Weihua Lu
594ebb5ade maintainers: add weihua 2021-03-20 19:28:50 -04:00
Robert Schütz
b1de2b4530
Merge pull request #116325 from armijnhemel/package_url
python3Packages.packageurl-python: init at 0.9.4
2021-03-20 22:23:46 +01:00
Sandro
820a6336ae
Merge pull request #115729 from illustris/percol 2021-03-20 20:14:51 +01:00
Sandro
903df9ccac
Merge pull request #116797 from tuxinaut/master 2021-03-20 19:47:40 +01:00
illustris
cd29936577 python38Packages.cmigemo: 0.1.6 2021-03-21 00:00:45 +05:30
Sandro
cf117712a8
Merge pull request #116148 from NeverBehave/pkg/fission 2021-03-19 23:30:32 +01:00
Denny Schäfer
8038bc5997
maintainers: add tuxinaut 2021-03-19 20:15:38 +01:00
Sandro
5c6b845e38
Merge pull request #114844 from FliegendeWurst/trilium-update 2021-03-19 18:29:18 +01:00
Sandro
8fe245607d
Merge pull request #115121 from mitchmindtree/ardour-video
ardour: add a videoSupport option, harvid: init at 0.8.3, xjadeo: init at 0.8.10
2021-03-19 18:28:12 +01:00
Mario Rodas
30467aa9dd
Merge pull request #116490 from sternenseemann/luv-0.5.7
ocamlPackages.luv: init at 0.5.7
2021-03-18 21:29:18 -05:00