Commit Graph

1499 Commits

Author SHA1 Message Date
Frederik Rietdijk
9e1943edc0 Merge master into staging-next 2020-10-13 19:34:34 +02:00
Jan Tojnar
aabcf2d8f5
Merge branch 'master' into staging-next 2020-10-11 00:27:21 +02:00
Vladimír Čunát
338b25697c
Merge branch 'master' into staging-next
Quite many rebuilds from master:
> Estimating rebuild amount by counting changed Hydra jobs.
>    3926 x86_64-darwin
>    4645 x86_64-linux
2020-10-10 11:32:10 +02:00
zowoq
311b360530 gitAndTools.delta: 0.4.3 -> 0.4.4
https://github.com/dandavison/delta/releases/tag/0.4.4
2020-10-11 09:30:37 +10:00
Mario Rodas
926a58ce63 gitAndTools.git-trim: 0.3.2 -> 0.4.0
https://github.com/foriequal0/git-trim/releases/tag/v0.4.0
2020-10-09 04:20:00 +00:00
Frederik Rietdijk
ec28e32c9e Merge master into staging-next 2020-10-08 21:47:26 +02:00
Doron Behar
f4b8c8f1df git-annex-metadata-gui: fix qt wrapping
Wrap application with wrapQtAppsHook and no double wrapping.
2020-10-08 18:57:24 +02:00
Frederik Rietdijk
692d219a93 Merge staging-next into staging 2020-10-06 10:25:58 +02:00
zowoq
bedaefb851 gitAndTools.gh: 1.0.0 -> 1.1.0
https://github.com/cli/cli/releases/tag/v1.1.0
2020-10-06 23:21:11 +10:00
Jan Tojnar
32b4375f10
Merge branch 'staging-next' into staging 2020-09-29 00:12:29 +02:00
Jörg Thalheim
a2960ac430
Merge pull request #97603 from zowoq/rust-test-threads 2020-09-25 06:19:23 +02:00
Jan Tojnar
d471c5d1f3
Merge branch 'staging-next' into staging 2020-09-24 23:09:00 +02:00
Martin Weinelt
2be541ff7c
Merge pull request #96136 from bdesham/fix-gitstatus-on-zsh
gitstatus: fix zsh integration
2020-09-24 07:22:13 +02:00
zowoq
664170166e gitAndTools.git-interactive-rebase-tool: use cargoParallelTestThreads 2020-09-24 07:20:03 +10:00
R. RyanTM
9bf3bd946d gitAndTools.gitstatus: 1.2.2 -> 1.3.0 2020-09-23 06:14:49 +00:00
Frederik Rietdijk
7bff759fac Merge staging-next into staging 2020-09-22 18:31:56 +02:00
Mario Rodas
fefb2ad107
Merge pull request #98348 from marsam/update-gitAndTools.git-imerge
gitAndTools.git-imerge: 1.1.0 -> 1.2.0
2020-09-21 07:07:03 -05:00
WORLDofPEACE
978e419abe Merge branch 'staging-next' into staging 2020-09-20 18:43:38 -04:00
WORLDofPEACE
34aaac6d7c Merge branch 'staging-next' into staging 2020-09-20 18:41:15 -04:00
Travis CI
358cfe9106 gitAndTools.git-machete: 2.15.5 -> 2.15.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 @blitz @Ma27 @tfc @worldofpeace
2020-09-20 18:32:57 +00:00
Mario Rodas
e5869f999f gitAndTools.git-imerge: 1.1.0 -> 1.2.0
https://github.com/mhagger/git-imerge/releases/tag/v1.2.0
2020-09-20 09:10:00 -05:00
Jacek Galowicz
0c1807e3e2
Merge pull request #97981 from VirtusLab/git-machete-2.15.5
gitAndTools.git-machete: 2.15.4 -> 2.15.5
2020-09-18 10:06:55 +02:00
zowoq
ec63faba64 gitAndTools.gh: 0.12.0 -> 1.0.0
https://github.com/cli/cli/releases/tag/v1.0.0
2020-09-17 17:41:04 +10:00
WORLDofPEACE
6b1c8e8036 Revert "git: enable zsh completion"
This reverts commit 35b403bf12.
2020-09-14 18:31:00 -04:00
Travis CI
6d0c57fb93 gitAndTools.git-machete: 2.15.4 -> 2.15.5
###### 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-09-14 15:56:26 +00:00
Norbert Melzer
4312e2460a lefthook: use go 1.14 to build
Due to some changes in `go` from 1.14 to 1.15 the lefthook tool
currently can't start external programs and errors each test it tries
to run, making it effectively useless.

This is a temporary fix to make `lefthook` usable again until the
upstream issue was fixed and a new release has been cut.

