Commit graph

3688 commits

Author SHA1 Message Date
Milan Pässler c1c2ff4a97 gitlab: 13.6.0 -> 13.6.1 2020-11-26 14:12:14 +01:00
Milan Pässler 844eddf330 gitlab-workhorse: use buildGoModule 2020-11-26 14:12:13 +01:00
Milan Pässler 2e4862d3ba gitlab-shell: use buildGoModule 2020-11-26 14:12:13 +01:00
Milan Pässler 0f344cc0db gitaly: use buildGoModule 2020-11-26 14:12:06 +01:00
Sandro 8585991bfb
Merge pull request #100758 from SuperSandro2000/git-delete-merged-branches 2020-11-26 03:52:46 +01:00
Henri Menke 6617122306 gitAndTools.pass-git-helper: 0.4 -> 1.1.0 2020-11-25 19:24:20 +01:00
zowoq 8d4af2e08c gitAndTools.gh: 1.2.1 -> 1.3.0
https://github.com/cli/cli/releases/tag/v1.3.0
2020-11-25 07:49:56 +10:00
Graham Christensen bc49a0815a
utillinux: rename to util-linux 2020-11-24 12:42:06 -05:00
Sandro 4c0e73053b
Merge pull request #103212 from victorluft/submergeupg 2020-11-23 15:01:07 +01:00
Sandro d2d2345384
Merge pull request #104246 from colatkinson/strip-cgit
cgit: strip debug symbols from cgit.cgi
2020-11-23 14:02:29 +01:00
Vladyslav M 8e245f583a
Merge pull request #104600 from dywedir/pijul
pijul: 1.0.0-alpha.3 -> 1.0.0-alpha.5
2020-11-22 18:44:36 +02:00
Vladyslav M 4b453515f1
pijul: 1.0.0-alpha.3 -> 1.0.0-alpha.5 2020-11-22 15:27:10 +02:00
Florian Klink 904f124247
Merge pull request #99116 from jslight90/gitlab-13.4.0
GitLab 13.0.14 -> 13.6.0
2020-11-22 12:00:03 +01:00
Milan Pässler 2429d5a307 gitlab: 13.5.1 -> 13.6.0
Changed ruby version to 2.7.x to match upstream.
Added a gem config for gitlab-pg_query as it tries to download a source
tarball during the build process.
Also removed a patch for gitaly that has become obsolete by upstream fix
[here](de04077c25).
2020-11-21 01:38:35 +01:00
Milan Pässler 4555a26b06 gitlab: 13.4.3 -> 13.5.1 2020-11-20 19:26:30 +01:00
Jeff Slight 2cf524c825 gitlab: add new line to end of data.json file 2020-11-20 19:26:30 +01:00
Jeff Slight c16a977386 gitlab: 13.0.14 -> 13.4.3
13.4.3
2020-11-20 19:26:30 +01:00
Jan Tojnar f6105d21e3
Merge branch 'master' into staging-next 2020-11-20 01:38:32 +01:00
Martin Weinelt 46769c7a77
Merge pull request #104307 from jonringer/fix-mercurial
mercurial: 5.4.2 -> 5.6, fix build
2020-11-19 23:43:04 +01:00
Jonathan Ringer 81d1cea1c0 mercurial: 5.4.2 -> 5.6 2020-11-19 11:29:46 -08:00
Jonathan Ringer 635485b85c mercurial: remove dulwich dependency 2020-11-19 11:25:52 -08:00
Frederik Rietdijk ea7b8978ef Merge master into staging-next 2020-11-19 20:08:15 +01:00
Ryan Mulligan 74eb38ffd5
Merge pull request #104124 from r-ryantm/auto-update/gitkraken
gitkraken: 7.3.2 -> 7.4.0
2020-11-19 09:49:07 -08:00
Colin Atkinson 3bc05c2602
cgit: strip debug symbols from cgit.cgi
The debug symbols result in an unneeded runtime dependency on GCC, and
properly stripping them shrinks the size of the closure significantly.
2020-11-19 00:49:00 -05:00
Victor Luft 2caa1782b5 sublime-merge: 2032 -> 2039 2020-11-18 11:58:31 -05:00
Frederik Rietdijk da12fc6838 Merge staging-next into staging 2020-11-18 15:36:56 +01:00
R. RyanTM 5544734b23 gitkraken: 7.3.2 -> 7.4.0 2020-11-18 03:46:26 +00:00
Oleksii Filonenko 512c3c0a05 maintainers: rename filalex77 -> Br1ght0ne 2020-11-17 13:09:31 +02:00
Vladyslav M 65e0474c7a
pijul: 1.0.0-alpha.1 -> 1.0.0-alpha.3 2020-11-16 21:49:15 +02:00
Maximilian Bosch a9a1423377
gitea: 1.12.5 -> 1.12.6
https://github.com/go-gitea/gitea/releases/tag/v1.12.6
2020-11-16 17:37:12 +01:00
Maximilian Bosch fdeba5ef32
Merge pull request #103873 from r-ryantm/auto-update/git-cola
git-cola: 3.5 -> 3.8
2020-11-16 13:30:47 +01:00
R. RyanTM acf82008ab git-cola: 3.5 -> 3.8 2020-11-15 05:44:05 +00:00
Vladyslav M a429039a1f
pijul: 1.0.0-alpha -> 1.0.0-alpha.1 2020-11-14 23:21:01 +02:00
Andrew Childs d686ded08c
git: fix darwin build (#103774)
The install step for the darwin specific $out/etc/gitconfig file
assumed that $out/etc already existed. This assumption is no longer
true after f5e2ff1ed80dac74bfb0afa92f34641cce098a49 in #103421. This
change makes make sure the directory exists before adding to it.
2020-11-14 18:32:52 +01:00
Frederik Rietdijk 9fc4a4db5a Merge staging-next into staging 2020-11-13 20:59:08 +01:00
Jonas Chevalier a7cb88c3de
tree-wide: unify Bash completions outputs (#103421)
Use $out/share/bash-completion/completions to store the Bash completions
2020-11-12 21:22:18 +00:00
zowoq 1e53f7e10b gitAndTools.gh: 1.2.0 -> 1.2.1
https://github.com/cli/cli/releases/tag/v1.2.1
2020-11-11 15:08:15 -08:00
Vladyslav M dd4ebbc91f
Merge pull request #102968 from dywedir/anu
pijul: 0.12.0 -> 1.0.0-alpha
2020-11-11 18:06:03 +02:00
Robert Hensing 3f7278f9e9
Merge pull request #101341 from SuperSandro2000/gitlab-triage
gitlab-triage: init at 1.13.0
2020-11-10 19:14:29 +01:00
Andrew Childs 4e2a217211
gitui: fix darwin build (#103194)
Fixes:

  = note: ld: warning: passed two min versions (10.12.0, 10.12) for platform macOS. Using 10.12.
          ld: framework not found AppKit
          clang-7: error: linker command failed with exit code 1 (use -v to see invocation)
2020-11-10 10:13:52 -05:00
Vladyslav M 2e1400173b
pijul: 0.12.0 -> 1.0.0-alpha 2020-11-09 21:05:03 +02:00
Victor Luft a1a4585729 sublime-merge-dev: 2033 -> 2037 2020-11-09 09:52:15 -05:00
Frederik Rietdijk 99fb79ae84 Merge master into staging-next 2020-11-06 12:51:56 +01:00
Robert Hensing 349288d101
Merge pull request #100582 from ldenefle/git-chglog-0.9.1
gitAndTools.git-chglog: init at 0.9.1
2020-11-05 22:39:07 +01:00
Frederik Rietdijk 10c57af49c Merge staging-next into staging 2020-11-04 09:28:07 +01:00
Frederik Rietdijk 9e6d7d3c74 Merge master into staging-next 2020-11-04 09:27:42 +01:00
Mario Rodas 422d223757 git-lfs: 2.12.0 -> 2.12.1
https://github.com/git-lfs/git-lfs/releases/tag/v2.12.1
2020-11-04 04:20:00 +00:00
Maximilian Bosch 988e44c3e6
Merge pull request #102567 from VirtusLab/git-machete-2.15.7
gitAndTools.git-machete: 2.15.6 -> 2.15.7
2020-11-04 00:18:52 +01:00
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
Travis CI 6373a64873 gitAndTools.git-machete: 2.15.6 -> 2.15.7
###### Motivation for this change
Update to latest upstream version

###### Things done
 * [ ]  Tested using sandboxing ([nix.useSandbox](http://nixos.org/nixos/manual/options.html#opt-nix.useSandbox) on NixOS, or option `sandbox` in [`nix.conf`](http://nixos.org/nix/manual/#sec-conf-file) on non-NixOS linux)
 * Built on platform(s)

   * [x]  NixOS
   * [ ]  macOS
   * [ ]  other Linux distributions
 * [ ]  Tested via one or more NixOS test(s) if existing and applicable for the change (look inside [nixos/tests](https://github.com/NixOS/nixpkgs/blob/master/nixos/tests))
 * [ ]  Tested compilation of all pkgs that depend on this change using `nix-shell -p nix-review --run "nix-review wip"`
 * [x]  Tested execution of all binary files (usually in `./result/bin/`)
 * [ ]  Determined the impact on package closure size (by running `nix path-info -S` before and after)
 * [ ]  Ensured that relevant documentation is up to date
 * [x]  Fits [CONTRIBUTING.md](https://github.com/NixOS/nixpkgs/blob/master/.github/CONTRIBUTING.md).

###### Notify maintainers
cc @blitz @Ma27 @tfc @worldofpeace
2020-11-03 01:53:25 +00: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
Sandro Jäckel 863ae4a768
gitlab-triage: init at 1.13.0 2020-10-23 09:37:39 +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
Sandro Jäckel 1ed7d0e629
gitAndTools.lab: wrap xdg-open to fix lab mr browse 2020-10-20 17:13:14 +02:00
Lucas Denefle cba7a74806 gitAndTools.git-chglog: init at 0.9.1 2020-10-20 15:26:35 +01: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
Sandro Jäckel 28bb32ff9e
git-delete-merged-branches: init at 6.0.5 2020-10-18 12:01:28 +02: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
Doron Behar 7c4ee7f3bf
Merge pull request #100245 from RaitoBezarius/raito-srht-man
mansrht: 0.15.1 -> 0.15.4
2020-10-12 11:10:30 +03:00
Doron Behar 61cf7afa28
Merge pull request #100249 from RaitoBezarius/raito-srht-scm
scmsrht: 0.22.3 -> 0.22.4
2020-10-12 11:09:24 +03:00
Doron Behar 0b2858acd1
Merge pull request #100247 from RaitoBezarius/raito-srht-paste 2020-10-12 11:09:03 +03:00
Doron Behar 063461113c
Merge pull request #100246 from RaitoBezarius/raito-srht-meta
metasrht: 0.50.2 -> 0.51.2
2020-10-12 11:08:52 +03:00
Doron Behar 9b179c7f26
Merge pull request #100242 from RaitoBezarius/raito-srht-hg
hgsrht: 0.26.18 -> 0.26.19
2020-10-12 11:07:32 +03:00
Doron Behar 9af82c3add
Merge pull request #100243 from RaitoBezarius/raito-srht-hub 2020-10-12 11:06:49 +03:00
Doron Behar 2c748c5c0f
Merge pull request #100240 from RaitoBezarius/raito-srht-builds
buildsrht: 0.62.6 -> 0.63.4
2020-10-12 11:06:09 +03:00
Raito Bezarius 270ee5bb47 gitsrht: 0.60.7 -> 0.61.10 2020-10-11 17:06:30 +02:00
Raito Bezarius a3a01c1cb4 scmsrht: 0.22.3 -> 0.22.4 2020-10-11 15:57:08 +02:00
Raito Bezarius 414f54c979 todosrht: 0.61.11 -> 0.62.1 2020-10-11 15:56:55 +02:00
Raito Bezarius 87e56d0687 pastesrht: 0.11.1 -> 0.11.2 2020-10-11 15:56:42 +02:00
Raito Bezarius 284836b443 metasrht: 0.50.2 -> 0.51.2 2020-10-11 15:56:26 +02:00
Raito Bezarius 68607f44dd mansrht: 0.15.1 -> 0.15.4 2020-10-11 15:56:15 +02:00
Raito Bezarius cb49394f28 listssrht: 0.45.9 -> 0.45.15 2020-10-11 15:55:44 +02:00
Raito Bezarius 3eea5bad2a hubsrht: 0.10.6 -> 0.11.5 2020-10-11 15:55:28 +02:00
Raito Bezarius 22aa45868f hgsrht: 0.26.18 -> 0.26.19 2020-10-11 15:55:16 +02:00
Raito Bezarius 84c37c7a7c buildsrht: 0.62.6 -> 0.63.4 2020-10-11 15:52:34 +02:00
Raito Bezarius d0c5160b36 srht: 0.64.0 -> 0.65.2 2020-10-11 15:51:20 +02:00
Jan Tojnar aabcf2d8f5
Merge branch 'master' into staging-next 2020-10-11 00:27:21 +02:00
Vladimír Čunát 338b25697c
Merge branch 'master' into staging-next
Quite many rebuilds from master:
> Estimating rebuild amount by counting changed Hydra jobs.
>    3926 x86_64-darwin
>    4645 x86_64-linux
2020-10-10 11:32:10 +02:00
zowoq 311b360530 gitAndTools.delta: 0.4.3 -> 0.4.4
https://github.com/dandavison/delta/releases/tag/0.4.4
2020-10-11 09:30:37 +10:00
Mario Rodas 926a58ce63 gitAndTools.git-trim: 0.3.2 -> 0.4.0
https://github.com/foriequal0/git-trim/releases/tag/v0.4.0
2020-10-09 04:20:00 +00:00
Frederik Rietdijk ec28e32c9e Merge master into staging-next 2020-10-08 21:47:26 +02:00
Doron Behar f4b8c8f1df git-annex-metadata-gui: fix qt wrapping
Wrap application with wrapQtAppsHook and no double wrapping.
2020-10-08 18:57:24 +02:00
Frederik Rietdijk 692d219a93 Merge staging-next into staging 2020-10-06 10:25:58 +02:00
zowoq bedaefb851 gitAndTools.gh: 1.0.0 -> 1.1.0
https://github.com/cli/cli/releases/tag/v1.1.0
2020-10-06 23:21:11 +10:00
Pawel Kruszewski 5778446619 bcompare: 4.3.5.24893 -> 4.3.7.25118 2020-10-03 23:00:35 +02:00
Sandro Jäckel 61d1967ab0
gitstatus: also install sh files 2020-10-03 08:15:56 +02:00
Maximilian Bosch 31ce2ee748
gitea: 1.12.4 -> 1.12.5
https://github.com/go-gitea/gitea/releases/tag/v1.12.5
2020-10-02 11:03:56 +02:00
zowoq f18e7e0d07 gitAndTools.git-interactive-rebase-tool: add maintainer 2020-10-02 16:59:43 +10:00
Francesco Zanini 6efc71f17b python3Packages.git-remote-codecommit: init at 1.15.1 2020-09-29 06:17:25 -07:00
Mario Rodas 031b9c172f gitAndTools.git-absorb: 0.6.3 -> 0.6.4 2020-09-28 18:20:00 -05:00
Jan Tojnar 32b4375f10
Merge branch 'staging-next' into staging 2020-09-29 00:12:29 +02:00
Jörg Thalheim a2960ac430
Merge pull request #97603 from zowoq/rust-test-threads 2020-09-25 06:19:23 +02:00
Jan Tojnar d471c5d1f3
Merge branch 'staging-next' into staging 2020-09-24 23:09:00 +02:00
Martin Weinelt 2be541ff7c
Merge pull request #96136 from bdesham/fix-gitstatus-on-zsh
gitstatus: fix zsh integration
2020-09-24 07:22:13 +02:00
zowoq 664170166e gitAndTools.git-interactive-rebase-tool: use cargoParallelTestThreads 2020-09-24 07:20:03 +10:00
R. RyanTM 9bf3bd946d gitAndTools.gitstatus: 1.2.2 -> 1.3.0 2020-09-23 06:14:49 +00:00
Frederik Rietdijk 7bff759fac Merge staging-next into staging 2020-09-22 18:31:56 +02:00
Mario Rodas fefb2ad107
Merge pull request #98348 from marsam/update-gitAndTools.git-imerge
gitAndTools.git-imerge: 1.1.0 -> 1.2.0
2020-09-21 07:07:03 -05:00
WORLDofPEACE 978e419abe Merge branch 'staging-next' into staging 2020-09-20 18:43:38 -04:00
WORLDofPEACE 34aaac6d7c Merge branch 'staging-next' into staging 2020-09-20 18:41:15 -04:00
Travis CI 358cfe9106 gitAndTools.git-machete: 2.15.5 -> 2.15.6
###### Motivation for this change
Update to latest upstream version

###### Things done
 * [ ]  Tested using sandboxing ([nix.useSandbox](http://nixos.org/nixos/manual/options.html#opt-nix.useSandbox) on NixOS, or option `sandbox` in [`nix.conf`](http://nixos.org/nix/manual/#sec-conf-file) on non-NixOS linux)
 * Built on platform(s)

   * [x]  NixOS
   * [ ]  macOS
   * [ ]  other Linux distributions
 * [ ]  Tested via one or more NixOS test(s) if existing and applicable for the change (look inside [nixos/tests](https://github.com/NixOS/nixpkgs/blob/master/nixos/tests))
 * [ ]  Tested compilation of all pkgs that depend on this change using `nix-shell -p nix-review --run "nix-review wip"`
 * [x]  Tested execution of all binary files (usually in `./result/bin/`)
 * [ ]  Determined the impact on package closure size (by running `nix path-info -S` before and after)
 * [ ]  Ensured that relevant documentation is up to date
 * [x]  Fits [CONTRIBUTING.md](https://github.com/NixOS/nixpkgs/blob/master/.github/CONTRIBUTING.md).

###### Notify maintainers
cc @blitz @Ma27 @tfc @worldofpeace
2020-09-20 18:32:57 +00:00
Mario Rodas e5869f999f gitAndTools.git-imerge: 1.1.0 -> 1.2.0
https://github.com/mhagger/git-imerge/releases/tag/v1.2.0
2020-09-20 09:10:00 -05:00
Lassulus 8779fd7ef7
Merge pull request #98262 from ju1m/fix-gitolite
gitolite: fix updating of gitweb access list and description
2020-09-19 15:00:41 +02:00
Julien Moutinho a3461afcca gitolite: fix updating of gitweb access list and description 2020-09-19 07:38:38 +02:00
Marek Mahut 8e1a41d63e
Merge pull request #94439 from prusnak/gomp
gomp: init at 1.1.0
2020-09-18 16:31:50 +02:00