cockpit: 287 -> 303

Signed-off-by: lucasew <lucas59356@gmail.com>
This commit is contained in:
lucasew 2023-10-22 21:08:26 -03:00
parent 185d0d9900
commit 4ec81766c2
2 changed files with 7 additions and 10 deletions

View File

@ -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)

View File

@ -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 = {