mirrors/nixpkgs
1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-03-04 22:34:04 +00:00
Code Issues Wiki Activity
301372 commits 182 branches 125 tags 13 GiB
Commit graph

4188 commits

Author SHA1 Message Date
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
github-actions[bot] cf8441dd85
Merge staging-next into staging 2021-06-09 18:14:53 +00:00
github-actions[bot] f242b07bc2
Merge master into staging-next 2021-06-09 18:14:51 +00:00
talyz 8f16b16291
gitlab: Make sure the FOSS version isn't identified as EE 2021-06-09 17:50:45 +02:00
Ben Siraphob f0b2272124 fossil: 2.14 -> 2.15.1 2021-06-09 20:48:54 +07:00
Sandro 29badbe190
Merge pull request #126353 from otavio/topic/updates-2021-06-09 2021-06-09 15:06:54 +02:00
Ryan Mulligan 62c94205ab
Merge pull request #126318 from r-ryantm/auto-update/glab 
glab: 1.17.0 -> 1.18.0
 2021-06-09 06:00:19 -07:00
Martin Weinelt 3da00fa467
Merge branch 'master' into staging-next 2021-06-09 14:18:55 +02:00
Otavio Salvador 963b1f068a gitRepo: 2.15.3 -> 2.15.4 
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
 2021-06-09 09:15:52 -03:00
R. RyanTM e9d48ab799 git-vendor: 1.2.0 -> 1.2.1 2021-06-09 14:15:52 +02:00
R. RyanTM a362b1e9ee glab: 1.17.0 -> 1.18.0 2021-06-09 07:03:20 +00:00
Michael Weiss 4ac67163c4
git: Drop POSIXPERM for the tests 
Shared permissions are forbidden in the Nix build sandbox which is why
some of the tests fail. Dropping the POSIXPERM test prerequisite, that
is added unconditionally on Linux, should help us avoiding uninteresting
test failures after Git updates. The drawback is that this disables a
few additional tests (as of Git 2.32.0 approx. 71 out of more than 20k
subtests require POSIXPERM).
 2021-06-08 20:36:34 +02:00
R. RyanTM 688a5b4c37 git-filter-repo: 2.29.0 -> 2.32.0 2021-06-08 03:48:25 +00:00
github-actions[bot] e218376e4a
Merge staging-next into staging 2021-06-07 06:37:31 +00:00
github-actions[bot] 33d7555871
Merge master into staging-next 2021-06-07 06:37:28 +00:00
R. RyanTM d4963ae435 gitui: 0.16.0 -> 0.16.1 2021-06-07 02:21:26 +00:00
Michael Weiss 752bfa0496
git: 2.31.1 -> 2.32.0 2021-06-06 16:35:32 +02:00
github-actions[bot] 51ecdeca84
Merge master into staging-next 2021-06-06 00:15:19 +00:00
Maximilian Bosch cd7a26eb8c
gitAndTools.tig: 2.5.3 -> 2.5.4 
ChangeLog: https://github.com/jonas/tig/releases/tag/tig-2.5.4
 2021-06-05 20:51:07 +02:00
