Commit Graph

1398 Commits

Author SHA1 Message Date
Vladimír Čunát
13add13388
Merge branch 'master' into staging-next
... to resolve a trivial conflict in libpcap.
2020-06-10 20:00:44 +02:00
Vladimír Čunát
a5f5d020c6
Merge branch 'staging-next' 2020-06-10 16:13:48 +02:00
Mario Rodas
531bedd2f8
Merge pull request #89938 from r-ryantm/auto-update/gitui
gitAndTools.gitui: 0.3.0 -> 0.5.0
2020-06-10 05:42:48 -05:00
Jan Tojnar
acb53e0698
Merge branch 'staging-next' into staging 2020-06-10 04:10:57 +02:00
Jan Tojnar
c637cbe992
Merge branch 'master' into staging-next 2020-06-10 04:10:34 +02:00
Mario Rodas
926e8631bc
Merge pull request #89969 from r-ryantm/auto-update/git-filter-repo
gitAndTools.git-filter-repo: 2.26.0 -> 2.27.0
2020-06-09 18:48:22 -05:00
Mario Rodas
3d44c01fe3
gitAndTools.git-filter-repo: add meta platforms 2020-06-09 18:18:18 -05:00
Mario Rodas
a8ba9a04b3
Merge pull request #89965 from r-ryantm/auto-update/git-absorb
gitAndTools.git-absorb: 0.6.2 -> 0.6.3
2020-06-09 18:12:42 -05:00
R. RyanTM
4f5e740880 gitAndTools.git-filter-repo: 2.26.0 -> 2.27.0 2020-06-09 19:59:57 +00:00
R. RyanTM
84264ef0f0 gitAndTools.git-absorb: 0.6.2 -> 0.6.3 2020-06-09 19:34:00 +00:00
R. RyanTM
01b660d8f1 gitAndTools.gitui: 0.3.0 -> 0.5.0 2020-06-09 15:49:24 +00:00
Vladimír Čunát
0b4afef84a
gitMinimal: fix build after PR #86848
In that case it specified $doc output but didn't even create it.
I expect it's better to do it this way instead of creating it
as an empty directory.
(Only the failed builds get rebuilt by this commit.)
2020-06-09 09:28:24 +02:00
R. RyanTM
d57cf1d355 ghq: 1.1.0 -> 1.1.1 2020-06-08 18:58:20 +00:00
Frederik Rietdijk
8576d24b2a Merge staging-next into staging 2020-06-08 12:08:51 +02:00
Frederik Rietdijk
dc33419285 Merge master into staging-next 2020-06-08 12:06:12 +02:00
Mario Rodas
3795ac59cf
gitAndTools.git-subset: init at 0.1.1 2020-06-07 04:20:00 -05:00
Michael Weiss
98c44f5657
git: 2.26.2 -> 2.27.0 (#89355)
disable_test: Use \s instead of ' ' as tabs are used for indentation in
t5324-split-commit-graph.sh. It's also necessary to insert : (no op) in
front of # to prevent Bash syntax errors due to empty loops.

Two newly added tests fail due the usage of shared permissions (outside
of the build sandbox they succeed, actually even with breakpointHook
(cntr attach + cntr exec bash)):
```
t5324-split-commit-graph.sh                      (Wstat: 256 Tests: 29
Failed: 2)
  Failed tests:  28-29
  Non-zero exit status: 1
```

I'm also adding myself as maintainer since there currently doesn't seem
to be a fixed one for regular updates.

Announcement:
https://lkml.kernel.org/lkml/xmqqzh9mu4my.fsf@gitster.c.googlers.com/
2020-06-06 19:21:54 +02:00
Frederik Rietdijk
08900c0554 Merge master into staging-next 2020-06-04 15:25:54 +02:00
zimbatm
9f15e95ff2
Merge pull request #89308 from LnL7/remove-sri-hashes
Remove sri hashes
2020-06-02 16:24:01 +02:00
Daiderd Jordan
b7ddbd52bd
treewide: replace SRI hashes 2020-06-01 15:24:19 +02:00
Martin Weinelt
43e6a42da8
gitstatus: unstable-2020-04-21 -> 1.1.3 2020-06-01 01:29:55 +02:00
Frederik Rietdijk
03de4c02fb Merge staging-next into staging 2020-05-28 22:05:36 +02:00
R. RyanTM
e74425ad1b gitAndTools.lefthook: 0.7.1 -> 0.7.2 2020-05-27 12:53:26 -07:00
Frederik Rietdijk
362d88c2b1 Merge staging-next into staging 2020-05-27 15:27:28 +02:00
zowoq
ad77631a6a gitAndTools.gh: 0.8.0 -> 0.9.0
https://github.com/cli/cli/releases/tag/v0.9.0
2020-05-27 09:53:02 +10:00
Mario Rodas
3b9ebb8b8c
gitAndTools.git-absorb: 0.6.0 -> 0.6.2 2020-05-25 04:20:00 -05:00
Kimat Boven
72716b7a6f gitAndTools.gitin: init at 0.27.8 2020-05-24 12:56:53 +02:00
Orivej Desh
16d7f7edae Merge branch 'master' into staging 2020-05-22 09:13:23 +00:00
Oleksii Filonenko
c2d6a3c4cf gitAndTools.gitui: 0.2.5 -> 0.3.0 2020-05-20 15:28:22 +03:00
Wout Mertens
fd05023849
Merge pull request #86848 from primeos/git-add-doc-output
git: Add a doc output for the HTML and text files
2020-05-18 21:28:58 +02:00
Michael Weiss
9f2faa1f6f
git-doc: init 2020-05-18 16:53:13 +02:00
Michael Weiss
54918d6366
git: Add a doc output for the HTML and text files
This will install the HTML and text documentation into a separate output
so that users can install it without having to rebuild Git.
Previously only `doc/git/git-subtree.html` was installed (which is now
in $doc as well).
The current output sizes are as follows:
```
$ du -sh $(nix-build -A git)
47M     /nix/store/wyqgalp61kmavx06rams7z8jz177nd8y-git-2.26.2
$ du -sh $(nix-build -A git.doc)
14M     /nix/store/6zi22fl5xc3sg23d9shsviinvwk89wvq-git-2.26.2-doc
```

Fixes #86022 (at least partly since the output has to be installed).
2020-05-18 16:50:43 +02:00
Oleksii Filonenko
70df85260b gitAndTools.gitui: 0.2.2 -> 0.2.5 2020-05-16 19:36:46 +00:00
Mario Rodas
415e3ec512
gitAndTools.git-absorb: 0.5.0 -> 0.6.0 2020-05-15 00:00:00 -05:00
Colin L Rice
d6162dab50
go-modules: Update files to use vendorSha256 2020-05-14 07:22:21 +01:00
Jacek Galowicz
42c85f251d
Merge pull request #87613 from VirtusLab/git-machete-2.14.0
gitAndTools.git-machete: 2.13.6 -> 2.14.0
2020-05-13 10:56:35 +02:00
Mario Rodas
01b85fd5de
Merge pull request #87587 from filalex77/gitui-0.2.2
gitAndTools.gitui: 0.2.1 -> 0.2.2
2020-05-11 23:06:07 -05:00
zowoq
6618edf594 gitAndTools.gh: 0.7.0 -> 0.8.0
https://github.com/cli/cli/releases/tag/v0.8.0
2020-05-12 04:25:21 +10:00
Travis CI
c2350ba8f6 gitAndTools.git-machete: 2.13.6 -> 2.14.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).

