Commit graph

4158 commits

Author SHA1 Message Date
github-actions[bot] 6f3d57cba9
Merge master into staging-next 2021-06-22 06:04:24 +00:00
Martin Weinelt eef9694ebc
Merge branch 'master' into staging-next 2021-06-22 00:58:31 +02:00
Artturin f845709e9e mercurial: use working patch links 2021-06-21 15:59:09 +03:00
Sandro 0c72a4ffaf
Merge pull request #127545 from liff/antlr/v4-is-default
antlr: make 4.8 default
2021-06-20 23:22:35 +02:00
Maximilian Bosch 8e25802249
Merge pull request #127301 from r-ryantm/auto-update/gitstatus
gitstatus: 1.5.1 -> 1.5.2
2021-06-20 19:37:59 +02:00
Olli Helenius b2bf2c6102
antlr: make 4.8 default 2021-06-20 14:06:47 +03:00
github-actions[bot] d0cc21f4bd
Merge master into staging-next 2021-06-19 00:08:37 +00:00
Maximilian Bosch e914a9aeb2
Merge pull request #127380 from Ma27/bump-gitea
gitea: 1.14.2 -> 1.14.3
2021-06-18 22:37:02 +02:00
github-actions[bot] 4ea74538ce
Merge master into staging-next 2021-06-18 18:04:25 +00:00
Maximilian Bosch d5edee8113
gitea: 1.14.2 -> 1.14.3
ChangeLog: https://github.com/go-gitea/gitea/releases/tag/v1.14.3
2021-06-18 19:11:31 +02:00
Sandro 13fcfce0af
Merge pull request #127228 from r-ryantm/auto-update/ghr
ghr: 0.13.0 -> 0.14.0
2021-06-18 17:10:42 +02:00
R. RyanTM 08aaf68511 gitstatus: 1.5.1 -> 1.5.2 2021-06-18 05:43:45 +00:00
R. RyanTM 3ac01fa851 ghr: 0.13.0 -> 0.14.0 2021-06-17 15:04:40 +00:00
github-actions[bot] b859981601
Merge master into staging-next 2021-06-17 12:05:01 +00:00
Sandro 7b229db9e4
Merge pull request #127119 from VirtusLab/git-machete-3.2.0 2021-06-17 13:38:31 +02:00
github-actions[bot] 538d5cc5d0
Merge staging-next into staging 2021-06-17 00:09:51 +00:00
github-actions[bot] 51bf815af0
Merge master into staging-next 2021-06-17 00:09:48 +00:00
Sandro eaef571d76
Merge pull request #125476 from LeSuisse/git-fix-pkgsStatic
git: fix pkgsStatic build
2021-06-17 01:10:00 +02:00
Ben Siraphob 8bae808a21
rcs: 5.9.4 -> 5.10.0 (#112014) 2021-06-17 01:00:33 +02:00
github-actions[bot] 8b9fa8d446
Merge staging-next into staging 2021-06-16 18:04:48 +00:00
github-actions[bot] 2d104c99a7
Merge master into staging-next 2021-06-16 18:04:45 +00:00
Jan Tojnar e3dfa79441
Merge branch 'staging-next' into staging
Regenerated pkgs/servers/x11/xorg/default.nix to resolve the conflict.
2021-06-16 19:59:05 +02:00
Git Machete Release Bot 8aebc1b904 gitAndTools.git-machete: 3.1.1 -> 3.2.0
###### 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).
2021-06-16 17:56:47 +00:00
Thomas Gerbet fc1c4bab77 git: fix pkgsStatic build 2021-06-16 18:46:39 +02:00
Sandro 4d5f3b8d93
Merge pull request #127022 from r-ryantm/auto-update/glab
glab: 1.18.0 -> 1.18.1
2021-06-16 18:25:26 +02:00
github-actions[bot] f060a3768b
Merge master into staging-next 2021-06-16 06:04:41 +00:00
R. RyanTM 76ceead4ec lefthook: 0.7.5 -> 0.7.6 2021-06-15 20:01:41 -07:00
Jonathan Ringer d1d37feb6d
Merge branch 'master' into staging-next
Conflicts:
  pkgs/servers/x11/xorg/default.nix
2021-06-15 19:32:36 -07:00
R. RyanTM 29cf0172e0 glab: 1.18.0 -> 1.18.1 2021-06-16 01:39:44 +00:00
Maximilian Bosch 9db4b84cfb
Merge pull request #126887 from Ma27/bump-diff-so-fancy
gitAndTools.diff-so-fancy: 1.4.1 -> 1.4.2
2021-06-15 22:04:09 +02:00
Jan Tojnar 91171e2955
Merge branch 'master' into staging-next
Regenerated pkgs/servers/x11/xorg/default.nix to resolve the conflict.
2021-06-15 11:19:41 +02:00
Milan Pässler 5c04139da2
gitlab: 13.12.3 -> 13.12.4
https://about.gitlab.com/releases/2021/06/14/gitlab-13-12-4-released/
2021-06-15 00:03:56 +02:00
Maximilian Bosch d387353590
gitAndTools.diff-so-fancy: 1.4.1 -> 1.4.2
ChangeLog: https://github.com/so-fancy/diff-so-fancy/releases/tag/v1.4.2
2021-06-14 22:36:43 +02:00
Sandro dfc55d71ec
Merge pull request #126530 from mweinelt/zsh-p10k 2021-06-14 19:26:34 +02:00
github-actions[bot] dbed958bf2
Merge staging-next into staging 2021-06-14 12:04:44 +00:00
github-actions[bot] f2ba460019
Merge master into staging-next 2021-06-14 12:04:41 +00:00
Milan Pässler d62aac819b gitlab: 13.12.2 -> 13.12.3 2021-06-14 08:04:31 +02:00
github-actions[bot] 9309a23dd3
Merge staging-next into staging 2021-06-12 18:04:58 +00:00
github-actions[bot] 65a7d168af
Merge master into staging-next 2021-06-12 18:04:56 +00:00
Sandro 6241f618f2
Merge pull request #126232 from siraben/fossil-update
fossil: 2.14 -> 2.15.1
2021-06-12 19:11:56 +02:00
Martin Weinelt 38b5368b7e
gitAndTools.gitstatus: 1.4.4 -> 1.5.1 2021-06-10 21:35:57 +02:00
github-actions[bot] f023076314
Merge staging-next into staging 2021-06-10 18:14:20 +00:00
github-actions[bot] 870106ba69
Merge master into staging-next 2021-06-10 18:14:17 +00:00
Alyssa Ross cf1f499e7e
cvs-fast-export: 1.56 -> 1.57 2021-06-10 14:08:28 +00:00
Alyssa Ross db733deeed
cvs-fast-export: clean up; fix cross
Style was unidiomatic for modern Nixpkgs, there was no
nativeBuildInputs/buildInputs separation, and some dependencies were
unused.

I've removed doCheck here, because the default Nixpkgs checkPhase
wasn't actually running the tests (need to cd into tests first), and
when I did write a checkPhase to run the tests, they didn't work and I
couldn't make them work.

A note on RCS:  There is code in cvsconvert that calls RCS, but I
analyzed it quite carefully, and came to the conclusion that all such
code is unreachable, so I removed the RCS dependency.
2021-06-10 14:04:46 +00:00
Jan Tojnar ba733d435b
Merge branch 'staging-next' into staging 2021-06-10 14:07:45 +02:00
github-actions[bot] 51dce04dde
Merge master into staging-next 2021-06-10 12:05:05 +00:00
Mario Rodas 1027d970df
Merge pull request #126152 from r-ryantm/auto-update/git-filter-repo
git-filter-repo: 2.29.0 -> 2.32.0
2021-06-10 05:38:19 -05:00
github-actions[bot] da8d931c82
Merge master into staging-next 2021-06-10 06:07:24 +00:00
AndersonTorres e9e5f5f84d Change all alsaLib references to alsa-lib 2021-06-10 01:12:49 -03:00