Commit message (Collapse) | Author | Age | |
---|---|---|---|
* | Merge pull request #68339 from NixOS/staging-next | Frederik Rietdijk | 2019-09-09 |
|\ | | | | | Staging next with systemd 243 | ||
| * | Merge staging-next into staging | Frederik Rietdijk | 2019-09-09 |
| |\ | |||
| * | | treewide: remove redundant quotes | volth | 2019-09-08 |
| | | | |||
* | | | git-cola: fix wrapping | Frederik Rietdijk | 2019-09-09 |
| |/ |/| | |||
* | | Merge pull request #68255 from jluttine/nbstripout-0.3.6 | Marek Mahut | 2019-09-08 |
|\ \ | |/ |/| | nbstripout: 0.3.1 -> 0.3.6 | ||
| * | nbstripout: 0.3.1 -> 0.3.6 | Jaakko Luttinen | 2019-09-07 |
| | | |||
* | | gitea: 1.9.2 -> 1.9.3 | Elis Hirwing | 2019-09-07 |
| | | | | | | | | Changelog: https://github.com/go-gitea/gitea/releases/tag/v1.9.3 | ||
* | | gitAndTools.hub: 2.12.3 -> 2.12.4 | Doron Behar | 2019-09-07 |
| | | |||
* | | gerrit: 2.14.6 -> 3.0.2 | Milan Pässler | 2019-09-06 |
| | | |||
* | | Merge branch 'master' into staging-next | Vladimír Čunát | 2019-09-04 |
|\ \ | |||
| * | | treewide: don't use single quotes with placeholder | worldofpeace | 2019-09-03 |
| |/ | |||
* | | Merge branch 'master' into staging | Vladimír Čunát | 2019-09-02 |
|\| | |||
| * | ghq: 0.10.2 -> 0.12.6 | Yann Hodique | 2019-08-31 |
| | | |||
* | | treewide: name -> pname (#67513) | volth | 2019-08-31 |
| | | |||
* | | Merge staging-next into staging | Frederik Rietdijk | 2019-08-31 |
|\| | |||
| * | Merge master into staging-next | Frederik Rietdijk | 2019-08-31 |
| |\ | |||
| | * | gitRepo: 1.13.5 -> 1.13.5.1 | Michael Weiss | 2019-08-30 |
| | | | |||
| | * | gitRepo: 1.13.4 -> 1.13.5 | Michael Weiss | 2019-08-30 |
| | | | |||
* | | | treewide: remove redundant rec | volth | 2019-08-28 |
| | | | |||
* | | | Merge staging-next into staging | Frederik Rietdijk | 2019-08-28 |
|\| | | |||
| * | | Merge master into staging-next | Frederik Rietdijk | 2019-08-27 |
| |\| | |||
| | * | gitAndTools.qgit: 2.8 -> 2.9 | Markus Kowalewski | 2019-08-26 |
| | | | | | | | | | | | | | | | | | | * switch name -> pname * qtApps compatibility: use Qt's mkDerivation * cmake: remove enableParallelBuilding | ||
| | * | Merge pull request #67442 from jlesquembre/blackbox | Marek Mahut | 2019-08-25 |
| | |\ | | | | | | | | | blackbox: 1.20170611 -> 1.20181219 | ||
| | | * | blackbox: 1.20170611 -> 1.20181219 | José Luis Lafuente | 2019-08-25 |
| | | | | |||
| * | | | Merge branch 'master' into staging-next | Vladimír Čunát | 2019-08-25 |
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | There were several more conflicts from name -> pname+version; all auto-solved by kdiff3, hopefully OK. Hydra nixpkgs: ?compare=1538611 | ||
| | * | | Merge pull request #62708 from ktor/bcompare-4.2.10.23938 | worldofpeace | 2019-08-24 |
| | |\ \ | | | | | | | | | | | bcompare: init at 4.2.10.23938 | ||
| | | * | | bcompare: init at 4.2.10.23938 | Pawel Kruszewski | 2019-08-23 |
| | | |/ | |||
| | * / | git-subrepo: init at 0.4.0 (#67217) | Ryan Trinkle | 2019-08-24 |
| | |/ | | | | | | | | | | | | | | | | | | | | | | * git-subrepo: init at 0.4.0 * Apply suggestions from code review Co-Authored-By: worldofpeace <worldofpeace@protonmail.ch> | ||
| * | | Merge branch 'master' into staging-next | Vladimír Čunát | 2019-08-24 |
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | There ver very many conflicts, basically all due to name -> pname+version. Fortunately, almost everything was auto-resolved by kdiff3, and for now I just fixed up a couple evaluation problems, as verified by the tarball job. There might be some fallback to these conflicts, but I believe it should be minimal. Hydra nixpkgs: ?compare=1538299 | ||
| | * | treewide: openssl_1_1 pinning is unnecessary | Robin Gloster | 2019-08-23 |
| | | | |||
| | * | Merge remote-tracking branch 'upstream/master' into openssl-1.1 | Robin Gloster | 2019-08-23 |
| | |\ | |||
| | | * | gitea: 1.9.1 -> 1.9.2 | kolaente | 2019-08-22 |
| | | | | |||
| | | * | gitkraken: 6.1.3 -> 6.1.4 | Evan Stoll | 2019-08-21 |
| | | | | |||
| | * | | Merge remote-tracking branch 'upstream/master' into openssl-1.1 | Robin Gloster | 2019-08-21 |
| | |\| | |||
| | | * | treewide: update globin's maintained drvs | Robin Gloster | 2019-08-20 |
| | | | | |||
| | | * | Merge pull request #66810 from evanjs/feature/gitkraken-6.1.3 | markuskowa | 2019-08-18 |
| | | |\ | | | | | | | | | | | gitkraken: 6.1.1 -> 6.1.3 | ||
| | | | * | gitkraken: add evanjs to maintainers | Evan Stoll | 2019-08-17 |
| | | | | | |||
| | | | * | gitkraken: remove gnome2 | Evan Stoll | 2019-08-17 |
| | | | | | |||
| | | | * | gitkraken: 6.1.1 -> 6.1.3 | Evan Stoll | 2019-08-17 |
| | | | | | |||
| | | * | | tortoisehg: untie from mercurial and update to 5.0.2 (#66173) | Danylo Hlynskyi | 2019-08-18 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * tortoisehg: untie from mercurial When I've added `tortoisehg` package, it turned out that mercurial updates sometimes broke thg. I've added a comment to `mercurial/default.nix` to update torotisehg version during mercurial updates, but this worked the other way round: mercurial stopped to be updated regularly (https://github.com/NixOS/nixpkgs/pull/60993). And sadly it didn't solve the issue - https://github.com/NixOS/nixpkgs/issues/61759. Here I'm trying to untie them. Tortoisehg will build a custom mercurial package if versions don't match. This makes updating tortoisehg more complicated, but it is still better than current situation. * expose custom mercurial from thg package | ||
| | | * | | Merge pull request #66621 from flokli/gitlab-12.1.6 | Florian Klink | 2019-08-18 |
| | | |\ \ | | | | |/ | | | |/| | gitlab-ce: 12.0.3 -> 12.1.6 | ||
| | | | * | gitaly: 1.47.0 -> 1.53.2 | Florian Klink | 2019-08-14 |
| | | | | | |||
| | | | * | gitlab-ee: 12.0.3 -> 12.1.6 | Florian Klink | 2019-08-14 |
| | | | | | |||
| | | | * | gitlab-ce: 12.0.3 -> 12.1.6 | Florian Klink | 2019-08-14 |
| | | | | | |||
| | | | * | gitlab: remove gitlab-deb-data.tar after extracting from it | Florian Klink | 2019-08-14 |
| | | | | | | | | | | | | | | | | | | | | | | | | | There's no reason to ship a 1.6GiB .tar file in the output. Slims down that output from 1.9GiB to ~350MiB | ||
| | * | | | Merge remote-tracking branch 'upstream/master' into openssl-1.1 | Robin Gloster | 2019-08-02 |
| | |\ \ \ | |||
| | * | | | | git-crypt: remove openssl 1.0.2 pinning | Robin Gloster | 2019-07-30 |
| | | | | | | |||
| | * | | | | gitAndTools.git-dit: use openssl 1.0.2 | Andreas Rammhold | 2019-07-29 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There hasn't been a release in almost two years. Some (pinned) dependency doesn't work with a newer openssl yet :/ | ||
| | * | | | | pin some packages to openssl 1.0.2 for now | Robin Gloster | 2019-07-29 |
| | | | | | | |||
* | | | | | | Merge pull request #66773 from Izorkin/git | Peter Simons | 2019-08-21 |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | git: 2.22.0 -> 2.23.0 |