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

chore(3p): bump unstable channel to 2021-07-03

Browse source 
Didn't bother to update the stable channel as it is unused currently.

Changes required:

* tazjin/frog, grfn/modules/obs:
  Remove obs-v4l2sink as it has been integrated into upstream OBS and
  the package removed from nixpkgs subsequently (at least according to
  the `builtins.throw`-message).

Change-Id: I4335ed060eef2c4ff8ac55a68d894bcc3d8ef4a3
Reviewed-on: https://cl.tvl.fyi/c/depot/+/3243
Tested-by: BuildkiteCI
Reviewed-by: grfn <grfn@gws.fyi>
Reviewed-by: tazjin <mail@tazj.in>
This commit is contained in:
sterni 2021-07-07 00:25:57 +02:00
parent f32cc0ecb1
commit 02aaed54f6
3 changed files with 3 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
third_party/nixpkgs/default.nix vendored
View file

@ -13,10 +13,10 @@ let
# nixos-unstable, and the current stable channel of the latest NixOS
# release.
# Tracking nixpkgs-unstable as of 2021-06-14.
# Tracking nixpkgs-unstable as of 2021-07-03.
unstableHashes = {
commit = "432fc2d9a67f92e05438dff5fdc2b39d33f77997";
sha256 = "0npj480pxjzl5vjsbijsn275z48jpqpjp0q5xbwpr3fx6m8lcvr6";
commit = "20887e4bbfdae3aed6bfa1f53ddf138ee325515e";
sha256 = "0hc79sv59appb7bynz5bzyqvrapyjdq63s79i649vxl93504kmnv";
};
# Tracking nixos-21.05 as of 2021-06-02.

3
users/grfn/system/home/modules/obs.nix
View file

@ -63,7 +63,4 @@ in
"${obs-input-overlay}/lib/obs-plugins/input-overlay.so";
xdg.configFile."obs-studio/plugins/input-overlay/data".source =
"${obs-input-overlay}/share/obs/obs-plugins/input-overlay";
xdg.configFile."obs-studio/plugins/obs-v4l2sink/bin/64bit/obs-v4l2sink.so".source =
"${pkgs.obs-v4l2sink}/share/obs/obs-plugins/v4l2sink/bin/64bit/v4l2sink.so";
}

1
users/tazjin/nixos/frog/default.nix
View file

@ -248,7 +248,6 @@ in lib.fix(self: {
nix-prefetch-github
notmuch
obs-studio
obs-v4l2sink
openssh
openssl
pass