Commit Graph

5707 Commits

Author SHA1 Message Date
kilianar
f8d9ca3703 gitea: 1.16.8 -> 1.16.9 2022-07-12 23:36:20 +02:00
zowoq
5723e473be gh: 2.13.0 -> 2.14.0
https://github.com/cli/cli/releases/tag/v2.14.0
2022-07-12 23:03:50 +10:00
techknowlogick
26d105482b mercurial: 6.1.4 -> 6.2 2022-07-11 22:38:23 -04:00
github-actions[bot]
05798fee88
Merge staging-next into staging 2022-07-10 18:01:55 +00:00
Sandro
7748a71d4d
Merge pull request #180702 from SuperSandro2000/fix-bash-completion 2022-07-10 18:47:53 +02:00
R. Ryantm
905e33f5f4 ghorg: 1.7.16 -> 1.8.0 2022-07-09 11:39:55 +00:00
github-actions[bot]
5c6643bcdd
Merge staging-next into staging 2022-07-09 00:02:42 +00:00
Yaya
9cd306c9eb
gitlab: 15.1.1 -> 15.1.2 (#180258)
https://about.gitlab.com/releases/2022/07/04/gitlab-15-1-2-released/
2022-07-08 23:43:07 +02:00
Jan Tojnar
819fe6a918 Merge branch 'staging-next' into staging
; Conflicts:
;	pkgs/data/icons/papirus-icon-theme/default.nix
2022-07-08 20:21:39 +02:00
superherointj
6f9aa3fa2a gfold: 4.0.0 -> 4.0.1 2022-07-08 14:05:57 -03:00
Sandro Jäckel
bf67d1e09d
git-extras: fix lazy bash-completion loading when loaded through XDG_DATA_DIRS 2022-07-08 13:53:39 +02:00
github-actions[bot]
527a304ac4
Merge staging-next into staging 2022-07-08 00:03:17 +00:00
github-actions[bot]
e1123916d6
Merge master into staging-next 2022-07-08 00:02:37 +00:00
Sandro
e1c4a3344a
Merge pull request #180561 from kilianar/gitlab-triage
gitlab-triage: 1.20.0 -> 1.23.1
2022-07-07 21:27:01 +02:00
kilianar
d277300000 gitlab-triage: 1.20.0 -> 1.23.1
Set

passthru.updateScript = bundlerUpdateScript "gitlab-triage";

for easier updates.
2022-07-07 20:05:22 +02:00
github-actions[bot]
02ada34099
Merge staging-next into staging 2022-07-07 18:01:45 +00:00
github-actions[bot]
7bf7571a34
Merge master into staging-next 2022-07-07 18:01:11 +00:00
kilianar
95c8e5731a github-desktop: 2.9.12 -> 3.0.3
https://github.com/desktop/desktop/releases/tag/release-3.0.3
2022-07-07 19:54:42 +02:00
Vlad M
ca2dfa2490
Merge pull request #180207 from dywedir/pijul
pijul: 1.0.0-beta.1 -> 1.0.0-beta.2
2022-07-07 20:12:11 +03:00
Jan Tojnar
d910a8b8a5 Merge branch 'staging-next' into staging
; Conflicts:
;	pkgs/data/icons/zafiro-icons/default.nix
2022-07-07 14:24:09 +02:00
github-actions[bot]
c0b6f4c121
Merge master into staging-next 2022-07-07 00:02:29 +00:00
Sebastián Mancilla
bdae2919d2
stgit: mark as unbroken on darwin (#180393)
Marked as broken by 37c633f7ae (treewide: pkgs/applications: mark
broken for darwin, 2022-05-28) probably by mistake. It builds and works
just fine.
2022-07-06 20:00:58 -04:00
ajs124
2837f807c9
Merge pull request #180066 from helsinki-systems/rem/nodejs-12_x
nodejs-12_x: remove
2022-07-06 23:09:28 +02:00
github-actions[bot]
4a077da28e
Merge staging-next into staging 2022-07-05 18:01:57 +00:00
github-actions[bot]
060674a777
Merge master into staging-next 2022-07-05 18:01:21 +00:00
06kellyjac
434f17b3e7 conform: 0.1.0-alpha.25 -> 0.1.0-alpha.26 2022-07-05 17:38:15 +01:00
Sandro
15ce383c0c
Merge pull request #180129 from wahjava/update-got
got: 0.70 -> 0.73
2022-07-05 17:38:14 +02:00
github-actions[bot]
14ba82064f
Merge staging-next into staging 2022-07-05 12:02:49 +00:00
github-actions[bot]
0c17a445aa
Merge master into staging-next 2022-07-05 12:02:09 +00:00
Vladyslav M
0fc7b58cdb pijul: 1.0.0-beta.1 -> 1.0.0-beta.2 2022-07-05 11:04:33 +03:00
zowoq
e7cd9046ca git: 2.36.1 -> 2.37.0
https://lore.kernel.org/git/xmqqy1xinf00.fsf@gitster.g/T/#u
2022-07-05 09:16:10 +10:00
Fabian Affolter
30c3425460 dvc: 2.10.2 -> 2.12.0 2022-07-04 20:41:17 +02:00
Fabian Affolter
e5cded3294 dvc: update optional dependencies 2022-07-04 20:16:02 +02:00
Ashish SHUKLA
4ed794f1bc
got: 0.70 -> 0.73 2022-07-04 21:01:56 +05:30
ajs124
c4b8828630 treewide: node*.nix remove references to nodejs-12_x 2022-07-04 15:33:57 +02:00
github-actions[bot]
33b3f971a7
Merge master into staging-next 2022-07-04 12:11:13 +00:00
Adam Joseph
261f090079 git-lfs: remove leaveDotGit=true
Since commit 0b0119f1ea on 2022-Jun-04,
`git-lfs` no longer builds with `--option substituters ""`:

```
error: hash mismatch in fixed-output derivation '/nix/store/2g1jwczzld8l190s2apc0ihffmil385f-source.drv':
         specified: sha256-3gVUPfZs5GViEA3D7Zm5NdxhuEz9DhwPLoQqHFdGCrI=
            got:    sha256-D7ZA04HZOG8DcejW+S91c5HjVIW+SLMzXZHylpARwrQ=
note: keeping build directory '/tmp/nix-build-source.drv-3'
error: 1 dependencies of derivation '/nix/store/jzl8ypirdrii6aik2pss84df7sds7vqr-git-lfs-3.2.0.drv' failed to build
``

It appears that the hash
`sha256-3gVUPfZs5GViEA3D7Zm5NdxhuEz9DhwPLoQqHFdGCrI=` was calculated
based on `fetchDotGit=false`, and was in cachix, so nobody noticed
that the hash doesn't match the fetcher expression.

This is yet another case of an ongoing problem with nixpkgs: we have
no way of noticing when a fetcher expression has the wrong hash if
that incorrect hash happens to be the hash of something that is in
cachix.  Apparently nobody (else) is checking that nixpkgs works with
`--option substituters ""`.
2022-07-03 21:34:49 -07:00
José Romildo
363c10d922 gitqlient: 1.4.3 -> 1.5.0 2022-07-03 22:13:50 -03:00
github-actions[bot]
1961d0a79b
Merge master into staging-next 2022-07-02 00:01:58 +00:00
Yaya
a8c71a477f
gitlab: 15.1.0 -> 15.1.1 (#179810)
https://about.gitlab.com/releases/2022/06/30/critical-security-release-gitlab-15-1-1-released/

Fixes CVE-2022-2185 CVE-2022-2235 CVE-2022-2230 CVE-2022-2229
      CVE-2022-1983 CVE-2022-1963 CVE-2022-2228 CVE-2022-1981
      CVE-2022-2243 CVE-2022-2244 CVE-2022-1954 CVE-2022-2270
      CVE-2022-2250 CVE-2022-1999 CVE-2022-2281 CVE-2022-2227
2022-07-01 22:19:41 +02:00
github-actions[bot]
7907ea3c9b
Merge staging-next into staging 2022-07-01 18:02:00 +00:00
sudosubin
f73860882d
lefthook: 1.0.0 -> 1.0.4 2022-07-01 23:40:59 +09:00
Jörg Thalheim
4f8a04f180
Merge pull request #173702 from bdd/go-checkFlags
go-modules/packages: Run unit tests under subdirs
2022-06-28 08:30:43 +02:00
Jörg Thalheim
725cee0dca
Merge pull request #179226 from bdd/use_testers_testversion
Replace use of `testVersion` alias
2022-06-27 07:15:19 +02:00
Mario Rodas
70811c9de6
Merge pull request #179129 from r-ryantm/auto-update/git-secret
git-secret: 0.4.0 -> 0.5.0
2022-06-26 18:15:37 -05:00
Mario Rodas
35ce1f5321
Merge pull request #179122 from r-ryantm/auto-update/ghorg
ghorg: 1.7.13 -> 1.7.16
2022-06-26 16:34:24 -05:00
Berk D. Demir
a9f912498f Replace use of testVersion alias
- lndconnect: Drop unused input `testVersion`
- other packages: Import `testers` and use `testers.testVersion`
2022-06-26 17:41:46 +00:00
R. Ryantm
009f63d926 git-secret: 0.4.0 -> 0.5.0 2022-06-26 00:32:38 +00:00
R. Ryantm
f8567a8b1a ghorg: 1.7.13 -> 1.7.16 2022-06-25 23:44:10 +00:00
Yaya
0a4e9dfda2
gitlab: 15.0.2 -> 15.1.0 (#178651)
https://about.gitlab.com/releases/2022/06/22/gitlab-15-1-released/
2022-06-25 21:18:14 +02:00
Mario Rodas
238420a923
Merge pull request #178548 from msfjarvis/hs/2022-06-22/git-quickfix-0.1.0
git-quickfix: 0.0.5 -> 0.1.0
2022-06-24 20:20:37 -05:00
Rick van Schijndel
40fc5e0737
Merge pull request #178616 from SuperSandro2000/gitea-
gitea: remove with lib over entire file, remove unused patchShebangs
2022-06-23 22:12:29 +02:00
Robert Scott
466c2e342a treewide/applications: add sourceType binaryNativeCode for many packages 2022-06-23 18:38:19 +01:00
Jan Tojnar
68c94a2786 meld: 3.21.1 → 3.21.2
https://gitlab.gnome.org/GNOME/meld/-/compare/3.21.1...3.21.2
2022-06-23 14:56:22 +02:00
Mario Rodas
dea18775fb
Merge pull request #178090 from r-ryantm/auto-update/git-machete
git-machete: 3.10.1 -> 3.11.1
2022-06-22 21:55:08 -05:00
zowoq
ff38a57aa8 gh: 2.12.1 -> 2.13.0
https://github.com/cli/cli/releases/tag/v2.13.0
2022-06-23 07:50:28 +10:00
Sandro Jäckel
1ea0b578d0
gitea: remove with lib over entire file, remove unused patchShebangs 2022-06-22 20:14:00 +02:00
Harsh Shandilya
1d7b440340
git-quickfix: disable checks
The tests require a Git repository in cwd which is never going to be true for Nix
2022-06-22 13:50:39 +05:30
Harsh Shandilya
5d949c95c2
git-quickfix: 0.1.0 -> 0.1.0 2022-06-22 13:50:33 +05:30
Joshua Gilman
b4706074ba
lefthook: 0.8.0 -> 1.0.0 2022-06-19 09:50:42 -07:00
Jörg Thalheim
10056ffc89
Merge pull request #178181 from wahjava/update-got
got: 0.69 -> 0.70
2022-06-19 08:32:40 +01:00
Ashish SHUKLA
1a98357175
got: 0.69 -> 0.70 2022-06-19 01:12:42 +05:30
Mario Rodas
e0a42267f7
Merge pull request #176441 from azahi/git-appraise
git-appraise: 2018-02-26 -> unstable-2022-04-13
2022-06-18 10:44:17 -05:00
R. Ryantm
ac8b47fa99 git-machete: 3.10.1 -> 3.11.1 2022-06-18 02:49:29 +00:00
Jan Tojnar
47fa54a96c sublime-merge-dev: 2070 → 2073 2022-06-17 17:29:25 +02:00
Jan Tojnar
12c0242db8 sublime-merge: 2071 → 2074 2022-06-17 17:27:50 +02:00
Sandro
c1b0bdec81
Merge pull request #177917 from rhoriguchi/gitkraken
gitkraken: 8.5.0 -> 8.6.0
2022-06-17 11:58:26 +02:00
Sandro
25e01ce4d1
Merge pull request #177922 from pacien/mercurial-6.1.4
mercurial: 6.1.3 -> 6.1.4
2022-06-17 11:58:13 +02:00
Mario Rodas
856826ff22
Merge pull request #177705 from r-ryantm/auto-update/git-machete
git-machete: 3.10.0 -> 3.10.1
2022-06-16 23:27:03 -05:00
pacien
94f540dde4 mercurial: 6.1.3 -> 6.1.4
Changelog: https://www.mercurial-scm.org/wiki/Release6.1
2022-06-16 22:11:36 +02:00
Ryan Horiguchi
f78d79d578
gitkraken: 8.5.0 -> 8.6.0 2022-06-16 21:24:37 +02:00
squalus
084294c064 git-lfs: fix cross compile 2022-06-15 13:43:46 -07:00
R. Ryantm
e7c8981392 git-machete: 3.10.0 -> 3.10.1 2022-06-15 02:56:51 +00:00
Azat Bahawi
db8f61ceb3
git-appraise: 2018-02-26 -> unstable-2022-04-13 2022-06-15 02:24:53 +03:00
sudosubin
31d2556995
lefthook: 0.7.7 -> 0.8.0 2022-06-12 15:49:50 +09:00
Fabian Affolter
9e6c6ad804
Merge pull request #175945 from fabaff/dvc-deps
dvc: add overrides for scmrepo and grandalf
2022-06-12 01:12:37 +02:00
Sandro
8c74650575
Merge pull request #171302 from renesat/submit/datalad 2022-06-11 15:12:36 +02:00
renesat
6c425b1778 datalad: init at 0.16.5 2022-06-10 12:19:58 +03:00
hyqhyq_3
99fcf0ee74
subversion: enable darwin keychain support (#176730)
Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
2022-06-10 01:02:28 +02:00
zowoq
559ee726a6 gh: 2.12.0 -> 2.12.1
https://github.com/cli/cli/releases/tag/v2.12.1
2022-06-10 07:22:14 +10:00
Martin Weinelt
cb7330c266
Merge pull request #174025 from LeSuisse/gogs-0.12.7
gogs: 0.12.6 -> 0.12.9
2022-06-09 14:20:26 +02:00
Thomas Gerbet
d8521f4005 gogs: 0.12.6 -> 0.12.9
Fixes CVE-2022-1464

https://github.com/gogs/gogs/releases/tag/v0.12.7
https://github.com/gogs/gogs/releases/tag/v0.12.8
https://github.com/gogs/gogs/releases/tag/v0.12.9
2022-06-09 13:30:21 +02:00
Julien Moutinho
010488c27b sourcehut.todosrht: 0.71.2 -> 0.72.2 2022-06-08 19:46:04 -04:00
Julien Moutinho
9bd0b0fdc6 sourcehut.pastesrht: 0.13.7 -> 0.13.8 2022-06-08 19:46:04 -04:00
Julien Moutinho
2524e0d7f3 sourcehut.pagessrht: 0.7.3 -> 0.7.4 2022-06-08 19:46:04 -04:00
Julien Moutinho
c32f043d67 sourcehut.metasrht: 0.58.8 -> 0.58.18 2022-06-08 19:46:04 -04:00
Julien Moutinho
fa6e3b6509 sourcehut.mansrht: 0.15.25 -> 0.15.26 2022-06-08 19:46:04 -04:00
Julien Moutinho
8388db5a9e sourcehut.listssrht: 0.51.10 -> 0.51.11 2022-06-08 19:46:04 -04:00
Julien Moutinho
de3b09c4d0 sourcehut.hgsrht: 0.31.2 -> 0.31.3 2022-06-08 19:46:04 -04:00
Julien Moutinho
0d286b8d96 sourcehut.gitsrht: 0.78.18 -> 0.78.20 2022-06-08 19:46:04 -04:00
Julien Moutinho
a623fb79c0 sourcehut.buildsrht: 0.80.0 -> 0.81.0 2022-06-08 19:46:04 -04:00
Julien Moutinho
4f97b2791f sourcehut: improve cross-compiling support 2022-06-08 19:46:04 -04:00
Julien Moutinho
8f92ed46cf sourcehut: code-style formatting 2022-06-08 19:46:04 -04:00
Julien Moutinho
5da4b29a99 sourcehut: fix update script 2022-06-08 19:46:04 -04:00
Julien Moutinho
a097ca163e sourcehut.srht: 0.68.24 -> 0.69.0 2022-06-08 19:46:04 -04:00
Julien Moutinho
cd6808ba9f sourcehut: fix Unix socket support for Redis 2022-06-08 19:46:04 -04:00
Julien Moutinho
2103e323e8 sourcehut: passthru nixosTests.sourcehut 2022-06-08 19:46:04 -04:00
Julien Moutinho
2add91db99 sourcehut.todosrht: 0.71.0 -> 0.71.2 2022-06-08 19:46:04 -04:00
Julien Moutinho
a43c25161c sourcehut.listssrht: 0.51.9 -> 0.51.10 2022-06-08 19:46:04 -04:00
Julien Moutinho
d587a14bca sourcehut.buildsrht: 0.79.1 -> 0.80.0 2022-06-08 19:46:04 -04:00
Julien Moutinho
876f3a8bf0 sourcehut.todosrht: 0.67.2 -> 0.71.0 2022-06-08 19:46:04 -04:00
Julien Moutinho
1722530759 sourcehut.pastesrht: 0.13.6 -> 0.13.7 2022-06-08 19:46:04 -04:00
Julien Moutinho
47680ca9e3 sourcehut.pagessrht: 0.6.2 -> 0.7.3 2022-06-08 19:46:04 -04:00
Julien Moutinho
bcb91bbeb7 sourcehut.metasrht: 0.57.5 -> 0.58.8 2022-06-08 19:46:04 -04:00
Julien Moutinho
a3297babdc sourcehut.mansrht: 0.15.23 -> 0.15.25 2022-06-08 19:46:04 -04:00
Julien Moutinho
59d8439966 sourcehut.listssrht: 0.51.7 -> 0.51.9 2022-06-08 19:46:04 -04:00
Julien Moutinho
0f1e37bc5b sourcehut.hubsrht: 0.14.4 -> 0.14.14 2022-06-08 19:46:04 -04:00
Julien Moutinho
658d8f1240 sourcehut.hgsrht: 0.29.4 -> 0.31.2 2022-06-08 19:46:04 -04:00
Julien Moutinho
b57ed0fa1d sourcehut.gitsrht: 0.77.3 -> 0.78.18 2022-06-08 19:46:04 -04:00
Julien Moutinho
43f856ab2c sourcehut.buildsrht: 0.75.2 -> 0.79.1 2022-06-08 19:46:04 -04:00
Julien Moutinho
dad23bcdd0 sourcehut.scmsrht: 0.22.19 -> 0.22.22 2022-06-08 19:46:04 -04:00
Julien Moutinho
a5d72ec6de sourcehut.srht: 0.68.14 -> 0.68.24 2022-06-08 19:46:04 -04:00
Julien Moutinho
a0021846c2 sourcehut: fix gqlgen with -trimpath 2022-06-08 19:46:04 -04:00
zowoq
a0db9aae9f gh: 2.11.3 -> 2.12.0
https://github.com/cli/cli/releases/tag/v2.12.0
2022-06-09 08:58:31 +10:00
Yaya
9a8ae4d72e
gitlab: 15.0.1 -> 15.0.2 (#176629)
https://about.gitlab.com/releases/2022/06/06/gitlab-15-0-2-released/
2022-06-07 01:05:09 +02:00
Rick van Schijndel
3037752d1d
Merge pull request #175961 from helsinki-systems/rem/broken
remove some packages marked broken for over 1.5 years
2022-06-06 20:44:39 +02:00
Sandro
5075061493
Merge pull request #175771 from jmgilman/conform
conform: init at 0.1.0-alpha.25
2022-06-06 17:49:04 +02:00
Joshua Gilman
5c871cdf83
conform: init at 0.1.0-alpha.25
fix: removes trailing period in package description

chore: adds jk as maintainer

test: enforces running tests

conform: init at 0.1.0-alpha.25

fix: fixes review comments

conform: init at 0.1.0-alpha.25
2022-06-06 07:09:32 -07:00
Robert Scott
53573e4866
Merge pull request #176278 from risicle/ris-jar-source-provenance
treewide: set `sourceProvenance` for packages containing downloaded jars
2022-06-05 12:04:38 +01:00
Mario Rodas
f910bc55af
Merge pull request #176180 from aaronjheng/git-lfs
git-lfs: use buildGoModule
2022-06-04 19:37:03 -05:00
Robert Scott
3b6bc4b69c treewide: set sourceProvenance for packages containing downloaded jars
these are the easily identifiable cases and will not be comprehensive
2022-06-04 19:47:57 +01:00
Mario Rodas
c3321ad063 git-absorb: 0.6.6 -> 0.6.7 2022-06-04 04:20:00 +00:00
Yaya
4d0cfc2d83
gitlab: 15.0.0 -> 15.0.1 (#175836)
https://about.gitlab.com/releases/2022/06/01/critical-security-release-gitlab-15-0-1-released/

Fixes: CVE-2022-1680, CVE-2022-1940, CVE-2022-1948, CVE-2022-1935,
       CVE-2022-1936, CVE-2022-1944, CVE-2022-1821, CVE-2022-1783
2022-06-04 12:35:24 +02:00
Aaron Jheng
0b0119f1ea
git-lfs: use buildGoModule 2022-06-04 03:14:28 +00:00
Luke Granger-Brown
8bf8fbcd1e
Merge pull request #175955 from techknowlogick/hg
mercurial: 6.1.2 -> 6.1.3
2022-06-03 07:44:52 +01:00
Rick van Schijndel
3c093e3f40
Merge pull request #175224 from aaronjheng/git-lfs
git-lfs1: remove
2022-06-02 20:24:15 +02:00
ajs124
8d567a8863 sit: remove after being marked broken for over 18 months
It was marked in commit a2514c22a8 by Benjamin Hipple on 2020-03-07 (commited on 2020-03-07)
2022-06-02 18:03:52 +02:00
techknowlogick
ca19b56a93 mercurial: add techknowlogick as maintainer 2022-06-02 11:15:11 -04:00
techknowlogick
98bc447a8a mercurial: 6.1.2 -> 6.1.3 2022-06-02 11:14:34 -04:00
Sandro
926444320b
Merge pull request #175940 from aaronjheng/git-annex-remote-b2
git-annex-remote-b2: remove
2022-06-02 17:06:51 +02:00
Fabian Affolter
050ca6ef8f dvc: add overrides for scmrepo and grandalf 2022-06-02 15:37:20 +02:00
Aaron Jheng
a7de9e82d2
git-annex-remote-b2: remove 2022-06-02 13:36:53 +00:00
github-actions[bot]
ebcaa0d01c
Merge master into staging-next 2022-06-01 12:01:27 +00:00
Aaron Jheng
11dd9db955
grv: remove 2022-06-01 11:21:31 +00:00
Berk D. Demir
a3205db0c5 gitbatch: Fix tests requiring .git & writable HOME
Disable the tests requiring access to gitlab.com

Bug fixed by #173702 runs the previously skipped tests for this
package.
2022-06-01 01:04:23 +00:00
github-actions[bot]
d6ede66f6a
Merge master into staging-next 2022-05-31 18:01:11 +00:00
Robert Hensing
c5d82eb1ab
Merge pull request #174939 from FliegendeWurst/nixos-tests
nixos/tests: various fixes
2022-05-31 16:31:06 +02:00
github-actions[bot]
8d36a138eb
Merge master into staging-next 2022-05-30 18:01:09 +00:00
Rick van Schijndel
37c633f7ae treewide: pkgs/applications: mark broken for darwin 2022-05-29 10:56:04 +02:00
Aaron Jheng
d70af2c3b6
git-lfs1: remove 2022-05-29 03:01:44 +00:00
github-actions[bot]
c74c0a18ba
Merge master into staging-next 2022-05-29 00:02:55 +00:00
Fabian Affolter
958cf873dc dvc: 2.9.5 -> 2.10.2 2022-05-27 21:29:48 +02:00
FliegendeWurst
9d2c8ba7e9 nixos/tests/gitolite: fix test timeout
This prevents ssh from reading from stdin.

Link the NixOS test to the package.
2022-05-27 15:34:46 +02:00
github-actions[bot]
7c4e7c3159
Merge staging-next into staging 2022-05-27 00:03:07 +00:00
Mario Rodas
297e869c23
Merge pull request #174666 from marsam/update-lfs
git-lfs: 3.1.4 -> 3.2.0
2022-05-26 18:50:11 -05:00
R. Ryantm
deb39706a1 ghq: 1.2.1 -> 1.3.0 2022-05-26 06:20:08 +00:00
github-actions[bot]
f82caaee74
Merge staging-next into staging 2022-05-26 00:02:58 +00:00
zowoq
c408f01b69 gh: 2.11.2 -> 2.11.3
https://github.com/cli/cli/releases/tag/v2.11.3
2022-05-26 08:18:01 +10:00
github-actions[bot]
ab6c34c083
Merge staging-next into staging 2022-05-25 18:01:56 +00:00
Pavol Rusnak
ef50f067f7
Merge pull request #171043 from prusnak/curlWithGnuTls
treewide: refactor curlWithGnuTls into all-packages.nix
2022-05-25 17:18:07 +02:00
zowoq
2836cfa1b1 gh: 2.11.1 -> 2.11.2
https://github.com/cli/cli/releases/tag/v2.11.2
2022-05-26 00:52:39 +10:00
Mario Rodas
2e17187eba git-lfs: 3.1.4 -> 3.2.0
https://github.com/git-lfs/git-lfs/releases/tag/v3.2.0
2022-05-25 04:20:00 +00:00
github-actions[bot]
59d64381a5
Merge staging-next into staging 2022-05-25 00:04:08 +00:00
zowoq
8c00b0e250 gh: 2.11.0 -> 2.11.1
https://github.com/cli/cli/releases/tag/v2.11.1
2022-05-25 07:38:58 +10:00
github-actions[bot]
6935cd110f
Merge staging-next into staging 2022-05-24 18:02:00 +00:00
zowoq
c78acaecb4 gh: 2.10.1 -> 2.11.0
https://github.com/cli/cli/releases/tag/v2.11.0
2022-05-24 22:44:57 +10:00
Michael Weiss
8dd636f74d
Merge pull request #173539 from primeos/git
git: 2.36.0 -> 2.36.1
2022-05-23 20:41:34 +02:00
Artturi
e00bb60b19
Merge pull request #173430 from Artturin/fetchzippost 2022-05-23 18:25:50 +03:00
Artturin
b3caa2f1fe treewide: extraPostFetch -> postFetch 2022-05-23 17:18:50 +03:00
Maximilian Bosch
53dea2d204
Merge pull request #173310 from techknowlogick/bgitea-3
gitea: 1.16.7 -> 1.16.8
2022-05-22 22:47:22 +02:00
Yureka
1e95faf0b8 gitlab: 14.10.2 -> 15.0.0 2022-05-22 13:09:36 +02:00
Mario Rodas
021fdc9189
Merge pull request #173537 from rhoriguchi/gitkraken
gitkraken: 8.4.0 -> 8.5.0
2022-05-21 17:35:11 -05:00
Mario Rodas
0528cbbf85
Merge pull request #173649 from r-ryantm/auto-update/git-machete
git-machete: 3.9.1 -> 3.10.0
2022-05-21 17:26:40 -05:00
Robert Scott
335334d1c6 monotone: add patch reverting old clang hack
modern clang has __float128 and the old declaration hack causes a
build failure
2022-05-20 21:43:56 +01:00
R. Ryantm
279e65cf19 git-machete: 3.9.1 -> 3.10.0 2022-05-19 16:52:21 +00:00
Michael Weiss
d97482f6c6
git: 2.36.0 -> 2.36.1 2022-05-18 23:33:09 +02:00
Ryan Horiguchi
0ab65882db
gitkraken: 8.4.0 -> 8.5.0 2022-05-18 23:18:30 +02:00
Alyssa Ross
66e01d3478 cgit-pink: 1.3.0 -> 1.4.1
We skipped 1.4.0 because it had a stack free bug.
2022-05-18 20:04:10 +00:00
Alyssa Ross
8e11760777 cgit-pink: remove duplicate maintainer entry
I'm already added through common.nix.
2022-05-18 20:04:10 +00:00
Artturi
b0c602515d
Merge pull request #173084 from Artturin/unecessaryprf
treewide: remove unecessary XDG_DATA_DIRS from appimage wrapType2
2022-05-18 21:23:58 +03:00
Alyssa Ross
ff78be018d
cgit,cgit-pink: enableParallelBuilding
Tested at -j48.
2022-05-18 10:31:50 +00:00
Mario Rodas
6e4887ce07 lab: 0.24.0 -> 0.25.0 2022-05-18 04:20:00 +00:00
Artturi
52c2ca47bb
Merge pull request #173240 from misuzu/git-workspace-update
git-workspace: 0.9.0 -> 1.0.3
2022-05-19 02:16:31 +03:00
Robert Scott
7de5ec8856
Merge pull request #173341 from leungbk/git-ignore
git-ignore: 1.1.1 -> 1.2.0 (fix build on aarch64-darwin)
2022-05-17 22:54:22 +01:00
Alexander Bantyev
b3f385f338
Merge pull request #173329 from cab404/cab/update-git-sync
git-sync: unstable-2021-07-14 -> unstable-2022-03-20
2022-05-17 13:23:10 +03:00
Brian Leung
c1436e20bf
git-ignore: install shell completions 2022-05-16 20:01:18 -07:00
Brian Leung
91a9c5a9be
git-ignore: 1.1.1 -> 1.2.0 2022-05-16 20:01:18 -07:00
cab
dd96e9f567
git-sync: unstable-2021-07-14 -> unstable-2022-03-20 2022-05-17 04:24:36 +04:00
techknowlogick
999b8268c8 gitea: 1.16.7 -> 1.16.8 2022-05-16 17:04:14 -04:00
misuzu
33294cea74 git-workspace: 0.9.0 -> 1.0.3
https://github.com/orf/git-workspace/releases/tag/v1.0.3
https://github.com/orf/git-workspace/compare/v0.9.0...v1.0.3
2022-05-16 10:55:05 +03:00
Mario Rodas
bf3bd2f9e8
Merge pull request #171249 from aaronjheng/git-codereview
git-codereview: 2020-01-15 -> 1.0.3
2022-05-15 09:59:19 -05:00
Artturin
1a634cc057 treewide: remove unecessary XDG_DATA_DIRS from appimage wrapType2
they're unnecessary since https://github.com/NixOS/nixpkgs/pull/161739/files

which links the schemas to their correct fhs locations and adds
gsettings-desktop-schemas and hicolor-icon-theme to appimage fhs
2022-05-15 05:19:23 +03:00
Shane Sveller
6320198329
gfold: 3.0.0 -> 4.0.0
https://github.com/nickgerace/gfold/blob/4.0.0/CHANGELOG.md
2022-05-13 17:37:32 -05:00
Sandro Jäckel
f721daad25 delta: 0.12.1 -> 0.13.0 2022-05-14 06:54:26 +10:00
R. Ryantm
61731ab0b1 git-machete: 3.9.0 -> 3.9.1 2022-05-12 17:27:13 +00:00
Thomas Gerbet
05f976210a rapidsvn: fix the build and use Python 3
Moved back to C++14 where dynamic exception specifications are deprecated but still present.

ZHF: #172160
2022-05-12 12:29:43 +02:00
Artturi
8d71f67faa
Merge pull request #171386 from viraptor/cvs2svn-man-pages
cvs2svn: add man pages
2022-05-11 13:09:34 +03:00
zowoq
7c38f2d12a gh: 2.9.0 -> 2.10.1
https://github.com/cli/cli/releases/tag/v2.10.0
https://github.com/cli/cli/releases/tag/v2.10.1
2022-05-11 11:03:14 +10:00
Artturi
f80d9c8958
Merge pull request #172310 from wahjava/update-fnc
fnc: 0.10 -> 0.12
2022-05-11 03:37:55 +03:00
Dmitry Bogatov
37578b911e
rcshist: use webarchive of source tgz (#172339)
Upstream archive has no version and is not reproducible. I doubt version 1.05
would ever appear, but still.

Suggested-By: @SuperSandro2000

Co-authored-by: Dmitry Bogatov <git#v1@kaction.cc>
2022-05-10 16:49:53 +02:00
Aaron Jheng
590098bcd7
git-codereview: 2020-01-15 -> 1.0.3 2022-05-10 11:48:40 +00:00
Ashish SHUKLA
6afb6d4032
fnc: 0.10 -> 0.12
Install checks are removed, courtesy: https://fnc.bsdbox.org/info/9b191697d6
2022-05-10 16:27:40 +05:30
Luke Granger-Brown
736ae06a21
Merge pull request #171565 from pacien/mercurial-6.1.2
mercurial: 6.1.1 -> 6.1.2
2022-05-09 19:42:59 +01:00
Dmitry Bogatov
3a71e04f36 Update pkgs/applications/version-management/rcshist/default.nix
Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
2022-05-09 05:31:46 -04:00
Dmitry Bogatov
99bfa8b949 rcshist: init at 1.04 2022-05-09 05:31:46 -04:00
github-actions[bot]
f39e774f11
Merge master into staging-next 2022-05-09 00:02:27 +00:00
Sandro
145b101a20
Merge pull request #171971 from NixOS/sm
sublime-merge: 2068 → 2071
2022-05-09 01:23:17 +02:00
github-actions[bot]
eaaed3f1d2
Merge master into staging-next 2022-05-08 12:01:07 +00:00
Bobby Rong
da0e3efa22
Merge pull request #171335 from wahjava/fix-fnc
fnc: unbreak build
2022-05-08 19:57:20 +08:00
Jan Tojnar
e3104e95c5 sublime-merge-dev: 2067 → 2070
https://www.sublimemerge.com/dev#changelog
2022-05-07 18:59:06 +02:00
Jan Tojnar
cd9591ccd9 sublime-merge: 2068 → 2071
https://www.sublimemerge.com/download#changelog
2022-05-07 18:59:06 +02:00
github-actions[bot]
fa99b3742a
Merge master into staging-next 2022-05-07 00:02:09 +00:00
Artturi
d2b5cf38f7
Merge pull request #170646 from VirtusLab/chore/pytest
git-machete: updates to 3.9.0
2022-05-06 23:42:50 +03:00
github-actions[bot]
6e0aca3c43
Merge master into staging-next 2022-05-06 12:02:02 +00:00
Yaya
defb285c96
gitlab: 14.10.1 -> 14.10.2 (#171801) 2022-05-06 13:39:59 +02:00
github-actions[bot]
ff5c4d3404
Merge master into staging-next 2022-05-06 06:01:36 +00:00
Artturi
1324b2b7b3
Merge pull request #169755 from clkamp/radicle-upstream-0.3.0
radicle-upstream: 0.2.12 -> 0.3.0
2022-05-06 07:19:44 +03:00
github-actions[bot]
b962dee3e7
Merge master into staging-next 2022-05-06 00:02:16 +00:00
Jan Tojnar
1e7cc37ca4 meld: Fix view not rendering with adwaita-icon-theme 42 due to removed icons 2022-05-06 00:48:25 +02:00
pacien
cfe0566da1 mercurial: 6.1.1 -> 6.1.2
Setting `HGMODULEPOLICY` for the tests is now required for the native
components to be properly detected when testing the already built binary
with `--with-hg`.

This release contains an important bug fix:
"Fix incorrect metadata causing dirstate-v2 data loss in edge case"

Release notes: https://www.mercurial-scm.org/wiki/Release6.1
2022-05-05 23:39:23 +02:00
github-actions[bot]
aba90d9366
Merge master into staging-next 2022-05-05 18:05:32 +00:00
Artturi
f09f23e9e5
Merge pull request #170831 from wahjava/update-got
got: 0.68.1 -> 0.69
2022-05-05 20:41:13 +03:00
Artturi
180879172e
Merge pull request #110168 from corngood/p4 2022-05-05 20:20:24 +03:00
Pawel Lipski
58fb27e4a1 git-machete: add pytest-mock and pytestCheckHook to checkInputs 2022-05-04 15:16:26 +02:00
github-actions[bot]
51a899bdc1
Merge staging-next into staging 2022-05-03 18:10:46 +00:00
Yaya
7af591c79c
gitlab: 14.10.0 -> 14.10.1 (#171363) 2022-05-03 14:10:17 +02:00
Stanisław Pitucha
578441d11b cvs2svn: add self to maintainers 2022-05-03 20:41:46 +10:00
Stanisław Pitucha
e63b0f634e cvs2svn: add man pages 2022-05-03 20:39:36 +10:00
R. Ryantm
fa1e885698 gitRepo: 2.24.1 -> 2.25 2022-05-03 08:04:49 +00:00
Ashish SHUKLA
509a6f1eba
fnc: unbreak build
Import a patch from upstream to be present in the next release
2022-05-03 06:23:35 +05:30
github-actions[bot]
46944fe032
Merge staging-next into staging 2022-05-03 00:02:25 +00:00
Aaron Jheng
4427d9cd73 gitbatch: 2019-12-19 -> 0.6.1 2022-05-03 01:11:39 +02:00
Robert Scott
cfba6e3971
Merge pull request #171199 from techknowlogick/bgitea-2
gitea: 1.16.6 -> 1.16.7
2022-05-02 21:57:13 +01:00
github-actions[bot]
c4bf3689ee
Merge staging-next into staging 2022-05-02 18:10:52 +00:00
Yaya
9345a203f0
gitlab: 14.9.3 -> 14.10.0 (#171129)
https://about.gitlab.com/releases/2022/04/22/gitlab-14-10-released/
2022-05-02 15:21:58 +02:00
github-actions[bot]
c01e301153
Merge staging-next into staging 2022-05-02 12:06:41 +00:00
techknowlogick
4bc73f44e6 gitea: 1.16.6 -> 1.16.7 2022-05-02 01:23:51 -04:00
Vladimír Čunát
c480cc2895
Merge branch 'master' into staging-next-2022-04-23 2022-04-30 23:02:28 +02:00
Pavol Rusnak
4b7a8ae947
treewide: refactor curlWithGnuTls into all-packages.nix 2022-04-30 18:56:59 +02:00
Thiago Kenji Okada
29bd246024 gitless: use pythonRelaxDepsHook 2022-04-30 13:20:01 +01:00
github-actions[bot]
80ebf94b82
Merge master into staging-next 2022-04-30 12:01:16 +00:00
Aaron Andersen
bcb60de7d5
Merge pull request #170025 from felixsinger/update/pkgs/redmine
redmine: 4.2.4 -> 4.2.5
2022-04-30 06:59:03 -04:00
github-actions[bot]
142bf917b0
Merge master into staging-next 2022-04-30 00:02:08 +00:00
zowoq
2075ea4de4 git-interactive-rebase-tool: 2.1.0 -> 2.2.0
https://github.com/MitMaro/git-interactive-rebase-tool/releases/tag/2.2.0
2022-04-30 07:12:38 +10:00
github-actions[bot]
db87306c53
Merge master into staging-next 2022-04-29 18:01:20 +00:00
Rick van Schijndel
74c26569a2
Merge pull request #170447 from armeenm/remove-subversion_1_10
subversion_1_10: remove
2022-04-29 18:36:46 +02:00
Ashish SHUKLA
a3c0afb1e2
got: 0.68.1 -> 0.69
Add dependency on libbsd, required for arc4random_* functions
2022-04-29 05:56:41 +05:30
Vladimír Čunát
51554cbbdb
Merge branch 'master' into staging-next-2022-04-23 2022-04-27 22:50:17 +02:00
Vladimír Čunát
9b64158404
git: disable a test on aarch64-darwin
I don't know what's wrong, but it does fail on Hydra
despite on (reportedly) not failing on some user systems.
https://hydra.nixos.org/build/174778232
2022-04-27 22:47:23 +02:00
github-actions[bot]
565df1946d
Merge master into staging-next 2022-04-27 18:01:19 +00:00
Pawel Lipski
e83884a9e9 git-machete: updates to 3.9.0 2022-04-27 18:54:28 +02:00
Mario Rodas
0e5e38b9e4
Merge pull request #170557 from r-ryantm/auto-update/gitRepo
gitRepo: 2.24 -> 2.24.1
2022-04-27 07:06:56 -05:00
github-actions[bot]
2ac5c4af82
Merge master into staging-next 2022-04-27 06:01:04 +00:00
R. Ryantm
1d8e889dc0 gitRepo: 2.24 -> 2.24.1 2022-04-27 03:11:52 +00:00
R. Ryantm
d9e593ed58 git-cliff: 0.6.1 -> 0.7.0 2022-04-26 21:54:56 -04:00
github-actions[bot]
8261a7aaba
Merge master into staging-next 2022-04-27 00:02:17 +00:00
zowoq
e10da1c7f5 gh: 2.8.0 -> 2.9.0
https://github.com/cli/cli/releases/tag/v2.9.0
2022-04-27 07:19:43 +10:00
Armeen Mahdian
b83fb8a29d subversion_1_10: remove 2022-04-26 11:54:30 -05:00
Felix Singer
21458a47a5 redmine: 4.2.4 -> 4.2.5
Update Redmine to version 4.2.5.

Change log: https://www.redmine.org/projects/redmine/wiki/Changelog_4_2

Signed-off-by: Felix Singer <felixsinger@posteo.net>
2022-04-26 02:36:54 +02:00
Vladimír Čunát
ad8197eb43
Merge branch 'master' into staging-next 2022-04-25 23:11:18 +02:00
Randy Eckenrode
0e5763e31b
git: fix failing build on Darwin 2022-04-25 14:33:46 -04:00
Ryan Mulligan
24a9d6b163
Merge pull request #170041 from r-ryantm/auto-update/git-machete
git-machete: 3.8.0 -> 3.9.0
2022-04-25 11:14:49 -07:00
github-actions[bot]
6a14b5834e
Merge master into staging-next 2022-04-25 00:02:35 +00:00
Mario Rodas
1445d399d7
Merge pull request #170007 from kira-bruneau/git-review
git-review: 2.3.0 → 2.3.1
2022-04-24 18:53:02 -05:00
Sandro
889e84c7d0
Merge pull request #169651 from SuperSandro2000/git-crypt 2022-04-25 01:37:21 +02:00
github-actions[bot]
6f66eac9d1
Merge master into staging-next 2022-04-24 18:01:04 +00:00
Yaya
858b460f3c
gitlab: 14.9.2 -> 14.9.3 (#168402) 2022-04-24 16:12:38 +02:00
github-actions[bot]
93ca6b8345
Merge master into staging-next 2022-04-24 06:01:05 +00:00
R. Ryantm
1d24939a9a git-machete: 3.8.0 -> 3.9.0 2022-04-24 02:51:13 +00:00
Bobby Rong
e076216c3e
Merge pull request #169299 from clkamp/fix-rcs
rcs: Fix build failure
2022-04-24 10:40:05 +08:00
Felix Singer
f02d6f4348 redmine: Add Felix Singer as maintainer
Signed-off-by: Felix Singer <felixsinger@posteo.net>
2022-04-24 03:32:36 +02:00
Felix Singer
3d33f6253c redmine: Add update script
The following steps need to be done before running the script:

  1. Copy Gemfile from new Redmine version to the Redmine folder in
     Nixpkgs
  2. Manually modify the database lines in Gemfile and just include the
     gems for the supported databases (diff the two files).

Signed-off-by: Felix Singer <felixsinger@posteo.net>
2022-04-24 02:32:53 +02:00
Kira Bruneau
13977be6e9 git-review: 2.3.0 → 2.3.1 2022-04-23 16:40:01 -04:00
Vladimír Čunát
82ec893b68
Merge branch 'staging' into staging-next 2022-04-23 18:10:57 +02:00
Mario Rodas
4ea2662743
Merge pull request #169848 from r-ryantm/auto-update/ghorg
ghorg: 1.7.12 -> 1.7.13
2022-04-23 06:36:08 -05:00
Michael Raskin
2795e9345e monotone: fix build by forcing C++11 2022-04-23 08:11:11 +02:00
Artturi
62866bc352
Merge pull request #169449 from Artturin/movetesting1
testers.testVersion: move from trivial-builders.nix
2022-04-23 06:06:16 +03:00
Mario Rodas
d7ca105981
Merge pull request #169754 from SuperSandro2000/git-extras
git-extras: 6.3.0 -> 6.4.0
2022-04-22 21:46:50 -05:00
Kira Bruneau
3700d166ed
Merge pull request #169269 from r-ryantm/auto-update/git-review
git-review: 2.2.0 -> 2.3.0
2022-04-22 22:41:25 -04:00
Mario Rodas
31f4416f64
Merge pull request #169760 from syberant/gitoxide
gitoxide: 0.10.0 -> 0.12.0
2022-04-22 19:21:03 -05:00
github-actions[bot]
90d2d8da85
Merge staging-next into staging 2022-04-23 00:02:52 +00:00
R. Ryantm
1acf421ff2 git-lfs: 3.1.2 -> 3.1.4 2022-04-22 22:47:49 +00:00
R. Ryantm
8be8be71cf ghorg: 1.7.12 -> 1.7.13 2022-04-22 20:00:49 +00:00
Artturin
f1c7f19e49 treewide: testVersion -> testers.testVersion 2022-04-22 16:24:27 +03:00
Sybrand Aarnoutse
a9fdf69f9f gitoxide: 0.10.0 -> 0.12.0 2022-04-22 12:34:23 +02:00
Sandro Jäckel
c7f09c80be
git-extras: 6.3.0 -> 6.4.0 2022-04-22 11:52:59 +02:00
Christian Luetke Stetzkamp
5a77756649 radicle-upstream: 0.2.12 -> 0.3.0
Fixes #168605
2022-04-22 11:46:45 +02:00
github-actions[bot]
e31746a7f5
Merge staging-next into staging 2022-04-22 06:01:51 +00:00
Ryan Mulligan
5d015eadf0
Merge pull request #169516 from r-ryantm/auto-update/gitRepo
gitRepo: 2.23 -> 2.24
2022-04-21 19:53:58 -07:00
github-actions[bot]
46f11e0147
Merge staging-next into staging 2022-04-22 00:02:43 +00:00
Sandro Jäckel
319d22ab46
git-crypt: 0.6.0 -> 0.7.0 2022-04-22 01:38:19 +02:00
Sandro Jäckel
f83b8f10b8
git-crypt: adopt 2022-04-22 01:37:13 +02:00
R. Ryantm
41a2be8dc8 gitRepo: 2.23 -> 2.24 2022-04-21 03:03:41 +00:00
techknowlogick
7f03674b29 gitea: 1.16.5 -> 1.16.6 2022-04-20 21:00:44 -04:00
Christian Luetke Stetzkamp
cd8f1c2f11 rcs: cleanup remove unecessary input 2022-04-20 08:52:13 +02:00
Christian Luetke Stetzkamp
a8d61ae530 Revert "rcs: fix build w/glibc-2.34"
This reverts commit 96418eb0e7.

Patch is not needed anymore.
2022-04-19 11:23:46 +02:00
R. Ryantm
e76dad1a77 git-review: 2.2.0 -> 2.3.0 2022-04-19 03:15:47 +00:00
techknowlogick
1ea980a082 git: 2.35.3 -> 2.36.0 2022-04-18 15:02:36 -04:00
github-actions[bot]
40f288fa90
Merge master into staging-next 2022-04-15 18:01:30 +00:00
Daniel Nagy
ac83e58d62
glab: install shell completions (#168166)
* glab: install shell completions

* Update pkgs/applications/version-management/git-and-tools/glab/default.nix

Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
2022-04-15 19:15:34 +02:00
Martin Weinelt
a7fc5aaa76 Merge remote-tracking branch 'origin/master' into staging-next 2022-04-15 13:30:48 +02:00
Lassulus
92734ac395
Merge pull request #166865 from malob/treewide-mainProgram
treewide: add meta.mainProgram to many packages
2022-04-15 09:28:00 +01:00
Fabián Heredia Montiel
cb4a8b71c0 pijul: 1.0.0-beta → 1.0.0-beta.1 2022-04-15 00:25:09 -05:00
github-actions[bot]
1c0229dbfd
Merge staging-next into staging 2022-04-15 00:03:21 +00:00
Artturi
82c41765d3
Merge pull request #168652 from rhoriguchi/gitkraken
gitkraken: 8.3.3 -> 8.4.0
2022-04-14 23:55:28 +03:00
Ryan Horiguchi
e32344a937
gitkraken: 8.3.3 -> 8.4.0 2022-04-14 19:55:37 +02:00
Malo Bourgon
0e802eafad treewide: add meta.mainProgram to many packages 2022-04-14 10:24:01 -07:00
Martin Weinelt
329623c04f
Merge pull request #168581 from qowoz/git
git: 2.35.2 -> 2.35.3
2022-04-14 16:20:28 +02:00
github-actions[bot]
999a16ca63
Merge staging-next into staging 2022-04-14 12:02:14 +00:00
Mario Rodas
0d2ac5b4ea
Merge pull request #168582 from r-ryantm/auto-update/git-machete
git-machete: 3.7.2 -> 3.8.0
2022-04-14 05:03:21 -05:00