3
0
Fork 0
forked from mirrors/nixpkgs
Commit graph

19 commits

Author SHA1 Message Date
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
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
Florian Klink 48da993627 gitaly: 1.47.0 -> 1.53.2 2019-08-14 14:52:16 +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
Ben Gamari 9f77b4a599 gitaly: Fix IFD import 2019-07-15 21:29:57 -04:00
Robin Gloster 6c98b0ff43
gitaly: add go mod deps 2019-07-16 01:17:38 +02: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
Florian Klink 80c35fb2a5 gitaly: 1.34.1 -> 1.34.3 2019-07-05 00:44:10 +02:00
Robin Gloster 2ec5786a4d
gitaly: fix build 2019-05-06 19:11:43 +02:00
Florian Klink 030bc8086b gitaly: 1.27.2 -> 1.34.1 2019-05-03 20:20:20 +02:00
Florian Klink cc785b3b9a gitaly: 1.27.1 -> 1.27.2 2019-05-01 14:49:16 +02:00
Ben Gamari 50a4de7326 nixos/gitlab: Install and fixup vendorised gitlab-shell
gitaly now ships its own vendorised version of gitlab-shell. Previously
we failed to install this, resulting in
https://gitlab.com/gitlab-org/gitlab-ce/issues/59403.
2019-03-29 11:53:07 -04:00
Florian Klink e558347243 gitaly: 1.27.0 -> 1.27.1 2019-03-26 20:59:46 +01:00
Ben Gamari d8c16f11a6 gitlab: 11.8.2 -> 11.9.0 2019-03-25 15:25:11 -04:00
Ben Gamari 0ba98bb64c gitlab: 11.7.5 -> 11.8.2 2019-03-25 15:25:06 -04:00
Jeff Slight 8c043d3c7b gitlab: 11.6.3 -> 11.7.4 2019-02-06 00:30:29 +01:00
Florian Klink 97e7cf75fa gitaly: 0.129.0 -> 1.7.1 2018-12-25 15:25:45 +01:00
Florian Klink 63f25471cb gitaly: 0.125.1 -> 0.129.0 2018-11-23 17:59:39 +01:00
Florian Klink cb79c1e60b gitaly: move to pkgs/applications/version-management/gitlab 2018-11-23 13:17:53 +01:00