From b2306ddcb8e2cf8d052f5cc57177203727d940d0 Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Mon, 19 Aug 2024 11:57:12 +0200 Subject: [PATCH 1/2] process-cpp: 3.0.1-unstable-2024-03-14 -> 3.0.2 --- pkgs/by-name/pr/process-cpp/package.nix | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/pkgs/by-name/pr/process-cpp/package.nix b/pkgs/by-name/pr/process-cpp/package.nix index 2a04e385c3254..8b6ac5676c43d 100644 --- a/pkgs/by-name/pr/process-cpp/package.nix +++ b/pkgs/by-name/pr/process-cpp/package.nix @@ -2,7 +2,7 @@ , stdenv , fetchFromGitLab , testers -, unstableGitUpdater +, gitUpdater , cmake , coreutils , boost @@ -14,14 +14,14 @@ stdenv.mkDerivation (finalAttrs: { pname = "process-cpp"; - version = "3.0.1-unstable-2024-03-14"; + version = "3.0.2"; src = fetchFromGitLab { domain = "gitlab.com"; owner = "ubports"; repo = "development/core/lib-cpp/process-cpp"; - rev = "7b0a829abcbcdd25d949e5f9e2c26bb985a58b31"; - hash = "sha256-Az+lSJ7uVR4pAWvOeah5vFtIPb12eKp0nAFF1qsHZXA="; + rev = finalAttrs.version; + hash = "sha256-UCNmD5Ea2wnEwG9gkt88TaX0vfS4SCaIOPRMeNFx80Y="; }; outputs = [ @@ -64,15 +64,15 @@ stdenv.mkDerivation (finalAttrs: { passthru = { tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; - updateScript = unstableGitUpdater { }; + updateScript = gitUpdater { }; }; - meta = with lib; { + meta = { description = "Simple convenience library for handling processes in C++11"; homepage = "https://gitlab.com/ubports/development/core/lib-cpp/process-cpp"; - license = with licenses; [ gpl3Only lgpl3Only ]; - maintainers = with maintainers; [ onny OPNA2608 ]; - platforms = platforms.linux; + license = with lib.licenses; [ gpl3Only lgpl3Only ]; + maintainers = with lib.maintainers; [ onny OPNA2608 ]; + platforms = lib.platforms.linux; pkgConfigModules = [ "process-cpp" ]; }; }) From 29058a4be2bb175873e86c5c8451de079c7d966c Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Mon, 19 Aug 2024 11:57:56 +0200 Subject: [PATCH 2/2] process-cpp: nixfmt --- pkgs/by-name/pr/process-cpp/package.nix | 43 +++++++++++++------------ 1 file changed, 23 insertions(+), 20 deletions(-) diff --git a/pkgs/by-name/pr/process-cpp/package.nix b/pkgs/by-name/pr/process-cpp/package.nix index 8b6ac5676c43d..eb9638e74ab1b 100644 --- a/pkgs/by-name/pr/process-cpp/package.nix +++ b/pkgs/by-name/pr/process-cpp/package.nix @@ -1,15 +1,16 @@ -{ lib -, stdenv -, fetchFromGitLab -, testers -, gitUpdater -, cmake -, coreutils -, boost -, gtest -, lomiri -, properties-cpp -, pkg-config +{ + lib, + stdenv, + fetchFromGitLab, + testers, + gitUpdater, + cmake, + coreutils, + boost, + gtest, + lomiri, + properties-cpp, + pkg-config, }: stdenv.mkDerivation (finalAttrs: { @@ -52,13 +53,9 @@ stdenv.mkDerivation (finalAttrs: { properties-cpp ]; - checkInputs = [ - gtest - ]; + checkInputs = [ gtest ]; - cmakeFlags = [ - (lib.cmakeBool "BUILD_TESTING" finalAttrs.finalPackage.doCheck) - ]; + cmakeFlags = [ (lib.cmakeBool "BUILD_TESTING" finalAttrs.finalPackage.doCheck) ]; doCheck = stdenv.buildPlatform.canExecute stdenv.hostPlatform; @@ -70,8 +67,14 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "Simple convenience library for handling processes in C++11"; homepage = "https://gitlab.com/ubports/development/core/lib-cpp/process-cpp"; - license = with lib.licenses; [ gpl3Only lgpl3Only ]; - maintainers = with lib.maintainers; [ onny OPNA2608 ]; + license = with lib.licenses; [ + gpl3Only + lgpl3Only + ]; + maintainers = with lib.maintainers; [ + onny + OPNA2608 + ]; platforms = lib.platforms.linux; pkgConfigModules = [ "process-cpp" ]; };