depot/third_party/git/default.nix, branch refs/r/8638 monorepo for the virus lounge http://code.tvl.fyi/depot/atom?h=refs%2Fr%2F8638 2024-07-01T17:42:30+00:00 chore(3p/sources): bump to OpenSSH vulnerability hotfix 2024-07-01T17:42:30+00:00 Vincent Ambo tazjin@tvl.su 2024-07-01T09:47:15+00:00 urn:sha1:4b2f3c5454a249c6fbd7697a5297c6d4db92ef3e See https://github.com/NixOS/nixpkgs/pull/323753 for details. Changes: * git: temporarily comment out dottime patch (it doesn't apply, but it's not critical) * third-party/cgit: use an older git version where dottime patch still applies * 3p/crate2nix: remove crate2nix patches included in latest release * tvix: remove unneeded defaultCrateOverrides (upstreamed to nixpkgs) * tvix: regenerate Cargo.nix * tvix/nix-compat: remove unnused AtermWriteable::aterm_bytes pub(crate) function * tvix/nix-compat: remove redundant trait bounds * tvix/glue: use clone_into() to set drv.{builder,system} * tools/crate2nix: apply workaround for https://github.com/numtide/treefmt/issues/327 * toold/depotfmt: expose treefmt config as passthru * tools/crate2nix: undo some more hacks in the crate2nix-check drv Change-Id: Ifbcedeb3e8f81b2f6ec1dbf10189bfa6dfd9c75c Co-Authored-By: Florian Klink <flokli@flokli.de> Reviewed-on: https://cl.tvl.fyi/c/depot/+/11907 Reviewed-by: tazjin <tazjin@tvl.su> Tested-by: BuildkiteCI Reviewed-by: flokli <flokli@flokli.de> style: format entire depot with nixpkgs-fmt 2022-01-31T16:11:53+00:00 Vincent Ambo mail@tazj.in 2022-01-30T16:06:58+00:00 urn:sha1:aa122cbae78ce97d60c0c98ba14df753d97e40b1 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> chore(3p/git): Unvendor git and track patches instead 2021-09-21T11:29:35+00:00 Vincent Ambo mail@tazj.in 2021-09-21T10:03:01+00:00 urn:sha1:43b1791ec601732ac31195df96781a848360a9ac This was vendored a long time ago under the expectation that keeping it in sync with cgit would be easier this way, but it has proven not to be a big issue. On the other hand, a vendored copy of git is an annoying maintenance burden. It is much easier to rebase the single (dottime) patch that we have. This removes the vendored copy of git and instead passes the git source code to cgit via `pkgs.srcOnly`, which includes the applied patch so that cgit can continue rendering dottime. Change-Id: If31f62dea7ce688fd1b9050204e9378019775f2b refactor: Move nixpkgs attribute to `third_party.nixpkgs` 2021-04-10T21:18:55+00:00 Vincent Ambo mail@tazj.in 2021-04-10T16:05:16+00:00 urn:sha1:473604f5675c455a65b91e287b125a9e042ae39f Please read b/108 to make sense of this. This gets rid of the explicit list of exposed packages from nixpkgs, and instead makes the entire package set available at `third_party.nixpkgs`. To accommodate this, a LOT of things have to be very slightly shuffled around. Some of this was done in already submitted CLs, but this change is unfortunately still quite noisy. Pay extra attention to: * overlay-like functionality that was partially moved to actual overlays (partially as in, the minimum required to get a green build) * modified uses of the package set path, esp. in NixOS systems Special notes: * xanthous has been disabled in CI because of issues with the Haskell overlay * //third_party/nix has been disabled because of other unclear dependency issues Both of these will be tackled in a followup CL. Change-Id: I2f9c60a4d275fdb5209264be0addfd7e06c53118 Reviewed-on: https://cl.tvl.fyi/c/depot/+/2910 Reviewed-by: glittershark <grfn@gws.fyi> Reviewed-by: sterni <sternenseemann@systemli.org> Tested-by: BuildkiteCI merge(3p/git): Merge git subtree at v2.29.2 2020-11-21T18:45:56+00:00 Vincent Ambo mail@tazj.in 2020-11-21T18:20:35+00:00 urn:sha1:f4609b896fac842433bd495c166d5987852a6a73 This also bumps the stable nixpkgs to 20.09 as of 2020-11-21, because there is some breakage in the git build related to the netrc credentials helper which someone has taken care of in nixpkgs. The stable channel is not used for anything other than git, so this should be fine. Change-Id: I3575a19dab09e1e9556cf8231d717de9890484fb chore: Rename pkgs->depot in all Nix file headers 2020-02-21T13:54:53+00:00 Vincent Ambo tazjin@google.com 2020-02-21T12:47:29+00:00 urn:sha1:4bbbb58cb537014dd8b0b3c3c560c039ac57ad89 feat(third_party/git): Add derivation to build git 2020-01-12T01:55:23+00:00 Vincent Ambo Vincent Ambo 2020-01-12T01:20:45+00:00 urn:sha1:93cc05d36319418c3304115964398f17f10545ae This overrides the upstream derivation to: * use local sources * build `git send-email` It also calls autoreconf before building because files that are included in the git distribution tarball (which the normal derivation uses) are missing from source. chore(third_party/git): Remove plain patch check-in 2020-01-11T23:36:38+00:00 Vincent Ambo Vincent Ambo 2020-01-11T23:36:38+00:00 urn:sha1:6a2a3007077818e24a3d56fc492ada9206a10cf0 feat(third_party/git): Support dottime as log date format 2019-12-28T00:39:33+00:00 Vincent Ambo tazjin@google.com 2019-12-28T00:38:34+00:00 urn:sha1:dce11128423a0e4f912e7182a352cd6755195b1b
This XML file does not appear to have any style information associated with it. The document tree is shown below.
<feed xmlns="http://www.w3.org/2005/Atom">
<title>depot/third_party/git/default.nix, branch refs/r/8638</title>
<subtitle>monorepo for the virus lounge</subtitle>
<id>http://code.tvl.fyi/depot/atom?h=refs%2Fr%2F8638</id>
<link rel="self" href="http://code.tvl.fyi/depot/atom?h=refs%2Fr%2F8638"/>
<link rel="alternate" type="text/html" href="http://code.tvl.fyi/"/>
<updated>2024-07-01T17:42:30+00:00</updated>
<entry>
<title>chore(3p/sources): bump to OpenSSH vulnerability hotfix</title>
<updated>2024-07-01T17:42:30+00:00</updated>
<author>
<name>Vincent Ambo</name>
<email>tazjin@tvl.su</email>
</author>
<published>2024-07-01T09:47:15+00:00</published>
<link rel="alternate" type="text/html" href="http://code.tvl.fyi/commit/?id=4b2f3c5454a249c6fbd7697a5297c6d4db92ef3e"/>
<id>urn:sha1:4b2f3c5454a249c6fbd7697a5297c6d4db92ef3e</id>
<content type="text"> See https://github.com/NixOS/nixpkgs/pull/323753 for details. Changes: * git: temporarily comment out dottime patch (it doesn't apply, but it's not critical) * third-party/cgit: use an older git version where dottime patch still applies * 3p/crate2nix: remove crate2nix patches included in latest release * tvix: remove unneeded defaultCrateOverrides (upstreamed to nixpkgs) * tvix: regenerate Cargo.nix * tvix/nix-compat: remove unnused AtermWriteable::aterm_bytes pub(crate) function * tvix/nix-compat: remove redundant trait bounds * tvix/glue: use clone_into() to set drv.{builder,system} * tools/crate2nix: apply workaround for https://github.com/numtide/treefmt/issues/327 * toold/depotfmt: expose treefmt config as passthru * tools/crate2nix: undo some more hacks in the crate2nix-check drv Change-Id: Ifbcedeb3e8f81b2f6ec1dbf10189bfa6dfd9c75c Co-Authored-By: Florian Klink <flokli@flokli.de> Reviewed-on: https://cl.tvl.fyi/c/depot/+/11907 Reviewed-by: tazjin <tazjin@tvl.su> Tested-by: BuildkiteCI Reviewed-by: flokli <flokli@flokli.de> </content>
</entry>
<entry>
<title>style: format entire depot with nixpkgs-fmt</title>
<updated>2022-01-31T16:11:53+00:00</updated>
<author>
<name>Vincent Ambo</name>
<email>mail@tazj.in</email>
</author>
<published>2022-01-30T16:06:58+00:00</published>
<link rel="alternate" type="text/html" href="http://code.tvl.fyi/commit/?id=aa122cbae78ce97d60c0c98ba14df753d97e40b1"/>
<id>urn:sha1:aa122cbae78ce97d60c0c98ba14df753d97e40b1</id>
<content type="text"> 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> </content>
</entry>
<entry>
<title>chore(3p/git): Unvendor git and track patches instead</title>
<updated>2021-09-21T11:29:35+00:00</updated>
<author>
<name>Vincent Ambo</name>
<email>mail@tazj.in</email>
</author>
<published>2021-09-21T10:03:01+00:00</published>
<link rel="alternate" type="text/html" href="http://code.tvl.fyi/commit/?id=43b1791ec601732ac31195df96781a848360a9ac"/>
<id>urn:sha1:43b1791ec601732ac31195df96781a848360a9ac</id>
<content type="text"> This was vendored a long time ago under the expectation that keeping it in sync with cgit would be easier this way, but it has proven not to be a big issue. On the other hand, a vendored copy of git is an annoying maintenance burden. It is much easier to rebase the single (dottime) patch that we have. This removes the vendored copy of git and instead passes the git source code to cgit via `pkgs.srcOnly`, which includes the applied patch so that cgit can continue rendering dottime. Change-Id: If31f62dea7ce688fd1b9050204e9378019775f2b </content>
</entry>
<entry>
<title>refactor: Move nixpkgs attribute to `third_party.nixpkgs`</title>
<updated>2021-04-10T21:18:55+00:00</updated>
<author>
<name>Vincent Ambo</name>
<email>mail@tazj.in</email>
</author>
<published>2021-04-10T16:05:16+00:00</published>
<link rel="alternate" type="text/html" href="http://code.tvl.fyi/commit/?id=473604f5675c455a65b91e287b125a9e042ae39f"/>
<id>urn:sha1:473604f5675c455a65b91e287b125a9e042ae39f</id>
<content type="text"> Please read b/108 to make sense of this. This gets rid of the explicit list of exposed packages from nixpkgs, and instead makes the entire package set available at `third_party.nixpkgs`. To accommodate this, a LOT of things have to be very slightly shuffled around. Some of this was done in already submitted CLs, but this change is unfortunately still quite noisy. Pay extra attention to: * overlay-like functionality that was partially moved to actual overlays (partially as in, the minimum required to get a green build) * modified uses of the package set path, esp. in NixOS systems Special notes: * xanthous has been disabled in CI because of issues with the Haskell overlay * //third_party/nix has been disabled because of other unclear dependency issues Both of these will be tackled in a followup CL. Change-Id: I2f9c60a4d275fdb5209264be0addfd7e06c53118 Reviewed-on: https://cl.tvl.fyi/c/depot/+/2910 Reviewed-by: glittershark <grfn@gws.fyi> Reviewed-by: sterni <sternenseemann@systemli.org> Tested-by: BuildkiteCI </content>
</entry>
<entry>
<title>merge(3p/git): Merge git subtree at v2.29.2</title>
<updated>2020-11-21T18:45:56+00:00</updated>
<author>
<name>Vincent Ambo</name>
<email>mail@tazj.in</email>
</author>
<published>2020-11-21T18:20:35+00:00</published>
<link rel="alternate" type="text/html" href="http://code.tvl.fyi/commit/?id=f4609b896fac842433bd495c166d5987852a6a73"/>
<id>urn:sha1:f4609b896fac842433bd495c166d5987852a6a73</id>
<content type="text"> This also bumps the stable nixpkgs to 20.09 as of 2020-11-21, because there is some breakage in the git build related to the netrc credentials helper which someone has taken care of in nixpkgs. The stable channel is not used for anything other than git, so this should be fine. Change-Id: I3575a19dab09e1e9556cf8231d717de9890484fb </content>
</entry>
<entry>
<title>chore: Rename pkgs->depot in all Nix file headers</title>
<updated>2020-02-21T13:54:53+00:00</updated>
<author>
<name>Vincent Ambo</name>
<email>tazjin@google.com</email>
</author>
<published>2020-02-21T12:47:29+00:00</published>
<link rel="alternate" type="text/html" href="http://code.tvl.fyi/commit/?id=4bbbb58cb537014dd8b0b3c3c560c039ac57ad89"/>
<id>urn:sha1:4bbbb58cb537014dd8b0b3c3c560c039ac57ad89</id>
<content type="text"> </content>
</entry>
<entry>
<title>feat(third_party/git): Add derivation to build git</title>
<updated>2020-01-12T01:55:23+00:00</updated>
<author>
<name>Vincent Ambo</name>
<email>Vincent Ambo</email>
</author>
<published>2020-01-12T01:20:45+00:00</published>
<link rel="alternate" type="text/html" href="http://code.tvl.fyi/commit/?id=93cc05d36319418c3304115964398f17f10545ae"/>
<id>urn:sha1:93cc05d36319418c3304115964398f17f10545ae</id>
<content type="text"> This overrides the upstream derivation to: * use local sources * build `git send-email` It also calls autoreconf before building because files that are included in the git distribution tarball (which the normal derivation uses) are missing from source. </content>
</entry>
<entry>
<title>chore(third_party/git): Remove plain patch check-in</title>
<updated>2020-01-11T23:36:38+00:00</updated>
<author>
<name>Vincent Ambo</name>
<email>Vincent Ambo</email>
</author>
<published>2020-01-11T23:36:38+00:00</published>
<link rel="alternate" type="text/html" href="http://code.tvl.fyi/commit/?id=6a2a3007077818e24a3d56fc492ada9206a10cf0"/>
<id>urn:sha1:6a2a3007077818e24a3d56fc492ada9206a10cf0</id>
<content type="text"> </content>
</entry>
<entry>
<title>feat(third_party/git): Support dottime as log date format</title>
<updated>2019-12-28T00:39:33+00:00</updated>
<author>
<name>Vincent Ambo</name>
<email>tazjin@google.com</email>
</author>
<published>2019-12-28T00:38:34+00:00</published>
<link rel="alternate" type="text/html" href="http://code.tvl.fyi/commit/?id=dce11128423a0e4f912e7182a352cd6755195b1b"/>
<id>urn:sha1:dce11128423a0e4f912e7182a352cd6755195b1b</id>
<content type="text"> </content>
</entry>
</feed>