Frederik Rietdijk
470f05cb5d
Merge staging-next into staging
2020-11-03 12:06:41 +01:00
Frederik Rietdijk
237966224d
Merge master into staging-next
2020-11-03 12:06:06 +01:00
Mario Rodas
76ff5a73c7
gitAndTools.git-absorb: 0.6.5 -> 0.6.6
2020-11-02 22:00:00 -05:00
Mario Rodas
eb64ee0a46
Merge pull request #102295 from r-ryantm/auto-update/git-extras
...
gitAndTools.git-extras: 6.0.0 -> 6.1.0
2020-11-02 18:10:23 -05:00
Mario Rodas
c1d13cde94
Merge pull request #102430 from r-ryantm/auto-update/git-filter-repo
...
gitAndTools.git-filter-repo: 2.28.0 -> 2.29.0
2020-11-02 04:53:13 -05:00
Pavol Rusnak
2c931312ce
treewide: simplify rev/repo arguments in src
...
+ use fetchFromGithub where possible
2020-11-01 23:02:24 -08:00
R. RyanTM
73e3b14503
gitAndTools.git-filter-repo: 2.28.0 -> 2.29.0
2020-11-02 05:48:03 +00:00
Jonathan Ringer
9122b454f6
csv_fast_export: use python3
2020-11-01 10:54:30 -08:00
Frederik Rietdijk
83dde6c52c
Merge staging-next into staging
2020-11-01 10:11:12 +01:00
Frederik Rietdijk
7a8d5dc8a6
Merge master into staging-next
2020-11-01 10:10:47 +01:00
Mario Rodas
26d3fbf215
Merge pull request #102310 from r-ryantm/auto-update/git-gone
...
gitAndTools.git-gone: 0.3.6 -> 0.3.7
2020-10-31 23:00:45 -05:00
Mario Rodas
76fdf69296
Merge pull request #102303 from r-ryantm/auto-update/git-trim
...
gitAndTools.git-trim: 0.4.0 -> 0.4.2
2020-10-31 22:11:55 -05:00
R. RyanTM
5535343769
gitAndTools.git-gone: 0.3.6 -> 0.3.7
2020-11-01 02:35:57 +00:00
R. RyanTM
0c77c15642
gitAndTools.git-trim: 0.4.0 -> 0.4.2
2020-11-01 01:10:34 +00:00
R. RyanTM
3408bddacf
gitAndTools.git-extras: 6.0.0 -> 6.1.0
2020-11-01 00:15:25 +00:00
Vladimír Čunát
dfd3ede68d
Merge branch 'master' into staging-next
2020-10-31 14:30:44 +01:00
Michael Weiss
6a1782986d
git: 2.29.1 -> 2.29.2
2020-10-30 13:55:20 +01:00
Sebastien Braun
bbf96d898b
git: Use asciidoctor instead of asciidoc for manpages
...
Asciidoc is severely outdated and is replaced by asciidoctor.
Eliminating asciidoc gets rid of a python2 dependency, see
https://github.com/NixOS/nixpkgs/issues/101964
2020-10-30 10:48:33 +01:00
MetaDark
ff4a1cf4d8
git-review: build with python3
...
Also updated source to the new repo and added myself as a maintainer
2020-10-29 16:01:12 -07:00
Andreas Rammhold
db0fe5c3eb
Merge branch master into staging to fix eval error
...
This fixes the eval error of the small (and "big"?) NixOS test set that
was fixed in 1088f05
& eba8f542
.
2020-10-28 03:03:27 +01:00
zowoq
f2eb36b889
gitAndTools.gh: 1.1.0 -> 1.2.0
...
https://github.com/cli/cli/releases/tag/v1.2.0
2020-10-28 00:38:12 +10:00
Vladimír Čunát
89023c38fc
Recover the complicated situation after my bad merge
...
I made a mistake merge. Reverting it in c778945806
undid the state
on master, but now I realize it crippled the git merge mechanism.
As the merge contained a mix of commits from `master..staging-next`
and other commits from `staging-next..staging`, it got the
`staging-next` branch into a state that was difficult to recover.
I reconstructed the "desired" state of staging-next tree by:
- checking out the last commit of the problematic range: 4effe769e2
- `git rebase -i --preserve-merges a8a018ddc0` - dropping the mistaken
merge commit and its revert from that range (while keeping
reapplication from 4effe769e2
)
- merging the last unaffected staging-next commit (803ca85c20
)
- fortunately no other commits have been pushed to staging-next yet
- applying a diff on staging-next to get it into that state
2020-10-26 09:01:04 +01:00
Vladimír Čunát
336bc8283b
Re-Revert "Merge #101508 : libraw: 0.20.0 -> 0.20.2"
...
This reverts commit c778945806
.
I believe this is exactly what brings the staging branch into
the right shape after the last merge from master (through staging-next);
otherwise part of staging changes would be lost
(due to being already reachable from master but reverted).
2020-10-26 08:19:17 +01:00
Vladimír Čunát
2f6b00b15e
Merge branch 'staging-next' into staging
2020-10-25 09:47:04 +01:00
Vladimír Čunát
c778945806
Revert "Merge #101508 : libraw: 0.20.0 -> 0.20.2"
...
I'm sorry; I didn't notice it contained staging commits.
This reverts commit 17f5305b6c
, reversing
changes made to a8a018ddc0
.
2020-10-25 09:41:51 +01:00
Vladimír Čunát
17f5305b6c
Merge #101508 : libraw: 0.20.0 -> 0.20.2
2020-10-25 09:28:53 +01:00
WORLDofPEACE
949f7f9227
Merge pull request #98316 from NixOS/gnome-3.38
...
GNOME 3.38
2020-10-23 20:02:38 -04:00
Jan Tojnar
b2ff709179
meld: Fix build on Darwin
...
Meld’s post install script requires gtk-update-icon-cache program on PATH.
Because Meld is a Python app, it uses strictDeps so we need to explicitly
add the program to nativeBuildInputs.
For some reason, Linux version has the program available, though,
which hides the missing dependency. Perhaps it is propagated by something
but I do not know how to determine it.
2020-10-24 01:17:26 +02:00
Jan Tojnar
8317c630af
Merge branch 'staging-next' into staging
2020-10-24 01:10:37 +02:00
Jan Tojnar
c252654584
Merge branch 'master' into staging-next
2020-10-24 01:10:07 +02:00
Michael Weiss
de32261d9f
git: 2.29.0 -> 2.29.1 ( #101488 )
2020-10-23 20:55:30 +02:00
Danielle Lancashire
b197c7fb48
p4: 2020.1.1991450 -> 2020.1.2007551
...
The download URL hasn't changed, but the sha256 and user facing download
version has. See [perforce downloads][p4-download].
[p4-download]: https://www.perforce.com/downloads/helix-command-line-client-p4
2020-10-23 16:24:13 +02:00
Jan Tojnar
d13fc932cd
Merge branch 'master' into staging-next
2020-10-22 21:20:14 +02:00
Sandro Jäckel
0ec595f0eb
gitstatus: 1.3.0 -> 1.3.1
2020-10-22 15:51:11 +02:00
Frederik Rietdijk
23890fc236
Merge staging-next into staging
2020-10-20 20:55:46 +02:00
Anderson Torres
751d7c6c80
Merge pull request #100350 from vidbina/init-ghorg-v1.4.0
...
ghorg: init at 1.4.0
2020-10-20 14:44:39 -03:00
David Asabina
abb7f225ec
ghorg: init at 1.4.0
2020-10-20 12:13:01 +02:00
Tim Steinbach
6f2e9937af
git: 2.28.0 -> 2.29.0
2020-10-19 19:22:46 -04:00
Mario Rodas
e725ae8704
gitAndTools.git-absorb: 0.6.4 -> 0.6.5
2020-10-19 04:20:00 +00:00
Ryan Mulligan
396f3407a2
Merge pull request #95717 from KAction/git-vanity-hash
...
git-vanity-hash: init at 2020-02-26
2020-10-18 10:56:51 -07:00
Mario Rodas
e7a18af0d9
Merge pull request #100945 from r-ryantm/auto-update/gitoxide
...
gitoxide: 0.4.0 -> 0.4.3
2020-10-18 07:56:51 -05:00
R. RyanTM
b1d5d5174f
gitoxide: 0.4.0 -> 0.4.3
2020-10-18 09:21:55 +00:00
Ben Siraphob
683a87dbeb
treewide: remove periods from end of package descriptions
2020-10-17 08:22:31 -07:00
Dmitry Bogatov
c004bcab9c
git-vanity-hash: init at 2020-02-26
2020-10-17 00:00:00 -04:00
R. RyanTM
00f0b1d721
nbstripout: 0.3.7 -> 0.3.9
2020-10-16 00:40:08 -07:00
Antonio Yang
866ce94402
gitui: 0.9.1 -> 0.10.1
...
- add python3 for nativeBuildInputs
- add xorg.libxcb for buildInputs
Co-authored-by: Jon <jonringer@users.noreply.github.com>
2020-10-15 14:18:11 +08:00
Frederik Rietdijk
9e1943edc0
Merge master into staging-next
2020-10-13 19:34:34 +02:00
Doron Behar
38c6398c78
Merge pull request #100248 from RaitoBezarius/raito-srht-todo
...
todosrht: 0.61.11 -> 0.62.1
2020-10-12 11:11:53 +03:00
Doron Behar
28ad2e0a9b
Merge pull request #100241 from RaitoBezarius/raito-srht-git
...
gitsrht: 0.60.7 -> 0.61.10
2020-10-12 11:11:23 +03:00
Doron Behar
e9e3c1dd96
Merge pull request #100244 from RaitoBezarius/raito-srht-lists
...
listssrht: 0.45.9 -> 0.45.15
2020-10-12 11:10:45 +03:00