From 44fbd03e79d43023381c1c583c24cccc6f9862fe Mon Sep 17 00:00:00 2001 From: Soham S Gumaste Date: Wed, 6 Jul 2022 09:27:11 -0500 Subject: [PATCH 1/2] maintainers: Add SohamG --- maintainers/maintainer-list.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 796caa7bfc62..a5fc1fd799e9 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -14600,6 +14600,14 @@ github = "snpschaaf"; githubId = 105843013; }; + SohamG = { + email = "sohamg2@gmail.com"; + name = "Soham S Gumaste"; + github = "SohamG"; + keys = [{ + fingerprint = "E067 520F 5EF2 C175 3F60 50C0 BA46 725F 6A26 7442"; + }]; + }; jali-clarke = { email = "jinnah.ali-clarke@outlook.com"; name = "Jinnah Ali-Clarke"; From 1087880e0b8f022cabbc9a8129ca7a2aa8f16bc6 Mon Sep 17 00:00:00 2001 From: Soham S Gumaste Date: Tue, 5 Jul 2022 22:31:09 -0500 Subject: [PATCH 2/2] ocs-url: init at 3.1.0 This package is used by DE store pages to one click install themes/fonts and other assets. Signed-off-by: Soham S Gumaste --- maintainers/maintainer-list.nix | 1 + pkgs/tools/misc/ocs-url/default.nix | 43 +++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 3 files changed, 46 insertions(+) create mode 100644 pkgs/tools/misc/ocs-url/default.nix diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index a5fc1fd799e9..b10c15775ed6 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -14604,6 +14604,7 @@ email = "sohamg2@gmail.com"; name = "Soham S Gumaste"; github = "SohamG"; + githubId = 7116239; keys = [{ fingerprint = "E067 520F 5EF2 C175 3F60 50C0 BA46 725F 6A26 7442"; }]; diff --git a/pkgs/tools/misc/ocs-url/default.nix b/pkgs/tools/misc/ocs-url/default.nix new file mode 100644 index 000000000000..c5748d6ee4b3 --- /dev/null +++ b/pkgs/tools/misc/ocs-url/default.nix @@ -0,0 +1,43 @@ +{ lib, stdenv, fetchgit, libsForQt5 }: + +stdenv.mkDerivation rec { + name = "ocs-url"; + version = "3.1.0"; + + srcs = [ + (fetchgit { + url = "https://www.opencode.net/dfn2/ocs-url.git"; + rev = "release-${version}"; + sha256 = "RvbkcSj8iUAHAEOyETwfH+3XnCCY/p8XM8LgVrZxrws="; + }) + + (fetchgit { + url = "https://github.com/akiraohgaki/qtil"; + rev = "v0.4.0"; + sha256 = "XRSp0F7ggfkof1RNAnQU3+O9DcXDy81VR7NakITOXrw="; + }) + ]; + + sourceRoot = "ocs-url"; + + buildInputs = with libsForQt5.qt5; [ + qtbase + qtsvg + qtquickcontrols + qmake + wrapQtAppsHook + ]; + + # We are NOT in $sourceRoot here + postUnpack = '' + mkdir -p $sourceRoot/lib/qtil + cp -r qtil/* $sourceRoot/lib/qtil/ + ''; + + meta = with lib; { + description = "Open Collaboration System for use with DE store websites"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ SohamG ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7d327ea986ea..1489ef9761ee 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1244,6 +1244,8 @@ with pkgs; nominatim = callPackage ../servers/nominatim { }; + ocs-url = libsForQt5.callPackage ../tools/misc/ocs-url { }; + pferd = callPackage ../tools/misc/pferd {}; qFlipper = libsForQt515.callPackage ../tools/misc/qflipper { };