JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
193,314 Commits 1 Branch 0 Tags 12 GiB
139806d89d
Commit Graph

2631 Commits

Author SHA1 Message Date
Aaron Andersen
7e5098a4eb
Merge pull request #68619 from evanjs/feature/gitkraken-6.2.0 
gitkraken: 6.1.4 -> 6.2.0
 2019-09-15 09:39:12 -04:00
Miguel Madrid Mencía
148c82e07e
maintainer: mimadrid: update github username and personal data 2019-09-14 12:15:46 +02:00
Evan Stoll
62195d4609 gitkraken: 6.1.4 -> 6.2.0 2019-09-12 17:39:50 -04:00
Roman Volosatovs
ddbf8bd82e
ghq: Migrate to buildGoModule, ensure go 1.13 compatibility 2019-09-09 20:32:38 +02:00
Frederik Rietdijk
0107ee8c32
Merge pull request #68339 from NixOS/staging-next 
Staging next with systemd 243
 2019-09-09 10:02:20 +02:00
Frederik Rietdijk
a96ef6cca5 git-cola: fix wrapping 2019-09-09 09:45:24 +02:00
Frederik Rietdijk
e3f25191c4 Merge staging-next into staging 2019-09-09 08:11:34 +02:00
volth
7b8fb5c06c treewide: remove redundant quotes 2019-09-08 23:38:31 +00:00
Marek Mahut
462cdb9aac
Merge pull request #68255 from jluttine/nbstripout-0.3.6 
nbstripout: 0.3.1 -> 0.3.6
 2019-09-08 22:38:13 +02:00
Elis Hirwing
8b71bb0ad4
gitea: 1.9.2 -> 1.9.3 
Changelog: https://github.com/go-gitea/gitea/releases/tag/v1.9.3
 2019-09-07 22:25:14 +02:00
Doron Behar
1ce20f23e7 gitAndTools.hub: 2.12.3 -> 2.12.4 2019-09-07 18:37:29 +00:00
Jaakko Luttinen
8b51ee3667
nbstripout: 0.3.1 -> 0.3.6 2019-09-07 14:43:43 +03:00
Milan Pässler
1d6c542b22 gerrit: 2.14.6 -> 3.0.2 2019-09-06 22:01:22 +00:00
Vladimír Čunát
4aad2947f8
Merge branch 'master' into staging-next 2019-09-04 11:00:56 +02:00
worldofpeace
59e68d3b74 treewide: don't use single quotes with placeholder 2019-09-03 13:01:42 -04:00
Vladimír Čunát
f21211ebfe
Merge branch 'master' into staging 2019-09-02 23:25:24 +02:00
Yann Hodique
a93a14e31c ghq: 0.10.2 -> 0.12.6 2019-08-31 17:59:29 -07:00
volth
7bb6b373ab treewide: name -> pname (#67513) 2019-08-31 07:41:22 -04:00
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