Commit graph

1415 commits

Author SHA1 Message Date
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
Mario Rodas
b149f2ee80 gitAndTools.ghq: fix build on darwin 2020-03-21 05:25:00 -05:00
Mario Rodas
02d54a88b6 gitAndTools.git-bug: fix build on darwin 2020-03-21 05:24:00 -05:00
Mario Rodas
3e92406ab0 gitAndTools.git-subtrac: fix build on darwin 2020-03-21 05:23:00 -05:00
Mario Rodas
b30c0c8d5f gitAndTools.lab: fix build on darwin 2020-03-21 05:22:00 -05:00
Mario Rodas
b24059bc2f gitAndTools.lefthook: fix build on darwin 2020-03-21 05:21:00 -05:00
Mario Rodas
a51275f3b5
gitAndTools.gh: fix build on darwin 2020-03-18 21:21:21 -05:00
zowoq
20f197d0b9 gitAndTools.gh: 0.6.1 -> 0.6.2
https://github.com/cli/cli/releases/tag/v0.6.2
2020-03-19 08:03:58 +10:00
Martin Weinelt
b1e788c028
gitstatus: unstable-2020-03-06 → unstable-2020-03-15 2020-03-16 13:12:09 +01:00
R. RyanTM
93144e0f4a gitAndTools.stgit: 0.21 -> 0.22 2020-03-14 14:33:20 +01:00
R. RyanTM
96bfae7c5d gitAndTools.lefthook: 0.6.3 -> 0.7.1 2020-03-14 07:29:00 +00:00
Mario Rodas
8e29a0ad79
Merge pull request #82466 from r-ryantm/auto-update/git-standup
gitAndTools.git-standup: 2.3.1 -> 2.3.2
2020-03-13 05:42:38 -05:00
R. RyanTM
913f4d312a gitAndTools.git-standup: 2.3.1 -> 2.3.2 2020-03-13 04:51:35 +00:00
Mario Rodas
6881eb96a9 gitAndTools.hub: 2.14.1 -> 2.14.2
Changelog: https://github.com/github/hub/releases/tag/v2.14.2
2020-03-12 17:29:01 +01:00
Martin Weinelt
d8e27096f2
gitstatus: Fix build of the internally used libgit2 fork
In 6733ece `-DUSE_HTTP_PARSER=system` was introduced, which does not seem
to work with this fork. So instead fallback to the `builtin`.

Also sync with upstream cmake flags.
2020-03-12 11:23:36 +01:00
Florian Klink
5ffc683fde
Merge pull request #81934 from mweinelt/pr/zsh-powerlevel10k/v1.3
zsh-powerlevel10k: v1.2.0 → v1.3.0
2020-03-11 17:17:38 -07:00
Benjamin Hipple
68a64b2afe gitAndTools.git-dit: mark as broken
See inline comment; this does not build on Hydra and either requires custom
patching or a new release from upstream before it will build.

