Commit Graph

3342 Commits

Author SHA1 Message Date
Vladimír Čunát
8bbc202208
Merge branch 'master' into staging-next 2020-08-04 21:37:39 +02:00
Jan Tojnar
2d6cbbe462
meld: 3.20.2 → 3.21.0
Clean up, switch to Meson, remove unused test dependencies, fix license.

https://gitlab.gnome.org/GNOME/meld/-/blob/3.21.0/NEWS
2020-08-04 17:47:04 +02:00
Frederik Rietdijk
26c481b435 Merge master into staging-next 2020-08-04 12:48:50 +02:00
zowoq
fe8590a18f gitAndTools.delta: 0.3.0 -> 0.4.0
https://github.com/dandavison/delta/releases/tag/0.4.0
2020-08-04 11:27:59 +10:00
Frederik Rietdijk
50c060d13d Merge master into staging-next 2020-08-01 19:37:20 +02:00
Oleksii Filonenko
991aa1d155
Merge pull request #94407 from r-ryantm/auto-update/gitui
gitAndTools.gitui: 0.8.1 -> 0.9.1
2020-08-01 11:16:13 +03:00
R. RyanTM
b735f8cba8 gitAndTools.gitui: 0.8.1 -> 0.9.1 2020-08-01 05:12:20 +00:00
Michael Weiss
e9c36545a7
tig: Don't install the broken ZSH completion
There are some Nixpkgs specific issues that we could fix but due to
changes in Git it currently isn't possible to source git-completion.bash
from ZSH (at least not how tig-completion.bash expects it).
Upstream issue: https://github.com/jonas/tig/issues/940

