about summary refs log tree commit diff
path: root/pkgs/applications/version-management
Commit message (Collapse)AuthorAge
* Merge branch 'staging', containing closure-size #7701Vladimír Čunát2016-04-13
|\
| * Merge branch 'master' into closure-sizeVladimír Čunát2016-04-10
| |\ | | | | | | | | | | | | | | | Comparison to master evaluations on Hydra: - 1255515 for nixos - 1255502 for nixpkgs
| * \ Merge 'staging' into closure-sizeVladimír Čunát2016-04-07
| |\ \ | | | | | | | | | | | | | | | | | | | | This is mainly to get the update of bootstrap tools. Otherwise there were mysterious segfaults: https://github.com/NixOS/nixpkgs/pull/7701#issuecomment-203389817
| * \ \ Merge branch 'master' into closure-sizeVladimír Čunát2016-04-01
| |\ \ \ | | | | | | | | | | | | | | | | | | | | Beware that stdenv doesn't build. It seems something more will be needed than just resolution of merge conflicts.
| * \ \ \ Merge master into closure-sizeVladimír Čunát2016-03-08
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | The kde-5 stuff still didn't merge well. I hand-fixed what I saw, but there may be more problems.
| * \ \ \ \ Merge branch 'master' into closure-sizeVladimír Čunát2016-02-14
| |\ \ \ \ \
| * \ \ \ \ \ Merge #12779: Mass replace `pkg}/bin`-style stringsVladimír Čunát2016-02-03
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | ... to refer to correct outputs
| | * | | | | | treewide: Mass replace 'xz}/bin' to refer the 'bin' outputTuomas Tynkkynen2016-02-01
| | | | | | | |
| | * | | | | | treewide: Mass replace 'bzip2}/bin' to refer the 'bin' outputTuomas Tynkkynen2016-02-01
| | | | | | | |
| * | | | | | | Merge recent 'staging' into closure-sizeVladimír Čunát2016-02-03
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | | | | | | | | Let's get rid of those merge conflicts.
| * | | | | | | Merge branch 'staging' into closure-sizeVladimír Čunát2016-01-19
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'master' into closure-sizeVladimír Čunát2015-12-31
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | TODO: there was more significant refactoring of qtbase and plasma 5.5 on master, and I'm deferring pointing to correct outputs to later.
| * \ \ \ \ \ \ \ \ Merge branch 'master' into closure-sizeLuca Bruno2015-12-11
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'master' into closure-sizeLuca Bruno2015-11-29
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge remote-tracking branch 'origin/master' into closure-sizeLuca Bruno2015-11-25
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge staging into closure-sizeVladimír Čunát2015-11-20
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The most complex problems were from dealing with switches reverted in the meantime (gcc5, gmp6, ncurses6). It's likely that darwin is (still) broken nontrivially.
| * | | | | | | | | | | | | subversion: fixup some referrers after splittingVladimír Čunát2015-10-28
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | subversion: Split into multiple outputsTuomas Tynkkynen2015-10-28
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | libxml2,libxslt: split into multiple outputsVladimír Čunát2015-10-05
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed all references, hopefully. libxml2Python is slightly hacky now, but it seems to work.
* | | | | | | | | | | | | | tortoisehg: 3.6 -> 3.7.1, fixes packageDan Connolly2016-04-11
| |_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fixes #13507 On June 8 (e8655ee) tortoisehg changed the way it computes the `/usr/share` directory in a way that invalidated the assumptions behind the use of substituteInPlace in postUnpack.
* | | | | | | | | | | | | mercurial: 3.7.1 -> 3.7.3 for multiple CVEsGraham Christensen2016-04-07
| |_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CVE-2016-3068 Blake Burkhart discovered that Mercurial allows URLs for Git subrepositories that could result in arbitrary code execution on clone. CVE-2016-3069 Blake Burkhart discovered that Mercurial allows arbitrary code execution when converting Git repositories with specially crafted names. CVE-2016-3630 It was discovered that Mercurial does not properly perform bounds- checking in its binary delta decoder, which may be exploitable for remote code execution via clone, push or pull.
* | | | | | | | | | | | git-cola: 2.2.1 -> 2.5Bob van der Linden2016-03-30
| | | | | | | | | | | |
* | | | | | | | | | | | Merge pull request #14207 from zimbatm/git-and-sshzimbatm2016-03-30
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | git: add openssh as a runtime dependency
| * | | | | | | | | | | git: add openssh as a runtime dependencyzimbatm2016-03-26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #1923
* | | | | | | | | | | | git: 2.7.4 -> 2.8.0Louis Taylor2016-03-29
| | | | | | | | | | | |
* | | | | | | | | | | | Merge pull request #14093 from matthiasbeyer/add-beFrederik Rietdijk2016-03-28
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | bugseverywhere: init at 1.1.1
| * | | | | | | | | | | | bugseverywhere: init at 1.1.1Matthias Beyer2016-03-28
| | | | | | | | | | | | |
* | | | | | | | | | | | | Merge remote-tracking branch 'origin/staging'Domen Kožar2016-03-27
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / |/| | | | | | | | | | | |
| * | | | | | | | | | | | Merge remote-tracking branch 'origin/gcc-5' into stagingEelco Dolstra2016-03-11
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Still some breakage but no blockers: http://hydra.nixos.org/eval/1242130?filter=x86_64-linux&compare=1237852&full=#tabs-now-fail
| | * | | | | | | | | | | rcs: Fix build on gcc 5Eelco Dolstra2016-03-03
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | http://hydra.nixos.org/build/32624218
* | | | | | | | | | | | | subversion: fix hashEvgeny Egorochkin2016-03-21
| | | | | | | | | | | | |
* | | | | | | | | | | | | gitlab: remove unused parameterzimbatm2016-03-19
| | | | | | | | | | | | |
* | | | | | | | | | | | | git: 2.7.3 -> 2.7.4Yann Hodique2016-03-18
| |_|/ / / / / / / / / / |/| | | | | | | | | | |
* | | | | | | | | | | | gitlab: 8.5.5 -> 8.5.7Franz Pletz2016-03-17
| | | | | | | | | | | |
* | | | | | | | | | | | git: update from version 2.7.1 to 2.7.3Peter Simons2016-03-16
| | | | | | | | | | | |
* | | | | | | | | | | | Merge pull request #13855 from jraygauthier/jrg/update_smart_git_from_710_to_712joachifm2016-03-14
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | smartgit: 7.1.0 -> 7.1.2
| * | | | | | | | | | | | smartgithg: 7.1.0 -> 7.1.2Raymond Gauthier2016-03-14
| |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also fixes broken download link.
* | | | | | | | | | | | Merge pull request #13906 from Zer0-/gitlab_version_bumpRobin Gloster2016-03-14
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | Gitlab version bump
| * | | | | | | | | | | | Gitlab package version 8.5.1 -> 8.5.5Philipp Volguine2016-03-13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | -had to bump the versions on a few gem dependencies
* | | | | | | | | | | | | svn: convert sha1 to sha256Graham Christensen2016-03-11
| |/ / / / / / / / / / / |/| | | | | | | | | | |
* | | | | | | | | | | | gitAndTools.darcsToGit: 0.2git -> 2015-06-04zimbatm2016-03-05
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes error where ruby 2.0+ doesn't have iconv anymore. `require': cannot load such file -- iconv (LoadError)
* | | | | | | | | | | | git-remote-hg: fix the derivation nameNathan Zadoks2016-03-03
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | -v0.2 isn't parsed as a version by Nix, and makes it inconvenient to install git-remote-hg through nix-env.
* | | | | | | | | | | | redmine: fix compilation with ruby 2.3zimbatm2016-02-29
|/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Just bumped the JSON dependency manually to the one bundled with ruby 2.3
* / / / / / / / / / / gitstats: init at 2016-01-08Bjørn Forsman2016-02-28
|/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Upstream does not make releases, using latest commit from master branch.
* | | | | | | | | | gitinspector: 0.4.1 -> 0.4.4Bjørn Forsman2016-02-28
| | | | | | | | | |
* | | | | | | | | | cgit: 0.11.2 -> 0.12 for CVE-2016-1899 CVE-2016-1900 CVE-2016-1901Graham Christensen2016-02-27
| | | | | | | | | |
* | | | | | | | | | Remove all dots at end of descriptionszimbatm2016-02-27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Specially crafted for @JagaJaga find pkgs -name "*.nix" -exec \ sed -e 's|\(description.*\)\.";|\1";|g' -i {} \;
* | | | | | | | | | Merge pull request #13396 from mayflower/pkg/gitlabzimbatm2016-02-26
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | gitlab: 8.0.5 -> 8.5.1, service improvements
| * | | | | | | | | | fixup! gitlab: 8.0.5 -> 8.5.0, service improvementsFranz Pletz2016-02-26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 8.5.0 -> 8.5.1
| * | | | | | | | | | gitlab: 8.0.5 -> 8.5.0, service improvementsFranz Pletz2016-02-26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Updates gitlab to the current stable version and fixes a lot of features that were broken, at least with the current version and our configuration. Quite a lot of sweat and tears has gone into testing nearly all features and reading/patching the Gitlab source as we're about to deploy gitlab for our whole company. Things to note: * The gitlab config is now written as a nix attribute set and will be converted to JSON. Gitlab uses YAML but JSON is a subset of YAML. The `extraConfig` opition is also an attribute set that will be merged with the default config. This way *all* Gitlab options are supported. * Some paths like uploads and configs are hardcoded in rails (at least after my study of the Gitlab source). This is why they are linked from the Gitlab root to /run/gitlab and then linked to the configurable `statePath`. * Backup & restore should work out of the box from another Gitlab instance. * gitlab-git-http-server has been replaced by gitlab-workhorse upstream. Push & pull over HTTPS works perfectly. Communication to gitlab is done over unix sockets. An HTTP server is required to proxy requests to gitlab-workhorse over another unix socket at `/run/gitlab/gitlab-workhorse.socket`. * The user & group running gitlab are now configurable. These can even be changed for live instances. * The initial email address & password of the root user can be configured. Fixes #8598.