Note that we can still recompute the `cargoSha256` for #79975; the package
is broken in the identical way.
2020-03-12 01:16:56 +01:00
Mario Rodas
ca9b9ef51e
gitAndTools.git-trim: init at 0.2.4 2020-03-07 04:20:00 -05:00
Mario Rodas
77c58e6944
Merge pull request #81966 from edef1c/git-codereview
git-codereview: init at 2020-01-15
2020-03-08 20:07:50 -05:00
royneary
1cd54c9f36
gitAndTools.git-bug: 0.6.0 -> 0.7.0
Update to version 0.7.0. Includes switch to buildGoModule because Gopkg.toml
has been removed upstream.
2020-03-08 13:31:07 +01:00
edef
609650a3e8 git-codereview: init at 2020-01-15 2020-03-07 10:23:37 +00:00
Martin Weinelt
4307ef63ed
gitstatusd: unstable-2020-02-26 → unstable-2020-03-06 2020-03-07 01:02:29 +01:00
zowoq
4656fba5ab gitAndTools.gh 0.6.0 -> 0.6.1
https://github.com/cli/cli/releases/tag/v0.6.1
2020-03-05 07:49:38 +10:00
David Wood
a54908f15e
delta: 0.0.16 -> 0.0.17 2020-03-04 13:47:27 +00:00
zowoq
85a8d13017 gitAndTools.gh: 0.5.7 -> 0.6.0
https://github.com/cli/cli/releases/tag/v0.6.0
2020-03-04 08:16:42 +10:00
Andrew Childs
bc4264a95f git: use tcl/tk from nixpkgs on darwin 2020-03-02 22:29:47 +09:00
Andrew Childs
880ce71f67 Revert "git: Fix git-gui to work on Catalina"
This reverts commit 1b6ef1268f.
2020-03-02 22:29:47 +09:00
Travis CI
166836eadc gitAndTools.git-machete: 2.13.1 -> 2.13.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 @worldofpeace @tfc @jtraue
2020-03-02 11:54:21 +00:00
Jan Tojnar
bb701376cf
Merge branch 'master' into staging-next 2020-02-28 11:30:44 +01:00
Georges Dubus
d25ac92fe5
Merge pull request #80887 from cohei/update-ghq
ghq: 0.12.6 -> 1.1.0
2020-02-27 13:46:40 +01:00
Mario Rodas
afa6c6a7c1
Merge pull request #81089 from bhipple/u/rust-cargo-gitAndTools.git-interactive-rebase-tool
gitAndTools.git-interactive-rebase-tool: upgrade cargo fetcher and cargoSha256
2020-02-27 07:32:18 -05:00
Frederik Rietdijk
ef156f7a8b Merge staging-next into staging 2020-02-27 10:15:34 +01:00
Martin Weinelt
7fa4d90d7b
gitstatusd: unstable-2020-01-28 → unstable-2020-02-26
Also updates the internally used libgit2 fork.
2020-02-26 22:24:32 +01:00
ryneeverett
e964450670 legit: init at 1.2.0 2020-02-26 20:11:31 +00:00
worldofpeace
0babf18003
Merge pull request #71378 from bb010g/git-my
git-my: init at 1.1.2
2020-02-26 15:54:16 +00:00
Mario Rodas
55beed9922
Merge pull request #81093 from bhipple/u/rust-cargo-gitAndTools.git-ignore
gitAndTools.git-ignore: upgrade cargo fetcher and cargoSha256
2020-02-26 03:53:16 -05:00
Mario Rodas
fdc118806b
Merge pull request #81092 from bhipple/u/rust-cargo-gitAndTools.git-codeowners
gitAndTools.git-codeowners: upgrade cargo fetcher and cargoSha256
2020-02-26 03:48:19 -05:00
Mario Rodas
d4cba71766
Merge pull request #81088 from bhipple/u/rust-cargo-gitAndTools.git-absorb
gitAndTools.git-absorb: upgrade cargo fetcher and cargoSha256
2020-02-26 03:43:18 -05:00
Mario Rodas
e3a556ca56
Merge pull request #81090 from bhipple/u/rust-cargo-gitAndTools.git-gone
gitAndTools.git-gone: upgrade cargo fetcher and cargoSha256
2020-02-26 03:43:06 -05:00
bb010g
ddb272bf1d git-my: init at 1.1.2 2020-02-25 23:04:20 -08:00
bb010g
846097b7af git-and-tools: strongly alphabetize 2020-02-25 23:04:20 -08:00
bb010g
a7cb757af4 git-and-tools: canonicalize hyphenated names
Old intercaps names are aliased.

darcs-to-git: rename from darcsToGit
git-fast-export: rename from gitFastExport
git-remote-gcrypt: rename from gitRemoteGcrypt
hub-unstable: rename from hubUnstable
top-git: rename from topGit
2020-02-25 23:04:20 -08:00
bb010g
925404027a hub-unstable: remove
This has been here for 2 years; we can remove it.

