chore(3p/sources): Bump channels & overlays

* //3p/overlays: add workaround for broken URL in current channel.
  The added assert should fire as soon as the fix lands in channels
  as a reminder to clean it up.

Change-Id: I3014fbacec5f8933bb0c055a065c5ff2935b131b
Reviewed-on: https://cl.tvl.fyi/c/depot/+/5425
Tested-by: BuildkiteCI
Reviewed-by: tazjin <tazjin@tvl.su>
This commit is contained in:
sterni 2022-03-30 13:12:39 +02:00
parent 017238a1be
commit b4b0008180
2 changed files with 27 additions and 9 deletions

View file

@ -74,4 +74,22 @@ self: super: {
outputHash = "10if2lmv8d95j3walq3ggx3y423yfy4yl9vplw3apd0s671bly8b"; outputHash = "10if2lmv8d95j3walq3ggx3y423yfy4yl9vplw3apd0s671bly8b";
}); });
}); });
# Temporary workaround until the following commit is in channels:
# https://github.com/nixos/nixpkgs/commit/5819b99350d7ac6e20f91adce38e7bb22e4d6fc4
ocamlPackages = super.ocamlPackages.overrideScope' (oself: osuper: {
uutf =
let
expectedUrls = [
"https://erratique.ch/software/uutf/releases/uutf-${osuper.uutf.version}.tbz"
];
in
assert osuper.uutf.src.urls != expectedUrls;
osuper.uutf.overrideAttrs (old: {
src = self.fetchurl {
urls = expectedUrls;
sha256 = old.src.outputHash;
};
});
});
} }

View file

@ -5,10 +5,10 @@
"homepage": "", "homepage": "",
"owner": "nix-community", "owner": "nix-community",
"repo": "emacs-overlay", "repo": "emacs-overlay",
"rev": "c0f04f623ea142862dfc02bbda18a0685bb42e39", "rev": "26da73dd9129d267f0c8c26b591ab91050c4cdc9",
"sha256": "0jnz4wplyvyfsdjbl6xxmd11pr5pl9f8dg90f6nq4fd84l2hpwbj", "sha256": "0sd868br1jqmihgm97ma1jv8r78x1n7s7bqjk5dl4v6s2rhzy3br",
"type": "tarball", "type": "tarball",
"url": "https://github.com/nix-community/emacs-overlay/archive/c0f04f623ea142862dfc02bbda18a0685bb42e39.tar.gz", "url": "https://github.com/nix-community/emacs-overlay/archive/26da73dd9129d267f0c8c26b591ab91050c4cdc9.tar.gz",
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz" "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
}, },
"nixpkgs": { "nixpkgs": {
@ -17,10 +17,10 @@
"homepage": "", "homepage": "",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "1ec61dd4167f04be8d05c45780818826132eea0d", "rev": "ce8cbe3c01fd8ee2de526ccd84bbf9b82397a510",
"sha256": "0aglyrxqkfwm4wxlz642vcgn0m350jv4nhhyq91cxylvs1avps54", "sha256": "19xfad7pxsp6nkrkjhn36w77w92m60ysq7njn711slw74yj6ibxv",
"type": "tarball", "type": "tarball",
"url": "https://github.com/NixOS/nixpkgs/archive/1ec61dd4167f04be8d05c45780818826132eea0d.tar.gz", "url": "https://github.com/NixOS/nixpkgs/archive/ce8cbe3c01fd8ee2de526ccd84bbf9b82397a510.tar.gz",
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz" "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
}, },
"nixpkgs-stable": { "nixpkgs-stable": {
@ -29,10 +29,10 @@
"homepage": "", "homepage": "",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "d2caa9377539e3b5ff1272ac3aa2d15f3081069f", "rev": "9b168e5e62406fa2e55e132f390379a6ba22b402",
"sha256": "0syx1mqpdm37zwpxfkmglcnb1swqvsgf6sff0q5ksnsfvqv38vh0", "sha256": "16baazcid93afjg75mf8w3hihyc4wilcq0mawxfrilm1xqm52265",
"type": "tarball", "type": "tarball",
"url": "https://github.com/NixOS/nixpkgs/archive/d2caa9377539e3b5ff1272ac3aa2d15f3081069f.tar.gz", "url": "https://github.com/NixOS/nixpkgs/archive/9b168e5e62406fa2e55e132f390379a6ba22b402.tar.gz",
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz" "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
}, },
"rustsec-advisory-db": { "rustsec-advisory-db": {