Commit graph

18 commits

Author SHA1 Message Date
Florian Klink
8222b40d66 chore(third_party/josh): bump to latest HEAD
It seems our currently pinned josh commit doesn't seem to support
pushing back, and just timeouts when trying to do so.

Bump to the latest head, let's see how it works out there.

We don't need to pull a more recent rustc, as the nixpkgs rustc seems to
be recent enough.

Change-Id: I4f6d775df4db13a4537049292edfe969d2bb45ea
Reviewed-on: https://cl.tvl.fyi/c/depot/+/9590
Reviewed-by: tazjin <tazjin@tvl.su>
Tested-by: BuildkiteCI
Autosubmit: flokli <flokli@flokli.de>
2023-10-09 14:42:25 +00:00
Vincent Ambo
e487030d7a fix(3p/josh): add package name to josh
Without this, the derivation is just called `rust-workspace-unknown`
which is - at best - a little confusing.

Change-Id: I3f50f87a411248ffcce9397a4ddb57e87abeab1c
Reviewed-on: https://cl.tvl.fyi/c/depot/+/8923
Reviewed-by: sterni <sternenseemann@systemli.org>
Autosubmit: tazjin <tazjin@tvl.su>
Tested-by: BuildkiteCI
2023-07-10 08:30:09 +00:00
Vincent Ambo
26a8b38a3c chore(3p/josh): enable debug information in builds
Change-Id: I09e980e871bec32397755fb0cafeaa61701f47a7
Reviewed-on: https://cl.tvl.fyi/c/depot/+/8916
Tested-by: BuildkiteCI
Reviewed-by: sterni <sternenseemann@systemli.org>
2023-07-02 16:38:10 +00:00
Vincent Ambo
3a2035c8b9 fix(3p/josh): build with Rust 1.69.0 exactly
As a workaround for b/283, we are downgrading the version of Rust used
to build josh as a strange issue causing invalid memory allocation
requests occurs with Rust 1.70.0

Change-Id: I94476077eb4a8cebb82f55c20397c299ff57c0a4
Reviewed-on: https://cl.tvl.fyi/c/depot/+/8917
Reviewed-by: sterni <sternenseemann@systemli.org>
Tested-by: BuildkiteCI
Autosubmit: tazjin <tazjin@tvl.su>
2023-07-02 16:38:10 +00:00
Vincent Ambo
6959a1248f chore(3p/josh): bump to latest master commit
Change-Id: Iebddca35f0a870799c8a19ae019cecd9803a3e9c
Reviewed-on: https://cl.tvl.fyi/c/depot/+/8907
Tested-by: BuildkiteCI
Reviewed-by: sterni <sternenseemann@systemli.org>
Autosubmit: tazjin <tazjin@tvl.su>
2023-06-30 20:53:30 +00:00
sterni
deccd8d39e chore(3p/sources): Bump channels & overlays
* //users/wpcarro/avaSystem: disable hidpi

  Recent changes have made nixpkgs adopt the position that hidpi
  optimization can't be done generically and at the very least needs to
  know a specific DPI number to optimize for. In addition to knowledge
  of the display(s) in question (i.e. wpcarro needs to do this) the
  issue <https://github.com/NixOS/nixpkgs/issues/222805> can give
  guidance as to how to restore the desired hidpi look and feel.

