summary refs log tree commit diff
path: root/pkgs/applications/version-management
Commit message (Collapse)AuthorAge
* 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 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 master into staging-nextFrederik Rietdijk2019-11-25
|\|
| * Merge pull request #73857 from petabyteboy/feature/gitlab-12-4-3Florian Klink2019-11-25
| |\ | | | | | | gitlab: 12.4.2 -> 12.4.3
| | * gitlab: 12.4.2 -> 12.4.3Milan Pässler2019-11-21
| | |
| * | Merge pull request #74049 from anderslundstedt/masterMario Rodas2019-11-24
| |\ \ | | | | | | | | git-subrepo: enable on Darwin
| | * | git-subrepo: enable on DarwinAnders Lundstedt2019-11-24
| | | |
| * | | Merge remote-tracking branch 'upstream/master' into wrapper-pname-supportJohn Ericson2019-11-24
| |\| |
| | * | Merge pull request #73907 from blitz/git-macheteworldofpeace2019-11-24
| | |\ \ | | | | | | | | | | git-machete: init at 2.12.1
| | | * | git-machete: init at 2.12.1Julian Stecklina2019-11-24
| | | | |
| * | | | treewide: Get rid of most `parseDrvName` without breaking compatJohn Ericson2019-11-24
| | | | | | | | | | | | | | | | | | | | | | | | | That is because this commit should be merged to both master and release-19.09.
* | | | | Merge staging-next into stagingFrederik Rietdijk2019-11-24
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | tree-wide: inherit yarn2nix from yarn2nix-moreteaMilan Pässler2019-11-24
| | | | |
| * | | | Merge pull request #73826 from LnL7/darwin-gitDaiderd Jordan2019-11-22
| |\ \ \ \ | | |_|/ / | |/| | | git: disable failing test on darwin
| | * | | git: disable failing test on darwinDaiderd Jordan2019-11-22
| | | |/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The tests for null patterns where changed in 25754125cef278c7e9492fbd6dc4a28319b01f18, it's possible utf-8 normalisation is causing different behaviour here. not ok 54 - LC_ALL='C' git grep -P -f f -i 'Æ<NUL>[Ð]' a not ok 57 - LC_ALL='C' git grep -P -f f -i '[Æ]<NUL>Ð' a not ok 60 - LC_ALL='C' git grep -P -f f -i '[Æ]<NUL>ð' a not ok 63 - LC_ALL='C' git grep -P -f f -i 'Æ<NUL>Ð' a Dubious, test returned 1 (wstat 256, 0x100) Failed 4/145 subtests (less 48 skipped subtests: 93 okay)
| * / | pijul: fix buildMario Rodas2019-11-21
| |/ /
* | | Merge staging-next into stagingFrederik Rietdijk2019-11-20
|\| |
| * | Merge master into staging-nextFrederik Rietdijk2019-11-20
| |\ \
| | * | gitRepo: 1.13.7.1 -> 1.13.8Michael Weiss2019-11-19
| | | |
| | * | gitea: 1.9.5 -> 1.10.0kolaente2019-11-18
| | | |
* | | | Merge staging-next into stagingFrederik Rietdijk2019-11-19
|\| | |
| * | | Merge master into staging-nextFrederik Rietdijk2019-11-16
| |\| |
| | * | gitea: 1.9.5 -> 1.9.6kolaente2019-11-14
| | | |
* | | | treewide: Stop using Qt 5.9adisbladis2019-11-18
| | | |
* | | | treewide: Get rid of libGLU_combinedadisbladis2019-11-18
|/ / /
* | | Merge master into staging-nextFrederik Rietdijk2019-11-14
|\| |
| * | Merge pull request #70210 from cko/git-extrasRenaud2019-11-12
| |\ \ | | | | | | | | gitAndTools.git-extras: 4.7.0 -> 5.0.0
| | * | gitAndTools.git-extras: 4.7.0 -> 5.0.0Christine Koppelt2019-11-12
| | | | | | | | | | | | | | | | For a list of changes and additions see: https://github.com/tj/git-extras/releases/tag/5.0.0
* | | | Merge staging-next into stagingFrederik Rietdijk2019-11-11
|\| | |
| * | | bcompare: 4.3.1.24438 -> 4.3.2.24472Paweł Kruszewski2019-11-09
| | | | | | | | | | | | (#72614)
| * | | gitkraken: 6.3.0 -> 6.3.1 (#73048)Evan Stoll2019-11-08
| | | |
| * | | Merge pull request #72894 from talyz/gitlab-12.4.2Florian Klink2019-11-08
| |\ \ \ | | | | | | | | | | gitlab: 12.4.1 -> 12.4.2
| | * | | gitlab: 12.4.1 -> 12.4.2talyz2019-11-06
| | | | |
| | * | | gitlab: Limit node memory consumption to 2048MBtalyz2019-11-06
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Hydra fails to build the assets on i686 - it runs out of memory. If we limit the max consumption to 2048MB the assets still build, and will hopefully also build on hydra.