JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
196,321 Commits 2 Branches 0 Tags 13 GiB
09ef6dc625
Commit Graph

2663 Commits

Author SHA1 Message Date
Frederik Rietdijk
ad1d58c622 Merge staging-next into staging 2019-08-31 10:04:20 +02:00
Frederik Rietdijk
fc74ba8291 Merge master into staging-next 2019-08-31 09:50:38 +02:00
Michael Weiss
3c6d4d7e06
gitRepo: 1.13.5 -> 1.13.5.1 2019-08-30 22:54:27 +02:00
Michael Weiss
a66012b3ec
gitRepo: 1.13.4 -> 1.13.5 2019-08-30 17:53:58 +02:00
volth
08f68313a4 treewide: remove redundant rec 2019-08-28 11:07:32 +00:00
Frederik Rietdijk
5061fe0c2c Merge staging-next into staging 2019-08-28 08:26:42 +02:00
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
Marek Mahut
d41b832ac2
Merge pull request #67442 from jlesquembre/blackbox 
blackbox: 1.20170611 -> 1.20181219
 2019-08-25 18:35:17 +02:00
José Luis Lafuente
25cae26c54
blackbox: 1.20170611 -> 1.20181219 2019-08-25 15:25:51 +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
worldofpeace
a980a2c3ca
Merge pull request #62708 from ktor/bcompare-4.2.10.23938 
bcompare: init at 4.2.10.23938
 2019-08-24 11:38:42 -04: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
Pawel Kruszewski
803108a1a6 bcompare: init at 4.2.10.23938 2019-08-23 19:01:32 +02:00
Robin Gloster
2cc05be907
treewide: openssl_1_1 pinning is unnecessary 2019-08-23 02:02:50 +02:00
Robin Gloster
c7e75df21f
Merge remote-tracking branch 'upstream/master' into openssl-1.1 2019-08-23 02:00:31 +02:00
kolaente
3ddb1a09fc
gitea: 1.9.1 -> 1.9.2 2019-08-22 19:38:21 +02:00
Evan Stoll
6d74533300 gitkraken: 6.1.3 -> 6.1.4 2019-08-21 13:00:22 -04:00
Robin Gloster
f4fc845e5b
Merge remote-tracking branch 'upstream/master' into openssl-1.1 2019-08-21 14:25:13 +02:00
Peter Simons
59d3b6ee82
Merge pull request #66773 from Izorkin/git 
git: 2.22.0 -> 2.23.0
 2019-08-21 09:15:30 +02:00
Robin Gloster
4e60b0efae
treewide: update globin's maintained drvs 2019-08-20 19:36:05 +02:00
markuskowa
7bc147a496
Merge pull request #66810 from evanjs/feature/gitkraken-6.1.3 
gitkraken: 6.1.1 -> 6.1.3
 2019-08-18 19:14:59 +02:00