Co-Authored-By: worldofpeace <worldofpeace@protonmail.ch>
2020-02-25 23:04:20 -08:00
Benjamin Hipple
c3f7554a34 gitAndTools.delta: upgrade cargo fetcher and cargoSha256
Infra upgrade as part of #79975; no functional change expected.
2020-02-25 23:24:48 -05:00
Benjamin Hipple
f2b14397d4 gitAndTools.git-ignore: upgrade cargo fetcher and cargoSha256
Infra upgrade as part of #79975; no functional change expected.
2020-02-25 23:20:29 -05:00
Benjamin Hipple
a717457135 gitAndTools.git-codeowners: upgrade cargo fetcher and cargoSha256
Infra upgrade as part of #79975; no functional change expected.
2020-02-25 23:15:04 -05:00
Benjamin Hipple
69ac30f87d gitAndTools.git-gone: upgrade cargo fetcher and cargoSha256
Infra upgrade as part of #79975; no functional change expected.
2020-02-25 23:12:45 -05:00
Benjamin Hipple
71137f9182 gitAndTools.git-interactive-rebase-tool: upgrade cargo fetcher and cargoSha256
Infra upgrade as part of #79975; no functional change expected.
2020-02-25 23:05:14 -05:00
Benjamin Hipple
42850aabd1 gitAndTools.git-absorb: upgrade cargo fetcher and cargoSha256
Infra upgrade as part of #79975; no functional change expected.
2020-02-25 23:03:55 -05:00
Peter Hoeg
2ddfc45235
Merge pull request #77071 from peterhoeg/git_emacs_files
git: upstream no longer ships .el files for emacs
2020-02-23 21:16:55 +08:00
TANIGUCHI Kohei
b974f0595f ghq: 0.12.6 -> 1.1.0 2020-02-23 21:24:48 +09:00
zowoq
3338225cd2 gitAndTools.gh: 0.5.6 -> 0.5.7
https://github.com/cli/cli/releases/tag/v0.5.7
2020-02-21 08:19:47 +10:00
zowoq
185aabefb0 gitAndTools.gh: 0.5.5 -> 0.5.6
https://github.com/cli/cli/releases/tag/v0.5.6
2020-02-20 09:36:08 -08:00
Tim Steinbach
b2a903a3e7
git: 2.25.0 -> 2.25.1 2020-02-20 08:22:22 -05:00
Daiderd Jordan
af1fffab5b
Merge pull request #79769 from virusdave/dnicponski/scratch/make_git_gui_work_on_modern_mac
git: Fix git-gui to work on Catalina
2020-02-19 20:25:41 +01:00
Frederik Rietdijk
ec1184f461 Merge master into staging-next 2020-02-17 15:12:28 +01:00
Mario Rodas
a05d11a95a
Merge pull request #77418 from marsam/init-gitAndTools.git-filter-repo
gitAndTools.git-filter-repo: init at 2.24.0
2020-02-16 18:26:46 -05:00
Frederik Rietdijk
0c7143462b Merge master into staging 2020-02-16 08:50:59 +01:00
Benjamin Hipple
131a32a5af rust: update docs on legacyCargoFetcher; remove unnecessary defaults
As mentioned in #79975, the default on `legacyCargoFetcher` if left unspecified
is now `false`.
2020-02-15 22:07:47 -08:00
Jonathan Ringer
bbb4a1be3d gitAndTools.ydiff: add python3.pkgs.ydiff tool 2020-02-15 08:54:42 -08:00
Jeff Labonte
ebf01d5614 gitAndTools.bump2version: init at 1.0.0 2020-02-14 16:46:15 -08:00
Mario Rodas
dafde55bf4
Merge pull request #80094 from r-ryantm/auto-update/svn-all-fast-export
gitAndTools.svn-all-fast-export: 1.0.16 -> 1.0.17
2020-02-14 08:28:52 -05:00
R. RyanTM
334e013a0a gitAndTools.svn-all-fast-export: 1.0.16 -> 1.0.17 2020-02-14 07:09:30 +00:00
Benjamin Hipple
eb11feaa0b treewide: change fetchCargoTarball default to opt-out
Changes the default fetcher in the Rust Platform to be the newer
`fetchCargoTarball`, and changes every application using the current default to
instead opt out.

This commit does not change any hashes or cause any rebuilds. Once integrated,
we will start deleting the opt-outs and recomputing hashes.

See #79975 for details.
2020-02-13 22:41:37 -08:00
zowoq
66f50128dc gitAndTools.gh: 0.5.4 -> 0.5.5
https://github.com/cli/cli/releases/tag/v0.5.5
2020-02-14 09:46:21 +10:00
R. RyanTM
7b61246b95 gitAndTools.gh: 0.5.3 -> 0.5.4 2020-02-12 09:40:46 -08:00
Mario Rodas
72ce1ffa9d
Merge pull request #79912 from r-ryantm/auto-update/git-remote-gcrypt
gitAndTools.gitRemoteGcrypt: 1.2 -> 1.3
2020-02-12 06:18:19 -05:00
R. RyanTM
de6b81a89b gitAndTools.gitRemoteGcrypt: 1.2 -> 1.3 2020-02-12 09:45:36 +00:00
Dave Nicponski
1b6ef1268f git: Fix git-gui to work on Catalina
The existing post-install was not successfully patching the git-gui script,
and thus was invoking the packaged osx app which uses the system tk,
which is too old to work (and is no longer supported by Apple anyway).
2020-02-10 17:19:26 -05:00
Benjamin Hipple
2115a2037c fetchcargo: use flat tar.gz file for vendored src instead of recursive hash dir
This has several advantages:

