diff options
| author | sterni <sternenseemann@systemli.org> | 2021-07-06T22·25+0200 |
|---|---|---|
| committer | sterni <sternenseemann@systemli.org> | 2021-07-16T13·57+0000 |
| commit | 02aaed54f67308d7ab05aad0cf80eb567d0f23c2 (patch) | |
| tree | ccb74a05286ee2dcefe245f52f40af19247b4c07 | |
| parent | f32cc0ecb12d5292881dbe3bd3c036bf941dc182 (diff) | |
chore(3p): bump unstable channel to 2021-07-03 r/2694
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>
| -rw-r--r-- | third_party/nixpkgs/default.nix | 6 | ||||
| -rw-r--r-- | users/grfn/system/home/modules/obs.nix | 3 | ||||
| -rw-r--r-- | users/tazjin/nixos/frog/default.nix | 1 |
3 files changed, 3 insertions, 7 deletions
diff --git a/third_party/nixpkgs/default.nix b/third_party/nixpkgs/default.nix index 681c8b1b9da7..edbeec8cb92a 100644 --- a/third_party/nixpkgs/default.nix +++ b/third_party/nixpkgs/default.nix @@ -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. diff --git a/users/grfn/system/home/modules/obs.nix b/users/grfn/system/home/modules/obs.nix index 39f7bbe3c6fc..d1dade477ccc 100644 --- a/users/grfn/system/home/modules/obs.nix +++ b/users/grfn/system/home/modules/obs.nix @@ -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"; } diff --git a/users/tazjin/nixos/frog/default.nix b/users/tazjin/nixos/frog/default.nix index 325483aafbfe..b3c803c87131 100644 --- a/users/tazjin/nixos/frog/default.nix +++ b/users/tazjin/nixos/frog/default.nix @@ -248,7 +248,6 @@ in lib.fix(self: { nix-prefetch-github notmuch obs-studio - obs-v4l2sink openssh openssl pass |