Commit graph

2541 commits

Author SHA1 Message Date
Michael Weiss b515a14c8f
gitRepo: 1.13.3 -> 1.13.4 2019-07-27 22:11:21 +02:00
Frederik Rietdijk db6c38a075 Merge master into staging-next 2019-07-22 14:15:32 +02:00
Nick Novitski 7136e0d0a6 bundlerUpdateScript: init and use (#64822) 2019-07-22 12:02:47 +00:00
worldofpeace ee5bcfff93
Merge pull request #65110 from worldofpeace/smerge-update
sublime-merge: 1107 -> 1116,  sublime-merge-dev: 1111 -> 1115
2019-07-20 21:11:19 -04:00
Mario Rodas f06e19a594
gitAndTools.hub: 2.12.2 -> 2.12.3 2019-07-19 21:01:55 -05:00
worldofpeace 496248820d sublime-merge-dev: 1111 -> 1115 2019-07-19 18:19:14 -04:00
worldofpeace b8d5a407c9 sublime-merge: 1107 -> 1116 2019-07-19 18:18:33 -04:00
worldofpeace dc7c4d003c sublime-merge: add redirect for /bin/true
Without it rebasing/squashing features are broken.
2019-07-19 18:17:46 -04:00
Frederik Rietdijk 0ce55a10d2 Merge master into staging-next 2019-07-19 16:33:38 +02:00
Robin Gloster 0972409c95
Merge pull request #64550 from bgamari/gitlab-12.0
gitlab: 11.10.8 -> 12.0.3
2019-07-17 16:01:03 +00:00
Demin Dmitriy ea688c051d git: remove runtime dependency on gcc
Reduces gitMinimal closure size from 329.6M to 174.8M.

Fixes the issue https://github.com/NixOS/nixpkgs/issues/64350.

In git 2.22.0 git-stash is no longer a shell script and now it is just a symlink to git.
`postInstall` assumed that it was a shell script, tried to patch it and
ended up corrupting the file and made `strip` refuse stripping it.
2019-07-17 10:33:13 +02:00
Mario Rodas 3b1b51520d
Merge pull request #64973 from marsam/update-git-absorb
gitAndTools.git-absorb: 0.4.0 -> 0.5.0
2019-07-17 02:18:59 -05:00
Mario Rodas 81e1151d0f
Merge pull request #64963 from r-ryantm/auto-update/subgit
gitAndTools.subgit: 3.3.6 -> 3.3.7
2019-07-17 01:08:11 -05:00
Mario Rodas 620ee144d9
gitAndTools.git-absorb: 0.4.0 -> 0.5.0 2019-07-17 00:00:00 -05:00
worldofpeace 6394fa54df
Merge pull request #64936 from nicknovitski/man-git-crypt
git-crypt: include man pages in output
2019-07-16 22:00:47 -04:00
Nick Novitski 1e9373cb59 git-crypt: pname 2019-07-16 18:58:19 -07:00
Nick Novitski de99f28611 git-crypt: include man pages in output 2019-07-16 18:56:31 -07:00
R. RyanTM 908807bb53 gitAndTools.subgit: 3.3.6 -> 3.3.7
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/subgit/versions
2019-07-16 18:42:52 -07:00
Frederik Rietdijk a28a9ac156 Merge master into staging-next 2019-07-16 11:15:46 +02:00
Robin Gloster a33ddd7a68
gitlab-shell: fix fallback bin searching 2019-07-16 03:51:22 +02:00
Ben Gamari 9f77b4a599 gitaly: Fix IFD import 2019-07-15 21:29:57 -04:00
Mario Rodas 19a7737784
Merge pull request #64800 from r-ryantm/auto-update/fossil
fossil: 2.8 -> 2.9
2019-07-15 20:15:33 -05:00
Robin Gloster 5589612599
gitlab: add all necessary gem groups 2019-07-16 01:18:42 +02:00
Robin Gloster 722ee7756b
gitlab: add gitaly go mod handling for the updater 2019-07-16 01:18:11 +02:00
Robin Gloster 6c98b0ff43
gitaly: add go mod deps 2019-07-16 01:17:38 +02:00
R. RyanTM aaa71375ed fossil: 2.8 -> 2.9
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
2019-07-15 06:31:37 -07:00
Mario Rodas e07ac44a35
gitAndTools.git-absorb: 0.3.0 -> 0.4.0 2019-07-14 19:00:00 -05:00
Ben Gamari 363b352af3 gitlab: 11.10.8 -> 12.0.3
This is a major version bump but things were generally straightforward
save two wrinkles:

 * it is necessary to ignore collisions in the gitlab bundler
   environment as both `omniauth_oauth2_generic` and
   `apollo_upload_server` provide a `console` executable.

 * grpc had to be patched since its build system expects the `AR`
   environment variable to contain not just the path to `ar` but
   also the `rpc` flags (see the discussion in nixpkgs #63056).
2019-07-14 23:03:39 +02:00
Frederik Rietdijk 54065ae20d Merge master into staging-next 2019-07-13 09:45:40 +02:00
xrelkd 7a40b2fe8c gitAndTools.hub: 2.12.1 -> 2.12.2 2019-07-12 14:38:14 +08:00
Frederik Rietdijk 22cb7f25f2 Merge master into staging-next 2019-07-11 09:40:10 +02:00
Ryan Mulligan 508ae42a0f treewide: fix redirect URLs 2019-07-10 12:52:51 -07:00
lewo 46d88d6896
Merge pull request #63550 from evanjs/feature/gitkraken-6.0.0
gitkraken: 5.0.4 -> 6.0.0
2019-07-10 09:02:08 +02:00
Frederik Rietdijk 79a03641d5 Merge staging-next into staging 2019-07-09 15:46:26 +02:00
Frederik Rietdijk 7cf5909fad Merge staging-next into staging 2019-07-09 15:44:08 +02:00
Mario Rodas 9719889377
gitAndTools.git-gone: init at 0.1.2 2019-07-07 23:39:45 -05:00
Robert Scott 49283ed802 cgit: add patch fixing remote DoS
issue assigned MGASA-2019-0203 by mageia
https://www.openwall.com/lists/oss-security/2019/05/19/3
2019-07-07 21:01:50 +02:00
Thomas Tuegel 56d5963382
Merge pull request #54525 from ttuegel/feature/qt-5/wrap-qt-apps
Wrap Qt applications
2019-07-05 14:38:10 -05:00
Thomas Tuegel 51d78034a1
wrapQtAppsHook: Remove ad hoc Qt wrappers 2019-07-05 10:42:08 -05:00
Florian Klink 1a205ad7fb gitlab-ce: remove substituteInPlace
This was removed in
23bcbf04c8
(since v11.6.0)
2019-07-05 00:44:10 +02:00
Florian Klink 80c35fb2a5 gitaly: 1.34.1 -> 1.34.3 2019-07-05 00:44:10 +02:00
Florian Klink 580be224c7 gitlab-ee: 11.10.5 -> 11.10.8 2019-07-05 00:44:10 +02:00
Florian Klink c57a9d7f9a gitlab-ce: 11.10.5 -> 11.10.8 2019-07-05 00:44:10 +02:00
Rok Garbas 65781e204d
Remove me (garbas) as maintainer since I don't have much time to maintain anything 2019-07-03 11:27:39 +02:00
R. RyanTM e8ee15f56e gitAndTools.diff-so-fancy: 1.2.5 -> 1.2.6
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/diff-so-fancy/versions
2019-07-03 09:30:31 +02:00
R. RyanTM 40a5daf5cb git-cola: 3.3 -> 3.4
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
2019-07-03 09:13:52 +02:00
Wael Nasreddine dc8740574c
pre-commit: 1.16.1 -> 1.17.0 (#64091) 2019-07-01 20:32:16 -07:00
Mario Rodas 76a9a0c246
gitAndTools.hub: 2.12.0 -> 2.12.1 2019-06-30 11:04:09 -05:00
José Luis Lafuente e295fd8137 git-recent: 1.1.0 -> 1.1.1 2019-06-30 13:37:58 +02:00
Jan Tojnar 07d1d3ed68
Merge branch 'master' into staging 2019-06-25 18:06:43 +02:00