From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp12.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms5.migadu.com with LMTPS id qLygCf6L4WLkTgEAbAwnHQ (envelope-from ) for ; Wed, 27 Jul 2022 21:03:26 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp12.migadu.com with LMTPS id YBGACf6L4WLnUwAAauVa8A (envelope-from ) for ; Wed, 27 Jul 2022 21:03:26 +0200 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id B9C5B8EAF for ; Wed, 27 Jul 2022 21:03:25 +0200 (CEST) Received: from localhost ([::1]:58618 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oGmJY-00069Z-Rj for larch@yhetil.org; Wed, 27 Jul 2022 15:03:24 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:50540) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oGmIN-0005Xv-80 for guix-patches@gnu.org; Wed, 27 Jul 2022 15:02:11 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:39044) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oGmIF-0004Le-87 for guix-patches@gnu.org; Wed, 27 Jul 2022 15:02:10 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1oGmIF-0005pi-3v for guix-patches@gnu.org; Wed, 27 Jul 2022 15:02:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#56803] [PATCH 6/6] gnu: Add hydrus-network. Resent-From: Tomasz Jeneralczyk Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 27 Jul 2022 19:02:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 56803 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 56803@debbugs.gnu.org Cc: Tomasz Jeneralczyk Received: via spool by 56803-submit@debbugs.gnu.org id=B56803.165894847822325 (code B ref 56803); Wed, 27 Jul 2022 19:02:03 +0000 Received: (at 56803) by debbugs.gnu.org; 27 Jul 2022 19:01:18 +0000 Received: from localhost ([127.0.0.1]:57023 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oGmHV-0005o0-89 for submit@debbugs.gnu.org; Wed, 27 Jul 2022 15:01:17 -0400 Received: from outgoing1.lunanode.net ([172.81.176.235]:42910) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oGmHS-0005nq-PC for 56803@debbugs.gnu.org; Wed, 27 Jul 2022 15:01:15 -0400 Received: from mail2.lunanode.net (mail2.lunanode.net [158.69.21.179]) by outgoing1.lunanode.net (Postfix) with ESMTPS id 91A1B4005F for <56803@debbugs.gnu.org>; Wed, 27 Jul 2022 19:01:14 +0000 (UTC) From: Tomasz Jeneralczyk Date: Wed, 27 Jul 2022 21:00:28 +0200 Message-Id: <9622a5d87b172e7f9ae838da45f15eb0ba95e374.1658946720.git.tj@schwi.pl> X-Mailer: git-send-email 2.37.1 In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Migadu-Flow: FLOW_IN X-Migadu-To: larch@yhetil.org X-Migadu-Country: US ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1658948605; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post; bh=VF03qFZtiuil+V0l1WHXttyEJt8WSG3fouGayeoNu0g=; b=UZNsPbzHez0hljkg04M+TuQQGoB0bEaoT20xiSk1H8wTtvQhHynh/BW1WYS2sYk0yhx54p Qqf5FDHegdPwD+1bhSGGVpmMUO+2kpkOb8a7NB3vVW+BWQe9iC3lHiKh10SJGQ2bGFFLXn Lk/h/7jlqMAtA4EPXYfDFDf2XLT/gPwq6otmHtKtYxIlldg+QVJsYHZkg7cT8+l5s5gLal XkvO939rMu9FpaMWR6ANPC75nVR5n4Ijv8lpgEg7BiRP28LhzI10MURjuwzPPFjdt6iYzo iyQ8TAS1M10tzJQ/bJ8wNe3Fnbm9VcDBVxk/LxEzguPcUT39uxgaFa3FMb7xYQ== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1658948605; a=rsa-sha256; cv=none; b=ePDTWlTxqQJqPggYriPuu6tVBOJwqKBSjfjG4ROMjSZY77qVguqJno355mbOjxaGw01CQH AOym9GlYPgnAqp3gcqnFhDE+O58995vNeik+6yfJ6Ix4Vzq09C/l3t4TmsQlJUzuKJWs7E hvJa4Qp69+26pmnSIDXqhqyfnygRAY5Tav75iJOMhcCaP5J+DuLHm4rClO6qncWRqavLh6 malyCaXXAtw2prvpbYQz7YXKYpNiXAqptLzEcZkdD2UENa4WAp66n7+G4+niZcSZWT2RuB Lj9zYCLMdqhVeFFKQ5fNs1IyEywlTOPqkWBy47oUYqzP2EKQbk+bIejtP4X6PA== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=none; dmarc=none; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" X-Migadu-Spam-Score: -1.93 Authentication-Results: aspmx1.migadu.com; dkim=none; dmarc=none; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" X-Migadu-Queue-Id: B9C5B8EAF X-Spam-Score: -1.93 X-Migadu-Scanner: scn1.migadu.com X-TUID: KvtLHf6Pb/fV Hydrus-network has a weekly release cycle and is meant to be used from its own directory so I artificially spread it out to comply with guix's expectations. Three binaries from inputs are copied into a directory hydrus knows about: * ffmpeg - works as expected * swftools - does not do anything neither on guix or Arch linux - possibly an unfinished feature, but I left it in, in case it gets fixed in a future version. * miniupnpc - times out on my system, but it should work otherwise. I was not able to build the program's help files. Updating python-pymdown-extensions to its latest version might be the solution, but this would require also packaging its new build system that is not present in guix yet. I decided to cut short there. Also adds copyright and new used modules. * gnu/packages/image-viewers.scm (hydrus-network): Add variable. --- gnu/packages/image-viewers.scm | 127 +++++++++++++++++++++++++++++++++ 1 file changed, 127 insertions(+) diff --git a/gnu/packages/image-viewers.scm b/gnu/packages/image-viewers.scm index 8d4d2351c3..9574384761 100644 --- a/gnu/packages/image-viewers.scm +++ b/gnu/packages/image-viewers.scm @@ -24,6 +24,7 @@ ;;; Copyright © 2021 Zheng Junjie <873216071@qq.com> ;;; Copyright © 2021 dissent ;;; Copyright © 2022 Michael Rohleder +;;; Copyright © 2022 Tomasz Jeneralczyk ;;; ;;; This file is part of GNU Guix. ;;; @@ -54,6 +55,7 @@ (define-module (gnu packages image-viewers) #:use-module (guix build-system qt) #:use-module (gnu packages autotools) #:use-module (gnu packages algebra) + #:use-module (gnu packages animation) #:use-module (gnu packages backup) #:use-module (gnu packages base) #:use-module (gnu packages bash) @@ -84,14 +86,20 @@ (define-module (gnu packages image-viewers) #:use-module (gnu packages photo) #:use-module (gnu packages pkg-config) #:use-module (gnu packages python) + #:use-module (gnu packages python-check) + #:use-module (gnu packages python-compression) + #:use-module (gnu packages python-crypto) + #:use-module (gnu packages python-web) #:use-module (gnu packages python-xyz) #:use-module (gnu packages qt) #:use-module (gnu packages suckless) #:use-module (gnu packages terminals) + #:use-module (gnu packages upnp) #:use-module (gnu packages version-control) #:use-module (gnu packages video) #:use-module (gnu packages web) #:use-module (gnu packages xdisorg) + #:use-module (gnu packages xml) #:use-module (gnu packages xorg) #:use-module (gnu packages)) @@ -973,3 +981,122 @@ (define-public xzgv (description "xzgv is a fast image viewer that provides extensive keyboard support.") (license license:gpl2+))) + +(define-public hydrus-network + (package + (name "hydrus-network") + (version "492") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/hydrusnetwork/hydrus") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0cyc499is97r8wri0y86yw6kpfcvc0a1yslr8g8sk4vhlly8gnra")))) + (build-system python-build-system) + (arguments + (list + #:phases + (with-imported-modules '((guix build utils)) + #~(let ((bin-dir "/libexec/hydrus") + (static-dir "/share/hydrus/static")) + (modify-phases %standard-phases + ;; Hydrus is a python program but does not uses setup.py or any + ;; other build system to build itself - it's delivered ready to + ;; run from the source. + (replace 'check + (lambda _ + (setenv "DISPLAY" ":0") + (setenv "XDG_CACHE_HOME" (getcwd)) + (setenv "HOME" (getcwd)) + (system "Xvfb &") + (invoke "python" "test.py"))) + (delete 'build) + (add-before 'install 'patch-variables + (lambda* (#:key outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out"))) + (substitute* "hydrus/core/HydrusConstants.py" + (("STATIC_DIR = (.*)\n") + (string-append "STATIC_DIR = \"" out static-dir "\"")) + (("BIN_DIR = (.*)\n") + (string-append "BIN_DIR = \"" out bin-dir "\"\n")))))) + (replace 'install + (lambda* (#:key outputs inputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (python (assoc-ref inputs "python")) + (client-path (string-append out "/bin/hydrus")) + (server-path (string-append out "/bin/hydrus-server"))) + (copy-recursively "static" + (string-append out static-dir)) + (copy-recursively "hydrus" + (string-append out + "/lib/python" + (python-version python) + "/site-packages/hydrus")) + (mkdir (string-append out "/bin")) + (copy-file "client.py" client-path) + (chmod client-path #o0555) + (copy-file "server.py" server-path) + (chmod server-path #o0555)))) + ;; Hydrus searches for some binaries at bin-dir so it's important + ;; to put them there so it can find and use them. + (add-after 'install 'pupulate-libexec + (lambda* (#:key outputs inputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (out/bin-dir (string-append out bin-dir))) + (mkdir-p out/bin-dir) + (copy-file + (string-append (assoc-ref inputs "swftools") "/bin/swfrender") + (string-append out/bin-dir "/swfrender_linux")) + (copy-file + (string-append (assoc-ref inputs "ffmpeg") "/bin/ffmpeg") + (string-append out/bin-dir "/ffmpeg")) + (copy-file + (string-append (assoc-ref inputs "miniupnpc") "/bin/upnpc") + (string-append out/bin-dir "/miniupnpc")))))))))) + ;; All native-inputs are only needed for the the check phase + (native-inputs + (list + python-nose + python-mock + python-httmock + xorg-server-for-tests)) + ;; All python packages were taken from static/build_files/linux/requirements.txt + (propagated-inputs + (list + python-beautifulsoup4 + python-cbor2 + python-chardet + python-cloudscraper + python-html5lib + python-lxml + python-lz4 + python-numpy + opencv-with-python ; drop-in replacement for opencv-python-headless + python-pillow + python-psutil + python-pylzma + python-pyopenssl + python-pyside-2 + python-pysocks + python-mpv + python-pyyaml + python-qtpy + python-requests + python-send2trash + python-service-identity + python-six + python-twisted)) + (inputs (list swftools ffmpeg miniupnpc)) + (synopsis "Organize your media with tags like a dektop booru") + (description + "The hydrus network client is an application written for +internet-fluent media nerds who have large image/swf/webm collections. +It browses with tags instead of folders, a little like a booru on your desktop. +Advanced users can share tags and files anonymously through custom servers that +any user may run. Everything is free and privacy is the first concern.") + (home-page "https://hydrusnetwork.github.io/hydrus/") + (license license:wtfpl2))) -- 2.37.1