diff options
43 files changed, 75 insertions, 3616 deletions
diff --git a/packages/komodo/Qaterial.patch b/packages/komodo/Qaterial.patch deleted file mode 100644 index 4298206..0000000 --- a/packages/komodo/Qaterial.patch +++ /dev/null @@ -1,56 +0,0 @@ -From 1c6b82f51a29f184727256da40c649bc46d81e57 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Marek=20Pa=C5=9Bnikowski?= <marek@marekpasnikowski.pl> -Date: Wed, 27 Mar 2024 10:50:08 +0100 -Subject: [PATCH] Bug Fix - ---- - cmake/QaterialGenerateIcons.cmake | 27 ++++++++++++++++++++++++--- - 1 file changed, 24 insertions(+), 3 deletions(-) - -diff --git a/cmake/QaterialGenerateIcons.cmake b/cmake/QaterialGenerateIcons.cmake -index d28d45d..3b54ae9 100644 ---- a/cmake/QaterialGenerateIcons.cmake -+++ b/cmake/QaterialGenerateIcons.cmake -@@ -200,8 +200,8 @@ function(qaterial_generate_icons_class OUTPUT_FILE_HPP OUTPUT_FILE_CPP) - else() - - # Generate fake Qaterial.Impl.Icons.Icons.qml -- message(STATUS "Generate Fake ${OUTPUT_FILE}") -- file(WRITE ${OUTPUT_FILE} -+ message(STATUS "Generate Fake ${OUTPUT_FILE_HPP}") -+ file(WRITE ${OUTPUT_FILE_HPP} - "// Dummy file generated with CMake to mock the absence of Mdi icons.\n" - "// Everything written here will be lost.\n\n" - "#ifndef __QATERIAL_ICONS_HPP__\n" -@@ -221,6 +221,27 @@ function(qaterial_generate_icons_class OUTPUT_FILE_HPP OUTPUT_FILE_CPP) - "#endif" - ) - -- endif() -+ # Generate fake Qaterial.Impl.Icons.Icons.qml -+ message(STATUS "Generate Fake ${OUTPUT_FILE_CPP}") -+ file(WRITE ${OUTPUT_FILE_CPP} -+ "// Dummy file generated with CMake to mock the absence of Mdi icons.\n" -+ "// Everything written here will be lost.\n\n" -+ "#ifndef __QATERIAL_ICONS_HPP__\n" -+ "#define __QATERIAL_ICONS_HPP__\n\n" -+ "#include <Qaterial/Details/Export.hpp>\n" -+ "#include <Qaterial/Details/Property.hpp>\n\n" -+ "#include <QtCore/QObject>\n\n" -+ "namespace qaterial {\n\n" -+ "class QATERIAL_API_ Icons : public QObject\n" -+ "{\n" -+ " QATERIAL_SINGLETON_IMPL(Icons, icons, Icons);\n\n" -+ "public:\n" -+ " Icons(QObject* parent = nullptr) : QObject(parent) {}\n\n" -+ "};\n\n" -+ "}\n\n" -+ "#endif" -+ ) -+ -+endif() - - endfunction() --- -2.41.0 - diff --git a/packages/komodo/antara-gaming-sdk.scm b/packages/komodo/antara-gaming-sdk.scm deleted file mode 100644 index 22d07cd..0000000 --- a/packages/komodo/antara-gaming-sdk.scm +++ /dev/null @@ -1,132 +0,0 @@ -(define-module (packages komodo antara-gaming-sdk) - #:use-module (packages komodo doom-meta) - #:use-module (gnu packages cpp) - #:use-module (gnu packages game-development) - #:use-module (gnu packages llvm) - #:use-module (gnu packages pretty-print) - #:use-module (guix build utils) - #:use-module (guix build-system cmake) - #:use-module (guix download) - #:use-module (guix gexp) - #:use-module (guix git-download) - #:use-module ((guix licenses) - #:prefix license:) - #:use-module (guix packages)) - -;;; BOTTOM LAYER - -(define antara-gaming-sdk-configure-flags - '(list "-DFETCHCONTENT_FULLY_DISCONNECTED=ON" - "-Wno-dev")) - -(define antara-gaming-sdk-github - "https://github.com/KomodoPlatform/antara-gaming-sdk") - -(define antara-gaming-sdk-hash - (content-hash "12jqg0y92y86lm0516k06x81zrargfgvby10kxmhj1vaxkf71ig6")) - -(define antara-gaming-sdk-native-inputs - (list doom-meta entt fmt range-v3)) - -(define antara-gaming-sdk-version "1.1.0-alpha") - -(define build-path-prefix "../build/_deps/") - -(define find-entt "find_package(EnTT)\n") - -(define find-fmt "find_package(fmt)\n") - -(define loguru-hash - (content-hash "1lig80s99kk5yjs7yn5nfm7jfz8982hink5ff7pzi4afkab2hbcd")) - -(define loguru-src "loguru-src/") - -;;; ABSTRACTION LAYER -5 - -(define build-path-loguru - (string-append build-path-prefix loguru-src)) - -(define loguru-origin - (origin (uri "https://github.com/emilk/loguru/archive/v2.1.0.zip") - (method url-fetch) - (hash loguru-hash))) - -;;; ABSTRACTION LAYER -4 - -(define download-loguru - `(string-append "3.14)\n\n" "file(ARCHIVE_EXTRACT INPUT " ,loguru-origin " " - "DESTINATION " ,build-path-loguru ")\n" - "file(COPY " ,build-path-loguru "/loguru-2.1.0/ " - "DESTINATION " ,build-path-loguru ")\n")) - -(define find-package-calls - (string-append "Dependancies\n" "\n" find-fmt find-entt "\n")) - -;;; ABSTRACTION LAYER -3 - -(define get-loguru - `(substitute* "CMakeLists.txt" - (("3.14\\)") ,download-loguru))) - -(define get-more-packages - `(substitute* "cmake/dependencies.cmake" - (("Dependancies") ,find-package-calls))) - -(define rename-doom-targets - `(substitute* (list "modules/math/CMakeLists.txt" - "modules/event/CMakeLists.txt" - "modules/ecs/CMakeLists.txt") - (("doom::meta") "doom"))) - -;;; ABSTRACTION LAYER -2 - -(define supplement-libs - `(lambda _ - ,get-loguru - ,get-more-packages - ,rename-doom-targets)) - -;;; ABSTRACTION LAYER -1 - -(define antara-gaming-sdk-phases - #~ (modify-phases %standard-phases - (add-after 'unpack - 'supplement-libs - #+ supplement-libs))) - -(define antara-gaming-sdk-git-reference - (git-reference (url antara-gaming-sdk-github) - (commit antara-gaming-sdk-version))) - -;;; ABSTRACTION LAYER 0 - -(define antara-gaming-sdk-arguments - `(#:phases ,antara-gaming-sdk-phases - #:configure-flags ,antara-gaming-sdk-configure-flags)) - -(define antara-gaming-sdk-origin - (origin (uri antara-gaming-sdk-git-reference) - (method git-fetch) - (hash antara-gaming-sdk-hash))) - -;;; SURFACE LAYER - -(define antara-gaming-sdk-blueprint - (package (name "antara-gaming-sdk-blueprint") - (version antara-gaming-sdk-version) - (source antara-gaming-sdk-origin) - (build-system cmake-build-system) - (arguments antara-gaming-sdk-arguments) - (native-inputs antara-gaming-sdk-native-inputs) - (synopsis "Komodo Gaming Software Development Kit") - (description "Komodo Gaming Software Development Kit") - (license license:cc-by-sa4.0) - (home-page antara-gaming-sdk-github))) - -(define antara-gaming-sdk/clang-toolchain - (package-with-c-toolchain antara-gaming-sdk-blueprint - `(("clang-toolchain" ,clang-toolchain-17)))) - -(define-public antara-gaming-sdk - (package (inherit antara-gaming-sdk/clang-toolchain) - (name "antara-gaming-sdk"))) diff --git a/packages/komodo/cmake.scm b/packages/komodo/cmake.scm deleted file mode 100644 index 39239ff..0000000 --- a/packages/komodo/cmake.scm +++ /dev/null @@ -1,442 +0,0 @@ -;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2013 Cyril Roelandt <tipecaml@gmail.com> -;;; Copyright © 2014 Mark H Weaver <mhw@netris.org> -;;; Copyright © 2014 Eric Bavier <bavier@member.fsf.org> -;;; Copyright © 2014 Ian Denhardt <ian@zenhack.net> -;;; Copyright © 2015 Sou Bunnbu <iyzsong@gmail.com> -;;; Copyright © 2016 Efraim Flashner <efraim@flashner.co.il> -;;; Copyright © 2017, 2018, 2020, 2021 Marius Bakke <marius@gnu.org> -;;; Copyright © 2018 Arun Isaac <arunisaac@systemreboot.net> -;;; Copyright © 2018, 2020 Tobias Geerinckx-Rice <me@tobias.gr> -;;; Copyright © 2019, 2020, 2021, 2022 Maxim Cournoyer <maxim.cournoyer@gmail.com> -;;; Copyright © 2019 Pierre-Moana Levesque <pierre.moana.levesque@gmail.com> -;;; Copyright © 2020, 2023 Janneke Nieuwenhuizen <janneke@gnu.org> -;;; Copyright © 2021 Ricardo Wurmus <rekado@elephly.net> -;;; -;;; 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 <http://www.gnu.org/licenses/>. - -(define-module (packages komodo cmake) - #:use-module (packages komodo cppdap) - #:use-module ((guix licenses) #:prefix license:) - #:use-module (guix packages) - #:use-module (guix gexp) - #:use-module (guix download) - #:use-module (guix git-download) - #:use-module (guix utils) - #:use-module (guix deprecation) - #:use-module (guix build-system gnu) - #:use-module (guix build-system cmake) - #:use-module (guix build-system emacs) - #:use-module ((guix search-paths) #:select ($SSL_CERT_DIR $SSL_CERT_FILE)) - #:use-module (gnu packages) - #:use-module (gnu packages backup) - #:use-module (gnu packages compression) - #:use-module (gnu packages cpp) - #:use-module (gnu packages crypto) - #:use-module (gnu packages curl) - #:use-module (gnu packages file) - #:use-module (gnu packages kde-frameworks) - #:use-module (gnu packages libevent) - #:use-module (gnu packages ncurses) - #:use-module (gnu packages serialization) - #:use-module (gnu packages sphinx) - #:use-module (gnu packages texinfo) - #:use-module (gnu packages xml) - #:use-module (ice-9 match) - #:use-module (srfi srfi-1)) - -(define-public cmake-shared - (let ((commit "8122f2b96c8da38ea41b653cf69958e75fe2129d") - (revision "32")) - (package - (name "cmake-shared") - (version - (git-version "1.1.0" revision commit)) - (source - (origin - (method git-fetch) - (uri - (git-reference - (url "https://github.com/lirios/cmake-shared.git") - (commit commit))) - (file-name - (git-file-name name version)) - (sha256 - (base32 "05avwzqcnliwx9h7qi1kl0iz4smqmxc4vkavyjbmlc6h2b97i58g")) - (modules '((guix build utils) - (ice-9 ftw) - (srfi srfi-1))) - (snippet - `(begin - (delete-file-recursively "3rdparty"))))) - (build-system cmake-build-system) - (arguments - `(#:tests? #f)) ; No target - (native-inputs - (list extra-cmake-modules)) - (synopsis "Shared CMake functions and macros") - (description "CMake-Shared are shared functions and macros for projects -using the CMake build system.") - (home-page "https://github.com/lirios/cmake-shared/") - (license license:bsd-3)))) - -;;; Build phases shared between 'cmake-bootstrap' and the later variants -;;; that use cmake-build-system. -(define (%common-build-phases) - `((add-after 'unpack 'split-package - ;; Remove files that have been packaged in other package recipes. - (lambda _ - (delete-file "Auxiliary/cmake-mode.el") - (substitute* "Auxiliary/CMakeLists.txt" - ((".*cmake-mode.el.*") "")))) - ,@(if (target-x86-32?) - '((add-after 'unpack 'skip-cpack-txz-test - (lambda _ - ;; In 'RunCMake.CPack_TXZ', the 'TXZ/THREADED_ALL' test - ;; would occasionally fail on i686 with "Internal error - ;; initializing compression library: Cannot allocate - ;; memory": <https://issues.guix.gnu.org/50617>. Skip it. - (substitute* "Tests/RunCMake/CPack/RunCMakeTest.cmake" - (("THREADED_ALL \"TXZ;DEB\"") - "THREADED_ALL \"DEB\""))))) - '()) - (add-before 'configure 'patch-bin-sh - (lambda _ - ;; Replace "/bin/sh" by the right path in... a lot of - ;; files. - (substitute* - '("Modules/CompilerId/Xcode-3.pbxproj.in" - "Modules/Internal/CPack/CPack.RuntimeScript.in" - "Source/cmGlobalXCodeGenerator.cxx" - "Source/cmLocalUnixMakefileGenerator3.cxx" - "Source/cmExecProgramCommand.cxx" - "Tests/CMakeLists.txt" - "Tests/RunCMake/File_Generate/RunCMakeTest.cmake") - (("/bin/sh") (which "sh"))))))) - -(define %common-disabled-tests - '(;; This test copies libgcc_s.so.1 from GCC and tries to modify its RPATH, - ;; but does not cope with the file being read-only. - "BundleUtilities" - ;; These tests require network access. - "CTestTestUpload" "CMake.FileDownload" - ;; This test requires 'ldconfig' which is not available in Guix. - "RunCMake.install" - ;; This test fails for unknown reason. - "RunCMake.file-GET_RUNTIME_DEPENDENCIES" - - "CMakeLib.testDebuggerNamedPipe-Project" - "CMakeLib.testDebuggerNamedPipe-Script")) - -(define %common-disabled-tests/hurd - '("CTestTestTimeout" - "CTestTestRerunFailed" - "RunCMake.CompilerChange" - "RunCMake.ctest_test" - "RunCMake.file" - "RunCMake.BundleUtilities" - "RunCMake.configure_file" - "RunCMake.CTestTimeout" - "RunCMake.CTestTimeoutAfterMatch" - "RunCMake.CommandLine" - "RunCMake.CTestCommandLine")) - -(define %preserved-third-party-files - '(;; 'Source/cm_getdate.c' includes archive_getdate.c wholesale, so it must - ;; be available along with the required headers. - "Utilities/cmlibarchive/libarchive/archive_getdate.c" - "Utilities/cmlibarchive/libarchive/archive_getdate.h" - ;; ELF headers. - "Utilities/cmelf" - ;; CMake header wrappers. - "Utilities/cm3p")) - -;;; The "bootstrap" CMake. It is used to build 'cmake-minimal' below, as well -;;; as any dependencies that need cmake-build-system. -(define-public cmake-bootstrap - (package - (name "cmake-bootstrap") - (version "3.27.1") - (source (origin - (method url-fetch) - (uri (string-append "https://cmake.org/files/v" - (version-major+minor version) - "/cmake-" version ".tar.gz")) - (sha256 - (base32 - "01102g2j5klqxl6jvwhwz45libcg9hnb7xchdr3r86x1bw9v19mi")) - (patches (search-patches "cmake-curl-certificates-3.24.patch")))) - (build-system gnu-build-system) - (arguments - (list - #:test-target "test" - #:configure-flags - #~(let ((parallel-job-count (number->string (parallel-job-count)))) - (list "--verbose" - (string-append "--parallel=" parallel-job-count) - (string-append "--prefix=" #$output) - "--system-libs" - "--no-system-cppdap" - ;; By default, the man pages and other docs land - ;; in PREFIX/man and PREFIX/doc, but we want them - ;; in share/{man,doc}. Note that unlike - ;; autoconf-generated configure scripts, cmake's - ;; configure prepends "PREFIX/" to what we pass - ;; to --mandir and --docdir. - "--mandir=share/man" - (string-append "--docdir=share/doc/cmake-" - #$(version-major+minor version)) - - ;; By default CMake is built without any optimizations. Use - ;; the recommended Release target for a ~2.5x speedup. - "--" "-DCMAKE_BUILD_TYPE=Release")) - #:make-flags - #~(let ((skipped-tests - (list #$@%common-disabled-tests - "CTestTestSubdir" ; This test fails to build 2 of the 3 tests. - ;; This test fails when ARGS (below) is in use, see - ;; <https://gitlab.kitware.com/cmake/cmake/issues/17165>. - "CTestCoverageCollectGCOV" - #$@(if (target-hurd?) - %common-disabled-tests/hurd - #~())))) - (list - (string-append - ;; These arguments apply for the tests only. - "ARGS=-j " (number->string (parallel-job-count)) - " --output-on-failure" - " --exclude-regex ^\\(" (string-join skipped-tests "\\|") "\\)$"))) - #:phases - #~(modify-phases %standard-phases - #$@(%common-build-phases) - (add-before 'configure 'set-paths - (lambda _ - ;; Help cmake's bootstrap process to find system libraries - (begin - (setenv "CMAKE_LIBRARY_PATH" (getenv "LIBRARY_PATH")) - (setenv "CMAKE_INCLUDE_PATH" (or (getenv "CPATH") - (getenv "C_INCLUDE_PATH")))))) - ;; CMake uses its own configure script. - (replace 'configure - (lambda* (#:key (configure-flags '()) #:allow-other-keys) - (apply invoke "./configure" configure-flags))) - #$@(if (target-hurd?) - #~((add-after 'unpack 'patch-hurd - (lambda _ - ;; Version 3.25.0 has a similar fix. - (substitute* "Utilities/cmlibuv/src/unix/udp.c" - (("!defined\\(__QNX__\\)") - "!defined(__GNU__)"))))) - #~())))) - (inputs - (list - libuv bzip2 cppdap curl expat file jsoncpp libarchive nlohmann-json rhash - zlib)) - (native-search-paths - (list (search-path-specification - (variable "CMAKE_PREFIX_PATH") - (files '(""))) - ;; "cmake-curl-certificates.patch" changes CMake to honor 'SSL_CERT_DIR' - ;; and 'SSL_CERT_FILE', hence these search path entries. - $SSL_CERT_DIR - $SSL_CERT_FILE)) - (home-page "https://cmake.org/") - (synopsis "Cross-platform build system") - (description - "CMake is a family of tools designed to build, test and package software. -CMake is used to control the software compilation process using simple platform -and compiler independent configuration files. CMake generates native makefiles -and workspaces that can be used in the compiler environment of your choice.") - (properties '((hidden? . #t))) - (license (list license:bsd-3 ; cmake - license:expat ; cmjsoncpp is dual MIT/public domain - license:public-domain)))) ; cmlibarchive/archive_getdate.c - -;;; This minimal variant of CMake does not include the documentation. It is -;;; used by the cmake-build-system. -(define-public cmake-minimal - (package - (inherit cmake-bootstrap) - (name "cmake-minimal") - (properties (alist-delete 'hidden? (package-properties cmake-bootstrap))) - (source (origin - (inherit (package-source cmake-bootstrap)) - ;; Purge CMakes bundled dependencies as they are no longer needed. - (modules '((ice-9 ftw))) - (snippet - `(begin - (define preserved-files ',%preserved-third-party-files) - - ;; (file-system-fold (lambda (dir stat result) ;enter? - ;; (or (string=? "Utilities" dir) ;init - ;; ;; The bundled dependencies are - ;; ;; distinguished by having a "cm" - ;; ;; prefix to their upstream names. - ;; (and (string-prefix? "Utilities/cm" dir) - ;; (not (member dir preserved-files))))) - ;; (lambda (file stat result) ;leaf - ;; (unless (or (member file preserved-files) - ;; ;; Preserve top-level files. - ;; (string=? "Utilities" - ;; (dirname file))) - ;; (delete-file file))) - ;; (const #t) ;down - ;; (lambda (dir stat result) ;up - ;; (when (equal? (scandir dir) '("." "..")) - ;; (rmdir dir))) - ;; (const #t) ;skip - ;; (lambda (file stat errno result) - ;; (format (current-error-port) - ;; "warning: failed to delete ~a: ~a~%" - ;; file (strerror errno))) - ;; #t - ;; "Utilities" - ;; lstat) - #t)))) - (build-system cmake-build-system) - (arguments - (list - #:configure-flags - #~(list "-DCMAKE_USE_SYSTEM_LIBRARIES=ON" - (string-append "-DCMAKE_DOC_DIR=share/doc/cmake-" - #$(version-major+minor (package-version - cmake-bootstrap)))) - - ;; This is the CMake used in cmake-build-system. Ensure compiler - ;; optimizations are enabled to save size and CPU cycles. - #:build-type "Release" - #:phases - #~(modify-phases %standard-phases - #$@(%common-build-phases) - (add-after 'install 'delete-help-documentation - (lambda _ - (delete-file-recursively - (string-append #$output - "/share/cmake-" - #$(version-major+minor - (package-version cmake-bootstrap)) - "/Help")))) - (replace 'check - (lambda* (#:key tests? parallel-tests? #:allow-other-keys) - (let ((skipped-tests (list #$@%common-disabled-tests - ;; This test requires the bundled libuv. - "BootstrapTest" - #$@(if (system-hurd?) - %common-disabled-tests/hurd - #~())))) - (if tests? - (begin - (invoke "ctest" "-j" (if parallel-tests? - (number->string (parallel-job-count)) - "1") - "--exclude-regex" - (string-append "^(" (string-join skipped-tests "|") ")$"))) - (format #t "test suite not run~%")))))) - #:cmake (if (%current-target-system) - cmake-minimal-cross - cmake-bootstrap))))) - -;;; The "user-facing" CMake, now with manuals and HTML documentation. -(define-public cmake - (package - (inherit cmake-minimal) - (name "cmake") - (version "3.27.1") - (source (origin - (inherit (package-source cmake-minimal)) - (method url-fetch) - (uri (string-append "https://cmake.org/files/v" - (version-major+minor version) - "/cmake-" version ".tar.gz")) - (snippet (match (origin-snippet (package-source cmake-minimal)) - (('begin ('define 'preserved-files ('quote x)) - rest ...) - `(begin (define preserved-files - ',(cons "Utilities/cmelf" x)) - ,@rest)))) - (sha256 - (base32 - "01102g2j5klqxl6jvwhwz45libcg9hnb7xchdr3r86x1bw9v19mi")) - (patches (search-patches "cmake-curl-certificates-3.24.patch")))) - (outputs '("out" "doc")) - (arguments - (substitute-keyword-arguments (package-arguments cmake-minimal) - ;; Use cmake-minimal this time. - ((#:cmake _ #f) - (if (%current-target-system) - cmake-minimal-cross - cmake-minimal)) - - ;; Enable debugging information for convenience. - ((#:build-type _ #f) "RelWithDebInfo") - - ((#:configure-flags flags ''()) - #~(append (list "-DSPHINX_INFO=ON" "-DSPHINX_MAN=ON" "-DSPHINX_HTML=ON" - (string-append "-DCMAKE_DOC_DIR=share/doc/cmake-" - #$(version-major+minor (package-version - cmake-minimal))) - "-DCMAKE_INFO_DIR=share/info" - "-DCMAKE_MAN_DIR=share/man") - #$flags)) - ((#:phases phases) - #~(modify-phases #$phases - (delete 'delete-help-documentation) - (add-after 'install 'move-html-doc - (lambda _ - (let ((html (string-append "/share/doc/cmake-" - #$(version-major+minor - (package-version cmake-minimal)) - "/html"))) - (copy-recursively (string-append #$output html) - (string-append #$output:doc html)) - (delete-file-recursively (string-append #$output html))))))))) - (inputs - (modify-inputs (package-inputs cmake-minimal) - (prepend ncurses))) ;required for ccmake - ;; Extra inputs required to build the documentation. - (native-inputs - (modify-inputs (package-native-inputs cmake-minimal) - (append python-sphinx - texinfo))) - (properties (alist-delete 'hidden? (package-properties cmake-minimal))))) - -(define-public cmake-minimal-cross - (package - (inherit cmake-minimal) - (name "cmake-minimal-cross") - (native-search-paths '()) - (search-paths - (package-native-search-paths cmake-minimal)))) - -(define-public emacs-cmake-mode - (package - (inherit cmake) - (name "emacs-cmake-mode") - (native-inputs '()) - (inputs '()) - (outputs '("out")) - (build-system emacs-build-system) - (arguments - (list #:phases - #~(modify-phases %standard-phases - (add-after 'unpack 'chdir-elisp - ;; Elisp directory is not in root of the source. - (lambda _ - (chdir "Auxiliary")))))) - (synopsis "Emacs major mode for editing Cmake expressions") - (description "@code{cmakeos-mode} provides an Emacs major mode for editing -Cmake files. It supports syntax highlighting, indenting and refilling of -comments."))) diff --git a/packages/komodo/cppdap.scm b/packages/komodo/cppdap.scm deleted file mode 100644 index 8e778d4..0000000 --- a/packages/komodo/cppdap.scm +++ /dev/null @@ -1,40 +0,0 @@ -(define-module (packages komodo cppdap) - #:use-module (gnu packages cpp) - #:use-module (guix build-system cmake) - #:use-module (guix git-download) - #:use-module - ((guix licenses) - #:prefix license:) - #:use-module (guix packages)) - -(define-public cppdap - (let ((cppdap-commit "5857b55c151c2efc1aea1ee0501e8d09f740d41b") - (cppdap-github "https://github.com/google/cppdap")) - (package - (name "cppdap") - (version cppdap-commit) - (source - (origin - (uri - (git-reference - (url (string-append cppdap-github ".git")) - (commit cppdap-commit))) - (method git-fetch) - (hash - (content-hash "08bdsn0568hidq51fzw63ph0wkri8siid74fxp7sqvxjv04164pr")))) - (build-system cmake-build-system) - (arguments - (list - #:phases '(modify-phases %standard-phases (delete 'check)) - #:configure-flags - '(list "-DCPPDAP_USE_EXTERNAL_NLOHMANN_JSON_PACKAGE=ON"))) - (native-inputs (list nlohmann-json)) - (synopsis "C++ library for the Debug Adapter Protocol") - (description - (string-append - "cppdap is a C++11 library (\"SDK\") implementation of the Debug Adapter " - "Protocol, providing an API for implementing a DAP client or server. " - "cppdap provides C++ type-safe structures for the full DAP specification, " - "and provides a simple way to add custom protocol messages.")) - (license license:asl2.0) - (home-page cppdap-github)))) diff --git a/packages/komodo/cpprestsdk.scm b/packages/komodo/cpprestsdk.scm deleted file mode 100644 index 1c9e6b8..0000000 --- a/packages/komodo/cpprestsdk.scm +++ /dev/null @@ -1,42 +0,0 @@ -(define-module (packages komodo cpprestsdk) - #:use-module (gnu packages boost) - #:use-module (gnu packages compression) - #:use-module (gnu packages tls) - #:use-module (gnu packages web) - #:use-module (guix build-system cmake) - #:use-module (guix gexp) - #:use-module (guix git-download) - #:use-module ((guix licenses) - #:prefix license:) - #:use-module (guix packages)) - -(define-public cpprestsdk - (package - (name "cpprestsdk") - (version "v2.10.16") - (source - (origin - (uri - (git-reference - ;; This fork includes a fix to an out-of-bounds error. - (url "https://github.com/priv-kweihmann/cpprestsdk") - (commit "gcc10-64bit"))) - (method git-fetch) - (hash - (content-hash - "03cd0p0fjvfi94avqvf00g89a9qqkj2r7skm4xnvr4p7hihw1ikd")))) - (build-system cmake-build-system) - (arguments - (list - #:phases - #~ (modify-phases %standard-phases (delete 'check)))) - (native-inputs (list boost openssl websocketpp zlib)) - (synopsis "The Microsoft C++ REST SDK") - (description - (string-append - "The C++ REST SDK is a Microsoft project for cloud-based client-server " - "communication in native code using a modern asynchronous C++ API " - "design. This project aims to help C++ developers connect to and " - "interact with services.")) - (license license:expat) - (home-page "https://github.com/microsoft/cpprestsdk"))) diff --git a/packages/komodo/doom-meta.scm b/packages/komodo/doom-meta.scm deleted file mode 100644 index ce9c32d..0000000 --- a/packages/komodo/doom-meta.scm +++ /dev/null @@ -1,41 +0,0 @@ -(define-module (packages komodo doom-meta) - #:use-module (gnu packages compression) - #:use-module (guix build utils) - #:use-module (guix build-system copy) - #:use-module (guix git-download) - #:use-module ((guix licenses) - #:prefix license:) - #:use-module (guix packages)) - -(define doom-meta-version "master") - -(define doom-meta-delete-null-targets - '(modify-phases %standard-phases - (delete 'install))) - -(define doom-meta-hash - (content-hash "1ib9dzq74kna4sfnf1h3g0zkgzr1fbgv5awyqx82wm5biz4vn717")) - -(define doom-meta-arguments - (list #:install-plan '(list (list "../source" ".")))) - -(define doom-meta-native-inputs - (list unzip)) - -(define doom-meta-origin - (origin (uri (git-reference (url "https://github.com/KomodoPlatform/meta.git") - (commit doom-meta-version))) - (method git-fetch) - (hash doom-meta-hash))) - -(define-public doom-meta - (package (name "doom-meta") - (version doom-meta-version) - (source doom-meta-origin) - (build-system copy-build-system) - (arguments doom-meta-arguments) - (native-inputs doom-meta-native-inputs) - (synopsis "Just a few metaprogramming utilities in C++") - (description "Just a few metaprogramming utilities in C++") - (license license:expat) - (home-page "https://github.com/doom/meta"))) diff --git a/packages/komodo/googlefontcmake.scm b/packages/komodo/googlefontcmake.scm deleted file mode 100644 index e147607..0000000 --- a/packages/komodo/googlefontcmake.scm +++ /dev/null @@ -1,72 +0,0 @@ -(define-module (packages komodo googlefontcmake) - #:use-module (guix build-system cmake) - #:use-module (guix git-download) - #:use-module ((guix licenses) - #:prefix license:) - #:use-module (guix packages)) - -;; DATA LAYER - -(define hash - (base32 "1lmbiv8hgbglaznv8dcsp92m8r9vdg1adg9qfyfinc92k8f5dyqq")) - -(define name - "googlefontcmake") - -(define description - (string-append "CMake function to download google fonts at configure time " - "from google/fonts.")) - -(define home-page - "https://github.com/OlivierLDff/FetchGoogleFontCMake/tree/master") - -(define synopsis - "CMake function to download google fonts at configure time.") - -(define tests? - #f) - -(define url - "https://github.com/OlivierLDff/FetchGoogleFontCMake.git") - -(define version - "master") - -;; ABSTRACTION LAYER -2 - -(define no-install-target - '(delete 'install)) - -;; ABSTRACTION LAYER -1 - -(define phases - `(modify-phases %standard-phases - ,no-install-target)) - -(define uri - (git-reference (url url) - (commit version))) - -;; ABSTRACTION LAYER -0 - -(define arguments - (list #:phases phases - #:tests? tests?)) - -(define source - (origin (uri uri) - (method git-fetch) - (sha256 hash))) - -;; SURFACE LAYER - -(define-public googlefontcmake - (package (name name) - (version version) - (source source) - (build-system cmake-build-system) - (arguments arguments) - (synopsis synopsis) - (description description) - (license license:expat) - (home-page home-page))) diff --git a/packages/komodo/komodo-vcpkg-ports.scm b/packages/komodo/komodo-vcpkg-ports.scm deleted file mode 100644 index 08cffe0..0000000 --- a/packages/komodo/komodo-vcpkg-ports.scm +++ /dev/null @@ -1,51 +0,0 @@ -(define-module (packages komodo komodo-vcpkg-ports) - #:use-module (guix build-system copy) - #:use-module (guix git-download) - #:use-module ((guix licenses) - #:prefix license:) - #:use-module (guix packages)) - -;; DATA LAYER - -(define hash - (base32 "0nw78mmncjbgl7cjpbcy9wkch7hlqaavr03n9ls6nkjacx3klyy6")) - -(define home-page - "https://github.com/KomodoPlatform/vcpkg-custom-ports/tree/main") - -(define name - "komodo-vcpkg-ports") - -(define synopsis - "Komodo VCPKG port files") - -(define url - "https://github.com/KomodoPlatform/vcpkg-custom-ports.git") - -(define version - "main") - -;; ABSTRACTION LAYER -1 - -(define uri - (git-reference (url url) - (commit version))) - -;; ABSTRACTION LAYER -0 - -(define source - (origin (uri uri) - (method git-fetch) - (sha256 hash))) - -;; SURFACE LAYER - -(define-public komodo-vcpkg-ports - (package (name name) - (version version) - (source source) - (build-system copy-build-system) - (synopsis synopsis) - (description synopsis) - (license license:expat) - (home-page home-page))) diff --git a/packages/komodo/komodo.scm b/packages/komodo/komodo.scm deleted file mode 100644 index 0b05cbf..0000000 --- a/packages/komodo/komodo.scm +++ /dev/null @@ -1,374 +0,0 @@ -(define-module (packages komodo komodo) - #:use-module (packages komodo cpprestsdk) - #:use-module (packages komodo doom-meta) - #:use-module (gnu packages) - #:use-module (gnu packages autotools) - #:use-module (gnu packages boost) - #:use-module (gnu packages calendar) - #:use-module (gnu packages check) - #:use-module (gnu packages compression) - #:use-module (gnu packages cpp) - #:use-module (gnu packages crypto) - #:use-module (gnu packages game-development) - #:use-module (gnu packages logging) - #:use-module (gnu packages ninja) - #:use-module (gnu packages perl) - #:use-module (gnu packages pretty-print) - #:use-module (gnu packages python) - #:use-module (gnu packages qt) - #:use-module (gnu packages tls) - #:use-module (gnu packages version-control) - #:use-module (guix build utils) - #:use-module (guix build-system cmake) - #:use-module (guix build-system copy) - #:use-module (guix build-system gnu) - #:use-module (guix build-system qt) - #:use-module (guix download) - #:use-module (guix gexp) - #:use-module (guix git-download) - #:use-module ((guix licenses) - #:prefix license:) - #:use-module (guix packages) - #:use-module (packages komodo komodo-vcpkg-ports) - #:use-module (packages komodo libsodium) - #:use-module (packages komodo qaterial) - #:use-module (packages komodo refl-cpp) - #:use-module (packages komodo sortfilterproxymodel) - #:use-module (packages komodo spdlog) - #:use-module (packages komodo strong-type) - #:use-module (packages komodo taskflow-2) - #:use-module (packages komodo wally)) - -;;; DATA LAYER - -(define build-deps-prefix "../build/_deps/") - -(define entt-komodo-version - "v3.5.1") - -(define entt-komodo-git-reference-url - "https://github.com/KomodoPlatform/entt") - -(define entt-komodo-hash - "16lqn4sa4yqkywqp35y0ydqwn8jsz0q98m4xyi352sppq0x3x941") - -(define expected-hash "17akrv80h0n4cfmxwvlvbb8ycqza7y3qqygjyphv95rrabqm9r02") - -(define expected-src "expected-src/") - -(define jl777-coins-hash "1svwwly61qy41xcvyz529fcfz6j4h3fgac34v1r4bc7jhjk0wm8a") - -(define jl777-coins-src "jl777-coins-src/") - -(define komodo-wallet-hash - "1gsw8kiz7r68yhzhvmcgrzaly8981nw9p7n8vmqmhdxl4av41sqd") - -(define komodo-wallet-home-page "https://atomicdex.io/") - -(define komodo-wallet-description-lines - (list "Komodo Wallet is a secure wallet and non-custodial decentralized " - "exchange rolled into one application. Store your coins, trade " - "peer-to-peer with minimal fees and never give up control over your " - "digital assets.")) - -(define komodo-wallet-name "komodo-wallet") - -(define komodo-wallet-synopsis-lines - (list "Komodo Wallet Desktop GUI")) - -(define komodo-wallet-version "0.7.1-beta") - -(define mm2-hash "1bn2sjcrp9ih44h3p96prnwg74aids7fgzcnlv3c68nan6y2lysi") - -(define mm2-src "mm2-src/") - -;;; ABSTRACTION LAYER -8 - -(define expected-file-name - (git-file-name "libexpected" "1.1.0")) - -(define expected-git-reference - (git-reference (url "https://github.com/TartanLlama/expected") - (commit "v1.1.0") - (recursive? #t))) - -(define expected-patches - (search-patches "libexpected-use-provided-catch2.patch")) - -(define komodo-wallet-git-reference - (git-reference (url "https://github.com/KomodoPlatform/komodo-wallet-desktop") - (commit komodo-wallet-version) - (recursive? #t))) - -(define expected-content-hash - (content-hash (base32 expected-hash))) - -(define jl777-coins-content-hash - (content-hash (base32 jl777-coins-hash))) - -(define komodo-wallet-content-hash - (content-hash (base32 komodo-wallet-hash))) - -(define mm2-content-hash - (content-hash (base32 mm2-hash))) - -;;; ABSTRACTION LAYER -7 - -(define build-path-mm2 - (string-append build-deps-prefix - mm2-src)) - -(define build-path-jl777-coins - (string-append build-deps-prefix - jl777-coins-src)) - -(define build-path-expected - (string-append build-deps-prefix - expected-src)) - -(define expected-origin - (origin (uri expected-git-reference) - (method git-fetch) - (hash expected-content-hash) - (file-name expected-file-name) - (patches expected-patches))) - -(define jl777-coins-origin - (origin (uri "https://github.com/KomodoPlatform/coins/archive/master.zip") - (method url-fetch) - (hash jl777-coins-content-hash))) - -(define komodo-wallet-origin - (origin (uri komodo-wallet-git-reference) - (method git-fetch) - (hash komodo-wallet-content-hash) - (modules '((guix build utils))) - (snippet '(begin (substitute* "cmake/antara.cmake" - (("if \\(LINUX\\)") - "if (NOT LINUX)")) - (substitute* "cmake/install/linux/linux_post_install.cmake" - (("if \\(EXISTS \\$\\{LINUX_DEPLOY_PATH\\}\\)") - "if (NOT EXISTS ${LINUX_DEPLOY_PATH})")) - (substitute* "cmake/install/linux/linux_post_install.cmake" - (("\"/usr/lib/x86_64-linux-gnu/libsmime3.so\"") - "")) - (substitute* "cmake/install/linux/linux_post_install.cmake" - (("\"/usr/lib/x86_64-linux-gnu/libssl3.so\"") - "")) - (substitute* "cmake/install/linux/linux_post_install.cmake" - (("\"/usr/lib/x86_64-linux-gnu/nss/libfreebl3.chk\"") - "")) - (substitute* "cmake/install/linux/linux_post_install.cmake" - (("\"/usr/lib/x86_64-linux-gnu/nss/libfreebl3.so\"") - "")) - (substitute* "cmake/install/linux/linux_post_install.cmake" - (("\"/usr/lib/x86_64-linux-gnu/nss/libnssdbm3.chk\"") - "")) - (substitute* "cmake/install/linux/linux_post_install.cmake" - (("\"/usr/lib/x86_64-linux-gnu/nss/libnssdbm3.so\"") - "")) - (substitute* "cmake/install/linux/linux_post_install.cmake" - (("\"/usr/lib/x86_64-linux-gnu/nss/libsoftokn3.chk\"") - "")) - (substitute* "cmake/install/linux/linux_post_install.cmake" - (("\"/usr/lib/x86_64-linux-gnu/nss/libsoftokn3.so\"") - "")) - (substitute* "cmake/install/linux/linux_post_install.cmake" - (("\"/usr/lib/x86_64-linux-gnu/nss/\"") - "")) - (substitute* "cmake/install/linux/linux_post_install.cmake" - (("file\\(COPY \\$\\{current_lib\\} DESTINATION \\$\\{PROJECT_LIB_PATH\\}\\)") - "")) - (substitute* "cmake/install/linux/linux_post_install.cmake" - (("file\\(RENAME \\$\\{CMAKE_SOURCE_DIR\\}\\/\\$\\{DEX_PROJECT_NAME\\}-\\$\\{VERSION_ID\\}-x86_64.AppImage \\$\\{CMAKE_SOURCE_DIR\\}\\/\\$\\{DEX_PROJECT_NAME\\}-linux-\\$\\{VERSION_ID\\}-x86_64.AppImage\\)") - "")) - (substitute* "cmake/install/linux/linux_post_install.cmake" - (("file\\(COPY \\$\\{CMAKE_SOURCE_DIR\\}\\/\\$\\{DEX_PROJECT_NAME\\}-linux-\\$\\{VERSION_ID\\}-x86_64.AppImage DESTINATION \\$\\{TARGET_APP_PATH\\}\\)") - "")) - (substitute* "cmake/install/linux/dex_install.cmake" - (("if \\(LINUX\\)") - "if (NOT LINUX)")))))) - -(define mm2-origin - (origin (uri "https://sdk.devbuilds.komodo.earth/main/mm2_b0fd99e-linux-x86-64.zip") - (method url-fetch) - (hash mm2-content-hash))) - -;;; ABSTRACTION LAYER -6 - -(define prepare-build-paths - `(string-append "file(MAKE_DIRECTORY \"" ,build-path-expected "\")\n" - "file(MAKE_DIRECTORY \"" ,build-path-jl777-coins "\")\n" - "file(MAKE_DIRECTORY \"" ,build-path-mm2 "\")\n")) - -(define prepare-expected-src - `(string-append "file(COPY " ,expected-origin "/ " - "DESTINATION " ,build-path-expected " " - "NO_SOURCE_PERMISSIONS FOLLOW_SYMLINK_CHAIN)\n")) - -(define prepare-jl777-coins-src - `(string-append "file(ARCHIVE_EXTRACT INPUT " ,jl777-coins-origin " " - "DESTINATION " ,build-path-jl777-coins ")\n" - "file(COPY " ,build-path-jl777-coins "/coins-master/ " - "DESTINATION " ,build-path-jl777-coins ")\n")) - -(define prepare-mm2-src - `(string-append "file(ARCHIVE_EXTRACT INPUT " ,mm2-origin " " - "DESTINATION " ,build-path-mm2 ")\n")) - -;;; ABSTRACTION LAYER -5 - -(define vcpkg-replacement - `(string-append "\n" - ,prepare-build-paths - ,prepare-expected-src - ,prepare-jl777-coins-src - ,prepare-mm2-src - "\n")) - -;;; ABSTRACTION LAYER -4 - -(define fix-date - `(substitute* "cmake/dependencies.cmake" - (("date::date-tz") - "date-tz"))) - -(define fix-doom-meta - `(substitute* (list "vendor/antara-gaming_sdk/modules/event/CMakeLists.txt" - "vendor/antara-gaming_sdk/modules/ecs/CMakeLists.txt") - (("doom::meta") - "doom_meta"))) - -(define include-nlohmann - `(substitute* "src/core/atomicdex/config/electrum.cfg.hpp" - (("STD") - "STD\n#include <nlohmann/json.hpp>"))) - -(define link-libraries - `(substitute* "cmake/dependencies.cmake" - (("ALIAS refl-cpp\\)") - (string-append "ALIAS refl-cpp)\n" - "add_library(strong_type INTERFACE)\n" - "target_link_libraries(strong_type INTERFACE strong_type)\n" - "add_library(doom_meta INTERFACE)\n" - "target_link_libraries(doom_meta INTERFACE doom_meta)\n" - "add_library(SortFilterProxyModel INTERFACE)\n" - "target_link_libraries(SortFilterProxyModel INTERFACE SortFilterProxyModel)\n")))) - -(define remove-unity - `(substitute* "src/CMakeLists.txt" - (("UNITY_BUILD ON") - "UNITY_BUILD ON"))) - -(define replace-vcpkg - `(substitute* "CMakeLists.txt" - (("include\\(vcpkg_prerequisites\\)") - ,vcpkg-replacement))) - -;;; ABSTRACTION LAYER -3 - -(define cmake-modification - `(lambda _ - ,replace-vcpkg - ,fix-date - ,fix-doom-meta - ,remove-unity - ,include-nlohmann - ,link-libraries)) - -(define entt-komodo-content-hash-get - (content-hash (base32 entt-komodo-hash))) - -(define entt-komodo-git-reference-get - (git-reference (url entt-komodo-git-reference-url) - (commit entt-komodo-version))) - -;;; ABSTRACTION LAYER -2 - -(define entt-komodo-origin-get - (origin (uri entt-komodo-git-reference-get) - (method git-fetch) - (hash entt-komodo-content-hash-get))) - -(define modify-cmake-configuration - `(add-after 'unpack - 'delete-vcpkg - ,cmake-modification)) - -;;; ABSTRACTION LAYER -1 - -(define date-komodo - (package (inherit date) - (version "v3.0.0") - (source (origin (uri (git-reference (url - "https://github.com/KomodoPlatform/date") - (commit - "cac99da8dc88be719a728dc1b597b0ac307c1800"))) - (method git-fetch) - (sha256 (base32 - "1qvlx6yzjsacj8zwl8k43cm00l1c41xdp1fqm8sq7ilglw06x8jk")))) - (arguments (list #:configure-flags - '(list "-DUSE_SYSTEM_TZ_DB=ON" - "-DBUILD_SHARED_LIBS=ON" - "-DBUILD_TZ_LIB=ON" - "-DENABLE_DATE_TESTING=ON" - "-DCMAKE_BUILD_TYPE=MinSizeRel") - #:tests? #f)))) - -(define entt-komodo - (package (inherit entt) - (name "entt-komodo") - (version entt-komodo-version) - (source entt-komodo-origin-get) - (arguments (list #:configure-flags '(list "-DBUILD_TESTING=OFF" - "-DFIND_GTEST_PACKAGE=OFF" - "-DBUILD_DOCS=OFF") - #:tests? #f)))) - -(define komodo-wallet-configure-flags - `(list "-DFETCHCONTENT_FULLY_DISCONNECTED=ON" - "-Wno-dev" - "-DCMAKE_BUILD_TYPE=MinSizeRel" - "-GNinja")) - -(define komodo-wallet-phases - #~(modify-phases %standard-phases - #+modify-cmake-configuration - (replace 'build - (lambda _ (invoke "ninja" "install"))) - ;;(delete 'install) - )) - -;;; ABSTRACTION LAYER 0 - -(define komodo-wallet-arguments - (list #:phases komodo-wallet-phases - #:configure-flags komodo-wallet-configure-flags - #:tests? #f)) - -(define komodo-wallet-description - (string-concatenate komodo-wallet-description-lines)) - -(define komodo-wallet-inputs - (list boost cpprestsdk date-komodo doctest doom-meta entt-komodo fmt git - libsodium-komodo ninja nlohmann-json openssl perl python qaterial - qtcharts qtdeclarative-5 qttools-5 qtsvg-5 qtwebengine-5 range-v3 - refl-cpp sortfilterproxymodel spdlog-1.8 strong-type taskflow-2 wally - zlib)) - -(define komodo-wallet-synopsis - (string-concatenate komodo-wallet-synopsis-lines)) - -;;; SURFACE LAYER - -(define-public komodo-wallet - (package (name komodo-wallet-name) - (version komodo-wallet-version) - (source komodo-wallet-origin) - (build-system qt-build-system) - (arguments komodo-wallet-arguments) - (inputs komodo-wallet-inputs) - (synopsis komodo-wallet-synopsis) - (description komodo-wallet-description) - (license license:gpl2) - (home-page komodo-wallet-home-page))) diff --git a/packages/komodo/libsodium.scm b/packages/komodo/libsodium.scm deleted file mode 100644 index 3476626..0000000 --- a/packages/komodo/libsodium.scm +++ /dev/null @@ -1,81 +0,0 @@ -(define-module (packages komodo libsodium) - #:use-module (gnu packages crypto) - #:use-module (guix build utils) - #:use-module (guix build-system cmake) - #:use-module (guix git-download) - #:use-module (guix packages) - #:use-module (packages komodo komodo-vcpkg-ports)) - -;; DATA LAYER - -(define hash - (base32 "0yk9pyj7bl421hb20lg9yaysqvcgrk7860613674la0gk5glq34d")) - -(define inputs - (list komodo-vcpkg-ports)) - -(define name - "libsodium-komodo") - -(define tests? - #f) - -(define url - "https://github.com/jedisct1/libsodium") - -(define version - "1.0.19") - -;; ABSTRACTION LAYER -4 - -(define komodo-vcpkg-ports-store - '(assoc-ref inputs "komodo-vcpkg-ports")) - -;; ABSTRACTION LAYER -3 - -(define copy-cmakelists - `(lambda* (#:key inputs #:allow-other-keys) - (let ((destination ".") - (source (string-append ,komodo-vcpkg-ports-store - "/ports/libsodium/"))) - (copy-recursively source - destination)))) - -;; ABSTRACTION LAYER -2 - -(define create-cmakelists - `(add-after 'unpack - 'create-cmakelists - ,copy-cmakelists)) - -;; ABSTRACTION LAYER -1 - -(define uri - (git-reference (url url) - (commit version))) - -(define phases - `(modify-phases %standard-phases - ,create-cmakelists)) - -;; ABSTRACTION LAYER -0 - -(define arguments - (list #:phases phases - #:tests? tests?)) - -(define source - (origin (uri uri) - (method git-fetch) - (sha256 hash))) - -;; SURFACE LAYER - -(define-public libsodium-komodo - (package (inherit libsodium) - (name name) - (source source) - (build-system cmake-build-system) - (arguments arguments) - (inputs inputs))) - diff --git a/packages/komodo/qaterial.scm b/packages/komodo/qaterial.scm deleted file mode 100644 index 91a8b68..0000000 --- a/packages/komodo/qaterial.scm +++ /dev/null @@ -1,240 +0,0 @@ -(define-module (packages komodo qaterial) - #:use-module (gnu packages qt) - #:use-module (packages komodo googlefontcmake) - #:use-module (guix build utils) - #:use-module (guix build-system copy) - #:use-module (guix build-system cmake) - #:use-module (guix download) - #:use-module (guix gexp) - #:use-module (guix git-download) - #:use-module ((guix licenses) - #:prefix license:) - #:use-module (guix packages) - #:use-module (packages komodo qolm) - #:use-module (packages komodo qtgeneratorcmake)) - -;; DATA LAYER - -(define cmake-fetchgooglefontcmake - "cmake/FetchGoogleFontCMake.cmake") - -(define cmakelists-fonts - "qml/Qaterial/Fonts/CMakeLists.txt") - -(define cmakelists-icons - "qml/Qaterial/Icons/CMakeLists.txt") - -(define cmakelists-root - "CMakeLists.txt") - -(define description - "A collection of Material Components to build faster UI using Qml.") - -(define disable-icons - "set(QATERIAL_ENABLE_ICONS OFF") - -(define disable-lato - "set(QATERIAL_ENABLE_LATO OFF") - -(define disable-roboto - "set(QATERIAL_ENABLE_ROBOTO OFF") - -(define disable-robotomono - "set(QATERIAL_ENABLE_ROBOTOMONO OFF") - -(define enable-build-shared - "set(QATERIAL_BUILD_SHARED ON") - -(define fetcher-fonts - "include\\(\\$\\{PROJECT_SOURCE_DIR\\}\\/cmake\\/FetchGoogleFontCMake.cmake\\)") - -(define fetcher-qolm - "include\\(cmake\\/FetchQOlm.cmake\\)") - -(define file-generateqrc - "cmake/GenerateQrc.cmake") - -(define fetcher-qtgeneratorcmake - "include\\(cmake\\/FetchQtGeneratorCMake.cmake\\)") - -(define hash - (base32 "19xvgk4h908x0zgxy63fqmrsb5df613vhr5h7cpsgg7nllglypss")) - -(define hook-enable-icons - "set\\(QATERIAL_ENABLE_ICONS ON") - -(define hook-qaterial-generate-icons-class - "qaterial_generate_icons_class\\(\\$\\{QATERIAL_ICONS_CLASS_FILE\\} \\$\\{QATERIAL_ICONS_SRC_FILE\\}\\)") - -(define head-hook - "include\\(cmake\\/Version.cmake\\)") - -(define home-page - "https://olivierldff.github.io/Qaterial") - -(define hook-icons - "include\\(\\$\\{PROJECT_SOURCE_DIR\\}\\/cmake\\/FetchMaterialDesignIcons.cmake\\)") - -(define name - "qaterial") - -(define null-string - "") - -(define setter-build-shared - "set\\(QATERIAL_BUILD_SHARED OFF") - -(define setter-lato - "set\\(QATERIAL_ENABLE_LATO ON") - -(define setter-roboto - "set\\(QATERIAL_ENABLE_ROBOTO ON") - -(define setter-robotomono - "set\\(QATERIAL_ENABLE_ROBOTOMONO ON") - -(define synopsis - "🧩 Collection of Material Components based on QtQuickControls2.") - -(define url - "https://github.com/OlivierLDff/Qaterial.git") - -(define version - "v1.4.9") - -;; ABSTRACTION LAYER -4 - -(define link-qtgeneratorcmake - '(string-append "include(cmake/Version.cmake)\n" - "include(" - path-qtgeneratorcmake - "/cmake/GenerateQrc.cmake" - ")\n" - "include(" - path-qtgeneratorcmake - "/cmake/GenerateQmldir.cmake" - ")\n" - "include(" - path-qtgeneratorcmake - "/cmake/GenerateQrcAliasQtObject.cmake" - ")\n")) - -;; ABSTRACTION LAYER -3 - -(define clause-delete-fetchers - `(lambda _ - (substitute* ,cmakelists-root - ((,fetcher-qolm) - ,null-string)) - (substitute* ,cmakelists-root - ((,fetcher-qtgeneratorcmake) - ,null-string)) - (substitute* ,cmakelists-root - ((,setter-roboto) - ,disable-roboto)) - (substitute* ,cmakelists-root - ((,setter-robotomono) - ,disable-robotomono)) - (substitute* ,cmakelists-root - ((,setter-lato) - ,disable-lato)) - (substitute* ,cmakelists-fonts - ((,fetcher-fonts) - ,null-string)) - (substitute* ,cmakelists-icons - ((,hook-icons) - ,null-string)) - (substitute* ,cmakelists-root - ((,hook-enable-icons) - ,disable-icons)) - (substitute* ,cmakelists-root - (("\\# ───── QATERIAL TARGET ─────") - "find_package(QOlm)")))) - -;; (define clause-hack-icon-generator -;; `(lambda _ -;; (invoke "echo" ,qaterial-fix ">" "cmake/QaterialGenerateIcons.cmake"))) - -(define clause-link-qtgenerator - `(lambda* (#:key inputs #:allow-other-keys) - (let ((path-qtgeneratorcmake (assoc-ref inputs "qtgeneratorcmake"))) - (substitute* ,cmakelists-root - ((,head-hook) - ,link-qtgeneratorcmake))))) - -(define clause-set-build-shared - `(lambda _ - (substitute* ,cmakelists-root - ((,setter-build-shared) - ,enable-build-shared)))) - -;; ABSTRACTION LAYER -2 - -(define phase-delete-fetchers - `(add-before 'configure - 'delete-fetchers - ,clause-delete-fetchers)) - -;; (define phase-hack-icon-generator -;; `(add-before 'configure -;; 'hack-icon-generator -;; ,clause-hack-icon-generator)) - -(define phase-link-qtgenerator - `(add-before 'configure - 'link-qtgenerator - ,clause-link-qtgenerator)) - -(define phase-set-build-shared - `(add-before 'configure - 'set-build-shared - ,clause-set-build-shared)) - -;; ABSTRACTION LAYER -1 - -(define phases - `(modify-phases %standard-phases - ,phase-delete-fetchers - ,phase-set-build-shared - ,phase-link-qtgenerator - (add-after 'unpack - 'kill-registericons - (lambda _ - (substitute* "src/Qaterial/Details/Utils.cpp" - ((" __Qaterial_registerIconsSingleton\\(\\)") - ,null-string)))) - )) - -(define uri - (git-reference (url url) - (commit version))) - -;; ABSTRACTION LAYER -0 - -(define arguments - (list #:phases phases - #:tests? #f)) - -(define inputs - (list googlefontcmake qolm qtbase-5 qtdeclarative-5 - qtgeneratorcmake qtquickcontrols2-5 qtsvg-5)) - -(define source - (origin (uri uri) - (method git-fetch) - (sha256 hash) - (patches (list (local-file "Qaterial.patch"))))) - -;; SURFACE LAYER - -(define-public qaterial - (package (name name) - (version version) - (source source) - (build-system cmake-build-system) - (arguments arguments) - (inputs inputs) - (synopsis synopsis) - (description description) - (license license:expat) - (home-page home-page))) diff --git a/packages/komodo/qolm.scm b/packages/komodo/qolm.scm deleted file mode 100644 index f674b8a..0000000 --- a/packages/komodo/qolm.scm +++ /dev/null @@ -1,69 +0,0 @@ -(define-module (packages komodo qolm) - #:use-module (gnu packages qt) - #:use-module (guix build-system cmake) - #:use-module (guix git-download) - #:use-module ((guix licenses) - #:prefix license:) - #:use-module (guix packages)) - -;; DATA LAYER - -(define description - (string-append "qolm::QOlm object based on QAbstractListModel that provide a " - "list of QObject based class to qml and c++. The model " - "dynamically update views by reacting to insert, remove, move " - "operations.")) - -(define hash - (base32 "1rxw6lwv3gbgscnlz7njrs8yd21svqq0qpwiggnyrlbk5j85n7d7")) - -(define home-page - "https://olivierldff.github.io/QOlm/") - -(define inputs - (list qtbase-5 qtdeclarative-5)) - -(define name - "qolm") - -(define synopsis - "🧱 QAbstractListModel subclass that provide List of QObject to C++ and Qml.") - -(define tests? - #f) - -(define url - "https://github.com/OlivierLDff/QOlm.git") - -(define version - "v3.2.1") - -;; ABSTRACTION LAYER -1 - -(define uri - (git-reference (url url) - (commit version))) - -;; ABSTRACTION LAYER -0 - -(define arguments - (list #:tests? tests?)) - -(define source - (origin (uri uri) - (method git-fetch) - (sha256 hash))) - -;; SURFACE LAYER - -(define-public qolm - (package (name name) - (version version) - (source source) - (build-system cmake-build-system) - (arguments arguments) - (inputs inputs) - (synopsis synopsis) - (description description) - (license license:expat) - (home-page home-page))) diff --git a/packages/komodo/qtgeneratorcmake.scm b/packages/komodo/qtgeneratorcmake.scm deleted file mode 100644 index 943c58e..0000000 --- a/packages/komodo/qtgeneratorcmake.scm +++ /dev/null @@ -1,56 +0,0 @@ -(define-module (packages komodo qtgeneratorcmake) - #:use-module (guix build-system copy) - #:use-module (guix git-download) - #:use-module ((guix licenses) - #:prefix license:) - #:use-module (guix packages)) - -;; DATA LAYER - -(define hash - (base32 "129ryyww6wd06ni4f7kcf91qr7a7fpc58kic4cvvgyczfrgswgd2")) - -(define name - "qtgeneratorcmake") - -(define description - (string-append "Collection of CMake function to generate qrc, qmldir files " - "for qt applications.")) - -(define home-page - "https://github.com/OlivierLDff/QtGeneratorCMake") - -(define synopsis - (string-append "Collection of CMake function to generate qrc, qmldir files " - "for qt applications.")) - -(define url - "https://github.com/OlivierLDff/QtGeneratorCMake.git") - -(define version - "v1.0.0") - -;; ABSTRACTION LAYER -1 - -(define uri - (git-reference (url url) - (commit version))) - -;; ABSTRACTION LAYER -0 - -(define source - (origin (uri uri) - (method git-fetch) - (sha256 hash))) - -;; SURFACE LAYER - -(define-public qtgeneratorcmake - (package (name name) - (version version) - (source source) - (build-system copy-build-system) - (synopsis synopsis) - (description description) - (license license:expat) - (home-page home-page))) diff --git a/packages/komodo/refl-cpp.scm b/packages/komodo/refl-cpp.scm deleted file mode 100644 index 8e73017..0000000 --- a/packages/komodo/refl-cpp.scm +++ /dev/null @@ -1,85 +0,0 @@ -(define-module (packages komodo refl-cpp) - #:use-module (guix build-system cmake) - #:use-module (guix git-download) - #:use-module ((guix licenses) - :prefix license:) - #:use-module (guix packages)) - -;; DATA LAYER - -(define refl-cpp-description-lines - (list "refl-cpp is a header-only library which provides compile-time " - "reflection and introspection capabilities to C++. By encoding type " - "metadata in the type system, refl-cpp allows you to process types and " - "their fields and functions via constexpr and template " - "metaprogramming.")) - -(define refl-cpp-git-reference-url "https://github.com/veselink1/refl-cpp.git") - -(define refl-cpp-hash "021aggcrh92ircxrk8g375czz5njn62h502arn265d672kn05nrq") - -(define refl-cpp-home-page - "https://veselink1.github.io/refl-cpp/md__introduction.html") - -(define refl-cpp-name "refl-cpp") - -(define refl-cpp-synopsis "Static reflection for C++17") - -(define refl-cpp-tests #f) - -(define refl-cpp-version "v0.12.4") - -;; ABSTRACTION LAYER -3 - -(define patch-install-rules - `(lambda _ - (substitute* "cmake/install-rules.cmake" - (("include\\/refl-cpp") - "include")))) - -;; ABSTRACTION LAYER -2 - -(define expose-header-file - `(add-after 'unpack - 'expose-header - ,patch-install-rules)) - -;; ABSTRACTION LAYER -1 - -(define refl-cpp-content-hash - (content-hash (base32 refl-cpp-hash))) - -(define refl-cpp-git-reference - (git-reference (url refl-cpp-git-reference-url) - (commit refl-cpp-version))) - -(define refl-cpp-phases - `(modify-phases %standard-phases - ,expose-header-file)) - -;; ABSTRACTION LAYER 0 - -(define refl-cpp-arguments - (list #:phases refl-cpp-phases - #:tests? refl-cpp-tests)) - -(define refl-cpp-description - (string-concatenate refl-cpp-description-lines)) - -(define refl-cpp-origin - (origin (uri refl-cpp-git-reference) - (method git-fetch) - (hash refl-cpp-content-hash))) - -;; SURFACE LAYER - -(define-public refl-cpp - (package (name refl-cpp-name) - (version refl-cpp-version) - (source refl-cpp-origin) - (build-system cmake-build-system) - (arguments refl-cpp-arguments) - (synopsis refl-cpp-synopsis) - (description refl-cpp-description) - (license license:expat) - (home-page refl-cpp-home-page))) diff --git a/packages/komodo/sortfilterproxymodel.scm b/packages/komodo/sortfilterproxymodel.scm deleted file mode 100644 index 43a4054..0000000 --- a/packages/komodo/sortfilterproxymodel.scm +++ /dev/null @@ -1,83 +0,0 @@ -(define-module (packages komodo sortfilterproxymodel) - #:use-module (gnu packages qt) - #:use-module (guix build-system cmake) - #:use-module (guix git-download) - #:use-module ((guix licenses) - #:prefix license:) - #:use-module (guix packages)) - -;; DATA LAYER - -(define description-lines - (list "SortFilterProxyModel is an implementation of QSortFilterProxyModel " - "conveniently exposed for QML.")) - -(define hash - "0953rb1ylx8havjdk6r5bnassllbbdvl5qg55kknvcvdz398z32f") - -(define home-page - "https://github.com/OlivierLDff/SortFilterProxyModel") - -(define name - "SortFilterProxyModel") - -(define synopsis-lines - (list "A nicely exposed QSortFilterProxyModel for QML")) - -(define test-target? - #f) - -(define version - "master") - -;; ABSTRACTION LAYER -2 - -(define delete-install - '(delete 'install)) - -;; ABSTRACTION LAYER -1 - -(define no-install - `(modify-phases %standard-phases - ,delete-install)) - -(define origin-uri - (git-reference (url home-page) - (commit version))) - -(define sha256 - (content-hash (base32 hash))) - -;; ABSTRACTION LAYER -0 - -(define arguments - (list #:phases no-install - #:tests? test-target?)) - -(define description - (string-concatenate description-lines)) - -(define inputs - (list qtbase-5 qtdeclarative-5)) - -(define source - (origin (uri origin-uri) - (method git-fetch) - (hash sha256))) - -(define synopsis - (string-concatenate synopsis-lines)) - -;; SURFACE LAYER - -(define-public sortfilterproxymodel - (package (name name) - (version version) - (source source) - (build-system cmake-build-system) - (arguments arguments) - (inputs inputs) - (synopsis synopsis) - (description description) - (license license:expat) - (home-page home-page))) diff --git a/packages/komodo/spdlog.scm b/packages/komodo/spdlog.scm deleted file mode 100644 index 0fe0513..0000000 --- a/packages/komodo/spdlog.scm +++ /dev/null @@ -1,44 +0,0 @@ -(define-module (packages komodo spdlog) - #:use-module (gnu packages logging) - #:use-module (guix git-download) - #:use-module (guix packages)) - -;; DATA LAYER - -(define configure-flags-inherited - (list "-DSPDLOG_BUILD_BENCH=OFF" - "-DSPDLOG_BUILD_SHARED=ON")) - -(define tests? - #f) - -(define version - "1.8.5") - -;; ABSTRACTION LAYER -1 - -(define configure-flags - `',configure-flags-inherited) - -;; ABSTRACTION LAYER -0 - -(define arguments - (list #:configure-flags configure-flags - #:tests? tests?)) - -(define source - (origin (uri (git-reference (url "https://github.com/gabime/spdlog") - (commit (string-append "v" - version)))) - (method git-fetch) - (file-name (git-file-name "spdlog" version)) - (sha256 (base32 - "179krvg5sad6dviqpcjwg6czzknnilqszrg1d0fgp12h6sy66vqg")))) - -;; SURFACE LAYER - -(define-public spdlog-1.8 - (package (inherit spdlog) - (version version) - (source source) - (arguments arguments))) diff --git a/packages/komodo/strong-type.scm b/packages/komodo/strong-type.scm deleted file mode 100644 index 4cf3b49..0000000 --- a/packages/komodo/strong-type.scm +++ /dev/null @@ -1,86 +0,0 @@ -(define-module (packages komodo strong-type) - ;; #:use-module (guix build utils) - #:use-module (guix build-system copy) - ;; #:use-module (guix build-system cmake) - #:use-module (guix git-download) - #:use-module ((guix licenses) - #:prefix license:) - #:use-module (guix packages)) - -;; DATA LAYER - -(define git-extension ".git") - -(define installation-source "../source") - -(define installation-target ".") - -(define strong-type-description-lines - (list "This tiny library provides a way to wrap an existing type in order to " - "give it additional meaning.")) - -(define strong-type-github "https://github.com/doom/strong_type") - -(define strong-type-hash "08r10j6qdv18jxsxb4qfs2pfii65by65cmfvn1baag9vv1cd6idf") - -(define strong-type-name "strong-type") - -(define strong-type-synopsis-lines - (list "C++ implementation of strong types")) - -(define strong-type-version "1.0.3") - -;; ABSTRACTION LAYER -2 - -(define install-everything - `(list ,installation-source ,installation-target)) - -(define strong-type-git - (string-append strong-type-github git-extension)) - -;; ABSTRACTION LAYER -1 - -(define install-plan - `(list ,install-everything)) - -(define strong-type-content-hash - (content-hash (base32 strong-type-hash))) - -(define strong-type-git-reference - (git-reference (url strong-type-git) - (commit strong-type-version))) - -;; ABSTRACTION LAYER -0 - -(define get-strong-type-arguments - (list #:install-plan install-plan)) - -(define get-strong-type-description - (string-concatenate strong-type-description-lines)) - -(define get-home-page strong-type-github) - -(define get-strong-type-name strong-type-name) - -(define get-strong-type-origin - (origin (uri strong-type-git-reference) - (method git-fetch) - (hash strong-type-content-hash))) - -(define get-strong-type-synopsis - (string-concatenate strong-type-synopsis-lines)) - -(define get-strong-type-version strong-type-version) - -;; SURFACE LAYER - -(define-public strong-type - (package (name get-strong-type-name) - (version get-strong-type-version) - (source get-strong-type-origin) - (build-system copy-build-system) - (arguments get-strong-type-arguments) - (synopsis get-strong-type-synopsis) - (description get-strong-type-description) - (license license:expat) - (home-page get-home-page))) diff --git a/packages/komodo/taskflow-2.scm b/packages/komodo/taskflow-2.scm deleted file mode 100644 index cd1b3cd..0000000 --- a/packages/komodo/taskflow-2.scm +++ /dev/null @@ -1,7 +0,0 @@ -(define-module (packages komodo taskflow-2) - #:use-module (gnu packages cpp) - #:use-module (guix packages)) - -(define-public taskflow-2 - (package (inherit taskflow) - (version "2.2.0"))) diff --git a/packages/komodo/vcpkg.scm b/packages/komodo/vcpkg.scm deleted file mode 100644 index c49c1eb..0000000 --- a/packages/komodo/vcpkg.scm +++ /dev/null @@ -1,168 +0,0 @@ -(define-module (packages komodo vcpkg) - ;; #:use-module (packages komodo cmake) - ;; #:use-module (gnu packages commencement) - ;; #:use-module (gnu packages compression) - ;; #:use-module (gnu packages cpp) - ;; #:use-module (gnu packages curl) - ;; #:use-module (gnu packages ncurses) - ;; #:use-module (gnu packages ninja) - ;; #:use-module (guix build utils) - #:use-module (guix build-system copy) - #:use-module (guix build-system cmake) - ;; #:use-module (guix build-system qt) - #:use-module (guix download) - ;; #:use-module (guix gexp) - ;; #:use-module (guix git-download) - #:use-module ((guix licenses) - #:prefix license:) - #:use-module (guix packages) - ;; #:use-module (nonguix build-system binary) - ) - - -;;; ABSTRACTION -2 - -(define-public vcpkg-tool-cmrc - (let ((version "2.0.1")) - (package - (name "vcpkg-cmrc") - (version version) - (source - (origin - (uri - (string-append - "https://github.com/vector-of-bool/cmrc/archive/refs/tags/" - version - ".tar.gz")) - (method url-fetch) - (hash - (content-hash - "06xpnnwbqv3r8v0vblzcrjp2zgddy05v132y9c9dz8dyl2m5zbgd")))) - (build-system copy-build-system) - (arguments - '(#:install-plan '(("CMakeRC.cmake" "CMakeRCConfig.cmake")))) - (synopsis "A Resource Compiler in a Single CMake Script") - (description - (string-append - "CMakeRC is a resource compiler provided in a single CMake " - "script that can easily be included in another project.")) - (license license:expat) - (home-page "https://github.com/vector-of-bool/cmrc/")))) - -(define-public vcpkg-tool-fmt - (let ((version "10.1.0")) - (package - (name "vcpkg-fmt") - (version version) - (source - (origin - (uri - (string-append - "https://github.com/fmtlib/fmt/archive/refs/tags/" - version ".tar.gz")) - (method url-fetch) - (hash - (content-hash - "02na80r7yrkda89s7mz35llqh904dbsppb7g5s7na9ji5yns7c6y")))) - (build-system cmake-build-system) - (synopsis "A modern formatting library") - (description - (string-append - "{fmt} is an open-source formatting library providing a fast " - "and safe alternative to C stdio and C++ iostreams.")) - (license license:expat) - (home-page "https://fmt.dev/")))) - -;;; ABSTRACTION -1 - -(define vcpkg - (let ((version "2024.02.14")) - (package - (name "vcpkg") - (version version) - (source - (origin - (uri - (string-append - "https://github.com/microsoft/vcpkg/archive/refs/tags/" - version - ".tar.gz")) - (method url-fetch) - (hash - (content-hash - "1wbhxfbi964bc93f69rsr1h6z82ypc9lyz2rb0kp3sfwp0m9jhhf")))) - (build-system copy-build-system) - (arguments - (list - #:install-plan '(list (list "vcpkg" "vcpkg")) - #:phases - #~ (modify-phases - %standard-phases - (add-after - 'unpack - 'unpack-vcpkg-tool - (lambda _ - (invoke "mkdir" "downloads") - (copy-recursively - #+ (origin - (uri - (string-append - "https://github.com/microsoft/vcpkg-tool/archive/" - "2024-02-07" - ".tar.gz")) - (method url-fetch) - (hash - (content-hash - "1j08vw8l8zf6pv6n1kvyjwvj0h7y667shs72sf69hg7p8zj5k9p4"))) - "downloads/2024-02-07.tar.gz"))) - (add-after - 'unpack-vcpkg-tool - 'patch-vcpkg-tool - (lambda* _ - (invoke "chmod" "+w" "downloads/2024-02-07.tar.gz") - (invoke "gunzip" "downloads/2024-02-07.tar.gz") - (invoke - "tar" "-xf" "downloads/2024-02-07.tar" "-C" "downloads" - "vcpkg-tool-2024-02-07/cmake/Findfmt.cmake" - "vcpkg-tool-2024-02-07/cmake/FindCMakeRC.cmake") - (invoke - "tar" "--delete" "-f" "downloads/2024-02-07.tar" - "vcpkg-tool-2024-02-07/cmake/Findfmt.cmake" - "vcpkg-tool-2024-02-07/cmake/FindCMakeRC.cmake") - (substitute* - "downloads/vcpkg-tool-2024-02-07/cmake/Findfmt.cmake" - (("the fmt library\" OFF") - "the fmt library\" ON")) - (substitute* - "downloads/vcpkg-tool-2024-02-07/cmake/FindCMakeRC.cmake" - (("resource compiler\" OFF") - "resource compiler\" ON")) - (invoke - "tar" "-rf" "downloads/2024-02-07.tar" - "downloads/vcpkg-tool-2024-02-07/cmake/Findfmt.cmake" - "downloads/vcpkg-tool-2024-02-07/cmake/FindCMakeRC.cmake") - (invoke "gzip" "downloads/2024-02-07.tar"))) - (add-after - 'patch-generated-file-shebangs - 'bootstrap-vcpkg - (lambda* _ - (substitute* - "scripts/bootstrap.sh" - (("vcpkgDownloadTool=\"ON\"") - "vcpkgDownloadTool=\"OFF\"") - (("\\$actualHash") - "$expectedHash")) - (invoke "./bootstrap-vcpkg.sh" "--disableMetrics"))) - (delete 'configure) - (delete 'build) - (delete 'check)))) - (native-inputs - (list cmake curl ninja unzip vcpkg-tool-cmrc vcpkg-tool-fmt zip)) - (synopsis "C++ Library Manager for Windows, Linux, and MacOS") - (description - (string-append - "Vcpkg helps you manage C and C++ libraries on Windows, Linux " - "and MacOS. This tool and ecosystem are constantly evolving, " - "and we always appreciate contributions!")) - (license license:expat) - (home-page "https://vcpkg.io")))) diff --git a/packages/komodo/wally.scm b/packages/komodo/wally.scm deleted file mode 100644 index 73d9417..0000000 --- a/packages/komodo/wally.scm +++ /dev/null @@ -1,61 +0,0 @@ -(define-module (packages komodo wally) - #:use-module (gnu packages autotools) - #:use-module (gnu packages python) - #:use-module (guix build-system gnu) - #:use-module (guix git-download) - #:use-module ((guix licenses) - #:prefix license:) - #:use-module (guix packages)) - -;; DATA LAYER - -(define description - (string-append "Wally is a cross-platform, cross-language collection of " - "useful primitives for cryptocurrency wallets.")) - -(define hash - (base32 "1c3w3qdg4l30wvijzi1rf4p0jynwdpb99x717h4v2i6fw140sz7f")) - -(define home-page - "https://github.com/ElementsProject/libwally-core") - -(define name - "wally") - -(define synopsis - "Useful primitives for wallets") - -(define url - "https://github.com/KomodoPlatform/libwally-core.git") - -(define version - "release_0.7.7") - -;; ABSTRACTION LAYER -1 - -(define uri - (git-reference (url url) - (commit version))) - -;; ABSTRACTION LAYER -0 - -(define inputs - (list autoconf automake libtool python python-2)) - -(define source - (origin (uri uri) - (method git-fetch) - (sha256 hash))) - -;; SURFACE LAYER - -(define-public wally - (package (name name) - (version version) - (source source) - (build-system gnu-build-system) - (inputs inputs) - (synopsis synopsis) - (description description) - (license license:expat) - (home-page home-page))) diff --git a/packages/plasma.scm b/packages/plasma.scm deleted file mode 100644 index 96aa3c5..0000000 --- a/packages/plasma.scm +++ /dev/null @@ -1,87 +0,0 @@ -(define-module (packages plasma) - #:use-module (gnu packages freedesktop) - #:use-module (gnu packages gnupg) - #:use-module (gnu packages kde-frameworks) - #:use-module (gnu packages kde-pim) - #:use-module (gnu packages kde-plasma) - #:use-module (gnu packages qt) - #:use-module (guix packages)) - -(define-public kgpg* - (package (inherit kgpg) - (propagated-inputs (list pinentry)))) - -(define-public plasma* - (package (inherit plasma) - (propagated-inputs (list kded ;; custom change - kgpg* ;; custom change - kdeclarative ;; require by sddm breeze theme - plasma5support ;; require by sddm breeze theme - qt5compat ;; require by sddm breeze theme - kiconthemes ;; require by sddm breeze theme - ksvg ;; require by sddm breeze theme - qqc2-desktop-style ; qtquickcontrols2 theme - ocean-sound-theme - qtdeclarative - qtsvg ;; for svg support - qtbase ;; why? - baloo - breeze-icons ; default mouse icon - breeze - breeze-gtk - layer-shell-qt - drkonqi - kactivitymanagerd ; require this run dbus - kde-cli-tools - kdecoration - kdeplasma-addons - ktexteditor - kscreen - libkscreen - krdp - ksystemstats - kwallet - kwallet-pam - kwin - plasma-workspace-wallpapers - libksysguard - milou - oxygen-sounds - qqc2-breeze-style - kde-gtk-config - kinfocenter - kscreenlocker - ksshaskpass - discover - kmenuedit - plasma-welcome - plasma-browser-integration - plasma-desktop - plasma-disks - polkit-kde-agent - system-settings - xdg-desktop-portal-kde - ;; module cyclic referencing - (module-ref - (resolve-interface - '(gnu packages kde-systemtools)) - 'dolphin) - (module-ref - (resolve-interface - '(gnu packages kde-systemtools)) - 'konsole) - (module-ref - (resolve-interface - '(gnu packages kde-systemtools)) - 'spectacle) - plasma-firewall - plasma-integration - plasma-nm - plasma-pa - plasma-systemmonitor - ;; plasma-thunderbolt ;; waiting for bolt - kglobalaccel - kglobalacceld - plasma-vault - plasma-workspace - powerdevil)))) diff --git a/services/guix/channels.scm b/services/guix/channels.scm deleted file mode 100644 index fcc3ba5..0000000 --- a/services/guix/channels.scm +++ /dev/null @@ -1,76 +0,0 @@ -(define-module (services guix channels) - #:use-module (gnu packages package-management) - #:use-module (gnu services) - #:use-module (gnu services base) - #:use-module (guix channels)) - -;;; DATA - -(define deployment-commit - "c24ce7cb11e74da13d491f9de3c4b7040a069f43") - -(define deployment-url - "https://git.marekpasnikowski.pl/git/deployment.git") - -(define distribution-commit - "7d17bded11ef1239592e6e5abd40ceee1e99cbb8") - -(define distribution-url - "https://git.marekpasnikowski.pl/git/distribution.git") - -(define marekpasnikowski-fingerprint - (openpgp-fingerprint "590E 500F E39D 26B3 E60B 743B 6D81 B120 7711 899F")) - -(define nonguix-commit - "897c1a470da759236cc11798f4e0a5f7d4d59fbc") - -(define nonguix-url - "https://gitlab.com/nonguix/nonguix") - -(define nonguix-fingerprint - (openpgp-fingerprint "2A39 3FFF 68F4 EF7A 3D29 12AF 6F51 20A0 22FB B2D5")) - -;;; ABSTRACTION 3 - -(define deployment-introduction - (make-channel-introduction deployment-commit - marekpasnikowski-fingerprint)) - -(define distribution-introduction - (make-channel-introduction distribution-commit - marekpasnikowski-fingerprint)) - -(define nonguix-introduction - (make-channel-introduction nonguix-commit - nonguix-fingerprint)) - -;;; ABSTRACTION 2 - -(define deployment - (channel (name 'deployment) - (url deployment-url) - (introduction deployment-introduction))) - -(define distribution - (channel (name 'distribution) - (url distribution-url) - (introduction distribution-introduction))) - -(define nonguix - (channel (name 'nonguix) - (url nonguix-url) - (introduction nonguix-introduction))) - -;;; ABSTRACTION 1 - -(define distribution-channels - (append %default-channels - (list deployment - distribution - nonguix))) - -;;; PUBLIC - -(define-public (channels config) - (guix-configuration (inherit config) - (channels distribution-channels))) diff --git a/services/nonguix/substitute.scm b/services/nonguix/substitute.scm deleted file mode 100644 index 4cf866a..0000000 --- a/services/nonguix/substitute.scm +++ /dev/null @@ -1,32 +0,0 @@ -(define-module (services nonguix substitute) - #:use-module (gnu services base) - #:use-module (guix gexp)) - -;; DATA - -(define nonguix-authorized-guix-key-content - (string-append "(public-key \n" - "(ecc \n" - "(curve Ed25519) \n" - "(q #C1FD53E5D4CE971933EC50C9F307AE2171A2D3B52C804642A7A35F84F3A4EA98#))) \n")) - -(define nonguix-authorized-guix-key-name - "nonguix-authorized-guix-key") - -(define nonguix-substitute-urls - (list "https://substitutes.nonguix.org")) - -;; ABSTRACTION 1 - -(define nonguix-authorized-guix-keys - (list (plain-file nonguix-authorized-guix-key-name - nonguix-authorized-guix-key-content))) - -;; PUBLIC - -(define-public (nonguix-substitute config) - (guix-configuration (inherit config) - (substitute-urls (append %default-substitute-urls - nonguix-substitute-urls)) - (authorized-keys (append %default-authorized-guix-keys - nonguix-authorized-guix-keys)))) diff --git a/services/plasma-desktop.scm b/services/plasma-desktop.scm deleted file mode 100644 index 9b8dc17..0000000 --- a/services/plasma-desktop.scm +++ /dev/null @@ -1,12 +0,0 @@ -(define-module (services plasma-desktop) - #:use-module (gnu services) - #:use-module (gnu services desktop) - #:use-module (packages plasma)) - -(define-public plasma-desktop-configuration* - (plasma-desktop-configuration (plasma-package plasma*))) - -;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; - -(define-public plasma-desktop-service-type* - (service plasma-desktop-service-type plasma-desktop-configuration*)) diff --git a/suweren/commons/sudoers.scm b/suweren/commons/sudoers.scm deleted file mode 100644 index 0ae42d3..0000000 --- a/suweren/commons/sudoers.scm +++ /dev/null @@ -1,8 +0,0 @@ -(define-module (suweren commons sudoers) - #:use-module (guix gexp)) - -(define-public %sudoers-specification* - (let ((content (string-append "root ALL=(ALL) ALL \n" - "%wheel ALL=(ALL) ALL \n" - "Defaults passwd_timeout=0 \n"))) - (plain-file "sudoers" content))) diff --git a/suweren/home.scm b/suweren/home.scm index e51579c..cb4c3eb 100644 --- a/suweren/home.scm +++ b/suweren/home.scm @@ -1,15 +1,4 @@ (define-module (suweren home) - ;; easyeffects - #:use-module (gnu packages audio) - - ;; font-google-noto - ;; font-google-noto-emoji - ;; font-google-noto-sans-cjk - ;; font-google-noto-serif-cjk - #:use-module (gnu packages fonts) - - ;; kded - #:use-module (gnu packages kde-frameworks) ;; home-profile-service-type #:use-module (gnu home services) @@ -17,62 +6,25 @@ ;; home-dbus-service-type #:use-module (gnu home services desktop) - ;; home-bash-service-type - #:use-module (gnu home services shells) - ;; home-shepherd-service-type #:use-module (gnu home services shepherd) ;; home-pipewire-service-type #:use-module (gnu home services sound) - ;; gnupg - ;; pinentry-qt - ;; pinentry-tty - #:use-module (gnu packages gnupg) - - ;; kde-gtk-config - #:use-module (gnu packages kde-plasma) - - ;; librewolf - #:use-module (gnu packages librewolf) - ;; service ;; simple-service #:use-module (gnu services) - - ;; suweren-home-fontconfig-service-type - #:use-module (suweren home services fontutils) ;; update-commands #:use-module (suweren update)) -;; string -> -;; (record service) -(define-public (%suweren-home-services host-name*) - (let* ((packages (list easyeffects - font-google-noto - font-google-noto-emoji - font-google-noto-sans-cjk - font-google-noto-serif-cjk - font-hack - gnupg - kde-gtk-config - kded - librewolf - pinentry-qt - pinentry-tty)) - - (dbus (service home-dbus-service-type)) - (pipewire (service home-pipewire-service-type)) - (profile (simple-service 'default-home-packages - home-profile-service-type - packages)) - (shepherd (service home-shepherd-service-type)) - (update-commands* (update-commands host-name*))) +(define-public %suweren-home-services + (let* + ( (dbus (service home-dbus-service-type)) + (pipewire (service home-pipewire-service-type)) + (shepherd (service home-shepherd-service-type))) (list dbus - pipewire - profile - shepherd - suweren-home-fontconfig-service-type - update-commands*))) + pipewire + shepherd + update-commands))) diff --git a/suweren/home/bash-profile b/suweren/home/bash-profile deleted file mode 100644 index 37ea25c..0000000 --- a/suweren/home/bash-profile +++ /dev/null @@ -1,2 +0,0 @@ -# Honor per-interactive-shell startup file -if [ -f ~/.bashrc ]; then . ~/.bashrc; fi diff --git a/suweren/home/bashrc b/suweren/home/bashrc deleted file mode 100644 index be0d92a..0000000 --- a/suweren/home/bashrc +++ /dev/null @@ -1,34 +0,0 @@ -# Bash initialization for interactive non-login shells and -# for remote shells (info "(bash) Bash Startup Files"). - -# Export 'SHELL' to child processes. Programs such as 'screen' -# honor it and otherwise use /bin/sh. -export SHELL - -if [[ $- != *i* ]] -then - # We are being invoked from a non-interactive shell. If this - # is an SSH session (as in "ssh host command"), source - # /etc/profile so we get PATH and other essential variables. - [[ -n "$SSH_CLIENT" ]] && source /etc/profile - - # Don't do anything else. - return -fi - -# Source the system-wide file. -source /etc/bashrc - -# Adjust the prompt depending on whether we're in 'guix environment'. -if [ -n "$GUIX_ENVIRONMENT" ] -then - PS1='\u@\h \w [env]\$ ' -else - PS1='\u@\h \w\$ ' -fi -alias ls='ls -p --color=auto' -alias ll='ls -l' -alias grep='grep --color=auto' - -GUIX_PROFILE="/var/guix/profiles/per-user/$USER/guix-profile" ; -source "$GUIX_PROFILE/etc/profile" ; diff --git a/suweren/home/emacs-configuration.el b/suweren/home/emacs-configuration.el deleted file mode 100644 index b883818..0000000 --- a/suweren/home/emacs-configuration.el +++ /dev/null @@ -1,101 +0,0 @@ -;; Enable Horizontal Scrolling -(setq-default auto-hscroll-mode t - hscroll-margin 10 - hscroll-step 1) - -;; Disable Backup Files -(setq make-backup-files nil) - -;;; https://github.com/fimblo/dot.emacs -;;; Theme Activation -(load-theme 'modus-operandi) - -;;; Disable Ring Bell -(setq-default ring-bell-function 'ignore) - -;;; Disable Org Indent Mode -(add-hook 'org-mode-hook (lambda () (org-indent-mode -1))) - -;;; Enable ParEdit -(add-hook 'prog-mode-hook 'enable-paredit-mode) - -;;; https://elpa.gnu.org/packages/aggressive-indent.html -;;; Automatic Activation of Aggressive Indent -;; (global-aggressive-indent-mode) - -;; Highlight the pair of delimiters under the cursor -(setq-default show-paren-mode 1 - show-paren-delay 0) - -;;; https://guix.gnu.org/manual/en/html_node/The-Perfect-Setup.html -;;; Copyright Information -(setq-default user-full-name "Marek Paśnikowski" - user-mail-address "marek@marekpasnikowski.pl") - -(setq-default epg-gpg-program "gpg2") - -;;;https://github.com/redguardtoo/mastering-emacs-in-one-year-guide/blob/master/gnus-guide-en.org#my-gnusel -(setq-default send-mail-function 'smtpmail-send-it - smtpmail-stream-type 'ssl - smtpmail-smtp-server "marekpasnikowski.pl" - smtpmail-smtp-service 465 - ;; smtpmail-local-domain "izumi.lan" - smtpmail-debug-info t) - -(require 'smtpmail) - -;;; https://github.com/redguardtoo/mastering-emacs-in-one-year-guide/blob/master/gnus-guide-en.org#my-gnusel -(add-hook 'message-mode-hook - (lambda () - (flyspell-mode t) - (local-set-key (kbd "TAB") - 'bbdb-complete-name))) - -;;; Startup Screen Inhibition -(setq-default inhibit-startup-screen t) - -;; Enable the column-100 line -(setq-default display-fill-column-indicator-column 100 - fill-column 100 - org-startup-truncated nil) -(set-face-attribute 'fill-column-indicator nil :foreground "green") -(global-display-fill-column-indicator-mode) - -;;; Enable Org Modern Style - ;(with-eval-after-load 'org (global-org-modern-mode)) - -;; Prepare Literate Programming -(setq-default - org-startup-indented t - org-confirm-babel-evaluate nil - org-src-fontify-natively t - org-src-tab-acts-natively t) -(org-babel-do-load-languages 'org-babel-load-languages '((emacs-lisp . t) - (scheme . t ) - (shell . t ))) - -(add-to-list 'auto-mode-alist '("\\.epub\\'" . nov-mode)) - -;; Monospace Font in Ebook Reader -(setq-default nov-variable-pitch nil) - -;; Disable Toolbar -(tool-bar-mode -1) - -;; ORG-FC Configuration -(setq-default - org-fc-algorithm 'tn - org-fc-shuffle-positions t - org-fc-directories '("~/Dokumenty/fiszki")) - -;; Nix Mode -;; (require 'nix-mode) -;; (add-to-list 'auto-mode-alist '("\\.nix\\'" . nix-mode)) - -;; (setq tramp-remote-path -;; (append tramp-remote-path -;; '(tramp-own-remote-path -;; "~/.guix-profile/bin" -;; "~/.guix-profile/sbin" -;; "/run/current-system/profile/bin" -;; "/run/current-system/profile/sbin"))) diff --git a/suweren/home/emacs-gnus.el b/suweren/home/emacs-gnus.el deleted file mode 100644 index 39d51a9..0000000 --- a/suweren/home/emacs-gnus.el +++ /dev/null @@ -1,28 +0,0 @@ -(setq gnus-select-method - '(nnimap "personal" - (nnimap-address "marekpasnikowski.pl") - (nnimap-user "marek") - (nnimap-inbox "INBOX"))) - -(setq gnus-secondary-select-methods - '((nnimap "guix-devel" - (nnimap-address "marekpasnikowski.pl") - (nnimap-user "guix-devel") - (nnimap-inbox "INBOX")) - (nnimap "help-guix" - (nnimap-address "marekpasnikowski.pl") - (nnimap-user "help-guix") - (nnimap-inbox "INBOX")))) - -;; (alist string parameter) -(setq gnus-parameters - '(("personal" (posting-style (address "marek@marekpasnikowski.pl"))) - ("guix-devel" (posting-style (address "marek@marekpasnikowski.pl") - (gcc nil))) - ("help-guix" (posting-style (address "marek@marekpasnikowski.pl") - (gcc nil))))) - -(setq gnus-message-archive-group - (format-time-string "nnimap+personal:Archive.%Y-%m")) - -(setq gnus-gcc-mark-as-read t) diff --git a/suweren/home/emacs-init.el b/suweren/home/emacs-init.el deleted file mode 100644 index 6715d0f..0000000 --- a/suweren/home/emacs-init.el +++ /dev/null @@ -1,8 +0,0 @@ -;; This is a DRY expression to load a list of Emacs configuration files. -(mapcar (lambda (file-name) - (let ((file-path (concat "$XDG_CONFIG_HOME/emacs/" file-name))) - (load-file file-path))) - (list "configuration.el" - "gnus.el" - "org.el" - "roam.el")) diff --git a/suweren/home/emacs-org.el b/suweren/home/emacs-org.el deleted file mode 100644 index 06ed13f..0000000 --- a/suweren/home/emacs-org.el +++ /dev/null @@ -1,13 +0,0 @@ -(require 'org) - -(defvar window-setup - (setq org-agenda-window-setup 'only-window) - (concat "Full-screen agenda.")) - -(use-package org - :bind - (("C-c a" . org-agenda) - ("C-c c" . org-capture) - ("C-c l" . org-store-link)) - :custom - 'window-setup) diff --git a/suweren/home/emacs-roam.el b/suweren/home/emacs-roam.el deleted file mode 100644 index 4e0673d..0000000 --- a/suweren/home/emacs-roam.el +++ /dev/null @@ -1,62 +0,0 @@ -(require 'org-roam) - -(defun org-roam-db-query-tasks () - (concat "The query constructor to receive a list of files with tasks.") - (org-roam-db-query [:select - :distinct [file] - :from nodes - :where (like todo "TODO") - :or (like todo "DONE")])) - -(defun org-roam-dailies-with-tasks () - (concat "List of distinct Org Roam files with tasks,\n" - "obtained with Roam’s SQLite database query.\n" - "\n" - "The application of append is necessary to unpack the query result.") - (apply 'append - (funcall #'org-roam-db-query-tasks))) - -(defvar org-roam-merged-agenda-files - (append org-agenda-files - (org-roam-dailies-with-tasks)) - (concat "List of Roam’s agenda files merged with agenda files set earlier.")) - -(defun org-roam-update-agenda-files (&rest _) - (concat "Refresh the list of agenda files before opening the agenda.") - (setq org-agenda-files (org-roam-dailies-with-tasks))) - -(use-package org-roam - :init - (setq org-roam-v2-ack t) - - :config - (require 'org-roam-dailies) - (org-roam-db-autosync-mode) - (advice-add 'org-agenda - :before - #'org-roam-update-agenda-files) - (advice-add 'org-todo-list - :before - #'org-roam-update-agenda-files) - - :bind - (("C-c n f" . org-roam-node-find) - ("C-c n i" . org-roam-node-insert) - ("C-c n l" . org-roam-buffer-toggle) - :map - org-roam-dailies-map - ("T" . org-roam-dailies-capture-tomorrow) - ("Y" . org-roam-dailies-capture-yesterday)) - - :bind-keymap - ("C-c n d" . org-roam-dailies-map) - - :custom - (org-roam-directory "~/Dokumenty/Baza") - (org-roam-dailies-directory "Dziennik/") - (org-roam-capture-templates '(("d" "default" plain "%?" - :target (file+head "${slug}.org" - "#+title: ${title}\n") - :unnarrowed t))) - - :ensure t) diff --git a/suweren/home/services/fontutils.scm b/suweren/home/services/fontutils.scm deleted file mode 100644 index 661667b..0000000 --- a/suweren/home/services/fontutils.scm +++ /dev/null @@ -1,41 +0,0 @@ -(define-module (suweren home services fontutils) - ;; suweren-home-fontconfig-service-type - - #:use-module (gnu home services fontutils) - - ;; suweren-home-fontconfig-service-type - #:use-module (gnu services)) - -(define-public suweren-home-fontconfig-service-type - (let* ((antialias '(match (@ (target "font")) - (edit (@ (mode "assign") - (name "antialias")) - (bool "true")))) - (hinting '(match (@ (target "font")) - (edit (@ (mode "assign") - (name "hinting")) - (bool "true")))) - (hintstyle '(match (@ (target "font")) - (edit (@ (mode "assign") - (name "hintstyle")) - (const "hintfull")))) - (rgba '(match (@ (target "font")) - (edit (@ (mode "assign") - (name "rgba")) - (const "rgb")))) - - ;; TODO sxml -> (sxml) - (rules (list antialias - hinting - hintstyle - rgba)) - - ;; TODO Remove the hardcoded path by using an appropriate variable. - ;; TODO string -> (sxml) -> fontconfig-extension - (extensions (list "~/.guix-home/profile/share/fonts" - rules))) - - ;; TODO symbol -> service-type? -> fontconfig-extension -> service - (simple-service 'suweren-fontconfig - home-fontconfig-service-type - extensions))) diff --git a/suweren/services.scm b/suweren/services.scm deleted file mode 100644 index c067df8..0000000 --- a/suweren/services.scm +++ /dev/null @@ -1,59 +0,0 @@ -(define-module (suweren services) - #:use-module (gnu packages cups) - #:use-module (gnu packages linux) - #:use-module (gnu services) - #:use-module (gnu services base) - #:use-module (gnu services cups) - #:use-module (gnu services desktop) - #:use-module (gnu services sddm) - #:use-module (gnu services sound) - #:use-module (gnu services syncthing) - #:use-module (gnu services xorg) - #:use-module (services guix channels) - #:use-module (services nonguix substitute) - #:use-module (services plasma-desktop) - #:use-module (suweren services desktop) - #:use-module (suweren trezor) ; trezor-bridge - #:use-module (upstream services nbfc)) - -(define (guix-options configuration-record) - (let ((extra-options (list "--gc-keep-derivations=yes" - "--gc-keep-outputs=yes"))) - (guix-configuration (inherit configuration-record) - (extra-options extra-options)))) - -(define-public %distribution-services - (let* ((cups-configuration* (cups-configuration (web-interface? #t))) - (nbfc-configuration* (nbfc-configuration (model "Acer Nitro AN515-43"))) - (sddm-configuration* (sddm-configuration ;; (display-server "wayland") - (theme "breeze"))) - - (cups-service (service cups-service-type - cups-configuration*)) - (%desktop-services* (modify-services %desktop-services - (delete gdm-service-type) - (delete pulseaudio-service-type) - (guix-service-type configuration - => - (guix-options configuration)) - (guix-service-type configuration - => - (channels configuration)) - (guix-service-type configuration - => - (nonguix-substitute configuration)))) - (nbfc-service (service nbfc-service-type - nbfc-configuration*)) - (plasma-desktop-service (service plasma-desktop-service-type)) - (sddm-service (service sddm-service-type - sddm-configuration*)) - (syncthing-service (service syncthing-service-type - (syncthing-configuration (user "marek"))))) - (append %desktop-services* - bluetooth-services - trezor-bridge - (list cups-service - nbfc-service - plasma-desktop-service - sddm-service - syncthing-service)))) diff --git a/suweren/services/desktop.scm b/suweren/services/desktop.scm deleted file mode 100644 index 6c50d96..0000000 --- a/suweren/services/desktop.scm +++ /dev/null @@ -1,6 +0,0 @@ -(define-module (suweren services desktop) - #:use-module (gnu services) - #:use-module (gnu services desktop)) - -(define-public bluetooth-services - (list (service bluetooth-service-type))) diff --git a/suweren/services/sound.scm b/suweren/services/sound.scm deleted file mode 100644 index 8067f98..0000000 --- a/suweren/services/sound.scm +++ /dev/null @@ -1,6 +0,0 @@ -(define-module (suweren services sound) - #:use-module (gnu home services sound) - #:use-module (gnu services)) - -(define-public pipewire - (service home-pipewire-service-type)) diff --git a/suweren/system.scm b/suweren/system.scm index 9ee81b9..a7934f0 100644 --- a/suweren/system.scm +++ b/suweren/system.scm @@ -1,174 +1,37 @@ (define-module (suweren system) - #:use-module (gnu packages kde-pim) ; kgpg - #:use-module (gnu services) ; modify-services - ; profile-service-type - ; simple-service - #:use-module (gnu services base) ; guix-configuration - ; guix-service-type - ; login-configuration - ; login-service-type - #:use-module (gnu services desktop) ; %desktop-services - ; plasma-desktop-service-type - #:use-module (gnu services sddm) ; sddm-configuration - ; sddm-service-type - #:use-module (gnu services syncthing) ; syncthing-configuration - ; syncthing-service-type - #:use-module (gnu services xorg) ; gdm-service-type - #:use-module (gnu system) ; operating-system + #:use-module (gnu system locale) #:use-module (gnu system file-systems) ; %base-file-systems - #:use-module (gnu system shadow) ; %base-user-accounts - #:use-module (guix channels) ; %default-channels - #:use-module (guix gexp) ; plain-file - #:use-module (suweren commons sudoers) ; %sudoers-specification* - ) + #:use-module (gnu system shadow) ; %base-user-accounts + #:use-module (nongnu packages linux)) -;; (list record* package) -(define packages - (list kgpg)) +(define-public polish-locale-string + "pl_PL.utf8") -;; record* service -(define profile - (simple-service 'distribution-packages - profile-service-type - packages)) +;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; -;; record guix-configuration -> -;; record guix-configuration -(define (guix configuration) - (let* ((deployment-commit "c24ce7cb11e74da13d491f9de3c4b7040a069f43") - (distribution-commit "7d17bded11ef1239592e6e5abd40ceee1e99cbb8") - (marekpasnikowski-fingerprint - (openpgp-fingerprint "590E 500F E39D 26B3 E60B 743B 6D81 B120 7711 899F")) - (nonguix-commit "897c1a470da759236cc11798f4e0a5f7d4d59fbc") - (nonguix-fingerprint - (openpgp-fingerprint "2A39 3FFF 68F4 EF7A 3D29 12AF 6F51 20A0 22FB B2D5")) +(define polish-locale + (locale-definition (name polish-locale-string) + (source "pl_PL"))) - (deployment-introduction (make-channel-introduction deployment-commit - marekpasnikowski-fingerprint)) - (deployment-url "https://git.marekpasnikowski.pl/git/deployment.git") - (distribution-introduction (make-channel-introduction distribution-commit - marekpasnikowski-fingerprint)) - (distribution-url "https://git.marekpasnikowski.pl/git/distribution.git") - (nonguix-authorized-guix-key-content - (string-append - "(public-key \n" - "(ecc \n" - "(curve Ed25519) \n" - "(q #C1FD53E5D4CE971933EC50C9F307AE2171A2D3B52C804642A7A35F84F3A4EA98#))) \n")) - (nonguix-authorized-guix-key-name "nonguix-authorized-guix-key") - (nonguix-introduction (make-channel-introduction nonguix-commit - nonguix-fingerprint)) - (nonguix-url "https://gitlab.com/nonguix/nonguix") +;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; - (deployment (channel (name 'deployment) - (url deployment-url) - (introduction deployment-introduction))) - (distribution (channel (name 'distribution) - (url distribution-url) - (introduction distribution-introduction))) - (nonguix (channel (name 'nonguix) - (url nonguix-url) - (introduction nonguix-introduction))) - (nonguix-key (plain-file nonguix-authorized-guix-key-name - nonguix-authorized-guix-key-content)) +(define (locale-definitions*) + (append %default-locale-definitions + (list polish-locale))) - (nonguix-authorized-guix-keys (list nonguix-key)) - (nonguix-substitute-urls (list "https://substitutes.nonguix.org")) - (suweren-channels (list deployment - distribution - nonguix)) +;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; - (%default-authorized-guix-keys* (append %default-authorized-guix-keys - nonguix-authorized-guix-keys)) - (%default-channels* (append %default-channels - suweren-channels)) - (%default-substitute-urls* (append %default-substitute-urls - nonguix-substitute-urls)) - (extra-options* (list "--gc-keep-derivations=yes" - "--gc-keep-outputs=yes"))) - (guix-configuration (inherit configuration) - (channels %default-channels*) - (authorized-keys %default-authorized-guix-keys*) - (substitute-urls %default-substitute-urls*) - (extra-options extra-options*)))) +(define-public %suweren-bootloader + #f) -;; record login-configuration -> -;; record login-configuration -(define (login configuration) - (login-configuration (inherit configuration) - (allow-empty-passwords? #f))) +(define-public %suweren-file-systems + %base-file-systems) -;; record syncthing-configuration -(define syncthing-configuration* - (syncthing-configuration (user "marek"))) +(define-public %suweren-kernel + linux) -;; record syncthing-service-type -(define syncthing - (service syncthing-service-type - syncthing-configuration*)) +(define-public %suweren-locale-definitions + (locale-definitions*)) -;; record package -> -;; record bootloader-configuration -> -;; bool | record keyboard-layout -> -;; record package -> -;; (record package) -> -;; string -> -;; (record file-system) -> -;; (record swap-space) -> -;; (record user-account) -> -;; string -> -;; string -> -;; (record service) -> -;; record operating-system -(define-public (%suweren-operating-system kernel* - bootloader-configuration* - keyboard-layout* - initrd* - firmware* - host-name* - file-systems* - swap-devices* - users* - timezone* - locale* - services*) - (let* ((sddm-configuration* (sddm-configuration (theme "breeze") - (auto-login-user "lilia"))) - - (plasma-desktop (service plasma-desktop-service-type)) - (sddm (service sddm-service-type - sddm-configuration*)) - - (%desktop-services* (modify-services %desktop-services - (delete gdm-service-type) - (guix-service-type configuration - => - (guix configuration)) - (login-service-type configuration - => - (login configuration)))) - (suweren-services (list plasma-desktop - profile - sddm - syncthing)) - - (file-systems* (append %base-file-systems - file-systems*)) - (services* (append %desktop-services* - suweren-services - services*)) - (users* (append %base-user-accounts - users*))) - (operating-system (kernel kernel*) - (bootloader bootloader-configuration*) - (keyboard-layout keyboard-layout*) - (initrd initrd*) - (firmware firmware*) - (host-name host-name*) - (file-systems file-systems*) - (swap-devices swap-devices*) - (users users*) - (timezone timezone*) - (locale locale*) - (services services*) - (sudoers-file %sudoers-specification*)))) +(define-public %suweren-users + %base-user-accounts) diff --git a/suweren/trezor.scm b/suweren/trezor.scm index 76643ea..496fd72 100644 --- a/suweren/trezor.scm +++ b/suweren/trezor.scm @@ -6,30 +6,34 @@ #:use-module (guix gexp)) (define-public trezor-bridge - (let* ((service-executable (file-append trezord - "/bin/trezord-go")) + (let* + ( (service-executable (file-append trezord + "/bin/trezord-go")) - (start-command #~ (list #$ service-executable)) + (start-command #~ (list #$ service-executable)) - (shepherd-symbols (list 'trezor-bridge)) - (start-process #~ (make-forkexec-constructor #$ start-command)) - (stop-process #~ (make-kill-destructor)) + (shepherd-symbols (list 'trezor-bridge)) + (start-process #~ (make-forkexec-constructor #$ start-command)) + (stop-process #~ (make-kill-destructor)) - (profile-extension (list trezord)) - (shepherd-extension (shepherd-service (provision shepherd-symbols) - (start start-process) - (stop stop-process))) + (profile-extension (list trezord)) + (shepherd-extension + (shepherd-service + (provision shepherd-symbols) + (requirement (list 'user-processes)) + (start start-process) + (stop stop-process))) - (shepherd-extension* (list shepherd-extension)) + (shepherd-extension* (list shepherd-extension)) - (profile-service (simple-service 'trezor-bridge-profile - profile-service-type - profile-extension)) - (shepherd-service (simple-service 'trezor-bridge-shepherd - shepherd-root-service-type - shepherd-extension*)) - (udev-service (udev-rules-service 'trezor-bridge-udev - trezord-udev-rules))) + (profile-service (simple-service 'trezor-bridge-profile + profile-service-type + profile-extension)) + (shepherd-service* (simple-service 'trezor-bridge-shepherd + shepherd-root-service-type + shepherd-extension*)) + (udev-service* (udev-rules-service 'trezor-bridge-udev + trezord-udev-rules))) (list profile-service - udev-service - shepherd-service))) + udev-service* + shepherd-service*))) diff --git a/suweren/update.scm b/suweren/update.scm index 1381b2c..7afe25c 100644 --- a/suweren/update.scm +++ b/suweren/update.scm @@ -1,7 +1,8 @@ (define-module (suweren update) ;; home-bash-extension ;; home-bash-service-type - #:use-module (gnu home services shells) + #:use-module ((gnu home services shells) + #:prefix gnu:home:services:shells:) ;; simple-service #:use-module (gnu services)) @@ -19,8 +20,8 @@ "sudo guix system delete-generations 7d") ;; string -(define guile-load-path - "GUILE_LOAD_PATH='$HOME/Szablony/distribution:$HOME/Szablony/deployment'") +(define guix-test-switches + "-L ~/Szablony/sovereign -L ~/Szablony/distribution -L ~/Szablony/deployment -v 3") ;; string (define pull-guix @@ -36,13 +37,6 @@ ;; string -> ;; string -(define (system-definition host-name*) - (string-append "'(@ (systems " - host-name* - ") operating-system*)'")) - -;; string -> -;; string (define (reconfigure-system system-definition*) (string-append "sudo guix system reconfigure -e " system-definition*)) @@ -50,9 +44,9 @@ ;; string -> ;; string (define (test-update reconfigure-system*) - (string-append guile-load-path - " " - reconfigure-system*)) + (string-append reconfigure-system* + " " + guix-test-switches)) ;; string -> ;; string @@ -78,15 +72,15 @@ ;; string -> ;; record service -(define-public (update-commands host-name*) - (let* ((system-definition* (system-definition host-name*)) - (reconfigure-system* (reconfigure-system system-definition*)) - (test-update* (test-update reconfigure-system*)) - (update-system* (update-system reconfigure-system*)) - (aliases* (aliases reconfigure-system* - test-update* - update-system*)) - (service-extension* (home-bash-extension (aliases aliases*)))) +(define-public update-commands + (let* + ( (reconfigure-system* (reconfigure-system "\"(@ (deployment systems $HOSTNAME) operating-system*)\"")) + (test-update* (test-update reconfigure-system*)) + (update-system* (update-system reconfigure-system*)) + (aliases* (aliases reconfigure-system* + test-update* + update-system*)) + (service-extension* (gnu:home:services:shells:home-bash-extension (aliases aliases*)))) (simple-service 'update-commands - home-bash-service-type - service-extension*))) + gnu:home:services:shells:home-bash-service-type + service-extension*))) diff --git a/upstream/packages/nbfc.patch b/upstream/packages/nbfc.patch deleted file mode 100644 index 2c5dea6..0000000 --- a/upstream/packages/nbfc.patch +++ /dev/null @@ -1,427 +0,0 @@ -From 0d7c51151629ea21325b4cc8f2d912633b842743 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Marek=20Pa=C5=9Bnikowski?= <marek@marekpasnikowski.pl> -Date: Sun, 9 Jun 2024 18:59:16 +0200 -Subject: [PATCH 1/1] change temperature threshholds - ---- - share/nbfc/configs/Acer Nitro AN515-43.json | 406 +++++++++----------- - 1 file changed, 173 insertions(+), 233 deletions(-) - -diff --git a/share/nbfc/configs/Acer Nitro AN515-43.json b/share/nbfc/configs/Acer Nitro AN515-43.json -index a0c64fb..edea6e0 100644 ---- a/share/nbfc/configs/Acer Nitro AN515-43.json -+++ b/share/nbfc/configs/Acer Nitro AN515-43.json -@@ -5,237 +5,177 @@ - "ReadWriteWords": true, - "CriticalTemperature": 90, - "FanConfigurations": [ -- { -- "ReadRegister": 19, -- "WriteRegister": 55, -- "MinSpeedValue": 0, -- "MaxSpeedValue": 100, -- "IndependentReadMinMaxValues": true, -- "MinSpeedValueRead": 0, -- "MaxSpeedValueRead": 6122, -- "ResetRequired": true, -- "FanSpeedResetValue": 50, -- "FanDisplayName": "Ryzen 3550H", -- "TemperatureThresholds": [ -- { -- "UpThreshold": 40, -- "DownThreshold": 0, -- "FanSpeed": 0.0 -- }, -- { -- "UpThreshold": 42, -- "DownThreshold": 40, -- "FanSpeed": 30.0 -- }, -- { -- "UpThreshold": 44, -- "DownThreshold": 41, -- "FanSpeed": 32.0 -- }, -- { -- "UpThreshold": 48, -- "DownThreshold": 43, -- "FanSpeed": 34.0 -- }, -- { -- "UpThreshold": 52, -- "DownThreshold": 46, -- "FanSpeed": 36.0 -- }, -- { -- "UpThreshold": 54, -- "DownThreshold": 50, -- "FanSpeed": 38.0 -- }, -- { -- "UpThreshold": 58, -- "DownThreshold": 53, -- "FanSpeed": 41.0 -- }, -- { -- "UpThreshold": 62, -- "DownThreshold": 56, -- "FanSpeed": 44.0 -- }, -- { -- "UpThreshold": 64, -- "DownThreshold": 60, -- "FanSpeed": 47.0 -- }, -- { -- "UpThreshold": 68, -- "DownThreshold": 63, -- "FanSpeed": 50.0 -- }, -- { -- "UpThreshold": 72, -- "DownThreshold": 66, -- "FanSpeed": 55.0 -- }, -- { -- "UpThreshold": 74, -- "DownThreshold": 70, -- "FanSpeed": 61.0 -- }, -- { -- "UpThreshold": 78, -- "DownThreshold": 73, -- "FanSpeed": 68.0 -- }, -- { -- "UpThreshold": 82, -- "DownThreshold": 76, -- "FanSpeed": 76.0 -- }, -- { -- "UpThreshold": 84, -- "DownThreshold": 80, -- "FanSpeed": 85.0 -- }, -- { -- "UpThreshold": 88, -- "DownThreshold": 83, -- "FanSpeed": 94.0 -- }, -- { -- "UpThreshold": 90, -- "DownThreshold": 86, -- "FanSpeed": 100.0 -- } -- ], -- "FanSpeedPercentageOverrides": [] -- }, -- { -- "ReadRegister": 21, -- "WriteRegister": 58, -- "MinSpeedValue": 0, -- "MaxSpeedValue": 100, -- "IndependentReadMinMaxValues": true, -- "MinSpeedValueRead": 0, -- "MaxSpeedValueRead": 6122, -- "ResetRequired": true, -- "FanSpeedResetValue": 50, -- "FanDisplayName": "AMD RX560X", -- "TemperatureThresholds": [ -- { -- "UpThreshold": 40, -- "DownThreshold": 0, -- "FanSpeed": 0.0 -- }, -- { -- "UpThreshold": 42, -- "DownThreshold": 40, -- "FanSpeed": 22.0 -- }, -- { -- "UpThreshold": 44, -- "DownThreshold": 41, -- "FanSpeed": 24.0 -- }, -- { -- "UpThreshold": 48, -- "DownThreshold": 43, -- "FanSpeed": 26.0 -- }, -- { -- "UpThreshold": 52, -- "DownThreshold": 46, -- "FanSpeed": 28.0 -- }, -- { -- "UpThreshold": 54, -- "DownThreshold": 50, -- "FanSpeed": 30.0 -- }, -- { -- "UpThreshold": 58, -- "DownThreshold": 53, -- "FanSpeed": 34.0 -- }, -- { -- "UpThreshold": 62, -- "DownThreshold": 56, -- "FanSpeed": 38.0 -- }, -- { -- "UpThreshold": 64, -- "DownThreshold": 60, -- "FanSpeed": 42.0 -- }, -- { -- "UpThreshold": 68, -- "DownThreshold": 63, -- "FanSpeed": 46.0 -- }, -- { -- "UpThreshold": 72, -- "DownThreshold": 66, -- "FanSpeed": 52.0 -- }, -- { -- "UpThreshold": 74, -- "DownThreshold": 70, -- "FanSpeed": 59.0 -- }, -- { -- "UpThreshold": 78, -- "DownThreshold": 73, -- "FanSpeed": 67.0 -- }, -- { -- "UpThreshold": 82, -- "DownThreshold": 76, -- "FanSpeed": 76.0 -- }, -- { -- "UpThreshold": 84, -- "DownThreshold": 80, -- "FanSpeed": 86.0 -- }, -- { -- "UpThreshold": 88, -- "DownThreshold": 83, -- "FanSpeed": 96.0 -- }, -- { -- "UpThreshold": 90, -- "DownThreshold": 86, -- "FanSpeed": 100.0 -- } -- ], -- "FanSpeedPercentageOverrides": [] -- } -- ], -+ { -+ "ReadRegister": 19, -+ "WriteRegister": 55, -+ "MinSpeedValue": 0, -+ "MaxSpeedValue": 100, -+ "IndependentReadMinMaxValues": true, -+ "MinSpeedValueRead": 0, -+ "MaxSpeedValueRead": 6122, -+ "ResetRequired": true, -+ "FanSpeedResetValue": 50, -+ "FanDisplayName": "Ryzen 3550H", -+ "TemperatureThresholds": [ -+ { -+ "UpThreshold": 30, -+ "DownThreshold": 0, -+ "FanSpeed": 0 -+ }, -+ { -+ "UpThreshold": 35, -+ "DownThreshold": 25, -+ "FanSpeed": 10.0 -+ }, -+ { -+ "UpThreshold": 40, -+ "DownThreshold": 30, -+ "FanSpeed": 20.0 -+ }, -+ { -+ "UpThreshold": 45, -+ "DownThreshold": 35, -+ "FanSpeed": 30.0 -+ }, -+ { -+ "UpThreshold": 50, -+ "DownThreshold": 40, -+ "FanSpeed": 40.0 -+ }, -+ { -+ "UpThreshold": 55, -+ "DownThreshold": 45, -+ "FanSpeed": 50.0 -+ }, -+ { -+ "UpThreshold": 60, -+ "DownThreshold": 50, -+ "FanSpeed": 60.0 -+ }, -+ { -+ "UpThreshold": 65, -+ "DownThreshold": 55, -+ "FanSpeed": 70.0 -+ }, -+ { -+ "UpThreshold": 70, -+ "DownThreshold": 60, -+ "FanSpeed": 80.0 -+ }, -+ { -+ "UpThreshold": 75, -+ "DownThreshold": 65, -+ "FanSpeed": 90.0 -+ }, -+ { -+ "UpThreshold": 80, -+ "DownThreshold": 70, -+ "FanSpeed": 100.0 -+ } -+ ], -+ "FanSpeedPercentageOverrides": [] -+ }, -+ { -+ "ReadRegister": 21, -+ "WriteRegister": 58, -+ "MinSpeedValue": 0, -+ "MaxSpeedValue": 100, -+ "IndependentReadMinMaxValues": true, -+ "MinSpeedValueRead": 0, -+ "MaxSpeedValueRead": 6122, -+ "ResetRequired": true, -+ "FanSpeedResetValue": 50, -+ "FanDisplayName": "AMD RX560X", -+ "TemperatureThresholds": [ -+ { -+ "UpThreshold": 30, -+ "DownThreshold": 0, -+ "FanSpeed": 0 -+ }, -+ { -+ "UpThreshold": 35, -+ "DownThreshold": 25, -+ "FanSpeed": 10.0 -+ }, -+ { -+ "UpThreshold": 40, -+ "DownThreshold": 30, -+ "FanSpeed": 20.0 -+ }, -+ { -+ "UpThreshold": 45, -+ "DownThreshold": 35, -+ "FanSpeed": 30.0 -+ }, -+ { -+ "UpThreshold": 50, -+ "DownThreshold": 40, -+ "FanSpeed": 40.0 -+ }, -+ { -+ "UpThreshold": 55, -+ "DownThreshold": 45, -+ "FanSpeed": 50.0 -+ }, -+ { -+ "UpThreshold": 60, -+ "DownThreshold": 50, -+ "FanSpeed": 60.0 -+ }, -+ { -+ "UpThreshold": 65, -+ "DownThreshold": 55, -+ "FanSpeed": 70.0 -+ }, -+ { -+ "UpThreshold": 70, -+ "DownThreshold": 60, -+ "FanSpeed": 80.0 -+ }, -+ { -+ "UpThreshold": 75, -+ "DownThreshold": 65, -+ "FanSpeed": 90.0 -+ }, -+ { -+ "UpThreshold": 80, -+ "DownThreshold": 70, -+ "FanSpeed": 100.0 -+ } -+ ], -+ "FanSpeedPercentageOverrides": [] -+ } -+ ], - "RegisterWriteConfigurations": [ -- { -- "WriteMode": "Set", -- "WriteOccasion": "OnInitialization", -- "Register": 34, -- "Value": 12, -- "ResetRequired": true, -- "ResetValue": 4, -- "ResetWriteMode": "Set", -- "Description": "CPU fan manual mode" -- }, -- { -- "WriteMode": "Set", -- "WriteOccasion": "OnInitialization", -- "Register": 33, -- "Value": 48, -- "ResetRequired": true, -- "ResetValue": 16, -- "ResetWriteMode": "Set", -- "Description": "GPU fan manual mode" -- }, -- { -- "WriteMode": "Set", -- "WriteOccasion": "OnInitialization", -- "Register": 16, -- "Value": 0, -- "ResetRequired": true, -- "ResetValue": 1, -- "ResetWriteMode": "Set", -- "Description": "CoolBoost off" -- } -- ] --} -+ { -+ "WriteMode": "Set", -+ "WriteOccasion": "OnInitialization", -+ "Register": 34, -+ "Value": 12, -+ "ResetRequired": true, -+ "ResetValue": 4, -+ "ResetWriteMode": "Set", -+ "Description": "CPU fan manual mode" -+ }, -+ { -+ "WriteMode": "Set", -+ "WriteOccasion": "OnInitialization", -+ "Register": 33, -+ "Value": 48, -+ "ResetRequired": true, -+ "ResetValue": 16, -+ "ResetWriteMode": "Set", -+ "Description": "GPU fan manual mode" -+ }, -+ { -+ "WriteMode": "Set", -+ "WriteOccasion": "OnInitialization", -+ "Register": 16, -+ "Value": 0, -+ "ResetRequired": true, -+ "ResetValue": 1, -+ "ResetWriteMode": "Set", -+ "Description": "CoolBoost off" -+ } -+ ] -+ } --- -2.45.1 - diff --git a/upstream/packages/nbfc.scm b/upstream/packages/nbfc.scm deleted file mode 100644 index 8e62c9d..0000000 --- a/upstream/packages/nbfc.scm +++ /dev/null @@ -1,57 +0,0 @@ -(define-module (upstream packages nbfc) - #:use-module (gnu packages admin) - #:use-module (gnu packages autotools) - #:use-module (gnu packages linux) - #:use-module (gnu packages pkg-config) - #:use-module (gnu packages python) - #:use-module (guix utils) - #:use-module (guix build utils) - #:use-module (guix build-system gnu) - #:use-module (guix gexp) - #:use-module (guix git-download) - #:use-module ((guix licenses) #:prefix license:) - #:use-module (guix packages)) - -(define-public nbfc-linux - (let ((version "0.1.12") - (commit "a7d0bb68e934ab88906a9410363b6481a2afca4d") - (revision "0")) - (package - (name "nbfc-linux") - (version (git-version version revision commit)) - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/nbfc-linux/nbfc-linux") - (commit commit))) - (file-name (git-file-name name version)) - (patches (list (local-file "nbfc.patch"))) - (sha256 - (base32 - "04spib9j9218vyhv5mbdd0p5bxsn1gxbh0kcbl5vgqig5r6nzkf7")))) - (build-system gnu-build-system) - (arguments - `(#:make-flags (list (string-append "CC=" - ,(cc-for-target)) - (string-append "PREFIX=" - (assoc-ref %outputs "out")) - ;; (string-append "CONFDIR=" - ;; (assoc-ref %outputs "out") - ;; "/etc") - ;; (string-append "BINDIR=" - ;; (assoc-ref %outputs "out") - ;; "/bin") - ) - #:tests? #f - #:phases (modify-phases %standard-phases - (delete 'configure)))) - (native-inputs (list autoconf pkg-config)) - (inputs (list kmod)) - (propagated-inputs (list python dmidecode)) - (synopsis "NoteBook FanControl ported to Linux") - (description - "This package provides a C port of NoteBook FanControl (NBFC), a fan -control service for notebooks. It provides the same utilities with the same -interfaces as the original NBFC, although the implementation differs.") - (home-page "https://github.com/nbfc-linux/nbfc-linux") - (license license:gpl3+)))) diff --git a/upstream/services/nbfc.scm b/upstream/services/nbfc.scm deleted file mode 100644 index 4b0b646..0000000 --- a/upstream/services/nbfc.scm +++ /dev/null @@ -1,65 +0,0 @@ -(define-module (upstream services nbfc) - ;; #:use-module (gnu packages linux) - #:use-module (gnu services) - #:use-module (gnu services shepherd) - #:use-module (guix build utils) - #:use-module (guix gexp) - #:use-module (guix records) - #:use-module (upstream packages nbfc) - #:export (nbfc-configuration)) - -(define-record-type* <nbfc-configuration> - nbfc-configuration - make-nbfc-configuration - nbfc-configuration? - (package get-nbfc-configuration-package - (default nbfc-linux)) - (model get-nbfc-configuration-model - (default "undefined"))) - -(define (nbfc-etc-extension configuration-record) - (let* ((model (get-nbfc-configuration-model configuration-record)) - - (nbfc-configuration-file (mixed-text-file "nbfc.json-stored" - "{\"SelectedConfigId\": \"" - model - "\"}\n"))) - (list `("nbfc.json" ,nbfc-configuration-file)))) - -(define nbfc-profile-extension - (lambda (configuration-record) - (list (get-nbfc-configuration-package configuration-record)))) - -(define (nbfc-shepherd-extension configuration-record) - (let* ((profile (get-nbfc-configuration-package configuration-record)) - - (service-executable (file-append profile - "/bin/nbfc_service")) - - (start-command #~ (list #$ service-executable - "--config-file" - "/etc/nbfc.json")) - - (start-process #~ (make-forkexec-constructor #$ start-command)) - (symbols (list 'nbfc)) - - (default-service (shepherd-service (provision symbols) - (start start-process)))) - (list default-service))) - -(define-public nbfc-service-type - (let* ((nbfc-etc-extension* (service-extension etc-service-type - nbfc-etc-extension)) - (nbfc-profile-extension* (service-extension profile-service-type - nbfc-profile-extension)) - (nbfc-shepherd-extension* (service-extension shepherd-root-service-type - nbfc-shepherd-extension)) - - (description "C port of Stefan Hirschmann's NoteBook FanControl") - (extensions (list nbfc-etc-extension* - nbfc-profile-extension* - nbfc-shepherd-extension*))) - (service-type (name 'nbfc) - (extensions extensions) - (description description) - (default-value (nbfc-configuration))))) |