diff --git a/pkgs/by-name/co/cockpit/package.nix b/pkgs/by-name/co/cockpit/package.nix index 14bfa8fe51d4..55d6fed592a4 100644 --- a/pkgs/by-name/co/cockpit/package.nix +++ b/pkgs/by-name/co/cockpit/package.nix @@ -2,7 +2,7 @@ lib, stdenv, fetchFromGitHub, - asciidoc, + asciidoctor, autoreconfHook, bashInteractive, cacert, @@ -53,18 +53,18 @@ in stdenv.mkDerivation (finalAttrs: { pname = "cockpit"; - version = "360"; + version = "361"; src = fetchFromGitHub { owner = "cockpit-project"; repo = "cockpit"; tag = finalAttrs.version; - hash = "sha256-nxucAln5iBRORgLtgslenBNxp6gCd7FauDbb3X7/3xQ="; + hash = "sha256-/OaFNUUz6W1du9b7esEz1VHtx7MEphbXhyybyWwPc2Y="; fetchSubmodules = true; }; nativeBuildInputs = [ - asciidoc + asciidoctor autoreconfHook makeWrapper docbook_xml_dtd_43 @@ -171,11 +171,6 @@ stdenv.mkDerivation (finalAttrs: { --replace-fail "/usr/lib/polkit-1/polkit-agent-helper-1" "/run/wrappers/bin/polkit-agent-helper-1" ''; - preConfigure = '' - # Make sure our Python comes before any other Python (e.g. from asciidoc) - export PATH="${lib.makeBinPath [ python3Packages.python ]}:$PATH" - ''; - configureFlags = [ "--enable-prefix-only=yes" "--disable-pcp" # TODO: figure out how to package its dependency