Upstream issue: https://github.com/Arkweid/lefthook/issues/151
2020-09-13 18:20:22 +02:00
Sandro
6623aac946
gitAndTools.rs-git-fsmonitor: init at 0.1.3 (#96574) 2020-09-10 13:09:33 +02:00
Mario Rodas
2649c85cb8
Merge pull request #97412 from marsam/update-git-subtrac
gitAndTools.git-subtrac: 0.03 -> 0.04
2020-09-08 05:10:15 -05:00
zowoq
ec22086628 gitAndTools.gh: 0.11.1 -> 0.12.0
https://github.com/cli/cli/releases/tag/v0.12.0
2020-09-08 20:04:32 +10:00
zowoq
e4cc68f766 gitAndTools.git-interactive-rebase-tool: disable check
disable until buildRustPackage supports setting test-threads in packages
2020-09-08 05:58:24 +10:00
Mario Rodas
22cf34bc25 gitAndTools.git-subtrac: 0.03 -> 0.04 2020-09-07 04:20:00 +00:00
zowoq
d763fb2257 gitAndTools.delta: 0.4.1 -> 0.4.3
https://github.com/dandavison/delta/releases/tag/0.4.3
2020-09-05 07:34:20 +10:00
yoctocell
008f45f591 gitAndTools.gita: 0.10.9 -> 0.10.10 2020-09-02 14:44:14 -07:00
Travis CI
b123d22237 gitAndTools.git-machete: 2.15.3 -> 2.15.4
###### 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-08-26 08:03:50 +00:00
Benjamin Esham
c278c6fd55 gitstatus: fix zsh integration
At some point the upstream changed and gitstatus.prompt.zsh stopped
working. The issue was that this file expects to be able to run the
"install" script in the same directory.

- Install the "install" script and "build.info" file that
  gitstatus.prompt.zsh expects to be able to find when it runs.
- Patch the install script so that it defaults to not automatically
  installing gitstatus. This can still be overridden by setting
  GITSTATUS_AUTO_INSTALL=1, although I'm not sure why anyone would do
  this if they've already installed gitstatus with Nix.
- Add an install check phase that tests the zsh integration to prevent
  this derivation from breaking in the same way in the future. (This
  also ends up testing the binary itself.)

Fixes #96135.
2020-08-24 18:29:16 -04:00
Robert Scott
b91ad42896 gitAndTools.git-fast-export: add installCheckPhase
this creates and converts a simple hg repository - should stop us
inadvertently breaking this package.
2020-08-23 14:08:03 +01:00
Robert Scott
6b1e2a51aa gitAndTools.git-fast-export: 190107 -> 200213, fix
fixing involves providing it with mercurial_4 (and implicitly python27 -
current released fast-export doesn't support py3 yet) and adding git to
the wrapped PATH. this shouldn't be a runtime-resolved dependency.
2020-08-23 12:13:14 +01:00
Jan Tojnar
2b6f959c3b gitAndTools.diff-so-fancy: Fix shebang patching and clean up
perl is a runtime dependency so it needs to be in buildInputs,
otherwise patchShebangs hook will not see it.
2020-08-21 12:31:29 -07:00
worldofpeace
ab77cf8930
Merge pull request #93298 from alyssais/git-remote-hg
git-remote-hg: fix; refactor
2020-08-19 19:08:47 -04:00
Alyssa Ross
8c05e036ea
gitAndTools.git-remote-hg: use buildPythonApplication
This is much cleaner than constructing PYTHONPATH using interpolated
subshells.
2020-08-19 20:30:42 +00:00
Dmitry Bogatov
a5985162e3 git: make nls support optional
Add option "nlsSupport" (true by default, maching upstream defaults) to
make nls support configurable. This change does not trigger rebuild.
2020-08-16 10:38:28 +00:00
zowoq
473536e3b5 buildRustPackage: remove platform.all from packages 2020-08-16 12:48:18 +10:00
zowoq
a83a88db05 buildGoPackage: remove platform.all from packages 2020-08-15 19:34:47 -07:00
zowoq
42313b92bc buildGoModule: remove platform.all from packages 2020-08-15 19:34:47 -07:00
andys8
bb472d014c Adding alias for git tool "git brunch" 2020-08-15 17:08:02 -07:00
zowoq
ad3dbcf02e gitAndTools.gh: enable checks 2020-08-15 11:18:59 +10:00
Timothy Stott
ba7c0893d4
treewide: remove obsolete attribute goPackagePath in buildGoModule derivations (#95092)
The buildGoModule infrastructure does not make use of goPackagePath it is a residue from buildGoPackage.
2020-08-11 21:04:55 +00:00
zowoq
cea7cd902e buildGoModule packages: set doCheck = false 2020-08-10 16:02:30 +10:00
zowoq
142da76d1d gitAndTools.delta: 0.4.0 -> 0.4.1
https://github.com/dandavison/delta/releases/tag/0.4.1
2020-08-09 08:06:23 +10:00
R. RyanTM
0ca9e6b2b5 ghq: 1.1.2 -> 1.1.5 2020-08-07 00:11:00 -07:00