diff --git a/hosts/common/programs/mpv/default.nix b/hosts/common/programs/mpv/default.nix index d55c365c8..a89ec4255 100644 --- a/hosts/common/programs/mpv/default.nix +++ b/hosts/common/programs/mpv/default.nix @@ -41,7 +41,7 @@ let cfg = config.sane.programs.mpv; - uosc = pkgs.mpvScripts.uosc.overrideAttrs (upstream: { + uosc = pkgs.mpvScripts.uosc.overrideAttrs (upstream: rec { version = "5.2.0-unstable-2024-05-07"; src = lib.warnIf (lib.versionOlder "5.2.0" upstream.version) "uosc outdated; remove patch?" pkgs.fetchFromGitHub { owner = "tomasklaen"; @@ -57,6 +57,12 @@ let # hash = "sha256-lpqk4nnCxDZr/Y7/seM4VyR30fVrDAT4VP7C8n88lvA="; # }; + tools = pkgs.buildGoModule { + pname = "uosc-bin"; + inherit version src; + vendorHash = "sha256-nkY0z2GiDxfNs98dpe+wZNI3dAXcuHaD/nHiZ2XnZ1Y="; + }; + postPatch = (upstream.postPatch or "") + '' ### patch so touch controls work well with sway 1.9+ ### in particular, "mouse.hover" is *always* false for touch events (i guess this is a bug in mpv?) diff --git a/pkgs/by-name/nixpkgs-bootstrap/master.nix b/pkgs/by-name/nixpkgs-bootstrap/master.nix index ed1ddb8bd..b425e64eb 100644 --- a/pkgs/by-name/nixpkgs-bootstrap/master.nix +++ b/pkgs/by-name/nixpkgs-bootstrap/master.nix @@ -8,8 +8,8 @@ mkNixpkgs ? import ./mkNixpkgs.nix {}, }: mkNixpkgs { - rev = "5a612580129e32f7db2350feb67a48d22c994080"; - sha256 = "sha256-1nSLSlvVw0O0jrgoFpN/blB+OVkqqKDI9WMFUbBTfdE="; - version = "0-unstable-2025-04-24"; + rev = "e406066f94d2cb4a17d708f99bcb892ec2934e12"; + sha256 = "sha256-hQ7qPsFM+FTCcx/AIg4OOeUFTV1i/4LOAXmtN2/2wOY="; + version = "0-unstable-2025-04-25"; branch = "master"; } diff --git a/pkgs/by-name/nixpkgs-bootstrap/staging-next.nix b/pkgs/by-name/nixpkgs-bootstrap/staging-next.nix index 5ee36a4e2..131945993 100644 --- a/pkgs/by-name/nixpkgs-bootstrap/staging-next.nix +++ b/pkgs/by-name/nixpkgs-bootstrap/staging-next.nix @@ -2,8 +2,8 @@ mkNixpkgs ? import ./mkNixpkgs.nix {}, }: mkNixpkgs { - rev = "955832a50a55455a007a5370fffeb47a9c896e57"; - sha256 = "sha256-Z+p/jUi9roeKPBP+AN/YM138NyYatJuHZKpPP/VU8zg="; - version = "0-unstable-2025-04-24"; + rev = "b6973f28b05deacd26ed0852554be2bbfa86aa1b"; + sha256 = "sha256-op/F7WPd9yjSVs1SCwmgQ4SP1CMoOj3qvtmi1kQsk3M="; + version = "0-unstable-2025-04-25"; branch = "staging-next"; } diff --git a/pkgs/by-name/nixpkgs-bootstrap/staging.nix b/pkgs/by-name/nixpkgs-bootstrap/staging.nix index 48ab53580..d510f7f3b 100644 --- a/pkgs/by-name/nixpkgs-bootstrap/staging.nix +++ b/pkgs/by-name/nixpkgs-bootstrap/staging.nix @@ -2,8 +2,8 @@ mkNixpkgs ? import ./mkNixpkgs.nix {}, }: mkNixpkgs { - rev = "d49ca5cb7e2474f22485ad2ddece025d22a029d3"; - sha256 = "sha256-rRMAb44aVlBoFrclPx9Cheo+TlGbLkOv4p8cObiG//s="; - version = "0-unstable-2025-04-24"; + rev = "5fcf24509b59e3b91ed348c6f53222f5c5c8918d"; + sha256 = "sha256-xOJq0/PPrs7ZfaBUuk4XNSYlLyQATqq8o6NXvOT6cMo="; + version = "0-unstable-2025-04-25"; branch = "staging"; }