Danylo Hlynskyi
a2ea2a1945
tortoisehg: untie from mercurial and update to 5.0.2 (#66173) 
* 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
 2019-08-18 18:28:03 +03:00
Florian Klink
36ece762e5
Merge pull request #66621 from flokli/gitlab-12.1.6 
gitlab-ce: 12.0.3 -> 12.1.6
 2019-08-18 14:08:14 +02:00
Frederik Rietdijk
f65aa21bb2 Merge master into staging-next 2019-08-18 12:53:44 +02:00
Izorkin
6da7a17ffb git: 2.22.1 -> 2.23.0 2019-08-18 09:19:42 +03:00
Evan Stoll
0be1f764fb gitkraken: add evanjs to maintainers 2019-08-17 22:04:47 -04:00
Evan Stoll
58b482987e gitkraken: remove gnome2 2019-08-17 22:04:47 -04:00
Evan Stoll
52f36c3db4 gitkraken: 6.1.1 -> 6.1.3 2019-08-17 21:30:42 -04:00
Marek Mahut
92571e8a55 nbstripout: moving buildInputs to checkInputs 
Fixes https://hydra.nixos.org/build/98602011
 2019-08-17 23:10:37 +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
Frederik Rietdijk
fe9a3e3e63 Merge staging-next into staging 2019-08-17 09:39:23 +02:00
Jonathan Ringer
099b79d443 smartgithg: 18.2.9 -> 19.1.1 2019-08-16 10:26:05 -07: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
kolaente
e137c91526
gitea: 1.9.0 -> 1.9.1 2019-08-14 19:38:59 +02:00
Florian Klink
48da993627 gitaly: 1.47.0 -> 1.53.2 2019-08-14 14:52:16 +02:00
Florian Klink
362076c581 gitlab-ee: 12.0.3 -> 12.1.6 2019-08-14 14:51:59 +02:00
Florian Klink
8ce1c4c26a gitlab-ce: 12.0.3 -> 12.1.6 2019-08-14 14:51:00 +02:00
Florian Klink
765491c895 gitlab: remove gitlab-deb-data.tar after extracting from it 
There's no reason to ship a 1.6GiB .tar file in the output.
Slims down that output from 1.9GiB to ~350MiB
 2019-08-14 14:45:08 +02: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
Edmund Wu
a2ca6ef26f
sourcehut: init 
builds-sr-ht: init at 0.45.13
dispatch-sr-ht: init at 0.11.0
git-sr-ht: init at 0.32.3
hg-sr-ht: init at 0.13.0
lists-sr-ht: init at 0.36.3
man-sr-ht: init at 0.12.4
meta-sr-ht: init at 0.34.3
paste-sr-ht: init at 0.5.1
todo-sr-ht: init at 0.46.8
 2019-08-13 11:25:52 -04:00
Jonathan Ringer
4e19dfcb70 gitAndTools.topgit: 0.9 -> 0.19.12 2019-08-13 05:28:03 -07:00
Aaron Andersen
8746c77a38
Merge pull request #66439 from aanderse/subversion 
subversion: 1.9.10 -> 1.9.12, 1.10.4 -> 1.10.6
 2019-08-12 20:53:59 -04:00
zimbatm
a0a0106f59
pre-commit: 1.17.0 -> 1.18.1 2019-08-12 09:34:23 +02:00
Aaron Andersen
ccf0499170 subversion: 1.9.10 -> 1.9.12, 1.10.4 -> 1.10.6 2019-08-10 09:23:48 -04:00
Aaron Andersen
9267328b09
Merge pull request #66169 from r-ryantm/auto-update/subversion-client 
subversionClient: 1.12.0 -> 1.12.2
 2019-08-10 09:09:38 -04:00
Ryan Mulligan
07ce48cc3a
Merge pull request #65924 from r-ryantm/auto-update/gitkraken 
gitkraken: 6.0.0 -> 6.0.1
 2019-08-09 18:10:52 -07:00
Marek Mahut
78dd0174e5 gitkraken: 6.0.1 -> 6.1.1 2019-08-09 23:51:51 +02:00
Marek Mahut
f688a3ea38 gitkraken: adding e2fsprogs and krb5 as inputs 2019-08-09 23:37:11 +02:00
Marek Mahut
d56106a8ff
Merge pull request #66164 from r-ryantm/auto-update/tortoisehg 
tortoisehg: 4.9.1 -> 5.0.2
 2019-08-06 20:57:26 +02:00
R. RyanTM
affde0f5a9 subversionClient: 1.12.0 -> 1.12.2 
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/subversion-client/versions
 2019-08-05 23:51:12 -07:00
R. RyanTM
624b316c20 tortoisehg: 4.9.1 -> 5.0.2 
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/tortoisehg/versions
 2019-08-05 22:42:11 -07: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
R. RyanTM
8123b2d11e gitkraken: 6.0.0 -> 6.0.1 
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/gitkraken/versions
 2019-08-04 03:15:36 -07:00
Meghea Iulian
c089c155df smartgithg: 18.2.4 -> 18.2.9 
Refactored packages:
  * adds makeDesktopItem and remove install_freedesktop_items
  * replaced buildCommand with preFixup & installPhase
  * replaces makeWrapper with wrapGAppsHook
 2019-08-03 20:12:11 +03:00
Robin Gloster
30969073f0
Merge remote-tracking branch 'upstream/master' into openssl-1.1 2019-08-02 03:01:30 +02:00
Frederik Rietdijk
55e4555b77 Merge master into staging-next 2019-08-01 09:42:54 +02:00
Elis Hirwing
b5294a27c6
Merge pull request #65700 from nyanloutre/gitea_update_1_9_0 
gitea: 1.8.3 -> 1.9.0
 2019-08-01 08:03:22 +02:00
nyanloutre
1a784390d2
gitea: 1.8.3 -> 1.9.0 2019-08-01 00:40:49 +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
Robin Gloster
ab82403038
Merge pull request #65468 from flokli/gitaly-fix-hashes 
gitaly: fix hashes
 2019-07-29 12:43:39 +00:00
Frederik Rietdijk
cca5ee9c07 Merge staging-next into staging 2019-07-28 09:10:03 +02:00
Michael Weiss
b515a14c8f
gitRepo: 1.13.3 -> 1.13.4 2019-07-27 22:11:21 +02:00
Florian Klink
89aae903da gitaly: fix hashes 
It seems the sha256 hashes of 3 gitaly dependencies were wrong or
changed.
 2019-07-27 14:29:29 +02:00
worldofpeace
b1bc0645ea gdk-pixbuf: rename from gdk_pixbuf 2019-07-22 18:50:57 -04: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