1. It takes up less space on disk in-between builds in the nix store.
2. It uses less space in the binary cache for vendor derivation packages.
3. It uses less network traffic downloading from the binary cache.
4. It plays nicely with hashed mirrors like tarballs.nixos.org, which only
   substitute --flat hashes on single files (not recursive directory hashes).
5. It's consistent with how simple `fetchurl` src derivations work.
6. It provides a stronger abstraction between input src-package and output
   package, e.g., it's harder to accidentally depend on the src derivation at
   runtime by referencing something like `${src}/etc/index.html`. Likewise, in
   the store it's harder to get confused with something that is just there as a
   build-time dependency vs. a runtime dependency, since the build-time
   src dependencies are tarred up.

Disadvantages are:
1. It takes slightly longer to untar at the start of a build.

As currently implemented, this attaches the compacted vendor.tar.gz feature as a
rider on `verifyCargoDeps`, since both of them are relatively newly implemented
behavior that change the `cargoSha256`.

If this PR is accepted, I will push forward the remaining rust packages with a
series of treewide PRs to update the `cargoSha256`s.
2020-02-10 10:17:29 -05:00
Benjamin Esham
35b403bf12 git: enable zsh completion
Git ships with a zsh completion script, but this script was previously
only available at $out/share/git/contrib/completion/git-completion.zsh,
which is not a path (or a filename) that would be discovered by a
typical zsh installation. This commit symlinks that file to
$out/share/zsh/site-functions/_git, which is a more standard location.

That zsh completion script is mostly a wrapper around the Bash
completion script, so this commit also patches the former so that it can
"find" the latter.
2020-02-09 09:22:20 +01:00
R. RyanTM
b2b755ece5 gitAndTools.git-machete: 2.12.6 -> 2.13.1 2020-02-08 09:20:18 +00:00
Mario Rodas
2fda7c1224
gitAndTools.delta: 0.0.15 -> 0.0.16
Changelog: https://github.com/dandavison/delta/releases/tag/0.0.16
2020-02-06 21:21:21 -05:00
zowoq
eb957383b7 gitAndTools.gh: init at 0.5.3 2020-02-04 13:53:56 +10:00
Mario Rodas
378be0a542
gitAndTools.git-interactive-rebase-tool: enable on darwin 2020-02-02 21:15:10 -05:00
Asad Saeeduddin
e3968c67f0
gitAndTools.git-interactive-rebase-tool: remove patch
Removes patch to disable tests, instead runs them in single threaded
mode.

See discussion in MitMaro/git-interactive-rebase-tool#172
2020-02-02 21:14:41 -05:00
Martin Weinelt
47b14f340a
gitstatus: unstable-2019-12-18 -> unstable-2020-01-28
Also add myself as maintainer.
2020-02-02 21:38:40 +01:00
Maximilian Bosch
9f61b23c01
Merge pull request #79096 from misuzu/git-workspace-update
gitAndTools.git-workspace: 0.4.1 -> 0.5.0
2020-02-02 19:32:59 +01:00
misuzu
cf4657092a gitAndTools.git-workspace: 0.4.1 -> 0.5.0 2020-02-02 18:45:53 +02:00
Asad Saeeduddin
4d67e30713
gitAndTools.git-interactive-rebase-tool: init 2020-02-02 10:09:28 +01:00
worldofpeace
183e706767
Merge pull request #77082 from misuzu/git-workspace-init
gitAndTools.git-workspace: init at 0.4.1
2020-01-30 04:08:05 -05:00
misuzu
b81d1b1781 gitAndTools.git-workspace: init at 0.4.1 2020-01-30 10:33:51 +02:00
Frederik Rietdijk
dce0ca29d9 Merge master into staging-next 2020-01-28 10:46:13 +01:00
Silvan Mosberger
80a2740991
Merge pull request #78265 from Synthetica9/https-homepages
treewide: fix redirected urls
2020-01-27 15:00:53 +01:00
Patrick Hilhorst
593e11fd94
treewide: fix redirected urls
According to https://repology.org/repository/nix_unstable/problems, we have a
lot of packages that have http links that redirect to https as their homepage.
This commit updates all these packages to use the https links as their
homepage.

The following script was used to make these updates:

