diff --git a/pkgs/applications/virtualization/docker/default.nix b/pkgs/applications/virtualization/docker/default.nix index 85c5d60af109..26754231051b 100644 --- a/pkgs/applications/virtualization/docker/default.nix +++ b/pkgs/applications/virtualization/docker/default.nix @@ -113,13 +113,13 @@ let }); docker-tini = tini.overrideAttrs { - pname = "docker-init"; + pname = "docker-tini"; inherit version; src = fetchFromGitHub { owner = "krallin"; repo = "tini"; - tag = tiniRev; + rev = tiniRev; hash = tiniHash; }; @@ -401,8 +401,8 @@ in runcHash = "sha256-J/QmOZxYnMPpzm87HhPTkYdt+fN+yeSUu2sv6aUeTY4="; containerdRev = "v1.7.27"; containerdHash = "sha256-H94EHnfW2Z59KcHcbfJn+BipyZiNUvHe50G5EXbrIps="; - tiniRev = "v0.19.0"; - tiniHash = "sha256-ZDKu/8yE5G0RYFJdhgmCdN3obJNyRWv6K/Gd17zc1sI="; + tiniRev = "369448a167e8b3da4ca5bca0b3307500c3371828"; + tiniHash = "sha256-jCBNfoJAjmcTJBx08kHs+FmbaU82CbQcf0IVjd56Nuw="; }; docker_28 = @@ -419,8 +419,8 @@ in runcHash = "sha256-oXoDio3l23Z6UyAhb9oDMo1O4TLBbFyLh9sRWXnfLVY="; containerdRev = "v1.7.28"; containerdHash = "sha256-vz7RFJkFkMk2gp7bIMx1kbkDFUMS9s0iH0VoyD9A21s="; - tiniRev = "v0.19.0"; - tiniHash = "sha256-ZDKu/8yE5G0RYFJdhgmCdN3obJNyRWv6K/Gd17zc1sI="; + tiniRev = "369448a167e8b3da4ca5bca0b3307500c3371828"; + tiniHash = "sha256-jCBNfoJAjmcTJBx08kHs+FmbaU82CbQcf0IVjd56Nuw="; }; } diff --git a/pkgs/by-name/op/openhmd/package.nix b/pkgs/by-name/op/openhmd/package.nix index 01fc1d072edf..6795d1aa8563 100644 --- a/pkgs/by-name/op/openhmd/package.nix +++ b/pkgs/by-name/op/openhmd/package.nix @@ -26,6 +26,13 @@ stdenv.mkDerivation rec { sha256 = "1hkpdl4zgycag5k8njvqpx01apxmm8m8pvhlsxgxpqiqy9a38ccg"; }; + # substitute for CMake 4 compat + # "OpenHMD is currently NOT ACTIVELY MAINTAINED" in upstream README + postPatch = '' + substituteInPlace CMakeLists.txt \ + --replace-fail "cmake_minimum_required(VERSION 3.1)" "cmake_minimum_required(VERSION 3.10)" + ''; + nativeBuildInputs = [ cmake pkg-config