From 1c134a8ffc29e7742d65ad913c6b380ae32f6817 Mon Sep 17 00:00:00 2001 From: PhiliPdB Date: Fri, 1 Aug 2025 20:38:39 +0200 Subject: [PATCH 1/3] onedrivegui: 1.1.1a -> 1.2.1, modernize Changelog: https://github.com/bpozdena/OneDriveGUI/compare/v1.1.1a...v1.2.1 --- pkgs/by-name/on/onedrivegui/package.nix | 30 ++++++++++++++----------- 1 file changed, 17 insertions(+), 13 deletions(-) diff --git a/pkgs/by-name/on/onedrivegui/package.nix b/pkgs/by-name/on/onedrivegui/package.nix index 93f296b61bd6..e5e630c158c8 100644 --- a/pkgs/by-name/on/onedrivegui/package.nix +++ b/pkgs/by-name/on/onedrivegui/package.nix @@ -11,7 +11,7 @@ }: let - version = "1.1.1a"; + version = "1.2.1"; setupPy = writeText "setup.py" '' from setuptools import setup @@ -28,15 +28,19 @@ in python3Packages.buildPythonApplication rec { pname = "onedrivegui"; inherit version; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "bpozdena"; repo = "OneDriveGUI"; - rev = "v${version}"; - hash = "sha256-pcY1JOi74pePvkIMRuHv5mlE4F68NzuBLJTCtgjUFRw="; + tag = "v${version}"; + hash = "sha256-QCSCJ1m/PKSpkfseq8fyDEHFyIt156Lp15JC04NY0ps="; }; + build-system = with python3Packages; [ + setuptools + ]; + nativeBuildInputs = [ copyDesktopItems qt6.wrapQtAppsHook @@ -48,7 +52,7 @@ python3Packages.buildPythonApplication rec { qt6.qtwayland ]; - propagatedBuildInputs = with python3Packages; [ + dependencies = with python3Packages; [ pyside6 requests ]; @@ -58,7 +62,7 @@ python3Packages.buildPythonApplication rec { dontWrapQtApps = true; doCheck = false; # No tests defined - pythonImportsCheck = [ "OneDriveGUI" ]; + # pythonImportsCheck = [ "OneDriveGUI" ]; # requires a display desktopItems = [ (makeDesktopItem { @@ -74,8 +78,8 @@ python3Packages.buildPythonApplication rec { ]; postPatch = '' - # Patch OneDriveGUI.py so DIR_PATH points to shared files location - sed -i src/OneDriveGUI.py -e "s@^DIR_PATH =.*@DIR_PATH = '$out/share/OneDriveGUI'@" + # Patch global_config.py so DIR_PATH points to shared files location + sed -i src/global_config.py -e "s@^DIR_PATH =.*@DIR_PATH = '$out/share/OneDriveGUI'@" cp ${setupPy} ${setupPy.name} ''; @@ -91,17 +95,17 @@ python3Packages.buildPythonApplication rec { ''${qtWrapperArgs[@]} \ --prefix PATH : ${lib.makeBinPath [ onedrive ]} \ --prefix PYTHONPATH : ${ - python3Packages.makePythonPath (propagatedBuildInputs ++ [ (placeholder "out") ]) + python3Packages.makePythonPath (dependencies ++ [ (placeholder "out") ]) } \ --add-flags $out/${python3Packages.python.sitePackages}/OneDriveGUI.py ''; - meta = with lib; { + meta = { homepage = "https://github.com/bpozdena/OneDriveGUI"; description = "Simple GUI for Linux OneDrive Client, with multi-account support"; mainProgram = "onedrivegui"; - license = licenses.gpl3Only; - maintainers = with maintainers; [ ]; - platforms = platforms.linux; + license = lib.licenses.gpl3Only; + maintainers = with lib.maintainers; [ ]; + platforms = lib.platforms.linux; }; } From 0381027a38d7d241cb140a21e518e31e7340c6c6 Mon Sep 17 00:00:00 2001 From: PhiliPdB Date: Fri, 1 Aug 2025 20:43:35 +0200 Subject: [PATCH 2/3] onedrivegui: add update script --- pkgs/by-name/on/onedrivegui/package.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/by-name/on/onedrivegui/package.nix b/pkgs/by-name/on/onedrivegui/package.nix index e5e630c158c8..7f1538d0e154 100644 --- a/pkgs/by-name/on/onedrivegui/package.nix +++ b/pkgs/by-name/on/onedrivegui/package.nix @@ -8,6 +8,8 @@ makeDesktopItem, makeWrapper, onedrive, + + nix-update-script, }: let @@ -100,6 +102,8 @@ python3Packages.buildPythonApplication rec { --add-flags $out/${python3Packages.python.sitePackages}/OneDriveGUI.py ''; + passthru.updateScript = nix-update-script { }; + meta = { homepage = "https://github.com/bpozdena/OneDriveGUI"; description = "Simple GUI for Linux OneDrive Client, with multi-account support"; From 63c58039afdcea3d8f0fbb399fd5bc5dff742011 Mon Sep 17 00:00:00 2001 From: PhiliPdB Date: Fri, 1 Aug 2025 20:44:03 +0200 Subject: [PATCH 3/3] onedrivegui: add philipdb as maintainer --- pkgs/by-name/on/onedrivegui/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/on/onedrivegui/package.nix b/pkgs/by-name/on/onedrivegui/package.nix index 7f1538d0e154..15786a21c781 100644 --- a/pkgs/by-name/on/onedrivegui/package.nix +++ b/pkgs/by-name/on/onedrivegui/package.nix @@ -109,7 +109,7 @@ python3Packages.buildPythonApplication rec { description = "Simple GUI for Linux OneDrive Client, with multi-account support"; mainProgram = "onedrivegui"; license = lib.licenses.gpl3Only; - maintainers = with lib.maintainers; [ ]; + maintainers = with lib.maintainers; [ philipdb ]; platforms = lib.platforms.linux; }; }