about summary refs log tree commit diff
path: root/pkgs/applications/version-management/git-and-tools
Commit message (Collapse)AuthorAge
* Merge #84442: staging-next branchVladimír Čunát2020-04-18
|\
| * Merge #85263: git: 2.25.1 -> 2.26.1 (into staging-next)Vladimír Čunát2020-04-16
| |\
| | * git: 2.25.1 -> 2.26.1James Ottaway2020-04-15
| | | | | | | | | | | | | | | | | | This version addresses CVE-2020-5260. See https://lore.kernel.org/lkml/xmqqy2qy7xn8.fsf@gitster.c.googlers.com/
* | | gitAndTools.delta: 0.0.17 -> 0.0.18Maximilian Bosch2020-04-18
|/ / | | | | | | https://github.com/dandavison/delta/releases/tag/0.0.18
* | tig: fix tig-completion's dependency on __git_completevasile luta2020-04-15
| | | | | | | | | | | | 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.
* | git: Allow the update script to target non-latest versionsJames Ottaway2020-04-15
|/ | | | | This came in handy when I wanted to bump a patch version while avoiding a new minor version.
* gitAndTools.git-trim: 0.2.4 -> 0.3.1Mario Rodas2020-04-14
|
* gitAndTools.gitbatch: init at 2019-12-19Matthieu Coudron2020-04-13
| | | | | | | | | 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".
* gitAndTools.hub: remove Securityzowoq2020-04-13
| | | | Not needed now that Security is propagated via go https://github.com/NixOS/nixpkgs/commit/0bba7474b3e6c8cef36960614446447d38ec04c9
* gitAndTools.git-bug: 0.6.0 -> 0.7.0Niklas Hambüchen2020-04-11
|
* treewide: Per RFC45, remove all unquoted URLsMichael Reilly2020-04-10
|
* gitAndTools.tig: 2.5.0 -> 2.5.1Maximilian Bosch2020-04-09
| | | | https://github.com/jonas/tig/releases/tag/tig-2.5.1
* Merge pull request #81442 from manveru/bundler-2.1.4Samuel Leathers2020-04-08
|\ | | | | bundler: 1.17.3 -> 2.1.4
| * update versions in Gemfile.lockMichael Fellinger2020-04-06
| |
* | Merge pull request #84185 from cpcloud/add-scmpuffworldofpeace2020-04-07
|\ \ | | | | | | scmpuff: init at 0.3.0
| * | scmpuff: init at 0.3.0Phillip Cloud2020-04-07
| |/ | | | | | | | | scmpuff is tool to make working with git easier by making it possible to refer to filenames using numeric shortcuts
* | gitAndTools.git-cinnabar: init at 0.5.4Alyssa Ross2020-04-07
| | | | | | | | | | | | | | | | | | | | | | | | 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.
* | Merge master into staging-nextFrederik Rietdijk2020-04-03
|\|
| * gitAndTools.gh: 0.6.3 -> 0.6.4zowoq2020-04-01
| | | | | | | | https://github.com/cli/cli/releases/tag/v0.6.4
| * gitAndTools.gh: 0.6.2 -> 0.6.3zowoq2020-04-01
| | | | | | | | https://github.com/cli/cli/releases/tag/v0.6.3
* | Merge branch 'master' into staging-nextJan Tojnar2020-03-31
|\|
| * Merge pull request #75129 from ryneeverett/legit-initTimo Kaufmann2020-03-31
| |\ | | | | | | legit: init at 1.2.0
| | * legit: init at 1.2.0ryneeverett2020-02-26
| | |
| * | gitAndTools.gita: 0.9.9 -> 0.10.5R. RyanTM2020-03-31
| | |
| * | Revert "gitAndTools.gh: fix build on darwin"zowoq2020-03-29
| | | | | | | | | | | | | | | | | | This reverts commit a51275f3b5f82fe3e45ff4536ee2994c9fc4029a. Not needed now that Security is propagated via go in https://github.com/NixOS/nixpkgs/commit/0bba7474b3e6c8cef36960614446447d38ec04c9
* | | Merge staging-next into stagingFrederik Rietdijk2020-03-28
|\| |
| * | gitAndTools.grv: fix build by using vendored libgitJörg Thalheim2020-03-28
| | |
| * | gitAndTools.grv: 0.3.1 -> 0.3.2Jörg Thalheim2020-03-28
| | |
| * | Revert "Merge pull request #83099 from marsam/fix-buildGoModule-packages-darwin"Jörg Thalheim2020-03-27
| | | | | | | | | | | | | | | | | | | | | This reverts commit 4e6bf03504c9e09f067cc6dee6b5aeec43a1405c, reversing changes made to afd997aab6e9b7a322198092c7828d6c560ac06f. Instead we propagate those frameworks from the compiler again
| * | gitAndTools.git-filter-repo: 2.25.0 -> 2.26.0R. RyanTM2020-03-24
| | |
* | | Merge pull request #81521 from thefloweringash/git-gui-darwinDaiderd Jordan2020-03-28
|\ \ \ | |/ / |/| | git: use tcl/tk from nixpkgs on darwin
| * | git: use tcl/tk from nixpkgs on darwinAndrew Childs2020-03-02
| | |
| * | Revert "git: Fix git-gui to work on Catalina"Andrew Childs2020-03-02
| | | | | | | | | | | | This reverts commit 1b6ef1268fa87d66125938399a42f2b4d416cd8f.
* | | gitAndTools.git-machete: 2.13.5 -> 2.13.6Travis CI2020-03-22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ###### 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
* | | gitAndTools.ghq: fix build on darwinMario Rodas2020-03-21
| | |
* | | gitAndTools.git-bug: fix build on darwinMario Rodas2020-03-21
| | |
* | | gitAndTools.git-subtrac: fix build on darwinMario Rodas2020-03-21
| | |
* | | gitAndTools.lab: fix build on darwinMario Rodas2020-03-21
| | |
* | | gitAndTools.lefthook: fix build on darwinMario Rodas2020-03-21
| | |
* | | gitAndTools.gh: fix build on darwinMario Rodas2020-03-18
| | |
* | | gitAndTools.gh: 0.6.1 -> 0.6.2zowoq2020-03-19
| | | | | | | | | | | | https://github.com/cli/cli/releases/tag/v0.6.2
* | | gitstatus: unstable-2020-03-06 → unstable-2020-03-15Martin Weinelt2020-03-16
| | |
* | | gitAndTools.stgit: 0.21 -> 0.22R. RyanTM2020-03-14
| | |
* | | gitAndTools.lefthook: 0.6.3 -> 0.7.1R. RyanTM2020-03-14
| | |
* | | Merge pull request #82466 from r-ryantm/auto-update/git-standupMario Rodas2020-03-13
|\ \ \ | | | | | | | | gitAndTools.git-standup: 2.3.1 -> 2.3.2
| * | | gitAndTools.git-standup: 2.3.1 -> 2.3.2R. RyanTM2020-03-13
| | | |
* | | | gitAndTools.hub: 2.14.1 -> 2.14.2Mario Rodas2020-03-12
| | | | | | | | | | | | | | | | Changelog: https://github.com/github/hub/releases/tag/v2.14.2
* | | | gitstatus: Fix build of the internally used libgit2 forkMartin Weinelt2020-03-12
|/ / / | | | | | | | | | | | | | | | | | | 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.
* | | Merge pull request #81934 from mweinelt/pr/zsh-powerlevel10k/v1.3Florian Klink2020-03-11
|\ \ \ | | | | | | | | zsh-powerlevel10k: v1.2.0 → v1.3.0
| * | | gitstatusd: unstable-2020-02-26 → unstable-2020-03-06Martin Weinelt2020-03-07
| | | |