From 9a89dc1cff1e9983407f623b83bd1eb640c8f77f Mon Sep 17 00:00:00 2001 From: John Garcia Date: Wed, 4 Sep 2024 18:17:10 +0100 Subject: [PATCH 1/2] onedrivegui: 1.0.3 -> 1.1.0rc3 --- pkgs/by-name/on/onedrivegui/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/on/onedrivegui/package.nix b/pkgs/by-name/on/onedrivegui/package.nix index 53dda082e8d5..045b0e2b468c 100644 --- a/pkgs/by-name/on/onedrivegui/package.nix +++ b/pkgs/by-name/on/onedrivegui/package.nix @@ -9,7 +9,7 @@ }: let - version = "1.0.3"; + version = "1.1.0rc3"; setupPy = writeText "setup.py" '' from setuptools import setup @@ -31,7 +31,7 @@ python3Packages.buildPythonApplication rec { owner = "bpozdena"; repo = "OneDriveGUI"; rev = "v${version}"; - hash = "sha256-HutziAzhIDYP8upNPieL2GNrxPBHUCVs09FFxdSqeBs="; + hash = "sha256-d5NAcT3x9R/2DVQKZsw4GH63nTlVFsvkWwMrb42s18s="; }; nativeBuildInputs = [ copyDesktopItems makeWrapper ]; From 2ac6d58a7c3f396c5b8fd02e9ca18522d1ff1031 Mon Sep 17 00:00:00 2001 From: John Garcia Date: Wed, 4 Sep 2024 18:17:37 +0100 Subject: [PATCH 2/2] onedrivegui: format with nixfmt --- pkgs/by-name/on/onedrivegui/package.nix | 31 ++++++++++++++++--------- 1 file changed, 20 insertions(+), 11 deletions(-) diff --git a/pkgs/by-name/on/onedrivegui/package.nix b/pkgs/by-name/on/onedrivegui/package.nix index 045b0e2b468c..2277cb5248de 100644 --- a/pkgs/by-name/on/onedrivegui/package.nix +++ b/pkgs/by-name/on/onedrivegui/package.nix @@ -1,11 +1,12 @@ -{ lib -, python3Packages -, fetchFromGitHub -, writeText -, copyDesktopItems -, makeDesktopItem -, makeWrapper -, onedrive +{ + lib, + python3Packages, + fetchFromGitHub, + writeText, + copyDesktopItems, + makeDesktopItem, + makeWrapper, + onedrive, }: let @@ -34,9 +35,15 @@ python3Packages.buildPythonApplication rec { hash = "sha256-d5NAcT3x9R/2DVQKZsw4GH63nTlVFsvkWwMrb42s18s="; }; - nativeBuildInputs = [ copyDesktopItems makeWrapper ]; + nativeBuildInputs = [ + copyDesktopItems + makeWrapper + ]; - propagatedBuildInputs = with python3Packages; [ pyside6 requests ]; + propagatedBuildInputs = with python3Packages; [ + pyside6 + requests + ]; # wrap manually to avoid having a bash script in $out/bin with a .py extension dontWrapPythonPrograms = true; @@ -73,7 +80,9 @@ python3Packages.buildPythonApplication rec { makeWrapper ${python3Packages.python.interpreter} $out/bin/onedrivegui \ --prefix PATH : ${lib.makeBinPath [ onedrive ]} \ - --prefix PYTHONPATH : ${python3Packages.makePythonPath (propagatedBuildInputs ++ [(placeholder "out")])} \ + --prefix PYTHONPATH : ${ + python3Packages.makePythonPath (propagatedBuildInputs ++ [ (placeholder "out") ]) + } \ --add-flags $out/${python3Packages.python.sitePackages}/OneDriveGUI.py '';