about summary refs log tree commit diff
path: root/pkgs/applications/version-management
Commit message (Collapse)AuthorAge
* Merge branch 'master' into stagingJan Malakhovski2018-05-26
|\ | | | | | | | | | | Fixed conflicts: - lib/systems/for-meta.nix: in favor of staging - pkgs/os-specific/darwin/xcode/default.nix: in favor of master
| * gitlab: 10.7.0 -> 10.8.0Robin Gloster2018-05-24
| |
| * gitlab-workhorse: 4.1.0 -> 4.2.0Robin Gloster2018-05-24
| |
| * gitaly: 0.95.0 -> 0.100.0Robin Gloster2018-05-24
| |
* | Merge pull request #41009 from matthewbauer/normalize-namesMatthew Justin Bauer2018-05-25
|\ \ | | | | | | Add versions to packages missing it
| * | treewide: add version to packagesMatthew Bauer2018-05-25
| |/ | | | | | | | | | | | | | | | | Lots of packages are missing versions in their name. This adds them where appropriate. These were found with this command: $ nix-env -qa -f. | grep -v '\-[0-9A-Za-z.-_+]*$' | grep -v '^hook$' See issue #41007.
* | Merge branch 'master' into stagingVladimír Čunát2018-05-20
|\|
| * gitAndTools.git-dit: Fix darwin buildJosef Kemetmüller2018-05-20
| |
* | Merge remote-tracking branch 'upstream/master' into stagingJohn Ericson2018-05-11
|\|
| * Merge pull request #40371 from Ma27/git-cola/qt5-portRobert Schütz2018-05-11
| |\ | | | | | | git-cola: port to qt5
| | * git-cola: port to qt5Maximilian Bosch2018-05-11
| | | | | | | | | | | | | | | | | | | | | | | | `git-cola` is a simple GUI `git` wrapper based on QT. Since 2.7 (namely https://github.com/git-cola/git-cola/commit/293364b45c4cbf3faff3fd7aba79b474d0abc845) it supports QT5 which provides a nicer inteface. See #33248
* | | Merge branch 'fewer-crossAttrs' into stagingJohn Ericson2018-05-10
|\| |
| * | fossil: Remove crossAttrsJohn Ericson2018-05-10
| | | | | | | | | | | | | | | TCC= (and BCC=) no longer needed as new Makefile defines with CC (and CC_FOR_BUILD).
* | | Merge master into stagingFrederik Rietdijk2018-05-09
|\| |
| * | git-secrets: fix homepage urlMatthew Justin Bauer2018-05-08
| | |
| * | Merge pull request #40151 from yrashk/sit-aarch64-iselxeji2018-05-08
| |\ \ | | | | | | | | sit: better fix for aarch64 bug
| | * | sit: better fix for aarch64 bugYurii Rashkovskii2018-05-07
| | | |
* | | | Merge remote-tracking branch 'upstream/master' into stagingMatthew Bauer2018-05-08
|\| | |
| * | | Merge pull request #40155 from jtojnar/gnome-3.28.2Jan Tojnar2018-05-08
| |\ \ \ | | |/ / | |/| | GNOME Updates
| | * | meld: 3.18.0 → 3.18.1Jan Tojnar2018-05-08
| | | |
| * | | sit: fix tests on aarch64Yurii Rashkovskii2018-05-07
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As we found out in #40032, sit tests won't pass on aarch64. The problem seems to be related to `create_dir` not returning an error if the directory already exists, happening specifically on aarch64+debug (not aarch64+release) This update injects a patch for tests that will also be included in subsequent versions of SIT.
| * | | Merge pull request #40032 from yrashk/sit-0.3.2xeji2018-05-07
| |\ \ \ | | | | | | | | | | sit: 0.3.0 -> 0.3.2
| | * | | sit: 0.3.0 -> 0.3.2Yurii Rashkovskii2018-05-07
| | | | |
| * | | | Merge pull request #40109 from r-ryantm/auto-update/fossilMichael Raskin2018-05-07
| |\ \ \ \ | | |_|_|/ | |/| | | fossil: 2.5 -> 2.6
| | * | | fossil: 2.5 -> 2.6R. RyanTM2018-05-07
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/fossil/versions. These checks were done: - built on NixOS - ran ‘/nix/store/by0my4ix1gpichp15gf3i8w3fgfxmsrc-fossil-2.6/bin/fossil --help’ got 0 exit code - ran ‘/nix/store/by0my4ix1gpichp15gf3i8w3fgfxmsrc-fossil-2.6/bin/fossil help’ got 0 exit code - found 2.6 with grep in /nix/store/by0my4ix1gpichp15gf3i8w3fgfxmsrc-fossil-2.6 - directory tree listing: https://gist.github.com/673b50672a3bb2c22d7e37175d1f37d4
| * | | | gitea: 1.4.0 -> 1.4.1zimbatm2018-05-06
| | |/ / | |/| |
| * | | Merge pull request #39770 from r-ryantm/auto-update/git-remote-gcryptxeji2018-05-05
| |\ \ \ | | |_|/ | |/| | gitAndTools.gitRemoteGcrypt: 1.0.3 -> 1.1
| | * | gitAndTools.gitRemoteGcrypt: 1.0.3 -> 1.1R. RyanTM2018-04-30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-remote-gcrypt/versions. These checks were done: - built on NixOS - ran ‘/nix/store/xqncvvl7rynvbw0lf27d68qj879s26bm-git-remote-gcrypt-1.1/bin/git-remote-gcrypt -h’ got 0 exit code - ran ‘/nix/store/xqncvvl7rynvbw0lf27d68qj879s26bm-git-remote-gcrypt-1.1/bin/git-remote-gcrypt --help’ got 0 exit code - ran ‘/nix/store/xqncvvl7rynvbw0lf27d68qj879s26bm-git-remote-gcrypt-1.1/bin/git-remote-gcrypt help’ got 0 exit code - ran ‘/nix/store/xqncvvl7rynvbw0lf27d68qj879s26bm-git-remote-gcrypt-1.1/bin/.git-remote-gcrypt-wrapped -h’ got 0 exit code - ran ‘/nix/store/xqncvvl7rynvbw0lf27d68qj879s26bm-git-remote-gcrypt-1.1/bin/.git-remote-gcrypt-wrapped --help’ got 0 exit code - ran ‘/nix/store/xqncvvl7rynvbw0lf27d68qj879s26bm-git-remote-gcrypt-1.1/bin/.git-remote-gcrypt-wrapped help’ got 0 exit code - found 1.1 with grep in /nix/store/xqncvvl7rynvbw0lf27d68qj879s26bm-git-remote-gcrypt-1.1 - directory tree listing: https://gist.github.com/f375e7b41aa0075f2c539d2c32748c12
| * | | Merge pull request #39990 from bbarker/git-secretsMatthew Justin Bauer2018-05-05
| |\ \ \ | | | | | | | | | | Add package: git-secrets
| | * | | confirmed git-secrets is now workingBrandon Elam Barker2018-05-04
| | | | |
| | * | | adding untested git-secretsBrandon Elam Barker2018-05-04
| | | |/ | | |/|
| * / | Upgrade gitkraken to 3.6.0Unknown2018-05-05
| |/ /
* | | Merge pull request #39945 from dtzWill/fix/temp-workaround-git-test-muslWill Dietz2018-05-03
|\ \ \ | | | | | | | | git: disable failing test w/musl for now
| * | | git: disable failing test w/musl for nowWill Dietz2018-05-03
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I'm working to resolve this but it will take some time (patches sent to upstream musl, maybe to git afterwards) and for now this blocks quite a lot. If that doesn't work out we can explore options such as always using GNU libiconv with musl.
* | | | Merge remote-tracking branch 'upstream/master' into stagingJohn Ericson2018-05-03
|\ \ \ \ | |/ / / |/| / / | |/ /
| * | treewide: remove platform assertionsMatthew Bauer2018-05-03
| | | | | | | | | | | | linux: readd assertion
* | | Merge branch 'staging' into fix-ncurses-darwin-extensionsMatthew Justin Bauer2018-05-02
|\ \ \ | |/ / |/| |
| * | Merge pull request #39461 from dtzWill/update/git-2.17.0-againWill Dietz2018-04-26
| |\ \ | | | | | | | | git: 2.16.3 -> 2.17.0, again, installCheck
| | * | git: add install checksGuillaume Maudoux2018-04-24
| | | | | | | | | | | | | | | | (cherry picked from commit f57873f674ebc2f6ae874407aafb98a1350ab525)
| | * | git: 2.16.3 -> 2.17.0... again!Will Dietz2018-04-24
| | | |
| * | | tree-wide: disable `doCheck` and `doInstallCheck` where it fails (the ↵Jan Malakhovski2018-04-25
| |/ / | | | | | | | | | trivial part)
| * | Merge remote-tracking branch 'origin/master' into stagingWill Dietz2018-04-24
| |\|
| * | Merge remote-tracking branch 'upstream/master' into HEADTuomas Tynkkynen2018-04-22
| |\ \ | | | | | | | | | | | | | | | | Conflicts: pkgs/development/tools/misc/binutils/default.nix
| * \ \ Merge remote-tracking branch 'upstream/master' into HEADTuomas Tynkkynen2018-04-16
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: pkgs/applications/version-management/git-and-tools/git/default.nix pkgs/top-level/all-packages.nix pkgs/top-level/unix-tools.nix
| * | | | git: fix perl libs pathGuillaume Maudoux2018-04-11
| | | | |
| * | | | git: 2.16.3 -> 2.17.0Guillaume Maudoux2018-04-11
| | | | |
| * | | | git: 2.16.2 -> 2.16.3Will Dietz2018-04-11
| | | | |
* | | | | git-cola: 3.0 -> 3.1R. RyanTM2018-05-01
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-cola/versions. These checks were done: - built on NixOS - ran ‘/nix/store/vdgbmam99abv4kryg2bn31vkzdxk90cq-git-cola-3.1/bin/.git-cola-wrapped -h’ got 0 exit code - ran ‘/nix/store/vdgbmam99abv4kryg2bn31vkzdxk90cq-git-cola-3.1/bin/.git-cola-wrapped --help’ got 0 exit code - ran ‘/nix/store/vdgbmam99abv4kryg2bn31vkzdxk90cq-git-cola-3.1/bin/.git-cola-wrapped --version’ and found version 3.1 - ran ‘/nix/store/vdgbmam99abv4kryg2bn31vkzdxk90cq-git-cola-3.1/bin/.git-cola-wrapped version’ and found version 3.1 - ran ‘/nix/store/vdgbmam99abv4kryg2bn31vkzdxk90cq-git-cola-3.1/bin/git-cola -h’ got 0 exit code - ran ‘/nix/store/vdgbmam99abv4kryg2bn31vkzdxk90cq-git-cola-3.1/bin/git-cola --help’ got 0 exit code - ran ‘/nix/store/vdgbmam99abv4kryg2bn31vkzdxk90cq-git-cola-3.1/bin/git-cola --version’ and found version 3.1 - ran ‘/nix/store/vdgbmam99abv4kryg2bn31vkzdxk90cq-git-cola-3.1/bin/git-cola version’ and found version 3.1 - ran ‘/nix/store/vdgbmam99abv4kryg2bn31vkzdxk90cq-git-cola-3.1/bin/.git-dag-wrapped -h’ got 0 exit code - ran ‘/nix/store/vdgbmam99abv4kryg2bn31vkzdxk90cq-git-cola-3.1/bin/.git-dag-wrapped --help’ got 0 exit code - ran ‘/nix/store/vdgbmam99abv4kryg2bn31vkzdxk90cq-git-cola-3.1/bin/.git-dag-wrapped --version’ and found version 3.1 - ran ‘/nix/store/vdgbmam99abv4kryg2bn31vkzdxk90cq-git-cola-3.1/bin/git-dag -h’ got 0 exit code - ran ‘/nix/store/vdgbmam99abv4kryg2bn31vkzdxk90cq-git-cola-3.1/bin/git-dag --help’ got 0 exit code - ran ‘/nix/store/vdgbmam99abv4kryg2bn31vkzdxk90cq-git-cola-3.1/bin/git-dag --version’ and found version 3.1 - found 3.1 with grep in /nix/store/vdgbmam99abv4kryg2bn31vkzdxk90cq-git-cola-3.1 - directory tree listing: https://gist.github.com/af016e8541c2ac80ef4e4e16a00bc0de
* | | | | gitlab: 10.5.6 -> 10.7.0Robin Gloster2018-04-26
| | | | |
* | | | | gitlab-workhorse: 3.6.0 -> 4.1.0Robin Gloster2018-04-26
| | | | |