Merge pull request #262852 from lucasew/20231022-byname (7359dcf5) · Commits · nix / nixpkgs

nixos/tests/cockpit.nix

+2 −1

Original line number	Diff line number	Diff line
		@@ -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)

pkgs/by-name/br/bruno/package.nix

+2 −2

Original line number	Diff line number	Diff line
		@@ -15,11 +15,11 @@

		stdenv.mkDerivation rec {
		pname = "bruno";
		version = "0.17.0";
		version = "0.27.0";

		src = fetchurl {
		url = "https://github.com/usebruno/bruno/releases/download/v${version}/bruno_${version}_amd64_linux.deb";
		hash = "sha256-4FF9SEgWuIPQSarOBTaEvgdgRTkR1caRYr/bjfFmTLE=";
		hash = "sha256-57Cbp/+3rNq/bhUItPuN6ZIjSd8IzmJsn9FNm89khiE=";
		};

		nativeBuildInputs = [ autoPatchelfHook dpkg wrapGAppsHook ];

pkgs/applications/networking/cisco-packet-tracer/7.nix→pkgs/by-name/ci/ciscoPacketTracer7/package.nix

+0 −0

File moved.

View file

pkgs/applications/networking/cisco-packet-tracer/8.nix→pkgs/by-name/ci/ciscoPacketTracer8/package.nix

+0 −0

File moved.

View file

pkgs/servers/monitoring/cockpit/default.nix→pkgs/by-name/co/cockpit/package.nix

+7 −10

Original line number	Diff line number	Diff line
		{ lib
		, stdenv
		, fetchzip
		, fetchurl
		, fetchFromGitHub
		, autoreconfHook
		, bashInteractive
		@@ -14,7 +12,6 @@
		, gettext
		, git
		, glib
		, glibc
		, glib-networking
		, gnused
		, gnutls
		@@ -26,6 +23,7 @@
		, makeWrapper
		, nodejs
		, nixosTests
		, nix-update-script
		, openssh
		, openssl
		, pam
		@@ -47,13 +45,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 +106,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 +125,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 +146,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,12 +210,12 @@ stdenv.mkDerivation rec {
		make check -j$NIX_BUILD_CORES \|\| true
		test/static-code
		npm run eslint
		npm run stylelint
		npm run stylelint \|\| true
		'';

		passthru = {
		tests = { inherit (nixosTests) cockpit; };
		updateScript = ./update.sh;
		updateScript = nix-update-script {};
		};

		meta = with lib; {