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

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

Browse source 
* //3p/overlays/tvl: nixpkgs-fmt 1.3.0 contains the fix we care about,
  so we can drop the override.

* //3p/nixpkgs: use awscli2 from stable nixpkgs as it's broken in
  unstable at the moment. Waiting on:
  https://nixpk.gs/pr-tracker.html?pr=178313

Change-Id: I9bb605d7940e53ebac80e3357799a3827a9415be
Reviewed-on: https://cl.tvl.fyi/c/depot/+/5890
Tested-by: BuildkiteCI
Autosubmit: sterni <sternenseemann@systemli.org>
Reviewed-by: tazjin <tazjin@tvl.su>
This commit is contained in:
sterni 2022-06-21 22:29:03 +02:00 committed by clbot
parent 807e7ec55f
commit 32b75c45c5
3 changed files with 18 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
third_party/nixpkgs/default.nix vendored
View file

@ -45,9 +45,13 @@ let
# instead (e.g. because something is broken in unstable). # instead (e.g. because something is broken in unstable).
# Use `stableNixpkgs` from above. # Use `stableNixpkgs` from above.
stableOverlay = _unstableSelf: _unstableSuper: { stableOverlay = _unstableSelf: _unstableSuper: {
inherit (stableNixpkgs)
# bat syntaxes changed with syntect 5.0, but cheddar is still on 4.x # bat syntaxes changed with syntect 5.0, but cheddar is still on 4.x
# TODO(tazjin): upgrade cheddar to syntect 5.0 # TODO(tazjin): upgrade cheddar to syntect 5.0
bat = stableNixpkgs.bat; bat
# TODO(sterni): Temporarily use awscli2 from stable, since it broke in unstable
awscli2
;
}; };
# Overlay to expose the nixpkgs commits we are using to other Nix code. # Overlay to expose the nixpkgs commits we are using to other Nix code.

16
third_party/overlays/tvl.nix vendored
View file

@ -74,22 +74,6 @@ in
}; };
})); }));
# bump nixpkgs-fmt to a version that doesn't touch whitespace in
# strings
nixpkgs-fmt = super.nixpkgs-fmt.overrideAttrs (old: rec {
src = self.fetchFromGitHub {
owner = "nix-community";
repo = "nixpkgs-fmt";
rev = "5ae8532b82eb040ca6b21ae2d02d9e88f604e76a";
sha256 = "0hjkbcgz62793hzfzlaxyah8a2c1k79n1k891lg7kfw8mkbq0w4p";
};
cargoDeps = old.cargoDeps.overrideAttrs (_: {
inherit src;
outputHash = "10if2lmv8d95j3walq3ggx3y423yfy4yl9vplw3apd0s671bly8b";
});
});
# upgrade home-manager until the service-generation fix has landed upstream # upgrade home-manager until the service-generation fix has landed upstream
# https://github.com/nix-community/home-manager/issues/2846 # https://github.com/nix-community/home-manager/issues/2846
home-manager = super.home-manager.overrideAttrs (old: rec { home-manager = super.home-manager.overrideAttrs (old: rec {

22
third_party/sources/sources.json vendored
View file

@ -17,10 +17,10 @@
"homepage": "", "homepage": "",
"owner": "nix-community", "owner": "nix-community",
"repo": "emacs-overlay", "repo": "emacs-overlay",
"rev": "e53bba119c56cb4983c84f41b24b8fc01a01b188", "rev": "843a950588e33a0ef1451f255cc1558833e3e474",
"sha256": "1wl245h5f70fd0pdn2bs2hmjs687srzvsdjlblrpv8s0r5rhsx1n", "sha256": "0md4r2wl3aw72pbh83qpldspiprbp4nv1lmmcjxv48krik4qdr65",
"type": "tarball", "type": "tarball",
"url": "https://github.com/nix-community/emacs-overlay/archive/e53bba119c56cb4983c84f41b24b8fc01a01b188.tar.gz", "url": "https://github.com/nix-community/emacs-overlay/archive/843a950588e33a0ef1451f255cc1558833e3e474.tar.gz",
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz" "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
}, },
"impermanence": { "impermanence": {
@ -53,10 +53,10 @@
"homepage": "", "homepage": "",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "6616de389ed55fba6eeba60377fc04732d5a207c", "rev": "0d68d7c857fe301d49cdcd56130e0beea4ecd5aa",
"sha256": "1h8lvyrv4sb5fhimzniiw6zjn74hl30zm9g8nzcaq331bd20gpw6", "sha256": "1lq2lirv5mkx74aly30xfhdwz7jq9hv4nrs49j693pv96z0p63gf",
"type": "tarball", "type": "tarball",
"url": "https://github.com/NixOS/nixpkgs/archive/6616de389ed55fba6eeba60377fc04732d5a207c.tar.gz", "url": "https://github.com/NixOS/nixpkgs/archive/0d68d7c857fe301d49cdcd56130e0beea4ecd5aa.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": {
@ -65,10 +65,10 @@
"homepage": "", "homepage": "",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "9227bbe43157225414e990b87587ccb1665225d9", "rev": "63198c9ccefdbd337cef0d85db0ea2689f4ce418",
"sha256": "0w8g75p9xdiw3075azmqalyl4ss8fzzc5cnnwhlqp21mp15mpx7b", "sha256": "05gc6xyv8a2dppngm1q44j85j769lr90lg20s6jv62gfg344i50r",
"type": "tarball", "type": "tarball",
"url": "https://github.com/NixOS/nixpkgs/archive/9227bbe43157225414e990b87587ccb1665225d9.tar.gz", "url": "https://github.com/NixOS/nixpkgs/archive/63198c9ccefdbd337cef0d85db0ea2689f4ce418.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": {
@ -77,10 +77,10 @@
"homepage": "https://rustsec.org", "homepage": "https://rustsec.org",
"owner": "RustSec", "owner": "RustSec",
"repo": "advisory-db", "repo": "advisory-db",
"rev": "f10f232879003e9a0d3b120c534268faddbff874", "rev": "49fb6c0b9418350332fa1e944ec83a5556ec5d91",
"sha256": "0d11rir2m22jf1k0fjakx4b0n3w69i2hl7jhwnhq5dd8qfg2s31j", "sha256": "0d11rir2m22jf1k0fjakx4b0n3w69i2hl7jhwnhq5dd8qfg2s31j",
"type": "tarball", "type": "tarball",
"url": "https://github.com/RustSec/advisory-db/archive/f10f232879003e9a0d3b120c534268faddbff874.tar.gz", "url": "https://github.com/RustSec/advisory-db/archive/49fb6c0b9418350332fa1e944ec83a5556ec5d91.tar.gz",
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz" "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
} }
} }