From 533a80b695989977e8701cf7bb665ba185e9ce80 Mon Sep 17 00:00:00 2001 From: lucasew Date: Fri, 20 Oct 2023 11:49:29 -0300 Subject: [PATCH 01/10] ciscoPacketTracer: move to by-name Signed-off-by: lucasew --- .../7.nix => by-name/ci/ciscoPacketTracer7/package.nix} | 0 .../8.nix => by-name/ci/ciscoPacketTracer8/package.nix} | 0 pkgs/top-level/all-packages.nix | 4 ---- 3 files changed, 4 deletions(-) rename pkgs/{applications/networking/cisco-packet-tracer/7.nix => by-name/ci/ciscoPacketTracer7/package.nix} (100%) rename pkgs/{applications/networking/cisco-packet-tracer/8.nix => by-name/ci/ciscoPacketTracer8/package.nix} (100%) diff --git a/pkgs/applications/networking/cisco-packet-tracer/7.nix b/pkgs/by-name/ci/ciscoPacketTracer7/package.nix similarity index 100% rename from pkgs/applications/networking/cisco-packet-tracer/7.nix rename to pkgs/by-name/ci/ciscoPacketTracer7/package.nix diff --git a/pkgs/applications/networking/cisco-packet-tracer/8.nix b/pkgs/by-name/ci/ciscoPacketTracer8/package.nix similarity index 100% rename from pkgs/applications/networking/cisco-packet-tracer/8.nix rename to pkgs/by-name/ci/ciscoPacketTracer8/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f4176c9d68d7..2c11bc99f87f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -30919,10 +30919,6 @@ with pkgs; clapper = callPackage ../applications/video/clapper { }; - ciscoPacketTracer7 = callPackage ../applications/networking/cisco-packet-tracer/7.nix { }; - - ciscoPacketTracer8 = callPackage ../applications/networking/cisco-packet-tracer/8.nix { }; - claws-mail = callPackage ../applications/networking/mailreaders/claws-mail { }; cligh = python3Packages.callPackage ../development/tools/github/cligh { }; From fee543007f9a601c22e03fcf8963151220c0fd7c Mon Sep 17 00:00:00 2001 From: lucasew Date: Sun, 22 Oct 2023 20:37:35 -0300 Subject: [PATCH 02/10] whatsapp-emoji-font: move to by-name Signed-off-by: lucasew --- .../default.nix => by-name/wh/whatsapp-emoji-font/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 2 deletions(-) rename pkgs/{data/fonts/whatsapp-emoji/default.nix => by-name/wh/whatsapp-emoji-font/package.nix} (100%) diff --git a/pkgs/data/fonts/whatsapp-emoji/default.nix b/pkgs/by-name/wh/whatsapp-emoji-font/package.nix similarity index 100% rename from pkgs/data/fonts/whatsapp-emoji/default.nix rename to pkgs/by-name/wh/whatsapp-emoji-font/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2c11bc99f87f..f96e72cf5a7d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -30214,8 +30214,6 @@ with pkgs; vollkorn = callPackage ../data/fonts/vollkorn { }; - whatsapp-emoji-font = callPackage ../data/fonts/whatsapp-emoji { }; - weather-icons = callPackage ../data/fonts/weather-icons { }; whitesur-cursors = callPackage ../data/icons/whitesur-cursors { }; From 185d0d9900c0cff028bb0cf5b91f41d5e8a62fed Mon Sep 17 00:00:00 2001 From: lucasew Date: Sun, 22 Oct 2023 20:40:03 -0300 Subject: [PATCH 03/10] cockpit: move to by-name Signed-off-by: lucasew --- .../cockpit/default.nix => by-name/co/cockpit/package.nix} | 0 pkgs/{servers/monitoring => by-name/co}/cockpit/update.sh | 0 pkgs/top-level/all-packages.nix | 2 -- 3 files changed, 2 deletions(-) rename pkgs/{servers/monitoring/cockpit/default.nix => by-name/co/cockpit/package.nix} (100%) rename pkgs/{servers/monitoring => by-name/co}/cockpit/update.sh (100%) diff --git a/pkgs/servers/monitoring/cockpit/default.nix b/pkgs/by-name/co/cockpit/package.nix similarity index 100% rename from pkgs/servers/monitoring/cockpit/default.nix rename to pkgs/by-name/co/cockpit/package.nix diff --git a/pkgs/servers/monitoring/cockpit/update.sh b/pkgs/by-name/co/cockpit/update.sh similarity index 100% rename from pkgs/servers/monitoring/cockpit/update.sh rename to pkgs/by-name/co/cockpit/update.sh diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f96e72cf5a7d..521c047295b4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -26305,8 +26305,6 @@ with pkgs; clickhouse-backup = callPackage ../development/tools/database/clickhouse-backup { }; - cockpit = callPackage ../servers/monitoring/cockpit { }; - codeowners = callPackage ../development/tools/codeowners { }; couchdb3 = callPackage ../servers/http/couchdb/3.nix { }; From 4ec81766c24419286ee41b39c04b502ecb770d4d Mon Sep 17 00:00:00 2001 From: lucasew Date: Sun, 22 Oct 2023 21:08:26 -0300 Subject: [PATCH 04/10] cockpit: 287 -> 303 Signed-off-by: lucasew --- 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 = { From f28f64222941f3d7bbca6d43c7d022c8264e0c81 Mon Sep 17 00:00:00 2001 From: lucasew Date: Sun, 22 Oct 2023 22:42:10 -0300 Subject: [PATCH 05/10] bruno: 0.17.0 -> 0.27.0 Signed-off-by: lucasew --- pkgs/by-name/br/bruno/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/br/bruno/package.nix b/pkgs/by-name/br/bruno/package.nix index 4dfa1375ef7a..b058449ea224 100644 --- a/pkgs/by-name/br/bruno/package.nix +++ b/pkgs/by-name/br/bruno/package.nix @@ -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 ]; From e0680e03d19395b447d0fe73876719e68fa63345 Mon Sep 17 00:00:00 2001 From: lucasew Date: Sun, 22 Oct 2023 22:47:41 -0300 Subject: [PATCH 06/10] cockpit: simplify update script Signed-off-by: lucasew --- pkgs/by-name/co/cockpit/package.nix | 3 ++- pkgs/by-name/co/cockpit/update.sh | 8 -------- 2 files changed, 2 insertions(+), 9 deletions(-) delete mode 100755 pkgs/by-name/co/cockpit/update.sh diff --git a/pkgs/by-name/co/cockpit/package.nix b/pkgs/by-name/co/cockpit/package.nix index ab73d770dd9b..48bcff3f32a9 100644 --- a/pkgs/by-name/co/cockpit/package.nix +++ b/pkgs/by-name/co/cockpit/package.nix @@ -23,6 +23,7 @@ , makeWrapper , nodejs , nixosTests +, nix-update-script , openssh , openssl , pam @@ -214,7 +215,7 @@ stdenv.mkDerivation rec { passthru = { tests = { inherit (nixosTests) cockpit; }; - updateScript = ./update.sh; + updateScript = nix-update-script {}; }; meta = with lib; { diff --git a/pkgs/by-name/co/cockpit/update.sh b/pkgs/by-name/co/cockpit/update.sh deleted file mode 100755 index c1834db9d39c..000000000000 --- a/pkgs/by-name/co/cockpit/update.sh +++ /dev/null @@ -1,8 +0,0 @@ -#!/usr/bin/env nix-shell -#!nix-shell -i bash -p curl jq common-updater-scripts - -set -eu -o pipefail - -version="$(curl --silent "https://api.github.com/repos/cockpit-project/cockpit/releases" | jq '.[0].tag_name' --raw-output)" - -update-source-version cockpit "$version" From 3742d941f436136ca44827285c2d2b6220068f9f Mon Sep 17 00:00:00 2001 From: lucasew Date: Sun, 22 Oct 2023 22:48:37 -0300 Subject: [PATCH 07/10] python3Packages.qasync: 0.24.1 -> 0.26.1 Signed-off-by: lucasew --- pkgs/development/python-modules/qasync/default.nix | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/qasync/default.nix b/pkgs/development/python-modules/qasync/default.nix index bdbede92c5d4..c3761210a1c1 100644 --- a/pkgs/development/python-modules/qasync/default.nix +++ b/pkgs/development/python-modules/qasync/default.nix @@ -3,23 +3,28 @@ , fetchFromGitHub , pyqt5 , pytestCheckHook +, poetry-core }: buildPythonPackage rec { pname = "qasync"; - version = "0.24.1"; + version = "0.26.1"; + + format = "pyproject"; src = fetchFromGitHub { owner = "CabbageDevelopment"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-DAzmobw+c29Pt/URGO3bWXHBxgu9bDHhdTUBE9QJDe4="; + hash = "sha256-vtRmThXKxqof+Rz3Dngtc9tuwL1bPYFHDq4DBRCsrIU="; }; postPatch = '' rm qasync/_windows.py # Ignoring it is not taking effect and it will not be used on Linux ''; + buildInputs = [ poetry-core ]; + propagatedBuildInputs = [ pyqt5 ]; checkInputs = [ pytestCheckHook ]; From c3359081f8ac61bfa78cc6e69227bb66429f824b Mon Sep 17 00:00:00 2001 From: lucasew Date: Sun, 22 Oct 2023 22:49:23 -0300 Subject: [PATCH 08/10] python3Packages.orange3: 3.36.0 -> 3.36.1 Signed-off-by: lucasew --- pkgs/development/python-modules/orange3/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/orange3/default.nix b/pkgs/development/python-modules/orange3/default.nix index fa1204ffa733..da14f118c04d 100644 --- a/pkgs/development/python-modules/orange3/default.nix +++ b/pkgs/development/python-modules/orange3/default.nix @@ -44,7 +44,7 @@ let self = buildPythonPackage rec { pname = "orange3"; - version = "3.36.0"; + version = "3.36.1"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -53,7 +53,7 @@ let owner = "biolab"; repo = "orange3"; rev = "refs/tags/${version}"; - hash = "sha256-0HIhBdufc46cTOSXa0koelTfZd5sY7QantmwGWggoCU="; + hash = "sha256-O5ZN5O1vMkqiv83Q5UoaDefGnqVnDLPmYLLG20cdajk="; }; postPatch = '' From 53ff668819eb39bb2a247856be74a26906d53581 Mon Sep 17 00:00:00 2001 From: lucasew Date: Sun, 22 Oct 2023 23:50:14 -0300 Subject: [PATCH 09/10] python3Packages.orange-canvas-core: 0.1.32 -> 0.1.33 Signed-off-by: lucasew --- .../development/python-modules/orange-canvas-core/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/orange-canvas-core/default.nix b/pkgs/development/python-modules/orange-canvas-core/default.nix index 9c5381171e2f..814c90a698dc 100644 --- a/pkgs/development/python-modules/orange-canvas-core/default.nix +++ b/pkgs/development/python-modules/orange-canvas-core/default.nix @@ -18,11 +18,11 @@ buildPythonPackage rec { pname = "orange-canvas-core"; - version = "0.1.32"; + version = "0.1.33"; src = fetchPypi { inherit pname version; - hash = "sha256-UE5LHsG7BrJqC0rNRtUUqmXSPsYRVqodiU5DsB/6ECo="; + hash = "sha256-w3krij7+CtJl1XoJz3RRAAp2aKqMCQg/PBh5erf/Phs="; }; propagatedBuildInputs = [ From 03eb6b98803daa6365184c30fedb7d6334f2dff8 Mon Sep 17 00:00:00 2001 From: lucasew Date: Sun, 22 Oct 2023 23:50:30 -0300 Subject: [PATCH 10/10] orange3: fix build Signed-off-by: lucasew --- pkgs/development/python-modules/orange3/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/development/python-modules/orange3/default.nix b/pkgs/development/python-modules/orange3/default.nix index da14f118c04d..c8939f01e939 100644 --- a/pkgs/development/python-modules/orange3/default.nix +++ b/pkgs/development/python-modules/orange3/default.nix @@ -45,7 +45,6 @@ let self = buildPythonPackage rec { pname = "orange3"; version = "3.36.1"; - format = "pyproject"; disabled = pythonOlder "3.7";