###### Notify maintainers
cc @worldofpeace @tfc @jtraue
2020-05-11 17:50:35 +00:00
Oleksii Filonenko
f6f86bbbc6 gitAndTools.gitui: 0.2.1 -> 0.2.2 2020-05-11 08:53:29 +00:00
R. RyanTM
6e9c5e8a9f gitAndTools.svn-all-fast-export: 1.0.17 -> 1.0.18 2020-05-10 12:41:00 +00:00
Alyssa Ross
24fcef1b9e cgit: 1.2.1 -> 1.2.3
cgit now supports lzip and zstd compression.
2020-05-09 22:00:50 +02:00
Jörg Thalheim
887295fd2d
treewide: remove the-kenny from maintainers
@the-kenny did a good job in the past and is set as maintainer in many package,
however since 2017-2018 he stopped contributing. To create less confusion
in pull requests when people try to request his feedback, I removed him as
maintainer from all packages.
2020-05-09 10:28:57 +01:00
Oleksii Filonenko
fee8076083 gitAndTools.gitui: 0.2.0 -> 0.2.1 2020-05-08 08:08:44 +00:00
Frederik Rietdijk
9875bbae75 Merge master into staging-next 2020-05-05 19:51:09 +02:00
Mario Rodas
7f306cd78f
gitAndTools.git-subtrac: 0.01 -> 0.02 2020-05-05 04:20:00 -05:00
Mario Rodas
d43d8a213b
Merge pull request #86862 from r-ryantm/auto-update/git-trim
gitAndTools.git-trim: 0.3.1 -> 0.3.2
2020-05-04 20:18:11 -05:00
R. RyanTM
6e5b3c9aed gitAndTools.git-trim: 0.3.1 -> 0.3.2 2020-05-05 00:47:07 +00:00
Oleksii Filonenko
01cb649bce gitAndTools.git-workspace: 0.5.0 -> 0.6.0 2020-05-03 22:54:03 +03:00
Oleksii Filonenko
b503187046
gitAndTools.gitui: init at 0.2.0 2020-05-01 14:28:35 +00:00