From 4ec81766c24419286ee41b39c04b502ecb770d4d Mon Sep 17 00:00:00 2001
From: lucasew <lucas59356@gmail.com>
Date: Sun, 22 Oct 2023 21:08:26 -0300
Subject: [PATCH] cockpit: 287 -> 303

Signed-off-by: lucasew <lucas59356@gmail.com>
---
 nixos/tests/cockpit.nix             |  3 ++-
 pkgs/by-name/co/cockpit/package.nix | 14 +++++---------
 2 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/nixos/tests/cockpit.nix b/nixos/tests/cockpit.nix
index 6f86d1e2c464..e7165b979014 100644
--- a/nixos/tests/cockpit.nix
+++ b/nixos/tests/cockpit.nix
@@ -50,7 +50,8 @@ import ./make-test-python.nix (
             options = Options()
             options.add_argument("--headless")
 
-            driver = webdriver.Firefox(options=options)
+            service = webdriver.FirefoxService(executable_path="${lib.getExe pkgs.geckodriver}")  # noqa: E501
+            driver = webdriver.Firefox(options=options, service=service)
 
             driver.implicitly_wait(10)
 
diff --git a/pkgs/by-name/co/cockpit/package.nix b/pkgs/by-name/co/cockpit/package.nix
index f73f391f71b9..ab73d770dd9b 100644
--- a/pkgs/by-name/co/cockpit/package.nix
+++ b/pkgs/by-name/co/cockpit/package.nix
@@ -1,7 +1,5 @@
 { lib
 , stdenv
-, fetchzip
-, fetchurl
 , fetchFromGitHub
 , autoreconfHook
 , bashInteractive
@@ -14,7 +12,6 @@
 , gettext
 , git
 , glib
-, glibc
 , glib-networking
 , gnused
 , gnutls
@@ -47,13 +44,13 @@ in
 
 stdenv.mkDerivation rec {
   pname = "cockpit";
-  version = "287";
+  version = "303";
 
   src = fetchFromGitHub {
     owner = "cockpit-project";
     repo = "cockpit";
     rev = "refs/tags/${version}";
-    sha256 = "sha256-tIZOI3jiMRaGHMXS1mA1Tom9ij3L/VuxDUJdnEc7SSc=";
+    hash = "sha256-1VPnmb4VDSwzdXtk2YZVHH4qFJSe2OPzsmzVD/NkbYg=";
     fetchSubmodules = true;
   };
 
@@ -108,6 +105,7 @@ stdenv.mkDerivation rec {
       --replace 'devel@lists.cockpit-project.org' 'https://github.com/NixOS/nixpkgs/issues/new?assignees=&labels=0.kind%3A+bug&template=bug_report.md&title=cockpit%25'
 
     patchShebangs \
+      build.js \
       test/common/pixel-tests \
       test/common/run-tests \
       test/common/tap-cdp \
@@ -126,9 +124,6 @@ stdenv.mkDerivation rec {
 
     cp node_modules/.package-lock.json package-lock.json
 
-    substituteInPlace src/systemd_ctypes/libsystemd.py \
-      --replace libsystemd.so.0 ${systemd}/lib/libsystemd.so.0
-
     for f in pkg/**/*.js pkg/**/*.jsx test/**/* src/**/*; do
       # some files substituteInPlace report as missing and it's safe to ignore them
       substituteInPlace "$(realpath "$f")" \
@@ -150,6 +145,7 @@ stdenv.mkDerivation rec {
     "--disable-pcp" # TODO: figure out how to package its dependency
     "--with-default-session-path=/run/wrappers/bin:/run/current-system/sw/bin"
     "--with-admin-group=root" # TODO: really? Maybe "wheel"?
+    "--enable-old-bridge=yes"
   ];
 
   enableParallelBuilding = true;
@@ -213,7 +209,7 @@ stdenv.mkDerivation rec {
     make check  -j$NIX_BUILD_CORES || true
     test/static-code
     npm run eslint
-    npm run stylelint
+    npm run stylelint || true
   '';
 
   passthru = {