Cleanup

rdricpp.scm

@@ -53,14 +53,14 @@
     (uri
      (git-reference
        (url "https://codeberg.org/xieamoe/rdricpp.git")
-       (commit "5175eb7566")))
+       (commit "26b4b518d6")))
     (sha256
-     (base32 "06h1jwsq2agynw7nzw8lzcgigr8q2ig5vzrs2ydph939qhqr7mg7"))))
+     (base32 "0c62g68gp0ya2v9rfszrm7mxsn0anj53sfcvwav88gbws6hxriih"))))
 
   (build-system cmake-build-system)
   (arguments
     ( list #:cmake cmake
-            ;;#:tests? #f
+            #:tests? #f
             #:configure-flags
             #~(list "-DGUIX=1")
     ))
@@ -73,7 +73,7 @@
     ))
   (inputs
     (list
-          catch2
+          catch2-full
     ))
 
   (synopsis "Rikaitan Deinflector Reference Implementation in C++.")

rdricpp_local.scm

@@ -1,140 +0,0 @@
- 
-(define-module (gd-tools)
-  #:use-module (gnu packages cmake)
-  #:use-module (gnu packages compression)
-  #:use-module (gnu packages pkg-config)
-  #:use-module (gnu packages search)
-  #:use-module (gnu packages web)
-
-  #:use-module (gnu packages gcc)
-  #:use-module (gnu packages tls)
-  #:use-module (gnu packages cpp)
-  #:use-module (gnu packages glib)
-  #:use-module (gnu packages nss)
-  #:use-module (gnu packages datastructures)
-
-  #:use-module (gnu packages certs)
-  #:use-module (gnu packages check)
-  #:use-module (guix build-system qt)
-  #:use-module (gnu packages curl)
-  #:use-module (guix utils)
-  #:use-module (guix search-paths)
-  #:use-module (guix build-system cmake)
-  #:use-module (guix build-system gnu)
-  #:use-module (guix download)
-  #:use-module (guix gexp)
-
-  #:use-module (guix git-download)
-  #:use-module (guix packages)
-  #:use-module ((guix licenses) #:prefix license:))
-
-(define-public catch2-full
-(package
-  (name "Catch2")
-  (version "3.5.2")
-  (source (local-file "../Catch2-3.5.2" "guile-checkout"
-                      #:recursive? #t))
-  (build-system cmake-build-system)
-  (arguments
-    ( list #:cmake cmake
-            #:tests? #f
-      )
-    )
-
-  (native-inputs
-  (list
-        gcc-13
-        pkg-config
-  ))
-
-  (synopsis "C++ Requests: Curl for People ")
-  (description
-  "Catch2 is mainly a unit testing framework for C++, but it also
-  provides basic micro-benchmarking features, and simple BDD macros.
-
-  Catch2's main advantage is that using it is both simple and natural.
-  Test names do not have to be valid identifiers, assertions look like
-  normal C++ boolean expressions, and sections provide a nice and local
-  way to share set-up and tear-down code in tests.")
-  (home-page "https://github.com/catchorg/Catch2")
-  (license
-    (list license:boost1.0))))
-
-(define-public libcpr
-(package
-  (name "cpr")
-  (version "1.5")
-  (source (local-file "./cpr-1.10.5" "guile-checkout"
-                      #:recursive? #t))
-  (build-system cmake-build-system)
-  (arguments
-    ( list #:cmake cmake
-            #:tests? #f
-      )
-    )
-
-
-  (native-inputs
-  (list
-        openssl
-        gcc-13
-        curl
-        pkg-config
-
-  ))
-  (inputs
-  (list
-        curl
-        openssl
-        ))
-
-  (synopsis "C++ Requests: Curl for People ")
-  (description
-    "C++ Requests is a simple wrapper around libcurl inspired by the excellent Python Requests project.
-
-    Despite its name, libcurl's easy interface is anything but, and making mistakes,
-    misusing it is a common source of error and frustration. Using the more expressive
-     language facilities of C++17 'or C++11 in case you use cpr < 1.10.0', this library
-      captures the essence of making network calls into a few concise idioms.")
-  (home-page "https://github.com/libcpr/cpr")
-  (license
-    (list license:expat))))
-
-(define-public rdricpp
-(package
-  (name "rdricpp")
-  (version "1.5")
-  (source (local-file "" "guile-checkout"
-                      #:recursive? #t))
-  (build-system cmake-build-system)
-  (arguments
-    ( list #:cmake cmake
-            ;;#:tests? #f
-            #:configure-flags
-            #~(list "-DGUIX=1")
-      )
-    )
-
-
-  (native-inputs
-    (list
-          gcc-13
-          pkg-config
-
-    ))
-  (inputs
-  (list
-        catch2-full
-        ))
-
-  (synopsis "Rikaitan Deinflector Reference Implementation in C++.")
-  (description
-    "Rikaitan Deinflector Reference Implementation in C++.")
-  (home-page "https://github.com/Ajatt-Tools/rdricpp")
-  (license
-    (list license:gpl3+
-          license:zlib))))
-
-
-
-rdricpp