From 760d6066f7089dd900ce079196523f717c0c8b19 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 21 Nov 2016 22:20:25 +0200 Subject: gnu: Rename owncloud.scm to sync.scm. * gnu/packages/owncloud.scm: Rename to ... * gnu/packages/sync.scm: ... this. * gnu/local.mk (GNU_SYSTEM_MODULES): Register it. --- gnu/local.mk | 2 +- gnu/packages/owncloud.scm | 105 ---------------------------------------------- gnu/packages/sync.scm | 105 ++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 106 insertions(+), 106 deletions(-) delete mode 100644 gnu/packages/owncloud.scm create mode 100644 gnu/packages/sync.scm (limited to 'gnu') diff --git a/gnu/local.mk b/gnu/local.mk index e5755ec968..b5acab6282 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -286,7 +286,6 @@ GNU_SYSTEM_MODULES = \ %D%/packages/openstack.scm \ %D%/packages/orpheus.scm \ %D%/packages/ots.scm \ - %D%/packages/owncloud.scm \ %D%/packages/package-management.scm \ %D%/packages/parallel.scm \ %D%/packages/password-utils.scm \ @@ -351,6 +350,7 @@ GNU_SYSTEM_MODULES = \ %D%/packages/suckless.scm \ %D%/packages/swig.scm \ %D%/packages/sxiv.scm \ + %D%/packages/sync.scm \ %D%/packages/synergy.scm \ %D%/packages/syndication.scm \ %D%/packages/task-management.scm \ diff --git a/gnu/packages/owncloud.scm b/gnu/packages/owncloud.scm deleted file mode 100644 index 6b40bd3ada..0000000000 --- a/gnu/packages/owncloud.scm +++ /dev/null @@ -1,105 +0,0 @@ -;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2015, 2016 Efraim Flashner -;;; -;;; This file is part of GNU Guix. -;;; -;;; GNU Guix is free software; you can redistribute it and/or modify it -;;; under the terms of the GNU General Public License as published by -;;; the Free Software Foundation; either version 3 of the License, or (at -;;; your option) any later version. -;;; -;;; GNU Guix is distributed in the hope that it will be useful, but -;;; WITHOUT ANY WARRANTY; without even the implied warranty of -;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -;;; GNU General Public License for more details. -;;; -;;; You should have received a copy of the GNU General Public License -;;; along with GNU Guix. If not, see . - -(define-module (gnu packages owncloud) - #:use-module ((guix licenses) #:prefix license:) - #:use-module (guix build-system cmake) - #:use-module (guix download) - #:use-module (guix packages) - #:use-module (gnu packages check) - #:use-module (gnu packages compression) - #:use-module (gnu packages databases) - #:use-module (gnu packages linux) - #:use-module (gnu packages perl) - #:use-module (gnu packages pkg-config) - #:use-module (gnu packages qt) - #:use-module (gnu packages tls)) - -(define-public owncloud-client - (package - (name "owncloud-client") - (version "2.2.4") - (source - (origin - (method url-fetch) - (uri (string-append "https://download.owncloud.com/desktop/stable/" - "owncloudclient-" version ".tar.xz")) - (sha256 - (base32 "1lz7v5sscj5489panz5ng372g9l66ng0srx6xaz8drnsgi7m64zk")) - (modules '((guix build utils))) - (snippet - '(begin - ;; only allows bundled libcrashreporter-qt - (delete-file-recursively "src/3rdparty/libcrashreporter-qt") - ;; we already package qtkeychain and sqlite - (delete-file-recursively "src/3rdparty/qtkeychain") - (delete-file-recursively "src/3rdparty/sqlite3") - ;; qjson is packaged, qprogessindicator, qlockedfile, qtokenizer and - ;; qtsingleapplication have not yet been packaged, but all are - ;; explicitly used from the 3rdparty folder during build. - ;; We can also remove the macgoodies folder - (delete-file-recursively "src/3rdparty/qtmacgoodies"))))) - (build-system cmake-build-system) - (arguments - `(#:phases - (modify-phases %standard-phases - (add-after 'unpack 'change-rpath-dirs - (lambda _ - (substitute* '("src/libsync/CMakeLists.txt" - "csync/src/CMakeLists.txt") - ;; We store the libs in out/lib and not /usr/lib/appname, so we - ;; need the executable to point to the libraries in /lib and not - ;; in /lib/appname. - (("\\/\\$\\{APPLICATION_EXECUTABLE\\}") "")) - (substitute* '("src/cmd/CMakeLists.txt" - "src/crashreporter/CMakeLists.txt" - "src/gui/CMakeLists.txt") - ;; This has the same issue as the substitution above. - (("\\/\\$\\{APPLICATION_EXECUTABLE\\}\\\"") "\"")) - #t)) - (add-after 'unpack 'delete-failing-tests - ;; These tests fail for no apparent reason - (lambda _ - (substitute* "test/CMakeLists.txt" - (("owncloud_add_test\\(FileSystem \"\"\\)" test) - (string-append "#" test)) - (("owncloud_add_test\\(Utility \"\"\\)" test) - (string-append "#" test))) - #t))) - #:configure-flags '("-DUNIT_TESTING=ON"))) - (native-inputs - `(("cmocka" ,cmocka) - ("perl" ,perl) - ("pkg-config" ,pkg-config) - ("qtlinguist" ,qttools))) - (inputs - `(("inotify-tools" ,inotify-tools) - ("openssl" ,openssl) - ("qtbase" ,qtbase) - ("qtkeychain" ,qtkeychain) - ("qtwebkit" ,qtwebkit) - ("sqlite" ,sqlite) - ("zlib" ,zlib))) - (home-page "https://owncloud.org") - (synopsis "Folder synchronization with an ownCloud server") - (description "The ownCloudSync system lets you always have your latest -files wherever you are. Just specify one or more folders on the local machine -to and a server to synchronize to. You can configure more computers to -synchronize to the same server and any change to the files on one computer will -silently and reliably flow across to every other.") - (license license:gpl2+))) diff --git a/gnu/packages/sync.scm b/gnu/packages/sync.scm new file mode 100644 index 0000000000..186914d98c --- /dev/null +++ b/gnu/packages/sync.scm @@ -0,0 +1,105 @@ +;;; GNU Guix --- Functional package management for GNU +;;; Copyright © 2015, 2016 Efraim Flashner +;;; +;;; This file is part of GNU Guix. +;;; +;;; GNU Guix is free software; you can redistribute it and/or modify it +;;; under the terms of the GNU General Public License as published by +;;; the Free Software Foundation; either version 3 of the License, or (at +;;; your option) any later version. +;;; +;;; GNU Guix is distributed in the hope that it will be useful, but +;;; WITHOUT ANY WARRANTY; without even the implied warranty of +;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;;; GNU General Public License for more details. +;;; +;;; You should have received a copy of the GNU General Public License +;;; along with GNU Guix. If not, see . + +(define-module (gnu packages sync) + #:use-module ((guix licenses) #:prefix license:) + #:use-module (guix build-system cmake) + #:use-module (guix download) + #:use-module (guix packages) + #:use-module (gnu packages check) + #:use-module (gnu packages compression) + #:use-module (gnu packages databases) + #:use-module (gnu packages linux) + #:use-module (gnu packages perl) + #:use-module (gnu packages pkg-config) + #:use-module (gnu packages qt) + #:use-module (gnu packages tls)) + +(define-public owncloud-client + (package + (name "owncloud-client") + (version "2.2.4") + (source + (origin + (method url-fetch) + (uri (string-append "https://download.owncloud.com/desktop/stable/" + "owncloudclient-" version ".tar.xz")) + (sha256 + (base32 "1lz7v5sscj5489panz5ng372g9l66ng0srx6xaz8drnsgi7m64zk")) + (modules '((guix build utils))) + (snippet + '(begin + ;; only allows bundled libcrashreporter-qt + (delete-file-recursively "src/3rdparty/libcrashreporter-qt") + ;; we already package qtkeychain and sqlite + (delete-file-recursively "src/3rdparty/qtkeychain") + (delete-file-recursively "src/3rdparty/sqlite3") + ;; qjson is packaged, qprogessindicator, qlockedfile, qtokenizer and + ;; qtsingleapplication have not yet been packaged, but all are + ;; explicitly used from the 3rdparty folder during build. + ;; We can also remove the macgoodies folder + (delete-file-recursively "src/3rdparty/qtmacgoodies"))))) + (build-system cmake-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'change-rpath-dirs + (lambda _ + (substitute* '("src/libsync/CMakeLists.txt" + "csync/src/CMakeLists.txt") + ;; We store the libs in out/lib and not /usr/lib/appname, so we + ;; need the executable to point to the libraries in /lib and not + ;; in /lib/appname. + (("\\/\\$\\{APPLICATION_EXECUTABLE\\}") "")) + (substitute* '("src/cmd/CMakeLists.txt" + "src/crashreporter/CMakeLists.txt" + "src/gui/CMakeLists.txt") + ;; This has the same issue as the substitution above. + (("\\/\\$\\{APPLICATION_EXECUTABLE\\}\\\"") "\"")) + #t)) + (add-after 'unpack 'delete-failing-tests + ;; These tests fail for no apparent reason + (lambda _ + (substitute* "test/CMakeLists.txt" + (("owncloud_add_test\\(FileSystem \"\"\\)" test) + (string-append "#" test)) + (("owncloud_add_test\\(Utility \"\"\\)" test) + (string-append "#" test))) + #t))) + #:configure-flags '("-DUNIT_TESTING=ON"))) + (native-inputs + `(("cmocka" ,cmocka) + ("perl" ,perl) + ("pkg-config" ,pkg-config) + ("qtlinguist" ,qttools))) + (inputs + `(("inotify-tools" ,inotify-tools) + ("openssl" ,openssl) + ("qtbase" ,qtbase) + ("qtkeychain" ,qtkeychain) + ("qtwebkit" ,qtwebkit) + ("sqlite" ,sqlite) + ("zlib" ,zlib))) + (home-page "https://owncloud.org") + (synopsis "Folder synchronization with an ownCloud server") + (description "The ownCloudSync system lets you always have your latest +files wherever you are. Just specify one or more folders on the local machine +to and a server to synchronize to. You can configure more computers to +synchronize to the same server and any change to the files on one computer will +silently and reliably flow across to every other.") + (license license:gpl2+))) -- cgit v1.2.3