From 5fae8b08266a4fd7f24ed3eddc914e61a45cee9a Mon Sep 17 00:00:00 2001 From: sterni Date: Wed, 4 May 2022 16:02:59 +0200 Subject: chore(3p/sources): Bump channels & overlays MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * //nix/buildLisp: ccl dumped images have fixed themselves… again * //3p/git: rebase patch on 2.36.0 * //3p/overlays/haskell: remove upstreamed workarounds * Disable everything depending on cgit temporarily, since it doesn't compile with git 2.36 yet. Change-Id: I9dc11c0846641341adbdcc7162cbf149a15fe0cb Reviewed-on: https://cl.tvl.fyi/c/depot/+/5519 Autosubmit: sterni Tested-by: BuildkiteCI Reviewed-by: tazjin --- third_party/cgit/default.nix | 1 + ...t-third_party-git-date-add-dottime-format.patch | 50 +++++++++++----------- third_party/overlays/haskell/default.nix | 11 ----- third_party/sources/sources.json | 18 ++++---- 4 files changed, 35 insertions(+), 45 deletions(-) (limited to 'third_party') diff --git a/third_party/cgit/default.nix b/third_party/cgit/default.nix index 55aaa02f32..e07bebee86 100644 --- a/third_party/cgit/default.nix +++ b/third_party/cgit/default.nix @@ -40,5 +40,6 @@ stdenv.mkDerivation rec { license = lib.licenses.gpl2; platforms = lib.platforms.linux; maintainers = with lib.maintainers; [ bjornfor ]; + ci.skip = true; # needs subtree update to work with git 2.36 }; } diff --git a/third_party/git/0001-feat-third_party-git-date-add-dottime-format.patch b/third_party/git/0001-feat-third_party-git-date-add-dottime-format.patch index 0e11b2ca63..a249b1ce1b 100644 --- a/third_party/git/0001-feat-third_party-git-date-add-dottime-format.patch +++ b/third_party/git/0001-feat-third_party-git-date-add-dottime-format.patch @@ -1,4 +1,4 @@ -From 46c52e6b462f9b1c9aa08a1b1bba79dd16302a9c Mon Sep 17 00:00:00 2001 +From 2fd675c5379dcfa7a2c3465e325cdea8faa2b95c Mon Sep 17 00:00:00 2001 From: Vincent Ambo Date: Mon, 6 Jan 2020 16:00:52 +0000 Subject: [PATCH] feat(third_party/git/date): add "dottime" format @@ -16,16 +16,16 @@ a strftime formatting string is not sufficient. --- Documentation/rev-list-options.txt | 3 +++ builtin/blame.c | 3 +++ - cache.h | 3 ++- date.c | 17 +++++++++++++++++ + date.h | 3 ++- t/t0006-date.sh | 2 ++ 5 files changed, 27 insertions(+), 1 deletion(-) diff --git a/Documentation/rev-list-options.txt b/Documentation/rev-list-options.txt -index b7bd27e171..273971bdd0 100644 +index fd4f4e26c9..1f7ab97865 100644 --- a/Documentation/rev-list-options.txt +++ b/Documentation/rev-list-options.txt -@@ -1052,6 +1052,9 @@ omitted. +@@ -1054,6 +1054,9 @@ omitted. 1970). As with `--raw`, this is always in UTC and therefore `-local` has no effect. @@ -33,13 +33,13 @@ index b7bd27e171..273971bdd0 100644 +but suffixed with the local timezone offset if given) + `--date=format:...` feeds the format `...` to your system `strftime`, - except for %z and %Z, which are handled internally. + except for %s, %z, and %Z, which are handled internally. Use `--date=format:%c` to show the date in your system locale's diff --git a/builtin/blame.c b/builtin/blame.c -index 641523ff9a..fa0240237c 100644 +index 8d15b68afc..e0cdf418f5 100644 --- a/builtin/blame.c +++ b/builtin/blame.c -@@ -1005,6 +1005,9 @@ int cmd_blame(int argc, const char **argv, const char *prefix) +@@ -1009,6 +1009,9 @@ int cmd_blame(int argc, const char **argv, const char *prefix) case DATE_STRFTIME: blame_date_width = strlen(show_date(0, 0, &blame_date_mode)) + 1; /* add the null */ break; @@ -49,22 +49,8 @@ index 641523ff9a..fa0240237c 100644 } blame_date_width -= 1; /* strip the null */ -diff --git a/cache.h b/cache.h -index 0c245d4f10..fa79e37b49 100644 ---- a/cache.h -+++ b/cache.h -@@ -1570,7 +1570,8 @@ enum date_mode_type { - DATE_RFC2822, - DATE_STRFTIME, - DATE_RAW, -- DATE_UNIX -+ DATE_UNIX, -+ DATE_DOTTIME - }; - - struct date_mode { diff --git a/date.c b/date.c -index c55ea47e96..7fe4fb982b 100644 +index 68a260c214..1485e3808f 100644 --- a/date.c +++ b/date.c @@ -347,6 +347,21 @@ const char *show_date(timestamp_t time, int tz, const struct date_mode *mode) @@ -98,11 +84,25 @@ index c55ea47e96..7fe4fb982b 100644 /* * Please update $__git_log_date_formats in * git-completion.bash when you add new formats. +diff --git a/date.h b/date.h +index 5d4eaba0a9..ff8fdffdbf 100644 +--- a/date.h ++++ b/date.h +@@ -17,7 +17,8 @@ enum date_mode_type { + DATE_RFC2822, + DATE_STRFTIME, + DATE_RAW, +- DATE_UNIX ++ DATE_UNIX, ++ DATE_DOTTIME + }; + + struct date_mode { diff --git a/t/t0006-date.sh b/t/t0006-date.sh -index 6b757d7169..5deb558497 100755 +index 2490162071..7ce4fe1927 100755 --- a/t/t0006-date.sh +++ b/t/t0006-date.sh -@@ -49,9 +49,11 @@ check_show short "$TIME" '2016-06-15' +@@ -51,9 +51,11 @@ check_show short "$TIME" '2016-06-15' check_show default "$TIME" 'Wed Jun 15 16:13:20 2016 +0200' check_show raw "$TIME" '1466000000 +0200' check_show unix "$TIME" '1466000000' @@ -115,5 +115,5 @@ index 6b757d7169..5deb558497 100755 check_show 'format:%z' "$TIME" '+0200' check_show 'format-local:%z' "$TIME" '+0000' -- -2.32.0 +2.35.3 diff --git a/third_party/overlays/haskell/default.nix b/third_party/overlays/haskell/default.nix index 2d01042f31..0ed0196a28 100644 --- a/third_party/overlays/haskell/default.nix +++ b/third_party/overlays/haskell/default.nix @@ -9,14 +9,6 @@ self: super: # overlay parameters for the nixpkgs overlay let overrides = hsSelf: hsSuper: with self.haskell.lib.compose; { # No overrides for the default package set necessary at the moment - # TODO(sterni): upstreamable? - generic-arbitrary = appendPatch - (self.fetchpatch { - name = "generic-arbitrary-no-negative-resize.patch"; - url = "https://github.com/typeable/generic-arbitrary/commit/c13d119d8ad0d43860ecdb93b357b0239e366a6c.patch"; - sha256 = "1jgbd2jn575icqw9nfdzh57nacm3pn8n53ka52129pnfjqfzyhsi"; - }) - hsSuper.generic-arbitrary; }; in { @@ -32,9 +24,6 @@ in # so we can use GHC 9.0.2 and benefit from upstream binary cache. random-fu = hsSelf.callPackage ./extra-pkgs/random-fu-0.2.nix { }; rvar = hsSelf.callPackage ./extra-pkgs/rvar-0.2.nix { }; - - # TODO(sterni): upstream this - universe-base = addBuildDepend hsSelf.OneTuple hsSuper.universe-base; } ); }; diff --git a/third_party/sources/sources.json b/third_party/sources/sources.json index 6a2538a070..ab005ab4b3 100644 --- a/third_party/sources/sources.json +++ b/third_party/sources/sources.json @@ -5,10 +5,10 @@ "homepage": "", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "2ab399a94a96281508ff7fcbe522b9d00b8dc304", - "sha256": "0bq7xpmqpxcfr2qzscb0pl77wbjnysd81ciypnp97069qsrmlbgx", + "rev": "6a432b7069783d4f4925a40bc6102d14ceee5c77", + "sha256": "0j84rgbz65xgxcrjmagk1a6ni23300m5sx0xfx3nr4qdlsp9iicp", "type": "tarball", - "url": "https://github.com/nix-community/emacs-overlay/archive/2ab399a94a96281508ff7fcbe522b9d00b8dc304.tar.gz", + "url": "https://github.com/nix-community/emacs-overlay/archive/6a432b7069783d4f4925a40bc6102d14ceee5c77.tar.gz", "url_template": "https://github.com///archive/.tar.gz" }, "nixpkgs": { @@ -17,10 +17,10 @@ "homepage": "", "owner": "NixOS", "repo": "nixpkgs", - "rev": "e10da1c7f542515b609f8dfbcf788f3d85b14936", - "sha256": "1if304v4i4lm217kp9f11f241kl3drbix3d0f08vgd6g43pv5mhq", + "rev": "cbe587c735b734405f56803e267820ee1559e6c1", + "sha256": "0jii8slqbwbvrngf9911z3al1s80v7kk8idma9p9k0d5fm3g4z7h", "type": "tarball", - "url": "https://github.com/NixOS/nixpkgs/archive/e10da1c7f542515b609f8dfbcf788f3d85b14936.tar.gz", + "url": "https://github.com/NixOS/nixpkgs/archive/cbe587c735b734405f56803e267820ee1559e6c1.tar.gz", "url_template": "https://github.com///archive/.tar.gz" }, "nixpkgs-stable": { @@ -29,10 +29,10 @@ "homepage": "", "owner": "NixOS", "repo": "nixpkgs", - "rev": "fd3e33d696b81e76b30160dfad2efb7ac1f19879", - "sha256": "1liw3glyv1cx0bxgxnq2yjp0ismg0np2ycg72rqghv75qb73zf9h", + "rev": "fd43ce017d4c95f47166d28664a004f57458a0b1", + "sha256": "1lkc5nbl53wlqp9hv03jlh7yyqn02933xdii5q7kbn49rplrx619", "type": "tarball", - "url": "https://github.com/NixOS/nixpkgs/archive/fd3e33d696b81e76b30160dfad2efb7ac1f19879.tar.gz", + "url": "https://github.com/NixOS/nixpkgs/archive/fd43ce017d4c95f47166d28664a004f57458a0b1.tar.gz", "url_template": "https://github.com///archive/.tar.gz" }, "rustsec-advisory-db": { -- cgit 1.4.1