```

curl https://repology.org/api/v1/repository/nix_unstable/problems \
    | jq '.[] | .problem' -r \
    | rg 'Homepage link "(.+)" is a permanent redirect to "(.+)" and should be updated' --replace 's@$1@$2@' \
    | sort | uniq > script.sed

find -name '*.nix' | xargs -P4 -- sed -f script.sed -i
```
2020-01-22 11:26:22 +01:00
Jon
0f3f0caf37
Merge pull request #78108 from filalex77/thicket-0.1.3
thicket: init at 0.1.3
2020-01-22 00:01:31 -08:00
Will Dietz
35363c3efa
gitAndTools.hub: 2.13.0 -> 2.14.1
https://github.com/github/hub/releases/tag/v2.14.1
https://github.com/github/hub/releases/tag/v2.14.0
2020-01-21 11:05:48 -06:00
Oleksii Filonenko
1e4c3f8dc8 thicket: init at 0.1.3 2020-01-20 15:52:26 +02:00
Frederik Rietdijk
bcd8c6b8dc Merge master into staging-next 2020-01-17 17:08:16 +01:00
Łukasz Jan Niemier
3d6c99a153 gitFull: support git send-email on Darwin 2020-01-16 21:36:29 +00:00
R. RyanTM
b467436ebb gitAndTools.git-subrepo: 0.4.0 -> 0.4.1 2020-01-15 12:57:58 +00:00
Frederik Rietdijk
2a88c3c302 Merge staging-next into staging 2020-01-15 09:23:28 +01:00
Tim Steinbach
a1d7308cf9
git: 2.24.1 -> 2.25.0 2020-01-13 19:22:51 -05:00
ryneeverett
f5e446b30f gitstatus: patch in variable rather than regexing
Patching in the GITSTATUS_DAEMON variable seems like a more stable
solution than doing inline replacements.
2020-01-12 22:21:25 +00:00
ryneeverett
be4efc8010 gitstatus: patch fewer characters
This is a followup to https://github.com/NixOS/nixpkgs/pull/76744.

The patch is still too aggressive because it captures additional local
variables declared in the same line. It should stop when it hits
whitespace.

See https://github.com/romkatv/gitstatus/pull/92.
2020-01-12 22:02:08 +00:00
Mario Rodas
bc6c029e12
gitAndTools.git-filter-repo: init at 2.25.0 2020-01-09 04:20:00 -05:00
Ryan Mulligan
fdf4002d70
Merge pull request #77098 from r-ryantm/auto-update/git-machete
gitAndTools.git-machete: 2.12.5 -> 2.12.6
2020-01-06 19:00:10 -08:00
Martin Weinelt
68106d9317 git-and-tools.gitstatus: unstable-2019-05-06 -> unstable-2019-12-18
Also bumps the interally used version of libgit2.
2020-01-06 21:49:15 +01:00
R. RyanTM
9bc1b6f8b9 gitAndTools.git-machete: 2.12.5 -> 2.12.6 2020-01-06 08:06:10 -08:00
royneary
8cc7acddda
gitAndTools.git-bug: 0.5.0 -> 0.6.0 2020-01-04 14:57:51 +01:00
Frederik Rietdijk
f08e3e38d4 Merge master into staging-next 2020-01-02 21:41:13 +01:00
Silvan Mosberger
59207c04b2
Merge pull request #76744 from bdesham/fix-gitstatus-patch
gitstatus: patch fewer lines
2020-01-01 03:06:57 +01:00
Benjamin Esham
054214057a gitstatus: patch fewer lines
The sed invocation was changing all lines matching "local daemon.*".
This changed the line it was supposed to, but two other lines that also
matched that pattern were being modified, which meant that the
"daemon_pid_var" and "daemon_pid" variables were not defined when they
should have been.
2019-12-31 10:29:08 -05:00
Peter Hoeg
a15efd8f73 git: upstream no longer ships .el files for emacs 2019-12-31 12:54:25 +08:00
Robin Gloster
5f2b92e3ec
treewide: NIX_*_COMPILE -> string 2019-12-31 00:13:29 +01:00
Robin Gloster
2157dcd141
treewide: installFlags is a list 2019-12-30 13:22:43 +01:00
Merijn Broeren
133103d709
treewide: replace make/build/configure/patchFlags with nix lists 2019-12-30 12:58:11 +01:00
Maximilian Bosch
9842c4b107
treewide: update which packages I'm currently maintaining
Idea shamelessly stolen from 4e60b0efae.

I realized that I don't really know anymore where I'm listed as maintainer and what
I'm actually (co)-maintaining which means that I can't proactively take
care of packages I officially maintain.

