JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
206,317 Commits 2 Branches 0 Tags 13 GiB
25fb2b68a9
Commit Graph

2838 Commits

Author SHA1 Message Date
Edmund Wu
09570b1b0c todosrht: 0.51.11 -> 0.51.13 2019-11-04 01:46:59 -08:00
Edmund Wu
0d487aef71 pastesrht: 0.7.1 -> 0.7.3 2019-11-04 01:46:59 -08:00
Edmund Wu
eb9b2ac6a0 metasrht: 0.35.3 -> 0.37.0 2019-11-04 01:46:59 -08:00
Edmund Wu
2269781690 hgsrht: 0.16.0 -> 0.16.2 2019-11-04 01:46:59 -08:00
Edmund Wu
7967cb05ad gitsrht: 0.34.2 -> 0.35.6 2019-11-04 01:46:59 -08:00
Edmund Wu
257f5d6303 dispatchsrht: 0.11.1 -> 0.12.3 2019-11-04 01:46:59 -08:00
Edmund Wu
9bc8540d86 buildsrht: 0.47.9 -> 0.48.0 2019-11-04 01:46:59 -08:00
Edmund Wu
21529a91d9 srht: 0.54.3 -> 0.54.4 2019-11-04 01:46:59 -08:00
Alyssa Ross
4b63c915af
git: drop extraneous sysconfdir trailing slash 
I noticed while strace-ing that Git was trying to open
/etc//gitconfig.  Not a big deal, but it is definitely more correct
without the trailing slash.
 2019-11-03 21:26:56 +00:00
R. RyanTM
99f221538b gitAndTools.stgit: 0.20 -> 0.21 2019-11-03 10:04:16 +01:00
Maximilian Bosch
945a52c90d
Merge pull request #72382 from kolaente/update/gitea-1.9.5 
gitea: 1.9.4 -> 1.9.5
 2019-11-01 11:33:59 +01:00
kolaente
67d0e44dc7
gitea: 1.9.4 -> 1.9.5 2019-10-31 20:33:22 +01:00
talyz
2e8417b52a gitlab: 12.4.0 -> 12.4.1 2019-10-31 18:55:08 +01:00
Vincent Laporte
7e51c79f17 monotoneViz: refactor out of ocamlPackages 2019-10-30 18:05:20 +00:00
worldofpeace
9121c914fc
Merge pull request #54530 from MatrixAI/dvc 
dvc: init at 0.24.3
 2019-10-29 01:14:50 +00:00
talyz
5081a6cd56 gitlab: 12.3.5 -> 12.4.0 
- gitlab-shell no longer requires ruby for anything else than the
  install script, so the bundlerEnv stuff could be dropped

- gitlab-shell and gitlab-workhorse now report their versions
  correctly
 2019-10-28 14:56:37 +01:00
Pawel Kruszewski
7d43ee015a bcompare: 4.3.0.24364 -> 4.3.1.24438 2019-10-28 08:22:46 +01:00
Roger Qiu
3c3ac19c43
dvc: init at 0.24.3 2019-10-28 13:07:58 +11:00
Aaron Andersen
9ec808ae62 redmine: 4.0.4 -> 4.0.5 2019-10-26 10:40:31 -04:00
Aaron Andersen
50e5139893 redmine: drop 3.4.x package 2019-10-26 10:40:16 -04:00
Mario Rodas
9e5a30b43e git-backup: init at 0.2.0 2019-10-24 18:50:34 -07:00
Mario Rodas
04cbe1b85b gitAndTools.delta: 0.0.12 -> 0.0.14 2019-10-24 10:14:39 +02:00
Dmitry Kalinkin
e98a2d752c
Merge pull request #71483 from eadwu/sourcehut/update-2 
sourcehut: update 2
 2019-10-23 17:39:18 -04:00
Michael Weiss
597881a9e1
gitRepo: 1.13.7 -> 1.13.7.1 2019-10-22 21:23:49 +02:00
R. RyanTM
2202b9f774 git-secret: 0.3.1 -> 0.3.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/git-secret/versions
 2019-10-21 19:19:07 -07:00
Florian Klink
1125fb02cc
Merge pull request #71428 from talyz/gitlab-already-initialized-constant 
gitlab: Get rid of most 'already initialized constant'-warnings
 2019-10-21 20:52:54 +02:00