tomberek 157aee00a5
nixos/sourcehut: init (#113244) 
* nixos/sourcehut: init

* sourcehut: default nginx setup

* sourcehut: documentation

* sourcehut: re-structure settings

* sourcehut: tests

* nixos/sourcehut: adopt StateDirectory

* Apply suggestions from code review

Co-authored-by: Aaron Andersen <aaron@fosslib.net>
Co-authored-by: Thibaut Marty <github@thibautmarty.fr>
Co-authored-by: malte-v <34393802+malte-v@users.noreply.github.com>

* nixos/sourcehut: PR suggestions

* nixos/sourcehut: malte-v patch

* nixos/sourcehut: add base virtualhost

* nixos/sourcehut: remove superfluous key

* nixos/sourcehut: use default from cfg

* nixos/sourcehut: use originBase for logs

* nixos/sourcehut: use toPythonApplication in systemPackages

* nixos/sourcehut: directly use ExecStart

* nixos/sourcehut: update docs

Co-authored-by: Aaron Andersen <aaron@fosslib.net>
Co-authored-by: Thibaut Marty <github@thibautmarty.fr>
Co-authored-by: malte-v <34393802+malte-v@users.noreply.github.com>
 2021-06-05 14:42:51 -04:00
github-actions[bot] 5b9da195a0
Merge master into staging-next 2021-06-04 01:45:17 +00:00
zowoq 2959ad27de gh: 1.10.3 -> 1.11.0 
https://github.com/cli/cli/releases/tag/v1.11.0
 2021-06-04 10:18:55 +10:00
github-actions[bot] a9f286f5cf
Merge master into staging-next 2021-06-03 19:52:02 +00:00
Otavio Salvador 8f166b95c9
gitRepo: Add import to ssl module to avoid runtime error (#125373) 
Co-authored-by: Ricardo M. Correia <rcorreia@wizy.org>
 2021-06-03 16:24:19 +02:00
github-actions[bot] 1fe3553272
Merge master into staging-next 2021-06-03 02:08:32 +00:00
Milan 2a1c29ef4b
gitlab: 13.12.0 -> 13.12.2 (#125271) 
https://about.gitlab.com/releases/2021/06/01/security-release-gitlab-13-12-2-released/
 2021-06-03 00:53:34 +02:00
github-actions[bot] 59de269a92
Merge master into staging-next 2021-05-30 12:49:08 +00:00
github-actions[bot] c33da551bf
Merge master into staging-next 2021-05-30 07:13:26 +00:00
Antonio Yang a8daff8b1a gitui: 0.15.0 -> 0.16.0 2021-05-30 12:41:00 +08:00
Sandro fa014484b8
Merge pull request #122854 from dguibert/dg/reposurgeon 
reposurgeon: 3.44 -> 4.26
 2021-05-30 04:28:40 +02:00
Otavio Salvador e00e031ce1
gitRepo: 2.14.5 -> 2.15.3 (#124904) 2021-05-30 04:16:10 +02:00
github-actions[bot] 4cfefea5b2
Merge master into staging-next 2021-05-29 01:43:58 +00:00
Mario Rodas 4052d0eceb gitAndTools.delta: 0.7.1 -> 0.8.0 
https://github.com/dandavison/delta/releases/tag/0.8.0
 2021-05-28 04:20:00 +00:00
github-actions[bot] a743ebe846
Merge master into staging-next 2021-05-27 18:58:59 +00:00
Sandro ee74a87392
Merge pull request #124591 from SuperSandro2000/diff-so-fancy 
diff-so-fancy: 1.4.0 -> 1.4.1
 2021-05-27 19:39:19 +02:00
Sandro Jäckel 15eb917faf
diff-so-fancy: 1.4.0 -> 1.4.1 2021-05-27 17:04:19 +02:00
github-actions[bot] 15e595f77d
Merge master into staging-next 2021-05-27 12:40:14 +00:00
Domen Kožar a48d4bf159
Merge pull request #124569 from thefloweringash/subversion-as 
subversion: update libtool to fix build on aarch64-darwin
 2021-05-27 09:09:13 +02:00
github-actions[bot] f385b431a7
Merge master into staging-next 2021-05-27 06:45:59 +00:00
Andrew Childs 364e6e634b subversion: update libtool to fix build on aarch64-darwin 2021-05-27 14:01:54 +09:00
Victor Luft b32f22110c sublime-merge: 2047 -> 2056 2021-05-26 21:34:01 -04:00
Victor Luft f45e3e9075 sublime-merge-dev: 2047 -> 2055 2021-05-26 21:33:50 -04:00
github-actions[bot] df4ebfc46c
Merge master into staging-next 2021-05-26 12:31:55 +00:00
Profpatsch 005702524a git-vendor: init at 1.2.0 2021-05-26 11:36:30 +02:00
github-actions[bot] a673990e6c
Merge master into staging-next 2021-05-25 18:43:22 +00:00
Ryan Mulligan 1ea4f723c7
Merge pull request #124039 from r-ryantm/auto-update/gitkraken 
gitkraken: 7.6.0 -> 7.6.1
 2021-05-25 11:23:15 -07:00
github-actions[bot] 73d840c309
Merge master into staging-next 2021-05-25 12:29:42 +00:00
Florian Klink 901d07152c
Merge pull request #124292 from petabyteboy/feature/gitlab-13-12 
gitlab: 13.11.2 -> 13.12.0
 2021-05-25 11:45:02 +02:00
github-actions[bot] 0615bb674f
Merge master into staging-next 2021-05-25 00:59:01 +00:00
Josh Holland 6ce887b083
stgit: enable tests and install documentation (#122370) 2021-05-25 02:01:03 +02:00
David Guibert 374ce1b1af reposurgeon: 3.44 -> 4.26 2021-05-24 22:37:08 +02:00
Milan Pässler 1ded8ef44e
gitlab: 13.11.2 -> 13.12.0 2021-05-24 21:33:56 +02:00
Milan Pässler 0c8f5b7b44
gitlab: add Gemfile fix to update script 
Since some GitLab versions, we need to remove the mail-smtp-pool
dependency from the Gemfile, or do other modifications.
Let's add those changes, that will probably be needed in the next
version as well, to the update script.
 2021-05-24 21:26:08 +02:00
Jonathan Ringer b9b9cdb87c
Merge remote-tracking branch 'origin/staging' into staging-next 2021-05-22 19:23:14 -07:00
Jonathan Ringer 11a9ac00fc
Merge remote-tracking branch 'origin/master' into staging-next 
Conflicts:
 pkgs/tools/networking/xh/default.nix
 2021-05-22 18:19:10 -07:00
R. RyanTM f212ed0cf4 gitkraken: 7.6.0 -> 7.6.1 2021-05-22 15:43:27 +00:00
Kira Bruneau cd4780fab4
maintainers: rename metadark -> kira-bruneau (#124035) 2021-05-22 16:47:40 +02:00
github-actions[bot] d0c1f6a78f
Merge staging-next into staging 2021-05-22 12:27:12 +00:00
github-actions[bot] 563389a7fd
Merge master into staging-next 2021-05-22 12:27:09 +00:00
Sandro efee454783
Merge pull request #123981 from r-ryantm/auto-update/lab 
lab: 0.21.0 -> 0.22.0
 2021-05-22 09:16:50 +02:00
R. RyanTM 04cb517e7d lab: 0.21.0 -> 0.22.0 2021-05-22 06:36:22 +00:00
github-actions[bot] d5714df652
Merge staging-next into staging 2021-05-22 06:21:58 +00:00
github-actions[bot] cc35c7fc85
Merge master into staging-next 2021-05-22 06:21:55 +00:00
R. RyanTM 4d46cb67ad gh: 1.10.2 -> 1.10.3 2021-05-22 15:56:25 +10:00
Andrew Brooks 12315866d1 fossil: Remove unneeded TCLLIBPATH export 
The use of tcl.mkTclDerivation in tcllib ensures that it will
already be present on TCLLIBPATH when tests are run.
 2021-05-21 15:18:10 -05:00
Arnout Engelen 17ccfe3f51
Merge pull request #123502 from Atemu/minimalIso-remove-ruby2.7 
minimalIso: remove ruby2.7
 2021-05-21 18:41:02 +02:00
github-actions[bot] 929b12e7b5
Merge master into staging-next 2021-05-21 12:28:43 +00:00
Michael Weiss d3ad6d42ca
Merge pull request #123713 from Mindavi/git/cross-compilation 
git: support cross-compilation by disabling perl support
 2021-05-21 12:50:47 +02:00
Atemu 88c2c543bf Revert "git: Use asciidoctor instead of asciidoc for manpages" 
This reverts commit bbf96d898b.

Removes dependency on ruby 2.7 and isn't much slower.

See https://github.com/NixOS/nixpkgs/pull/123502 for more info
 2021-05-21 09:50:48 +02:00
Jonathan Ringer 14f3686af1
Merge remote-tracking branch 'origin/master' into staging-next 
Conflicts:
  pkgs/applications/terminal-emulators/alacritty/default.nix
  pkgs/servers/clickhouse/default.nix
 2021-05-20 09:12:42 -07:00
R. RyanTM 2bab7f632d gh: 1.10.1 -> 1.10.2 2021-05-20 18:31:56 +10:00