As I don't have the time, energy and motivation to take care of stuff I
was interested in 1 or 2 years ago (or packaged for someone else in the
past), I decided that I make this explicit by removing myself from several
packages and adding myself in some other stuff I'm now interested in.

I've seen it several times now that people remove themselves from a
package without removing the package if it's unmaintained after that
which is why I figured that it's fine in my case as the affected pkgs
are rather low-prio and were pretty easy to maintain.
2019-12-26 15:27:47 +01:00
Mario Rodas
4cd7c0f7d8
Merge pull request #76271 from r-ryantm/auto-update/git-machete
gitAndTools.git-machete: 2.12.2 -> 2.12.5
2019-12-23 10:58:15 -05:00
Jörg Thalheim
75760562dd gitAndTools.git-hub: 1.0.3 -> 1.1.0 2019-12-23 15:13:04 +00:00
R. RyanTM
e7ea379eb2 gitAndTools.git-machete: 2.12.2 -> 2.12.5 2019-12-23 06:48:48 -08:00
Mario Rodas
c382675f3a
Merge pull request #76251 from r-ryantm/auto-update/git-extras
gitAndTools.git-extras: 5.0.0 -> 5.1.0
2019-12-23 08:36:00 -05:00
R. RyanTM
05bf7427b3 gitAndTools.git-extras: 5.0.0 -> 5.1.0 2019-12-23 03:54:27 -08:00
Mario Rodas
1d9531fa6c
gitAndTools.git-gone: 0.2.0 -> 0.3.0 2019-12-22 00:00:00 -05:00
Mario Rodas
cc99d54c5f
gitAndTools.lab: 0.17.1 -> 0.17.2
Changelog: https://github.com/zaquestion/lab/releases/tag/v0.17.2
2019-12-18 13:36:00 -05:00
Mario Rodas
6b3720b395
Merge pull request #75675 from marsam/update-git-gone
gitAndTools.git-gone: 0.1.2 -> 0.2.0
2019-12-15 15:21:19 -05:00
Mario Rodas
fb112af09e
gitAndTools.git-gone: 0.1.2 -> 0.2.0 2019-12-14 20:20:20 -05:00
Jan Tojnar
429561978b
Merge branch 'master' into staging-next 2019-12-14 23:09:06 +01:00
Frederik Rietdijk
dfdf1597a7 Merge master into staging-next 2019-12-13 11:43:39 +01:00
Mario Rodas
76c69056bd
gitAndTools.lab: 0.17.0 -> 0.17.1 2019-12-13 00:00:00 -05:00
Mario Rodas
bc412904f1
gitAndTools.lab: 0.16.0 -> 0.17.0
Changelog: https://github.com/zaquestion/lab/releases/tag/v0.17.0
2019-12-11 18:18:18 -05:00
Wout Mertens
697b44b631
Merge pull request #75406 from andersk/gitk-completion
git: Install bash-completion symlink for gitk
2019-12-11 15:00:36 +01:00
edef
8fe0c8c351 git: 2.24.0 -> 2.24.1
CVE-2019-1348, CVE-2019-1349, CVE-2019-1350, CVE-2019-1351,
CVE-2019-1352, CVE-2019-1353, CVE-2019-1354, CVE-2019-1387,
CVE-2019-19604

Link: https://lore.kernel.org/git/xmqqr21cqcn9.fsf@gitster-ct.c.googlers.com/
2019-12-11 00:01:06 +00:00
Frederik Rietdijk
f3618342ec Merge staging-next into staging 2019-12-10 19:01:27 +01:00
Tim Steinbach
68708349f1
git: Add git to update script
Otherwise the system's git will be used, which may not exist
or, as is the case with Ubuntu, not have the --sort flag for ls-remote.
2019-12-10 08:30:00 -05:00
Anders Kaseorg
a16dbef1c1 git: Install bash-completion symlink for gitk
Since bash-completion rules are loaded dynamically, the completion
rules for `gitk <Tab>` waere not being loaded until the user first
typed `git <Tab>`.  Fix this by adding a symlink named `gitk`.

Signed-off-by: Anders Kaseorg <andersk@mit.edu>
2019-12-09 16:09:56 -08:00
Peter Simons
fa9159b0de
Merge pull request #73861 from xfix/git-enable-some-of-broken-tests
git: enable some of broken tests
2019-12-06 20:21:49 +01:00
Jan Tojnar
55a72926e1
Merge branch 'staging-next' into staging 2019-11-30 19:45:46 +01:00