about summary refs log tree commit diff
path: root/pkgs/applications/version-management/git-and-tools
Commit message (Collapse)AuthorAge
* Merge pull request #46519 from teto/git_extra_zsh_completionMatthew Bauer2018-09-29
|\ | | | | gitAndTools.git-extras: install zsh completion
| * gitAndTools.git-extras: install zsh completionMatthieu Coudron2018-09-11
| | | | | | | | because there are so many freaking commands !
* | gitAndTools.pass-git-helper: init at 0.4 (#47056)vanzef2018-09-26
| |
* | Merge pull request #47234 from Ma27/fix-tig-zsh-completionJörg Thalheim2018-09-23
|\ \ | | | | | | tig: fix zsh completion
| * | tig: fix zsh completionMaximilian Bosch2018-09-23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The ZSH completion script of `tig` basically imports the bash completion script and uses it as completion approach. Unfortunately the script takes several assumptions about the directory structure using `$funcsourcetrace`[1] that don't apply on NixOS. The easiest workaround is t opatch the completion script and import the bash completion script from `$out`. [1] http://zsh.sourceforge.net/Doc/Release/Zsh-Modules.html#index-funcsourcetrace
* | | gitAndTools.pre-commit: 1.11.0 -> 1.11.1 (#47211)Boris2018-09-23
|/ /
* | Merge pull request #46824 from borisbabic/update/gitAndTools.pre-commit-1.11.0Jörg Thalheim2018-09-18
|\ \ | | | | | | gitAndTools.pre-commit: 1.10.4 -> 1.11.0
| * | gitAndTools.pre-commit: 1.10.4 -> 1.11.0Boris Babic2018-09-18
| | |
* | | git-appraise: init unstable at 2018-02-26Vincent Demeester2018-09-18
|/ / | | | | | | Signed-off-by: Vincent Demeester <vincent@sbr.pm>
* | gitAndTools.grv: fix darwin build by using go 1.9Maximilian Bode2018-09-14
| | | | | | | | | | | | cf. https://github.com/fsnotify/fsevents/issues/40 /cc ZHF #45961
* | gitAndTools.git-imerge: 1.0.0 -> 1.1.0 (#46281)R. RyanTM2018-09-12
| | | | | | | | | | | | Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/git-imerge/versions
* | gitAndTools.svn-all-fast-export: 1.0.12 -> 1.0.13 (#46173)R. RyanTM2018-09-11
| | | | | | | | | | | | Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from svn-all-fast-export
* | cgit: use full path of groff in man2htmlDaniël de Kok2018-09-09
|/ | | | | | groff may not be installed system-wide or may be outside cgit's path (e.g. when running cgit using uwsgi). As a result, the man2html filter fails. Replace groff by its full path in man2html.
* git-cola: 3.1 -> 3.2R. RyanTM2018-08-30
| | | | | | | Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from git-cola
* hub: 2.5.0 -> 2.5.1 (#45599)Will Dietz2018-08-24
|
* Merge pull request #45229 from r-ryantm/auto-update/git-extrasJörg Thalheim2018-08-17
|\ | | | | gitAndTools.git-extras: 4.5.0 -> 4.6.0
| * gitAndTools.git-extras: 4.5.0 -> 4.6.0R. RyanTM2018-08-17
| | | | | | | | | | | | | | Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/git-extras/versions.
* | gitAndTools.tig: 2.4.0 -> 2.4.1R. RyanTM2018-08-16
|/ | | | | | | Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/tig/versions.
* cgit: 1.1 -> 1.2.1Bjørn Forsman2018-08-09
| | | | Fixes CVE-2018-14912.
* gitAndTools.pre-commit: init at 1.10.4Boris Babic2018-07-31
|
* grv: 0.1.2 -> 0.2.0Will Dietz2018-07-26
| | | | | Needs libgit2 0.27 apparently, doesn't build with 0.26 or 0.25 in-tree.
* Merge staging-next into master (#44009)Frederik Rietdijk2018-07-24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * substitute(): --subst-var was silently coercing to "" if the variable does not exist. * libffi: simplify using `checkInputs` * pythonPackges.hypothesis, pythonPackages.pytest: simpify dependency cycle fix * utillinux: 2.32 -> 2.32.1 https://lkml.org/lkml/2018/7/16/532 * busybox: 1.29.0 -> 1.29.1 * bind: 9.12.1-P2 -> 9.12.2 https://ftp.isc.org/isc/bind9/9.12.2/RELEASE-NOTES-bind-9.12.2.html * curl: 7.60.0 -> 7.61.0 * gvfs: make tests run, but disable * ilmbase: disable tests on i686. Spooky! * mdds: fix tests * git: disable checks as tests are run in installcheck * ruby: disable tests * libcommuni: disable checks as tests are run in installcheck * librdf: make tests run, but disable * neon, neon_0_29: make tests run, but disable * pciutils: 3.6.0 -> 3.6.1 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/pciutils/versions. * mesa: more include fixes mostly from void-linux (thanks!) * npth: 1.5 -> 1.6 minor bump * boost167: Add lockfree next_prior patch * stdenv: cleanup darwin bootstrapping Also gets rid of the full python and some of it's dependencies in the stdenv build closure. * Revert "pciutils: use standardized equivalent for canonicalize_file_name" This reverts commit f8db20fb3ae382eba1ba2b160fe24739f43c0bd7. Patching should no longer be needed with 3.6.1. * binutils-wrapper: Try to avoid adding unnecessary -L flags (cherry picked from commit f3758258b8895508475caf83e92bfb236a27ceb9) Signed-off-by: Domen Kožar <domen@dev.si> * libffi: don't check on darwin libffi usages in stdenv broken darwin. We need to disable doCheck for that case. * "rm $out/share/icons/hicolor/icon-theme.cache" -> hicolor-icon-theme setup-hook * python.pkgs.pytest: setupHook to prevent creation of .pytest-cache folder, fixes #40273 When `py.test` was run with a folder as argument, it would not only search for tests in that folder, but also create a .pytest-cache folder. Not only is this state we don't want, but it was also causing collisions. * parity-ui: fix after merge * python.pkgs.pytest-flake8: disable test, fix build * Revert "meson: 0.46.1 -> 0.47.0" With meson 0.47.0 (or 0.47.1, or git) things are very wrong re:rpath handling resulting in at best missing libs but even corrupt binaries :(. When we run patchelf it masks the problem by removing obviously busted paths. Which is probably why this wasn't noticed immediately. Unfortunately the binary already has a long series of paths scribbled in a space intended for a much smaller string; in my testing it was something like lengths were 67 with 300+ written to it. I think we've reported the relevant issues upstream, but unfortunately it appears our patches are what introduces the overwrite/corruption (by no longer being correct in what they assume) This doesn't look so bad to fix but it's not something I can spend more time on at the moment. -- Interestingly the overwritten string data (because it is scribbled past the bounds) remains in the binary and is why we're suddenly seeing unexpected references in various builds -- notably this is is the reason we're seeing the "extra-utils" breakage that entirely crippled NixOS on master (and probably on staging before?). Fixes #43650. This reverts commit 305ac4dade5758c58e8ab1666ad0197fd305828d. (cherry picked from commit 273d68eff8f7b6cd4ebed3718e5078a0f43cb55d) Signed-off-by: Domen Kožar <domen@dev.si>
* tig: 2.3.3 -> 2.4.0Will Dietz2018-07-23
| | | | https://github.com/jonas/tig/releases/tag/tig-2.4.0
* gitFull: build libsecret credential helper (#43616)Benjamin Staffin2018-07-22
| | | ...except on Darwin, where it won't be useful.
* treewide: fix build with disallowed aliases (#43872)volth2018-07-21
| | | fixes build with disallowed aliases
* Merge branch 'master' into unused5Jörg Thalheim2018-07-21
|\
| * [bot] treewide: remove unused 'inherit' in let blocksvolth2018-07-20
| |
* | pkgs/*: remove unreferenced function argumentsvolth2018-07-21
|/
* treewide: remove aliases in nixpkgsMatthew Bauer2018-07-18
| | | | | | | | | | | | | | | | | | This makes the command ‘nix-env -qa -f. --arg config '{skipAliases = true;}'’ work in Nixpkgs. Misc... - qtikz: use libsForQt5.callPackage This ensures we get the right poppler. - rewrites: docbook5_xsl -> docbook_xsl_ns docbook_xml_xslt -> docbook_xsl diffpdf: fixup
* config.skipAliases -> config.allowAliasesvolth2018-07-17
|
* config.skipAliases: also disable vimPlugins, git, xfce and gnome3 aliasesvolth2018-07-17
|
* Merge pull request #43617 from dtzWill/update/hub-2.5.0lewo2018-07-17
|\ | | | | hub: 2.4.0 -> 2.5.0
| * hub: 2.4.0 -> 2.5.0Will Dietz2018-07-16
| |
* | Merge branch 'master' into staging-nextVladimír Čunát2018-07-14
|\| | | | | | | Hydra: ?compare=1468896
| * tig: zsh completion should be named _tigJörg Thalheim2018-07-12
| |
| * tig: add zsh completionMatthieu Coudron2018-07-12
| | | | | | | | along with contrib/vim.tigrc config in case users want to use it.
* | Merge branch 'master' into stagingVladimír Čunát2018-06-30
|\|
| * treewide: http -> https sources (#42676)Silvan Mosberger2018-06-28
| | | | | | | | | | | | | | | | | | * treewide: http -> https sources This updates the source urls of all top-level packages from http to https where possible. * buildtorrent: fix url and tab -> spaces
| * Merge pull request #41876 from IvanMalison/addGitSyncxeji2018-06-26
| |\ | | | | | | Add git sync
| | * git-sync: move to gitAndTools.git-syncUli Baum2018-06-26
| | | | | | | | | | | | | | | By convention, git-related tools in nixpkgs are not added to the top level but bundled under gitAndTools.
| | * git-sync: init at 20151024Ivan Malison2018-06-12
| | |
* | | Revert "Revert "Merge pull request #42376 from dtzWill/update/git-2.18.0""Will Dietz2018-06-28
|/ / | | | | | | This reverts commit 6d1955e0c49720074505e090dac8b576a77efdd0.
* | Revert "Merge pull request #42376 from dtzWill/update/git-2.18.0"Will Dietz2018-06-24
| | | | | | | | | | | | | | | | | | | | | | This reverts commit 2624f9079617df6b1fffda8c10f6a7a35068ecdc, reversing changes made to 37aab4cbb5552bf021b20cf05d64e8ded6f3538a. See: https://github.com/NixOS/nixpkgs/pull/42376#issuecomment-399789096 Basically this breaks at least some users of fetchgit, so let's revert this until this is sorted out.
* | git: indicate when last tested to "still" fail, for checking updatesWill Dietz2018-06-22
| |
* | git: disable failing completion test as wellWill Dietz2018-06-22
| |
* | git: disable "editor with a space" tests due to failsWill Dietz2018-06-22
| | | | | | | | Need to investigate.
* | git: disable working-tree-encoding tests on muslWill Dietz2018-06-22
| | | | | | | | Makes assumptions about BOM.
* | git: remove symlinks-in-bin patchWill Dietz2018-06-22
| |
* | git: 2.17.1 -> 2.18.0Will Dietz2018-06-22
| |
* | git: remove object file from closureMatthew Bauer2018-06-21
| | | | | | | | | | This file pulls in some big dependencies that are unneeded (like clang).