chore(3p/sources): Bump channels & overlays
Upstream nixpkgs removed a lot of aliases this time, so we needed to do the following transformations. It's a real shame that aliases only really become discoverable easily when they are removed. * runCommandNoCC -> runCommand * gmailieer -> lieer We also need to work around the fact that home-manager hasn't catched on to this rename. * mysql -> mariadb * pkgconfig -> pkg-config This also affects our Nix fork which needs to be bumped. * prometheus_client -> prometheus-client * rxvt_unicode -> rxvt-unicode-unwrapped * nix-review -> nixpkgs-review * oauth2_proxy -> oauth2-proxy Additionally, some Go-related builders decided to drop support for passing the sha256 hash in directly, so we need to use the generic hash arguments. Change-Id: I84aaa225ef18962937f8616a9ff064822f0d5dc3 Reviewed-on: https://cl.tvl.fyi/c/depot/+/6792 Autosubmit: sterni <sternenseemann@systemli.org> Tested-by: BuildkiteCI Reviewed-by: grfn <grfn@gws.fyi> Reviewed-by: flokli <flokli@flokli.de> Reviewed-by: tazjin <tazjin@tvl.su> Reviewed-by: wpcarro <wpcarro@gmail.com>
This commit is contained in:
parent
f40283e098
commit
0c178a0ef6
58 changed files with 100 additions and 95 deletions
4
third_party/bat_syntaxes/default.nix
vendored
4
third_party/bat_syntaxes/default.nix
vendored
|
|
@ -7,9 +7,9 @@
|
|||
{ pkgs, ... }:
|
||||
|
||||
let
|
||||
inherit (pkgs) bat runCommandNoCC;
|
||||
inherit (pkgs) bat runCommand;
|
||||
in
|
||||
runCommandNoCC "bat-syntaxes.bin" { } ''
|
||||
runCommand "bat-syntaxes.bin" { } ''
|
||||
export HOME=$PWD
|
||||
mkdir -p .config/bat/syntaxes
|
||||
cp ${./Prolog.sublime-syntax} .config/bat/syntaxes
|
||||
|
|
|
|||
2
third_party/bufbuild/default.nix
vendored
2
third_party/bufbuild/default.nix
vendored
|
|
@ -5,7 +5,7 @@
|
|||
pkgs.buildGoModule {
|
||||
pname = "buf";
|
||||
version = "v0.20.1";
|
||||
vendorSha256 = "1gg5c7aiqb4w1zxwsraxxpln33xkmkzlp1h69xgi9i08zvrfipqs";
|
||||
vendorHash = "sha256:1gg5c7aiqb4w1zxwsraxxpln33xkmkzlp1h69xgi9i08zvrfipqs";
|
||||
|
||||
src = pkgs.fetchFromGitHub {
|
||||
owner = "bufbuild";
|
||||
|
|
|
|||
2
third_party/buzz/default.nix
vendored
2
third_party/buzz/default.nix
vendored
|
|
@ -9,7 +9,7 @@ depot.third_party.naersk.buildPackage {
|
|||
};
|
||||
|
||||
buildInputs = with pkgs; [
|
||||
pkgconfig
|
||||
pkg-config
|
||||
dbus
|
||||
glib
|
||||
openssl_1_1
|
||||
|
|
|
|||
2
third_party/gerrit-queue/default.nix
vendored
2
third_party/gerrit-queue/default.nix
vendored
|
|
@ -3,7 +3,7 @@
|
|||
pkgs.buildGoModule {
|
||||
pname = "gerrit-queue";
|
||||
version = "master";
|
||||
vendorSha256 = "0n5h7j416yb2mwic9c3rhqza64jlvl7iw507r9mkw3jadn4whm7a";
|
||||
vendorHash = "sha256:0n5h7j416yb2mwic9c3rhqza64jlvl7iw507r9mkw3jadn4whm7a";
|
||||
src = ./.;
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
|||
2
third_party/irccat/default.nix
vendored
2
third_party/irccat/default.nix
vendored
|
|
@ -5,7 +5,7 @@ pkgs.buildGoModule rec {
|
|||
pname = "irccat";
|
||||
version = "20201108";
|
||||
meta.license = lib.licenses.gpl3;
|
||||
vendorSha256 = "06a985y4alw1rsghgmhfyczns6klz7bbkfn5mnqc9fdfclgg4s3r";
|
||||
vendorHash = "sha256:06a985y4alw1rsghgmhfyczns6klz7bbkfn5mnqc9fdfclgg4s3r";
|
||||
|
||||
src = pkgs.fetchFromGitHub {
|
||||
owner = "irccloud";
|
||||
|
|
|
|||
2
third_party/josh/default.nix
vendored
2
third_party/josh/default.nix
vendored
|
|
@ -15,7 +15,7 @@ depot.third_party.naersk.buildPackage {
|
|||
buildInputs = with pkgs; [
|
||||
libgit2
|
||||
openssl
|
||||
pkgconfig
|
||||
pkg-config
|
||||
];
|
||||
|
||||
cargoBuildOptions = x: x ++ [
|
||||
|
|
|
|||
5
third_party/overlays/tvl.nix
vendored
5
third_party/overlays/tvl.nix
vendored
|
|
@ -9,14 +9,15 @@ let
|
|||
nixSrc =
|
||||
let
|
||||
# branch 2.3-backport-await-users
|
||||
rev = "abdc60f49f1104696bac723331d3ed0296d5a784";
|
||||
# XXX(tazjin): merge https://github.com/tvlfyi/nix/pull/3
|
||||
rev = "22efe1ed25dff2fa15345a0f187e5ad450552599";
|
||||
in
|
||||
self.fetchFromGitHub
|
||||
{
|
||||
owner = "tvlfyi";
|
||||
repo = "nix";
|
||||
inherit rev;
|
||||
hash = "sha256:0c1pmg8y0yafdkliz970k52s92z3qin3xrz3g0n2ss7xcfbg8nzy";
|
||||
hash = "sha256:0rwyrh471c5y64axyd8vzzzmzlscg97fsrjbgbm1a93wnzxcvnvk";
|
||||
} // { revCount = 0; shortRev = builtins.substring 0 7 rev; };
|
||||
in
|
||||
{
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@ let
|
|||
};
|
||||
|
||||
python = pkgs.python3.withPackages (p: [
|
||||
p.prometheus_client
|
||||
p.prometheus-client
|
||||
]);
|
||||
|
||||
in
|
||||
|
|
|
|||
2
third_party/smtprelay/default.nix
vendored
2
third_party/smtprelay/default.nix
vendored
|
|
@ -4,7 +4,7 @@
|
|||
pkgs.buildGoModule rec {
|
||||
pname = "smtprelay";
|
||||
version = "1.7.0";
|
||||
vendorSha256 = "00nb81hdg5pv5l0q7w5lv08dv4v72vml7jha351frani0gpg27pn";
|
||||
vendorHash = "sha256:00nb81hdg5pv5l0q7w5lv08dv4v72vml7jha351frani0gpg27pn";
|
||||
|
||||
src = pkgs.fetchFromGitHub {
|
||||
owner = "decke";
|
||||
|
|
|
|||
30
third_party/sources/sources.json
vendored
30
third_party/sources/sources.json
vendored
|
|
@ -5,10 +5,10 @@
|
|||
"homepage": "https://matrix.to/#/#agenix:nixos.org",
|
||||
"owner": "ryantm",
|
||||
"repo": "agenix",
|
||||
"rev": "c96da5835b76d3d8e8d99a0fec6fe32f8539ee2e",
|
||||
"sha256": "05b504v6jn8kk3ihfv5crisfqn9p7i1cbhrlqdj4h6gg5fyqzfms",
|
||||
"rev": "6acb1fe5f8597d5ce63fc82bc7fcac7774b1cdf0",
|
||||
"sha256": "0k6aggy3lhqv6j11cvi4gr0i3jps8hlf262xl9ji3ffxwas46p54",
|
||||
"type": "tarball",
|
||||
"url": "https://github.com/ryantm/agenix/archive/c96da5835b76d3d8e8d99a0fec6fe32f8539ee2e.tar.gz",
|
||||
"url": "https://github.com/ryantm/agenix/archive/6acb1fe5f8597d5ce63fc82bc7fcac7774b1cdf0.tar.gz",
|
||||
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
|
||||
},
|
||||
"emacs-overlay": {
|
||||
|
|
@ -17,10 +17,10 @@
|
|||
"homepage": "",
|
||||
"owner": "nix-community",
|
||||
"repo": "emacs-overlay",
|
||||
"rev": "6346fa5aa82fd663d340fe1e16e213128cad7542",
|
||||
"sha256": "1yj28if5l4gg6h4sg3ffmdfarlnyqx09gqzspdxjvf2l18kli47a",
|
||||
"rev": "117975b8082f22730778f9ad4529ff001b01b6cf",
|
||||
"sha256": "0w8djx0z8h349ak0a1l7z7959bjfdkrardnpcdp31hlknff73azk",
|
||||
"type": "tarball",
|
||||
"url": "https://github.com/nix-community/emacs-overlay/archive/6346fa5aa82fd663d340fe1e16e213128cad7542.tar.gz",
|
||||
"url": "https://github.com/nix-community/emacs-overlay/archive/117975b8082f22730778f9ad4529ff001b01b6cf.tar.gz",
|
||||
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
|
||||
},
|
||||
"impermanence": {
|
||||
|
|
@ -53,10 +53,10 @@
|
|||
"homepage": "",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "d6490a0bd9dfb298fcd8382d3363b86870dc7340",
|
||||
"sha256": "1wf0vgzfkpa1famz1fxx2758nm13k7dhkz1z8f4bgasmc2bxfckc",
|
||||
"rev": "79d3ca08920364759c63fd3eb562e99c0c17044a",
|
||||
"sha256": "1zz72k161yl9dxs5nxgy5p6nh8zsz4fbpclm99r12jw39zrlzhhw",
|
||||
"type": "tarball",
|
||||
"url": "https://github.com/NixOS/nixpkgs/archive/d6490a0bd9dfb298fcd8382d3363b86870dc7340.tar.gz",
|
||||
"url": "https://github.com/NixOS/nixpkgs/archive/79d3ca08920364759c63fd3eb562e99c0c17044a.tar.gz",
|
||||
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
|
||||
},
|
||||
"nixpkgs-stable": {
|
||||
|
|
@ -77,10 +77,10 @@
|
|||
"homepage": "",
|
||||
"owner": "oxalica",
|
||||
"repo": "rust-overlay",
|
||||
"rev": "f45f856ae5a9fe2c48d756fa17bb9c5b3b8070c5",
|
||||
"sha256": "152pw4a1vs4kiwfmncsc9d4zgd3v1li09adqm9ssq62jmxvzz217",
|
||||
"rev": "e6c6adb0438a46baaf820d3f52ca587b44437d34",
|
||||
"sha256": "0kcq4q8g5xc7iyj39523p1zkj5hjs403q1cykc78mcq4l20k702a",
|
||||
"type": "tarball",
|
||||
"url": "https://github.com/oxalica/rust-overlay/archive/f45f856ae5a9fe2c48d756fa17bb9c5b3b8070c5.tar.gz",
|
||||
"url": "https://github.com/oxalica/rust-overlay/archive/e6c6adb0438a46baaf820d3f52ca587b44437d34.tar.gz",
|
||||
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
|
||||
},
|
||||
"rustsec-advisory-db": {
|
||||
|
|
@ -89,10 +89,10 @@
|
|||
"homepage": "https://rustsec.org",
|
||||
"owner": "RustSec",
|
||||
"repo": "advisory-db",
|
||||
"rev": "a25cb0b593af26eeb7823a407163ec130028d62f",
|
||||
"sha256": "19bc3qik3599nv1h89phq0k6miapgfvpkza3y52d80gnrn2zfma4",
|
||||
"rev": "c83c210200de080c359cac76ea5abb9af003f4e4",
|
||||
"sha256": "0lfhir3f1cr8bcik0fm1vq31vrlxbxwlm6ngq752650yyfxfw6rn",
|
||||
"type": "tarball",
|
||||
"url": "https://github.com/RustSec/advisory-db/archive/a25cb0b593af26eeb7823a407163ec130028d62f.tar.gz",
|
||||
"url": "https://github.com/RustSec/advisory-db/archive/c83c210200de080c359cac76ea5abb9af003f4e4.tar.gz",
|
||||
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -9,9 +9,9 @@ pkgs.terraform-providers.mkProvider rec {
|
|||
owner = "glesys";
|
||||
repo = "terraform-provider-glesys";
|
||||
rev = "v${version}";
|
||||
sha256 = "1hlqa4f9d44hq614ff8ivg8a6fwg48jwz11zsrlghjzky82cfraq";
|
||||
hash = "sha256:1hlqa4f9d44hq614ff8ivg8a6fwg48jwz11zsrlghjzky82cfraq";
|
||||
|
||||
vendorSha256 = "0g5g69absf0vmin0ff0anrxcgfq0bzx4iz3qci90p9xkvyph4nlw";
|
||||
vendorHash = "sha256:0g5g69absf0vmin0ff0anrxcgfq0bzx4iz3qci90p9xkvyph4nlw";
|
||||
|
||||
# This provider is not officially published in the TF registry, so
|
||||
# we're giving it a fake source here.
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue