mdebray/tvl-depot
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

chore(3p): bump NixOS channels and emacs overlay to 2021-12-07

Browse source 
* //third_party/cgit: apply patch [1] for Git 2.34 compatibility to
  reflect dropping of the string_list_init function in 770fed [2].
  Patch hasn't been applied on cgit's master yet, over concern about a
  breaking change in git (?) [3].

[1]: https://lists.zx2c4.com/pipermail/cgit/2021-November/004666.html
[2]: 770fedaf9f
[3]: https://lists.zx2c4.com/pipermail/cgit/2021-November/004667.html

Change-Id: Ie10c99c017ae5a43f4369b42151e19ecf07f7949
This commit is contained in:
sterni 2021-12-07 10:02:42 +01:00
parent 7f2f5d07f2
commit 6ef5162a93
4 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
third_party/cgit/Makefile vendored
View file

@ -14,7 +14,7 @@ htmldir = $(docdir)
pdfdir = $(docdir) pdfdir = $(docdir)
mandir = $(prefix)/share/man mandir = $(prefix)/share/man
SHA1_HEADER = <openssl/sha.h> SHA1_HEADER = <openssl/sha.h>
GIT_VER = 2.32.0 GIT_VER = 2.34.0
GIT_URL = https://www.kernel.org/pub/software/scm/git/git-$(GIT_VER).tar.xz GIT_URL = https://www.kernel.org/pub/software/scm/git/git-$(GIT_VER).tar.xz
INSTALL = install INSTALL = install
COPYTREE = cp -r COPYTREE = cp -r

2
third_party/cgit/cgit.c vendored
View file

@ -428,7 +428,7 @@ static void prepare_context(void)
ctx.page.modified = time(NULL); ctx.page.modified = time(NULL);
ctx.page.expires = ctx.page.modified; ctx.page.expires = ctx.page.modified;
ctx.page.etag = NULL; ctx.page.etag = NULL;
string_list_init(&ctx.cfg.mimetypes, 1); string_list_init_dup(&ctx.cfg.mimetypes);
if (ctx.env.script_name) if (ctx.env.script_name)
ctx.cfg.script_name = xstrdup(ctx.env.script_name); ctx.cfg.script_name = xstrdup(ctx.env.script_name);
if (ctx.env.query_string) if (ctx.env.query_string)

12
third_party/nixpkgs/default.nix vendored
View file

@ -13,16 +13,16 @@ let
# nixos-unstable, and the current stable channel of the latest NixOS # nixos-unstable, and the current stable channel of the latest NixOS
# release. # release.
# Tracking nixos-unstable as of 2021-11-24. # Tracking nixos-unstable as of 2021-12-05.
unstableHashes = { unstableHashes = {
commit = "39cb89ef2ffcbef8d2ac2d52267ac69121a6becb"; commit = "c71f061c68ba8ce53471b767d5049cbd0f3d8490";
sha256 = "1x9vzpay56ap4hgfq1giz00050crdngv5jkxgkxzx276mzhw93na"; sha256 = "1s2lmxswx30z80abccvrcygpnys3csbaygjdlw5i0lk4nwslnkmn";
}; };
# Tracking nixos-21.05 as of 2021-11-24. # Tracking nixos-21.05 as of 2021-12-07.
stableHashes = { stableHashes = {
commit = "09650059d7f5ae59a7f0fb2dd3bfc6d2042a74de"; commit = "4a8751d694b46340072d95409804f59b98326f44";
sha256 = "0f06zcc8mh934fya0hwzklmga238yxiyfp183y48vyzkdsg7xgn0"; sha256 = "14pmmd82s0anknd6g57i0c1795766bvylqalf9kz730q1v0ransl";
}; };
# import the nixos-unstable package set, or optionally use the # import the nixos-unstable package set, or optionally use the

6
third_party/overlays/emacs.nix vendored
View file

@ -2,10 +2,10 @@
{ ... }: { ... }:
let let
# from 2021-11-14 # from 2021-12-07
commit = "c75b7c047cc4635b0ecdedfd4ad78e1ac76e41c5"; commit = "2f14e98a92505c517a8364c3a5e614592fbea4f4";
src = builtins.fetchTarball { src = builtins.fetchTarball {
url = "https://github.com/nix-community/emacs-overlay/archive/${commit}.tar.gz"; url = "https://github.com/nix-community/emacs-overlay/archive/${commit}.tar.gz";
sha256 = "06if42qy22xni3gd9hqqq6yhama20qn402asalj16mxi1rxx4kgz"; sha256 = "16i16pm3bm43fj85n5bafghak0asi7p9xpyshpls6yyh85chcdb5";
}; };
in import src in import src