For the meantime it seems best to simply not install it anymore so that
the fallback implementation from ZSH can be used (more inaccurate as the
git-log completion is reused but it is helpful to complete remotes,
branches, tags, etc. and doesn't emit an error to the console).
2020-07-31 20:57:35 +02:00
zowoq
3c5750d1cd buildGoModule packages: editorconfig fixes 2020-07-31 13:58:04 +10:00
Frederik Rietdijk
cee7df4846 Merge staging-next into staging 2020-07-30 18:28:15 +02:00
Maximilian Bosch
1ee2610f1a
gitea: 1.12.2 -> 1.12.3
https://github.com/go-gitea/gitea/releases/tag/v1.12.3
2020-07-30 02:09:50 +02:00
Vladimír Čunát
60d89e5793
Merge branch 'master' into staging 2020-07-29 18:40:28 +02:00
zowoq
3007e7e48c gitAndTools.gh: 0.11.0 -> 0.11.1
https://github.com/cli/cli/releases/tag/v0.11.1
2020-07-29 09:03:54 +10:00
Mario Rodas
c3f8d59463
Merge pull request #94086 from r-ryantm/auto-update/git-filter-repo
gitAndTools.git-filter-repo: 2.27.1 -> 2.28.0
2020-07-28 11:09:54 -05:00
R. RyanTM
01676580dc gitAndTools.git-filter-repo: 2.27.1 -> 2.28.0 2020-07-28 15:10:46 +00:00
leo60228
d42bcde652
git: 2.27.0 -> 2.28.0 (#94026) 2020-07-28 12:38:29 +02:00
Maximilian Bosch
c80bf92d7c
gitAndTools.git-workspace: 0.6.0 -> 0.7.0
https://github.com/orf/git-workspace/releases/tag/v0.7.0
2020-07-26 11:32:41 +02:00
Ryan Mulligan
e5e2c8dd09
Merge pull request #93282 from r-ryantm/auto-update/bcompare
bcompare: 4.3.4.24657 -> 4.3.5.24893
2020-07-19 16:47:42 -07:00
Maximilian Bosch
739713fce2
Merge pull request #93342 from VirtusLab/git-machete-2.15.3
gitAndTools.git-machete: 2.15.2 -> 2.15.3
2020-07-17 16:08:30 +02:00
Ryan Mulligan
e0ed6d71e3
Merge pull request #93317 from r-ryantm/auto-update/gitkraken
gitkraken: 7.0.1 -> 7.1.0
2020-07-17 06:01:45 -07:00
Travis CI
8c5f73ae69 gitAndTools.git-machete: 2.15.2 -> 2.15.3
###### 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-07-17 11:58:49 +00:00
Mario Rodas
4f5195c350
Merge pull request #93313 from r-ryantm/auto-update/gitui
gitAndTools.gitui: 0.5.0 -> 0.8.1
2020-07-16 21:44:02 -05:00
R. RyanTM
7444a7ea05 gitkraken: 7.0.1 -> 7.1.0 2020-07-17 01:01:29 +00:00
zowoq
2a45eea7e3 gitAndTools.gh: 0.10.1 -> 0.11.0
https://github.com/cli/cli/releases/tag/v0.11.0
2020-07-17 09:57:01 +10:00
R. RyanTM
2025e915bc gitAndTools.gitui: 0.5.0 -> 0.8.1 2020-07-16 23:53:40 +00:00
R. RyanTM
3b34f20fb5 bcompare: 4.3.4.24657 -> 4.3.5.24893 2020-07-16 16:21:26 +00:00
Florian Klink
56e63ca017 gerrit: add myself to maintainers 2020-07-13 17:41:32 +02:00
edef
26291ccf34
Merge pull request #92930 from flokli/gerrit-3.2.2
gerrit: 3.1.5 -> 3.2.2
2020-07-13 15:27:58 +00:00
Claudio Bley
8aa6716621 gitAndTools.delta: 0.2.0 -> 0.3.0 2020-07-13 10:48:20 +02:00
Maximilian Bosch
3970e7a1c0
gitea: 1.12.1 -> 1.12.2
https://github.com/go-gitea/gitea/releases/tag/v1.12.2
2020-07-11 21:06:59 +02:00
Florian Klink
34663b0fc1 gerrit: 3.1.5 -> 3.2.2 2020-07-11 15:07:54 +02:00
Florian Klink
6e63209f28
Merge pull request #92635 from petabyteboy/feature/gitlab-13-0-9
gitlab: 13.0.8 -> 13.0.9
2020-07-08 20:12:34 +02:00
Mario Rodas
a9a8b65b9b
Merge pull request #92590 from r-ryantm/auto-update/stgit
gitAndTools.stgit: 0.22 -> 0.23
2020-07-07 20:47:27 -05:00
Mario Rodas
ce6a518773
gitAndTools.stgit: install completions 2020-07-07 20:33:16 -05:00
Milan Pässler
f3a353f184 gitlab: 13.0.8 -> 13.0.9
Security release: https://about.gitlab.com/releases/2020/07/06/critical-security-release-gitlab-13-1-3-released/
2020-07-07 22:15:03 +02:00
R. RyanTM
53ae3eff51 gitAndTools.subgit: 3.3.9 -> 3.3.10 2020-07-07 09:51:15 -07:00
R. RyanTM
b306720264 gitAndTools.stgit: 0.22 -> 0.23 2020-07-07 15:09:40 +00:00
Florian Klink
d986fccd9d
gitlab: 13.0.6 -> 13.0.8 (#92060) 2020-07-06 22:44:18 +02:00
R. RyanTM
3a3d5ff8a0 mercurial: 5.4.1 -> 5.4.2 2020-07-05 14:40:56 +00:00
Maximilian Bosch
ab005bf302
Merge pull request #92151 from r-ryantm/auto-update/git-extras
gitAndTools.git-extras: 5.1.0 -> 6.0.0
2020-07-03 12:17:06 +02:00
R. RyanTM
9b0f6a0ffc gitAndTools.git-extras: 5.1.0 -> 6.0.0 2020-07-03 09:33:30 +00:00
Travis CI
a40b8a6869 gitAndTools.git-machete: 2.14.0 -> 2.15.2
###### 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-07-02 15:26:15 +00:00
zowoq
26c7b538cc gitAndTools.delta: add maintainer 2020-07-02 15:02:05 +10:00
zowoq
092cf65e99 gitAndTools.delta: 0.1.1 -> 0.2.0
https://github.com/dandavison/delta/releases/tag/0.2.0
2020-07-02 15:01:58 +10:00
Mario Rodas
79cd1cc2d7
Merge pull request #89085 from wigust/gita
Update gitAndTools.gita and add bash completion
2020-06-29 14:52:55 -05:00
Marco Hennings
e5f0d13a49
gitAndTools.stgit: Fix broken package. (#84198)
The stgit package is installing using make, which leaves the application in a state where it can not properly find the installed package stgit.

---
File "/run/current-system/sw/bin/stg", line 35, in <module>
    from stgit.main import main
ImportError: No module named stgit.main
---

This is fixed by using buildPythonApplication instead of stdenv.mkDerivation.
2020-06-27 23:54:57 +02:00
R. RyanTM
d8cab5ba0b ghq: 1.1.1 -> 1.1.2 2020-06-26 09:22:04 +00:00
Daniël de Kok
6b096983f4
Merge pull request #90685 from zookatron/sublime-merge
sublime-merge: askpass bug fix
2020-06-25 19:54:14 +02:00
Tim Zook
228cd7fbd7 sublime-merge-dev: 2011 -> 2022 2020-06-25 12:06:31 -05:00
zowoq
c7e61112df treewide: remove deprecated value Application from makeDesktopItem 2020-06-25 12:18:37 +10:00