Edmund Wu
ec6740ab8d
scmsrht: 0.14.2 -> 0.15.3 2019-10-20 21:51:06 -04:00
Edmund Wu
e481e10632
pastesrht: 0.5.2 -> 0.7.1 2019-10-20 21:50:54 -04:00
Edmund Wu
cc64ae180f
metasrht: 0.35.2 -> 0.35.3 2019-10-20 21:50:49 -04:00
Edmund Wu
ea1d0ce7ff
listssrht: 0.38.1 -> 0.38.3 2019-10-20 21:50:35 -04:00
Edmund Wu
815a204aa1
hgsrht: 0.15.2 -> 0.16.0 2019-10-20 21:50:21 -04:00
Edmund Wu
d1f0cbd4fe
gitsrht: 0.33.1 -> 0.34.2 2019-10-20 21:50:16 -04:00
Edmund Wu
690ffc9761
buildsrht: 0.47.8 -> 0.47.9 2019-10-20 21:49:55 -04:00
Edmund Wu
7ebc8ded84
srht: 0.54.2 -> 0.54.3 2019-10-20 21:49:40 -04:00
talyz
ed4a09c6f3 gitlab: Get rid of most 'already initialized constant'-warnings 
On start, unicorn, sidekiq and other parts running ruby code emits
quite a few warnings similar to

/var/gitlab/state/config/application.rb:202: warning: already initialized constant Gitlab::Application::LOOSE_EE_APP_ASSETS
/nix/store/ysb0lgbzxp7a9y4yl8d4f9wrrzy9kafc-gitlab-ee-12.3.5/share/gitlab/config/application.rb:202: warning: previous definition of LOOSE_EE_APP_ASSETS was here
/var/gitlab/state/lib/gitlab.rb:38: warning: already initialized constant Gitlab::COM_URL
/nix/store/ysb0lgbzxp7a9y4yl8d4f9wrrzy9kafc-gitlab-ee-12.3.5/share/gitlab/lib/gitlab.rb:38: warning: previous definition of COM_URL was here

This seems to be caused by the same ruby files being evaluated
multiple times due to the paths being different - sometimes they're
loaded using the direct path and sometimes through a symlink, due to
our split between config and package data. To fix this, we make sure
that the offending files in the state directory always reference the
store path, regardless of that being the real file or a symlink.
 2019-10-19 19:30:28 +02:00
