3
0
Fork 0
forked from mirrors/nixpkgs
Commit graph

1442 commits

Author SHA1 Message Date
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
Oleg Pykhalov a34547730f
gitAndTools.gita: enable tests 2020-06-02 23:35:03 +03:00
Oleg Pykhalov abf309e005
gitAndTools.gita: add bash completion 2020-06-02 22:31:09 +03:00
Oleg Pykhalov 880c9a8519
gitAndTools.gita: 0.10.5 -> 0.10.9 2020-06-02 22:22:04 +03: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
Frederik Rietdijk 484ee79050 Merge staging-next into staging 2020-05-01 08:57:10 +02:00
Maximilian Bosch ee58c7a363
Merge pull request #82982 from cole-h/rust-cleanup
improve robustness of various Rust packages
2020-04-30 02:07:57 +02:00
zowoq b5dc07a4b4 treewide: use $out instead of $bin with buildGoPackage 2020-04-28 20:30:29 +10:00
Frederik Rietdijk 16f031e8e7
Merge pull request #86139 from NixOS/staging-next
Staging next
2020-04-27 19:35:17 +02:00
Mario Rodas 417974355f
Merge pull request #86091 from marsam/update-delta
gitAndTools.delta: 0.0.18 -> 0.1.1
2020-04-27 08:54:59 -05:00
Martin Weinelt b53cabcfed
gitstatus: unstable-2020-03-15 → unstable-2020-04-21 2020-04-27 12:37:24 +02:00
Mario Rodas b0698e430b
gitAndTools.delta: 0.0.18 -> 0.1.1 2020-04-26 18:17:00 -05:00
zowoq e75465256b gitAndTools.hub: use installShellFiles 2020-04-27 08:48:42 +10:00
Frederik Rietdijk bb10352242 Merge staging-next into staging 2020-04-25 07:53:37 +02:00
Maximilian Bosch a3467dfa82
gitAndTools.diff-so-fancy: 1.2.7 -> 1.3.0
https://github.com/so-fancy/diff-so-fancy/releases/tag/v1.3.0
2020-04-24 21:39:08 +02:00
Frederik Rietdijk cff0669a48 Merge master into staging-next 2020-04-23 08:11:16 +02:00
Frederik Rietdijk 6c13816249 Merge staging-next into staging 2020-04-22 17:20:43 +02:00
Frederik Rietdijk 8374a2a0ee Merge master into staging-next 2020-04-22 17:20:20 +02:00
Michael Weiss 7d2561cbdd git: 2.26.1 -> 2.26.2 (security, CVE-2020-11008)
See: https://raw.githubusercontent.com/git/git/master/Documentation/RelNotes/2.17.5.txt
2020-04-22 13:54:25 +02:00
Peter Hoeg 0bfd4557db thicket: specify the build type and pin to crystal 0.33 2020-04-22 17:30:23 +08:00
Frederik Rietdijk 23be4a8b4d Merge master into staging-next 2020-04-21 19:59:56 +02:00
Michael Weiss 666042141e
git: Fix the update.sh script and use HTTPS
The syntax is ${parameter:-word} (i.e. previously this used
"latestTag" instead of the actual value).
(Fixes a regression from #85278.)

Also: Even though getting the latest tag isn't really security critical
(as long as Git itself is secure against untrusted input), I'd prefer to
switch from the Git to the HTTPS protocol (for authentication of the
server and encryption + uses a standard port).
2020-04-21 14:30:11 +02:00
Frederik Rietdijk 803b3d296c Merge staging-next into staging 2020-04-21 08:29:51 +02:00
R. RyanTM 9fe2f2565e gitAndTools.gitFull: 2.25.1 -> 2.25.2 2020-04-21 08:14:29 +02:00
Mario Rodas 4ef7161104
gitAndTools.git-gone: 0.3.0 -> 0.3.2 2020-04-20 04:20:00 -05:00
zowoq f7b9c6c28b gitAndTools.gh: 0.6.4 -> 0.7.0
https://github.com/cli/cli/releases/tag/v0.7.0
2020-04-23 08:49:28 +10:00
Vladimír Čunát e233a9d4dd
Merge #84442: staging-next branch 2020-04-18 23:11:00 +02:00
Maximilian Bosch 16c6b2de8d
gitAndTools.delta: 0.0.17 -> 0.0.18
https://github.com/dandavison/delta/releases/tag/0.0.18
2020-04-18 22:36:35 +02:00
Vladimír Čunát 9d77dc28d2
Merge #85263: git: 2.25.1 -> 2.26.1 (into staging-next) 2020-04-16 16:59:53 +02:00
Jan Tojnar 4b706490da
Merge branch 'staging-next' into staging 2020-04-16 10:10:38 +02:00
vasile luta f57da8ef0a tig: fix tig-completion's dependency on __git_complete
tig recently updated it's bash-completion making it depend on __git-complete from git.
Becase __git-complete is not automatically sourced tig bash completion fails.
Also this PR makes tig completion load on-demand.
2020-04-15 22:14:51 +02:00
James Ottaway 4848eef29d git: Allow the update script to target non-latest versions
This came in handy when I wanted to bump a patch version while avoiding
a new minor version.
2020-04-15 17:05:34 +10:00
James Ottaway fbd29dcbe7 git: 2.25.1 -> 2.26.1
This version addresses CVE-2020-5260.

See https://lore.kernel.org/lkml/xmqqy2qy7xn8.fsf@gitster.c.googlers.com/
2020-04-15 14:23:52 +10:00
Mario Rodas 1ad005458f gitAndTools.git-trim: 0.2.4 -> 0.3.1 2020-04-14 18:42:36 +02:00
Matthew Bauer e520d6af29
Merge pull request #84415 from matthewbauer/mb-cross-fixes-april2020
Cross compilation fixes [april 2020]
2020-04-13 16:48:38 -04:00
Matthieu Coudron ed234c3708 gitAndTools.gitbatch: init at 2019-12-19
init an unstable version since the tagged release wouldn't work on my
machine (infinite loop).
Practical tool to fetch several repositories at the same time, see their
status etc.

Disabled for darwin because of CI error "SIGILL: illegal instruction".
2020-04-13 16:36:19 +02:00
zowoq 56480fe64c gitAndTools.hub: remove Security
Not needed now that Security is propagated via go 0bba7474b3
2020-04-13 13:08:11 +10:00
Cole Helbling 3d1824896f
gitAndTools.git-ignore: improve robustness 2020-04-12 14:06:08 -07:00
Niklas Hambüchen fd6ee37def gitAndTools.git-bug: 0.6.0 -> 0.7.0 2020-04-11 18:04:02 +02:00
Michael Reilly 84cf00f980
treewide: Per RFC45, remove all unquoted URLs 2020-04-10 17:54:53 +01:00
Maximilian Bosch a3eaf6c88b
gitAndTools.tig: 2.5.0 -> 2.5.1
https://github.com/jonas/tig/releases/tag/tig-2.5.1
2020-04-09 22:25:42 +02:00
Samuel Leathers 72cb7f81fd
Merge pull request #81442 from manveru/bundler-2.1.4
bundler: 1.17.3 -> 2.1.4
2020-04-08 12:44:54 -04:00
worldofpeace 36beb6efa4
Merge pull request #84185 from cpcloud/add-scmpuff
scmpuff: init at 0.3.0
2020-04-07 23:41:22 -04:00
Phillip Cloud 9c2ffc5834 scmpuff: init at 0.3.0
scmpuff is tool to make working with git easier by making it possible
to refer to filenames using numeric shortcuts
2020-04-07 23:41:06 -04:00
Alyssa Ross fafac02e41 gitAndTools.git-cinnabar: init at 0.5.4
git-cinnabar calls into Mercurial as a library, so we make use the
same version of Python as Mercurial.

Support for Python 3 is an experimental feature in git-cinnabar, but
we unconditionally use it here because:

* Mercurial in Nixpkgs only supports Python 3.
* git-cinnabar touches a network, and for that purpose it's good to
  use a version of Python that is going to get security updates.
2020-04-07 09:07:12 +00:00
Matthew Bauer d0dbdfea4f git: fix cross compilation 2020-04-06 16:36:14 -04:00
Michael Fellinger f92600b406
update versions in Gemfile.lock 2020-04-06 15:02:13 +02:00
Frederik Rietdijk 92124ed660 Merge master into staging-next 2020-04-03 21:54:40 +02:00
zowoq 26a6d89cab gitAndTools.gh: 0.6.3 -> 0.6.4
https://github.com/cli/cli/releases/tag/v0.6.4
2020-04-01 16:55:03 -07:00
zowoq 68a50aaaa5 gitAndTools.gh: 0.6.2 -> 0.6.3
https://github.com/cli/cli/releases/tag/v0.6.3
2020-04-01 08:37:03 +10:00
Jan Tojnar 3e0f4e202f
Merge branch 'master' into staging-next 2020-03-31 21:32:15 +02:00
Timo Kaufmann 24ead6996c
Merge pull request #75129 from ryneeverett/legit-init
legit: init at 1.2.0
2020-03-31 14:22:31 +00:00
R. RyanTM 6248fb23d2 gitAndTools.gita: 0.9.9 -> 0.10.5 2020-03-31 04:20:27 +00:00
zowoq 2ae5cf317f Revert "gitAndTools.gh: fix build on darwin"
This reverts commit a51275f3b5.

Not needed now that Security is propagated via go in 0bba7474b3
2020-03-29 09:43:11 +10:00
Frederik Rietdijk a36be028f5 Merge staging-next into staging 2020-03-28 21:15:15 +01:00
Jörg Thalheim f909e50287
gitAndTools.grv: fix build by using vendored libgit 2020-03-28 11:42:07 +00:00
Jörg Thalheim d13c14b5e3
gitAndTools.grv: 0.3.1 -> 0.3.2 2020-03-28 11:42:07 +00:00
Daiderd Jordan c4ecf64b3a
Merge pull request #81521 from thefloweringash/git-gui-darwin
git: use tcl/tk from nixpkgs on darwin
2020-03-28 11:51:05 +01:00
Jörg Thalheim 066db11215
Revert "Merge pull request #83099 from marsam/fix-buildGoModule-packages-darwin"
This reverts commit 4e6bf03504, reversing
changes made to afd997aab6.

Instead we propagate those frameworks from the compiler again
2020-03-27 07:33:21 +00:00
R. RyanTM ab049eef08 gitAndTools.git-filter-repo: 2.25.0 -> 2.26.0 2020-03-24 09:12:58 +00:00
Travis CI 9280064b8b gitAndTools.git-machete: 2.13.5 -> 2.13.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 @worldofpeace @tfc @jtraue
2020-03-22 17:54:44 +01:00