Change-Id: Ia4b079a06dcb710050619f350cd0655216b4a42f
Reviewed-on: https://cl.tvl.fyi/c/depot/+/8345
Autosubmit: sterni <sternenseemann@systemli.org>
Reviewed-by: wpcarro <wpcarro@gmail.com>
Reviewed-by: tazjin <tazjin@tvl.su>
Tested-by: BuildkiteCI
2023-03-27 14:32:31 +00:00
Vincent Ambo
89d9ce39b4 chore(3p/josh): update josh to recent master commit
It's been a long time since we updated josh, almost 400 commits in
between. I read through the entire changelog, and here are relevant
josh commits from in between that might be interesting to us:

  38eecee Fix optimisation bug for compose filter (#1159)
  e1d10b6 Add :rev(...) filter
  0f1a07b Initial implementation of refs locking (#929)
  88cea2a Initial work on meta repo support
  030ad93 Change magic refs to include "for"
  28b1d75 Add split changes feature (#904)
  1f908d7 Discover filters only on HEAD (#774)
  a368d8f Make --require-auth only apply to push
  8d80230 Add :linear filter (#741)
  3460ec2 Implement redundant refs filtering (#700)
  55b4e50 Implement stacked changes support (#699)
  ea1f814 Handle @sha urls by creating magic ref (#690)
  883a381 Run filter discovery only on changed refs (#685)
  4bb004f Prepend refs/heads to base parameter as default (#664)

Of particular interest is a368d8f, which allows us to drop our
authentication patch and use the standard --require-auth flag again.

The default behaviour of dropping signatures on commits (which are
invalid after filtering) has also been changed in josh, now only
occuring when the `:unsign` filter is present. Since this breaks
commit hashes with our existing exported histories, we are opting to
set a `:unsign` filter prefix on all proxy requests to ensure that the
hashes stay consistent.

During this update we found a bug (josh#1155) which was fixed in the
commit that this CL moves josh to.

Change-Id: I3afac1619f3aa90313a0441da91f0e4a96fe0a3b
Reviewed-on: https://cl.tvl.fyi/c/depot/+/8186
Autosubmit: tazjin <tazjin@tvl.su>
Reviewed-by: flokli <flokli@flokli.de>
Tested-by: BuildkiteCI
2023-03-07 16:46:54 +00:00
sterni
0c178a0ef6 chore(3p/sources): Bump channels & overlays
Upstream nixpkgs removed a lot of aliases this time, so we needed to do
the following transformations. It's a real shame that aliases only
really become discoverable easily when they are removed.

* runCommandNoCC -> runCommand
* gmailieer -> lieer
  We also need to work around the fact that home-manager hasn't catched
  on to this rename.
* mysql -> mariadb
* pkgconfig -> pkg-config
  This also affects our Nix fork which needs to be bumped.
* prometheus_client -> prometheus-client
* rxvt_unicode -> rxvt-unicode-unwrapped
* nix-review -> nixpkgs-review
* oauth2_proxy -> oauth2-proxy

Additionally, some Go-related builders decided to drop support for
passing the sha256 hash in directly, so we need to use the generic hash
arguments.

Change-Id: I84aaa225ef18962937f8616a9ff064822f0d5dc3
Reviewed-on: https://cl.tvl.fyi/c/depot/+/6792
Autosubmit: sterni <sternenseemann@systemli.org>
Tested-by: BuildkiteCI
Reviewed-by: grfn <grfn@gws.fyi>
Reviewed-by: flokli <flokli@flokli.de>
Reviewed-by: tazjin <tazjin@tvl.su>
Reviewed-by: wpcarro <wpcarro@gmail.com>
2022-09-28 08:02:31 +00:00
Vincent Ambo
a438f81964 fix(3p/josh): Add git to josh-proxy PATH
josh-proxy calls git at runtime and needs to have it available

Change-Id: Ifccc6879cc5911060c7e6681c202fe5e8c2f5440
Reviewed-on: https://cl.tvl.fyi/c/depot/+/5269
Tested-by: BuildkiteCI
Autosubmit: tazjin <tazjin@tvl.su>
Reviewed-by: sterni <sternenseemann@systemli.org>
Reviewed-by: wpcarro <wpcarro@gmail.com>
Reviewed-by: grfn <grfn@gws.fyi>
2022-02-18 08:24:59 +00:00
Vincent Ambo
813e0c0747 fix(3p/josh): Require HTTP authentication when pushing back
With this change it becomes possible to push back to code.tvl.fyi
through josh views.

We probably want to change this patch so that it can be upstreamed,
but for now I just want to get this to work.

Change-Id: I7cdacf384e38da6ba9621e5818cfaf7c5d5c99a2
Reviewed-on: https://cl.tvl.fyi/c/depot/+/5273
Tested-by: BuildkiteCI
Reviewed-by: sterni <sternenseemann@systemli.org>
Autosubmit: tazjin <tazjin@tvl.su>
2022-02-13 17:39:28 +00:00
Vincent Ambo
9d0e7a9ff0 chore(3p/josh): Update to latest master
Change-Id: Id0d9bab7583169c24b158050c73fd7e63e5267bb
Reviewed-on: https://cl.tvl.fyi/c/depot/+/5272
Autosubmit: tazjin <tazjin@tvl.su>
Tested-by: BuildkiteCI
Reviewed-by: sterni <sternenseemann@systemli.org>
Reviewed-by: wpcarro <wpcarro@gmail.com>
2022-02-13 05:59:05 +00:00
Vincent Ambo
aa122cbae7 style: format entire depot with nixpkgs-fmt
This CL can be used to compare the style of nixpkgs-fmt against other
formatters (nixpkgs, alejandra).

Change-Id: I87c6abff6bcb546b02ead15ad0405f81e01b6d9e
Reviewed-on: https://cl.tvl.fyi/c/depot/+/4397
Tested-by: BuildkiteCI
Reviewed-by: sterni <sternenseemann@systemli.org>
Reviewed-by: lukegb <lukegb@tvl.fyi>
Reviewed-by: wpcarro <wpcarro@gmail.com>
Reviewed-by: Profpatsch <mail@profpatsch.de>
Reviewed-by: kanepyork <rikingcoding@gmail.com>
Reviewed-by: tazjin <tazjin@tvl.su>
Reviewed-by: cynthia <cynthia@tvl.fyi>
Reviewed-by: edef <edef@edef.eu>
Reviewed-by: eta <tvl@eta.st>
Reviewed-by: grfn <grfn@gws.fyi>
2022-01-31 16:11:53 +00:00
Vincent Ambo
e0d00b9621 feat(3p/josh): Bump to latest master
Change-Id: I32104d1cdc6d9cd72543d66bbe2f146e8ac27f6d
Reviewed-on: https://cl.tvl.fyi/c/depot/+/4988
Autosubmit: tazjin <tazjin@tvl.su>
Tested-by: BuildkiteCI
Reviewed-by: sterni <sternenseemann@systemli.org>
2022-01-18 09:56:12 +00:00
Vincent Ambo
6cfee7ef5a chore(3p/josh): Bump version to latest master
Change-Id: I01b58653a9d0067deb9644ecfa4d4b3bd75185a9
Reviewed-on: https://cl.tvl.fyi/c/depot/+/3557
Tested-by: BuildkiteCI
Reviewed-by: sterni <sternenseemann@systemli.org>
2021-09-16 01:19:16 +00:00
Vincent Ambo
e0708cba8d fix(3p/josh): Temporarily patch instances of master->canon
... until hardcoded references are removed upstream.

This is motivated by HEAD-branch related issues when cloning depot via
josh and a naive search for places where `master` was used directly.

Change-Id: I46709631d6ee5561344fc5f407324bcf69c641e2
Reviewed-on: https://cl.tvl.fyi/c/depot/+/3171
Tested-by: BuildkiteCI
Reviewed-by: cschilling <christian.schilling.de@gmail.com>
Reviewed-by: sterni <sternenseemann@systemli.org>
2021-06-02 08:00:07 +00:00
Vincent Ambo
00d2af6d7e chore(3p/josh): Bump to most recent commit
Includes a potentially relevant fix (anonymous authentication with the
correct username).

Change-Id: Iabf2eff43e98cc8b7b998ead3775b1fc8f1dfac6
Reviewed-on: https://cl.tvl.fyi/c/depot/+/3173
Tested-by: BuildkiteCI
Reviewed-by: cschilling <christian.schilling.de@gmail.com>
2021-06-02 08:00:07 +00:00
Vincent Ambo
47986fdc21 chore(3p/josh): Bump version to latest HEAD
This lets us drop the patch for pinning the git library, as this one
is now pinned to something upstream.

Change-Id: Ib8026f5f22e2e49371a2bad83aa726c2951570e4
Reviewed-on: https://cl.tvl.fyi/c/depot/+/3086
Tested-by: BuildkiteCI
Reviewed-by: eta <eta@theta.eu.org>
2021-05-04 15:47:08 +00:00
Vincent Ambo
377de6afdc feat(3p/josh): Import and build josh
We've had josh in here previously, but it was kind of immature back
then. The repository looks much better now and I'd like to give it
another try.

Josh is a Rust project, the build here is done with naersk.

Change-Id: I3731340d00ce1eb4cef55de114e1915579e47ef3
Reviewed-on: https://cl.tvl.fyi/c/depot/+/3017
Reviewed-by: lukegb <lukegb@tvl.fyi>
Tested-by: BuildkiteCI
2021-04-16 19:44:34 +00:00