chore(3p/sources): Bump channels & overlays
* //third_party/overlays/tvl: remove SBCL override, as SBCL 2.2.11 fixes the bug we were running into. * //fun/gemma: use historical nixpkgs for everything due to ABI incompatibilities triggered by preloaded libredirect.so wanting GLIBC_2.34 which is not available in elm-make. Change-Id: I465f0366413856e45ddd1e67fc9d732075e2f3c5 Reviewed-on: https://cl.tvl.fyi/c/depot/+/7595 Tested-by: BuildkiteCI Autosubmit: sterni <sternenseemann@systemli.org> Reviewed-by: grfn <grfn@gws.fyi>
This commit is contained in:
sterni
clbot
parent
835ea6ca7d
commit
16db185d97
4 changed files with 25 additions and 26 deletions
|
|
@ -1,8 +1,7 @@
|
|||
{ depot, pkgs, ... }:
|
||||
{ depot, ... }:
|
||||
|
||||
let
|
||||
inherit (pkgs) cacert iana-etc libredirect stdenv runCommand writeText;
|
||||
elmPackages = depot.third_party.elmPackages_0_18;
|
||||
inherit (depot.third_party.elmPackages_0_18) cacert iana-etc libredirect stdenv runCommand writeText elmPackages;
|
||||
|
||||
frontend = stdenv.mkDerivation {
|
||||
name = "gemma-frontend.html";
|
||||
|
|
|
|||
6
third_party/elmPackages_0_18/default.nix
vendored
6
third_party/elmPackages_0_18/default.nix
vendored
|
|
@ -4,6 +4,10 @@
|
|||
# Elm 0.19 changed the language & package ecosystem completely,
|
||||
# essentially requiring a partial rewrite of all Elm apps. However,
|
||||
# //fun/gemma uses Elm 0.18 and I don't have time to rewrite it.
|
||||
#
|
||||
# Since the ABIs of current glibc and the pinned version have diverged
|
||||
# too much, we need to build //fun/gemma completely based on a historical
|
||||
# nixpkgs version.
|
||||
|
||||
{ pkgs, ... }:
|
||||
|
||||
|
|
@ -14,4 +18,4 @@
|
|||
rev = "14f9ee66e63077539252f8b4550049381a082518";
|
||||
sha256 = "1wn7nmb1cqfk2j91l3rwc6yhimfkzxprb8wknw5wi57yhq9m6lv1";
|
||||
})
|
||||
{ }).elmPackages
|
||||
{ })
|
||||
|
|
|
|||
4
third_party/overlays/tvl.nix
vendored
4
third_party/overlays/tvl.nix
vendored
|
|
@ -92,10 +92,6 @@ in
|
|||
};
|
||||
});
|
||||
|
||||
# SBCL 2.2.10 breaks lisp-binary somehow
|
||||
# https://github.com/j3pic/lisp-binary/issues/59
|
||||
sbcl = self.sbcl_2_2_9;
|
||||
|
||||
# nix-serve does not work with nix 2.4
|
||||
# https://github.com/edolstra/nix-serve/issues/28
|
||||
nix-serve = super.nix-serve.override { nix = super.nix_2_3; };
|
||||
|
|
|
|||
36
third_party/sources/sources.json
vendored
36
third_party/sources/sources.json
vendored
|
|
@ -17,10 +17,10 @@
|
|||
"homepage": "",
|
||||
"owner": "nix-community",
|
||||
"repo": "emacs-overlay",
|
||||
"rev": "61e8c3167cd2a748a7a805caca3ae5756b2b6eb5",
|
||||
"sha256": "0fmpcx00id923h2w01bf1n1y1vffjmphj3sn3ylb7qz2p10svpam",
|
||||
"rev": "1cb4409944f776fbf9ca79bbd25cd8f4c3b70069",
|
||||
"sha256": "0v2bfjy00zcbn7897wxfhgpwmpgdsy1clgryrw7rzrj4mb42q7bg",
|
||||
"type": "tarball",
|
||||
"url": "https://github.com/nix-community/emacs-overlay/archive/61e8c3167cd2a748a7a805caca3ae5756b2b6eb5.tar.gz",
|
||||
"url": "https://github.com/nix-community/emacs-overlay/archive/1cb4409944f776fbf9ca79bbd25cd8f4c3b70069.tar.gz",
|
||||
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
|
||||
},
|
||||
"home-manager": {
|
||||
|
|
@ -29,10 +29,10 @@
|
|||
"homepage": "https://nix-community.github.io/home-manager/",
|
||||
"owner": "nix-community",
|
||||
"repo": "home-manager",
|
||||
"rev": "054d9e3187ca00479e8036dc0e92900a384f30fd",
|
||||
"sha256": "07mfsylmzp1rd808kry236wa5lvmavrlhnb9y450y60vzghzpqls",
|
||||
"rev": "d7eee202e597bc7789498a8664082cf0ffedaa8f",
|
||||
"sha256": "0hfys6nblswfblm5m4ii3mnwhnihqpsvxjnd6fwa55k788x500xl",
|
||||
"type": "tarball",
|
||||
"url": "https://github.com/nix-community/home-manager/archive/054d9e3187ca00479e8036dc0e92900a384f30fd.tar.gz",
|
||||
"url": "https://github.com/nix-community/home-manager/archive/d7eee202e597bc7789498a8664082cf0ffedaa8f.tar.gz",
|
||||
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
|
||||
},
|
||||
"impermanence": {
|
||||
|
|
@ -53,10 +53,10 @@
|
|||
"homepage": "",
|
||||
"owner": "nmattia",
|
||||
"repo": "naersk",
|
||||
"rev": "6944160c19cb591eb85bbf9b2f2768a935623ed3",
|
||||
"sha256": "01i282zrx651mpvnmlgk4fgwg56nbr1yljpzcj5irqxf18cqx3gn",
|
||||
"rev": "d998160d6a076cfe8f9741e56aeec7e267e3e114",
|
||||
"sha256": "1s10ygdsi17zjfiypwj7bhxys6yxws10hhq3ckfl3996v2q04d3v",
|
||||
"type": "tarball",
|
||||
"url": "https://github.com/nmattia/naersk/archive/6944160c19cb591eb85bbf9b2f2768a935623ed3.tar.gz",
|
||||
"url": "https://github.com/nmattia/naersk/archive/d998160d6a076cfe8f9741e56aeec7e267e3e114.tar.gz",
|
||||
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
|
||||
},
|
||||
"napalm": {
|
||||
|
|
@ -77,10 +77,10 @@
|
|||
"homepage": "",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "64e0bf055f9d25928c31fb12924e59ff8ce71e60",
|
||||
"sha256": "1hmx7hhjr74fqmxhb49yfyrpqhzwayrq48xwjv3a117czpb0gnjx",
|
||||
"rev": "652e92b8064949a11bc193b90b74cb727f2a1405",
|
||||
"sha256": "19vq1n9m73xfd8d521sxvxgv3fmpdk6lgwvij2cy6h88x58ijdx2",
|
||||
"type": "tarball",
|
||||
"url": "https://github.com/NixOS/nixpkgs/archive/64e0bf055f9d25928c31fb12924e59ff8ce71e60.tar.gz",
|
||||
"url": "https://github.com/NixOS/nixpkgs/archive/652e92b8064949a11bc193b90b74cb727f2a1405.tar.gz",
|
||||
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
|
||||
},
|
||||
"nixpkgs-stable": {
|
||||
|
|
@ -101,10 +101,10 @@
|
|||
"homepage": "",
|
||||
"owner": "oxalica",
|
||||
"repo": "rust-overlay",
|
||||
"rev": "fe185fac76e009b4bd543704a8c61077cf70155b",
|
||||
"sha256": "1ipbr07gxdp7q15vavskypqc1faspz7y7f0sygy88xr7i8p0mls5",
|
||||
"rev": "631e692192eeeea85cdfb2a9dccbbfce543478b1",
|
||||
"sha256": "1k75xk6b3l7xsygrwjmhxr886bznc4rvwiwavn73kkb08v245qra",
|
||||
"type": "tarball",
|
||||
"url": "https://github.com/oxalica/rust-overlay/archive/fe185fac76e009b4bd543704a8c61077cf70155b.tar.gz",
|
||||
"url": "https://github.com/oxalica/rust-overlay/archive/631e692192eeeea85cdfb2a9dccbbfce543478b1.tar.gz",
|
||||
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
|
||||
},
|
||||
"rustsec-advisory-db": {
|
||||
|
|
@ -113,10 +113,10 @@
|
|||
"homepage": "https://rustsec.org",
|
||||
"owner": "RustSec",
|
||||
"repo": "advisory-db",
|
||||
"rev": "0a2faeb87195392b23333a8097309d29f2c5d31d",
|
||||
"sha256": "01qqn7my4w4v2af3914carlhmy5d5jp500y8nbljqv4jp8alihvz",
|
||||
"rev": "487a60b7a5d4337f3ac33c504f1e03ede505bcdb",
|
||||
"sha256": "102jp2ajbm2gnvh9v4mfg7xkl9a91k0iq3133ml1d9nqz1grk3h4",
|
||||
"type": "tarball",
|
||||
"url": "https://github.com/RustSec/advisory-db/archive/0a2faeb87195392b23333a8097309d29f2c5d31d.tar.gz",
|
||||
"url": "https://github.com/RustSec/advisory-db/archive/487a60b7a5d4337f3ac33c504f1e03ede505bcdb.tar.gz",
|
||||
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in a new issue