summary refs log tree commit diff
path: root/pkgs/applications/version-management
Commit message (Collapse)AuthorAge
...
| * | gitlab: 12.5.4 -> 12.5.5talyz2019-12-17
| | |
* | | gitAndTools.lab: 0.17.1 -> 0.17.2Mario Rodas2019-12-18
|/ / | | | | | | Changelog: https://github.com/zaquestion/lab/releases/tag/v0.17.2
* | Merge pull request #75675 from marsam/update-git-goneMario Rodas2019-12-15
|\ \ | | | | | | gitAndTools.git-gone: 0.1.2 -> 0.2.0
| * | gitAndTools.git-gone: 0.1.2 -> 0.2.0Mario Rodas2019-12-14
| | |
* | | Merge branch 'master' into staging-nextJan Tojnar2019-12-14
|\| |
| * | gitAndTools.lab: 0.17.0 -> 0.17.1Mario Rodas2019-12-13
| | |
* | | Merge master into staging-nextFrederik Rietdijk2019-12-13
|\| |
| * | gitAndTools.lab: 0.16.0 -> 0.17.0Mario Rodas2019-12-11
| | | | | | | | | | | | Changelog: https://github.com/zaquestion/lab/releases/tag/v0.17.0
| * | Merge pull request #75508 from flokli/gitlab-12.5.4Florian Klink2019-12-11
| |\ \ | | | | | | | | gitlab: 12.5.3 -> 12.5.4
| | * | gitlab: 12.5.3 -> 12.5.4Florian Klink2019-12-11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://about.gitlab.com/blog/2019/12/10/critical-security-release-gitlab-12-5-4-released/ Insufficient parameter sanitization for Maven package registry could lead to privilege escalation and remote code execution vulnerabilities under certain conditions. The issue is now mitigated in the latest release and is assigned CVE-2019-19628. When transferring a public project to a private group, private code would be disclosed via the Group Search API provided by Elasticsearch integration. The issue is now mitigated in the latest release and is assigned CVE-2019-19629. The Git dependency has been upgraded to 2.22.2 in order to apply security fixes detailed here. CVE-2019-19604 was identified by the GitLab Security Research team. For more information on that issue, please visit the GitLab Security Research Advisory closes #75506.
| * | | Merge pull request #75406 from andersk/gitk-completionWout Mertens2019-12-11
| |\ \ \ | | |/ / | |/| | git: Install bash-completion symlink for gitk
| | * | git: Install bash-completion symlink for gitkAnders Kaseorg2019-12-09
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| * | | diffuse: removeworldofpeace2019-12-10
| | | |
| * | | git: 2.24.0 -> 2.24.1edef2019-12-11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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/
* | | | Merge staging-next into stagingFrederik Rietdijk2019-12-10
|\| | |
| * | | git: Add git to update scriptTim Steinbach2019-12-10
| | | | | | | | | | | | | | | | | | | | 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.
| * | | gitAndTools.tig: 2.4.1 -> 2.5.0R. RyanTM2019-11-29
| | | |
| * | | gitolite: wrap gitolite-shellBruno Bigras2019-12-08
| | | | | | | | | | | | | | | | | | | | git wasn't found when used with services.fcgiwrap for http auth
| * | | gitea: 1.10.0 -> 1.10.1kolaente2019-12-05
| | | |
| * | | gitAndTools.delta: 0.0.14 -> 0.0.15Mario Rodas2019-12-05
| | | | | | | | | | | | | | | | Changelog: https://github.com/dandavison/delta/releases/tag/0.0.15
* | | | Merge pull request #73861 from xfix/git-enable-some-of-broken-testsPeter Simons2019-12-06
|\ \ \ \ | |/ / / |/| | | git: enable some of broken tests
| * | | git: enable some of previously broken testsKonrad Borowski2019-11-29
| | | |
* | | | Merge master into staging-nextFrederik Rietdijk2019-12-05
|\ \ \ \ | | |/ / | |/| |
| * | | gitlab: 12.5.2 -> 12.5.3Milan Pässler2019-12-04
| | | |
* | | | Merge branch 'master' into staging-nextJan Tojnar2019-12-03
|\| | |
| * | | Merge pull request #74695 from r-ryantm/auto-update/yadmRyan Mulligan2019-12-02
| |\ \ \ | | |_|/ | |/| | yadm: 1.12.0 -> 2.0.1
| | * | yadm: 1.12.0 -> 2.0.1R. RyanTM2019-11-29
| | | |
* | | | Merge branch 'staging-next' into stagingJan Tojnar2019-11-30
|\| | |
| * | | Merge branch 'master' into staging-nextJan Tojnar2019-11-30
| |\ \ \
| | * | | sourcehut.listssrht: add pygit2Jonathan Ringer2019-11-30
| | | | |
| | * | | gitAndTools.subgit: 3.3.8 -> 3.3.9 (#74653)R. RyanTM2019-11-30
| | | | |
* | | | | Merge staging-next into stagingFrederik Rietdijk2019-11-30
|\| | | | | |_|_|/ |/| | |
| * | | Merge master into staging-nextFrederik Rietdijk2019-11-30
| |\| |
| | * | yadm: add missing dependenciesilikeavocadoes2019-11-29
| | | | | | | | | | | | | | | | | | | | | | | | * yadm: add missing dependencies (#73615) * yadm: replace buildCommand with installPhase This let the fixup phase compress man pages and patch shebangs
| | * | Revert "gitlab: fix updater shebang"Florian Klink2019-11-28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit be6f3f69bf090873d4af526632711c32aa08b5b8. In fact, `yarn2nix-moretea.yarn2nix` should be available via `yarn2nix` in nixpkgs master.
| | * | pythonPackages.bugseverywhere: removing, abandoned (#74441)Jörg Thalheim2019-11-28
| | |\ \ | | | | | | | | | | pythonPackages.bugseverywhere: removing, abandoned
| | | * | pythonPackages.bugseverywhere: removing, abandonedDima2019-11-28
| | | | | | | | | | | | | | | | | | | | | | | | | This package has been abandoned by upstream, with the last version being from 2012. This is being removed due to python 3 incompatibility.
| * | | | Merge branch 'master' into staging-nextJonathan Ringer2019-11-27
| |\| | |
| | * | | Merge pull request #74278 from talyz/gitlab-12.5.0Florian Klink2019-11-28
| | |\ \ \ | | | | | | | | | | | | gitlab: 12.4.3 -> 12.5.0
| | | * | | gitlab-workhorse: 8.14.0 -> 8.14.1Florian Klink2019-11-28
| | | | | |
| | | * | | gitaly: 1.72.0 -> 1.72.1Florian Klink2019-11-28
| | | | | |
| | | * | | gitlab: 12.5.0 -> 12.5.2Florian Klink2019-11-28
| | | | | |
| | | * | | gitlab: fix updater shebangFlorian Klink2019-11-28
| | | | | |
| | | * | | gitlab: 12.4.3 -> 12.5.0talyz2019-11-26
| | | |/ /
| | * / / gitAndTools.git-machete: 2.12.1 -> 2.12.2Julian Stecklina2019-11-27
| | |/ /
| | * | gource: 0.49 -> 0.51R. RyanTM2019-11-26
| | | |
| | * | gitAndTools.git-subtrac: init at 0.01Mario Rodas2019-11-25
| | |/
* | | Merge pull request #74213 from ruuda/fix-git-perl-supportWout Mertens2019-11-28
|\ \ \ | | | | | | | | git: fix the "perlSupport = false" configuration
| * | | git: fix the "perlSupport = false" configurationRuud van Asseldonk2019-11-27
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When perlSupport = false, we will set NO_PERL=1, and build Git without Perl support. This is a build option that Git supports. However, Git's test suite still requires a Perl to be available to run the tests, and we did not provide one. The tests respect PERL_PATH, and if it is not set, they default to /usr/bin/perl. Before this commit, if we set "perlSupport = false", then no Perl would be available to the package, and so the tests would default to /usr/bin/perl. When building without a sandbox, that could still work, even though there is no "perl" on the path, because the tests defaulted to an absolute path. You can reproduce this issue as follows: nix-build -E 'let pkgs = (import ./default.nix) {}; in pkgs.git.override { perlSupport = false; }' I just ran into this when trying to build pkgs.git from an old version of Nixpkgs that I was able to build just fine in the past, and today it would not build any more, complaining when running the tests: make -C t/ all make[1]: Entering directory '/build/git-2.18.0/t' rm -f -r 'test-results' /nix/store/czx8vkrb9jdgjyz8qfksh10vrnqa723l-bash-4.4-p23/bin/bash: /usr/bin/perl: No such file or directory In the past the sandbox was not enabled by default, so then it worked for me. But now that it is enabled, my host's (not NixOS) /usr/bin/perl is no longer accessible, and the build fails. The solution is to explicitly set PERL_PATH when running the tests. This *almost* works, except that there appears to be a bug in the test for "git request-pull". That command is a Bash script that calls Perl at some point, so it requires Perl, and therefore it cannot be supported when NO_PERL=1. But that particular test does not check whether Git was compiled with Perl support (other tests do include that check), and that makes the test fail: t5150-request-pull.sh .............................. not ok 4 - pull request after push not ok 5 - request asks HEAD to be pulled not ok 6 - pull request format not ok 7 - request-pull ignores OPTIONS_KEEPDASHDASH poison not ok 9 - pull request with mismatched object not ok 10 - pull request with stale object Dubious, test returned 1 (wstat 256, 0x100) Failed 6/10 subtests This output makes sense if you look at t5150-request-pull.sh. Test 1 and 2 are setup steps. Test 3 does call request-pull, but it expects the command to fail, and it cannot distinguish between the command exiting with a nonzero exit code, or failing to start it at all. So test 3 passes for the wrong reasons. Test 4 through 10 all call request-pull, so they fail. The quick workaround here is to disable the test. I will look into upstreaming a patch that makes the test skip itself when Perl is disabled.
* / / git: build with python3Jörg Thalheim2019-11-28
|/ / | | | | | | | | | | git-p4 seems to be python3 ready: https://github.com/git/git/blob/master/git-p4.py#L32