Commit Graph

1100 Commits

Author SHA1 Message Date
Frederik Rietdijk
98640fd482 Merge master into staging-next 2019-08-27 16:36:47 +02:00
Markus Kowalewski
388d6de5bd
gitAndTools.qgit: 2.8 -> 2.9
* switch name -> pname
* qtApps compatibility: use Qt's mkDerivation
* cmake: remove enableParallelBuilding
2019-08-26 13:17:05 +02:00
Vladimír Čunát
985d1ac425
Merge branch 'master' into staging-next
There were several more conflicts from name -> pname+version;
all auto-solved by kdiff3, hopefully OK.

Hydra nixpkgs: ?compare=1538611
2019-08-25 14:57:11 +02:00
Ryan Trinkle
3bc52453a4 git-subrepo: init at 0.4.0 (#67217)
* git-subrepo: init at 0.4.0

* Apply suggestions from code review

Co-Authored-By: worldofpeace <worldofpeace@protonmail.ch>
2019-08-24 16:13:00 +02:00
Vladimír Čunát
2e6bf42a22
Merge branch 'master' into staging-next
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
2019-08-24 08:55:37 +02:00
Robin Gloster
f4fc845e5b
Merge remote-tracking branch 'upstream/master' into openssl-1.1 2019-08-21 14:25:13 +02:00
Robin Gloster
4e60b0efae
treewide: update globin's maintained drvs 2019-08-20 19:36:05 +02:00
Frederik Rietdijk
f65aa21bb2 Merge master into staging-next 2019-08-18 12:53:44 +02:00
volth
c814d72b51 treewide: name -> pname 2019-08-17 10:54:38 +00:00
Jonathan Ringer
2b2d8919e8 pythonPackage.pre-commit: move to python-modules
Add pkgs.gitAndTools.pre-commit alias
  Add pkgs.pre-commit alias
2019-08-17 12:29:39 +02:00
volth
46420bbaa3 treewide: name -> pname (easy cases) (#66585)
treewide replacement of

stdenv.mkDerivation rec {
  name = "*-${version}";
  version = "*";

to pname
2019-08-15 13:41:18 +01:00
Frederik Rietdijk
cff9e6429a Merge staging-next into staging 2019-08-14 13:46:33 +02:00
Tim Steinbach
ce1b77231a
git: 2.22.0 -> 2.22.1 2019-08-13 13:58:37 -04:00
Jonathan Ringer
4e19dfcb70 gitAndTools.topgit: 0.9 -> 0.19.12 2019-08-13 05:28:03 -07:00
zimbatm
a0a0106f59
pre-commit: 1.17.0 -> 1.18.1 2019-08-12 09:34:23 +02:00
Wout Mertens
f24e74d159
Merge pull request #53494 from kirelagin/git-instaweb
git, gitweb: Fix git-instaweb
2019-08-04 23:40:16 +02:00
Robin Gloster
30969073f0
Merge remote-tracking branch 'upstream/master' into openssl-1.1 2019-08-02 03:01:30 +02:00
Robin Gloster
cfa7177419
git-crypt: remove openssl 1.0.2 pinning 2019-07-30 13:51:17 +02:00
Frederik Rietdijk
92cb811455 git-cola: use qt5.wrapQtAppsHook 2019-07-30 13:16:18 +02:00
Andreas Rammhold
43ab7e184d
gitAndTools.git-dit: use openssl 1.0.2
There hasn't been a release in almost two years. Some (pinned)
dependency doesn't work with a newer openssl yet :/
2019-07-29 21:25:13 +02:00
Robin Gloster
a22429bf05
pin some packages to openssl 1.0.2 for now 2019-07-29 21:25:10 +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
Mario Rodas
f06e19a594
gitAndTools.hub: 2.12.2 -> 2.12.3 2019-07-19 21:01:55 -05: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
Mario Rodas
e07ac44a35
gitAndTools.git-absorb: 0.3.0 -> 0.4.0 2019-07-14 19:00:00 -05:00
xrelkd
7a40b2fe8c gitAndTools.hub: 2.12.1 -> 2.12.2 2019-07-12 14:38:14 +08: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
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
Frederik Rietdijk
72d647f3d8 Merge master into staging-next 2019-06-21 08:20:26 +02:00
Mario Rodas
233e75fc7b
Merge pull request #63254 from r-ryantm/auto-update/git-secret
git-secret: 0.2.5 -> 0.2.6
2019-06-20 06:03:32 -05:00
Franz Pletz
10812379fa libgit2: remove 0.26, default to 0.27 2019-06-18 11:16:48 +02:00
Mario Rodas
2870bf6ccd
gitAndTools.hub: 2.11.2 -> 2.12.0 2019-06-17 22:00:00 -05:00
R. RyanTM
591b08825b git-secret: 0.2.5 -> 0.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/git-secret/versions
2019-06-16 17:03:00 -07:00
Peter Simons
eeffb474bd
Merge pull request #56069 from delroth/git-diff-highlight
git: build diff-highlight if Perl support is enabled
2019-06-14 17:27:02 +02:00
Peter Simons
fcc8e700a2
Merge pull request #62848 from dtzWill/update/git-2.22.0
git: 2.21.0 -> 2.22.0
2019-06-14 17:25:26 +02:00
pacien
4965343da0 cgit: patch and wrap filters 2019-06-11 15:27:56 +02:00