Evan Stoll
9deca47b33 gitkraken: 6.2.1 -> 6.3.0 (#71294) 
* gitkraken: 6.2.1 -> 6.3.0

* gitkraken: run preInstall and postInstall hooks during installPhase

* gitkraken: move dpkg to nativeBuildInputs
 2019-10-18 18:26:12 +02:00
Nathan Yong
1ced63da76 p4v: explicitly depend on openssl 1.0 series 
The 2017.3 version of p4v is linked against `libssl.so.1.0.0`.  Since
the default openssl in NixOS 2019.09 has been changed to openssl 1.1,
the p4v package must now import the openssl_1_0_2 derivation.
 2019-10-18 09:26:28 +11:00
Frank Doepper
bf12dc1ce7 git-annex-utils: init at 0.04-3-g531bb33 2019-10-15 14:41:24 +02:00
Marco Maggesi
24d0bd37b5
Merge branch 'master' into rename-z77z-into-maggesi 2019-10-13 18:06:23 +02:00
Vladimír Čunát
b5697c6954
Merge branch 'master' into staging-next 
Hydra nixpkgs: ?compare=1548439
 2019-10-13 13:31:33 +02:00
Gürkan Gür
e810171ef6 gitAndTools.gita: 0.9.2 -> 0.9.9 2019-10-12 14:47:43 +02:00
Jan Tojnar
6c8aed6391
Merge branch 'master' into staging-next 2019-10-12 00:50:21 +02:00
Renaud
05ab1cc756
Merge pull request #70950 from ktor/bcompare-4.3.0.24364 
bcompare: 4.2.10.23938 -> 4.3.0.24364
 2019-10-11 23:46:58 +02:00
Marek Mahut
ccc06a7e01
Merge pull request #70798 from r-ryantm/auto-update/subgit 
gitAndTools.subgit: 3.3.7 -> 3.3.8
 2019-10-11 22:08:47 +02:00
Pawel Kruszewski
eaa72aa453 bcompare: 4.2.10.23938 -> 4.3.0.24364 2019-10-11 06:14:23 +02:00
Mario Rodas
79ec4bb3d3
Merge pull request #70791 from r-ryantm/auto-update/stgit 
gitAndTools.stgit: 0.19 -> 0.20
 2019-10-09 21:37:09 -05:00
Dmitry Kalinkin
a7b3728c64
Merge pull request #70255 from eadwu/sourcehut/update-1 
sourcehut.*: 2019.10.02
 2019-10-09 12:50:58 -04:00
Michael Weiss
bd16602cb9
gitRepo: 1.13.6 -> 1.13.7 2019-10-09 18:02:22 +02:00
Elis Hirwing
79852ae24a
Merge pull request #70777 from kolaente/update/gitea-1.9.4 
gitea: 1.9.3 -> 1.9.4
 2019-10-09 09:34:45 +02:00
Robin Gloster
eadeca9ea7
Merge pull request #70216 from talyz/gitlab_12_3_2 
gitlab: 12.1.6 -> 12.3.5, bundler: 1.17.2 -> 1.17.3
 2019-10-09 00:27:04 +02:00
R. RyanTM
17ceba2174 gitAndTools.subgit: 3.3.7 -> 3.3.8 
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-10-08 15:07:19 -07:00
R. RyanTM
ff81cf1186 gitAndTools.stgit: 0.19 -> 0.20 
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/stgit/versions
 2019-10-08 14:26:42 -07:00
kolaente
7c087faeb8
gitea: 1.9.3 -> 1.9.4 2019-10-08 21:11:07 +02:00
talyz
c115d4df88 gitlab: Add myself to list of maintainers 2019-10-08 16:37:01 +02:00
talyz
9be76d0b6a gitlab: 12.3.4 -> 12.3.5 2019-10-08 16:35:50 +02:00
talyz
afa3abf632 gitlab: Refactor for new repo structure 
GitLab recently restructured their repos; whereas previously they had
one gitlab-ce and one gitlab-ee repo, they're now one and the
same. All proprietary components are put into the ee subdirectory -
removing it gives us the foss / community version of GitLab. For more
info, see
https://about.gitlab.com/2019/02/21/merging-ce-and-ee-codebases/

This gives us the opportunity to simplify things quite a bit, since we
don't have to keep track of two separate versions of either the base
data or rubyEnv.
 2019-10-08 15:52:11 +02:00
Frederik Rietdijk
a0c34f54cc Merge master into staging-next 2019-10-08 11:56:52 +02:00
talyz
59324d1fb9 gitlab: Build frontend assets from source 
Instead of extracting prebuilt assets from the debian build, build
them from the source. This should give faster package updates and
reduces the amount of data needed to be downloaded by more than 500MB.
 2019-10-08 11:24:06 +02:00
R. RyanTM
e18f8b6909 gitAndTools.git-remote-hg: 1.0.0 -> 1.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/git-remote-hg/versions
 2019-10-07 10:47:53 -07:00
R. RyanTM
55023876bd fossil: 2.9 -> 2.10 
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-10-07 10:23:52 -07:00
Marco Maggesi
ff1ed720e2 Rename z77z into maggesi 
Make the "handle" of the maintainer match the name of the github account.
Also update the email address.
 2019-10-07 17:05:25 +02:00
Renaud
61d745e571
Merge pull request #69959 from r-ryantm/auto-update/src 
src: 1.26 -> 1.27
 2019-10-06 16:45:44 +02:00
Edmund Wu
55d5a90182
sourcehut.srht: unmark as broken 2019-10-06 08:48:40 -04:00
Edmund Wu
c4ce930c23
sourcehut.*: fix setuptools validation 2019-10-06 08:48:32 -04:00
Mario Rodas
7f1d646b80
gitAndTools.hub: 2.12.7 -> 2.12.8 
Changelog: https://github.com/github/hub/releases/tag/v2.12.8
 2019-10-06 04:20:00 -05:00
Christine Koppelt
ee06d27cf2 treewide: add some missing meta: descriptions and homepages (#70497) 2019-10-06 00:59:26 -04:00
Edmund Wu
2c16a2498c
scmsrht: 0.13.3 -> 0.14.2 2019-10-05 10:45:49 -04:00
Edmund Wu
748f4b1a78
todosrht: 0.46.8 -> 0.51.11 2019-10-05 10:45:44 -04:00
Edmund Wu
21e541520f
pastesrht: 0.5.1 -> 0.5.2 2019-10-05 10:45:34 -04:00
Edmund Wu
5fe13e341b
metasrht: 0.34.3 -> 0.35.2 2019-10-05 10:45:30 -04:00
Edmund Wu
bf7cce0418
mansrht: 0.12.4 -> 0.13.5 2019-10-05 10:45:24 -04:00
Edmund Wu
f71bf95ffb
listssrht: 0.36.3 -> 0.38.1 2019-10-05 10:45:15 -04:00
Edmund Wu
9fecb93740
hgsrht: 0.13.0 -> 0.15.2 2019-10-05 10:45:02 -04:00
Edmund Wu
3c842a91a0
gitsrht: 0.32.3 -> 0.33.1 2019-10-05 10:44:52 -04:00
Edmund Wu
facecca784
dispatchsrht: 0.11.0 -> 0.11.1 2019-10-05 10:44:46 -04:00
Edmund Wu
c503f76409
buildsrht: 0.45.13 -> 0.47.8 2019-10-05 10:44:43 -04:00
Edmund Wu
093ea80e98
srht: 0.52.13 -> 0.54.2 2019-10-05 10:44:28 -04:00
Linus Heckemann
141b7210cb
Merge pull request #70256 from Ma27/drop-nodejs-11_x 
nodejs-11_x: remove
 2019-10-04 18:14:15 +02:00
talyz
09e657efea gitlab-shell: Split patch into ruby and go parts 
Split the remove-hardcoded-locations patch into two separate patches,
one for the ruby package and one for the go package. This is clearer
and results in fewer rebuilds.
 2019-10-04 18:06:23 +02:00
talyz
f3eb063ecf gitlab: 12.1.6 -> 12.3.4 
- Update GitLab to 12.3.4

- Update update.py to cope with the new upstream repository structure

- Refactor gitlab-shell to use buildGoPackage and bundlerEnv for
  dependencies

- Refactor gitlab-workhorse to use buildGoPackage for dependencies

- Make update.py able to update gitlab-shell and gitlab-workhorse
  dependencies

- Various fixes necessary for update to work
 2019-10-04 18:03:05 +02:00
Mario Rodas
011c984b45
gitAndTools.delta: init at 0.0.12 2019-10-04 04:20:00 -05:00
Maximilian Bosch
594378ceea
sourcehut: mark as broken 
There were several custom python dependencies broken. I decided to
modify the `sourcehut` expression as it wouldn't even evaluate without
nodejs-11_x I didn't manage to get it building.
 2019-10-03 14:33:34 +02:00
Maximilian Bosch
334641d112
nodejs-11_x: remove 
Package is EOLed by upstream: https://github.com/nodejs/Release

Fixes #69008
 2019-10-03 14:33:34 +02:00
Dmitry Kalinkin
c83db0cc53
sourcehut: use recurseIntoAttrs 2019-10-02 23:40:47 -04:00
Jan Tojnar
b3fcd9375d
Merge branch 'master' into staging-next 2019-10-03 01:47:08 +02:00
Jonathan Ringer
fe24628a26 git-up: 1.4.2 -> 1.6.1 2019-10-03 00:19:33 +02:00
Evan Stoll
cdc963c5f3 gitkraken: 6.2.0 -> 6.2.1 2019-10-02 22:55:04 +02:00
Frederik Rietdijk
503081fa5b Merge staging into staging-next 2019-09-29 11:05:22 +02:00
R. RyanTM
7f33507e85 src: 1.26 -> 1.27 
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/src/versions
 2019-09-28 20:46:00 -07:00
Mario Rodas
be7bc49504
gitAndTools.hub: 2.12.4 -> 2.12.7 2019-09-28 04:20:00 -05:00
Maximilian Bosch
b7dbf33f5d
Merge pull request #69578 from r-ryantm/auto-update/git-secret 
git-secret: 0.2.6 -> 0.3.1
 2019-09-26 23:42:55 +02:00
R. RyanTM
db7433dd77 git-secret: 0.2.6 -> 0.3.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/git-secret/versions
 2019-09-26 12:34:59 -07:00
Maximilian Bosch
460e603852
git-cola: build application with python3 by default 2019-09-26 20:37:03 +02:00
Maximilian Bosch
7c54149a25
Merge pull request #69564 from r-ryantm/auto-update/git-cola 
git-cola: 3.4 -> 3.5
 2019-09-26 20:32:06 +02:00
R. RyanTM
305d811a2d git-cola: 3.4 -> 3.5 
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-09-26 11:03:21 -07:00
R. RyanTM
ea356329ca gitAndTools.diff-so-fancy: 1.2.6 -> 1.2.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/diff-so-fancy/versions
 2019-09-26 06:59:00 -07:00
Vladimír Čunát
192fb9d11b
Merge branch 'staging-next' into staging 2019-09-24 08:15:01 +02:00
Orivej Desh
dc4224bc54 Merge branch 'master' into staging 
* master: (36 commits)
  libipt: set platforms to unix
  licenses: refer to curl using spdx
  qhull: specify spdx license
  ocamlPackages.spacetime_lib: 0.1.0 -> 0.3.0
  ocamlPackages.owee: 0.2 -> 0.3
  nixFlakes: 2.4pre20190913_a25c022 -> 2.4pre20190922_382aa05
  daemon: init at 0.6.4
  k9s: 0.7.13 -> 0.8.4
  cask: Use generated src/version from Melpa
  python.pkgs.flask_oauthlib: remove
  radeon-profile: 20170714 -> 20190903
  radeon-profile: use Qt mkDerivation
  afew: propagate setuptools
  pythonPackages.flask-jwt-extended: 3.17.0 -> 3.23.0
  mutt: 1.12.1 -> 1.12.2
  unit: 1.10.0 -> 1.11.0
  emacsPackages: Update elpa
  emacsPackages: Update melpa
  cask: Fix cask usage
  git-lfs: use buildGoPackage
  ...
 2019-09-22 21:33:00 +00:00
Eric Ren
696b36f928 lefthook: init at 0.6.3 (#69233) 
lefthook: init at 0.6.3
 2019-09-22 16:18:08 -05:00
Mario Rodas
9e968db302 git-lfs: use buildGoPackage 2019-09-21 04:34:00 -05:00
worldofpeace
b0c2aea20b
treewide: drop adding hicolor-icon-theme where possible 
This was either for the setup-hook to remove caches or added
even though the respective icon theme propagated it.
 2019-09-18 22:47:26 +02:00
Jan Tojnar
f5ef80b46d
Merge branch 'staging-next' into staging 2019-09-18 21:16:01 +02:00
Matthew Bauer
0c1cef2f11
Merge pull request #68366 from sorbits/git-bash-completion 
Install git’s bash completion so that it is loaded on demand
 2019-09-18 09:40:52 -04:00
Michael Weiss
1c8ed8fd7e
gitRepo: 1.13.5.1 -> 1.13.6 2019-09-17 21:28:29 +02:00
worldofpeace
2fe6173cc6
Merge pull request #68455 from rvolosatovs/update/git-lfs 
git-lfs: 2.7.2 -> 2.8.0, ensure go 1.13 compatibility
 2019-09-17 13:26:38 -04:00
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
9630cb4b8d
git-lfs: 2.7.2 -> 2.8.0, ensure go 1.13 compatibility 2019-09-10 22:55:30 +02:00
Roman Volosatovs
ddbf8bd82e
ghq: Migrate to buildGoModule, ensure go 1.13 compatibility 2019-09-09 20:32:38 +02:00
Allan Odgaard
dc45fc4ca2 Install git’s bash completion so that it is loaded on demand 
Putting the file in $out/share/bash-completion/completions means that it will be loaded on demand by nixpkgs.bash-completion.

With the old location, the user would either have to explicitly source the file during bash startup, or set BASH_COMPLETION_COMPAT_DIR before sourcing bash_completion.sh, which will eagerly load everything in that directory.
 2019-09-09 19:16:29 +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